pearmut 0.1.3__py3-none-any.whl → 0.2.0__py3-none-any.whl

pearmut/app.py

@@ -53,7 +53,8 @@ async def _log_response(request: LogResponseRequest):
         return JSONResponse(content={"error": "Unknown user ID"}, status_code=400)
 
     # append response to the output log
-    save_db_payload(campaign_id, request.payload | {"user_id": user_id, "item_i": item_i})
+    save_db_payload(campaign_id, request.payload | {
+                    "user_id": user_id, "item_i": item_i})
 
     # if actions were submitted, we can log time data
     if "actions" in request.payload:
@@ -68,7 +69,16 @@ async def _log_response(request: LogResponseRequest):
             for a, b in zip(times, times[1:])
         ])
 
-    update_progress(campaign_id, user_id, tasks_data, progress_data, request.item_i, request.payload)
+    # Initialize validation_checks if it doesn't exist
+    print(request.payload.keys())
+    if "validations" in request.payload:
+        if "validations" not in progress_data[campaign_id][user_id]:
+            progress_data[campaign_id][user_id]["validations"] = {}
+
+        progress_data[campaign_id][user_id]["validations"][request.item_i] = request.payload["validations"]
+
+    update_progress(campaign_id, user_id, tasks_data,
+                    progress_data, request.item_i, request.payload)
     save_progress_data(progress_data)
 
     return JSONResponse(content={"status": "ok"}, status_code=200)
@@ -145,6 +155,11 @@ async def _dashboard_data(request: DashboardDataRequest):
     for user_id, user_val in progress_data[campaign_id].items():
         # shallow copy
         entry = dict(user_val)
+        entry["validations"] = [
+            all(v)
+            for v in list(entry.get("validations", {}).values())
+        ]
+        
 
         if not is_privileged:
             entry["token_correct"] = None
@@ -229,10 +244,11 @@ async def _download_progress(
 
 static_dir = f"{os.path.dirname(os.path.abspath(__file__))}/static/"
 if not os.path.exists(static_dir + "index.html"):
-    raise FileNotFoundError("Static directory not found. Please build the frontend first.")
+    raise FileNotFoundError(
+        "Static directory not found. Please build the frontend first.")
 
 app.mount(
     "/",
     StaticFiles(directory=static_dir, html=True, follow_symlink=True),
     name="static",
-)
+)

pearmut/assignment.py

@@ -76,8 +76,6 @@ def get_i_item_taskbased(
     Get specific item for task-based protocol.
     """
     user_progress = progress_data[campaign_id][user_id]
-    if all(user_progress["progress"]):
-        return _completed_response(progress_data, campaign_id, user_id)
 
     # try to get existing annotations if any
     items_existing = get_db_log_item(campaign_id, user_id, item_i)
@@ -120,8 +118,6 @@ def get_i_item_singlestream(
     Get specific item for single-stream assignment.
     """
     user_progress = progress_data[campaign_id][user_id]
-    if all(user_progress["progress"]):
-        return _completed_response(progress_data, campaign_id, user_id)
 
     # try to get existing annotations if any
     # note the None user_id since it is shared
@@ -254,6 +250,7 @@ def _reset_user_time(progress_data: dict, campaign_id: str, user_id: str) -> Non
     progress_data[campaign_id][user_id]["time"] = 0.0
     progress_data[campaign_id][user_id]["time_start"] = None
     progress_data[campaign_id][user_id]["time_end"] = None
+    progress_data[campaign_id][user_id]["validations"] = {}
 
 
 def reset_task(
@@ -299,7 +296,6 @@ def update_progress(
     if assignment == "task-based":
         # even if it's already set it should be fine
         progress_data[campaign_id][user_id]["progress"][item_i] = True
-        # TODO: log attention checks/quality?
         return JSONResponse(content={"status": "ok"}, status_code=200)
     elif assignment == "single-stream":
         # progress all users

pearmut/cli.py

@@ -214,7 +214,7 @@ def main():
         import shutil
 
         confirm = input(
-            "Are you sure you want to purge all campaign data? This action cannot be undone. [y/n]"
+            "Are you sure you want to purge all campaign data? This action cannot be undone. [y/n] "
         )
         if confirm.lower() == 'y':
             shutil.rmtree(f"{ROOT}/data/tasks", ignore_errors=True)

pearmut/static/assets/style.css

@@ -225,4 +225,11 @@ input[type="button"].error_delete:hover {
 
 #progress span.progress_incomplete:hover {
     background: #aaa;
+}
+
+/* Validation warning indicator */
+.validation_warning {
+    margin-right: 5px;
+    position: relative;
+    top: -5px;
 }