Upload streamlit_app.py

streamlit_app.py

@@ -1,21 +1,20 @@
 # streamlit_app.py — Fit Studio AI (Fashion & Apparel) v0.8 UI
-# 9:16 dikey kadraj — Still Image (VTO) → (optional) Runway Video
-# 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.
+# 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.
 
-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
 
-# ============== Env & API =================
+# ================= 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")
-)
-if API_BASE:
-    API_BASE = API_BASE.rstrip("/")
+    _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 ""
 
 HF_TOKEN = (_env("FITSTUDIO_TOKEN") or _env("AI_LIGHTBOX_TOKEN") or _env("LUXFIT_TOKEN"))
 HEADERS = {"Authorization": f"Bearer {HF_TOKEN}"} if HF_TOKEN else {}
@@ -24,24 +23,27 @@ if not API_BASE:
     st.error("API_BASE bulunamadı. Settings > Variables: FITSTUDIO_API (veya AI_LIGHTBOX_API / LUXFIT_API) tanımlayın.")
     st.stop()
 
-# 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
+# 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)
 
+# ================= 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():
+defaults = {
+    "results": None,
+    "job_counter": 0,
+    "duration": "6",
+    "input_preview_bytes": None,
+}
+for k, v in defaults.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/ veya mevcut klasörden oku."""
     if not url_or_path:
         return None
     try:
@@ -72,16 +74,28 @@ def infer_ext(data: bytes) -> str:
         return ".jpg"
 
 @st.cache_data(ttl=300, show_spinner=False)
-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."""
+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
-    scale = min(out_w / w, out_h / h)
-    new_w, new_h = max(1, int(w*scale)), max(1, int(h*scale))
-    im_resized = im.resize((new_w, new_h), Image.LANCZOS)
-    canvas = Image.new("RGB", (out_w, out_h), bg_rgb)
-    off = ((out_w - new_w)//2, (out_h - new_h)//2)
-    canvas.paste(im_resized, off)
+    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:
@@ -114,88 +128,83 @@ def make_zip(named_bytes: list[tuple[str, bytes]]) -> 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")
+st.caption("HTML/CSS olmadan sabit 3 sütun: Input • Look • Video (9:16 görünüm)")
 
 ok = backend_ok()
-c0, c1, c2, c3, c4, c5 = st.columns([1.0, 1.4, 1.4, 1.0, 1.6, 1.6])
+c0, c1, c2, c3, c4, c5 = st.columns([1.0, 1.4, 1.4, 1.0, 1.8, 1.6])
 with c0:
     category = st.selectbox("Kategori", ["general","underwear"], index=0, key="category")
 with c1:
     gender = st.selectbox("Cinsiyet", ["auto","female","male","unisex"], index=0, key="gender")
 with c2:
-    age_group = st.selectbox("Yaş Grubu", ["auto","teen","young_adult","adult","mature"], index=0, key="age_group")
+    age_group = st.selectbox("Yaş", ["auto","teen","young_adult","adult","mature"], index=0, key="age_group")
 with c3:
-    num_images = st.selectbox("Çıktı adedi", [1,2,3,4], index=0, key="num_images")
+    num_images = st.selectbox("Adet", [1,2,3,4], index=0, key="num_images")
 with c4:
-    file_list = st.file_uploader("Garment upload", type=["jpg","jpeg","png","webp"], accept_multiple_files=True, key="file_upl")
+    file_list = st.file_uploader("Upload", type=["jpg","jpeg","png","webp"], accept_multiple_files=True, key="file_upl")
 with c5:
-    image_url = st.text_input("veya Garment URL", key="image_url")
+    image_url = st.text_input("veya URL", key="image_url")
 
-prompt_box = st.text_area("Özel prompt (boş bırak → varsayılan)", value="", height=90, key="custom_prompt")
+prompt_box = st.text_area("Özel prompt (opsiyonel)", value="", height=80, key="custom_prompt")
 
-info_col, run_col = st.columns([1,1])
-with info_col:
+cA, cB = st.columns([1,1])
+with cA:
     st.info(f"Backend: {'Online' if ok else 'Offline'}", icon="🔌")
-with run_col:
-    run_image = st.button("Çalıştır (Sadece Foto)", type="primary", use_container_width=True, key="run_img_btn")
+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")
 
-# ============== Demo Preview =================
-st.divider()
+# ================= Demo preview (3 sabit sütun) =================
+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 kutular 9:16 ve aynı boyutta.")
+st.caption("Klasörde **input.jpg**, **tryon.jpg**, **fitstudio_video.mp4** varsa yan yana gösterilir.")
 
-dcol1, dcol2, dcol3 = st.columns(3, gap="large")
+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")
 
+def _placeholder_img(col, title):
+    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:
-    dcol1.markdown("**Input**")
-    dcol1.image(pad_to_9x16(demo_in), use_container_width=True)
+    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: dcol1.caption(f"Girdi: {sz[0]}×{sz[1]} px")
+    if sz: d1.caption(f"{sz[0]}×{sz[1]} px")
 else:
-    dcol1.markdown("**Input**"); dcol1.image(Image.new("RGB",(PREVIEW_W,PREVIEW_H),PREVIEW_BG), use_container_width=True)
+    _placeholder_img(d1, "Input")
 
 if demo_out:
-    dcol2.markdown("**Sample Output**")
-    dcol2.image(pad_to_9x16(demo_out), use_container_width=True)
+    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:
-    dcol2.markdown("**Sample Output**"); dcol2.image(Image.new("RGB",(PREVIEW_W,PREVIEW_H),PREVIEW_BG), use_container_width=True)
+    _placeholder_img(d2, "Sample Output")
 
 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)
+    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:
-    dcol3.markdown("**Sample Video**"); dcol3.image(Image.new("RGB",(PREVIEW_W,PREVIEW_H),PREVIEW_BG), use_container_width=True)
+    _placeholder_img(d3, "Sample Video")
 
-# ============== Girdi Önizleme =================
-st.divider()
-icol1, icol2, icol3 = st.columns(3, gap="large")
-
-input_preview = None
+# ================= Input preview (state) =================
 if file_list:
-    try: input_preview = file_list[0].getvalue()
-    except Exception: input_preview = None
-elif image_url:
-    input_preview = fetch_bytes(image_url)
-
-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")
+        st.session_state["input_preview_bytes"] = file_list[0].getvalue()
     except Exception:
-        pass
-else:
-    icol1.image(Image.new("RGB",(PREVIEW_W,PREVIEW_H),PREVIEW_BG), use_container_width=True)
+        st.session_state["input_preview_bytes"] = None
+elif image_url:
+    st.session_state["input_preview_bytes"] = fetch_bytes(image_url)
 
-# ============== Çalıştır =================
+# ================= Run =================
 def _build_files_payload():
     files_payload = []
     if file_list:
@@ -221,7 +230,7 @@ if run_image 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 garment görseli girin (upload veya URL).")
+        st.error("En az bir görsel girin (upload veya URL).")
     else:
         try:
             files_payload = _build_files_payload()
@@ -234,6 +243,7 @@ if run_image or run_chain:
                     out = post_chain(form, files_payload)   # 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 []
@@ -252,84 +262,86 @@ if run_image or run_chain:
         except Exception as e:
             st.error(f"Hata: {e}")
 
-# ============== Sonuçlar — Tek satır, 3 sütun (Input/Look/Video değil; Look1/2/Video) ==============
+# ================= STUDIO — TEK SATIR: Input • Look • Video =================
+st.markdown("---")
+st.subheader("Studio (yan yana 3 sabit sütun)")
+
+c1, c2, c3 = 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)
+else:
+    _placeholder_img(c1, "Input")
+
+# 2) Look (ilk sonuç / yoksa demo_out / yoksa boş)
 res = st.session_state.get("results") or {}
-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")
+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)
+
+if look_b:
+    c2.markdown("**Look**")
+    c2.image(pad_to_aspect(look_b, TARGET_ASPECT), use_container_width=True)
+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)
+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")
+
+if gen_video and go_video:
+    src_for_video = urls[0] if urls else None
+    if not src_for_video:
+        st.warning("Video için kaynak görsel yok.")
     else:
-        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.")
+        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 — Studio satırındaki Video kutusunda görüntülenir.")
         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": 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 =================
+            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 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.sidebar:
     st.caption(f"Resolved API_BASE: {API_BASE}")
     st.caption("Auth header: " + ("ON" if HF_TOKEN else "OFF"))
@@ -344,4 +356,6 @@ 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.session_state["input_preview_bytes"] = None
+        st.success("Results cleared.")