Update app.py

app.py

@@ -42,11 +42,15 @@ WHISPER_DIR = CACHE_DIR / "whisper"
 for _d in (MODEL_DIR, ANIM_DIR, WHISPER_DIR):
     _d.mkdir(parents=True, exist_ok=True)
 
-VRM_REPO = os.environ.get("OC_VRM_REPO", "OpenCompanion/assets")
-VRM_FILE = os.environ.get("OC_VRM_FILE", "Ani.vrm")
-VRMA_ZIP = os.environ.get("OC_VRMA_ZIP", "all_vrma.zip")
-LLM_MODEL = os.environ.get("OC_LLM_MODEL", "openbmb/MiniCPM5-1B")
-WHISPER_SZ = os.environ.get("OC_WHISPER", "base")
+VRM_FILE   = os.environ.get("OC_VRM_FILE",  "Ani.vrm")
+VRMA_ZIP   = os.environ.get("OC_VRMA_ZIP",  "all_vrma.zip")
+LLM_MODEL  = os.environ.get("OC_LLM_MODEL", "openbmb/MiniCPM5-1B")
+WHISPER_SZ = os.environ.get("OC_WHISPER",   "base")
+
+# Auto-detect HF Space repo from SPACE_ID env var (set automatically on HF Spaces).
+# Fallback order: OC_VRM_REPO env → SPACE_ID → None (skip HF download)
+_SPACE_ID = os.environ.get("SPACE_ID", "")   # e.g. "MyUser/open-companion"
+VRM_REPO  = os.environ.get("OC_VRM_REPO", _SPACE_ID if _SPACE_ID else "")
 
 # ── Model globals ──────────────────────────────────────────────────────────
 _llm = _tokenizer = _whisper = None
@@ -54,26 +58,79 @@ _llm = _tokenizer = _whisper = None
 # ── Asset download ─────────────────────────────────────────────────────────
 def _ensure_vrm() -> Path:
     dest = MODEL_DIR / VRM_FILE
-    if dest.exists(): return dest
-    log.info(f"Downloading VRM {VRM_REPO}/{VRM_FILE}")
-    try:
-        p = hf_hub_download(repo_id=VRM_REPO, filename=VRM_FILE, local_dir=str(MODEL_DIR))
-        return Path(p)
-    except Exception as e:
-        log.warning(f"VRM download failed: {e}")
+    if dest.exists():
+        log.info(f"VRM already cached: {dest}")
         return dest
 
+    # 1. Check local /app directory (HF Spaces places repo files there)
+    local_candidates = [
+        Path("/app") / VRM_FILE,
+        Path(".") / VRM_FILE,
+    ]
+    for lp in local_candidates:
+        if lp.exists():
+            log.info(f"VRM found locally at {lp}, symlinking/copying to cache")
+            import shutil
+            shutil.copy2(str(lp), str(dest))
+            return dest
+
+    # 2. Download from HF repo
+    if VRM_REPO:
+        log.info(f"Downloading VRM from {VRM_REPO}/{VRM_FILE}")
+        try:
+            p = hf_hub_download(repo_id=VRM_REPO, filename=VRM_FILE,
+                                local_dir=str(MODEL_DIR), repo_type="space")
+            return Path(p)
+        except Exception as e:
+            log.warning(f"Space repo VRM download failed: {e}")
+        # Try as model/dataset repo
+        try:
+            p = hf_hub_download(repo_id=VRM_REPO, filename=VRM_FILE,
+                                local_dir=str(MODEL_DIR))
+            return Path(p)
+        except Exception as e:
+            log.warning(f"VRM download failed: {e}")
+
+    log.warning("VRM not found — browser will use CDN fallback if available")
+    return dest
+
 def _ensure_vrma_zip() -> Path:
     dest = ANIM_DIR / VRMA_ZIP
-    if dest.exists(): return dest
-    log.info(f"Downloading VRMA zip {VRM_REPO}/{VRMA_ZIP}")
-    try:
-        p = hf_hub_download(repo_id=VRM_REPO, filename=VRMA_ZIP, local_dir=str(ANIM_DIR))
-        return Path(p)
-    except Exception as e:
-        log.warning(f"VRMA zip download failed: {e}")
+    if dest.exists():
+        log.info(f"VRMA zip already cached: {dest}")
         return dest
 
+    # 1. Check local /app directory
+    local_candidates = [
+        Path("/app") / VRMA_ZIP,
+        Path(".") / VRMA_ZIP,
+    ]
+    for lp in local_candidates:
+        if lp.exists():
+            log.info(f"VRMA zip found locally at {lp}")
+            import shutil
+            shutil.copy2(str(lp), str(dest))
+            return dest
+
+    # 2. Download from HF repo
+    if VRM_REPO:
+        log.info(f"Downloading VRMA zip from {VRM_REPO}/{VRMA_ZIP}")
+        try:
+            p = hf_hub_download(repo_id=VRM_REPO, filename=VRMA_ZIP,
+                                local_dir=str(ANIM_DIR), repo_type="space")
+            return Path(p)
+        except Exception as e:
+            log.warning(f"Space repo VRMA download failed: {e}")
+        try:
+            p = hf_hub_download(repo_id=VRM_REPO, filename=VRMA_ZIP,
+                                local_dir=str(ANIM_DIR))
+            return Path(p)
+        except Exception as e:
+            log.warning(f"VRMA zip download failed: {e}")
+
+    log.warning("VRMA zip not found — browser will fetch from GitHub CDN fallback")
+    return dest
+
 def _get_anim_names(zip_path: Path) -> list:
     if not zip_path.exists(): return []
     try:
@@ -94,7 +151,7 @@ ANIM_LIST  = ', '.join(ANIM_NAMES) if ANIM_NAMES else 'neutral2.vrma'
 log.info(f"Found {len(ANIM_NAMES)} VRMAs: {ANIM_LIST[:120]}...")
 
 VRM_SERVER_PATH  = f"/file={_vrm_path}"  if _vrm_path.exists()  else ""
-VRMA_SERVER_PATH = f"/file={_vrma_path}" if _vrma_path.exists() else ""
+VRMA_SERVER_PATH = f"/file={_vrma_path}" if _vrma_path.exists() else ""  # ← fixed: was _vrm_path
 
 # ── System prompt ──────────────────────────────────────────────────────────
 SYSTEM_PROMPT = """\
@@ -1602,7 +1659,6 @@ THINK_JS = """
 with gr.Blocks(
     title="Open Companion",
     analytics_enabled=False,
-    css=CUSTOM_CSS,
 ) as demo:
 
     history_state = gr.State([])
@@ -1701,11 +1757,14 @@ async def tts_route(
 
 
 # ── Entry point ──────────────────────────────────────────────
-if __name__ == "__main__":
-    demo.launch(
-        server_name   = "0.0.0.0",
-        server_port   = int(os.environ.get("PORT", 7860)),
-        share         = False,
-        show_error    = True,
-        allowed_paths = [str(CACHE_DIR)],
-    )
+# ── Entry point ──────────────────────────────────────────────
+# Called unconditionally so HF Spaces (which imports the module) also applies css.
+# css= is the Gradio 6.0+ way; it was moved from gr.Blocks() to launch().
+demo.launch(
+    server_name   = "0.0.0.0",
+    server_port   = int(os.environ.get("PORT", 7860)),
+    share         = False,
+    show_error    = True,
+    allowed_paths = [str(CACHE_DIR)],
+    css           = CUSTOM_CSS,
+)