fixes @pcrespov

Author: bisgaard-itis

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

@@ -76,7 +76,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.get_task_id(
+        search_key = _CELERY_TASK_INFO_PREFIX + task_filter.create_task_id(
             task_uuid=Wildcard()
         )
 

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.get_task_id(task_uuid=task_uuid)
+            task_id = task_filter.create_task_id(task_uuid=task_uuid)
             self._celery_app.send_task(
                 task_metadata.name,
                 task_id=task_id,
@@ -73,7 +73,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.get_task_id(task_uuid=task_uuid)
+            task_id = task_filter.create_task_id(task_uuid=task_uuid)
             if not await self.task_exists(task_id):
                 raise TaskNotFoundError(task_id=task_id)
 
@@ -95,7 +95,7 @@ async def get_task_result(
             logging.DEBUG,
             msg=f"Get task result: {task_filter=} {task_uuid=}",
         ):
-            task_id = task_filter.get_task_id(task_uuid=task_uuid)
+            task_id = task_filter.create_task_id(task_uuid=task_uuid)
             if not await self.task_exists(task_id):
                 raise TaskNotFoundError(task_id=task_id)
 
@@ -138,7 +138,7 @@ async def get_task_status(
             logging.DEBUG,
             msg=f"Getting task status: {task_filter=} {task_uuid=}",
         ):
-            task_id = task_filter.get_task_id(task_uuid=task_uuid)
+            task_id = task_filter.create_task_id(task_uuid=task_uuid)
             if not await self.task_exists(task_id):
                 raise TaskNotFoundError(task_id=task_id)
 

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

@@ -64,7 +64,7 @@ def _build_task_id_prefix(self) -> str:
             [f"{key}={filter_dict[key]}" for key in sorted(filter_dict)]
         )
 
-    def get_task_id(self, task_uuid: TaskUUID | Wildcard) -> TaskID:
+    def create_task_id(self, task_uuid: TaskUUID | Wildcard) -> TaskID:
         return _TASK_ID_KEY_DELIMITATOR.join(
             [
                 self._build_task_id_prefix(),
@@ -74,11 +74,11 @@ def get_task_id(self, task_uuid: TaskUUID | Wildcard) -> TaskID:
 
     @classmethod
     def recreate_as_model(cls, task_id: TaskID, schema: type[ModelType]) -> ModelType:
-        filter_dict = cls.recreate_data(task_id)
+        filter_dict = cls._recreate_data(task_id)
         return schema.model_validate(filter_dict)
 
     @classmethod
-    def recreate_data(cls, task_id: TaskID) -> dict[str, Any]:
+    def _recreate_data(cls, task_id: TaskID) -> dict[str, Any]:
         """Recreates the filter data from a task_id string
         WARNING: does not validate types. For that use `recreate_model` instead
         """

packages/service-library/tests/test_celery.py

@@ -47,7 +47,7 @@ async def test_task_filter_task_uuid(
 ):
     task_filter = TaskFilter.model_validate(task_filter_data)
     task_uuid = TaskUUID(_faker.uuid4())
-    task_id = task_filter.get_task_id(task_uuid)
+    task_id = task_filter.create_task_id(task_uuid)
     assert TaskFilter.get_task_uuid(task_id=task_id) == task_uuid
 
 
@@ -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.get_task_id(task_uuid)
+    task_id = task_filter.create_task_id(task_uuid)
     assert TaskFilter.recreate_as_model(task_id=task_id, schema=MyModel) == mymodel