Upload streamlit_app.py

streamlit_app.py

@@ -1,14 +1,17 @@
-# streamlit_app.py — Fit Studio AI (Fashion & Apparel) v0.4 UI
+# streamlit_app.py — Fit Studio AI (Fashion & Apparel) v0.5 UI
 # Still Image (VTO) → (optional) Runway Video
-# Demo preview: same folder "input.jpg" (girdi), "tryon.jpg" (örnek çıktı), "fitstudio_video.mp4" (örnek video)
+# Demo preview: same folder "input.jpg", "tryon.jpg", "fitstudio_video.mp4"
+# Notlar:
+#  - Tüm kutular (Input / Output / Video) eş boyutta kare kutular olarak gösterilir.
+#  - Cinsiyet ve yaş grubu seçimleri prompt’a akıllıca enjekte edilir.
 
-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
+import streamlit.components.v1 as components
 
 # ================= Env & API (robust) =================
-def _env(k):
-    return (os.getenv(k) or "").strip().strip("'\"")
+def _env(k): return (os.getenv(k) or "").strip().strip("'\"")
 
 API_BASE = (
     _env("FITSTUDIO_API")
@@ -37,17 +40,20 @@ if not API_BASE:
     st.stop()
 
 HEADERS = {"Authorization": f"Bearer {HF_TOKEN}"} if HF_TOKEN else {}
-PREVIEW_SIZE = int(os.getenv("PREVIEW_SIZE", "512"))
+
+# Kare kutu hedef boyutu (px)
+def _clampi(v, lo, hi):
+    try: v = int(v)
+    except: v = 360
+    return max(lo, min(hi, v))
+
+TILE = _clampi(os.getenv("TILE_SIZE", "360"), 240, 720)  # tüm kutular için tek boyut
+PREVIEW_SIZE = TILE  # görüntü önizleme üretiminde de aynı değer
 
 # ================= Session State (ilk yük) =================
-defaults = {
-    "results": None,
-    "job_counter": 0,
-    "duration": "6",
-}
+defaults = {"results": None, "job_counter": 0, "duration": "6"}
 for k, v in defaults.items():
-    if k not in st.session_state:
-        st.session_state[k] = v
+    if k not in st.session_state: st.session_state[k] = v
 
 # ================= Yardımcılar =================
 def _needs_auth(url: str) -> bool:
@@ -58,8 +64,7 @@ def fetch_bytes(url_or_path: str | None):
     """
     URL, outputs/ yolu veya mevcut klasörden dosya okur.
     """
-    if not url_or_path:
-        return None
+    if not url_or_path: return None
     try:
         p = Path(url_or_path)
         if p.is_file():
@@ -100,101 +105,129 @@ def square_preview_bytes(img_bytes: bytes, size: int = PREVIEW_SIZE, bg_rgb=(255
     canvas.paste(im_resized, off, im_resized)
     buf = io.BytesIO(); canvas.save(buf, format="PNG"); return buf.getvalue()
 
-def first_present(d: dict, keys: list, default=None):
-    for k in keys:
-        v = d.get(k)
-        if v:
-            return v
-    return default
-
-def show_tile(col, title, url: str | None, bg_rgb=(255,255,255), filename_stub="image", key_prefix=""):
+def show_img_tile(col, title, src: str | bytes | None, filename_stub="image", key_prefix=""):
     col.subheader(title)
-    if not url:
+    if not src:
         placeholder = Image.new("RGBA", (PREVIEW_SIZE, PREVIEW_SIZE), (0,0,0,0))
-        col.image(placeholder, use_container_width=True)
-        col.caption("—")
-        return None, None
-
-    b = fetch_bytes(url)
+        col.image(placeholder, width=TILE)
+        col.caption("—"); return None, None
+    b = None
+    try:
+        b = src if isinstance(src, (bytes, bytearray)) else fetch_bytes(src)
+    except Exception:
+        b = None
     if not b:
-        col.warning("Görsel yüklenemedi")
-        return None, None
-
-    pv = square_preview_bytes(b, size=PREVIEW_SIZE, bg_rgb=bg_rgb)
-    col.image(pv, use_container_width=True)
+        col.warning("Görsel yüklenemedi"); return None, None
+    pv = square_preview_bytes(b, size=PREVIEW_SIZE, bg_rgb=(255,255,255))
+    col.image(pv, width=TILE)
     sz = image_size_from_bytes(b)
-    if sz:
-        col.caption(f"Gerçek çözünürlük: {sz[0]}×{sz[1]} px")
-
+    if sz: col.caption(f"Gerçek: {sz[0]}×{sz[1]} px")
     ext = infer_ext(b)
     mime = "image/jpeg" if ext in [".jpg",".jpeg"] else ("image/png" if ext==".png" else "image/webp")
-    col.download_button(
-        "İndir (tam kalite)",
-        data=b,
-        file_name=f"{filename_stub}{ext}",
-        mime=mime,
-        key=f"{key_prefix}_{filename_stub}_dl"
-    )
-    return url, b
-
-def show_video_tile(col, title, video_source: str | bytes | None, key_prefix=""):
+    col.download_button("İndir (tam kalite)", data=b, file_name=f"{filename_stub}{ext}", mime=mime,
+                        key=f"{key_prefix}_{filename_stub}_dl")
+    return src, b
+
+def _b64(vb: bytes) -> str:
+    return base64.b64encode(vb).decode("utf-8")
+
+def show_video_tile(col, title, src: str | bytes | None, key_prefix=""):
+    """
+    Kare video kutusu: WIDTH=TILE, HEIGHT=TILE. İçeride <video> object-fit: cover.
+    """
     col.subheader(title)
-    if not video_source:
-        col.caption("—")
-        return None
-    try:
-        if isinstance(video_source, (bytes, bytearray)):
-            col.video(video_source, format="video/mp4")
-            vb = video_source
-        else:
-            vb = fetch_bytes(video_source) if isinstance(video_source, str) else None
-            if vb:
-                col.video(vb, format="video/mp4")
-        if vb:
-            col.download_button("Video indir (MP4)", data=vb, file_name="fitstudio_video.mp4", mime="video/mp4",
-                                key=f"{key_prefix}_video_dl")
-        return vb
-    except Exception:
-        col.info("Video yüklenemedi.")
+    if not src:
+        # boş kare placeholder
+        ph_html = f"""
+        <div style="width:{TILE}px;height:{TILE}px;border-radius:12px;background:#111;display:flex;align-items:center;justify-content:center;color:#bbb;font:500 14px system-ui;">
+            —
+        </div>"""
+        components.html(ph_html, height=TILE+4)
         return None
+    vb = src if isinstance(src, (bytes, bytearray)) else fetch_bytes(src)
+    if not vb:
+        components.html(f"<div style='width:{TILE}px;height:{TILE}px;background:#111;border-radius:12px'></div>", height=TILE+4)
+        col.caption("Video yüklenemedi."); return None
+    data_url = f"data:video/mp4;base64,{_b64(vb)}"
+    html = f"""
+    <div style="width:{TILE}px;height:{TILE}px;border-radius:12px;overflow:hidden;background:#000;">
+      <video src="{data_url}" controls playsinline style="width:100%;height:100%;object-fit:cover;display:block;"></video>
+    </div>
+    """
+    components.html(html, height=TILE+48)
+    col.download_button("Video indir (MP4)", data=vb, file_name="fitstudio_video.mp4", mime="video/mp4",
+                        key=f"{key_prefix}_video_dl")
+    return vb
 
 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()
+            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)
-        r.raise_for_status()
-        return True
+        r.raise_for_status(); return True
     except Exception:
         return False
 
 def post_image_edit(data: dict, files_payload):
     r = requests.post(f"{API_BASE}/v1/image/edit", data=data, files=files_payload or None,
                       headers=HEADERS if HF_TOKEN else None, timeout=600)
-    r.raise_for_status()
-    return r.json()
+    r.raise_for_status(); return r.json()
 
 def post_chain(data: dict, files_payload):
     payload = {**data, "to_video": "false"}  # video UI'da 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()
+    r.raise_for_status(); return r.json()
 
 def post_video(image_url: str, duration="6", resolution="768P", prompt_optimizer=True):
     payload = {"image_url": image_url, "duration": duration, "resolution": resolution,
                "prompt_optimizer": "true" if prompt_optimizer else "false"}
     r = requests.post(f"{API_BASE}/v1/video/from-image", data=payload,
                       headers=HEADERS if HF_TOKEN else None, timeout=600)
-    r.raise_for_status()
-    return r.json()
+    r.raise_for_status(); return r.json()
+
+# ================= Prompt bileşimi (cinsiyet + yaş) =================
+def _map_gender_txt(tr):
+    if tr == "Kadın": return "female"
+    if tr == "Erkek": return "male"
+    return "auto"
+
+def _map_age_txt(tr):
+    # Güvenli aralıklar (18+)
+    if tr.startswith("Genç"): return "young adult (18–25)"
+    if tr.startswith("Yetişkin"): return "adult (26–45)"
+    if tr.startswith("Olgun"): return "mature adult (46+)"
+    return "auto"
+
+def compose_prompt(base_user_prompt: str, category: str, gender_tr: str, age_tr: str) -> str:
+    gender = _map_gender_txt(gender_tr)
+    age = _map_age_txt(age_tr)
+    parts = []
+    if base_user_prompt and len(base_user_prompt.strip()) > 10:
+        parts.append(base_user_prompt.strip())
+    else:
+        # kısa, sağlam bir temel prompt
+        base = ("Commercial fashion catalog still; full-body, face visible, feet not cropped; "
+                "photorealistic; preserve garment identity (design, texture, color, stitching, logos) exactly; "
+                "no added text/logos; modern Istanbul street style; neutral daylight.")
+        if category == "underwear":
+            base += " Wear ONLY the uploaded underwear garment; neutral, non-sexual catalog pose."
+        parts.append(base)
+    model_rules = []
+    if gender != "auto":
+        model_rules.append(f"Model gender presentation: {gender}.")
+    if age != "auto":
+        model_rules.append(f"Age group cues: {age}. Avoid depicting minors.")
+    if model_rules:
+        parts.append(" ".join(model_rules))
+    # tutarlılık
+    parts.append("Hands visible; 3/4 or frontal pose; avoid cropping; single person; no artefacts.")
+    return " ".join(parts)
 
 # ================= Sayfa =================
 st.set_page_config(page_title="Fit Studio AI", layout="wide", page_icon="🧵")
@@ -203,84 +236,72 @@ st.caption("Fashion & Apparel — Still Image (VTO) → (optional) Runway Video"
 
 # ================= Üst Kontrol Şeridi =================
 ok = backend_ok()
-c0, c1, c2, c3, c4 = st.columns([1.0, 1.8, 1.8, 1.4, 1.6])
+c0, c_gender, c_age, c1, c2, c3 = st.columns([1.0, 1.0, 1.2, 1.6, 1.4, 1.6])
 
 with c0:
     category = st.selectbox("Kategori", ["general","underwear"], index=0, key="category")
+
+with c_gender:
+    gender_tr = st.radio("Cinsiyet", ["Otomatik","Kadın","Erkek"], index=0, horizontal=True, key="gender_tr",
+                         help="Modelin cinsiyet sunumunu seçin.")
+
+with c_age:
+    age_tr = st.selectbox("Yaş grubu",
+                          ["Otomatik","Genç (18–25)","Yetişkin (26–45)","Olgun (46+)"],
+                          index=0, key="age_tr",
+                          help="Güvenli aralık: 18 yaş ve üzeri.")
+
 with c1:
-    file_list = st.file_uploader("Garment image (upload)", type=["jpg","jpeg","png","webp"], accept_multiple_files=True, key="file_upl")
+    file_list = st.file_uploader("Garment image (upload)", type=["jpg","jpeg","png","webp"],
+                                 accept_multiple_files=True, key="file_upl")
 with c2:
     image_url = st.text_input("veya Garment URL", key="image_url")
 with c3:
-    num_images = st.selectbox("Çıktı adedi", [1,2,3,4], index=0, key="num_images")
-with c4:
-    custom_prompt = st.text_area("Özel prompt (boş bırak → varsayılan)", value="", height=80, key="custom_prompt")
+    custom_prompt = st.text_area("Özel prompt (opsiyonel)", value="", height=80, key="custom_prompt")
 
-bA, bB = st.columns([1.0, 1.0])
+bA, bB, bC = st.columns([1.0, 1.0, 1.0])
 with bA:
-    st.info(f"Backend: {'Online' if ok else 'Offline'}", icon="🔌")
+    st.info(f"Backend: {'Online' if ok else 'Offline'} • Tile: {TILE}px", icon="🔌")
 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")
+    num_images = st.selectbox("Çıktı adedi", [1,2,3,4], index=0, key="num_images")
+with bC:
+    colbtn1, colbtn2 = st.columns(2)
+    with colbtn1:
+        run_image = st.button("Çalıştır (Foto)", type="primary", use_container_width=True, key="run_img_btn")
+    with colbtn2:
+        run_chain = st.button("Zincir (Foto → Video hazırlık)", use_container_width=True, key="run_chain_btn")
+
+# Güvenlik: underwear + 18 altı seçenek yok; ek bir uyarı da koyalım
+if category == "underwear" and age_tr in {"Otomatik"}:
+    st.caption("ℹ️ Underwear için yaş grubu otomatik bırakıldı; sistem yetişkin güvenli aralıkta yorumlar.")
 
 # ================= Demo Preview (mevcut klasörden) =================
 st.markdown("---")
 st.subheader("Demo preview (çalıştırmadan önce örnek)")
+st.caption("Aynı klasörden **input.jpg**, **tryon.jpg**, **fitstudio_video.mp4** okunur. Tüm kutular eş boyutta kare.")
 
-dp_in, dp_sp, dp_v = st.columns([1,1,1])
+dp_in, dp_out, dp_vid = st.columns(3)
 in_bytes = fetch_bytes("input.jpg")
-if in_bytes:
-    dp_in.subheader("Input")
-    dp_in.image(square_preview_bytes(in_bytes, size=PREVIEW_SIZE, bg_rgb=(255,255,255)), use_container_width=True)
-    sz = image_size_from_bytes(in_bytes)
-    if sz: dp_in.caption(f"Input: {sz[0]}×{sz[1]} px")
-    dp_in.download_button("İndir (tam kalite)", data=in_bytes, file_name=f"input{infer_ext(in_bytes)}",
-                          mime="image/jpeg", key="demo_input_dl")
-else:
-    show_tile(dp_in, "Input", None)
+show_img_tile(dp_in, "Input", in_bytes, filename_stub="input", key_prefix="demo")
 
 try_bytes = fetch_bytes("tryon.jpg")
-if try_bytes:
-    dp_sp.subheader("Sample Output")
-    dp_sp.image(square_preview_bytes(try_bytes, size=PREVIEW_SIZE, bg_rgb=(255,255,255)), use_container_width=True)
-    sz2 = image_size_from_bytes(try_bytes)
-    if sz2: dp_sp.caption(f"Output: {sz2[0]}×{sz2[1]} px")
-    dp_sp.download_button("İndir (tam kalite)", data=try_bytes, file_name=f"tryon{infer_ext(try_bytes)}",
-                          mime="image/jpeg", key="demo_try_dl")
-else:
-    show_tile(dp_sp, "Sample Output", None)
+show_img_tile(dp_out, "Sample Output", try_bytes, filename_stub="tryon", key_prefix="demo")
 
 demo_vbytes = fetch_bytes("fitstudio_video.mp4")
-if demo_vbytes:
-    show_video_tile(dp_v, "Sample Video", demo_vbytes, key_prefix="demo")
-else:
-    dp_v.subheader("Sample Video")
-    dp_v.caption("—")
+show_video_tile(dp_vid, "Sample Video", demo_vbytes, key_prefix="demo")
 
 # ================= Girdi Önizleme =================
 st.markdown("---")
 g1, g2, g3, g4 = st.columns(4)
-white_bg = (255,255,255)
 
 input_preview = None
 if file_list:
-    try:
-        input_preview = file_list[0].getvalue()
-    except Exception:
-        input_preview = None
+    try: input_preview = file_list[0].getvalue()
+    except Exception: input_preview = None
 elif image_url:
     input_preview = fetch_bytes(image_url)
 
-if input_preview:
-    g1.subheader("Input")
-    g1.image(square_preview_bytes(input_preview, size=PREVIEW_SIZE, bg_rgb=white_bg), use_container_width=True)
-    try:
-        sz = Image.open(io.BytesIO(input_preview)).size
-        g1.caption(f"{sz[0]}×{sz[1]} px")
-    except Exception:
-        g1.caption("—")
-else:
-    show_tile(g1, "Input", None)
+show_img_tile(g1, "Input (preview)", input_preview, filename_stub="input_preview", key_prefix="preview")
 
 # ================ Çalıştır ================
 def _build_files_payload():
@@ -291,14 +312,17 @@ def _build_files_payload():
     return files_payload
 
 def _common_form_data():
+    # Prompt’u cinsiyet+yaş ile kompoze et
+    prompt_final = compose_prompt(st.session_state.get("custom_prompt",""),
+                                  st.session_state["category"],
+                                  st.session_state["gender_tr"],
+                                  st.session_state["age_tr"])
     data = {
         "category": st.session_state["category"],
         "num_images": str(st.session_state["num_images"]),
+        "prompt": prompt_final,
     }
-    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 image_url: data["image_urls"] = image_url.strip()
     return data
 
 if run_image or run_chain:
@@ -310,7 +334,6 @@ if run_image or run_chain:
         try:
             files_payload = _build_files_payload()
             form = _common_form_data()
-
             with st.spinner("Çalışıyor…"):
                 if run_image:
                     out = post_image_edit(form, files_payload)
@@ -319,6 +342,7 @@ if run_image or run_chain:
                     out = post_chain(form, files_payload)   # to_video=false
                     image_json = out.get("image_step") or out
 
+            # ---- Çıktıları çıkar ----
             imgs = (image_json.get("result") or {}).get("images") or []
             urls = [i.get("url") for i in imgs if isinstance(i, dict) and i.get("url")]
             st.session_state["job_counter"] += 1
@@ -328,47 +352,42 @@ if run_image or run_chain:
                 "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}")
 
-# ================ Sonuçları Satırda Yan Yana Göster ================
+# ================ Sonuçları Satırda Yan Yana (eş boyut) ================
 res = st.session_state.get("results") or {}
 if res:
     key_prefix = f"job{st.session_state['job_counter']}"
     img_urls = res.get("image_urls") or []
     video_url = res.get("video_url")
 
-    # 1. Satır: 3 görsel + 1 video sütunu (video varsa göster)
-    c1, c2, c3, c4 = st.columns([1,1,1,1])
+    # 1. Satır: 3 kare görsel + 1 kare video (varsa)
+    c1, c2, c3, c4 = st.columns(4)
     named = []
-
-    # İlk 3 görsel
     tiles = [c1, c2, c3]
     for idx in range(min(3, len(img_urls))):
         u = img_urls[idx]
         title = "Look" if idx == 0 else f"Look #{idx+1}"
-        _, b = show_tile(tiles[idx], title, u, bg_rgb=white_bg, filename_stub=f"look_{idx+1}", key_prefix=f"{key_prefix}_{idx}")
-        if b:
-            named.append((f"look_{idx+1}{infer_ext(b)}", b))
+        _, b = show_img_tile(tiles[idx], title, u, filename_stub=f"look_{idx+1}", key_prefix=f"{key_prefix}_{idx}")
+        if b: named.append((f"look_{idx+1}{infer_ext(b)}", b))
 
-    # Video sütunu (küçük kadraj: sütun genişliği kadar)
     vbytes = None
     if video_url:
         vbytes = show_video_tile(c4, "Video", video_url, key_prefix=key_prefix)
     else:
-        c4.subheader("Video")
-        c4.caption("Henüz üretilmedi.")
+        show_video_tile(c4, "Video", None, key_prefix=key_prefix)
 
-    # 2. Satır: Video üretim kontrolleri (isteğe bağlı)
+    # 2. Satır: Video üretim kontrolleri
     st.markdown("---")
     colv1, colv2, colv3 = st.columns([1.1, 1.0, 1.2])
     with colv1:
         gen_video = st.checkbox("Bu sonuçtan video üret", value=False, key="video_toggle")
     with colv2:
-        st.selectbox("Video süresi", ["6","10"], index=(0 if st.session_state["duration"]=="6" else 1), key="duration_select")
+        st.selectbox("Video süresi", ["6","10"],
+                     index=(0 if st.session_state["duration"]=="6" else 1), key="duration_select")
     with colv3:
         go_video = st.button("Video Oluştur", use_container_width=True, key="video_btn")
 
@@ -378,33 +397,25 @@ if res:
             st.warning("Video için kaynak görsel yok.")
         else:
             with st.spinner("Video üretiliyor…"):
-                v = post_video(
-                    src_for_video,
-                    duration=st.session_state.get("duration_select","6"),
-                    resolution="768P",
-                    prompt_optimizer=True
-                )
+                v = post_video(src_for_video,
+                               duration=st.session_state.get("duration_select","6"),
+                               resolution="768P",
+                               prompt_optimizer=True)
             vurl = (v.get("result") or {}).get("video", {}).get("url")
             if vurl:
                 st.session_state["results"]["video_url"] = vurl
                 video_url = vurl
-                # Hemen üst satırdaki sütuna küçük kadrajda göster
                 vbytes = show_video_tile(c4, "Video", video_url, key_prefix=key_prefix)
             else:
                 st.info("Video URL gelmedi.")
 
     # ZIP indir
     if named or vbytes:
-        if vbytes:
-            named.append(("video.mp4", vbytes))
+        if vbytes: named.append(("video.mp4", vbytes))
         zip_bytes = make_zip(named)
-        st.download_button(
-            "Tümünü indir (ZIP)",
-            data=zip_bytes,
-            file_name="fitstudio_outputs.zip",
-            mime="application/zip",
-            key=f"{key_prefix}_zip_dl"
-        )
+        st.download_button("Tümünü indir (ZIP)", data=zip_bytes,
+                           file_name="fitstudio_outputs.zip", mime="application/zip",
+                           key=f"{key_prefix}_zip_dl")
 
     # Debug
     with st.expander("Debug"):
@@ -415,21 +426,23 @@ if res:
             "has_auth_header": bool(HF_TOKEN),
             "image_urls": img_urls,
             "video_url": res.get("video_url"),
+            "tile_px": TILE,
+            "gender": gender_tr,
+            "age_group": age_tr,
         })
 
 # ================= Sidebar (teşhis) =================
 with st.sidebar:
     st.caption(f"Resolved API_BASE: {API_BASE}")
     st.caption("Auth header: " + ("ON" if HF_TOKEN else "OFF"))
+    st.caption(f"Tile size: {TILE}px (env: TILE_SIZE)")
 
     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])
+            try: st.json(r.json())
+            except Exception: st.code((r.text or "")[:1000])
         except Exception as e:
             st.error(f"Health error: {e}")