Update app.py

app.py

@@ -1,85 +1,115 @@
-import gradio as gr
-from random import randint
-from all_models import models
-
-def load_fn(models):
-    global models_load
-    models_load = {}
-    
-    for model in models:
-        if model not in models_load.keys():
-            try:
-                m = gr.load(f'models/{model}')
-            except Exception as error:
-                m = gr.Interface(lambda txt: None, ['text'], ['image'])
-            models_load.update({model: m})
-
-
-load_fn(models)
-
-
-num_models = 32
-default_models = models[:num_models]
-
-
-def extend_choices(choices):
-    return choices + (num_models - len(choices)) * ['NA']
-
-
-def update_imgbox(choices):
-    choices_plus = extend_choices(choices)
-    return [gr.Image(None, label = m, visible = (m != 'NA')) for m in choices_plus]
-
-    
-def gen_fn(model_str, prompt):
-    if model_str == 'NA':
-        return None
-    noise = str(randint(0, 99999999999))
-    return models_load[model_str](f'{prompt} {noise}')
-
-
-with gr.Blocks() as demo:
-    with gr.Tab('Multiple models'): 
-        with gr.Accordion('Model selection'):
-            model_choice = gr.CheckboxGroup(models, label = f'Choose up to {num_models} different models', value = default_models, multiselect = True, max_choices = num_models, interactive = True, filterable = False)
-
-
-        txt_input = gr.Textbox(label = 'Prompt text')
-        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)
-           
-        with gr.Row():
-            output = [gr.Image(label = m) for m in default_models]
-            current_models = [gr.Textbox(m, visible = False) for m in default_models]
-            
-            model_choice.change(update_imgbox, model_choice, output)
-            model_choice.change(extend_choices, model_choice, current_models)
-
-        for m, o in zip(current_models, output):
-            gen_event = gen_button.click(gen_fn, [m, txt_input], o, queue=False)
-                    
-            
-    with gr.Tab('Single model'):
-        model_choice2 = gr.Dropdown(models, label = 'Choose model', value = models[0], filterable = False)
-        txt_input2 = gr.Textbox(label = 'Prompt text')
-        
-        max_images = 16
-        num_images = gr.Slider(1, max_images, value = max_images, step = 1, label = 'Number of images')
-        
-        gen_button2 = gr.Button('Generate')
-        stop_button2 = gr.Button('Stop', variant = 'secondary', interactive = False)
-        gen_button2.click(lambda s: gr.update(interactive = True), None, stop_button2)
-        
-        with gr.Row():
-            output2 = [gr.Image(label = '') for _ in range(max_images)]
-
-        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)
-            gen_event2 = gen_button2.click(lambda i, n, m, t: gen_fn(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])
-
-    
-demo.queue(concurrency_count = 36)                        
+import gradio as gr
+from random import randint
+from all_models import models
+from PIL import Image
+import io
+
+def load_fn(models):
+    global models_load
+    models_load = {}
+    
+    for model in models:
+        if model not in models_load.keys():
+            try:
+                m = gr.load(f'models/{model}')
+            except Exception as error:
+                m = gr.Interface(lambda txt: None, ['text'], ['image'])
+            models_load.update({model: m})
+
+load_fn(models)
+
+num_models = 32
+default_models = models[:num_models]
+
+def extend_choices(choices):
+    return choices + (num_models - len(choices)) * ['NA']
+
+def update_imgbox(choices, height, width):
+    choices_plus = extend_choices(choices)
+    return [gr.Image(None, label=m, visible=(m != 'NA'), height=height, width=width) for m in choices_plus]
+
+def resize_image(image, height, width):
+    """Resize image to specified dimensions"""
+    if image is None:
+        return None
+    try:
+        # Convert Gradio image to PIL Image
+        pil_image = Image.fromarray(image)
+        # Resize while maintaining aspect ratio if one dimension is None
+        resized_image = pil_image.resize((width, height), Image.Resampling.LANCZOS)
+        return resized_image
+    except Exception as e:
+        return image  # Return original if resize fails
+
+def gen_fn(model_str, prompt, height, width):
+    if model_str == 'NA':
+        return None
+    noise = str(randint(0, 99999999999))
+    # Generate image
+    generated = models_load[model_str](f'{prompt} {noise}')
+    # Resize to specified dimensions
+    return resize_image(generated, height, width)
+
+with gr.Blocks() as demo:
+    with gr.Tab('Multiple models'): 
+        with gr.Accordion('Model selection'):
+            model_choice = gr.CheckboxGroup(models, label=f'Choose up to {num_models} different models', value=default_models, multiselect=True, max_choices=num_models, interactive=True, filterable=False)
+            
+        with gr.Row():
+            img_height = gr.Slider(100, 1000, value=300, step=10, label='Image Height (px)')
+            img_width = gr.Slider(100, 1000, value=300, step=10, label='Image Width (px)')
+
+        txt_input = gr.Textbox(label='Prompt text')
+        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)
+           
+        with gr.Row():
+            output = [gr.Image(label=m, height=300, width=300) for m in default_models]
+            current_models = [gr.Textbox(m, visible=False) for m in default_models]
+            
+            model_choice.change(update_imgbox, [model_choice, img_height, img_width], output)
+            model_choice.change(extend_choices, model_choice, current_models)
+            img_height.change(update_imgbox, [model_choice, img_height, img_width], output)
+            img_width.change(update_imgbox, [model_choice, img_height, img_width], output)
+
+        for m, o in zip(current_models, output):
+            gen_event = gen_button.click(
+                gen_fn, 
+                [m, txt_input, img_height, img_width], 
+                o, 
+                queue=False
+            )
+                    
+    with gr.Tab('Single model'):
+        model_choice2 = gr.Dropdown(models, label='Choose model', value=models[0], filterable=False)
+        txt_input2 = gr.Textbox(label='Prompt text')
+        
+        with gr.Row():
+            img_height2 = gr.Slider(100, 1000, value=300, step=10, label='Image Height (px)')
+            img_width2 = gr.Slider(100, 1000, value=300, step=10, label='Image Width (px)')
+        
+        max_images = 16
+        num_images = gr.Slider(1, max_images, value=max_images, step=1, label='Number of images')
+        
+        gen_button2 = gr.Button('Generate')
+        stop_button2 = gr.Button('Stop', variant='secondary', interactive=False)
+        gen_button2.click(lambda s: gr.update(interactive=True), None, stop_button2)
+        
+        with gr.Row():
+            output2 = [gr.Image(label='', height=300, width=300) for _ in range(max_images)]
+
+        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)
+            img_height2.change(lambda h: gr.update(height=h), img_height2, o)
+            img_width2.change(lambda w: gr.update(width=w), img_width2, o)
+            gen_event2 = gen_button2.click(
+                lambda i, n, m, t, h, w: gen_fn(m, t, h, w) if (i < n) else None, 
+                [img_i, num_images, model_choice2, txt_input2, img_height2, img_width2], 
+                o
+            )
+            stop_button2.click(lambda s: gr.update(interactive=False), None, stop_button2, cancels=[gen_event2])
+
+demo.queue(concurrency_count=36)                        
 demo.launch()