Update loader.py

loader.py

@@ -1,4 +1,4 @@
-# loader.py — public proxy for PRIVATE Static Space via huggingface.co/resolve & raw
+# loader.py — Public proxy to a PRIVATE Static Space (auth via resolve/raw endpoints)
 import os
 import mimetypes
 from urllib.parse import urljoin
@@ -8,35 +8,35 @@ import httpx
 
 app = FastAPI()
 
-# --- Config from Secrets ---
-SPACE_ID = os.getenv("PRIVATE_SPACE_ID")          # e.g. "cheekeong2025/IIP_Grading"
-HF_TOKEN = os.getenv("HF_TOKEN")                  # read-access token for that Space
-REVISION = os.getenv("REVISION", "main")          # branch/tag/commit
-# ---------------------------
+# ===== Config (from Space Secrets) =====
+SPACE_ID = os.getenv("PRIVATE_SPACE_ID")          # e.g., "cheekeong2025/IIP_Grading"
+HF_TOKEN = os.getenv("HF_TOKEN")                  # token with READ access to that private Space
+REVISION = os.getenv("REVISION", "main")          # branch/tag/commit; default "main"
+# ======================================
 
 if not SPACE_ID:
     raise RuntimeError("Set PRIVATE_SPACE_ID (e.g. 'cheekeong2025/IIP_Grading') in Settings → Repository secrets.")
 if not HF_TOKEN:
-    raise RuntimeError("Set HF_TOKEN (read access to the private Space) in Settings → Repository secrets.")
+    raise RuntimeError("Set HF_TOKEN (READ access to the private Space) in Settings → Repository secrets.")
 
 HEADERS = {"Authorization": f"Bearer {HF_TOKEN}"}
 BASE_RESOLVE = f"https://huggingface.co/spaces/{SPACE_ID}/resolve/{REVISION}/"
 BASE_RAW     = f"https://huggingface.co/spaces/{SPACE_ID}/raw/{REVISION}/"
 
-def _join(b: str, p: str) -> str:
-    return urljoin(b, p.lstrip("/"))
+def _join(base: str, path: str) -> str:
+    return urljoin(base, path.lstrip("/"))
 
 def _with_q(url: str, req: Request) -> str:
     q = str(req.url.query or "")
     return f"{url}?{q}" if q else url
 
-def _looks_file(p: str) -> bool:
-    return "." in p.split("/")[-1]
+def _looks_file(path: str) -> bool:
+    return "." in path.split("/")[-1]
 
-def _mime(p: str, default="application/octet-stream"):
-    if p.endswith("/") or p == "":
+def _mime(path: str, default="application/octet-stream") -> str:
+    if path.endswith("/") or path == "":
         return "text/html; charset=utf-8"
-    m, _ = mimetypes.guess_type(p)
+    m, _ = mimetypes.guess_type(path)
     return m or default
 
 async def _get(client: httpx.AsyncClient, url: str) -> httpx.Response:
@@ -44,9 +44,9 @@ async def _get(client: httpx.AsyncClient, url: str) -> httpx.Response:
     print(f"[proxy] GET {url} -> {r.status_code}")
     return r
 
-async def _fetch(client: httpx.AsyncClient, path: str, req: Request) -> tuple[httpx.Response, str]:
+async def _fetch(client: httpx.AsyncClient, path: str, req: Request):
     """
-    Try in order (first 200 wins):
+    Robust lookup order (first 200 wins):
       resolve:path
       resolve:static/path
       (dir) resolve:path/index.html
@@ -78,10 +78,10 @@ async def _fetch(client: httpx.AsyncClient, path: str, req: Request) -> tuple[ht
         ]
 
     last = None
-    for u in candidates:
-        url = _with_q(u, req)
+    for base_u in candidates:
+        url = _with_q(base_u, req)
         r = await _get(client, url)
-        tried.append(u)
+        tried.append(base_u)
         if r.status_code == 200:
             return r, " -> ".join(tried)
         last = r
@@ -128,4 +128,4 @@ async def proxy(path: str, request: Request):
         return PlainTextResponse(f"Error fetching {path}: {e}", status_code=500)
 
     ctype = r.headers.get("content-type") or _mime(path)
-    return Response(content=r.content, media_type=ctype, status_code=r.status_code)
+    return Response(content=r.content, media_type=ctype, status_code=r.status_code)