Upload 2 files

app.py

@@ -15,10 +15,6 @@ inference_timeout = 300
 MAX_SEED = 2**32-1
 current_model = models[0]
 text_gen1 = extend_prompt
-#text_gen1=gr.Interface.load("spaces/phenomenon1981/MagicPrompt-Stable-Diffusion") 
-#text_gen1=gr.Interface.load("spaces/Yntec/prompt-extend") 
-#text_gen1=gr.Interface.load("spaces/daspartho/prompt-extend") 
-#text_gen1=gr.Interface.load("spaces/Omnibus/MagicPrompt-Stable-Diffusion_link")
 
 models2 = [gr_Interface_load(f"models/{m}", live=False, preprocess=True, postprocess=False, hf_token=HF_TOKEN) for m in models]
 
@@ -54,11 +50,17 @@ async def infer(model_index, prompt, nprompt="", height=None, width=None, steps=
     await asyncio.sleep(0)
     try:
         result = await asyncio.wait_for(task, timeout=timeout)
-    except (Exception, asyncio.TimeoutError) as e:
+    except asyncio.TimeoutError as e:
         print(e)
         print(f"Task timed out: {models2[model_index]}")
         if not task.done(): task.cancel()
         result = None
+        raise Exception(f"Task timed out: {models2[model_index]}")
+    except Exception as e:
+        print(e)
+        if not task.done(): task.cancel()
+        result = None
+        raise Exception(e)
     if task.done() and result is not None:
         with lock:
             png_path = "image.png"
@@ -76,6 +78,7 @@ def gen_fn(model_index, prompt, nprompt="", height=None, width=None, steps=None,
         print(e)
         print(f"Task aborted: {models2[model_index]}")
         result = None
+        raise gr.Error(f"Task aborted: {models2[model_index]}, Error: {e}")
     finally:
         loop.close()
     return result
@@ -90,93 +93,27 @@ h4 {display: inline-block; color: #ffffff !important;}
 .wrapper img {font-size: 98% !important; white-space: nowrap !important; text-align: center !important;
 display: inline-block !important; color: #ffffff !important;}
 .wrapper {color: #ffffff !important;}
-.text-gray-500 {color: #ffc99f !important;}
 .gr-box {background-image: linear-gradient(#182634, #1e2f40, #254150) !important;
  border-top-color: #000000 !important; border-right-color: #ffffff !important;
  border-bottom-color: #ffffff !important; border-left-color: #000000 !important;}
-.gr-input {color: #ffc99f; !important; background-color: #254150 !important;}
-:root {--neutral-100: #000000 !important;}
-.gr-button {color: #ffffff !important; text-shadow: 1px 1px 0 rgba(0, 0, 0, 1) !important;
-background-image: linear-gradient(#76635a, #d2a489) !important; border-radius: 24px !important;
-border: solid 1px !important; border-top-color: #ffc99f !important; border-right-color: #000000 !important;
-border-bottom-color: #000000 !important; border-left-color: #ffc99f !important; padding: 6px 30px;}
-.gr-button:active {color: #ffc99f !important; font-size: 98% !important;
-text-shadow: 0px 0px 0 rgba(0, 0, 0, 1) !important; background-image: linear-gradient(#d2a489, #76635a) !important;
-border-top-color: #000000 !important; border-right-color: #ffffff !important;
-border-bottom-color: #ffffff !important; border-left-color: #000000 !important;}
-.gr-button:hover {filter: brightness(130%);}
 """
 
 with gr.Blocks(theme='John6666/YntecDark', fill_width=True, css=css) as myface:
     gr.HTML(f"""
-     <div style="text-align: center; max-width: 1200px; margin: 0 auto;">
-              <div>
-                <style>
-                    h1 {{
-                    font-size: 6em;
-                    color: #ffc99f;
-                    margin-top: 30px;
-                    margin-bottom: 30px;
-                    text-shadow: 3px 3px 0 rgba(0, 0, 0, 1) !important;
-                   }}
-                   h3 {{
-                    color: #ffc99f; !important;
-                   }}
-                   h4 {{
-                    display: inline-block;
-                    color: #ffffff !important;
-                   }}
-                   .wrapper img {{
-                    font-size: 98% !important;
-                    white-space: nowrap !important;
-                    text-align: center !important;
-                    display: inline-block !important;
-                    color: #ffffff !important;
-                   }}
-                   .wrapper {{
-                    color: #ffffff !important;
-                   }}
-                   .gradio-container {{
-                   background-image: linear-gradient(#254150, #1e2f40, #182634) !important;
-                   color: #ffaa66 !important;
-                   font-family: 'IBM Plex Sans', sans-serif !important;
-                   }}
-                   .text-gray-500 {{
-                   color: #ffc99f !important;
-                   }}
-                   .gr-box {{
-    background-image: linear-gradient(#182634, #1e2f40, #254150) !important;
-    border-top-color: #000000 !important;
-    border-right-color: #ffffff !important;
-    border-bottom-color: #ffffff !important;
-    border-left-color: #000000 !important;
-                   }}
-                   .gr-input {{
-                   color: #ffc99f; !important;
-                   background-color: #254150 !important;
-                   }}
-                   :root {{
-    --neutral-100: #000000 !important;
-                   }}
-                </style>
-                <body>
-                <div class="center"><h1>Blitz Diffusion</h1>
-                </div>
-                </body>
-              </div>
-              <p style="margin-bottom: 1px; color: #ffaa66;">
-              <h3>{int(len(models))} Stable Diffusion models, but why? For your enjoyment!</h3></p>
-              <br><div class="wrapper">9.3 <img src="https://huggingface.co/Yntec/DucHaitenLofi/resolve/main/NEW.webp" alt="NEW!" style="width:32px;height:16px;">This has become a legacy backup copy of old <u><a href="https://huggingface.co/spaces/Yntec/ToyWorld">ToyWorld</a></u>'s UI! Newer models added dailty over there! 25 new models since last update!</div>
-              <p style="margin-bottom: 1px; font-size: 98%">
-              <br><h4>If a model is already loaded each new image takes less than <b>10</b> seconds to generate!</h4></p>
-              <p style="margin-bottom: 1px; color: #ffffff;">
-              <br><div class="wrapper">Generate 6 images from 1 prompt at the <u><a href="https://huggingface.co/spaces/Yntec/PrintingPress">PrintingPress</a></u>, and use 6 different models at <u><a href="https://huggingface.co/spaces/Yntec/diffusion80xx">Huggingface Diffusion!</a></u>!
-        </p></p>
-            </div>
-            """, elem_classes="gr-box")
+        <div style="text-align: center; max-width: 1200px; margin: 0 auto;">
+        <div class="center"><h1>Blitz Diffusion</h1></div>
+        <p style="margin-bottom: 1px; color: #ffaa66;">
+        <h3>{int(len(models))} Stable Diffusion models, but why? For your enjoyment!</h3></p>
+        <br><div class="wrapper">9.3 <img src="https://huggingface.co/Yntec/DucHaitenLofi/resolve/main/NEW.webp" alt="NEW!" style="width:32px;height:16px;">This has become a legacy backup copy of old <u><a href="https://huggingface.co/spaces/Yntec/ToyWorld">ToyWorld</a></u>'s UI! Newer models added dailty over there! 25 new models since last update!</div>
+        <p style="margin-bottom: 1px; font-size: 98%">
+        <br><h4>If a model is already loaded each new image takes less than <b>10</b> seconds to generate!</h4></p>
+        <p style="margin-bottom: 1px; color: #ffffff;">
+        <br><div class="wrapper">Generate 6 images from 1 prompt at the <u><a href="https://huggingface.co/spaces/Yntec/PrintingPress">PrintingPress</a></u>, and use 6 different models at <u><a href="https://huggingface.co/spaces/Yntec/diffusion80xx">Huggingface Diffusion!</a></u>!
+        </p></p></div>
+        """, elem_classes="gr-box")
     with gr.Row():
         with gr.Column(scale=100):
-            #Model selection dropdown
+            # Model selection dropdown
             model_name1 = gr.Dropdown(label="Select Model", choices=[m for m in models], type="index",
                                       value=current_model, interactive=True, elem_classes=["gr-box", "gr-input"])
     with gr.Row():
@@ -192,7 +129,7 @@ with gr.Blocks(theme='John6666/YntecDark', fill_width=True, css=css) as myface:
                         steps = gr.Slider(label="Number of inference steps", info="If 0, the default value is used.", maximum=100, step=1, value=0, elem_classes=["gr-box", "gr-input"])
                         cfg = gr.Slider(label="Guidance scale", info="If 0, the default value is used.", maximum=30.0, step=0.1, value=0, elem_classes=["gr-box", "gr-input"])
                         seed = gr.Slider(label="Seed", info="Randomize Seed if -1.", minimum=-1, maximum=MAX_SEED, step=1, value=-1, elem_classes=["gr-box", "gr-input"])
-            run = gr.Button("Generate Image", elem_classes="gr-button")
+            run = gr.Button("Generate Image", variant="primary", elem_classes="gr-button")
 
     with gr.Row():
         with gr.Column():
@@ -202,8 +139,8 @@ with gr.Blocks(theme='John6666/YntecDark', fill_width=True, css=css) as myface:
     with gr.Row():
         with gr.Column(scale=50):
             input_text=gr.Textbox(label="Use this box to extend an idea automagically, by typing some words and clicking Extend Idea", lines=2, elem_classes=["gr-box", "gr-input"])
-            see_prompts=gr.Button("Extend Idea -> overwrite the contents of the `Your Prompt´ box above", elem_classes="gr-button")
-            use_short=gr.Button("Copy the contents of this box to the `Your Prompt´ box above", elem_classes="gr-button")
+            see_prompts=gr.Button("Extend Idea -> overwrite the contents of the `Your Prompt´ box above", variant="primary", elem_classes="gr-button")
+            use_short=gr.Button("Copy the contents of this box to the `Your Prompt´ box above", variant="primary", elem_classes="gr-button")
     def short_prompt(inputs):
         return (inputs)
     

externalmod.py

@@ -33,6 +33,7 @@ if TYPE_CHECKING:
     from gradio.interface import Interface
 
 
+HF_TOKEN = os.environ.get("HF_TOKEN") if os.environ.get("HF_TOKEN") else None # If private or gated models aren't used, ENV setting is unnecessary.
 server_timeout = 600
 
 
@@ -543,8 +544,8 @@ def list_uniq(l):
 
 
 def get_status(model_name: str):
-    from huggingface_hub import InferenceClient
-    client = InferenceClient(timeout=10)
+    from huggingface_hub import AsyncInferenceClient
+    client = AsyncInferenceClient(token=HF_TOKEN, timeout=10)
     return client.get_model_status(model_name)
 
 
@@ -563,7 +564,7 @@ def is_loadable(model_name: str, force_gpu: bool = False):
 
 def find_model_list(author: str="", tags: list[str]=[], not_tag="", sort: str="last_modified", limit: int=30, force_gpu=False, check_status=False):
     from huggingface_hub import HfApi
-    api = HfApi()
+    api = HfApi(token=HF_TOKEN)
     default_tags = ["diffusers"]
     if not sort: sort = "last_modified"
     limit = limit * 20 if check_status and force_gpu else limit * 5
@@ -576,7 +577,7 @@ def find_model_list(author: str="", tags: list[str]=[], not_tag="", sort: str="l
         print(e)
         return models
     for model in model_infos:
-        if not model.private and not model.gated:
+        if not model.private and not model.gated or HF_TOKEN is not None:
            loadable = is_loadable(model.id, force_gpu) if check_status else True
            if not_tag and not_tag in model.tags or not loadable: continue
            models.append(model.id)