Update app.py

app.py

@@ -52,15 +52,18 @@ custom_head = f"""
         <link rel="manifest" href="file=_res/assets/favicons/site.webmanifest">
 """
 
-
-theme = gr.themes.Soft(
-    primary_hue="orange",
-    radius_size="sm",
-    neutral_hue=gr.themes.Color(c100="#a6adc8", c200="#9399b2", c300="#7f849c", c400="#6c7086", c50="#cdd6f4", c500="#585b70", c600="#45475a", c700="#313244", c800="#1e1e2e", c900="#181825", c950="#11111b"),
-)
-
+# MARK: GET PREV. IMAGES
+def get_gallery_images(dirpath):
+    gallery_images = [dirpath + "/" + s for s in os.listdir(dirpath) if os.path.isfile(os.path.join(dirpath, s))]
+    gallery_images.sort(key=lambda s: os.path.getmtime(s), reverse=True)
+    return gallery_images
 title = "Bilder Builder"
 
+def get_gallery_images(dirpath):
+    gallery_images = [dirpath + "/" + s for s in os.listdir(dirpath) if os.path.isfile(os.path.join(dirpath, s))]
+    gallery_images.sort(key=lambda s: os.path.getmtime(s), reverse=True)
+    return gallery_images
+
 
 # MARK: READ EXIF
 def read_exif(image_path):
@@ -140,13 +143,12 @@ 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):
+def process(Prompt, used_model, image_width, image_height, image_ratio, image_seed, randomize_seed):
     if Prompt == "":
-        gr.Info("Kein Prompt angegeben, es wird ein zufälliger Prompt generiert.", duration=8)
+        gr.Info("Kein Prompt angegeben, es wird ein zufälliger Prompt generiert.", duration=12)
         Prompt = groq_enhance_process("random prompt")
 
+    image_ratio = "9:16" if image_ratio == "" else image_ratio
     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
 
@@ -155,19 +157,37 @@ def process(Prompt, image_width, image_height, image_seed, randomize_seed):
     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=flux&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": Prompt, "__type__": "update"}, {"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)
+    # Retry-Logik mit requests und Retry
+    session = Session()
+    retries = Retry(total=3, status_forcelist=[429, 500, 502, 503, 504], backoff_factor=0.3, respect_retry_after_header=True)  # Max 3 Versuche  # Codes, die wiederholt werden  # Exponential Backoff  # Retry-Header beachten
+    adapter = HTTPAdapter(max_retries=retries)
+    session.mount("https://", adapter)
+    session.mount("http://", adapter)
+
+    API_OLD_REQUEST_URL = f"{API_OLD}{urllib.parse.quote(Prompt)}?model=flux&width={image_width}&height={image_height}&nologo=true&enhance=false&nofeed=true&seed={used_seed}"
+    API_V1_REQUEST_URL = f"{API_V1_IMAGE}?prompt={urllib.parse.quote(Prompt)}&size={urllib.parse.quote(image_ratio)}&seed={used_seed}&model={used_model.lower()}"
+    REQUEST_URL = API_V1_REQUEST_URL if used_model.lower() != "flux-api-old" else API_OLD_REQUEST_URL
+    print(REQUEST_URL)
+    try:
+        response = session.get(REQUEST_URL, timeout=60)
+        if response.status_code == 200:
+            print("Imagine API Request solved")
+            print("Save image to: " + file_path)
+            img = PILImage.open(BytesIO(response.content))
+            img.save(file_path, "PNG")
+
+            # 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": Prompt, "__type__": "update"}, {"value": file_path, "__type__": "update"}, {"value": None, "visible": False, "__type__": "update"}, {"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:
+            print("Imagine API Request ERROR")
+            raise gr.Error("Imagine API Request fehlgeschlagen 💥!", duration=15)
+    except requests.exceptions.Timeout:
+        raise gr.Error("Zeitüberschreitung beim API-Aufruf", duration=15)
+    except requests.exceptions.RequestException as e:
+        raise gr.Error(f"Fehler beim API-Aufruf: {e}", duration=15)
 
 
 # MARK: Gradio BLOCKS UI
@@ -187,8 +207,10 @@ with gr.Blocks(theme=theme, head=custom_head, css=custom_css, js=custom_js, titl
                 with gr.Row(elem_classes="image_size_selctor_wrapper"):
                     with gr.Column(scale=1):
                         with gr.Row():
-                            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)
+                            select_model = gr.Dropdown(choices=["FLUX", "FLUX-API-OLD", "FLUX-Realism", "FLUX-Pixel", "ANY-DARK", "Stable-Diffusion-XL-Lightning", "Stable-Diffusion-XL-Base"], value="FLUX", label="Model", elem_id="select_model", elem_classes="select-model")
+                            # with gr.Row():
+                            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, visible=False)
+                            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, visible=False)
                         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)
@@ -200,19 +222,17 @@ with gr.Blocks(theme=theme, head=custom_head, css=custom_css, js=custom_js, titl
                 with gr.Row():
                     with gr.Column(scale=1):
                         with gr.Row():
-                            output_image = gr.Image(show_label=False, min_width=320, scale=3, elem_id="output_image", elem_classes="output-image", type="filepath")
+                            output_image = gr.Image(show_label=False, min_width=320, scale=3, elem_id="output_image", elem_classes="output-image", type="filepath", format="webp")
+                            # gallery = gr.Gallery(label="Bisher erstellte Bilder", show_label=True, value=get_gallery_images(IMAGE_DIR), elem_id="gallery", columns=[4], object_fit="cover", height="auto", interactive=False, format="webp")
                             with gr.Column(scale=1, visible=False, elem_classes="image-info-wrapper") as image_info_wrapper:
-                                # with gr.Group(visible=False) as image_info_wrapper:
                                 with gr.Group():
                                     image_informations = gr.Markdown("""## Bildinformationen""", visible=True)
-                                # textbox_your_prompt = gr.Textbox(label="Dein Prmopt", lines=2, max_lines=4, interactive=False, show_copy_button=True)
                                 with gr.Row(elem_classes="img-size-wrapper"):
                                     image_info_tb_width = gr.Textbox(label="Breite", lines=1, max_lines=1, interactive=False, show_copy_button=True, elem_classes="image-info-tb-width")
                                     image_info_tb_height = gr.Textbox(label="Höhe", lines=1, max_lines=1, interactive=False, show_copy_button=True, elem_classes="image-info-tb-height")
                                 with gr.Row(elem_classes="img-seed-wrapper"):
                                     image_info_tb_seed = gr.Textbox(label="Seed", lines=1, max_lines=1, interactive=False, show_copy_button=True, elem_classes="image-info-tb-seed")
                                     image_info_tb_prompt = gr.Textbox("Bild Prompt", lines=4, max_lines=8, interactive=False, elem_classes="hide-progress", show_copy_button=True, visible=False)
-                                # image_info_tb_prompt = gr.Textbox("Bild Prompt", lines=4, max_lines=8, interactive=False, show_copy_button=True, visible=True)
                                 image_download_button = gr.DownloadButton("Bild herunterladen", value=None, elem_classes="download-button", variant="primary", visible=False)
 
                 output_url = gr.Textbox(label="Output URL", show_label=True, interactive=False, visible=False)
@@ -225,7 +245,6 @@ with gr.Blocks(theme=theme, head=custom_head, css=custom_css, js=custom_js, titl
         def switch_image_ratio_buttons(ratio_value):
             ratio_value = ratio_value.split(":")
             ratio_value_new = f"{int(ratio_value[1])}:{int(ratio_value[0])}"
-            print("ratio_value_new:", ratio_value_new)
 
             if int(ratio_value[1]) > int(ratio_value[0]):
                 # Querformat
@@ -235,38 +254,45 @@ with gr.Blocks(theme=theme, head=custom_head, css=custom_css, js=custom_js, titl
                 # Hochformat
                 new_choises = ["9:16", "3:4", "2:3", "1:1"]
                 new_label = "Hochformat"
+            elif int(ratio_value[1]) == int(ratio_value[0]):
+                new_choises = image_ratio_buttons.choices
+                new_label = "Quadratisch"
 
             return {"choices": new_choises, "value": ratio_value_new, "label": new_label, "__type__": "update"}
 
-        def calculate_ratio_values(image_ratio_buttons, image_width, image_height):
+        def calculate_ratio_values(image_ratio_buttons):
             ratio_value = image_ratio_buttons.split(":")
             if int(ratio_value[0]) > int(ratio_value[1]):
                 a = 2048
                 b = int(a * int(ratio_value[1]) / int(ratio_value[0]))
                 new_width = a
                 new_height = b
+                new_label = "Querformat"
             elif int(ratio_value[0]) < int(ratio_value[1]):
                 b = 2048
                 a = int(b * int(ratio_value[0]) / int(ratio_value[1]))
                 new_width = a
                 new_height = b
-            else:
+                new_label = "Hochformat"
+            elif int(ratio_value[0]) == int(ratio_value[1]):
                 new_width = 2048
                 new_height = 2048
+                new_label = "Quadratisch"
 
-            return new_width, new_height
+            return {"label": new_label, "__type__": "update"}, 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")
+        switch_width_height.click(fn=switch_image_size_values, inputs=[image_width, image_height], outputs=[image_width, image_height], show_progress="hidden", show_api=False)
+        switch_width_height.click(fn=switch_image_ratio_buttons, inputs=[image_ratio_buttons], outputs=[image_ratio_buttons], show_progress="hidden", show_api=False)
 
-        image_ratio_buttons.input(fn=calculate_ratio_values, inputs=[image_ratio_buttons, image_width, image_height], outputs=[image_width, image_height], show_progress="hidden")
+        image_ratio_buttons.input(fn=calculate_ratio_values, inputs=[image_ratio_buttons], outputs=[image_ratio_buttons, image_width, image_height], show_progress="hidden", show_api=False)
 
-        run_button.click(fn=lambda: {"interactive": False, "__type__": "update"}, outputs=[run_button]).then(fn=process, inputs=[text_prompt, image_width, image_height, image_seed, randomize_seed], outputs=[text_prompt, 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]).then(
-            fn=lambda: {"interactive": True, "__type__": "update"}, outputs=[run_button]
-        )
+        run_button.click(fn=lambda: ({"interactive": False, "__type__": "update"}, {"interactive": False, "__type__": "update"}, {"interactive": False, "__type__": "update"}), outputs=[run_button, enhance_prompt_button, random_prompt_button], show_api=False).then(fn=clear_components, outputs=[output_image], show_api=False).then(
+            fn=process, inputs=[text_prompt, select_model, image_width, image_height, image_ratio_buttons, image_seed, randomize_seed, gallery], outputs=[text_prompt, output_image, output_url, 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, gallery]
+        ).then(fn=lambda: ({"interactive": True, "__type__": "update"}, {"interactive": True, "__type__": "update"}, {"interactive": True, "__type__": "update"}), outputs=[run_button, enhance_prompt_button, random_prompt_button], show_api=False)
 
-        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])
+        randomize_seed.input(lambda x: {"interactive": False if x == True else True, "__type__": "update"}, inputs=[randomize_seed], outputs=[image_seed], show_api=False)
 
+        enhance_prompt_button.click(fn=groq_enhance_process, inputs=[text_prompt], outputs=[text_prompt], show_api=False)
+        random_prompt_button.click(fn=groq_enhance_process, inputs=None, outputs=[text_prompt], show_api=False)
 # MARK: Gradio LAUNCH
 demo.launch()