fix: typecheck

Author: giancarloromeo

packages/celery-library/src/celery_library/backends/redis.py

@@ -172,7 +172,9 @@ async def consume_task_events(
                         continue
 
                     try:
-                        event = TypeAdapter(TaskEvent).validate_json(raw_event)
+                        event: TaskEvent = TypeAdapter(TaskEvent).validate_json(
+                            raw_event
+                        )
                         event.event_id = msg_id
                         yield event
                     except ValidationError:

packages/celery-library/src/celery_library/task_manager.py

@@ -192,7 +192,7 @@ async def consume_task_events(
         self,
         task_filter: TaskFilter,
         task_uuid: TaskUUID,
-        last_id: str,
+        last_id: str | None = None,
     ) -> AsyncIterator[TaskEvent]:
         task_id = task_filter.create_task_id(task_uuid=task_uuid)
         async for event in self._task_info_store.consume_task_events(

packages/service-library/src/servicelib/celery/models.py

@@ -127,20 +127,23 @@ class TaskMetadata(BaseModel):
     queue: TasksQueue = TasksQueue.DEFAULT
 
 
-class TaskDataEvent(BaseModel):
-    type: Literal["data"] = "data"
+class BaseTaskEvent(BaseModel):
     event_id: str | None = None
+
+
+class TaskDataEvent(BaseTaskEvent):
+    type: Literal["data"]
     data: Any
 
 
-class TaskStatusEvent(BaseModel):
-    type: Literal["status"] = "status"
-    event_id: str | None = None
+class TaskStatusEvent(BaseTaskEvent):
+    type: Literal["status"]
     data: Literal["done", "error"]
 
 
-TaskEvent: TypeAlias = Annotated[
-    TaskDataEvent | TaskStatusEvent, Field(discriminator="type")
+TaskEvent = Annotated[
+    TaskDataEvent | TaskStatusEvent,
+    Field(discriminator="type"),
 ]
 
 
@@ -213,7 +216,7 @@ async def publish_task_event(self, task_id: TaskID, event: TaskEvent) -> None: .
     def consume_task_events(
         self,
         task_id: TaskID,
-        last_id: str,
+        last_id: str | None,
     ) -> AsyncIterator[TaskEvent]: ...