Upload db.py with huggingface_hub

db.py

@@ -63,25 +63,66 @@ def schedule_auto_push():
 
 
 def push_upload_to_repo(local_path, filename):
-    """背景把單一上傳 XLS 推到 repo 的 uploads/<filename>，讓檔案跨 factory reboot 保留。"""
+    """同步把單一上傳 XLS 推到 repo 的 uploads/<filename>，
+    確保在 request 結束前完成（避免 daemon thread 被容器閒置/重啟中斷）。
+    失敗只記錄，不拋出（本地已存檔，可靠 startup 時再推）。"""
+    token = os.environ.get('HF_TOKEN', '')
+    username = os.environ.get('HF_USERNAME', '')
+    if not token or not username:
+        return False
+    try:
+        from huggingface_hub import HfApi
+        api = HfApi(token=token)
+        api.upload_file(
+            path_or_fileobj=str(local_path),
+            path_in_repo=f'uploads/{filename}',
+            repo_id=f'{username}/pradsa',
+            repo_type='space',
+        )
+        logger.info(f'Upload pushed to repo: uploads/{filename}')
+        return True
+    except Exception as e:
+        logger.warning(f'Upload push failed ({filename}): {e}')
+        return False
+
+
+def pull_uploads_from_repo():
+    """容器啟動時從 repo 拉 uploads/* 到本地 UPLOAD_DIR。
+    只下載本地沒有的檔案（以檔名判斷），避免重複下載。"""
     token = os.environ.get('HF_TOKEN', '')
     username = os.environ.get('HF_USERNAME', '')
     if not token or not username:
         return
-    def _go():
-        try:
-            from huggingface_hub import HfApi
-            api = HfApi(token=token)
-            api.upload_file(
-                path_or_fileobj=str(local_path),
-                path_in_repo=f'uploads/{filename}',
-                repo_id=f'{username}/pradsa',
-                repo_type='space',
-            )
-            logger.info(f'Upload pushed to repo: uploads/{filename}')
-        except Exception as e:
-            logger.warning(f'Upload push failed: {e}')
-    threading.Thread(target=_go, daemon=True).start()
+    try:
+        from huggingface_hub import HfApi
+        api = HfApi(token=token)
+        repo_id = f'{username}/pradsa'
+        UPLOAD_DIR.mkdir(exist_ok=True)
+        existing = {p.name for p in UPLOAD_DIR.iterdir() if p.is_file()}
+        files = api.list_repo_files(repo_id, repo_type='space')
+        pulled = 0
+        for rf in files:
+            if not rf.startswith('uploads/'):
+                continue
+            name = rf[len('uploads/'):]
+            if not name or name in existing:
+                continue
+            try:
+                local = api.hf_hub_download(
+                    repo_id=repo_id, filename=rf, repo_type='space',
+                    local_dir=str(UPLOAD_DIR.parent),
+                )
+                # hf_hub_download 會照 path_in_repo 結構存放；確保檔案在 UPLOAD_DIR
+                dest = UPLOAD_DIR / name
+                if not dest.exists():
+                    shutil.copy2(local, dest)
+                pulled += 1
+            except Exception as e:
+                logger.warning(f'pull upload {name} failed: {e}')
+        if pulled:
+            logger.info(f'Pulled {pulled} upload(s) from repo')
+    except Exception as e:
+        logger.warning(f'pull_uploads_from_repo failed: {e}')
 
 
 def _guarded_push():
@@ -696,3 +737,8 @@ def update_user(user_id, display_name=None, username=None, password=None, role=N
 
 
 init_db()
+# 容器啟動時把 repo 上的 uploads/ 拉下來，確保 list_uploads() 能看到其他 session 上傳的檔案
+try:
+    pull_uploads_from_repo()
+except Exception as _e:
+    logger.warning(f'startup pull_uploads skipped: {_e}')