aboutsummaryrefslogtreecommitdiff
path: root/jb/managers
diff options
context:
space:
mode:
authorstuppie2026-04-11 11:03:37 -0600
committerstuppie2026-04-11 11:03:40 -0600
commit67983224fbe5a33bd7bf8ea8c134b27f1afdda8a (patch)
tree86df1a608cacffaf03326e4755dc4ef919feba32 /jb/managers
parentd0af0c38d7b59013e35eca4e2679a509b56f5980 (diff)
downloadamt-jb-67983224fbe5a33bd7bf8ea8c134b27f1afdda8a.tar.gz
amt-jb-67983224fbe5a33bd7bf8ea8c134b27f1afdda8a.zip
pydantic after model_validator doesnt raise a ValidationError if a KeyError is raised, only a ValueError.
did not know that. try except ValidationError in get_assignment bc Baddies have been known to submit assignments with purposely malformed "answer" (xml) section to break the process_assignment flow
Diffstat (limited to 'jb/managers')
-rw-r--r--jb/managers/amt.py18
1 files changed, 14 insertions, 4 deletions
diff --git a/jb/managers/amt.py b/jb/managers/amt.py
index b764ffc..88ae07d 100644
--- a/jb/managers/amt.py
+++ b/jb/managers/amt.py
@@ -3,6 +3,8 @@ from datetime import timezone, datetime
from typing import Tuple, Optional, List, Dict, Any
import botocore.exceptions
+from generalresearchutils.currency import USDCent
+from mypy_boto3_mturk import MTurkClient
from mypy_boto3_mturk.type_defs import (
AssignmentTypeDef,
BonusPaymentTypeDef,
@@ -10,15 +12,14 @@ from mypy_boto3_mturk.type_defs import (
GetHITResponseTypeDef,
CreateHITWithHITTypeResponseTypeDef,
)
+from pydantic import ValidationError
from jb.config import TOPIC_ARN
from jb.models import AMTAccount
from jb.models.assignment import Assignment
from jb.models.bonus import Bonus
-from generalresearchutils.currency import USDCent
from jb.models.definitions import HitStatus
from jb.models.hit import HitType, HitQuestion, Hit
-from mypy_boto3_mturk import MTurkClient
REJECT_MESSAGE_UNKNOWN_ASSIGNMENT = "Unknown assignment"
REJECT_MESSAGE_NO_WORK = "Assignment was submitted with no attempted work."
@@ -130,7 +131,17 @@ class AMTManager:
"""
res = self.amt_client.get_assignment(AssignmentId=amt_assignment_id)
ass_res: AssignmentTypeDef = res["Assignment"]
- assignment = Assignment.from_amt_get_assignment(ass_res)
+ try:
+ assignment = Assignment.from_amt_get_assignment(ass_res)
+ except ValidationError as e:
+ # Baddies have been known to submit assignments with purposely
+ # malformed "answer" (xml) section, which will raise
+ # a pydantic validation error. Try to parse again with no Answer.
+ logging.exception(e)
+ ass_res["Answer"] = None
+ # If it wasn't the Answer that caused the ValidationError, it'll raise again
+ assignment = Assignment.from_amt_get_assignment(ass_res)
+
# to be clear, this has not checked whether it exists in our db
assert assignment.id is None
return assignment
@@ -140,7 +151,6 @@ class AMTManager:
try:
return self.get_assignment(amt_assignment_id=amt_assignment_id)
-
except botocore.exceptions.ClientError as e:
logging.warning(e)
error_code = e.response["Error"]["Code"]