Upload streamlit_app.py

streamlit_app.py

@@ -1,49 +1,47 @@
 # streamlit_app.py — Fit Studio AI (Fashion & Apparel) v0.8 UI
 # 9:16 dikey kadraj — Still Image (VTO) → (optional) Runway Video
-# DEMO: aynı klasörde input.jpg, tryon.jpg, fitstudio_video.mp4 varsa otomatik önizleme
-# DÜZELTME: HTML/CSS YOK. Sadece Streamlit bileşenleriyle
-#            “Input | Look | Video” HER ZAMAN aynı satırda, aynı genişlikte.
+# NOT: HTML/CSS yok. Yalnızca Streamlit bileşenleri. Tüm kutular aynı satırda ve aynı boyutta.
+# Demo: aynı klasörde input.jpg, tryon.jpg, fitstudio_video.mp4 varsa otomatik önizleme.
 
-import os, io, zipfile, requests, streamlit as st
+import os, io, base64, zipfile, requests, streamlit as st
 from pathlib import Path
 from PIL import Image
-import base64
 
-# ================= Env & API (robust) =================
+# ============== Env & API =================
 def _env(k): 
     return (os.getenv(k) or "").strip().strip("'\"")
 
 API_BASE = (
-    _env("FITSTUDIO_API")
-    or _env("AI_LIGHTBOX_API")
-    or _env("LUXFIT_API")
-).rstrip("/") if (_env("FITSTUDIO_API") or _env("AI_LIGHTBOX_API") or _env("LUXFIT_API")) else ""
+    _env("FITSTUDIO_API") or _env("AI_LIGHTBOX_API") or _env("LUXFIT_API")
+)
+if API_BASE:
+    API_BASE = API_BASE.rstrip("/")
 
 HF_TOKEN = (_env("FITSTUDIO_TOKEN") or _env("AI_LIGHTBOX_TOKEN") or _env("LUXFIT_TOKEN"))
+HEADERS = {"Authorization": f"Bearer {HF_TOKEN}"} if HF_TOKEN else {}
 
 if not API_BASE:
     st.error("API_BASE bulunamadı. Settings > Variables: FITSTUDIO_API (veya AI_LIGHTBOX_API / LUXFIT_API) tanımlayın.")
     st.stop()
 
-HEADERS = {"Authorization": f"Bearer {HF_TOKEN}"} if HF_TOKEN else {}
-
-# Tek tip 9:16 kadraj (tüm görüntü/video buraya padlenir)
-PREVIEW_H = int(os.getenv("PREVIEW_H", "640"))      # 640 px
-PREVIEW_W = int(round(PREVIEW_H * 9 / 16))          # 360 px
+# Sabit 9:16 önizleme hedefi (tüm kutular aynı)
+PREVIEW_H = int(os.getenv("PREVIEW_H", "640"))   # 640 px
+PREVIEW_W = int(round(PREVIEW_H * 9 / 16))       # 360 px
 PREVIEW_BG = (255, 255, 255)
 
-# ================= Session State =================
 st.set_page_config(page_title="Fit Studio AI", layout="wide", page_icon="🧵")
+
+# ============== State =====================
 for k, v in {"results": None, "job_counter": 0, "duration": "6"}.items():
     st.session_state.setdefault(k, v)
 
-# ================= Helpers =================
+# ============== Helpers ===================
 def _needs_auth(url: str) -> bool:
     return (url.startswith(API_BASE) or url.startswith("outputs/"))
 
 @st.cache_data(ttl=300, show_spinner=False)
 def fetch_bytes(url_or_path: str | None):
-    """URL, outputs/ yolu veya bulunduğumuz klasörden dosyayı okur."""
+    """URL, outputs/ veya mevcut klasörden oku."""
     if not url_or_path:
         return None
     try:
@@ -74,8 +72,8 @@ def infer_ext(data: bytes) -> str:
         return ".jpg"
 
 @st.cache_data(ttl=300, show_spinner=False)
-def vertical_preview_9x16(img_bytes: bytes, out_w: int = PREVIEW_W, out_h: int = PREVIEW_H, bg_rgb=PREVIEW_BG) -> bytes:
-    """Görüntüyü 9:16 canvasa pad’ler (crop yok), çıktı PNG bytes."""
+def pad_to_9x16(img_bytes: bytes, out_w: int = PREVIEW_W, out_h: int = PREVIEW_H, bg_rgb=PREVIEW_BG) -> bytes:
+    """Görüntüyü 9:16 canvas’a (out_w×out_h) pad’ler, crop yok."""
     im = Image.open(io.BytesIO(img_bytes)).convert("RGB")
     w, h = im.size
     scale = min(out_w / w, out_h / h)
@@ -86,13 +84,6 @@ def vertical_preview_9x16(img_bytes: bytes, out_w: int = PREVIEW_W, out_h: int =
     canvas.paste(im_resized, off)
     buf = io.BytesIO(); canvas.save(buf, format="PNG"); return buf.getvalue()
 
-def make_zip(named_bytes: list[tuple[str, bytes]]) -> bytes:
-    buf = io.BytesIO()
-    with zipfile.ZipFile(buf, "w", compression=zipfile.ZIP_DEFLATED) as z:
-        for fname, b in named_bytes:
-            if b: z.writestr(fname, b)
-    buf.seek(0); return buf.read()
-
 def backend_ok() -> bool:
     try:
         r = requests.get(f"{API_BASE}/health", headers=HEADERS if HF_TOKEN else None, timeout=10)
@@ -106,7 +97,7 @@ def post_image_edit(data: dict, files_payload):
     r.raise_for_status(); return r.json()
 
 def post_chain(data: dict, files_payload):
-    payload = {**data, "to_video": "false"}  # video ayrı akış
+    payload = {**data, "to_video": "false"}  # video ayrı
     r = requests.post(f"{API_BASE}/v1/tryon/chain", data=payload, files=files_payload or None,
                       headers=HEADERS if HF_TOKEN else None, timeout=600)
     r.raise_for_status(); return r.json()
@@ -116,40 +107,19 @@ def post_video(data: dict):
                       headers=HEADERS if HF_TOKEN else None, timeout=600)
     r.raise_for_status(); return r.json()
 
-# Ortak “kart” renderer’ları (SADECE STREAMLIT)
-def render_image_card(col, title: str, img_bytes: bytes | None, dl_name: str | None = None):
-    col.markdown(f"**{title}**")
-    if img_bytes is None:
-        # Boş kart (tam genişlikte sabit kadraj)
-        col.image(Image.new("RGB",(PREVIEW_W, PREVIEW_H), PREVIEW_BG), use_container_width=True)
-        col.caption("—")
-        return None
-    pv = vertical_preview_9x16(img_bytes, PREVIEW_W, PREVIEW_H, PREVIEW_BG)
-    col.image(pv, use_container_width=True)
-    sz = image_size_from_bytes(img_bytes)
-    if sz: col.caption(f"Gerçek: {sz[0]}×{sz[1]} px")
-    if dl_name:
-        ext = infer_ext(img_bytes)
-        mime = "image/jpeg" if ext in [".jpg",".jpeg"] else ("image/png" if ext==".png" else "image/webp")
-        col.download_button("İndir (tam kalite)", data=img_bytes, file_name=f"{dl_name}{ext}", mime=mime)
-
-def render_video_card(col, title: str, video_bytes: bytes | None):
-    col.markdown(f"**{title}**")
-    if not video_bytes:
-        col.image(Image.new("RGB",(PREVIEW_W, PREVIEW_H), PREVIEW_BG), use_container_width=True)
-        col.caption("—")
-        return None
-    # st.video: HTML kullanmadan, sütun genişliğini doldurur (9:16 video ise hizalama tam olur)
-    col.video(video_bytes, format="video/mp4", start_time=0)
-    col.download_button("Video indir (MP4)", data=video_bytes, file_name="fitstudio_video.mp4", mime="video/mp4")
-    return video_bytes
+def make_zip(named_bytes: list[tuple[str, bytes]]) -> bytes:
+    buf = io.BytesIO()
+    with zipfile.ZipFile(buf, "w", compression=zipfile.ZIP_DEFLATED) as z:
+        for fname, b in named_bytes:
+            if b: z.writestr(fname, b)
+    buf.seek(0); return buf.read()
 
-# ================= Header & Controls =================
+# ============== Header & Controls =================
 st.title("🧵 Fit Studio AI")
 st.caption("Fashion & Apparel — Dikey 9:16 Still Image (VTO) → (opsiyonel) Runway Video")
 
 ok = backend_ok()
-c0, c1, c2, c3, c4, c5 = st.columns([1.0, 1.6, 1.6, 1.1, 1.4, 1.4])
+c0, c1, c2, c3, c4, c5 = st.columns([1.0, 1.4, 1.4, 1.0, 1.6, 1.6])
 with c0:
     category = st.selectbox("Kategori", ["general","underwear"], index=0, key="category")
 with c1:
@@ -165,36 +135,67 @@ with c5:
 
 prompt_box = st.text_area("Özel prompt (boş bırak → varsayılan)", value="", height=90, key="custom_prompt")
 
-bA, bB = st.columns([1.0, 1.0])
-with bA:
+info_col, run_col = st.columns([1,1])
+with info_col:
     st.info(f"Backend: {'Online' if ok else 'Offline'}", icon="🔌")
-with bB:
+with run_col:
     run_image = st.button("Çalıştır (Sadece Foto)", type="primary", use_container_width=True, key="run_img_btn")
     run_chain = st.button("Zincir (Foto → Video hazırlık)", use_container_width=True, key="run_chain_btn")
 
-# ================= Demo Preview =================
-st.markdown("---")
+# ============== Demo Preview =================
+st.divider()
 st.subheader("Demo preview (çalıştırmadan önce)")
-st.caption("Aynı klasörde **input.jpg**, **tryon.jpg**, **fitstudio_video.mp4** okunur. Tüm kadrajlar 9:16 ve eşit genişlikte.")
-
-demo_c1, demo_c2, demo_c3 = st.columns(3)
-render_image_card(demo_c1, "Input", fetch_bytes("input.jpg"), "input")
-render_image_card(demo_c2, "Sample Output", fetch_bytes("tryon.jpg"), "tryon")
-render_video_card(demo_c3, "Sample Video", fetch_bytes("fitstudio_video.mp4"))
-
-# ================= Girdi Önizleme (Input | Look | Video aynı satır) =================
-st.markdown("---")
-st.subheader("Studio")
-
-# Input bytes
-input_bytes = None
+st.caption("Aynı klasörden **input.jpg**, **tryon.jpg**, **fitstudio_video.mp4** okunur. Tüm kutular 9:16 ve aynı boyutta.")
+
+dcol1, dcol2, dcol3 = st.columns(3, gap="large")
+demo_in  = fetch_bytes("input.jpg")
+demo_out = fetch_bytes("tryon.jpg")
+demo_vid = fetch_bytes("fitstudio_video.mp4")
+
+if demo_in:
+    dcol1.markdown("**Input**")
+    dcol1.image(pad_to_9x16(demo_in), use_container_width=True)
+    sz = image_size_from_bytes(demo_in)
+    if sz: dcol1.caption(f"Girdi: {sz[0]}×{sz[1]} px")
+else:
+    dcol1.markdown("**Input**"); dcol1.image(Image.new("RGB",(PREVIEW_W,PREVIEW_H),PREVIEW_BG), use_container_width=True)
+
+if demo_out:
+    dcol2.markdown("**Sample Output**")
+    dcol2.image(pad_to_9x16(demo_out), use_container_width=True)
+else:
+    dcol2.markdown("**Sample Output**"); dcol2.image(Image.new("RGB",(PREVIEW_W,PREVIEW_H),PREVIEW_BG), use_container_width=True)
+
+if demo_vid:
+    dcol3.markdown("**Sample Video**")
+    # Streamlit loop desteği yok; sadece aynı genişlikte gösteriyoruz.
+    dcol3.video(demo_vid, format="video/mp4", start_time=0)
+else:
+    dcol3.markdown("**Sample Video**"); dcol3.image(Image.new("RGB",(PREVIEW_W,PREVIEW_H),PREVIEW_BG), use_container_width=True)
+
+# ============== Girdi Önizleme =================
+st.divider()
+icol1, icol2, icol3 = st.columns(3, gap="large")
+
+input_preview = None
 if file_list:
-    try: input_bytes = file_list[0].getvalue()
-    except Exception: input_bytes = None
+    try: input_preview = file_list[0].getvalue()
+    except Exception: input_preview = None
 elif image_url:
-    input_bytes = fetch_bytes(image_url)
+    input_preview = fetch_bytes(image_url)
 
-# Çalıştırma yardımcıları
+icol1.markdown("**Input**")
+if input_preview:
+    icol1.image(pad_to_9x16(input_preview), use_container_width=True)
+    try:
+        sz = Image.open(io.BytesIO(input_preview)).size
+        icol1.caption(f"{sz[0]}×{sz[1]} px")
+    except Exception:
+        pass
+else:
+    icol1.image(Image.new("RGB",(PREVIEW_W,PREVIEW_H),PREVIEW_BG), use_container_width=True)
+
+# ============== Çalıştır =================
 def _build_files_payload():
     files_payload = []
     if file_list:
@@ -204,19 +205,18 @@ def _build_files_payload():
 
 def _common_form_data():
     data = {
-        "category": category,
-        "gender": gender,
-        "age_group": age_group,
+        "category": st.session_state["category"],
+        "gender": st.session_state["gender"],
+        "age_group": st.session_state["age_group"],
         "frame_aspect": "9:16",
-        "num_images": str(num_images),
+        "num_images": str(st.session_state["num_images"]),
     }
-    if prompt_box.strip():
-        data["prompt"] = prompt_box.strip()
+    if st.session_state.get("custom_prompt","").strip():
+        data["prompt"] = st.session_state["custom_prompt"].strip()
     if image_url:
         data["image_urls"] = image_url.strip()
     return data
 
-# Run
 if run_image or run_chain:
     if not ok:
         st.error("Backend erişilemiyor. API_BASE / TOKEN kontrol edin.")
@@ -242,6 +242,8 @@ if run_image or run_chain:
 
             st.session_state["job_counter"] += 1
             st.session_state["results"] = {
+                "job_id": (image_json.get("job_id") or out.get("job_id")),
+                "schema_version": (image_json.get("schema_version") or out.get("schema_version")),
                 "image_urls": urls,
                 "video_url": None,
             }
@@ -250,70 +252,84 @@ if run_image or run_chain:
         except Exception as e:
             st.error(f"Hata: {e}")
 
-# === Aynı SATIR: Input | Look | Video ===
-c1, c2, c3 = st.columns(3)
-
-# Input (her durumda sol kolon dolu — boşsa placeholder 9:16)
-render_image_card(c1, "Input", input_bytes, "input_runtime")
-
-# Look (ilk çıktı veya boş kart)
+# ============== Sonuçlar — Tek satır, 3 sütun (Input/Look/Video değil; Look1/2/Video) ==============
 res = st.session_state.get("results") or {}
-img_urls = res.get("image_urls") or []
-look_bytes = fetch_bytes(img_urls[0]) if img_urls else None
-render_image_card(c2, "Look", look_bytes, "look_1")
-
-# Video (üretilmiş varsa göster, yoksa boş kart)
-video_url = res.get("video_url")
-video_bytes = fetch_bytes(video_url) if video_url else None
-render_video_card(c3, "Video", video_bytes)
-
-# === Video üretimi ===
-st.markdown("")
-vc1, vc2, vc3 = st.columns([1.1, 1.0, 1.2])
-with vc1:
-    gen_video = st.checkbox("Bu sonuçtan video üret", value=False, key="video_toggle")
-with vc2:
-    st.selectbox("Video süresi", ["6","10"], index=(0 if st.session_state["duration"]=="6" else 1), key="duration_select")
-with vc3:
-    go_video = st.button("Video Oluştur", use_container_width=True, key="video_btn")
-
-if gen_video and go_video:
-    src_for_video = img_urls[0] if img_urls else None
-    if not src_for_video:
-        st.warning("Video için kaynak görsel yok.")
+if res:
+    st.divider()
+    st.subheader("Sonuçlar")
+
+    img_urls = res.get("image_urls") or []
+    video_url = res.get("video_url")
+
+    r1, r2, r3 = st.columns(3, gap="large")
+
+    # Look 1
+    r1.markdown("**Look**")
+    if img_urls:
+        b = fetch_bytes(img_urls[0])
+        if b:
+            r1.image(pad_to_9x16(b), use_container_width=True)
+            dl_ext = infer_ext(b)
+            r1.download_button("İndir (Look)", b, file_name=f"look_1{dl_ext}",
+                               mime="image/jpeg" if dl_ext in [".jpg",".jpeg"] else "image/png")
+    else:
+        r1.image(Image.new("RGB",(PREVIEW_W,PREVIEW_H),PREVIEW_BG), use_container_width=True)
+
+    # Look 2 (varsa)
+    r2.markdown("**Look #2**")
+    if len(img_urls) >= 2:
+        b2 = fetch_bytes(img_urls[1])
+        if b2:
+            r2.image(pad_to_9x16(b2), use_container_width=True)
+            dl_ext2 = infer_ext(b2)
+            r2.download_button("İndir (Look #2)", b2, file_name=f"look_2{dl_ext2}",
+                               mime="image/jpeg" if dl_ext2 in [".jpg",".jpeg"] else "image/png")
+    else:
+        r2.image(Image.new("RGB",(PREVIEW_W,PREVIEW_H),PREVIEW_BG), use_container_width=True)
+
+    # Video
+    r3.markdown("**Video**")
+    if video_url:
+        vb = fetch_bytes(video_url)
+        if vb:
+            r3.video(vb, format="video/mp4", start_time=0)
+            r3.download_button("Video indir (MP4)", data=vb, file_name="fitstudio_video.mp4", mime="video/mp4")
     else:
-        with st.spinner("Video üretiliyor…"):
-            v = post_video({
-                "image_url": src_for_video,
-                "duration": st.session_state.get("duration_select","6"),
-                "resolution": "768P",
-                "prompt_optimizer": "true",
-                "gender": gender,
-                "age_group": age_group,
-                "frame_aspect": "9:16",
-            })
-        vurl = (v.get("result") or {}).get("video", {}).get("url")
-        if vurl:
-            st.session_state["results"]["video_url"] = vurl
-            # Güncel satırı yeniden çizmek için sayfayı tekrar çalıştır
-            st.experimental_rerun()
+        r3.image(Image.new("RGB",(PREVIEW_W,(PREVIEW_H)),PREVIEW_BG), use_container_width=True)
+
+    # Video üretim kontrolleri
+    st.divider()
+    v1, v2, v3 = st.columns(3)
+    with v1:
+        gen_video = st.checkbox("Bu sonuçtan video üret", value=False, key="video_toggle")
+    with v2:
+        st.selectbox("Video süresi", ["6","10"], index=(0 if st.session_state["duration"]=="6" else 1), key="duration_select")
+    with v3:
+        go_video = st.button("Video Oluştur", use_container_width=True, key="video_btn")
+
+    if gen_video and go_video:
+        src_for_video = img_urls[0] if img_urls else None
+        if not src_for_video:
+            st.warning("Video için kaynak görsel yok.")
         else:
-            st.info("Video URL gelmedi.")
-
-# === ZIP indir ===
-named = []
-if look_bytes: named.append((f"look_1{infer_ext(look_bytes)}", look_bytes))
-if video_bytes: named.append(("video.mp4", video_bytes))
-if named:
-    st.download_button(
-        "Tümünü indir (ZIP)",
-        data=make_zip(named),
-        file_name="fitstudio_outputs.zip",
-        mime="application/zip",
-        key=f"zip_{st.session_state['job_counter']}"
-    )
-
-# ================= Sidebar =================
+            with st.spinner("Video üretiliyor…"):
+                v = post_video({
+                    "image_url": src_for_video,
+                    "duration": st.session_state.get("duration_select","6"),
+                    "resolution": "768P",
+                    "prompt_optimizer": "true",
+                    "gender": st.session_state["gender"],
+                    "age_group": st.session_state["age_group"],
+                    "frame_aspect": "9:16",
+                })
+            vurl = (v.get("result") or {}).get("video", {}).get("url")
+            if vurl:
+                st.session_state["results"]["video_url"] = vurl
+                st.success("Video hazır. Yukarıdaki Video kutusunda görüntülenir.")
+            else:
+                st.info("Video URL gelmedi.")
+
+# ============== Sidebar =================
 with st.sidebar:
     st.caption(f"Resolved API_BASE: {API_BASE}")
     st.caption("Auth header: " + ("ON" if HF_TOKEN else "OFF"))
@@ -328,4 +344,4 @@ with st.sidebar:
     if st.button("Clear cache"):
         st.cache_data.clear(); st.success("Cache cleared.")
     if st.button("Clear results"):
-        st.session_state["results"] = None; st.success("Results cleared.")
+        st.session_state["results"] = None; st.success("Results cleared.")