Update app.py

app.py

@@ -12,7 +12,6 @@ MAX_IMAGE_SIZE = 2048
 
 GROQ_APIKEY_PROMPTENHANCE = os.environ["GROQ_APIKEY_PROMPTENHANCE"]
 
-
 # delete cache folder if exist and create new
 CACHE_DIR = os.path.join(os.path.dirname(__file__), "cache")
 IMAGE_DIR = os.path.join(CACHE_DIR, "images")
@@ -65,7 +64,7 @@ def groq_enhance_process(Prompt=""):
         model="llama-3.1-70b-versatile",
         messages=[SYSTEMPROMPT, {"role": "user", "content": Prompt}],
         temperature=0.8,
-        max_tokens=8000,
+        max_tokens=1024,
         top_p=0.9,
         stream=False,
         stop=None,
@@ -135,9 +134,8 @@ def process(Prompt, image_width, image_height, image_seed, randomize_seed):
 
         time.sleep(1)
 
-        return ({"value": file_path, "__type__": "update"}, {"value": None, "visible": False, "__type__": "update"}, img_exif_comment, {"visible": True, "__type__": "update"}, {"value": Prompt, "visible": True, "__type__": "update"}, img_width, img_height, used_seed, {"value": file_path, "visible": True, "__type__": "update"}, img_dominant_color)
+        return ({"value": file_path, "__type__": "update"}, {"value": None, "visible": False, "__type__": "update"}, img_exif_comment, {"visible": True, "__type__": "update"}, {"value": Prompt, "visible": True, "__type__": "update"}, img_width, img_height, used_seed, {"value": file_path, "visible": True, "__type__": "update"}, img_dominant_color, used_seed)
     else:
-        used_seed = random.randint(0, MAX_SEED) if image_seed == 0 or randomize_seed else image_seed
         used_model = "turbo" if int(image_width) > 1024 or int(image_height) > 1024 else "flux"  # turbo, flux
 
         timestamp = datetime.now().strftime("%Y-%m-%d-%H-%M-%S")
@@ -158,7 +156,7 @@ def process(Prompt, image_width, image_height, image_seed, randomize_seed):
             img_dominant_color = image_get_dominant_color(file_path)
             img_width, img_height = image_get_size(file_path)
 
-            return ({"value": file_path, "__type__": "update"}, {"value": None, "visible": False, "__type__": "update"}, img_exif_comment, {"visible": True, "__type__": "update"}, {"value": Prompt, "visible": True, "__type__": "update"}, img_width, img_height, used_seed, {"value": file_path, "visible": True, "__type__": "update"}, img_dominant_color)
+            return ({"value": file_path, "__type__": "update"}, {"value": None, "visible": False, "__type__": "update"}, img_exif_comment, {"visible": True, "__type__": "update"}, {"value": Prompt, "visible": True, "__type__": "update"}, img_width, img_height, used_seed, {"value": file_path, "visible": True, "__type__": "update"}, img_dominant_color, used_seed)
 
 
 with gr.Blocks(theme=theme, css=custom_css, js=custom_js, title=title) as demo:
@@ -175,10 +173,8 @@ with gr.Blocks(theme=theme, css=custom_css, js=custom_js, title=title) as demo:
                 with gr.Row(elem_classes="image_size_selctor_wrapper"):
                     with gr.Column(scale=1):
                         with gr.Row():
-                            # image_width = gr.Textbox(label="Breite", minimum=256, maximum=MAX_IMAGE_SIZE, value=1024, step=128, elem_id="image_width_selector", elem_classes="image-width-selector", scale=1)
-                            image_width = gr.Textbox(label="Breite", value=1024, lines=1, max_lines=1, elem_id="image_width_selector", elem_classes="image-width-selector", scale=1)
-                            # image_height = gr.Number(label="Höhe", minimum=256, maximum=MAX_IMAGE_SIZE, value=683, step=128, elem_id="image_height_selector", elem_classes="image-height-selector", scale=1)
-                            image_height = gr.Textbox(label="Höhe", value=683, lines=1, max_lines=1, elem_id="image_height_selector", elem_classes="image-height-selector", scale=1)
+                            image_width = gr.Number(label="Breite", minimum=256, maximum=MAX_IMAGE_SIZE, value=1024, step=128, elem_id="image_width_selector", elem_classes="image-width-selector", scale=1)
+                            image_height = gr.Number(label="Höhe", minimum=256, maximum=MAX_IMAGE_SIZE, value=683, step=128, elem_id="image_height_selector", elem_classes="image-height-selector", scale=1)
                         with gr.Row():
                             image_ratio_buttons = gr.Radio(["16:9", "4:3", "3:2", "1:1"], value="3:2", label="Querformat", show_label=True, info="Die gängigsten Seitenverhältnissen.", interactive=True, elem_id="image_ratio_buttons", elem_classes="image-ratio-buttons", container=True, scale=2)
                             switch_width_height = gr.Button("", size="sm", elem_id="switch_width_height", elem_classes="switch-ratio-btn", variant="primary", scale=1)
@@ -207,17 +203,37 @@ with gr.Blocks(theme=theme, css=custom_css, js=custom_js, title=title) as demo:
                 output_url = gr.Textbox(label="Output URL", show_label=True, interactive=False, visible=False)
                 outpu_image_comment = gr.Json(visible=False)
                 output_dominant_image_color = gr.Textbox(show_label=False, elem_id="dominant_image_color", visible=True, elem_classes="output-dominant-image-color")
-   
 
         def switch_image_size_values(image_width, image_height):
             return image_height, image_width
 
-        # switch_width_height.click(fn=switch_image_size_values, inputs=[image_width, image_height], outputs=[image_width, image_height])
+        def switch_image_ratio_buttons(ratio_value):
+            ratio_value = ratio_value.split(":")
+            ratio_value_new = f"{ratio_value[1]}:{ratio_value[0]}"
+
+            if ratio_value[1] > ratio_value[0]:
+                # Querformat
+                new_choises = ["16:9", "4:3", "3:2", "1:1"]
+                new_label = "Querformat"
+            elif ratio_value[1] < ratio_value[0]:
+                # Hochformat
+                new_choises = ["9:16", "3:4", "2:3", "1:1"]
+                new_label = "Hochformat"
+
+            return {"choices": new_choises, "value": ratio_value_new, "label": new_label, "__type__": "update"}
+
+            return image_ratio_buttons
 
-        run_button.click(fn=process, inputs=[text_prompt, image_width, image_height, image_seed, randomize_seed], outputs=[output_image, output_url, outpu_image_comment, image_informations, image_info_tb_prompt, image_info_tb_width, image_info_tb_height, image_info_tb_seed, image_download_button, output_dominant_image_color])
+        switch_width_height.click(fn=switch_image_size_values, inputs=[image_width, image_height], outputs=[image_width, image_height], show_progress="hidden")
+
+        switch_width_height.click(fn=switch_image_ratio_buttons, inputs=[image_ratio_buttons], outputs=[image_ratio_buttons], show_progress="hidden")
+
+        # image_ratio_buttons = gr.Radio(["16:9", "4:3", "3:2", "1:1"], value="3:2", label="Querformat", show_label=True, info="Die gängigsten Seitenverhältnissen.", interactive=True, elem_id="image_ratio_buttons", elem_classes="image-ratio-buttons", container=True, scale=2)
+
+        run_button.click(fn=process, inputs=[text_prompt, image_width, image_height, image_seed, randomize_seed], outputs=[output_image, output_url, outpu_image_comment, image_informations, image_info_tb_prompt, image_info_tb_width, image_info_tb_height, image_info_tb_seed, image_download_button, output_dominant_image_color, image_seed])
 
         enhance_prompt_button.click(fn=groq_enhance_process, inputs=[text_prompt], outputs=[text_prompt])
         random_prompt_button.click(fn=groq_enhance_process, inputs=None, outputs=[text_prompt])
-        
+
 
 demo.launch()