Update app.py

app.py

@@ -14,6 +14,7 @@ Jev-style 判別式決策互動 POC（繁體中文）
 """
 import json
 import os
+import shutil
 import subprocess
 import threading
 import time
@@ -138,13 +139,13 @@ def _ensure_backend_locked():
         _set_phase("ready", "jevos 已在運行")
         return
     try:
-        jev_dir = _find_or_prepare_backend()
-        binary = os.path.join(jev_dir, "jev")
+        jev_dir, binary = _find_or_prepare_backend()
         # 保險：確保可執行（git/網頁上傳可能掉執行權限）
         try:
             os.chmod(binary, 0o755)
         except Exception:
             pass
+        _ensure_model_weights(os.path.join(jev_dir, "model"))
         _set_phase("starting", "啟動 jevos…")
         _server = subprocess.Popen([binary, "serve"], cwd=jev_dir,
                                    stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
@@ -159,13 +160,52 @@ def _ensure_backend_locked():
         raise
 
 
+def _ensure_model_weights(model_dir):
+    """確保 openvino_model.bin 存在；缺失時從 release 下載 zip 並只解出該檔（支援續傳）。"""
+    bin_path = os.path.join(model_dir, "openvino_model.bin")
+    if os.path.isfile(bin_path):
+        return
+    print("[poc] 缺少 openvino_model.bin，從 release 下載模型包並解出該檔…", flush=True)
+    _set_phase("downloading", "下載模型包（約 630MB，只取權重檔，支援續傳）…")
+    zf = _dl(MODEL_URL, os.path.join(DATA, "jevos-v3-openvino-int8.zip"))
+    _set_phase("extracting", "解出 openvino_model.bin…")
+    os.makedirs(model_dir, exist_ok=True)
+    with zipfile.ZipFile(zf) as z:
+        for name in z.namelist():
+            if name.endswith("openvino_model.bin"):
+                with z.open(name) as src, open(bin_path, "wb") as dst:
+                    shutil.copyfileobj(src, dst, length=1024 * 1024)
+                print("[poc] openvino_model.bin 就緒", flush=True)
+                return
+    raise RuntimeError("模型包內找不到 openvino_model.bin")
+
+
 def _find_or_prepare_backend():
-    """找後端檔案，順序：repo 內已解壓 → 快取 → repo 內壓縮檔 → 線上下載。回傳 jev_dir。"""
+    """找後端檔案，順序：repo 內已解壓 → 快取 → repo 內壓縮檔 → 線上下載。
+    回傳 (jev_dir, binary)。jev_dir 下保證有執行檔與 model/（巢狀佈局會建連結）。"""
     # 1. 已解壓好的（手動上傳到 repo 根目錄，或之前快取的）
-    for cand in [os.path.join(BASE, "jev"), os.path.join(DATA, "jev")]:
-        if os.path.exists(os.path.join(cand, "jev")) and os.path.isdir(os.path.join(cand, "model")):
-            print(f"[poc] 使用現成後端：{cand}", flush=True)
-            return cand
+    for base in (BASE, DATA):
+        # 1a. 標準佈局：<base>/jev/{jev(執行檔), model/, *.so}
+        d = os.path.join(base, "jev")
+        b = os.path.join(d, "jev")
+        if os.path.isfile(b) and os.path.isdir(os.path.join(d, "model")):
+            print(f"[poc] 使用現成後端：{b}", flush=True)
+            return d, b
+        # 1b. 巢狀佈局：<base>/jev/jev/{jev(執行檔), *.so}，model/ 在 <base>/jev/model/
+        #     （tarball 內層目錄被原樣上傳時會長這樣；執行檔在內層，./model 要能被找到）
+        inner = os.path.join(d, "jev")
+        b2 = os.path.join(inner, "jev")
+        outer_model = os.path.join(d, "model")
+        if os.path.isfile(b2) and os.path.isdir(outer_model):
+            link = os.path.join(inner, "model")
+            if not os.path.exists(link):
+                try:
+                    os.symlink(outer_model, link)
+                    print("[poc] 巢狀佈局：已建立 model 連結", flush=True)
+                except Exception as e:
+                    print(f"[poc] 建 model 連結失敗：{e}", flush=True)
+            print(f"[poc] 使用現成後端（巢狀）：{b2}", flush=True)
+            return inner, b2
     # 2. repo 根目錄有壓縮檔（手動上傳）→ 解到 DATA
     jev_dir = os.path.join(DATA, "jev")
     tgz = os.path.join(BASE, "jev-linux-x64.tar.gz")
@@ -176,9 +216,10 @@ def _find_or_prepare_backend():
         os.makedirs(DATA, exist_ok=True)
         with tarfile.open(tgz) as tf:
             tf.extractall(DATA, filter="data")
-        with zipfile.ZipFile(zf) as z:
-            z.extractall(jev_dir)  # 內含 model/
-        return jev_dir
+        print("[poc] 主程式解壓完成，解壓縮模型（約 630MB，需要幾分鐘）…", flush=True)
+        _extract_zip_progress(zf, jev_dir)
+        print("[poc] 模型解壓完成", flush=True)
+        return jev_dir, os.path.join(jev_dir, "jev")
     # 3. 線上下載（Spaces 執行期可連外網）
     os.makedirs(DATA, exist_ok=True)
     tgz = _dl(BIN_URL, os.path.join(DATA, "jev-linux-x64.tar.gz"))
@@ -186,10 +227,21 @@ def _find_or_prepare_backend():
     with tarfile.open(tgz) as tf:
         tf.extractall(DATA, filter="data")
     zf = _dl(MODEL_URL, os.path.join(DATA, "jevos-v3-openvino-int8.zip"))
-    _set_phase("extracting", "解壓縮模型（約 630MB）…")
+    _set_phase("extracting", "解壓縮模型（約 630MB，需要幾分鐘）…")
+    _extract_zip_progress(zf, jev_dir)
+    print("[poc] 模型解壓完成", flush=True)
+    return jev_dir, os.path.join(jev_dir, "jev")
+
+
+def _extract_zip_progress(zf, jev_dir):
+    """解壓 zip 並印進度（避免長時間無輸出被誤判卡死）。"""
     with zipfile.ZipFile(zf) as z:
-        z.extractall(jev_dir)  # 內含 model/
-    return jev_dir
+        members = z.namelist()
+        total = len(members)
+        for i, m in enumerate(members):
+            z.extract(m, jev_dir)
+            if (i + 1) % 25 == 0 or (i + 1) == total:
+                print(f"[poc] 模型解壓縮 {i + 1}/{total}", flush=True)
 
 
 def decide(state, mode, question, options_text):