Move common types

Author: MU-Software

runtime/chalicelib/sender/__interface__.py

@@ -1,16 +1,12 @@
+import chalicelib.util.type_util as type_util
 import pydantic
 
-ReceiverType = str
-AllowedBasicValueTypes = str | int | float | bool | None
-AllowedValueTypes = AllowedBasicValueTypes | list[AllowedBasicValueTypes] | dict[str, AllowedBasicValueTypes] | None
-ContextType = dict[str, AllowedValueTypes]
-
 
 class NotificationSendRequestSharedContext(pydantic.BaseModel):
     from_: str
 
 
 class NotificationSendRequest(pydantic.BaseModel):
     template_code: str
-    shared_context: ContextType
-    personalized_context: dict[ReceiverType, ContextType]
+    shared_context: type_util.ContextType
+    personalized_context: dict[str, type_util.ContextType]

runtime/chalicelib/sender/aws_ses.py

@@ -3,6 +3,7 @@
 import botocore.exceptions
 import chalicelib.aws_resource
 import chalicelib.sender.__interface__ as sender_interface
+import chalicelib.util.type_util as type_util
 import jinja2
 import pydantic
 
@@ -53,7 +54,7 @@ class AWSSESSendRequest(sender_interface.NotificationSendRequest):
 
     @pydantic.field_validator("shared_context", mode="before")
     @classmethod
-    def validate_shared_context(cls, v: sender_interface.ContextType) -> sender_interface.ContextType:
+    def validate_shared_context(cls, v: type_util.ContextType) -> type_util.ContextType:
         if all(k not in v for k in cls.REQUIRED_SHARED_FIELDS):
             raise ValueError("shared_context missing required fields")
         return v

runtime/chalicelib/util/type_util.py

@@ -6,6 +6,11 @@
 RouteInfoType = tuple[str, list[HttpMethodType], typing.Callable]
 RouteCollectionType = list[RouteInfoType]
 
+AllowedBasicValueTypes = str | int | float | bool | None
+AllowedValueTypes = AllowedBasicValueTypes | list[AllowedBasicValueTypes] | dict[str, AllowedBasicValueTypes] | None
+ContextType = dict[str, AllowedValueTypes]
+TemplateType = dict[str, AllowedValueTypes]
+
 
 class NotiCoSQSMessage(pydantic.BaseModel):
     worker_action: str