pearmut 1.0.1__py3-none-any.whl → 1.0.3__py3-none-any.whl

pearmut/app.py

@@ -4,7 +4,7 @@ from typing import Any
 
 from fastapi import FastAPI, Query
 from fastapi.middleware.cors import CORSMiddleware
-from fastapi.responses import JSONResponse, Response
+from fastapi.responses import FileResponse, JSONResponse, Response
 from fastapi.staticfiles import StaticFiles
 from pydantic import BaseModel
 
@@ -17,6 +17,7 @@ from .results_export import (
 )
 from .utils import (
     ROOT,
+    TOKEN_MAIN,
     check_validation_threshold,
     load_progress_data,
     save_db_payload,
@@ -48,7 +49,7 @@ for campaign_id in progress_data.keys():
 class LogResponseRequest(BaseModel):
     campaign_id: str
     user_id: str
-    item_i: int
+    item_i: int | str
     payload: dict[str, Any]
 
 
@@ -123,7 +124,7 @@ async def _get_next_item(request: NextItemRequest):
 class GetItemRequest(BaseModel):
     campaign_id: str
     user_id: str
-    item_i: int
+    item_i: int | str
 
 
 @app.post("/get-i-item")
@@ -178,7 +179,11 @@ async def _dashboard_data(request: DashboardDataRequest):
         ]
 
         # Add threshold pass/fail status (only when user is complete)
-        if all(entry["progress"]):
+        if (
+            tasks_data[campaign_id]["info"]["assignment"] != "dynamic" and all(v in {"completed", "completed_foreign"} for v in entry["progress"])
+        ) or (
+            tasks_data[campaign_id]["info"]["assignment"] == "dynamic" and all(v in {"completed", "completed_foreign"} for mv in entry["progress"] for v in mv.values())
+        ):
             entry["threshold_passed"] = check_validation_threshold(
                 tasks_data, progress_data, campaign_id, user_id
             )
@@ -192,7 +197,11 @@ async def _dashboard_data(request: DashboardDataRequest):
         progress_new[user_id] = entry
 
     return JSONResponse(
-        content={"data": progress_new, "validation_threshold": validation_threshold},
+        content={
+            "data": progress_new,
+            "validation_threshold": validation_threshold,
+            "assignment": assignment,
+        },
         status_code=200,
     )
 
@@ -288,7 +297,7 @@ class PurgeCampaignRequest(BaseModel):
 @app.post("/purge-campaign")
 async def _purge_campaign(request: PurgeCampaignRequest):
     global progress_data, tasks_data
-    
+
     campaign_id = request.campaign_id
     token = request.token
 
@@ -298,57 +307,69 @@ async def _purge_campaign(request: PurgeCampaignRequest):
         return JSONResponse(content="Invalid token", status_code=400)
 
     # Unlink assets if they exist
-    destination = tasks_data[campaign_id].get("info", {}).get("assets", {}).get("destination")
+    destination = (
+        tasks_data[campaign_id].get("info", {}).get("assets", {}).get("destination")
+    )
     if destination:
         symlink_path = f"{ROOT}/data/{destination}".rstrip("/")
         if os.path.islink(symlink_path):
             os.remove(symlink_path)
-    
+
     # Remove task file
     task_file = f"{ROOT}/data/tasks/{campaign_id}.json"
     if os.path.exists(task_file):
         os.remove(task_file)
-    
+
     # Remove output file
     output_file = f"{ROOT}/data/outputs/{campaign_id}.jsonl"
     if os.path.exists(output_file):
         os.remove(output_file)
-    
+
     # Remove from in-memory data structures
     del tasks_data[campaign_id]
     del progress_data[campaign_id]
-    
+
     # Save updated progress data
     save_progress_data(progress_data)
-    
+
     return JSONResponse(content="ok", status_code=200)
 
 
 class AddCampaignRequest(BaseModel):
     campaign_data: dict[str, Any]
+    token_main: str
 
 
 @app.post("/add-campaign")
 async def _add_campaign(request: AddCampaignRequest):
     global progress_data, tasks_data
-    
+
     from .cli import _add_single_campaign
-    
+
+    if request.token_main != TOKEN_MAIN:
+        return JSONResponse(
+            content={"error": "Invalid main token. Use the latest one."},
+            status_code=400,
+        )
+
     try:
         server = f"{os.environ.get('PEARMUT_SERVER_URL', 'http://localhost:8001')}"
         _add_single_campaign(request.campaign_data, overwrite=False, server=server)
-        
-        campaign_id = request.campaign_data['campaign_id']
+
+        campaign_id = request.campaign_data["campaign_id"]
         with open(f"{ROOT}/data/tasks/{campaign_id}.json", "r") as f:
             tasks_data[campaign_id] = json.load(f)
-        
+
         progress_data = load_progress_data(warn=None)
-        
-        return JSONResponse(content={
-            "status": "ok",
-            "campaign_id": campaign_id,
-            "token": tasks_data[campaign_id]["token"]
-        }, status_code=200)
+
+        return JSONResponse(
+            content={
+                "status": "ok",
+                "campaign_id": campaign_id,
+                "token": tasks_data[campaign_id]["token"],
+            },
+            status_code=200,
+        )
     except Exception as e:
         return JSONResponse(content={"error": str(e)}, status_code=400)
 
@@ -359,7 +380,6 @@ async def _download_annotations(
     # NOTE: currently not checking tokens for progress download as it is non-destructive
     # token: list[str] = Query()
 ):
-
     output = {}
     for campaign_id in campaign_id:
         output_path = f"{ROOT}/data/outputs/{campaign_id}.jsonl"
@@ -386,7 +406,6 @@ async def _download_annotations(
 async def _download_progress(
     campaign_id: list[str] = Query(), token: list[str] = Query()
 ):
-
     if len(campaign_id) != len(token):
         return JSONResponse(
             content="Mismatched campaign_id and token count", status_code=400
@@ -418,6 +437,18 @@ if not os.path.exists(static_dir + "index.html"):
         "Static directory not found. Please build the frontend first."
     )
 
+
+# Serve HTML files directly without redirect
+@app.get("/annotate")
+async def serve_annotate():
+    return FileResponse(static_dir + "annotate.html")
+
+
+@app.get("/dashboard")
+async def serve_dashboard():
+    return FileResponse(static_dir + "dashboard.html")
+
+
 # Mount user assets from data/assets/
 assets_dir = f"{ROOT}/data/assets"
 os.makedirs(assets_dir, exist_ok=True)