Upload streamlit_app.py

streamlit_app.py

@@ -1,13 +1,15 @@
-# streamlit_app.py — Fit Studio AI (Fashion & Apparel) v0.7 UI
+# streamlit_app.py — Fit Studio AI (Fashion & Apparel) v0.8 UI
 # 9:16 dikey kadraj — Still Image (VTO) → (optional) Runway Video
-# DÜZELTME: “Input + Look + Video” tek satır sabit 3 sütun grid; boşluk yok, hepsi aynı boy.
-# Demo: aynı klasörde input.jpg, tryon.jpg, fitstudio_video.mp4 varsa ilk bölümde önizleme.
+# 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.
 
-import os, io, base64, zipfile, requests, streamlit as st
+import os, io, zipfile, requests, streamlit as st
 from pathlib import Path
 from PIL import Image
+import base64
 
-# ============== Env & API =================
+# ================= Env & API (robust) =================
 def _env(k): 
     return (os.getenv(k) or "").strip().strip("'\"")
 
@@ -18,33 +20,30 @@ API_BASE = (
 ).rstrip("/") if (_env("FITSTUDIO_API") or _env("AI_LIGHTBOX_API") or _env("LUXFIT_API")) else ""
 
 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()
 
-# Tek tip 9:16 kart ölçüsü (yan yana eşit)
-PREVIEW_H = int(os.getenv("PREVIEW_H", "640"))       # px
-PREVIEW_W = int(round(PREVIEW_H * 9 / 16))           # 360 px
+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
 PREVIEW_BG = (255, 255, 255)
 
-# ============== State =====================
+# ================= Session State =================
 st.set_page_config(page_title="Fit Studio AI", layout="wide", page_icon="🧵")
-for k, v in {
-    "results": None,
-    "job_counter": 0,
-    "duration": "6",
-    "input_preview_bytes": None,
-}.items():
+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."""
     if not url_or_path:
         return None
     try:
@@ -76,6 +75,7 @@ def infer_ext(data: bytes) -> str:
 
 @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."""
     im = Image.open(io.BytesIO(img_bytes)).convert("RGB")
     w, h = im.size
     scale = min(out_w / w, out_h / h)
@@ -86,11 +86,12 @@ 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 b64_img_png(png_bytes: bytes) -> str:
-    return "data:image/png;base64," + base64.b64encode(png_bytes).decode("utf-8")
-
-def b64_video_mp4(mp4_bytes: bytes) -> str:
-    return "data:video/mp4;base64," + base64.b64encode(mp4_bytes).decode("utf-8")
+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:
@@ -105,7 +106,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ı
+    payload = {**data, "to_video": "false"}  # video ayrı akış
     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()
@@ -115,57 +116,40 @@ def post_video(data: dict):
                       headers=HEADERS if HF_TOKEN else None, timeout=600)
     r.raise_for_status(); return r.json()
 
-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()
+# 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
 
-# ============== CSS (sabit 3 sütun grid) ==============
-st.markdown(f"""
-<style>
-:root {{
-  --frameW: {PREVIEW_W}px;
-  --frameH: {PREVIEW_H}px;
-}}
-.media-row {{
-  display: grid;
-  grid-template-columns: repeat(3, var(--frameW)); /* HER ZAMAN 3 sütun */
-  gap: 28px;
-  justify-content: center;   /* ortala, sağda boşluk yok */
-  align-items: start;
-  margin: 8px 0 18px 0;
-}}
-.media-card {{
-  width: var(--frameW);
-  margin: 0;
-}}
-.media-title {{ font-weight: 600; margin-bottom: 8px; }}
-.media-frame {{
-  width: var(--frameW); height: var(--frameH);
-  background: #fff; border: 1px solid #e9e9ec; border-radius: 12px;
-  overflow: hidden; display:flex; align-items:center; justify-content:center;
-  box-shadow: 0 1px 2px rgba(0,0,0,.05);
-}}
-.media-frame img, .media-frame video {{
-  width: 100%; height: 100%; object-fit: contain; display:block;
-}}
-.media-actions {{ margin-top: 6px; font-size: 12px; color: #666; text-align:center; }}
-.media-actions a {{
-  text-decoration: none; color: #444; border:1px solid #ddd; padding:4px 8px;
-  border-radius: 6px; display:inline-block;
-}}
-.ph {{ color:#9aa; font-size: 13px; }}
-</style>
-""", unsafe_allow_html=True)
-
-# ============== UI: 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.5, 1.5, 1.2, 1.8, 1.6])
+c0, c1, c2, c3, c4, c5 = st.columns([1.0, 1.6, 1.6, 1.1, 1.4, 1.4])
 with c0:
     category = st.selectbox("Kategori", ["general","underwear"], index=0, key="category")
 with c1:
@@ -181,71 +165,36 @@ with c5:
 
 prompt_box = st.text_area("Özel prompt (boş bırak → varsayılan)", value="", height=90, key="custom_prompt")
 
-cA, cB = st.columns([1,1])
-with cA:
+bA, bB = st.columns([1.0, 1.0])
+with bA:
     st.info(f"Backend: {'Online' if ok else 'Offline'}", icon="🔌")
-with cB:
+with bB:
     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 (çalıştırmadan önce) =================
-def card_img(title: str, raw_bytes: bytes, fname: str):
-    pv = vertical_preview_9x16(raw_bytes, PREVIEW_W, PREVIEW_H, PREVIEW_BG)
-    data_url = b64_img_png(pv)
-    dl_url  = "data:image/jpeg;base64," + base64.b64encode(raw_bytes).decode("utf-8")
-    return f"""
-    <div class="media-card">
-      <div class="media-title">{title}</div>
-      <div class="media-frame"><img src="{data_url}" alt="{title}"/></div>
-      <div class="media-actions"><a download="{fname}" href="{dl_url}">İndir</a></div>
-    </div>
-    """
-
-def card_video(title: str, video_bytes: bytes, fname: str="fitstudio_video.mp4"):
-    vurl = b64_video_mp4(video_bytes)
-    return f"""
-    <div class="media-card">
-      <div class="media-title">{title}</div>
-      <div class="media-frame">
-        <video src="{vurl}" autoplay loop muted playsinline></video>
-      </div>
-      <div class="media-actions"><a download="{fname}" href="{vurl}">Video indir</a></div>
-    </div>
-    """
-
-def card_placeholder(title: str, text: str="Hazır değil"):
-    return f"""
-    <div class="media-card">
-      <div class="media-title">{title}</div>
-      <div class="media-frame"><div class="ph">{text}</div></div>
-      <div class="media-actions">&nbsp;</div>
-    </div>
-    """
-
+# ================= Demo Preview =================
 st.markdown("---")
 st.subheader("Demo preview (çalıştırmadan önce)")
-st.caption("Aynı klasörden **input.jpg**, **tryon.jpg**, **fitstudio_video.mp4** okunur. Tüm kartlar 9:16 ve aynı boyutta.")
+st.caption("Aynı klasörde **input.jpg**, **tryon.jpg**, **fitstudio_video.mp4** okunur. Tüm kadrajlar 9:16 ve eşit genişlikte.")
 
-demo_left  = fetch_bytes("input.jpg")
-demo_mid   = fetch_bytes("tryon.jpg")
-demo_right = fetch_bytes("fitstudio_video.mp4")
+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"))
 
-demo_row = []
-demo_row.append(card_img("Input", demo_left, f"input{infer_ext(demo_left)}") if demo_left else card_placeholder("Input"))
-demo_row.append(card_img("Sample Output", demo_mid, f"tryon{infer_ext(demo_mid)}") if demo_mid else card_placeholder("Sample Output"))
-demo_row.append(card_video("Sample Video", demo_right) if demo_right else card_placeholder("Sample Video"))
-st.markdown('<div class="media-row">' + "\n".join(demo_row) + "</div>", unsafe_allow_html=True)
+# ================= Girdi Önizleme (Input | Look | Video aynı satır) =================
+st.markdown("---")
+st.subheader("Studio")
 
-# ============== Input preview (state’e yaz) =================
+# Input bytes
+input_bytes = None
 if file_list:
-    try:
-        st.session_state["input_preview_bytes"] = file_list[0].getvalue()
-    except Exception:
-        st.session_state["input_preview_bytes"] = None
+    try: input_bytes = file_list[0].getvalue()
+    except Exception: input_bytes = None
 elif image_url:
-    st.session_state["input_preview_bytes"] = fetch_bytes(image_url)
+    input_bytes = fetch_bytes(image_url)
 
-# ============== Run =================
+# Çalıştırma yardımcıları
 def _build_files_payload():
     files_payload = []
     if file_list:
@@ -255,18 +204,19 @@ def _build_files_payload():
 
 def _common_form_data():
     data = {
-        "category": st.session_state["category"],
-        "gender": st.session_state["gender"],
-        "age_group": st.session_state["age_group"],
+        "category": category,
+        "gender": gender,
+        "age_group": age_group,
         "frame_aspect": "9:16",
-        "num_images": str(st.session_state["num_images"]),
+        "num_images": str(num_images),
     }
-    if st.session_state.get("custom_prompt","").strip():
-        data["prompt"] = st.session_state["custom_prompt"].strip()
+    if prompt_box.strip():
+        data["prompt"] = prompt_box.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.")
@@ -292,8 +242,6 @@ 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,
             }
@@ -302,41 +250,35 @@ if run_image or run_chain:
         except Exception as e:
             st.error(f"Hata: {e}")
 
-# ============== STUDIO — Tek satırda Input + Look + Video =================
-st.markdown("---")
-st.subheader("Studio")
+# === Aynı SATIR: Input | Look | Video ===
+c1, c2, c3 = st.columns(3)
 
-# 1) Input kartı (her zaman dolu veya placeholder)
-row_cards = []
-in_bytes = st.session_state.get("input_preview_bytes")
-row_cards.append(card_img("Input", in_bytes, f"input_runtime{infer_ext(in_bytes)}") if in_bytes else card_placeholder("Input", "Görsel seç"))
+# Input (her durumda sol kolon dolu — boşsa placeholder 9:16)
+render_image_card(c1, "Input", input_bytes, "input_runtime")
 
-# 2) Look (ilk çıktı veya placeholder ya da tryon.jpg fallback)
+# Look (ilk çıktı veya boş kart)
 res = st.session_state.get("results") or {}
-urls = (res.get("image_urls") or [])
-look_url = urls[0] if urls else None
-look_bytes = fetch_bytes(look_url) if look_url else (demo_mid if demo_mid else None)
-row_cards.append(card_img("Look", look_bytes, f"look_1{infer_ext(look_bytes)}") if look_bytes else card_placeholder("Look"))
-
-# 3) Video (üretilmiş → URL / yoksa örnek / yoksa placeholder)
-vurl = res.get("video_url")
-vbytes = fetch_bytes(vurl) if vurl else (demo_right if demo_right else None)
-row_cards.append(card_video("Video", vbytes) if vbytes else card_placeholder("Video"))
-
-# Satırı çiz — 3 sütun sabit → sağda/ solda boşluk oluşmaz
-st.markdown('<div class="media-row">' + "\n".join(row_cards) + "</div>", unsafe_allow_html=True)
-
-# ============== Video üretim kontrolleri (aynı sayfada) =================
-ctl1, ctl2, ctl3 = st.columns([1.1, 1.0, 1.2])
-with ctl1:
-    gen_video = st.checkbox("Bu sonuçtan video üret (loop)", value=False, key="video_toggle")
-with ctl2:
+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 ctl3:
+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 = urls[0] if urls else None
+    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:
@@ -346,22 +288,22 @@ if gen_video and go_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"],
+                "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
-            # satırı yeniden çizmek yerine bilgi ver
-            st.success("Video hazır — üstteki Video kartında otomatik oynar.")
+            # Güncel satırı yeniden çizmek için sayfayı tekrar çalıştır
+            st.experimental_rerun()
         else:
             st.info("Video URL gelmedi.")
 
-# ============== ZIP indir (Look + Video varsa) =================
+# === ZIP indir ===
 named = []
 if look_bytes: named.append((f"look_1{infer_ext(look_bytes)}", look_bytes))
-if vbytes:    named.append(("video.mp4", vbytes))
+if video_bytes: named.append(("video.mp4", video_bytes))
 if named:
     st.download_button(
         "Tümünü indir (ZIP)",
@@ -371,7 +313,7 @@ if named:
         key=f"zip_{st.session_state['job_counter']}"
     )
 
-# ============== Sidebar =================
+# ================= Sidebar =================
 with st.sidebar:
     st.caption(f"Resolved API_BASE: {API_BASE}")
     st.caption("Auth header: " + ("ON" if HF_TOKEN else "OFF"))
@@ -386,4 +328,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.session_state["input_preview_bytes"] = None; st.success("Results cleared.")
+        st.session_state["results"] = None; st.success("Results cleared.")