renaming utils

Author: sanderegg

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

@@ -39,19 +39,19 @@
     NonAssociatedInstance,
 )
 from ...utils import utils_docker, utils_ec2
-from ...utils.auto_scaling_core import (
+from ...utils.buffer_machines import (
+    get_activated_buffer_ec2_tags,
+    get_deactivated_buffer_ec2_tags,
+    is_buffer_machine,
+)
+from ...utils.cluster_scaling import (
     associate_ec2_instances_with_nodes,
     ec2_startup_script,
     find_selected_instance_type_for_task,
     get_machine_buffer_type,
     node_host_name_from_ec2_private_dns,
     sort_drained_nodes,
 )
-from ...utils.buffer_machines_pool_core import (
-    get_activated_buffer_ec2_tags,
-    get_deactivated_buffer_ec2_tags,
-    is_buffer_machine,
-)
 from ...utils.rabbitmq import (
     post_autoscaling_status_message,
     post_tasks_log_message,

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

@@ -43,12 +43,12 @@
 )
 from ...core.settings import get_application_settings
 from ...models import BufferPool, BufferPoolManager
-from ...utils.auto_scaling_core import ec2_buffer_startup_script
-from ...utils.buffer_machines_pool_core import (
+from ...utils.buffer_machines import (
     dump_pre_pulled_images_as_tags,
     get_deactivated_buffer_ec2_tags,
     load_pre_pulled_images_from_tags,
 )
+from ...utils.cluster_scaling import ec2_buffer_startup_script
 from ..ec2 import get_ec2_client
 from ..instrumentation import get_instrumentation, has_instrumentation
 from ..ssm import get_ssm_client

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

@@ -21,7 +21,7 @@
     DaskWorkerNotFoundError,
 )
 from ..models import AssociatedInstance, DaskTask, DaskTaskId
-from ..utils.auto_scaling_core import (
+from ..utils.cluster_scaling import (
     node_host_name_from_ec2_private_dns,
     node_ip_from_ec2_private_dns,
 )
@@ -30,7 +30,7 @@
 
 
 async def _wrap_client_async_routine(
-    client_coroutine: Coroutine[Any, Any, Any] | Any | None
+    client_coroutine: Coroutine[Any, Any, Any] | Any | None,
 ) -> Any:
     """Dask async behavior does not go well with Pylance as it returns
     a union of types. this wrapper makes both mypy and pylance happy"""
@@ -96,7 +96,7 @@ def _dask_worker_from_ec2_instance(
 
     # dict is of type dask_worker_address: worker_details
     def _find_by_worker_host(
-        dask_worker: tuple[DaskWorkerUrl, DaskWorkerDetails]
+        dask_worker: tuple[DaskWorkerUrl, DaskWorkerDetails],
     ) -> bool:
         _, details = dask_worker
         if match := re.match(DASK_NAME_PATTERN, details["name"]):
@@ -173,9 +173,9 @@ def _list_tasks(
         }
 
     async with _scheduler_client(scheduler_url, authentication) as client:
-        list_of_tasks: dict[
-            dask.typing.Key, DaskTaskResources
-        ] = await _wrap_client_async_routine(client.run_on_scheduler(_list_tasks))
+        list_of_tasks: dict[dask.typing.Key, DaskTaskResources] = (
+            await _wrap_client_async_routine(client.run_on_scheduler(_list_tasks))
+        )
         _logger.debug("found unrunnable tasks: %s", list_of_tasks)
         return [
             DaskTask(
@@ -207,10 +207,10 @@ def _list_processing_tasks(
         return worker_to_processing_tasks
 
     async with _scheduler_client(scheduler_url, authentication) as client:
-        worker_to_tasks: dict[
-            str, list[tuple[dask.typing.Key, DaskTaskResources]]
-        ] = await _wrap_client_async_routine(
-            client.run_on_scheduler(_list_processing_tasks)
+        worker_to_tasks: dict[str, list[tuple[dask.typing.Key, DaskTaskResources]]] = (
+            await _wrap_client_async_routine(
+                client.run_on_scheduler(_list_processing_tasks)
+            )
         )
         _logger.debug("found processing tasks: %s", worker_to_tasks)
         tasks_per_worker = defaultdict(list)
@@ -276,12 +276,12 @@ def _list_processing_tasks_on_worker(
         _logger.debug("looking for processing tasks for %s", f"{worker_url=}")
 
         # now get the used resources
-        worker_processing_tasks: list[
-            tuple[dask.typing.Key, DaskTaskResources]
-        ] = await _wrap_client_async_routine(
-            client.run_on_scheduler(
-                _list_processing_tasks_on_worker, worker_url=worker_url
-            ),
+        worker_processing_tasks: list[tuple[dask.typing.Key, DaskTaskResources]] = (
+            await _wrap_client_async_routine(
+                client.run_on_scheduler(
+                    _list_processing_tasks_on_worker, worker_url=worker_url
+                ),
+            )
         )
 
         total_resources_used: collections.Counter[str] = collections.Counter()

services/autoscaling/src/simcore_service_autoscaling/utils/buffer_machines_pool_core.py renamed to services/autoscaling/src/simcore_service_autoscaling/utils/buffer_machines.py

@@ -84,7 +84,7 @@
 )
 from simcore_service_autoscaling.modules.docker import AutoscalingDocker
 from simcore_service_autoscaling.modules.ec2 import SimcoreEC2API
-from simcore_service_autoscaling.utils.buffer_machines_pool_core import (
+from simcore_service_autoscaling.utils.buffer_machines import (
     get_deactivated_buffer_ec2_tags,
 )
 from simcore_service_autoscaling.utils.utils_docker import (

services/autoscaling/src/simcore_service_autoscaling/utils/auto_scaling_core.py renamed to services/autoscaling/src/simcore_service_autoscaling/utils/cluster_scaling.py

@@ -66,7 +66,7 @@
     AutoscalingDocker,
     get_docker_client,
 )
-from simcore_service_autoscaling.utils.auto_scaling_core import (
+from simcore_service_autoscaling.utils.cluster_scaling import (
     node_host_name_from_ec2_private_dns,
 )
 from simcore_service_autoscaling.utils.utils_docker import (

services/autoscaling/tests/unit/conftest.py

@@ -20,7 +20,7 @@
 from simcore_service_autoscaling.modules.cluster_scaling._provider_dynamic import (
     DynamicAutoscalingProvider,
 )
-from simcore_service_autoscaling.utils.buffer_machines_pool_core import (
+from simcore_service_autoscaling.utils.buffer_machines import (
     dump_pre_pulled_images_as_tags,
     get_activated_buffer_ec2_tags,
     get_deactivated_buffer_ec2_tags,

services/autoscaling/tests/unit/test_modules_cluster_scaling_dynamic.py

@@ -22,7 +22,7 @@
 from simcore_service_autoscaling.core.errors import Ec2InvalidDnsNameError
 from simcore_service_autoscaling.core.settings import ApplicationSettings
 from simcore_service_autoscaling.models import AssociatedInstance, EC2InstanceData
-from simcore_service_autoscaling.utils.auto_scaling_core import (
+from simcore_service_autoscaling.utils.cluster_scaling import (
     associate_ec2_instances_with_nodes,
     ec2_startup_script,
     get_machine_buffer_type,