Update app.py

app.py

@@ -34,7 +34,6 @@ def load_fn(models):
 
 load_fn(models)
 
-
 num_models = 12
 max_images = 12
 inference_timeout = 400
@@ -57,21 +56,18 @@ def random_choices():
     return random.choices(models, k=num_models)
 
 
-# https://huggingface.co/docs/api-inference/detailed_parameters
-# https://huggingface.co/docs/huggingface_hub/package_reference/inference_client
 async def infer(model_str, prompt, nprompt="", height=0, width=0, steps=0, cfg=0, seed=-1, timeout=inference_timeout):
     kwargs = {}
     if height > 0: kwargs["height"] = height
     if width > 0: kwargs["width"] = width
     if steps > 0: kwargs["num_inference_steps"] = steps
     if cfg > 0: cfg = kwargs["guidance_scale"] = cfg
-        
+
     if seed == -1:
         theSeed = randomize_seed()
-        kwargs["seed"] = theSeed
     else: 
-        kwargs["seed"] = seed
         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)
@@ -90,15 +86,11 @@ async def infer(model_str, prompt, nprompt="", height=0, width=0, steps=0, cfg=0
         raise Exception() from e
     if task.done() and result is not None and not isinstance(result, tuple):
         with lock:
-            # png_path = "img.png"
-            # png_path = get_current_time() + "_" + model_str.replace("/", "_") + ".png"
-            # png_path =  model_str.replace("/", "_") + " - " +  prompt + " - " + get_current_time() + ".png"
             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, seed)
         return image
     return None
 
-
 def gen_fn(model_str, prompt, nprompt="", height=0, width=0, steps=0, cfg=0, seed=-1):
     try:
         loop = asyncio.new_event_loop()
@@ -120,49 +112,11 @@ def add_gallery(image, model_str, gallery):
         if image is not None: gallery.insert(0, (image, model_str))
     return gallery
 
-
-CSS="""
-.gradio-container { max-width: 1200px; margin: 0 auto; !important; }
-.output { width=112px; height=112px; max_width=112px; max_height=112px; !important; }
-.gallery { min_width=512px; min_height=512px; max_height=512px; !important; }
-.guide { text-align: center; !important; }
-"""
-
-js_func = """
-function refresh() {
-    const url = new URL(window.location);
-
-    if (url.searchParams.get('__theme') !== 'dark') {
-        url.searchParams.set('__theme', 'dark');
-        window.location.href = url.href;
-    }
-}
-"""
-
-js_AutoSave="""
-
-        console.log("Yo");
-        
-        var img1 = document.querySelector("div#component-355 .svelte-1kpcxni button.svelte-1kpcxni .svelte-1kpcxni img"),
-        observer = new MutationObserver((changes) => {
-            changes.forEach(change => {
-                    if(change.attributeName.includes('src')){
-                        console.log(img1.src);
-                        document.querySelector("div#component-355 .svelte-1kpcxni .svelte-sr71km a.svelte-1s8vnbx button").click();
-                    }
-            });
-        });
-        observer.observe(img1, {attributes : true});
-        
-"""
-
 js="""
     <script>console.log("BOOOOOOOOOOOOOOOOBS");</script>
 """
 
 with gr.Blocks(fill_width=True, head=js) as demo:
-# with gr.Blocks(fill_width=True, css=CSS) as demo:
-# with gr.Blocks(theme='JohnSmith9982/small_and_pretty', fill_width=True, css=CSS, js=js_func) as demo:
     gr.HTML("")  
     with gr.Tab(str(num_models) + ' Models'):
         with gr.Column(scale=2):
@@ -182,8 +136,6 @@ with gr.Blocks(fill_width=True, head=js) as demo:
             with gr.Row():
                 gen_button = gr.Button(f'Generate up to {int(num_models)} images', variant='primary', scale=3)
                 random_button = gr.Button(f'Randomize Models', variant='secondary', scale=1)
-                #stop_button = gr.Button('Stop', variant='stop', interactive=False, scale=1)
-                #gen_button.click(lambda: gr.update(interactive=True), None, stop_button)
             gr.Markdown("", elem_classes="guide")
 
         with gr.Column(scale=1):
@@ -202,9 +154,8 @@ with gr.Blocks(fill_width=True, head=js) as demo:
         for m, o in zip(current_models, output):
             gen_event = gr.on(triggers=[gen_button.click, txt_input.submit], fn=gen_fn,
                               inputs=[m, txt_input, neg_input, height, width, steps, cfg, seed], outputs=[o],
-                              concurrency_limit=None, queue=False) # Be sure to delete ", queue=False" when activating the stop button
+                              concurrency_limit=None, queue=False)
             o.change(add_gallery, [o, m, gallery], [gallery])
-            #stop_button.click(lambda: gr.update(interactive=False), None, stop_button, cancels=[gen_event])
 
         with gr.Column(scale=4):
             with gr.Accordion('Model selection'):
@@ -217,8 +168,6 @@ with gr.Blocks(fill_width=True, head=js) as demo:
         with gr.Column(scale=2):
             model_choice2 = gr.Dropdown(models, label='Choose model', value=models[0])
             with gr.Group():
-                # global preSetPrompt
-                # global negPreSetPrompt
                 txt_input2 = gr.Textbox(label='Your prompt:', value = preSetPrompt, lines=3, autofocus=1)
                 neg_input2 = gr.Textbox(label='Negative prompt:', value=negPreSetPrompt, lines=1)
                 with gr.Accordion("Advanced", open=False, visible=True):
@@ -234,8 +183,6 @@ with gr.Blocks(fill_width=True, head=js) as demo:
             num_images = gr.Slider(1, max_images, value=max_images/2, step=1, label='Number of images')
             with gr.Row():
                 gen_button2 = gr.Button('Let the machine halucinate', variant='primary', scale=2)
-                #stop_button2 = gr.Button('Stop', variant='stop', interactive=False, scale=1)
-                #gen_button2.click(lambda: gr.update(interactive=True), None, stop_button2)
 
         with gr.Column(scale=1):
             with gr.Group():
@@ -256,13 +203,9 @@ with gr.Blocks(fill_width=True, head=js) as demo:
                                fn=lambda i, n, m, t1, t2, n1, n2, n3, n4, n5: gen_fn(m, t1, t2, n1, n2, n3, n4, n5) if (i < n) else None,
                                inputs=[img_i, num_images, model_choice2, txt_input2, neg_input2,
                                        height2, width2, steps2, cfg2, seed2], outputs=[o],
-                                       concurrency_limit=None, queue=False)  # Be sure to delete ", queue=False" when activating the stop button
+                                       concurrency_limit=None, queue=False)
             o.change(add_gallery, [o, model_choice2, gallery2], [gallery2])
-            #stop_button2.click(lambda: gr.update(interactive=False), None, stop_button2, cancels=[gen_event2])
     
-    # gr.Markdown(js_AutoSave)
     gr.Markdown("")
 
-# demo.queue(default_concurrency_limit=200, max_size=200)
 demo.launch(show_api=False, max_threads=400)
-# demo.launch(show_api=False, max_threads=400, js=js_AutoSave)