simplify

Author: sanderegg

services/autoscaling/src/simcore_service_autoscaling/modules/dask.py

@@ -202,7 +202,11 @@ def _list_processing_tasks(
         for task_key, task_state in dask_scheduler.tasks.items():
             if task_state.processing_on:
                 worker_to_processing_tasks[task_state.processing_on.address].append(
-                    (task_key, task_state.resource_restrictions or {})
+                    (
+                        task_key,
+                        (task_state.resource_restrictions or {})
+                        | {DASK_WORKER_THREAD_RESOURCE_NAME: 1},
+                    )
                 )
         return worker_to_processing_tasks
 
@@ -270,19 +274,6 @@ async def get_worker_used_resources(
         DaskNoWorkersError
     """
 
-    def _list_processing_tasks_on_worker(
-        dask_scheduler: distributed.Scheduler, *, worker_url: str
-    ) -> list[tuple[dask.typing.Key, DaskTaskResources]]:
-        processing_tasks = []
-        for task_key, task_state in dask_scheduler.tasks.items():
-            if task_state.processing_on and (
-                task_state.processing_on.address == worker_url
-            ):
-                processing_tasks.append(
-                    (task_key, task_state.resource_restrictions or {})
-                )
-        return processing_tasks
-
     async with _scheduler_client(scheduler_url, authentication) as client:
         worker_url, _ = _dask_worker_from_ec2_instance(client, ec2_instance)
         worker_to_tasks = await _list_cluster_processing_tasks(client)

services/autoscaling/tests/unit/test_modules_dask.py

@@ -166,7 +166,10 @@ def _add_fct(x: int, y: int) -> int:
         scheduler_url, scheduler_authentication
     ) == {
         next(iter(dask_spec_cluster_client.scheduler_info()["workers"])): [
-            DaskTask(task_id=DaskTaskId(future_queued_task.key), required_resources={})
+            DaskTask(
+                task_id=DaskTaskId(future_queued_task.key),
+                required_resources={DASK_WORKER_THREAD_RESOURCE_NAME: 1},
+            )
         ]
     }