add resource info on instance types as well

Author: sanderegg

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

@@ -346,7 +346,9 @@ async def _try_attach_pending_ec2s(
     )
 
 
-async def _sorted_allowed_instance_types(app: FastAPI) -> list[EC2InstanceType]:
+async def _sorted_allowed_instance_types(
+    app: FastAPI, auto_scaling_mode: AutoscalingProvider
+) -> list[EC2InstanceType]:
     app_settings: ApplicationSettings = app.state.settings
     assert app_settings.AUTOSCALING_EC2_INSTANCES  # nosec
     ec2_client = get_ec2_client(app)
@@ -370,6 +372,8 @@ def _as_selection(instance_type: EC2InstanceType) -> int:
         return allowed_instance_type_names.index(f"{instance_type.name}")
 
     allowed_instance_types.sort(key=_as_selection)
+    for instance_type in allowed_instance_types:
+        auto_scaling_mode.add_instance_type_generic_resource(app, instance_type)
     return allowed_instance_types
 
 
@@ -1578,7 +1582,10 @@ async def auto_scale_cluster(
     the additional load.
     """
     # current state
-    allowed_instance_types = await _sorted_allowed_instance_types(app)
+    allowed_instance_types = await _sorted_allowed_instance_types(
+        app, auto_scaling_mode
+    )
+
     cluster = await _analyze_current_cluster(
         app, auto_scaling_mode, allowed_instance_types
     )

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

@@ -3,6 +3,7 @@
 from typing import Any, cast
 
 from aws_library.ec2 import EC2InstanceData, EC2Tags, Resources
+from aws_library.ec2._models import EC2InstanceType
 from fastapi import FastAPI
 from models_library.clusters import ClusterAuthentication
 from models_library.docker import DockerLabelKey
@@ -191,3 +192,14 @@ def add_instance_generic_resources(
         app_settings = get_application_settings(app)
         assert app_settings.AUTOSCALING_DASK  # nosec
         dask.add_instance_generic_resources(app_settings.AUTOSCALING_DASK, instance)
+
+    def add_instance_type_generic_resource(
+        self, app: FastAPI, instance_type: EC2InstanceType
+    ) -> None:
+        assert self  # nosec
+        assert app  # nosec
+        app_settings = get_application_settings(app)
+        assert app_settings.AUTOSCALING_DASK  # nosec
+        dask.add_instance_type_generic_resource(
+            app_settings.AUTOSCALING_DASK, instance_type
+        )

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

@@ -1,6 +1,7 @@
 from typing import Protocol
 
 from aws_library.ec2 import EC2InstanceData, EC2Tags, Resources
+from aws_library.ec2._models import EC2InstanceType
 from fastapi import FastAPI
 from models_library.docker import DockerLabelKey
 from models_library.generated_models.docker_rest_api import Node as DockerNode
@@ -51,3 +52,7 @@ async def try_retire_nodes(self, app: FastAPI) -> None: ...
     def add_instance_generic_resources(
         self, app: FastAPI, instance: EC2InstanceData
     ) -> None: ...
+
+    def add_instance_type_generic_resource(
+        self, app: FastAPI, instance_type: EC2InstanceType
+    ) -> None: ...

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

@@ -9,6 +9,7 @@
 import dask.typing
 import distributed
 from aws_library.ec2 import EC2InstanceData, Resources
+from aws_library.ec2._models import EC2InstanceType
 from dask_task_models_library.resource_constraints import (
     DASK_WORKER_THREAD_RESOURCE_NAME,
     DaskTaskResources,
@@ -359,3 +360,22 @@ def add_instance_generic_resources(
     instance.resources.generic_resources[
         create_ec2_resource_constraint_key(instance.type)
     ] = _LARGE_RESOURCE
+
+
+def add_instance_type_generic_resource(
+    settings: DaskMonitoringSettings, instance_type: EC2InstanceType
+) -> None:
+    instance_threads = round(instance_type.resources.cpus)
+    if settings.DASK_NTHREADS > 0:
+        # this overrides everything
+        instance_threads = settings.DASK_NTHREADS
+    if settings.DASK_NTHREADS_MULTIPLIER > 1:
+        instance_threads = instance_threads * settings.DASK_NTHREADS_MULTIPLIER
+
+    instance_type.resources.generic_resources[DASK_WORKER_THREAD_RESOURCE_NAME] = (
+        instance_threads
+    )
+
+    instance_type.resources.generic_resources[
+        create_ec2_resource_constraint_key(instance_type.name)
+    ] = _LARGE_RESOURCE