migration

Author: sanderegg

services/autoscaling/src/simcore_service_autoscaling/constants.py

@@ -36,5 +36,5 @@
     BUFFER_MACHINE_TAG_KEY: TypeAdapter(AWSTagValue).validate_python("false")
 }
 PRE_PULLED_IMAGES_RE: Final[re.Pattern] = re.compile(
-    rf"{PRE_PULLED_IMAGES_EC2_TAG_KEY}_\((\d+)\)"
+    rf"{PRE_PULLED_IMAGES_EC2_TAG_KEY}_(\((\d+)\)|\d+)"
 )

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

@@ -59,7 +59,7 @@ async def _scheduler_client(
                 require_encryption=True,
             )
         async with distributed.Client(
-            url,
+            f"{url}",
             asynchronous=True,
             timeout=f"{_DASK_SCHEDULER_CONNECT_TIMEOUT_S}",
             security=security,
@@ -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 tasksfor %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

@@ -56,7 +56,7 @@ def dump_pre_pulled_images_as_tags(images: Iterable[DockerGenericTag]) -> EC2Tag
         ]
         return {
             TypeAdapter(AWSTagKey)
-            .validate_python(f"{PRE_PULLED_IMAGES_EC2_TAG_KEY}_({i})"): TypeAdapter(
+            .validate_python(f"{PRE_PULLED_IMAGES_EC2_TAG_KEY}_{i}"): TypeAdapter(
                 AWSTagValue
             )
             .validate_python(c)

services/autoscaling/tests/unit/test_utils_buffer_machines_pool_core.py

@@ -144,10 +144,10 @@ def test_is_buffer_machine(tags: EC2Tags, expected_is_buffer: bool):
                 "registry.pytest.com/simcore/services/dynamic/sym-server-8-0-0-dy:3.2.34",
             ],
             {
-                f"{PRE_PULLED_IMAGES_EC2_TAG_KEY}_(0)": '["itisfoundation/dynamic-sidecar:latest","itisfoundation/agent:latest","registry.pytest.com/simcore/services/dynamic/ti-postpro:2.0.34","registry.pytest.com/simcore/services/dynamic/ti-simu:1.0.12","registry.pytest.com/simcore/services/dynamic/ti-pers:1.0.',
-                f"{PRE_PULLED_IMAGES_EC2_TAG_KEY}_(1)": '19","registry.pytest.com/simcore/services/dynamic/sim4life-postpro:2.0.106","registry.pytest.com/simcore/services/dynamic/s4l-core-postpro:2.0.106","registry.pytest.com/simcore/services/dynamic/s4l-core-stream:2.0.106","registry.pytest.com/simcore/services',
-                f"{PRE_PULLED_IMAGES_EC2_TAG_KEY}_(2)": '/dynamic/sym-server-8-0-0-dy:2.0.106","registry.pytest.com/simcore/services/dynamic/sim4life-8-0-0-modeling:3.2.34","registry.pytest.com/simcore/services/dynamic/s4l-core-8-0-0-modeling:3.2.34","registry.pytest.com/simcore/services/dynamic/s4l-stream-8-0-0',
-                f"{PRE_PULLED_IMAGES_EC2_TAG_KEY}_(3)": '-dy:3.2.34","registry.pytest.com/simcore/services/dynamic/sym-server-8-0-0-dy:3.2.34"]',
+                f"{PRE_PULLED_IMAGES_EC2_TAG_KEY}_0": '["itisfoundation/dynamic-sidecar:latest","itisfoundation/agent:latest","registry.pytest.com/simcore/services/dynamic/ti-postpro:2.0.34","registry.pytest.com/simcore/services/dynamic/ti-simu:1.0.12","registry.pytest.com/simcore/services/dynamic/ti-pers:1.0.',
+                f"{PRE_PULLED_IMAGES_EC2_TAG_KEY}_1": '19","registry.pytest.com/simcore/services/dynamic/sim4life-postpro:2.0.106","registry.pytest.com/simcore/services/dynamic/s4l-core-postpro:2.0.106","registry.pytest.com/simcore/services/dynamic/s4l-core-stream:2.0.106","registry.pytest.com/simcore/services',
+                f"{PRE_PULLED_IMAGES_EC2_TAG_KEY}_2": '/dynamic/sym-server-8-0-0-dy:2.0.106","registry.pytest.com/simcore/services/dynamic/sim4life-8-0-0-modeling:3.2.34","registry.pytest.com/simcore/services/dynamic/s4l-core-8-0-0-modeling:3.2.34","registry.pytest.com/simcore/services/dynamic/s4l-stream-8-0-0',
+                f"{PRE_PULLED_IMAGES_EC2_TAG_KEY}_3": '-dy:3.2.34","registry.pytest.com/simcore/services/dynamic/sym-server-8-0-0-dy:3.2.34"]',
             },
             id="many images that get chunked to AWS Tag max length",
         ),