remove circular dependency

Author: sanderegg

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

@@ -340,10 +340,10 @@ async def _sorted_allowed_instance_types(app: FastAPI) -> list[EC2InstanceType]:
         allowed_instance_type_names
     ), "EC2_INSTANCES_ALLOWED_TYPES cannot be empty!"
 
-    allowed_instance_types: list[EC2InstanceType] = (
-        await ec2_client.get_ec2_instance_capabilities(
-            cast(set[InstanceTypeType], set(allowed_instance_type_names))
-        )
+    allowed_instance_types: list[
+        EC2InstanceType
+    ] = await ec2_client.get_ec2_instance_capabilities(
+        cast(set[InstanceTypeType], set(allowed_instance_type_names))
     )
 
     def _as_selection(instance_type: EC2InstanceType) -> int:
@@ -631,8 +631,8 @@ async def _find_needed_instances(
                     defined_ec2 = find_selected_instance_type_for_task(
                         task_required_ec2_instance,
                         available_ec2_types,
-                        auto_scaling_mode,
                         task,
+                        auto_scaling_mode.get_task_required_resources(task),
                     )
                     needed_new_instance_types_for_tasks.append(
                         AssignedTasksToInstanceType(
@@ -1075,9 +1075,9 @@ async def _notify_based_on_machine_type(
     launch_time_to_tasks: dict[datetime.datetime, list] = collections.defaultdict(list)
     now = datetime.datetime.now(datetime.UTC)
     for instance in instances:
-        launch_time_to_tasks[
-            instance.ec2_instance.launch_time
-        ] += instance.assigned_tasks
+        launch_time_to_tasks[instance.ec2_instance.launch_time] += (
+            instance.assigned_tasks
+        )
 
     for launch_time, tasks in launch_time_to_tasks.items():
         time_since_launch = now - launch_time

services/autoscaling/src/simcore_service_autoscaling/utils/auto_scaling_core.py

@@ -4,6 +4,7 @@
 from typing import Final
 
 from aws_library.ec2 import EC2InstanceBootSpecific, EC2InstanceData, EC2InstanceType
+from aws_library.ec2._models import Resources
 from models_library.generated_models.docker_rest_api import Node
 from types_aiobotocore_ec2.literals import InstanceTypeType
 
@@ -14,7 +15,6 @@
 )
 from ..core.settings import ApplicationSettings
 from ..models import AssociatedInstance
-from ..modules.auto_scaling_mode_base import BaseAutoscaling
 from . import utils_docker
 
 _EC2_INTERNAL_DNS_RE: Final[re.Pattern] = re.compile(r"^(?P<host_name>ip-[^.]+).*$")
@@ -138,8 +138,8 @@ def _instance_type_by_type_name(
 def find_selected_instance_type_for_task(
     instance_type_name: InstanceTypeType,
     available_ec2_types: list[EC2InstanceType],
-    auto_scaling_mode: BaseAutoscaling,
     task,
+    task_required_resources: Resources,
 ) -> EC2InstanceType:
     filtered_instances = list(
         filter(
@@ -158,14 +158,11 @@ def find_selected_instance_type_for_task(
     selected_instance = filtered_instances[0]
 
     # check that the assigned resources and the machine resource fit
-    if (
-        auto_scaling_mode.get_task_required_resources(task)
-        > selected_instance.resources
-    ):
+    if task_required_resources > selected_instance.resources:
         raise TaskRequirementsAboveRequiredEC2InstanceTypeError(
             task=task,
             instance_type=selected_instance,
-            resources=auto_scaling_mode.get_task_required_resources(task),
+            resources=task_required_resources,
         )
 
     return selected_instance