Revert "Batch count functionality + stop btn (#15)"

This reverts commit 2af6f8ecf76dbdea6c320bfd1b37b582368355a0.

app.py

@@ -7,11 +7,9 @@ import base64
 import os
 from io import BytesIO
 import PIL
-from PIL import Image
 from PIL.ExifTags import TAGS
 import html
 import re
-from threading import Thread
 
 
 class Prodia:
@@ -161,8 +159,8 @@ for model_name in model_list:
     name_without_ext = remove_id_and_ext(model_name)
     model_names[name_without_ext] = model_name
 
-def txt2img(prompt, negative_prompt, model, steps, sampler, cfg_scale, width, height, seed, batch_count, gallery):
-    data = {
+def txt2img(prompt, negative_prompt, model, steps, sampler, cfg_scale, width, height, seed, gallery):
+    result = prodia_client.generate({
         "prompt": prompt,
         "negative_prompt": negative_prompt,
         "model": model,
@@ -172,35 +170,17 @@ def txt2img(prompt, negative_prompt, model, steps, sampler, cfg_scale, width, he
         "width": width,
         "height": height,
         "seed": seed
-    }
+    })
 
-    total_images = []
-    threads = []
-
-    def generate_one_image():
-        result = prodia_client.generate(data)
-        job = prodia_client.wait(result)
-        total_images.append(job['imageUrl'])
-
-    for x in range(batch_count):
-        t = Thread(target=generate_one_image)
-        threads.append(t)
-        t.start()
-
-    for t in threads:
-        t.join()
+    job = prodia_client.wait(result)
 
     new_images_list = [img['name'] for img in gallery]
+    new_images_list.insert(0, job["imageUrl"])
 
-    for image in total_images:
-        new_images_list.insert(0, image)
+    return {image_output: job["imageUrl"], gallery_obj: new_images_list}
 
-    return {image_output: total_images, gallery_obj: new_images_list}
-
-
-def img2img(input_image, denoising, prompt, negative_prompt, model, steps, sampler, cfg_scale, width, height, seed,
-            batch_count, gallery):
-    data = {
+def img2img(input_image, denoising, prompt, negative_prompt, model, steps, sampler, cfg_scale, width, height, seed, gallery):
+    result = prodia_client.transform({
         "imageData": image_to_base64(input_image),
         "denoising_strength": denoising,
         "prompt": prompt,
@@ -212,30 +192,21 @@ def img2img(input_image, denoising, prompt, negative_prompt, model, steps, sampl
         "width": width,
         "height": height,
         "seed": seed
-    }
-
-    total_images = []
-    threads = []
+    })
 
-    def generate_one_image():
-        result = prodia_client.transform(data)
-        job = prodia_client.wait(result)
-        total_images.append(job['imageUrl'])
-
-    for x in range(batch_count):
-        t = Thread(target=generate_one_image)
-        threads.append(t)
-        t.start()
-
-    for t in threads:
-        t.join()
+    job = prodia_client.wait(result)
 
     new_images_list = [img['name'] for img in gallery]
+    new_images_list.insert(0, job["imageUrl"])
+
+    return {i2i_image_output: job["imageUrl"], gallery_obj: new_images_list}
 
-    for image in total_images:
-        new_images_list.insert(0, image)
 
-    return {i2i_image_output: total_images, gallery_obj: new_images_list}
+css = """
+#generate {
+    height: 100%;
+}
+"""
 
 samplers = [
     "Euler",
@@ -259,7 +230,7 @@ samplers = [
     "PLMS",
 ]
 
-with gr.Blocks() as demo:
+with gr.Blocks(css=css) as demo:
     with gr.Row():
         with gr.Column(scale=6):
             model = gr.Dropdown(interactive=True,value="absolutereality_v181.safetensors [3d9d4d2b]", show_label=True, label="Stable Diffusion Checkpoint", choices=prodia_client.list_models())
@@ -274,9 +245,8 @@ with gr.Blocks() as demo:
                 with gr.Column(scale=6, min_width=600):
                     prompt = gr.Textbox("space warrior, beautiful, female, ultrarealistic, soft lighting, 8k", placeholder="Prompt", show_label=False, lines=3)
                     negative_prompt = gr.Textbox(placeholder="Negative Prompt", show_label=False, lines=3, value="3d, cartoon, anime, (deformed eyes, nose, ears, nose), bad anatomy, ugly")
-                with gr.Row():
-                    text_button = gr.Button("Generate", variant='primary')
-                    stop_btn = gr.Button("Cancel", elem_id="cancel")
+                with gr.Column():
+                    text_button = gr.Button("Generate", variant='primary', elem_id="generate")
                     
             with gr.Row():
                 with gr.Column(scale=3):
@@ -315,14 +285,14 @@ with gr.Blocks() as demo:
                             
                             with gr.Column(scale=1):
                                 batch_size = gr.Slider(label="Batch Size", maximum=1, value=1)
-                                batch_count = gr.Slider(label="Batch Count", minimum=1, maximum=4, value=1, step=1)
+                                batch_count = gr.Slider(label="Batch Count", maximum=1, value=1)
     
                         cfg_scale = gr.Slider(label="CFG Scale", minimum=1, maximum=20, value=7, step=1)
                         seed = gr.Number(label="Seed", value=-1)
     
                     
                 with gr.Column(scale=2):
-                    image_output = gr.Gallery(value=["https://images.prodia.xyz/8ede1a7c-c0ee-4ded-987d-6ffed35fc477.png"], preview=True)
+                    image_output = gr.Image(value="https://images.prodia.xyz/8ede1a7c-c0ee-4ded-987d-6ffed35fc477.png")
     
        
         with gr.Tab("img2img", id='i2i'):
@@ -330,9 +300,8 @@ with gr.Blocks() as demo:
                 with gr.Column(scale=6, min_width=600):
                     i2i_prompt = gr.Textbox("space warrior, beautiful, female, ultrarealistic, soft lighting, 8k", placeholder="Prompt", show_label=False, lines=3)
                     i2i_negative_prompt = gr.Textbox(placeholder="Negative Prompt", show_label=False, lines=3, value="3d, cartoon, anime, (deformed eyes, nose, ears, nose), bad anatomy, ugly")
-                with gr.Row():
+                with gr.Column():
                     i2i_text_button = gr.Button("Generate", variant='primary', elem_id="generate")
-                    i2i_stop_btn = gr.Button("Cancel", elem_id="cancel")
                     
             with gr.Row():
                 with gr.Column(scale=3):
@@ -353,7 +322,7 @@ with gr.Blocks() as demo:
                             
                             with gr.Column(scale=1):
                                 i2i_batch_size = gr.Slider(label="Batch Size", maximum=1, value=1)
-                                i2i_batch_count = gr.Slider(label="Batch Count", minimum=1, maximum=100, value=1, step=1)
+                                i2i_batch_count = gr.Slider(label="Batch Count", maximum=1, value=1)
     
                         i2i_cfg_scale = gr.Slider(label="CFG Scale", minimum=1, maximum=20, value=7, step=1)
                         i2i_denoising = gr.Slider(label="Denoising Strength", minimum=0, maximum=1, value=0.7, step=0.1)
@@ -361,7 +330,7 @@ with gr.Blocks() as demo:
     
                     
                 with gr.Column(scale=2):
-                    i2i_image_output = gr.Gallery(value=["https://images.prodia.xyz/8ede1a7c-c0ee-4ded-987d-6ffed35fc477.png"], preview=True)
+                    i2i_image_output = gr.Image(value="https://images.prodia.xyz/8ede1a7c-c0ee-4ded-987d-6ffed35fc477.png")
     
 
         with gr.Tab("PNG Info"):
@@ -400,15 +369,12 @@ with gr.Blocks() as demo:
         with gr.Tab("Gallery"):
             gallery_obj = gr.Gallery(height=500, columns=4)
 
-        t2i_event = text_button.click(txt2img, inputs=[prompt, negative_prompt, model, steps, sampler, cfg_scale, width, height, seed, batch_count, gallery_obj], outputs=[image_output, gallery_obj])
-        stop_btn.click(fn=None, outputs=None, cancels=[t2i_event])
-        
+        text_button.click(txt2img, inputs=[prompt, negative_prompt, model, steps, sampler, cfg_scale, width, height, seed, gallery_obj], outputs=[image_output, gallery_obj])
         image_input.upload(get_exif_data, inputs=[image_input], outputs=exif_output)
         send_to_txt2img_btn.click(send_to_txt2img, inputs=[image_input], outputs=[tabs, prompt, negative_prompt, steps, seed,
                                                                                           model, sampler, width, height, cfg_scale])
+        i2i_text_button.click(img2img, inputs=[i2i_image_input, i2i_denoising, i2i_prompt, i2i_negative_prompt, model, i2i_steps, i2i_sampler, i2i_cfg_scale, i2i_width, i2i_height, i2i_seed, gallery_obj], outputs=[i2i_image_output, gallery_obj])
         
-        i2i_event = i2i_text_button.click(img2img, inputs=[i2i_image_input, i2i_denoising, i2i_prompt, i2i_negative_prompt, model, i2i_steps, i2i_sampler, i2i_cfg_scale, i2i_width, i2i_height, i2i_seed, i2i_batch_count, gallery_obj], outputs=[i2i_image_output, gallery_obj])
-        i2i_stop_btn.click(fn=None, outputs=None, cancels=[i2i_event])
 
 demo.queue(concurrency_count=32)
 demo.launch()