Update app.py

app.py

@@ -1,8 +1,6 @@
 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
@@ -28,27 +26,18 @@ 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):
+def gen_fn(model_str, prompt, height, width, use_ratio):
     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)
+    
+    # Wenn 16:10 Verhältnis gewünscht, Höhe anpassen
+    if use_ratio:
+        height = int(width * 10 / 16)  # 16:10 Verhältnis
+    
+    # Größe in den Prompt einfügen
+    size_prompt = f"{prompt}, {width}x{height} resolution {noise}"
+    return models_load[model_str](size_prompt)
 
 with gr.Blocks() as demo:
     with gr.Tab('Multiple models'): 
@@ -56,8 +45,21 @@ with gr.Blocks() as demo:
             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, 1200, value=1200, step=10, label='Image Height (px)')
-            img_width = gr.Slider(100, 1920, value=1920, step=10, label='Image Width (px)')
+            img_width = gr.Slider(100, 1200, value=1024, step=2, label='Image Width (px)')
+            img_height = gr.Slider(100, 1200, value=640, step=2, label='Image Height (px)')
+            use_ratio = gr.Checkbox(label='Use 16:10 ratio', value=True)
+        
+        # Höhe aktualisieren wenn Ratio aktiviert
+        img_width.change(
+            lambda w, r: gr.update(value=int(w * 10 / 16)) if r else gr.update(),
+            [img_width, use_ratio],
+            img_height
+        )
+        use_ratio.change(
+            lambda w, r: gr.update(value=int(w * 10 / 16)) if r else gr.update(),
+            [img_width, use_ratio],
+            img_height
+        )
 
         txt_input = gr.Textbox(label='Prompt text')
         gen_button = gr.Button('Generate')
@@ -65,7 +67,7 @@ with gr.Blocks() as demo:
         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]
+            output = [gr.Image(label=m, height=640, width=1024) for m in default_models]  # Default 16:10
             current_models = [gr.Textbox(m, visible=False) for m in default_models]
             
             model_choice.change(update_imgbox, [model_choice, img_height, img_width], output)
@@ -76,7 +78,7 @@ with gr.Blocks() as demo:
         for m, o in zip(current_models, output):
             gen_event = gen_button.click(
                 gen_fn, 
-                [m, txt_input, img_height, img_width], 
+                [m, txt_input, img_height, img_width, use_ratio], 
                 o, 
                 queue=False
             )
@@ -86,8 +88,21 @@ with gr.Blocks() as demo:
         txt_input2 = gr.Textbox(label='Prompt text')
         
         with gr.Row():
-            img_height2 = gr.Slider(100, 1200, value=1200, step=10, label='Image Height (px)')
-            img_width2 = gr.Slider(100, 1920, value=1920, step=10, label='Image Width (px)')
+            img_width2 = gr.Slider(100, 1200, value=1024, step=2, label='Image Width (px)')
+            img_height2 = gr.Slider(100, 1200, value=640, step=2, label='Image Height (px)')
+            use_ratio2 = gr.Checkbox(label='Use 16:10 ratio', value=True)
+        
+        # Höhe aktualisieren wenn Ratio aktiviert
+        img_width2.change(
+            lambda w, r: gr.update(value=int(w * 10 / 16)) if r else gr.update(),
+            [img_width2, use_ratio2],
+            img_height2
+        )
+        use_ratio2.change(
+            lambda w, r: gr.update(value=int(w * 10 / 16)) if r else gr.update(),
+            [img_width2, use_ratio2],
+            img_height2
+        )
         
         max_images = 16
         num_images = gr.Slider(1, max_images, value=max_images, step=1, label='Number of images')
@@ -97,7 +112,7 @@ with gr.Blocks() as demo:
         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)]
+            output2 = [gr.Image(label='', height=640, width=1024) for _ in range(max_images)]
 
         for i, o in enumerate(output2):
             img_i = gr.Number(i, visible=False)
@@ -105,8 +120,8 @@ with gr.Blocks() as demo:
             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], 
+                lambda i, n, m, t, h, w, r: gen_fn(m, t, h, w, r) if (i < n) else None, 
+                [img_i, num_images, model_choice2, txt_input2, img_height2, img_width2, use_ratio2], 
                 o
             )
             stop_button2.click(lambda s: gr.update(interactive=False), None, stop_button2, cancels=[gen_event2])