simplify

Author: sanderegg

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

@@ -590,9 +590,7 @@ async def _process_executing_tasks(
         """process executing tasks from the 3rd party backend"""
 
     @abstractmethod
-    async def _release_resources(
-        self, user_id: UserID, project_id: ProjectID, comp_run: CompRunsAtDB
-    ) -> None:
+    async def _release_resources(self, comp_run: CompRunsAtDB) -> None:
         """release resources used by the scheduler for a given user and project"""
 
     async def apply(
@@ -660,7 +658,7 @@ async def apply(
 
                 # 7. Are we done scheduling that pipeline?
                 if not dag.nodes() or pipeline_result in COMPLETED_STATES:
-                    await self._release_resources(user_id, project_id, comp_run)
+                    await self._release_resources(comp_run)
                     # there is nothing left, the run is completed, we're done here
                     _logger.info(
                         "pipeline %s scheduling completed with result %s",

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

@@ -232,21 +232,21 @@ async def _process_executing_tasks(
             )
         )
 
-    async def _release_resources(
-        self, user_id: UserID, project_id: ProjectID, comp_run: CompRunsAtDB
-    ) -> None:
+    async def _release_resources(self, comp_run: CompRunsAtDB) -> None:
         """release resources used by the scheduler for a given user and project"""
         with (
             log_catch(_logger, reraise=False),
             log_context(
                 _logger,
                 logging.INFO,
-                msg=f"releasing resources for {user_id=}, {project_id=}, {comp_run.run_id=}",
+                msg=f"releasing resources for {comp_run.user_id=}, {comp_run.project_uuid=}, {comp_run.run_id=}",
             ),
         ):
             await self.dask_clients_pool.release_client_ref(
                 ref=_DASK_CLIENT_RUN_REF.format(
-                    user_id=user_id, project_id=project_id, run_id=comp_run.run_id
+                    user_id=comp_run.user_id,
+                    project_id=comp_run.project_uuid,
+                    run_id=comp_run.run_id,
                 )
             )