Merges pull request #3

Off of Amazon!!!

1 files changed, 18 insertions, 14 deletions

diff --git a/jb/models/assignment.py b/jb/models/assignment.py
index 92e5a89..fa6ccd5 100644
--- a/jb/models/assignment.py
+++ b/jb/models/assignment.py
@@ -1,23 +1,26 @@
 import logging
 from datetime import datetime, timezone
-from typing import Optional, TypedDict, Any
+from typing import Any, TypedDict
 from xml.etree import ElementTree
 
+from generalresearch.models.custom_types import AwareDatetimeISO, UUIDStr
 from mypy_boto3_mturk.type_defs import AssignmentTypeDef
 from pydantic import (
     BaseModel,
-    Field,
     ConfigDict,
-    model_validator,
+    Field,
     PositiveInt,
     TypeAdapter,
     ValidationError,
+    model_validator,
 )
 from typing_extensions import Self
 
-from jb.models.custom_types import AMTBoto3ID, AwareDatetimeISO, UUIDStr
+from jb.models.custom_types import AMTBoto3ID
 from jb.models.definitions import AssignmentStatus
 
+logger = logging.getLogger("amtjb")
+
 
 class AnswerDict(TypedDict):
     amt_assignment_id: str
@@ -36,8 +39,8 @@ class AssignmentStub(BaseModel):
         validate_assignment=True,
     )
 
-    id: Optional[PositiveInt] = Field(default=None)
-    hit_id: Optional[PositiveInt] = Field(default=None)
+    id: PositiveInt | None = Field(default=None)
+    hit_id: PositiveInt | None = Field(default=None)
     amt_assignment_id: AMTBoto3ID = Field()
     amt_hit_id: AMTBoto3ID = Field()
     amt_worker_id: str = Field(min_length=3, max_length=50)
@@ -50,7 +53,7 @@ class AssignmentStub(BaseModel):
         description="When this record was saved in the database",
     )
 
-    modified_at: Optional[AwareDatetimeISO] = Field(
+    modified_at: AwareDatetimeISO | None = Field(
         default_factory=lambda: datetime.now(tz=timezone.utc),
         description="When this record was updated / modified in the database",
     )
@@ -96,18 +99,18 @@ class Assignment(AssignmentStub):
         "submitted results.",
     )
 
-    approval_time: Optional[AwareDatetimeISO] = Field(
+    approval_time: AwareDatetimeISO | None = Field(
         default=None,
         description="The date and time the Requester approved the results. This "
         "value is omitted from the assignment if the Requester has "
         "not yet approved the results.",
     )
-    rejection_time: Optional[AwareDatetimeISO] = Field(
+    rejection_time: AwareDatetimeISO | None = Field(
         default=None,
         description="The date and time the Requester rejected the results.",
     )
 
-    requester_feedback: Optional[str] = Field(
+    requester_feedback: str | None = Field(
         # Default: None. This field isn't returned with assignment data by
         # default. To request this field, specify a response group of
         # AssignmentFeedback. For information about response groups, see
@@ -123,11 +126,11 @@ class Assignment(AssignmentStub):
         },
     )
 
-    answer_xml: Optional[str] = Field(default=None, exclude=True)
+    answer_xml: str | None = Field(default=None, exclude=True)
 
     # GRL Specific
 
-    tsid: Optional[UUIDStr] = Field(default=None)
+    tsid: UUIDStr | None = Field(default=None)
 
     # --- Validators ---
 
@@ -140,7 +143,8 @@ class Assignment(AssignmentStub):
                 values["tsid"] = TypeAdapter(UUIDStr).validate_python(tsid)
             except ValidationError as e:
                 # Don't break the model validation if a baddie messes with the tsid in the answer.
-                logging.warning(e)
+                logger.warning(e)
+
                 values["tsid"] = None
         return values
 
@@ -173,7 +177,7 @@ class Assignment(AssignmentStub):
     # --- Properties  ---
 
     @property
-    def answers_dict(self) -> Optional[AnswerDict]:
+    def answers_dict(self) -> AnswerDict | None:
         # See https://docs.aws.amazon.com/AWSMechTurk/latest/AWSMturkAPI/ApiReference_AssignmentDataStructureArticle.html
         # https://docs.aws.amazon.com/AWSMechTurk/latest/AWSMechanicalTurkRequester/Concepts_NotificationsArticle.html
         if self.answer_xml is None: