test callback mechanism

Author: sanderegg

services/director-v2/src/simcore_service_director_v2/modules/comp_scheduler/_manager.py

@@ -113,9 +113,7 @@ async def _get_pipeline_dag(project_id: ProjectID, db_engine: Engine) -> nx.DiGr
 
 @exclusive(
     get_redis_client_from_app,
-    lock_key=get_redis_lock_key(
-        MODULE_NAME_SCHEDULER, unique_lock_key_builder=lambda: ""
-    ),
+    lock_key=get_redis_lock_key(MODULE_NAME_SCHEDULER, unique_lock_key_builder=None),
 )
 async def schedule_pipelines(app: FastAPI) -> None:
     with log_context(_logger, logging.DEBUG, msg="scheduling pipelines"):

services/director-v2/src/simcore_service_director_v2/modules/comp_scheduler/_utils.py

@@ -93,11 +93,15 @@ def get_redis_client_from_app(*args, **kwargs) -> RedisClientSDK:
 
 
 def get_redis_lock_key(
-    suffix: str, *, unique_lock_key_builder: Callable[..., str]
+    suffix: str, *, unique_lock_key_builder: Callable[..., str] | None
 ) -> Callable[..., str]:
     def _(*args, **kwargs) -> str:
         app = _get_app_from_args(*args, **kwargs)
-        unique_lock_part = unique_lock_key_builder(*args, **kwargs)
-        return f"{app.title}-{suffix}-{unique_lock_part}"
+        unique_lock_part = (
+            unique_lock_key_builder(*args, **kwargs) if unique_lock_key_builder else ""
+        )
+        if unique_lock_part:
+            unique_lock_part = f"-{unique_lock_part}"
+        return f"{app.title}-{suffix}{unique_lock_part}"
 
     return _

services/director-v2/src/simcore_service_director_v2/modules/comp_scheduler/_worker.py

@@ -26,7 +26,7 @@ def _get_scheduler_worker(app: FastAPI) -> BaseCompScheduler:
 
 
 def _unique_key_builder(
-    user_id: UserID, project_id: ProjectID, iteration: Iteration
+    _app, user_id: UserID, project_id: ProjectID, iteration: Iteration
 ) -> str:
     return f"{user_id}:{project_id}:{iteration}"
 

services/director-v2/tests/unit/with_dbs/comp_scheduler/test_worker.py

@@ -48,6 +48,7 @@ def mocked_get_scheduler_worker(
 
 
 async def test_worker_properly_calls_scheduler_api(
+    with_disabled_auto_scheduling: mock.Mock,
     initialized_app: FastAPI,
     mocked_get_scheduler_worker: mock.Mock,
     published_project: PublishedProject,