stripping out some amt stuff. reject all submitted assignments. add direct work view

2 files changed, 26 insertions, 108 deletions

diff --git a/jb/views/common.py b/jb/views/common.py
index 7011557..d3b3e93 100644
--- a/jb/views/common.py
+++ b/jb/views/common.py
@@ -1,19 +1,18 @@
 import json
-from typing import Dict, Any
+from typing import Annotated, Any
 
 import requests
-from fastapi import Request, APIRouter, HTTPException
+from fastapi import APIRouter, Depends, HTTPException, Request
 from fastapi.responses import HTMLResponse
 from starlette.responses import RedirectResponse
 
-from jb.config import settings, JB_EVENTS_STREAM
-from jb.decorators import REDIS, HM
-from jb.flow.monitoring import emit_assignment_event, emit_mturk_notification_event
-from jb.models.definitions import AssignmentStatus
+from jb.api.auth import get_authenticated_user
+from jb.config import JB_EVENTS_STREAM, settings
+from jb.decorators import REDIS
+from jb.flow.monitoring import emit_mturk_notification_event
+from jb.models.auth import User
 from jb.models.event import MTurkEvent
 from jb.settings import BASE_HTML
-from jb.config import settings
-from jb.views.tasks import process_request
 
 common_router = APIRouter(prefix="", tags=["API"], include_in_schema=True)
 
@@ -29,32 +28,16 @@ async def work(request: Request):
     amt_hit_id = request.query_params.get("hitId", None)
     print(f"work: {amt_assignment_id=} {worker_id=} {amt_hit_id=}")
 
-    if not worker_id:
+    if (
+        not worker_id
+        or not amt_assignment_id
+        or amt_assignment_id == "ASSIGNMENT_ID_NOT_AVAILABLE"
+    ):
         return RedirectResponse(
             url=f"/preview/?{request.url.query}" if request.url.query else "/preview/",
             status_code=302,
         )
 
-    if amt_assignment_id is None or amt_assignment_id == "ASSIGNMENT_ID_NOT_AVAILABLE":
-        # Worker is previewing the HIT
-        amt_hit_type_id = "unknown"
-        if amt_hit_id:
-            hit = HM.get_from_amt_id(amt_hit_id=amt_hit_id)
-            amt_hit_type_id = hit.amt_hit_type_id
-        emit_assignment_event(
-            status=AssignmentStatus.PreviewState, amt_hit_type_id=amt_hit_type_id
-        )
-        return RedirectResponse(
-            url=f"/preview/?{request.url.query}" if request.url.query else "/preview/",
-            status_code=302,
-        )
-
-    try:
-        # The Worker has accepted the HIT
-        process_request(request)
-    except Exception:
-        raise HTTPException(status_code=500, detail="Error processing request")
-
     return HTMLResponse(BASE_HTML)
 
 
@@ -85,10 +68,23 @@ async def mturk_notifications(request: Request):
     return {"status": "ok"}
 
 
-def enqueue_mturk_notifications(msg: Dict[str, Any]) -> None:
+def enqueue_mturk_notifications(msg: dict[str, Any]) -> None:
     for evt in msg["Events"]:
         event = MTurkEvent.from_sns(evt)
         emit_mturk_notification_event(
             event_type=event.event_type, amt_hit_type_id=event.amt_hit_type_id
         )
         REDIS.xadd(JB_EVENTS_STREAM, {"data": event.model_dump_json()})
+
+
+@common_router.get(path="/work/direct/", response_class=HTMLResponse)
+async def work_direct(
+    request: Request,
+    user: Annotated[User, Depends(get_authenticated_user)],
+):
+    """
+    View for direct work (not on AMT).
+    Makes sure user is authenticated.
+    """
+    # todo: emit event
+    return HTMLResponse(BASE_HTML)
diff --git a/jb/views/tasks.py b/jb/views/tasks.py
deleted file mode 100644
index 15857c3..0000000
--- a/jb/views/tasks.py
+++ /dev/null
@@ -1,78 +0,0 @@
-from datetime import datetime, timezone, timedelta
-
-from fastapi import Request
-
-from jb.decorators import AMTM, AM, HM
-from jb.flow.maintenance import check_hit_status
-from jb.flow.monitoring import emit_assignment_event
-from jb.models.assignment import AssignmentStub
-from jb.models.definitions import AssignmentStatus
-
-
-def process_request(request: Request) -> None:
-    """
-    A worker has loaded the HIT (work) page and (probably) accepted the HIT.
-    AMT creates an assignment, tied to this hit and this worker.
-    Create it in the DB.
-    """
-    amt_assignment_id = request.query_params.get("assignmentId", None)
-    if amt_assignment_id == "ASSIGNMENT_ID_NOT_AVAILABLE":
-        raise ValueError("shouldn't happen")
-
-    amt_hit_id = request.query_params.get("hitId", None)
-    amt_worker_id = request.query_params.get("workerId", None)
-    print(f"process_request: {amt_assignment_id=} {amt_worker_id=} {amt_hit_id=}")
-    assert amt_worker_id and amt_hit_id and amt_assignment_id
-
-    # Check that the HIT is still valid
-    hit = HM.get_from_amt_id_if_exists(amt_hit_id=amt_hit_id)
-    if not hit:
-        raise ValueError(f"Hit {amt_hit_id} not found in DB")
-
-    _ = check_hit_status(
-        amtm=AMTM, amt_hit_id=amt_hit_id, amt_hit_type_id=hit.amt_hit_type_id
-    )
-
-    emit_assignment_event(
-        status=AssignmentStatus.Accepted,
-        amt_hit_type_id=hit.amt_hit_type_id,
-    )
-
-    # I think it won't be assignable anymore? idk
-    # assert hit_status == HitStatus.Assignable, f"hit {amt_hit_id} {hit_status=}. Expected Assignable"
-
-    # I would like to verify in the AMT API that this assignment is valid, but there
-    #   is no way to do that (until the assignment is submitted)
-
-    # # Make an offerwall to create a user account...
-    # # todo: GSS: Do we really need to do this???
-    # client_ip = get_client_ip(request)
-    # url = f"{settings.fsb_host}{settings.product_id}/offerwall/45b7228a7/"
-    # _ = requests.get(
-    #     url,
-    #     {"bpuid": amt_worker_id, "ip": client_ip, "n_bins": 1, "format": "json"},
-    # ).json()
-
-    # This assignment shouldn't already exist. If it does, just make sure it
-    #   is all the same.
-    assignment_stub = AM.get_stub_if_exists(amt_assignment_id=amt_assignment_id)
-    if assignment_stub:
-        print(f"{assignment_stub=}")
-        assert assignment_stub.amt_worker_id == amt_worker_id
-        assert assignment_stub.amt_assignment_id == amt_assignment_id
-        assert assignment_stub.created_at > (
-            datetime.now(tz=timezone.utc) - timedelta(minutes=90)
-        )
-        return None
-
-    assignment_stub = AssignmentStub(
-        amt_hit_id=amt_hit_id,
-        amt_worker_id=amt_worker_id,
-        amt_assignment_id=amt_assignment_id,
-        status=AssignmentStatus.Accepted,
-        hit_id=hit.id,
-    )
-
-    AM.create_stub(stub=assignment_stub)
-
-    return None