Several minor corrections @pcrespov

Author: bisgaard-itis

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

@@ -75,7 +75,7 @@ async def get_task_progress(self, task_id: TaskID) -> ProgressReport | None:
             return None
 
     async def list_tasks(self, task_filter: TaskFilter) -> list[Task]:
-        search_key = _CELERY_TASK_INFO_PREFIX + task_filter.task_id("*")
+        search_key = _CELERY_TASK_INFO_PREFIX + task_filter.get_task_id("*")
 
         keys: list[str] = []
         pipeline = self._redis_client_sdk.redis.pipeline()
@@ -102,7 +102,7 @@ async def list_tasks(self, task_filter: TaskFilter) -> list[Task]:
                 task_metadata = TaskMetadata.model_validate_json(raw_metadata)
                 tasks.append(
                     Task(
-                        uuid=TaskFilter.task_uuid(key),
+                        uuid=TaskFilter.get_task_uuid(key),
                         metadata=task_metadata,
                     )
                 )

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

@@ -49,7 +49,7 @@ async def submit_task(
             msg=f"Submit {task_metadata.name=}: {task_filter=} {task_params=}",
         ):
             task_uuid = uuid4()
-            task_id = task_filter.task_id(task_uuid=task_uuid)
+            task_id = task_filter.get_task_id(task_uuid=task_uuid)
             self._celery_app.send_task(
                 task_metadata.name,
                 task_id=task_id,
@@ -77,7 +77,7 @@ async def cancel_task(self, task_filter: TaskFilter, task_uuid: TaskUUID) -> Non
             logging.DEBUG,
             msg=f"task cancellation: {task_filter=} {task_uuid=}",
         ):
-            task_id = task_filter.task_id(task_uuid=task_uuid)
+            task_id = task_filter.get_task_id(task_uuid=task_uuid)
             if not (await self.get_task_status(task_filter, task_uuid)).is_done:
                 await self._abort_task(task_id)
             await self._task_info_store.remove_task(task_id)
@@ -94,7 +94,7 @@ async def get_task_result(
             logging.DEBUG,
             msg=f"Get task result: {task_filter=} {task_uuid=}",
         ):
-            task_id = task_filter.task_id(task_uuid=task_uuid)
+            task_id = task_filter.get_task_id(task_uuid=task_uuid)
             async_result = self._celery_app.AsyncResult(task_id)
             result = async_result.result
             if async_result.ready():
@@ -108,7 +108,7 @@ async def _get_task_progress_report(
         self, task_filter: TaskFilter, task_uuid: TaskUUID, task_state: TaskState
     ) -> ProgressReport:
         if task_state in (TaskState.STARTED, TaskState.RETRY, TaskState.ABORTED):
-            task_id = task_filter.task_id(task_uuid=task_uuid)
+            task_id = task_filter.get_task_id(task_uuid=task_uuid)
             progress = await self._task_info_store.get_task_progress(task_id)
             if progress is not None:
                 return progress
@@ -137,7 +137,7 @@ async def get_task_status(
             logging.DEBUG,
             msg=f"Getting task status: {task_filter=} {task_uuid=}",
         ):
-            task_id = task_filter.task_id(task_uuid=task_uuid)
+            task_id = task_filter.get_task_id(task_uuid=task_uuid)
             task_state = await self._get_task_celery_state(task_id)
             return TaskStatus(
                 task_uuid=task_uuid,

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

@@ -7,7 +7,7 @@
 from pydantic import BaseModel, ConfigDict, StringConstraints, model_validator
 from pydantic.config import JsonDict
 
-T = TypeVar("T", bound=BaseModel)
+ModelType = TypeVar("ModelType", bound=BaseModel)
 
 TaskID: TypeAlias = str
 TaskName: TypeAlias = Annotated[
@@ -41,20 +41,20 @@ def _build_task_id_prefix(self) -> str:
             [f"{key}={filter_dict[key]}" for key in sorted(filter_dict)]
         )
 
-    def task_id(self, task_uuid: TaskUUID | Literal["*"]) -> TaskID:
+    def get_task_id(self, task_uuid: TaskUUID | Literal["*"]) -> TaskID:
         return _TASK_ID_KEY_DELIMITATOR.join(
             [self._build_task_id_prefix(), f"task_uuid={task_uuid}"]
         )
 
     @classmethod
-    def recreate_model(cls, task_id: TaskID, model: type[T]) -> T:
+    def recreate_model(cls, task_id: TaskID, model: type[ModelType]) -> ModelType:
         filter_dict = cls.recreate_data(task_id)
         return model.model_validate(filter_dict)
 
     @classmethod
     def recreate_data(cls, task_id: TaskID) -> dict[str, Any]:
         """Recreates the filter data from a task_id string
-        Careful: does not validate types. For that use `recreate_model` instead
+        WARNING: does not validate types. For that use `recreate_model` instead
         """
         try:
             parts = task_id.split(_TASK_ID_KEY_DELIMITATOR)
@@ -67,7 +67,7 @@ def recreate_data(cls, task_id: TaskID) -> dict[str, Any]:
             raise ValueError(f"Invalid task_id format: {task_id}") from err
 
     @classmethod
-    def task_uuid(cls, task_id: TaskID) -> TaskUUID:
+    def get_task_uuid(cls, task_id: TaskID) -> TaskUUID:
         try:
             return UUID(task_id.split(_TASK_ID_KEY_DELIMITATOR)[-1].split("=")[1])
         except (IndexError, ValueError) as err:

packages/service-library/tests/test_celery.py

@@ -47,8 +47,8 @@ async def test_task_filter_task_uuid(
 ):
     task_filter = TaskFilter.model_validate(task_filter_data)
     task_uuid = TaskUUID(_faker.uuid4())
-    task_id = task_filter.task_id(task_uuid)
-    assert TaskFilter.task_uuid(task_id=task_id) == task_uuid
+    task_id = task_filter.get_task_id(task_uuid)
+    assert TaskFilter.get_task_uuid(task_id=task_id) == task_uuid
 
 
 async def test_create_task_filter_from_task_id():
@@ -62,7 +62,7 @@ class MyModel(BaseModel):
     mymodel = MyModel(_int=1, _bool=True, _str="test", _list=["a", "b"])
     task_filter = TaskFilter.model_validate(mymodel.model_dump())
     task_uuid = TaskUUID(_faker.uuid4())
-    task_id = task_filter.task_id(task_uuid)
+    task_id = task_filter.get_task_id(task_uuid)
     assert TaskFilter.recreate_model(task_id=task_id, model=MyModel) == mymodel