Update app.py

app.py

@@ -3,25 +3,22 @@ from gradio_client import Client, handle_file
 import re
 import threading
 import time
-import tempfile
 import requests
 import os
 import uuid
+import tempfile
 
 # ---------------------------
-# Setup Storage (persistent)
+# CONFIG
 # ---------------------------
 IMAGE_DIR = "data/images"
 os.makedirs(IMAGE_DIR, exist_ok=True)
 
-# ---------------------------
-# Clients
-# ---------------------------
 client_main = Client("selfit-camera/Omni-Image-Editor")
-client_process = Client("Galaxydude2/aaaaa")
+client_process = Client("SLSLK/n8")
 
 # ---------------------------
-# Session State
+# SESSION
 # ---------------------------
 if "gallery" not in st.session_state:
     st.session_state.gallery = []
@@ -33,7 +30,7 @@ if "page" not in st.session_state:
     st.session_state.page = "🖼️ Generieren"
 
 # ---------------------------
-# Helpers
+# HELPERS
 # ---------------------------
 def extract_url(html):
     match = re.search(r"src='([^']+)'", html)
@@ -44,37 +41,41 @@ def save_image_from_url(url):
     try:
         r = requests.get(url)
         if r.status_code != 200:
-            st.error(f"❌ Download Error: HTTP {r.status_code}")
+            st.error(f"❌ Download Error HTTP {r.status_code}")
             return None
 
-        filename = f"{uuid.uuid4()}.png"
-        path = os.path.join(IMAGE_DIR, filename)
-
+        path = os.path.join(IMAGE_DIR, f"{uuid.uuid4()}.png")
         with open(path, "wb") as f:
             f.write(r.content)
 
         return path
-
     except Exception as e:
         st.error(f"❌ Save Error: {e}")
         return None
 
 
-def prepare_image(input_image):
-    # ❌ block gradio tmp
-    if isinstance(input_image, str) and "/tmp/gradio" in input_image:
-        st.error("❌ Invalid temp path from gradio")
-        return None
+def upload_to_imgbb(file):
+    try:
+        api_key = os.getenv("IMGBB_API_KEY")
+        if not api_key:
+            st.error("❌ Missing IMGBB_API_KEY")
+            return None
 
-    # 🌐 URL → speichern
-    if isinstance(input_image, str) and input_image.startswith("http"):
-        local_path = save_image_from_url(input_image)
-        if not local_path:
+        res = requests.post(
+            "https://api.imgbb.com/1/upload",
+            data={"key": api_key},
+            files={"image": file.getvalue()}
+        )
+
+        if res.status_code == 200:
+            return res.json()["data"]["url"]
+        else:
+            st.error(f"❌ Upload Error HTTP {res.status_code}")
             return None
-        return handle_file(local_path)
 
-    # 📁 local file
-    return handle_file(input_image)
+    except Exception as e:
+        st.error(f"❌ Upload Exception: {e}")
+        return None
 
 
 # ---------------------------
@@ -95,12 +96,21 @@ def generate_image(prompt):
 
 def edit_image(input_image, prompt):
     try:
-        image_input = prepare_image(input_image)
-        if not image_input:
+        if hasattr(input_image, "getvalue"):
+            image_url = upload_to_imgbb(input_image)
+
+        elif isinstance(input_image, str) and not input_image.startswith("http"):
+            with open(input_image, "rb") as f:
+                image_url = upload_to_imgbb(f)
+
+        else:
+            image_url = input_image
+
+        if not image_url:
             return None
 
         result = client_main.predict(
-            input_image=image_input,
+            input_image=image_url,
             prompt=prompt,
             api_name="/edit_image_interface"
         )
@@ -114,9 +124,13 @@ def edit_image(input_image, prompt):
 
 def process_image(input_image):
     try:
-        image_input = prepare_image(input_image)
-        if not image_input:
-            return None
+        if hasattr(input_image, "getvalue"):
+            tmp = tempfile.NamedTemporaryFile(delete=False, suffix=".png")
+            tmp.write(input_image.getvalue())
+            tmp.close()
+            image_input = handle_file(tmp.name)
+        else:
+            image_input = handle_file(input_image)
 
         result = client_process.predict(
             image=image_input,
@@ -131,27 +145,40 @@ def process_image(input_image):
 
 
 # ---------------------------
-# Async Helper
+# ASYNC
 # ---------------------------
-def run_with_progress(func, *args):
-    result_container = {"result": None, "done": False}
+def run_async(func, *args):
+    result = {"done": False, "data": None}
 
     def task():
-        result_container["result"] = func(*args)
-        result_container["done"] = True
+        result["data"] = func(*args)
+        result["done"] = True
 
     threading.Thread(target=task).start()
-    return result_container
+    return result
+
+
+def show_progress(job):
+    progress_bar = st.progress(0)
+
+    percent = 0
+    while not job["done"]:
+        percent += 5
+        if percent > 95:
+            percent = 95
+
+        progress_bar.progress(percent)
+        time.sleep(0.2)
+
+    progress_bar.progress(100)
 
 
 # ---------------------------
 # UI
 # ---------------------------
-st.set_page_config(page_title="Omni Image Studio", layout="wide")
-
+st.set_page_config(layout="wide")
 st.title("🎨 Omni Image Studio")
 
-# Navigation
 page = st.radio(
     "Navigation",
     ["🖼️ Generieren", "✨ Bearbeiten", "🧪 Analyse", "📚 Galerie"],
@@ -165,153 +192,99 @@ st.session_state.page = page
 # GENERATE
 # ---------------------------
 if page == "🖼️ Generieren":
-    prompt = st.text_area("Bildbeschreibung")
+    prompt = st.text_area("Prompt")
 
     if st.button("Generieren"):
-        if prompt:
-            status = st.empty()
-            progress = st.progress(0)
-
-            job = run_with_progress(generate_image, prompt)
+        job = run_async(generate_image, prompt)
+        show_progress(job)
 
-            percent = 0
-            while not job["done"]:
-                percent = min(percent + 5, 95)
-                progress.progress(percent)
-                status.text(f"Generiere Bild... {percent}%")
-                time.sleep(0.2)
+        url = job["data"]
+        if url:
+            path = save_image_from_url(url)
+            st.image(path)
 
-            progress.progress(100)
-            status.text("Fertig ✅")
-
-            url = job["result"]
-
-            if url:
-                local_path = save_image_from_url(url)
-
-                st.image(local_path)
-                st.session_state.gallery.append({
-                    "path": local_path,
-                    "prompt": prompt
-                })
+            st.session_state.gallery.append({
+                "path": path,
+                "prompt": prompt
+            })
 
 # ---------------------------
 # EDIT
 # ---------------------------
 elif page == "✨ Bearbeiten":
-    st.subheader("✨ Bild bearbeiten")
-
     if st.session_state.selected_image:
         st.image(st.session_state.selected_image)
         input_image = st.session_state.selected_image
     else:
-        uploaded = st.file_uploader("Bild hochladen")
-        input_image = uploaded
+        input_image = st.file_uploader("Upload Image")
 
-    edit_prompt = st.text_area("Bearbeitung")
+    prompt = st.text_area("Edit Prompt")
 
     if st.button("Bearbeiten"):
-        if input_image and edit_prompt:
-            status = st.empty()
-            progress = st.progress(0)
-
-            job = run_with_progress(edit_image, input_image, edit_prompt)
+        job = run_async(edit_image, input_image, prompt)
+        show_progress(job)
 
-            percent = 0
-            while not job["done"]:
-                percent = min(percent + 5, 95)
-                progress.progress(percent)
-                status.text(f"Bearbeite Bild... {percent}%")
-                time.sleep(0.2)
+        url = job["data"]
+        if url:
+            path = save_image_from_url(url)
+            st.image(path)
 
-            progress.progress(100)
-            status.text("Fertig ✅")
-
-            url = job["result"]
-
-            if url:
-                local_path = save_image_from_url(url)
-                st.image(local_path)
-
-                st.session_state.gallery.append({
-                    "path": local_path,
-                    "prompt": edit_prompt
-                })
+            st.session_state.gallery.append({
+                "path": path,
+                "prompt": prompt
+            })
 
 # ---------------------------
 # ANALYSE
 # ---------------------------
 elif page == "🧪 Analyse":
-    st.subheader("🧪 Bild Analyse")
-
     if st.session_state.selected_image:
         st.image(st.session_state.selected_image)
         input_image = st.session_state.selected_image
     else:
-        uploaded = st.file_uploader("Bild auswählen")
-        input_image = uploaded
+        input_image = st.file_uploader("Upload Image")
 
     if st.button("Analysieren"):
-        if input_image:
-            status = st.empty()
-            progress = st.progress(0)
-
-            job = run_with_progress(process_image, input_image)
+        job = run_async(process_image, input_image)
+        show_progress(job)
 
-            percent = 0
-            while not job["done"]:
-                percent = min(percent + 5, 95)
-                progress.progress(percent)
-                status.text(f"Analysiere Bild... {percent}%")
-                time.sleep(0.2)
+        result = job["data"]
 
-            progress.progress(100)
-            status.text("Fertig ✅")
+        if isinstance(result, str) and result.startswith("http"):
+            path = save_image_from_url(result)
+            st.image(path)
 
-            result = job["result"]
-
-            if isinstance(result, str) and result.startswith("http"):
-                local_path = save_image_from_url(result)
-                st.image(local_path)
-
-                st.session_state.gallery.append({
-                    "path": local_path,
-                    "prompt": "Analyse"
-                })
-            else:
-                st.write(result)
+            st.session_state.gallery.append({
+                "path": path,
+                "prompt": "Analyse"
+            })
+        else:
+            st.write(result)
 
 # ---------------------------
 # GALLERY
 # ---------------------------
 elif page == "📚 Galerie":
-    st.subheader("📸 Galerie")
-
     if not st.session_state.gallery:
-        st.info("Keine Bilder vorhanden")
+        st.info("Keine Bilder")
     else:
         cols = st.columns(3)
 
         for i, item in enumerate(st.session_state.gallery):
-            path = item["path"]
-            prompt = item["prompt"]
-
             with cols[i % 3]:
-                st.image(path, caption=prompt)
+                st.image(item["path"], caption=item["prompt"])
 
-                col1, col2 = st.columns(2)
+                c1, c2 = st.columns(2)
 
-                with col1:
-                    if st.button("✏️ Edit", key=f"edit_{i}"):
-                        st.session_state.selected_image = path
-                        st.session_state.page = "✨ Bearbeiten"
-                        st.rerun()
+                if c1.button("✏️ Edit", key=f"e{i}"):
+                    st.session_state.selected_image = item["path"]
+                    st.session_state.page = "✨ Bearbeiten"
+                    st.rerun()
 
-                with col2:
-                    if st.button("🧪 Analyse", key=f"proc_{i}"):
-                        st.session_state.selected_image = path
-                        st.session_state.page = "🧪 Analyse"
-                        st.rerun()
+                if c2.button("🧪 Analyse", key=f"a{i}"):
+                    st.session_state.selected_image = item["path"]
+                    st.session_state.page = "🧪 Analyse"
+                    st.rerun()
 
-        if st.button("🗑️ Galerie leeren"):
+        if st.button("🗑️ Clear"):
             st.session_state.gallery = []