simplify wildcard usage

Author: bisgaard-itis

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

@@ -128,10 +128,6 @@ async def set_task_progress(self, task_id: TaskID, report: ProgressReport) -> No
             value=report.model_dump_json(),
         )  # type: ignore
 
-    @property
-    def wildcard_str(self) -> str:
-        return "*"
-
 
 if TYPE_CHECKING:
     _: type[TaskInfoStore] = RedisTaskInfoStore

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

@@ -49,9 +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, wildcard_str=self._task_info_store.wildcard_str
-            )
+            task_id = task_filter.get_task_id(task_uuid=task_uuid)
             self._celery_app.send_task(
                 task_metadata.name,
                 task_id=task_id,
@@ -79,9 +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.get_task_id(
-                task_uuid=task_uuid, wildcard_str=self._task_info_store.wildcard_str
-            )
+            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)
@@ -98,9 +94,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, wildcard_str=self._task_info_store.wildcard_str
-            )
+            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():
@@ -114,9 +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.get_task_id(
-                task_uuid=task_uuid, wildcard_str=self._task_info_store.wildcard_str
-            )
+            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
@@ -145,9 +137,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, wildcard_str=self._task_info_store.wildcard_str
-            )
+            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

@@ -15,14 +15,15 @@
 ]
 TaskUUID: TypeAlias = UUID
 _TASK_ID_KEY_DELIMITATOR: Final[str] = ":"
+_WILDCARD: Final[str] = "*"
 
 
 class Wildcard: ...
 
 
-def _replace_wildcard(value: Any, wildcard_str: str) -> str:
+def _replace_wildcard(value: Any) -> str:
     if isinstance(value, Wildcard):
-        return wildcard_str
+        return _WILDCARD
     return f"{value}"
 
 
@@ -60,20 +61,20 @@ def _check_valid_filters(self) -> Self:
                 )
         return self
 
-    def _build_task_id_prefix(self, wildcard_str: str) -> str:
+    def _build_task_id_prefix(self) -> str:
         filter_dict = self.model_dump()
         return _TASK_ID_KEY_DELIMITATOR.join(
             [
-                f"{key}={_replace_wildcard(filter_dict[key], wildcard_str)}"
+                f"{key}={_replace_wildcard(filter_dict[key])}"
                 for key in sorted(filter_dict)
             ]
         )
 
-    def get_task_id(self, task_uuid: TaskUUID | Wildcard, wildcard_str: str) -> TaskID:
+    def get_task_id(self, task_uuid: TaskUUID | Wildcard) -> TaskID:
         return _TASK_ID_KEY_DELIMITATOR.join(
             [
-                self._build_task_id_prefix(wildcard_str),
-                f"task_uuid={_replace_wildcard(task_uuid, wildcard_str)}",
+                self._build_task_id_prefix(),
+                f"task_uuid={_replace_wildcard(task_uuid)}",
             ]
         )
 
@@ -191,9 +192,6 @@ async def set_task_progress(
         self, task_id: TaskID, report: ProgressReport
     ) -> None: ...
 
-    @property
-    def wildcard_str(cls) -> str: ...
-
 
 class TaskStatus(BaseModel):
     task_uuid: TaskUUID