Upload streamlit_app.py

streamlit_app.py

@@ -1,8 +1,8 @@
 # streamlit_app.py — Fit Studio AI (Fashion & Apparel) v0.8 UI
-# Amaç: HTML/CSS KULLANMADAN sabit 3 sütun (Input • Look • Video) yan yana ve aynı boy görünüm.
-# Demo: klasörde input.jpg, tryon.jpg, fitstudio_video.mp4 varsa "Demo preview" ve "Studio" satırında gösterilir.
+# Hedef: Gerçek Input + Look + Video KARTLARI aynı satırda, aynı 9:16 kadrajda, HTML kullanmadan.
+# Demo: klasörde input.jpg, tryon.jpg, fitstudio_video.mp4 varsa çalıştırmadan önce gösterilir.
 
-import os, io, zipfile, requests, streamlit as st
+import os, io, zipfile, base64, requests, streamlit as st
 from pathlib import Path
 from PIL import Image
 
@@ -20,23 +20,20 @@ HF_TOKEN = (_env("FITSTUDIO_TOKEN") or _env("AI_LIGHTBOX_TOKEN") or _env("LUXFIT
 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.error("API_BASE yok. Variables: FITSTUDIO_API (veya AI_LIGHTBOX_API/LUXFIT_API) ekleyin.")
     st.stop()
 
-# Tüm görsel/video kadrajı hedef oranı (9:16). Görseller bu orana pad’lenir.
-TARGET_ASPECT = (9, 16)
-PREVIEW_BG = (255, 255, 255)
+# Tüm görsel/video kartları 9:16
+ASPECT_W, ASPECT_H = 9, 16
+PREVIEW_H = int(os.getenv("PREVIEW_H", "640"))         # 640 px yükseklik
+PREVIEW_W = int(round(PREVIEW_H * ASPECT_W / ASPECT_H)) # 360 px genişlik
+BG = (255, 255, 255)
 
 # ================= State =================
 st.set_page_config(page_title="Fit Studio AI", layout="wide", page_icon="🧵")
-defaults = {
-    "results": None,
-    "job_counter": 0,
-    "duration": "6",
-    "input_preview_bytes": None,
-}
-for k, v in defaults.items():
-    st.session_state.setdefault(k, v)
+st.session_state.setdefault("results", None)
+st.session_state.setdefault("job_counter", 0)
+st.session_state.setdefault("duration", "6")
 
 # ================= Helpers =================
 def _needs_auth(url: str) -> bool:
@@ -59,45 +56,24 @@ def fetch_bytes(url_or_path: str | None):
         return None
 
 @st.cache_data(ttl=300, show_spinner=False)
-def image_size_from_bytes(b: bytes):
-    try:
-        im = Image.open(io.BytesIO(b)); return im.size
-    except Exception:
-        return None
+def pad_to_9x16(img_bytes: bytes, out_w=PREVIEW_W, out_h=PREVIEW_H, bg=BG) -> bytes:
+    im = Image.open(io.BytesIO(img_bytes)).convert("RGB")
+    w, h = im.size
+    scale = min(out_w / w, out_h / h)
+    new_w, new_h = max(1, int(w*scale)), max(1, int(h*scale))
+    im_r = im.resize((new_w, new_h), Image.LANCZOS)
+    canvas = Image.new("RGB", (out_w, out_h), bg)
+    off = ((out_w - new_w)//2, (out_h - new_h)//2)
+    canvas.paste(im_r, off)
+    buf = io.BytesIO(); canvas.save(buf, format="PNG"); return buf.getvalue()
 
-def infer_ext(data: bytes) -> str:
+def infer_ext(b: bytes) -> str:
     try:
-        im = Image.open(io.BytesIO(data))
-        fmt = (im.format or "JPEG").lower()
+        fmt = (Image.open(io.BytesIO(b)).format or "JPEG").lower()
         return "." + {"jpeg":"jpg","jpg":"jpg","png":"png","webp":"webp"}.get(fmt, "jpg")
     except Exception:
         return ".jpg"
 
-@st.cache_data(ttl=300, show_spinner=False)
-def pad_to_aspect(img_bytes: bytes, aspect=(9,16), bg_rgb=PREVIEW_BG) -> bytes:
-    """
-    Görseli crop yapmadan istenen orana pad’ler. Çıktı PNG (şeffaflık yok, düz arka plan).
-    Genişlik/yükseklik UI’da sütun genişliğine göre otomatik ölçeklenecek.
-    """
-    im = Image.open(io.BytesIO(img_bytes)).convert("RGB")
-    w, h = im.size
-    target_w, target_h = aspect
-    # hedef oran
-    target_ratio = target_w / target_h
-    img_ratio = w / h
-    # hedef canvas’ı hesapla (en kısa kenar bazlı)
-    if img_ratio > target_ratio:
-        # görüntü daha geniş → hedef yükseklik = w / target_ratio
-        new_h = int(round(w / target_ratio))
-        new_w = w
-    else:
-        new_w = int(round(h * target_ratio))
-        new_h = h
-    canvas = Image.new("RGB", (new_w, new_h), bg_rgb)
-    off = ((new_w - w)//2, (new_h - h)//2)
-    canvas.paste(im, off)
-    buf = io.BytesIO(); canvas.save(buf, format="PNG"); return buf.getvalue()
-
 def backend_ok() -> bool:
     try:
         r = requests.get(f"{API_BASE}/health", headers=HEADERS if HF_TOKEN else None, timeout=10)
@@ -121,217 +97,203 @@ 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:
+def make_zip(named: 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)
+        for name, b in named:
+            if b: z.writestr(name, b)
     buf.seek(0); return buf.read()
 
-# ================= Header & Controls =================
+# ================= UI — Controls =================
 st.title("🧵 Fit Studio AI")
-st.caption("HTML/CSS olmadan sabit 3 sütun: Input • Look • Video (9:16 görünüm)")
+st.caption("9:16 Still Image (VTO) → (opsiyonel) Runway Video — HTML’siz sabit 3 kart düzeni")
 
 ok = backend_ok()
-c0, c1, c2, c3, c4, c5 = st.columns([1.0, 1.4, 1.4, 1.0, 1.8, 1.6])
+c0, c1, c2, c3, c4, c5 = st.columns([1.0, 1.4, 1.4, 1.1, 1.8, 1.6])
 with c0:
-    category = st.selectbox("Kategori", ["general","underwear"], index=0, key="category")
+    category = st.selectbox("Kategori", ["general","underwear"], index=0)
 with c1:
-    gender = st.selectbox("Cinsiyet", ["auto","female","male","unisex"], index=0, key="gender")
+    gender = st.selectbox("Cinsiyet", ["auto","female","male","unisex"], index=0)
 with c2:
-    age_group = st.selectbox("Yaş", ["auto","teen","young_adult","adult","mature"], index=0, key="age_group")
+    age_group = st.selectbox("Yaş Grubu", ["auto","teen","young_adult","adult","mature"], index=0)
 with c3:
-    num_images = st.selectbox("Adet", [1,2,3,4], index=0, key="num_images")
+    num_images = st.selectbox("Çıktı adedi", [1,2,3,4], index=0)
 with c4:
-    file_list = st.file_uploader("Upload", type=["jpg","jpeg","png","webp"], accept_multiple_files=True, key="file_upl")
+    files = st.file_uploader("Garment upload", type=["jpg","jpeg","png","webp"], accept_multiple_files=True)
 with c5:
-    image_url = st.text_input("veya URL", key="image_url")
+    image_url = st.text_input("veya Garment URL")
 
-prompt_box = st.text_area("Özel prompt (opsiyonel)", value="", height=80, key="custom_prompt")
+prompt = st.text_area("Özel prompt (boş → varsayılan)", value="", height=90)
 
 cA, cB = st.columns([1,1])
 with cA:
     st.info(f"Backend: {'Online' if ok else 'Offline'}", icon="🔌")
 with cB:
-    run_image = st.button("Çalıştır (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")
+    run_img = st.button("Çalıştır (Foto)", type="primary", use_container_width=True)
+    run_chain = st.button("Zincir (Foto → Video hazırlık)", use_container_width=True)
 
-# ================= Demo preview (3 sabit sütun) =================
+# ================= Demo Preview (Streamlit-only) =================
 st.markdown("---")
 st.subheader("Demo preview (çalıştırmadan önce)")
-st.caption("Klasörde **input.jpg**, **tryon.jpg**, **fitstudio_video.mp4** varsa yan yana gösterilir.")
+dcol1, dcol2, dcol3 = st.columns(3)
 
-d1, d2, d3 = st.columns(3)
-demo_in  = fetch_bytes("input.jpg")
-demo_out = fetch_bytes("tryon.jpg")
-demo_vid = fetch_bytes("fitstudio_video.mp4")
+demo_input_b = fetch_bytes("input.jpg")
+demo_try_b   = fetch_bytes("tryon.jpg")
+demo_vid_b   = fetch_bytes("fitstudio_video.mp4")
 
-def _placeholder_img(col, title):
+def show_image_card(col, title, b: bytes | None, fname="image.jpg"):
     col.markdown(f"**{title}**")
-    ph = Image.new("RGB", (900, 1600), PREVIEW_BG)  # 9:16 boş görsel
-    col.image(ph, use_container_width=True)
-    col.caption("—")
-
-if demo_in:
-    d1.markdown("**Input**")
-    d1.image(pad_to_aspect(demo_in, TARGET_ASPECT), use_container_width=True)
-    sz = image_size_from_bytes(demo_in)
-    if sz: d1.caption(f"{sz[0]}×{sz[1]} px")
-else:
-    _placeholder_img(d1, "Input")
-
-if demo_out:
-    d2.markdown("**Sample Output**")
-    d2.image(pad_to_aspect(demo_out, TARGET_ASPECT), use_container_width=True)
-    sz2 = image_size_from_bytes(demo_out)
-    if sz2: d2.caption(f"{sz2[0]}×{sz2[1]} px")
-else:
-    _placeholder_img(d2, "Sample Output")
-
-if demo_vid:
-    d3.markdown("**Sample Video**")
-    # Streamlit st.video loop desteklemez; fakat sütun genişliği ile aynı görünür.
-    d3.video(demo_vid, format="video/mp4", start_time=0)
-else:
-    _placeholder_img(d3, "Sample Video")
+    if b:
+        pv = pad_to_9x16(b)
+        col.image(pv, use_container_width=True)
+        col.download_button("İndir", data=b, file_name=fname, mime="image/jpeg")
+    else:
+        col.image(Image.new("RGB", (PREVIEW_W, PREVIEW_H), BG), use_container_width=True)
+        col.caption("—")
 
-# ================= Input preview (state) =================
-if file_list:
-    try:
-        st.session_state["input_preview_bytes"] = file_list[0].getvalue()
-    except Exception:
-        st.session_state["input_preview_bytes"] = None
+def show_video_card(col, title, vb: bytes | None):
+    col.markdown(f"**{title}**")
+    if vb:
+        col.video(vb, format="video/mp4", start_time=0)
+        col.download_button("Video indir", data=vb, file_name="fitstudio_video.mp4", mime="video/mp4")
+    else:
+        col.image(Image.new("RGB", (PREVIEW_W, PREVIEW_H), BG), use_container_width=True)
+        col.caption("—")
+
+show_image_card(dcol1, "Sample Input", demo_input_b, f"input{infer_ext(demo_input_b or b'')}")
+show_image_card(dcol2, "Sample Output", demo_try_b, f"tryon{infer_ext(demo_try_b or b'')}")
+show_video_card(dcol3, "Sample Video", demo_vid_b)
+
+# ================= Input preview (for Studio row) =================
+runtime_input_b = None
+if files:
+    try: runtime_input_b = files[0].getvalue()
+    except Exception: runtime_input_b = None
 elif image_url:
-    st.session_state["input_preview_bytes"] = fetch_bytes(image_url)
+    runtime_input_b = fetch_bytes(image_url)
 
 # ================= Run =================
-def _build_files_payload():
-    files_payload = []
-    if file_list:
-        for f in file_list:
-            files_payload.append(("files", (f.name, f.getvalue(), f.type or "image/jpeg")))
-    return files_payload
-
-def _common_form_data():
+def build_files_payload():
+    payload = []
+    if files:
+        for f in files:
+            payload.append(("files", (f.name, f.getvalue(), f.type or "image/jpeg")))
+    return payload
+
+def common_form():
     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 image_url:
-        data["image_urls"] = image_url.strip()
+    if prompt.strip(): data["prompt"] = prompt.strip()
+    if image_url.strip(): data["image_urls"] = image_url.strip()
     return data
 
-if run_image or run_chain:
+if run_img or run_chain:
     if not ok:
-        st.error("Backend erişilemiyor. API_BASE / TOKEN kontrol edin.")
-    elif not (file_list or image_url):
-        st.error("En az bir görsel girin (upload veya URL).")
+        st.error("Backend erişilemiyor.")
+    elif not (files or image_url):
+        st.error("En az bir garment görseli girin.")
     else:
         try:
-            files_payload = _build_files_payload()
-            form = _common_form_data()
+            fp = build_files_payload()
+            form = common_form()
             with st.spinner("Çalışıyor…"):
-                if run_image:
-                    out = post_image_edit(form, files_payload)
-                    image_json = out
+                if run_img:
+                    image_json = post_image_edit(form, fp)
                 else:
-                    out = post_chain(form, files_payload)   # to_video=false
+                    out = post_chain(form, fp)  # to_video=false
                     image_json = out.get("image_step") or out
 
-            # URLs
             imgs_norm = (image_json.get("result") or {}).get("images_9_16") or []
             if not imgs_norm:
-                imgs_raw = (image_json.get("result") or {}).get("images") or []
-                imgs_norm = [{"url": i.get("url")} for i in imgs_raw if isinstance(i, dict) and i.get("url")]
+                raw = (image_json.get("result") or {}).get("images") or []
+                imgs_norm = [{"url": i.get("url")} for i in raw if isinstance(i, dict) and i.get("url")]
             urls = [i.get("url") for i in imgs_norm if isinstance(i, dict) and i.get("url")]
 
             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,
-            }
+            st.session_state["results"] = {"image_urls": urls, "video_url": None}
         except requests.HTTPError as e:
             st.error(f"HTTP {e.response.status_code}")
         except Exception as e:
             st.error(f"Hata: {e}")
 
-# ================= STUDIO — TEK SATIR: Input • Look • Video =================
+# ================= STUDIO — HTML YOK: 3 sabit kolon =================
 st.markdown("---")
-st.subheader("Studio (yan yana 3 sabit sütun)")
+st.subheader("Studio (Gerçek çıktılar)")
 
-c1, c2, c3 = st.columns(3)
+col_in, col_look, col_vid = st.columns(3)
 
-# 1) Input
-inp_b = st.session_state.get("input_preview_bytes")
-if inp_b:
-    c1.markdown("**Input**")
-    c1.image(pad_to_aspect(inp_b, TARGET_ASPECT), use_container_width=True)
+# 1) Input kartı (her durumda dolu/placeholder) — 9:16’e pad’lenmiş
+col_in.markdown("**Input**")
+if runtime_input_b:
+    col_in.image(pad_to_9x16(runtime_input_b), use_container_width=True)
+    col_in.download_button("İndir", data=runtime_input_b, file_name=f"input_runtime{infer_ext(runtime_input_b)}", mime="image/jpeg")
 else:
-    _placeholder_img(c1, "Input")
-
-# 2) Look (ilk sonuç / yoksa demo_out / yoksa boş)
-res = st.session_state.get("results") or {}
-urls = (res.get("image_urls") or [])
-look_url = urls[0] if urls else None
-look_b = fetch_bytes(look_url) if look_url else (demo_out if demo_out else None)
+    col_in.image(Image.new("RGB", (PREVIEW_W, PREVIEW_H), BG), use_container_width=True)
+    col_in.caption("—")
 
+# 2) Look kartı
+urls = (st.session_state.get("results") or {}).get("image_urls") or []
+look_b = fetch_bytes(urls[0]) if urls else None
+col_look.markdown("**Look**")
 if look_b:
-    c2.markdown("**Look**")
-    c2.image(pad_to_aspect(look_b, TARGET_ASPECT), use_container_width=True)
+    col_look.image(pad_to_9x16(look_b), use_container_width=True)
+    col_look.download_button("İndir", data=look_b, file_name=f"look_1{infer_ext(look_b)}", mime="image/jpeg")
 else:
-    _placeholder_img(c2, "Look")
-
-# 3) Video (üretilmiş URL / yoksa demo)
-vurl = res.get("video_url")
-v_b = fetch_bytes(vurl) if vurl else (demo_vid if demo_vid else None)
-if v_b:
-    c3.markdown("**Video**")
-    c3.video(v_b, format="video/mp4", start_time=0)
+    col_look.image(Image.new("RGB", (PREVIEW_W, PREVIEW_H), BG), use_container_width=True)
+    col_look.caption("—")
+
+# 3) Video kartı
+vurl = (st.session_state.get("results") or {}).get("video_url")
+vbytes = fetch_bytes(vurl) if vurl else None
+col_vid.markdown("**Video**")
+if vbytes:
+    col_vid.video(vbytes, format="video/mp4", start_time=0)
+    col_vid.download_button("Video indir", data=vbytes, file_name="fitstudio_video.mp4", mime="video/mp4")
 else:
-    _placeholder_img(c3, "Video")
-
-# ================= Video üretim kontrolleri =================
-v1, v2, v3 = st.columns([1.1, 1.0, 1.2])
-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")
+    col_vid.video(demo_vid_b, format="video/mp4", start_time=0) if demo_vid_b else col_vid.image(Image.new("RGB",(PREVIEW_W,PREVIEW_H),BG), use_container_width=True)
+    if not demo_vid_b: col_vid.caption("—")
+
+# ================= Video üretimi (opsiyonel) =================
+st.markdown("")
+cV1, cV2, cV3 = st.columns([1.1, 1.0, 1.2])
+with cV1:
+    gen_video = st.checkbox("Bu sonuçtan video üret", value=False)
+with cV2:
+    dur = st.selectbox("Video süresi", ["6","10"], index=(0 if st.session_state["duration"]=="6" else 1))
+with cV3:
+    go_video = st.button("Video Oluştur", use_container_width=True)
 
 if gen_video and go_video:
-    src_for_video = urls[0] if urls else None
-    if not src_for_video:
+    src = urls[0] if urls else None
+    if not src:
         st.warning("Video için kaynak görsel yok.")
     else:
         with st.spinner("Video üretiliyor…"):
             v = post_video({
-                "image_url": src_for_video,
-                "duration": st.session_state.get("duration_select","6"),
+                "image_url": src,
+                "duration": dur,
                 "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
-            st.success("Video hazır — Studio satırındaki Video kutusunda görüntülenir.")
+            st.success("Video hazır — yukarıdaki Video kartında oynatılabilir.")
         else:
             st.info("Video URL gelmedi.")
 
 # ================= ZIP indir =================
 named = []
-if look_b: named.append((f"look_1{infer_ext(look_b)}", look_b))
-if v_b:    named.append(("video.mp4", v_b))
+if look_b:  named.append((f"look_1{infer_ext(look_b)}", look_b))
+if vbytes:  named.append(("video.mp4", vbytes))
 if named:
     st.download_button(
         "Tümünü indir (ZIP)",
@@ -343,19 +305,17 @@ if named:
 
 # ================= Sidebar =================
 with st.sidebar:
-    st.caption(f"Resolved API_BASE: {API_BASE}")
+    st.caption(f"API_BASE: {API_BASE}")
     st.caption("Auth header: " + ("ON" if HF_TOKEN else "OFF"))
     if st.button("Ping /health"):
         try:
             r = requests.get(f"{API_BASE}/health", headers=HEADERS if HF_TOKEN else None, timeout=10)
             st.write(r.status_code)
             try: st.json(r.json())
-            except Exception: st.code((r.text or "")[:1000])
+            except Exception: st.code((r.text or "")[:800])
         except Exception as e:
             st.error(f"Health error: {e}")
     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.")