Merges pull request #3

Off of Amazon!!!

1 files changed, 8 insertions, 7 deletions

diff --git a/jb/models/bonus.py b/jb/models/bonus.py
index a536dd1..c6da3c4 100644
--- a/jb/models/bonus.py
+++ b/jb/models/bonus.py
@@ -1,10 +1,11 @@
-from typing import Optional, Dict, Any
+from typing import Any
 
-from pydantic import BaseModel, Field, ConfigDict, PositiveInt
+from generalresearch.currency import USDCent
+from generalresearch.models.custom_types import AwareDatetimeISO, UUIDStr
+from pydantic import BaseModel, ConfigDict, Field, PositiveInt
 from typing_extensions import Self
 
-from generalresearchutils.currency import USDCent
-from jb.models.custom_types import AMTBoto3ID, AwareDatetimeISO, UUIDStr
+from jb.models.custom_types import AMTBoto3ID
 
 
 class Bonus(BaseModel):
@@ -20,8 +21,8 @@ class Bonus(BaseModel):
         extra="forbid",
         validate_assignment=True,
     )
-    id: Optional[PositiveInt] = Field(default=None)
-    assignment_id: Optional[PositiveInt] = Field(default=None)
+    id: PositiveInt | None = Field(default=None)
+    assignment_id: PositiveInt | None = Field(default=None)
 
     amt_worker_id: str = Field(min_length=3, max_length=50)
     amt_assignment_id: AMTBoto3ID = Field()
@@ -40,7 +41,7 @@ class Bonus(BaseModel):
         return d
 
     @classmethod
-    def from_postgres(cls, data: Dict[str, Any]) -> Self:
+    def from_postgres(cls, data: dict[str, Any]) -> Self:
         data["amount"] = USDCent(round(data["amount"] * 100))
         fields = set(cls.model_fields.keys())
         data = {k: v for k, v in data.items() if k in fields}