Update app.py

app.py

@@ -4,6 +4,12 @@ from all_models import models
 
 from externalmod import gr_Interface_load
 
+import asyncio
+import os
+from threading import RLock
+lock = RLock()
+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.
+
 def load_fn(models):
     global models_load
     models_load = {}
@@ -11,9 +17,10 @@ def load_fn(models):
     for model in models:
         if model not in models_load.keys():
             try:
-                m = gr_Interface_load(f'models/{model}')
+                m = gr_Interface_load(f'models/{model}', hf_token=HF_TOKEN)
             except Exception as error:
-                m = gr.Interface(lambda txt: None, ['text'], ['image'])
+                print(error)
+                m = gr.Interface(lambda: None, ['text'], ['image'])
             models_load.update({model: m})
 
 
@@ -22,6 +29,7 @@ load_fn(models)
 
 num_models = 1
 default_models = models[:num_models]
+inference_timeout = 600
 
 
 
@@ -61,8 +69,8 @@ with gr.Blocks() as demo:
         num_imagesone = gr.Slider(1, max_imagesone, value = max_imagesone, step = 1, label = 'Nobody gets to see this label so I can put here whatever I want!', visible = False)
         
         gen_button = gr.Button('Generate')
-        stop_button = gr.Button('Stop', variant = 'secondary', interactive = False)
-        gen_button.click(lambda s: gr.update(interactive = True), None, stop_button)
+        #stop_button = gr.Button('Stop', variant = 'secondary', interactive = False)
+        gen_button.click(lambda s: gr.update(interactive = True), None)
         
         with gr.Row():
             output = [gr.Image(label = '') for _ in range(max_imagesone)]
@@ -70,8 +78,8 @@ with gr.Blocks() as demo:
         for i, o in enumerate(output):
             img_in = gr.Number(i, visible = False)
             num_imagesone.change(lambda i, n: gr.update(visible = (i < n)), [img_in, num_imagesone], o, show_progress = False)
-            gen_event = gen_button.click(lambda i, n, m, t: gen_fn(m, t) if (i < n) else None, [img_in, num_imagesone, model_choice, txt_input], o)
-            stop_button.click(lambda s: gr.update(interactive = False), None, stop_button, cancels = [gen_event])
+            gen_event = gen_button.click(lambda i, n, m, t: gen_fn(m, t) if (i < n) else None, [img_in, num_imagesone, model_choice, txt_input], o, concurrency_limit=None, queue=False)
+            #stop_button.click(lambda s: gr.update(interactive = False), None, stop_button, cancels = [gen_event])
         with gr.Row():
             gr.HTML(
     """
@@ -88,8 +96,8 @@ with gr.Blocks() as demo:
         num_images = gr.Slider(1, max_images, value = max_images, step = 1, label = 'Number of images (if you want less than 6 decrease them slowly until they match the boxes below)')
         
         gen_button2 = gr.Button('Generate up to 6 images in up to 3 minutes total')
-        stop_button2 = gr.Button('Stop', variant = 'secondary', interactive = False)
-        gen_button2.click(lambda s: gr.update(interactive = True), None, stop_button2)
+        #stop_button2 = gr.Button('Stop', variant = 'secondary', interactive = False)
+        gen_button2.click(lambda s: gr.update(interactive = True), None)
         gr.HTML(
         """
             <div style="text-align: center; max-width: 1200px; margin: 0 auto;">
@@ -108,8 +116,8 @@ with gr.Blocks() as demo:
         for i, o in enumerate(output2):
             img_i = gr.Number(i, visible = False)
             num_images.change(lambda i, n: gr.update(visible = (i < n)), [img_i, num_images], o, show_progress = False)
-            gen_event2 = gen_button2.click(lambda i, n, m, t: gen_fnsix(m, t) if (i < n) else None, [img_i, num_images, model_choice2, txt_input2], o)
-            stop_button2.click(lambda s: gr.update(interactive = False), None, stop_button2, cancels = [gen_event2])
+            gen_event2 = gen_button2.click(lambda i, n, m, t: gen_fnsix(m, t) if (i < n) else None, [img_i, num_images, model_choice2, txt_input2], o, concurrency_limit=None, queue=False)
+            #stop_button2.click(lambda s: gr.update(interactive = False), None, stop_button2, cancels = [gen_event2])
         with gr.Row():
             gr.HTML(
     """
@@ -119,5 +127,5 @@ with gr.Blocks() as demo:
     """
 )
 
-demo.queue()                        
-demo.launch()
+demo.queue(default_concurrency_limit=200, max_size=200)
+demo.launch(show_api=False, max_threads=400)