Update app.py

app.py

@@ -5,63 +5,58 @@ import tempfile
 from typing import Optional, Tuple, List
 
 import gradio as gr
-import spaces  # ZeroGPU runtime requires at least one @spaces.GPU-decorated function
+import spaces
 from PIL import Image
 from gradio_client import Client, handle_file
 from huggingface_hub import login
 
-# ----------------------------
-# Remote Space (IDM-VTON)
-# ----------------------------
 SPACE = "yisol/IDM-VTON"
 API_NAME = "/tryon"
 
 # ----------------------------
-# Demo auth (no HF accounts needed)
-# Set these in HF Space Secrets:
-#   DEMO_USER=companydemo
-#   DEMO_PASS=your-strong-password
+# Auth (from HF Secrets)
 # ----------------------------
 DEMO_USER = os.getenv("DEMO_USER", "").strip()
 DEMO_PASS = os.getenv("DEMO_PASS", "").strip()
 APP_AUTH = (DEMO_USER, DEMO_PASS) if (DEMO_USER and DEMO_PASS) else None
 
 # ----------------------------
-# Garment catalog folder in repo
+# Garment catalog
 # ----------------------------
 GARMENT_DIR = "garments"
 ALLOWED_EXTS = (".png", ".jpg", ".jpeg", ".webp")
 
 def list_garments() -> List[str]:
     try:
-        files = []
-        for f in os.listdir(GARMENT_DIR):
-            if f.lower().endswith(ALLOWED_EXTS) and not f.startswith("."):
-                files.append(f)
-        files.sort()
-        return files
+        return sorted(
+            f for f in os.listdir(GARMENT_DIR)
+            if f.lower().endswith(ALLOWED_EXTS) and not f.startswith(".")
+        )
     except Exception:
         return []
 
+def garment_path(filename: str) -> str:
+    return os.path.join(GARMENT_DIR, filename)
+
+def load_garment_pil(filename: str) -> Optional[Image.Image]:
+    path = garment_path(filename)
+    if os.path.exists(path):
+        return Image.open(path).convert("RGB")
+    return None
+
+def build_gallery_items(files: List[str]):
+    return [(garment_path(f), "") for f in files]
+
 # ----------------------------
-# HF token (optional)
+# HF login (optional)
 # ----------------------------
 HF_TOKEN = os.getenv("HF_TOKEN", "")
-
-print("HF_TOKEN set:", bool(HF_TOKEN), "len:", len(HF_TOKEN) if HF_TOKEN else 0)
-
 if HF_TOKEN:
     try:
         login(token=HF_TOKEN, add_to_git_credential=False)
-        print("HF login: OK")
-    except Exception as e:
-        print("HF login: FAILED:", str(e)[:200])
-else:
-    print("HF login: skipped (no token in env)")
+    except:
+        pass
 
-# ----------------------------
-# Client caching
-# ----------------------------
 _client: Optional[Client] = None
 
 def reset_client():
@@ -69,53 +64,23 @@ def reset_client():
     _client = None
 
 def get_client() -> Client:
-    """
-    gradio_client differs by version. Newer versions support hf_token=...
-    Older versions don't. We fallback gracefully.
-    """
     global _client
     if _client is None:
         try:
-            if HF_TOKEN:
-                _client = Client(SPACE, hf_token=HF_TOKEN)  # may raise TypeError on older versions
-            else:
-                _client = Client(SPACE)
+            _client = Client(SPACE)
         except TypeError:
             _client = Client(SPACE)
     return _client
 
-# ----------------------------
-# Helpers
-# ----------------------------
-def clamp_int(x, lo, hi):
-    try:
-        x = int(x)
-    except Exception:
-        x = lo
-    return max(lo, min(hi, x))
-
-def save_pil_temp(pil_img: Image.Image, suffix: str = ".png") -> str:
-    f = tempfile.NamedTemporaryFile(delete=False, suffix=suffix)
+def save_pil_temp(pil_img: Image.Image) -> str:
+    f = tempfile.NamedTemporaryFile(delete=False, suffix=".png")
     path = f.name
     f.close()
-    pil_img.save(path, format="PNG")  # no resize/compress
+    pil_img.save(path, format="PNG")
     return path
 
-def load_garment_pil(filename: str) -> Optional[Image.Image]:
-    if not filename:
-        return None
-    path = os.path.join(GARMENT_DIR, filename)
-    if not os.path.exists(path):
-        return None
-    try:
-        return Image.open(path).convert("RGB")
-    except Exception:
-        return None
-
 # ----------------------------
-# Simple global rate limit (anti spam)
-# NOTE: this is a global limiter across all users for this Space.
-# For internal demo it's usually enough. Adjust interval as needed.
+# Rate limit
 # ----------------------------
 _last_call_ts = 0.0
 
@@ -123,204 +88,116 @@ def allow_call(min_interval_sec: float = 3.0) -> Tuple[bool, str]:
     global _last_call_ts
     now = time.time()
     if now - _last_call_ts < min_interval_sec:
-        wait = max(0.0, min_interval_sec - (now - _last_call_ts))
-        return False, f"⏳ Слишком часто. Подождите {wait:.1f} сек."
+        wait = min_interval_sec - (now - _last_call_ts)
+        return False, f"⏳ Подождите {wait:.1f} сек."
     _last_call_ts = now
     return True, ""
 
 # ----------------------------
-# Core inference (remote call)
-# ZeroGPU: keep duration LOW to avoid burning quota
+# Try-on
 # ----------------------------
 @spaces.GPU(duration=20)
-def tryon_remote(person_pil, garment_filename, garment_desc, auto_mask, crop_center, denoise_steps, seed):
+def tryon_remote(person_pil, selected_filename):
     ok, msg = allow_call(3.0)
     if not ok:
         return None, msg
 
     if person_pil is None:
         return None, "❌ Загрузите фото человека"
+    if not selected_filename:
+        return None, "❌ Выберите одежду"
 
-    if not garment_filename:
-        return None, "❌ Выберите одежду из списка"
-
-    garment_pil = load_garment_pil(garment_filename)
+    garment_pil = load_garment_pil(selected_filename)
     if garment_pil is None:
-        return None, "❌ Не удалось загрузить выбранную одежду (проверьте файл в папке garments/)"
-
-    denoise_steps = clamp_int(denoise_steps, 10, 40)
-    seed = clamp_int(seed, 0, 999999)
-
-    garment_desc = (garment_desc or "").strip()
-    if not garment_desc:
-        garment_desc = "a photo of a garment"
+        return None, "❌ Ошибка загрузки одежды"
 
     p_path = save_pil_temp(person_pil)
     g_path = save_pil_temp(garment_pil)
 
     try:
-        last_err = None
+        client = get_client()
 
-        for attempt in range(1, 7):
-            try:
-                client = get_client()
-
-                result = client.predict(
-                    dict={"background": handle_file(p_path), "layers": [], "composite": None},
-                    garm_img=handle_file(g_path),
-                    garment_des=garment_desc,
-                    is_checked=bool(auto_mask),
-                    is_checked_crop=bool(crop_center),
-                    denoise_steps=int(denoise_steps),
-                    seed=int(seed),
-                    api_name=API_NAME,
-                )
-
-                if isinstance(result, (list, tuple)):
-                    result = result[0]
-
-                out = Image.open(result).convert("RGB")
-                return out, f"✅ Готово (одежда: {garment_filename}, steps={denoise_steps}, seed={seed})"
-
-            except Exception as e:
-                last_err = e
-                msg_l = str(e).lower()
-
-                is_timeout = (
-                    "write operation timed out" in msg_l
-                    or "read operation timed out" in msg_l
-                    or "timed out" in msg_l
-                )
-
-                is_busy = (
-                    "too many requests" in msg_l
-                    or "queue" in msg_l
-                    or "too busy" in msg_l
-                    or "overloaded" in msg_l
-                    or "capacity" in msg_l
-                    or "zerogpu" in msg_l
-                )
-
-                is_expired = "expired zerogpu proxy token" in msg_l or "zerogpu proxy token" in msg_l
-
-                if is_timeout or is_busy or is_expired:
-                    reset_client()
-                    time.sleep(4.0 * attempt)
-                    continue
-
-                time.sleep(1.2 * attempt)
-
-        tail = str(last_err)[:240] if last_err else "unknown error"
-        return None, f"❌ Ошибка Space после 6 попыток: {tail}"
+        result = client.predict(
+            dict={"background": handle_file(p_path), "layers": [], "composite": None},
+            garm_img=handle_file(g_path),
+            garment_des="a photo of a garment",
+            is_checked=True,
+            is_checked_crop=True,
+            denoise_steps=25,
+            seed=42,
+            api_name=API_NAME,
+        )
+
+        if isinstance(result, (list, tuple)):
+            result = result[0]
+
+        out = Image.open(result).convert("RGB")
+        return out, "✅ Готово"
+
+    except Exception as e:
+        reset_client()
+        return None, f"❌ Ошибка: {str(e)[:200]}"
 
     finally:
         for path in (p_path, g_path):
             try:
                 os.remove(path)
-            except Exception:
+            except:
                 pass
 
-# ----------------------------
-# UI helpers
-# ----------------------------
-def refresh_garments():
-    files = list_garments()
-    value = files[0] if files else None
-    preview = load_garment_pil(value) if value else None
-    status = "✅ Каталог обновлён" if files else "⚠️ В папке garments/ пока нет изображений"
-    return gr.Dropdown(choices=files, value=value), preview, status
-
-def on_select_garment(filename: str):
-    return load_garment_pil(filename)
-
-def reset_ui():
-    files = list_garments()
-    value = files[0] if files else None
-    preview = load_garment_pil(value) if value else None
-    return None, value, preview, "", "Ожидание...", None
-
 # ----------------------------
 # UI
 # ----------------------------
 CUSTOM_CSS = """
 footer {display:none !important;}
-#api-info {display:none !important;}
-div[class*="footer"] {display:none !important;}
-button[aria-label="Settings"] {display:none !important;}
 """
 
-initial_files = list_garments()
-initial_value = initial_files[0] if initial_files else None
-initial_preview = load_garment_pil(initial_value) if initial_value else None
+files = list_garments()
+items = build_gallery_items(files)
 
 with gr.Blocks(title="Virtual Try-On Rendez-vous", css=CUSTOM_CSS) as demo:
     gr.Markdown("# Virtual Try-On Rendez-vous")
 
+    selected_state = gr.State(None)
+
     with gr.Row():
         with gr.Column():
             person = gr.Image(label="Фото человека", type="pil", height=420)
 
-            with gr.Row():
-                garment_selector = gr.Dropdown(
-                    choices=initial_files,
-                    value=initial_value,
-                    label="Выберите одежду из каталога (garments/)"
-                )
-                refresh_btn = gr.Button("🔄 Обновить каталог", variant="secondary")
-
-            garment_preview = gr.Image(label="Предпросмотр одежды", type="pil", height=320)
-
-            garment_desc = gr.Textbox(label="Описание одежды (опционально)", value="")
-
-            with gr.Accordion("Настройки", open=False):
-                auto_mask = gr.Checkbox(label="Auto-mask (Space)", value=True)
-                crop_center = gr.Checkbox(label="Crop по центру", value=True)
-                denoise_steps = gr.Slider(10, 40, value=25, step=1, label="Denoise steps")
-                seed = gr.Slider(0, 999999, value=42, step=1, label="Seed")
-
-            with gr.Row():
-                run = gr.Button("Примерить", variant="primary")
-                reset = gr.Button("Сбросить", variant="secondary")
+            garment_gallery = gr.Gallery(
+                label="Выберите одежду",
+                value=items,
+                columns=4,
+                height=300
+            )
 
+            run = gr.Button("Примерить", variant="primary")
             status = gr.Textbox(value="Ожидание...", interactive=False)
 
         with gr.Column():
             out = gr.Image(label="Результат", type="pil", height=760)
 
-    # Preview updates
-    garment_selector.change(
-        fn=on_select_garment,
-        inputs=[garment_selector],
-        outputs=[garment_preview]
-    )
+    def on_select(files, evt: gr.SelectData):
+        if not files:
+            return None
+        return files[evt.index]
 
-    # Refresh catalog (after uploading new files)
-    refresh_btn.click(
-        fn=refresh_garments,
-        inputs=[],
-        outputs=[garment_selector, garment_preview, status]
+    garment_gallery.select(
+        fn=on_select,
+        inputs=[gr.State(files)],
+        outputs=[selected_state]
     )
 
-    # Run try-on
     run.click(
         fn=tryon_remote,
-        inputs=[person, garment_selector, garment_desc, auto_mask, crop_center, denoise_steps, seed],
-        outputs=[out, status],
-    )
-
-    # Reset UI
-    reset.click(
-        fn=reset_ui,
-        inputs=[],
-        outputs=[person, garment_selector, garment_preview, garment_desc, status, out],
+        inputs=[person, selected_state],
+        outputs=[out, status]
     )
 
 if __name__ == "__main__":
     demo.launch(
         server_name="0.0.0.0",
         server_port=7860,
-        share=False,
-        debug=False,
-        ssr_mode=False,
-        auth=APP_AUTH,  # ✅ login/password gate
+        auth=APP_AUTH,
+        share=False
     )