simplify

Author: sanderegg

services/autoscaling/src/simcore_service_autoscaling/modules/cluster_scaling/_utils_computational.py

@@ -15,7 +15,7 @@
 _DEFAULT_MAX_CPU: Final[float] = 1
 _DEFAULT_MAX_RAM: Final[int] = 1024
 
-_DASK_TO_RESOURCE_NAME_MAPPING: Final[dict[str, str]] = {
+DASK_TO_RESOURCE_NAME_MAPPING: Final[dict[str, str]] = {
     "CPU": "cpus",
     "RAM": "ram",
 }
@@ -30,7 +30,7 @@ def resources_from_dask_task(task: DaskTask) -> Resources:
     )  # merge with defaults to ensure there is always some minimal resource defined
 
     return Resources.from_flat_dict(
-        task_resources.items(), mapping=_DASK_TO_RESOURCE_NAME_MAPPING
+        task_resources.items(), mapping=DASK_TO_RESOURCE_NAME_MAPPING
     )
 
 

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

@@ -29,7 +29,7 @@
     node_ip_from_ec2_private_dns,
 )
 from .cluster_scaling._utils_computational import (
-    resources_from_dask_task,
+    DASK_TO_RESOURCE_NAME_MAPPING,
 )
 
 _logger = logging.getLogger(__name__)
@@ -293,7 +293,9 @@ async def get_worker_used_resources(
             total_resources_used.update(task_resources)
 
         _logger.debug("found %s for %s", f"{total_resources_used=}", f"{worker_url=}")
-        return resources_from_dask_task(total_resources_used)
+        return Resources.from_flat_dict(
+            dict(total_resources_used), mapping=DASK_TO_RESOURCE_NAME_MAPPING
+        )
 
 
 async def compute_cluster_total_resources(