simplify wildcard usage

Author: bisgaard-itis

packages/celery-library/tests/unit/test_tasks.py

@@ -20,7 +20,6 @@
 from common_library.errors_classes import OsparcErrorMixin
 from faker import Faker
 from models_library.progress_bar import ProgressReport
-from pydantic import BaseModel
 from servicelib.celery.models import (
     TaskFilter,
     TaskID,
@@ -214,7 +213,7 @@ async def test_listing_task_uuids_contains_submitted_task(
 async def test_filtering_listing_tasks(
     celery_task_manager: CeleryTaskManager,
 ):
-    class MyFilter(BaseModel):
+    class MyFilter(TaskFilter):
         user_id: int
         product_name: str | Wildcard
         client_app: str | Wildcard
@@ -223,12 +222,11 @@ class MyFilter(BaseModel):
     expected_task_uuids: set[TaskUUID] = set()
 
     for _ in range(5):
-        myfilter = MyFilter(
+        task_filter = MyFilter(
             user_id=user_id,
             product_name=_faker.word(),
             client_app=_faker.word(),
         )
-        task_filter = TaskFilter.model_validate(myfilter.model_dump())
         task_uuid = await celery_task_manager.submit_task(
             TaskMetadata(
                 name=dreamer_task.__name__,
@@ -238,12 +236,11 @@ class MyFilter(BaseModel):
         expected_task_uuids.add(task_uuid)
 
     for _ in range(3):
-        myfilter = MyFilter(
+        task_filter = MyFilter(
             user_id=_faker.pyint(min_value=100, max_value=200),
             product_name=_faker.word(),
             client_app=_faker.word(),
         )
-        task_filter = TaskFilter.model_validate(myfilter.model_dump())
         await celery_task_manager.submit_task(
             TaskMetadata(
                 name=dreamer_task.__name__,
@@ -256,7 +253,5 @@ class MyFilter(BaseModel):
         product_name=Wildcard(),
         client_app=Wildcard(),
     )
-    tasks = await celery_task_manager.list_tasks(
-        TaskFilter.model_validate(search_filter.model_dump())
-    )
+    tasks = await celery_task_manager.list_tasks(search_filter)
     assert expected_task_uuids == {task.uuid for task in tasks}

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

@@ -19,13 +19,9 @@
 _FORBIDDEN_CHARS = (_WILDCARD, _TASK_ID_KEY_DELIMITATOR, "=")
 
 
-class Wildcard: ...
-
-
-def _replace_wildcard(value: Any) -> str:
-    if isinstance(value, Wildcard):
+class Wildcard:
+    def __str__(self) -> str:
         return _WILDCARD
-    return f"{value}"
 
 
 class TaskFilter(BaseModel):
@@ -47,7 +43,7 @@ class MyTaskFilter(TaskFilter):
 
     """
 
-    model_config = ConfigDict(extra="allow")
+    model_config = ConfigDict(extra="allow", arbitrary_types_allowed=True)
 
     @model_validator(mode="after")
     def _check_valid_filters(self) -> Self:
@@ -63,17 +59,14 @@ def _check_valid_filters(self) -> Self:
     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])}"
-                for key in sorted(filter_dict)
-            ]
+            [f"{key}={filter_dict[key]}" for key in sorted(filter_dict)]
         )
 
     def get_task_id(self, task_uuid: TaskUUID | Wildcard) -> TaskID:
         return _TASK_ID_KEY_DELIMITATOR.join(
             [
                 self._build_task_id_prefix(),
-                f"task_uuid={_replace_wildcard(task_uuid)}",
+                f"task_uuid={task_uuid}",
             ]
         )