Update handle_models.py

handle_models.py

@@ -1,13 +1,13 @@
 import gradio as gr
 from config import howManyModelsToUse,num_models,max_images,inference_timeout,MAX_SEED,thePrompt,preSetPrompt,negPreSetPrompt
-#from all_models import models
+from all_models import models
 import asyncio
 from externalmod import gr_Interface_load, save_image, randomize_seed
 import os
 from threading import RLock
 lock = RLock()
 HF_TOKEN = os.getenv("HF_TOKEN")
-#default_models = static_models[:num_models]
+default_models = models[:num_models]
 def get_current_time():
     from datetime import datetime
     now = datetime.now()
@@ -27,7 +27,9 @@ def load_fn(models,HF_TOKEN):
             models_load.update({model: m})
 
 async def infer(model_str, prompt, nprompt="", height=0, width=0, steps=0, cfg=0, seed=-1, timeout=inference_timeout):
-    print(f"{prompt}")
+    print(f"{prompt}\n")
+    print(f"{model_str}\n")
+    print(f"{timeout}\n")
     kwargs = {}
     if height > 0: kwargs["height"] = height
     if width > 0: kwargs["width"] = width
@@ -39,7 +41,8 @@ async def infer(model_str, prompt, nprompt="", height=0, width=0, steps=0, cfg=0
         theSeed = seed
     kwargs["seed"] = theSeed
     task = asyncio.create_task(asyncio.to_thread(models_load[model_str].fn, prompt=prompt, negative_prompt=nprompt, **kwargs, token=HF_TOKEN))
-    await asyncio.sleep(0)
+    print(f"await")
+    await asyncio.sleep(20)
     try:
         result = await asyncio.wait_for(task, timeout=timeout)
     except asyncio.TimeoutError as e:
@@ -55,17 +58,18 @@ async def infer(model_str, prompt, nprompt="", height=0, width=0, steps=0, cfg=0
         result = None
         raise Exception() from e
     if task.done() and result is not None and not isinstance(result, tuple):
+        print(f"{result}")
         with lock:
             png_path =  model_str.replace("/", "_") + " - " + get_current_time() + "_" + str(theSeed) + ".png"
             image = save_image(result, png_path, model_str, prompt, nprompt, height, width, steps, cfg, theSeed)
         return image
     return None
 
-def gen_fn(model_str, prompt, nprompt="", height=0, width=0, steps=0, cfg=0, seed=-1):
+def gen_fn(model_str, prompt, nprompt="", height=0, width=0, steps=0, cfg=0, seed=-1, inference_timeout2=120):
     try:
         loop = asyncio.new_event_loop()
         result = loop.run_until_complete(infer(model_str, prompt, nprompt,
-                                         height, width, steps, cfg, seed, inference_timeout))
+                                         height, width, steps, cfg, seed, inference_timeout2))
     except (Exception, asyncio.CancelledError) as e:
         print(e)
         print(f"gen_fn: Task aborted: {model_str}")