removed depenedency

Author: sanderegg

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

@@ -92,7 +92,7 @@ async def _analyze_current_cluster(
 
     buffer_ec2_instances = await get_ec2_client(app).get_instances(
         key_names=[app_settings.AUTOSCALING_EC2_INSTANCES.EC2_INSTANCES_KEY_NAME],
-        tags=get_deactivated_buffer_ec2_tags(app, auto_scaling_mode),
+        tags=get_deactivated_buffer_ec2_tags(auto_scaling_mode.get_ec2_tags(app)),
         state_names=["stopped"],
     )
 
@@ -476,7 +476,7 @@ async def _start_warm_buffer_instances(
         # NOTE: first start the instance and then set the tags in case the instance cannot start (e.g. InsufficientInstanceCapacity)
         await get_ec2_client(app).set_instances_tags(
             started_instances,
-            tags=get_activated_buffer_ec2_tags(app, auto_scaling_mode),
+            tags=get_activated_buffer_ec2_tags(auto_scaling_mode.get_ec2_tags(app)),
         )
     started_instance_ids = [i.id for i in started_instances]
 

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

@@ -119,7 +119,7 @@ async def _analyse_current_state(
 
     all_buffer_instances = await ec2_client.get_instances(
         key_names=[app_settings.AUTOSCALING_EC2_INSTANCES.EC2_INSTANCES_KEY_NAME],
-        tags=get_deactivated_buffer_ec2_tags(app, auto_scaling_mode),
+        tags=get_deactivated_buffer_ec2_tags(auto_scaling_mode.get_ec2_tags(app)),
         state_names=["stopped", "pending", "running", "stopping"],
     )
     buffers_manager = BufferPoolManager()
@@ -265,7 +265,9 @@ async def _add_remove_buffer_instances(
                     name=ec2_type,
                     resources=Resources.create_as_empty(),  # fake resources
                 ),
-                tags=get_deactivated_buffer_ec2_tags(app, auto_scaling_mode),
+                tags=get_deactivated_buffer_ec2_tags(
+                    auto_scaling_mode.get_ec2_tags(app)
+                ),
                 startup_script=ec2_buffer_startup_script(
                     ec2_boot_specific, app_settings
                 ),

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

@@ -4,7 +4,6 @@
 
 from aws_library.ec2 import AWS_TAG_VALUE_MAX_LENGTH, AWSTagKey, AWSTagValue, EC2Tags
 from common_library.json_serialization import json_dumps
-from fastapi import FastAPI
 from models_library.docker import DockerGenericTag
 from pydantic import TypeAdapter
 
@@ -15,27 +14,20 @@
     PRE_PULLED_IMAGES_EC2_TAG_KEY,
     PRE_PULLED_IMAGES_RE,
 )
-from ..modules.auto_scaling_mode_base import BaseAutoscaling
 
 _NAME_EC2_TAG_KEY: Final[AWSTagKey] = TypeAdapter(AWSTagKey).validate_python("Name")
 
 
-def get_activated_buffer_ec2_tags(
-    app: FastAPI, auto_scaling_mode: BaseAutoscaling
-) -> EC2Tags:
-    return auto_scaling_mode.get_ec2_tags(app) | ACTIVATED_BUFFER_MACHINE_EC2_TAGS
+def get_activated_buffer_ec2_tags(base_ec2_tags: EC2Tags) -> EC2Tags:
+    return base_ec2_tags | ACTIVATED_BUFFER_MACHINE_EC2_TAGS
 
 
-def get_deactivated_buffer_ec2_tags(
-    app: FastAPI, auto_scaling_mode: BaseAutoscaling
-) -> EC2Tags:
-    base_ec2_tags = (
-        auto_scaling_mode.get_ec2_tags(app) | DEACTIVATED_BUFFER_MACHINE_EC2_TAGS
+def get_deactivated_buffer_ec2_tags(base_ec2_tags: EC2Tags) -> EC2Tags:
+    new_base_ec2_tags = base_ec2_tags | DEACTIVATED_BUFFER_MACHINE_EC2_TAGS
+    new_base_ec2_tags[_NAME_EC2_TAG_KEY] = TypeAdapter(AWSTagValue).validate_python(
+        f"{new_base_ec2_tags[_NAME_EC2_TAG_KEY]}-buffer"
     )
-    base_ec2_tags[_NAME_EC2_TAG_KEY] = TypeAdapter(AWSTagValue).validate_python(
-        f"{base_ec2_tags[_NAME_EC2_TAG_KEY]}-buffer"
-    )
-    return base_ec2_tags
+    return new_base_ec2_tags
 
 
 def is_buffer_machine(tags: EC2Tags) -> bool:

services/autoscaling/tests/unit/conftest.py

@@ -1185,7 +1185,7 @@ async def _do(
         resource_tags: list[TagTypeDef] = [
             {"Key": tag_key, "Value": tag_value}
             for tag_key, tag_value in get_deactivated_buffer_ec2_tags(
-                initialized_app, DynamicAutoscaling()
+                DynamicAutoscaling().get_ec2_tags(initialized_app)
             ).items()
         ]
         if pre_pull_images is not None and instance_state_name == "stopped":

services/autoscaling/tests/unit/test_utils_buffer_machines_pool_core.py

@@ -39,7 +39,7 @@ def test_get_activated_buffer_ec2_tags_dynamic(
 ):
     auto_scaling_mode = DynamicAutoscaling()
     activated_buffer_tags = get_activated_buffer_ec2_tags(
-        initialized_app, auto_scaling_mode
+        auto_scaling_mode.get_ec2_tags(initialized_app)
     )
     assert (
         auto_scaling_mode.get_ec2_tags(initialized_app)
@@ -57,7 +57,7 @@ def test_get_deactivated_buffer_ec2_tags_dynamic(
 ):
     auto_scaling_mode = DynamicAutoscaling()
     deactivated_buffer_tags = get_deactivated_buffer_ec2_tags(
-        initialized_app, auto_scaling_mode
+        auto_scaling_mode.get_ec2_tags(initialized_app)
     )
     # when deactivated the buffer EC2 name has an additional -buffer suffix
     expected_tags = (
@@ -81,7 +81,7 @@ def test_get_activated_buffer_ec2_tags_computational(
 ):
     auto_scaling_mode = ComputationalAutoscaling()
     activated_buffer_tags = get_activated_buffer_ec2_tags(
-        initialized_app, auto_scaling_mode
+        auto_scaling_mode.get_ec2_tags(initialized_app)
     )
     assert (
         auto_scaling_mode.get_ec2_tags(initialized_app)
@@ -99,7 +99,7 @@ def test_get_deactivated_buffer_ec2_tags_computational(
 ):
     auto_scaling_mode = ComputationalAutoscaling()
     deactivated_buffer_tags = get_deactivated_buffer_ec2_tags(
-        initialized_app, auto_scaling_mode
+        auto_scaling_mode.get_ec2_tags(initialized_app)
     )
     # when deactivated the buffer EC2 name has an additional -buffer suffix
     expected_tags = (