pearmut 0.2.3__tar.gz → 0.2.5__tar.gz

{pearmut-0.2.3 → pearmut-0.2.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pearmut
-Version: 0.2.3
+Version: 0.2.5
 Summary: A tool for evaluation of model outputs, primarily MT.
 Author-email: Vilém Zouhar <vilem.zouhar@gmail.com>
 License: apache-2.0

{pearmut-0.2.3 → pearmut-0.2.5}/pearmut.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pearmut
-Version: 0.2.3
+Version: 0.2.5
 Summary: A tool for evaluation of model outputs, primarily MT.
 Author-email: Vilém Zouhar <vilem.zouhar@gmail.com>
 License: apache-2.0

{pearmut-0.2.3 → pearmut-0.2.5}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "pearmut"
-version = "0.2.3"
+version = "0.2.5"
 description = "A tool for evaluation of model outputs, primarily MT."
 readme = "README.md"
 license = { text = "apache-2.0" }

{pearmut-0.2.3 → pearmut-0.2.5}/server/app.py

@@ -54,9 +54,9 @@ async def _log_response(request: LogResponseRequest):
     item_i = request.item_i
 
     if campaign_id not in progress_data:
-        return JSONResponse(content={"error": "Unknown campaign ID"}, status_code=400)
+        return JSONResponse(content="Unknown campaign ID", status_code=400)
     if user_id not in progress_data[campaign_id]:
-        return JSONResponse(content={"error": "Unknown user ID"}, status_code=400)
+        return JSONResponse(content="Unknown user ID", status_code=400)
 
     # append response to the output log
     save_db_payload(
@@ -86,7 +86,7 @@ async def _log_response(request: LogResponseRequest):
                     progress_data, request.item_i, request.payload)
     save_progress_data(progress_data)
 
-    return JSONResponse(content={"status": "ok"}, status_code=200)
+    return JSONResponse(content="ok", status_code=200)
 
 
 class NextItemRequest(BaseModel):
@@ -100,9 +100,9 @@ async def _get_next_item(request: NextItemRequest):
     user_id = request.user_id
 
     if campaign_id not in progress_data:
-        return JSONResponse(content={"error": "Unknown campaign ID"}, status_code=400)
+        return JSONResponse(content="Unknown campaign ID", status_code=400)
     if user_id not in progress_data[campaign_id]:
-        return JSONResponse(content={"error": "Unknown user ID"}, status_code=400)
+        return JSONResponse(content="Unknown user ID", status_code=400)
 
     return get_next_item(
         campaign_id,
@@ -125,9 +125,9 @@ async def _get_i_item(request: GetItemRequest):
     item_i = request.item_i
 
     if campaign_id not in progress_data:
-        return JSONResponse(content={"error": "Unknown campaign ID"}, status_code=400)
+        return JSONResponse(content="Unknown campaign ID", status_code=400)
     if user_id not in progress_data[campaign_id]:
-        return JSONResponse(content={"error": "Unknown user ID"}, status_code=400)
+        return JSONResponse(content="Unknown user ID", status_code=400)
 
     return get_i_item(
         campaign_id,
@@ -147,15 +147,15 @@ class DashboardDataRequest(BaseModel):
 async def _dashboard_data(request: DashboardDataRequest):
     campaign_id = request.campaign_id
 
-    is_privileged = (request.token == tasks_data[campaign_id]["token"])
-
     if campaign_id not in progress_data:
-        return JSONResponse(content={"error": "Unknown campaign ID"}, status_code=400)
+        return JSONResponse(content="Unknown campaign ID", status_code=400)
+    
+    is_privileged = (request.token == tasks_data[campaign_id]["token"])
 
     progress_new = {}
     assignment = tasks_data[campaign_id]["info"]["assignment"]
     if assignment not in ["task-based", "single-stream"]:
-        return JSONResponse(content={"error": "Unsupported campaign assignment type"}, status_code=400)
+        return JSONResponse(content="Unsupported campaign assignment type", status_code=400)
 
     # Get threshold info for the campaign
     validation_threshold = tasks_data[campaign_id]["info"].get("validation_threshold")
@@ -184,7 +184,6 @@ async def _dashboard_data(request: DashboardDataRequest):
 
     return JSONResponse(
         content={
-            "status": "ok",
             "data": progress_new,
             "validation_threshold": validation_threshold
         },
@@ -206,11 +205,11 @@ async def _reset_task(request: ResetTaskRequest):
     token = request.token
 
     if campaign_id not in progress_data:
-        return JSONResponse(content={"error": "Unknown campaign ID"}, status_code=400)
+        return JSONResponse(content="Unknown campaign ID", status_code=400)
     if token != tasks_data[campaign_id]["token"]:
-        return JSONResponse(content={"error": "Invalid token"}, status_code=400)
+        return JSONResponse(content="Invalid token", status_code=400)
     if user_id not in progress_data[campaign_id]:
-        return JSONResponse(content={"error": "Unknown user ID"}, status_code=400)
+        return JSONResponse(content="Unknown user ID", status_code=400)
 
     response = reset_task(campaign_id, user_id, tasks_data, progress_data)
     save_progress_data(progress_data)
@@ -228,7 +227,7 @@ async def _download_annotations(
     for campaign_id in campaign_id:
         output_path = f"{ROOT}/data/outputs/{campaign_id}.jsonl"
         if campaign_id not in progress_data:
-            return JSONResponse(content={"error": f"Unknown campaign ID {campaign_id}"}, status_code=400)
+            return JSONResponse(content=f"Unknown campaign ID {campaign_id}", status_code=400)
         if not os.path.exists(output_path):
             output[campaign_id] = []
         else:
@@ -245,14 +244,14 @@ async def _download_progress(
 ):
 
     if len(campaign_id) != len(token):
-        return JSONResponse(content={"error": "Mismatched campaign_id and token count"}, status_code=400)
+        return JSONResponse(content="Mismatched campaign_id and token count", status_code=400)
 
     output = {}
     for i, cid in enumerate(campaign_id):
         if cid not in progress_data:
-            return JSONResponse(content={"error": f"Unknown campaign ID {cid}"}, status_code=400)
+            return JSONResponse(content=f"Unknown campaign ID {cid}", status_code=400)
         if token[i] != tasks_data[cid]["token"]:
-            return JSONResponse(content={"error": f"Invalid token for campaign ID {cid}"}, status_code=400)
+            return JSONResponse(content=f"Invalid token for campaign ID {cid}", status_code=400)
 
         output[cid] = progress_data[cid]
 

{pearmut-0.2.3 → pearmut-0.2.5}/server/assignment.py

@@ -48,7 +48,7 @@ def get_next_item(
     elif assignment == "dynamic":
         return get_next_item_dynamic(campaign_id, user_id, tasks_data, progress_data)
     else:
-        return JSONResponse(content={"error": "Unknown campaign assignment type"}, status_code=400)
+        return JSONResponse(content="Unknown campaign assignment type", status_code=400)
 
 
 def get_i_item(
@@ -67,7 +67,7 @@ def get_i_item(
     elif assignment == "single-stream":
         return get_i_item_singlestream(campaign_id, user_id, tasks_data, progress_data, item_i)
     else:
-        return JSONResponse(content={"error": "Get item not supported for this assignment type"}, status_code=400)
+        return JSONResponse(content="Get item not supported for this assignment type", status_code=400)
 
 
 def get_i_item_taskbased(
@@ -90,7 +90,7 @@ def get_i_item_taskbased(
 
     if item_i < 0 or item_i >= len(data_all[campaign_id]["data"][user_id]):
         return JSONResponse(
-            content={"status": "error", "message": "Item index out of range"},
+            content="Item index out of range",
             status_code=400
         )
 
@@ -133,7 +133,7 @@ def get_i_item_singlestream(
 
     if item_i < 0 or item_i >= len(data_all[campaign_id]["data"]):
         return JSONResponse(
-            content={"status": "error", "message": "Item index out of range"},
+            content="Item index out of range",
             status_code=400
         )
 
@@ -280,7 +280,7 @@ def reset_task(
             })
         progress_data[campaign_id][user_id]["progress"] = [False] * num_items
         _reset_user_time(progress_data, campaign_id, user_id)
-        return JSONResponse(content={"status": "ok"}, status_code=200)
+        return JSONResponse(content="ok", status_code=200)
     elif assignment == "single-stream":
         # Save reset markers for all items (shared pool)
         num_items = len(tasks_data[campaign_id]["data"])
@@ -294,9 +294,9 @@ def reset_task(
         for uid in progress_data[campaign_id]:
             progress_data[campaign_id][uid]["progress"] = [False] * num_items
         _reset_user_time(progress_data, campaign_id, user_id)
-        return JSONResponse(content={"status": "ok"}, status_code=200)
+        return JSONResponse(content="ok", status_code=200)
     else:
-        return JSONResponse(content={"status": "error", "message": "Reset not supported for this assignment type"}, status_code=400)
+        return JSONResponse(content="Reset not supported for this assignment type", status_code=400)
 
 
 def update_progress(
@@ -319,8 +319,8 @@ def update_progress(
         # progress all users
         for uid in progress_data[campaign_id]:
             progress_data[campaign_id][uid]["progress"][item_i] = True
-        return JSONResponse(content={"status": "ok"}, status_code=200)
+        return JSONResponse(content="ok", status_code=200)
     elif assignment == "dynamic":
-        return JSONResponse(content={"status": "error", "message": "Dynamic protocol logging not implemented yet."}, status_code=400)
+        return JSONResponse(content="Dynamic protocol logging not implemented yet.", status_code=400)
     else:
-        return JSONResponse(content={"status": "error", "message": "Unknown campaign assignment type"}, status_code=400)
+        return JSONResponse(content="Unknown campaign assignment type", status_code=400)

{pearmut-0.2.3 → pearmut-0.2.5}/server/cli.py

@@ -65,11 +65,10 @@ def _add_single_campaign(data_file, overwrite, server):
         progress_data = json.load(f)
 
     if campaign_data['campaign_id'] in progress_data and not overwrite:
-        print(
-            f"Campaign {campaign_data['campaign_id']} already exists.",
+        raise ValueError(
+            f"Campaign {campaign_data['campaign_id']} already exists.\n"
             "Use -o to overwrite."
         )
-        exit(1)
 
     if "info" not in campaign_data:
         raise ValueError("Campaign data must contain 'info' field.")

{pearmut-0.2.3 → pearmut-0.2.5}/server/static/assets/style.css

@@ -232,4 +232,8 @@ input[type="button"].error_delete:hover {
     margin-right: 5px;
     position: relative;
     top: -5px;
+}
+
+.char_missing {
+    font-family: monospace;
 }