Ruff auto fix, and requirements bump

1 files changed, 20 insertions, 22 deletions

diff --git a/jb/models/hit.py b/jb/models/hit.py
index 45478fc..f6c854f 100644
--- a/jb/models/hit.py
+++ b/jb/models/hit.py
@@ -1,25 +1,25 @@
-from datetime import datetime, timezone, timedelta
-from typing import Optional, List, Dict, Any
+from datetime import datetime, timedelta, timezone
+from typing import Any
 from uuid import uuid4
 from xml.etree import ElementTree
 
+from generalresearch.currency import USDCent
 from mypy_boto3_mturk.type_defs import HITTypeDef
 from pydantic import (
     BaseModel,
-    Field,
-    PositiveInt,
     ConfigDict,
+    Field,
     NonNegativeInt,
+    PositiveInt,
 )
 from typing_extensions import Self
 
-from generalresearch.currency import USDCent
-from jb.models.custom_types import AMTBoto3ID, HttpsUrlStr, AwareDatetimeISO
-from jb.models.definitions import HitStatus, HitReviewStatus
+from jb.models.custom_types import AMTBoto3ID, AwareDatetimeISO, HttpsUrlStr
+from jb.models.definitions import HitReviewStatus, HitStatus
 
 
 class HitQuestion(BaseModel):
-    id: Optional[PositiveInt] = Field(default=None)
+    id: PositiveInt | None = Field(default=None)
 
     url: HttpsUrlStr = Field()
     height: PositiveInt = Field(default=1_200, ge=100, le=4_000)
@@ -33,7 +33,7 @@ class HitQuestion(BaseModel):
     def xml(self) -> str:
         return f"""<?xml version="1.0" encoding="UTF-8"?>
                     <ExternalQuestion xmlns="http://mechanicalturk.amazonaws.com/AWSMechanicalTurkDataSchemas/2006-07-14/ExternalQuestion.xsd">
-                    <ExternalURL>{str(self.url)}</ExternalURL>
+                    <ExternalURL>{self.url!s}</ExternalURL>
                     <FrameHeight>{self.height}</FrameHeight>
                     </ExternalQuestion>"""
 
@@ -82,8 +82,8 @@ class HitType(HitTypeCommon):
     https://docs.aws.amazon.com/AWSMechTurk/latest/AWSMturkAPI/ApiReference_CreateHITTypeOperation.html
     """
 
-    id: Optional[PositiveInt] = Field(default=None)
-    amt_hit_type_id: Optional[AMTBoto3ID] = Field(default=None)
+    id: PositiveInt | None = Field(default=None)
+    amt_hit_type_id: AMTBoto3ID | None = Field(default=None)
 
     # --- GRL Specific ---
     min_active: NonNegativeInt = Field(default=0, le=100_000)
@@ -104,11 +104,11 @@ class HitType(HitTypeCommon):
         return d
 
     @classmethod
-    def from_postgres(cls, data: Dict[str, Any]) -> Self:
+    def from_postgres(cls, data: dict[str, Any]) -> Self:
         data["reward"] = USDCent(round(data["reward"] * 100))
         return cls.model_validate(data)
 
-    def generate_hit_amt_request(self, question: HitQuestion) -> Dict[str, Any]:
+    def generate_hit_amt_request(self, question: HitQuestion) -> dict[str, Any]:
         d = dict()
         d["HITTypeId"] = self.amt_hit_type_id
         d["MaxAssignments"] = 1
@@ -124,9 +124,9 @@ class Hit(HitTypeCommon):
         validate_assignment=True,
     )
 
-    id: Optional[PositiveInt] = Field(default=None)
-    hit_type_id: Optional[PositiveInt] = Field(default=None)
-    question_id: Optional[PositiveInt] = Field(default=None)
+    id: PositiveInt | None = Field(default=None)
+    hit_type_id: PositiveInt | None = Field(default=None)
+    question_id: PositiveInt | None = Field(default=None)
 
     amt_hit_id: AMTBoto3ID = Field()
     amt_hit_type_id: AMTBoto3ID = Field()
@@ -138,10 +138,8 @@ class Hit(HitTypeCommon):
 
     # TODO: Check if this is actually ever going to be None. I type fixed it,
     # but I don't have anything to suggest it isn't requred. -- Max 2026-02-24
-    creation_time: Optional[AwareDatetimeISO] = Field(
-        default=None, description="From aws"
-    )
-    expiration: Optional[AwareDatetimeISO] = Field(default=None)
+    creation_time: AwareDatetimeISO | None = Field(default=None, description="From aws")
+    expiration: AwareDatetimeISO | None = Field(default=None)
 
     # GRL Specific
     created_at: AwareDatetimeISO = Field(
@@ -155,7 +153,7 @@ class Hit(HitTypeCommon):
 
     # -- Hit specific
 
-    qualification_requirements: Optional[List[Dict[str, Any]]] = Field(default=None)
+    qualification_requirements: list[dict[str, Any]] | None = Field(default=None)
     max_assignments: int = Field()
 
     # # this comes back as expiration. only for the request
@@ -235,7 +233,7 @@ class Hit(HitTypeCommon):
         return d
 
     @classmethod
-    def from_postgres(cls, data: Dict[str, Any]) -> Self:
+    def from_postgres(cls, data: dict[str, Any]) -> Self:
         data["reward"] = USDCent(round(data["reward"] * 100))
         return cls.model_validate(data)