Update app.py

app.py

@@ -7,6 +7,7 @@ from exif import Image
 from PIL import Image as PILImage, ExifTags as PILExifTags
 import colorsys
 
+# MARK: INIT
 MAX_SEED = 9999
 MAX_IMAGE_SIZE = 2048
 
@@ -35,6 +36,7 @@ theme = gr.themes.Soft(
 )
 
 
+# MARK: READ EXIF
 def read_exif(image_path):
     with open(image_path, "rb") as src:
         img = Image(src)
@@ -53,6 +55,7 @@ def read_image_exfi_data(image_path):
     return None, image_path, img_exif_comment
 
 
+# MARK: GROQ PROMPT ENHANCE
 def groq_enhance_process(Prompt=""):
     client = Groq(api_key=GROQ_APIKEY_PROMPTENHANCE)
     Prompt = "random prompt" if Prompt == "" else Prompt
@@ -84,6 +87,7 @@ def image_get_size(image_path):
     return width, height
 
 
+# MARK: DOMINANT COLOR
 def image_get_dominant_color(image_path):
     img = PILImage.open(image_path)
     img = img.convert("RGB")
@@ -111,54 +115,37 @@ def image_get_dominant_color(image_path):
     return dominant_color_rgb
 
 
+# MARK: PROCESS IMAGE
 def process(Prompt, image_width, image_height, image_seed, randomize_seed):
+
+    if Prompt == "":
+        gr.Info("Kein Prompt angegeben, es wird ein zufälliger Prompt generiert.", duration=15)
+        Prompt = groq_enhance_process("random prompt")
+
     used_seed = random.randint(0, MAX_SEED) if image_seed == 0 or randomize_seed else image_seed
-    if "test image" in Prompt.lower() or Prompt == "":
-        print("Prompt:", Prompt)
-        TESTIMAGES = os.path.join(RES, "testimages")
-        random_num = random.randint(1, 10)
-        match = re.match(r"test image (\d+)", Prompt)
-        if match and 1 <= int(match.group(1)) <= 10:
-            random_num = match.group(1)
-            print("\n\nrandom: ", random_num)
-
-        Prompt = "test image " + str(random_num) if Prompt == "" else Prompt
-        filename = str(random_num) + ".png"
-        print("Filename:", filename)
-        file_path = os.path.join(TESTIMAGES, filename)
+    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")
+    filename_prompt = re.sub(r"[^\w\s-]", "", Prompt).strip().replace(" ", "_")
+    filename = timestamp + "_" + filename_prompt[:100] + ".png"
+    file_path = os.path.join(IMAGE_DIR, filename)
+
+    encode_prompt = urllib.parse.quote(Prompt)
+    request_url = f"https://image.pollinations.ai/prompt/{encode_prompt}?model={used_model}&width={image_width}&height={image_height}&nologo=true&enhance=false&nofeed=true&seed={used_seed}"
+    print(request_url)
+    response = requests.get(request_url)
+    if response.status_code == 200:
+        with open(file_path, "wb") as f:
+            f.write(response.content)
 
         img_exif_comment = read_exif(file_path)
         img_dominant_color = image_get_dominant_color(file_path)
         img_width, img_height = image_get_size(file_path)
-        print("ImageSize: " + str(img_width) + "x" + str(img_height) + "px")
-
-        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, used_seed)
-    else:
-        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")
-        filename_prompt = re.sub(r"[^\w\s-]", "", Prompt).strip().replace(" ", "_")
-        filename = timestamp + "_" + filename_prompt[:100] + ".png"
-        # file_path = os.path.join(filename_dir, filename)
-        file_path = os.path.join(IMAGE_DIR, filename)
-
-        encode_prompt = urllib.parse.quote(Prompt)
-        request_url = f"https://image.pollinations.ai/prompt/{encode_prompt}?model={used_model}&width={image_width}&height={image_height}&nologo=true&enhance=false&nofeed=true&seed={used_seed}"
-        print(request_url)
-        response = requests.get(request_url)
-        if response.status_code == 200:
-            with open(file_path, "wb") as f:
-                f.write(response.content)
-
-            img_exif_comment = read_exif(file_path)
-            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, used_seed)
 
 
+# MARK: Gradio BLOCKS UI
 with gr.Blocks(theme=theme, css=custom_css, js=custom_js, title=title) as demo:
     with gr.Tab("Image Generator"):
         with gr.Row():
@@ -209,7 +196,7 @@ with gr.Blocks(theme=theme, css=custom_css, js=custom_js, title=title) as demo:
 
         def switch_image_ratio_buttons(ratio_value):
             ratio_value = ratio_value.split(":")
-            ratio_value_new = f"{ratio_value[1]}:{ratio_value[0]}"
+            ratio_value_new = f"{int(ratio_value[1])}:{int(ratio_value[0])}"
 
             if ratio_value[1] > ratio_value[0]:
                 # Querformat
@@ -222,18 +209,33 @@ with gr.Blocks(theme=theme, css=custom_css, js=custom_js, title=title) as demo:
 
             return {"choices": new_choises, "value": ratio_value_new, "label": new_label, "__type__": "update"}
 
-            return image_ratio_buttons
+        def calculate_ratio_values(image_ratio_buttons, image_width, image_height):
+            ratio_value = image_ratio_buttons.split(":")
+            if int(ratio_value[0]) > int(ratio_value[1]):
+                a = 1024
+                b = int(a * int(ratio_value[1]) / int(ratio_value[0]))
+                new_width = a
+                new_height = b
+            elif int(ratio_value[0]) < int(ratio_value[1]):
+                b = 1024
+                a = int(b * int(ratio_value[0]) / int(ratio_value[1]))
+                new_width = a
+                new_height = b
+            else:
+                new_width = 1024
+                new_height = 1024
+
+            return new_width, new_height
 
         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)
+        image_ratio_buttons.input(fn=calculate_ratio_values, inputs=[image_ratio_buttons, image_width, image_height], outputs=[image_width, image_height], show_progress="hidden")
 
         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])
 
-
+# MARK: Gradio LAUNCH
 demo.launch()