pylint

Author: sanderegg

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

@@ -369,8 +369,8 @@ async def _activate_and_notify(
         ),
         post_tasks_log_message(
             app,
-            drained_node.assigned_tasks,
-            "cluster adjusted, service should start shortly...",
+            tasks=drained_node.assigned_tasks,
+            message="cluster adjusted, service should start shortly...",
             level=logging.INFO,
         ),
         post_tasks_progress_message(
@@ -792,8 +792,8 @@ async def _launch_instances(
     except EC2TooManyInstancesError:
         await post_tasks_log_message(
             app,
-            tasks,
-            "The maximum number of machines in the cluster was reached. Please wait for your running jobs "
+            tasks=tasks,
+            message="The maximum number of machines in the cluster was reached. Please wait for your running jobs "
             "to complete and try again later or contact osparc support if this issue does not resolve.",
             level=logging.ERROR,
         )
@@ -834,8 +834,8 @@ async def _launch_instances(
         if isinstance(r, EC2TooManyInstancesError):
             await post_tasks_log_message(
                 app,
-                tasks,
-                "Exceptionally high load on computational cluster, please try again later.",
+                tasks=tasks,
+                message="Exceptionally high load on computational cluster, please try again later.",
                 level=logging.ERROR,
             )
         elif isinstance(r, BaseException):
@@ -850,12 +850,14 @@ async def _launch_instances(
         f"{sum(n for n in capped_needed_machines.values())} new machines launched"
         ", it might take up to 3 minutes to start, Please wait..."
     )
-    await post_tasks_log_message(app, tasks, log_message, level=logging.INFO)
+    await post_tasks_log_message(
+        app, tasks=tasks, message=log_message, level=logging.INFO
+    )
     if last_issue:
         await post_tasks_log_message(
             app,
-            tasks,
-            "Unexpected issues detected, probably due to high load, please contact support",
+            tasks=tasks,
+            message="Unexpected issues detected, probably due to high load, please contact support",
             level=logging.ERROR,
         )
 
@@ -1088,7 +1090,9 @@ async def _notify_based_on_machine_type(
             f" est. remaining time: {timedelta_as_minute_second(estimated_time_to_completion)})...please wait..."
         )
         if tasks:
-            await post_tasks_log_message(app, tasks, message=msg, level=logging.INFO)
+            await post_tasks_log_message(
+                app, tasks=tasks, message=msg, level=logging.INFO
+            )
             await post_tasks_progress_message(
                 app,
                 tasks=tasks,
@@ -1189,8 +1193,8 @@ async def _scale_up_cluster(
     ):
         await post_tasks_log_message(
             app,
-            unassigned_tasks,
-            "service is pending due to missing resources, scaling up cluster now...",
+            tasks=unassigned_tasks,
+            message="service is pending due to missing resources, scaling up cluster now...",
             level=logging.INFO,
         )
         new_pending_instances = await _launch_instances(

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

@@ -37,9 +37,9 @@ def _get_task_ids(task: DockerTask | DaskTask) -> tuple[UserID, ProjectID, NodeI
 
 async def post_tasks_log_message(
     app: FastAPI,
+    *,
     tasks: list[DockerTask] | list[DaskTask],
     message: str,
-    *,
     level: int = logging.INFO,
 ) -> None:
     if not tasks:

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

@@ -1,6 +1,4 @@
-""" Free helper functions for docker API
-
-"""
+"""Free helper functions for docker API"""
 
 import asyncio
 import collections
@@ -384,7 +382,7 @@ async def compute_cluster_used_resources(
     list_of_used_resources = await logged_gather(
         *(compute_node_used_resources(docker_client, node) for node in nodes)
     )
-    counter = collections.Counter({k: 0 for k in Resources.model_fields})
+    counter = collections.Counter({k: 0 for k in list(Resources.model_fields)})
     for result in list_of_used_resources:
         counter.update(result.model_dump())
 
@@ -413,7 +411,7 @@ async def get_docker_swarm_join_bash_command(*, join_as_drained: bool) -> str:
     decoded_stdout = stdout.decode()
     if match := re.search(_DOCKER_SWARM_JOIN_PATTERN, decoded_stdout):
         capture = match.groupdict()
-        return f"{capture['command']} --availability={'drain' if join_as_drained  else 'active'} {capture['token']} {capture['address']}"
+        return f"{capture['command']} --availability={'drain' if join_as_drained else 'active'} {capture['token']} {capture['address']}"
     msg = f"expected docker '{_DOCKER_SWARM_JOIN_RE}' command not found: received {decoded_stdout}!"
     raise RuntimeError(msg)
 
@@ -445,7 +443,7 @@ def write_compose_file_command(
 ) -> str:
     compose = {
         "services": {
-            f"{image_tag.split('/')[-1].replace(':','-')}": {"image": image_tag}
+            f"{image_tag.split('/')[-1].replace(':', '-')}": {"image": image_tag}
             for n, image_tag in enumerate(docker_tags)
         },
     }

services/autoscaling/tests/unit/test_modules_auto_scaling_dynamic.py

@@ -1787,9 +1787,7 @@ async def test__activate_drained_nodes_with_no_tasks(
 ):
     # no tasks, does nothing and returns True
     empty_cluster = cluster()
-    updated_cluster = await _activate_drained_nodes(
-        initialized_app, empty_cluster, DynamicAutoscaling()
-    )
+    updated_cluster = await _activate_drained_nodes(initialized_app, empty_cluster)
     assert updated_cluster == empty_cluster
 
     active_cluster = cluster(
@@ -1801,9 +1799,7 @@ async def test__activate_drained_nodes_with_no_tasks(
             create_associated_instance(drained_host_node, True)  # noqa: FBT003
         ],
     )
-    updated_cluster = await _activate_drained_nodes(
-        initialized_app, active_cluster, DynamicAutoscaling()
-    )
+    updated_cluster = await _activate_drained_nodes(initialized_app, active_cluster)
     assert updated_cluster == active_cluster
     mock_docker_tag_node.assert_not_called()
 
@@ -1855,7 +1851,7 @@ async def test__activate_drained_nodes_with_no_drained_nodes(
         active_nodes=[create_associated_instance(host_node, True)]  # noqa: FBT003
     )
     updated_cluster = await _activate_drained_nodes(
-        initialized_app, cluster_without_drained_nodes, DynamicAutoscaling()
+        initialized_app, cluster_without_drained_nodes
     )
     assert updated_cluster == cluster_without_drained_nodes
     mock_docker_tag_node.assert_not_called()
@@ -1916,7 +1912,7 @@ async def test__activate_drained_nodes_with_drained_node(
     )
 
     updated_cluster = await _activate_drained_nodes(
-        initialized_app, cluster_with_drained_nodes, DynamicAutoscaling()
+        initialized_app, cluster_with_drained_nodes
     )
     # they are the same nodes, but the availability might have changed here
     assert updated_cluster.active_nodes != cluster_with_drained_nodes.drained_nodes

services/autoscaling/tests/unit/test_utils_rabbitmq.py

@@ -24,8 +24,8 @@
 from servicelib.rabbitmq import BIND_TO_ALL_TOPICS, RabbitMQClient
 from settings_library.rabbit import RabbitSettings
 from simcore_service_autoscaling.utils.rabbitmq import (
-    post_task_log_message,
-    post_task_progress_message,
+    post_tasks_log_message,
+    post_tasks_progress_message,
 )
 from tenacity.asyncio import AsyncRetrying
 from tenacity.retry import retry_if_exception_type
@@ -88,7 +88,9 @@ async def test_post_task_log_message(
     assert len(service_tasks) == 1
 
     log_message = faker.pystr()
-    await post_task_log_message(initialized_app, service_tasks[0], log_message, 0)
+    await post_tasks_log_message(
+        initialized_app, tasks=service_tasks, message=log_message, level=0
+    )
 
     async for attempt in AsyncRetrying(**_TENACITY_RETRY_PARAMS):
         with attempt:
@@ -135,7 +137,9 @@ async def test_post_task_log_message_does_not_raise_if_service_has_no_labels(
 
     # this shall not raise any exception even if the task does not contain
     # the necessary labels
-    await post_task_log_message(initialized_app, service_tasks[0], faker.pystr(), 0)
+    await post_tasks_log_message(
+        initialized_app, tasks=service_tasks, message=faker.pystr(), level=0
+    )
 
 
 async def test_post_task_progress_message(
@@ -178,7 +182,12 @@ async def test_post_task_progress_message(
     assert len(service_tasks) == 1
 
     progress_value = faker.pyfloat(min_value=0)
-    await post_task_progress_message(initialized_app, service_tasks[0], progress_value)
+    await post_tasks_progress_message(
+        initialized_app,
+        tasks=service_tasks,
+        progress=progress_value,
+        progress_type=ProgressType.CLUSTER_UP_SCALING,
+    )
 
     async for attempt in AsyncRetrying(**_TENACITY_RETRY_PARAMS):
         with attempt:
@@ -225,6 +234,9 @@ async def test_post_task_progress_does_not_raise_if_service_has_no_labels(
 
     # this shall not raise any exception even if the task does not contain
     # the necessary labels
-    await post_task_progress_message(
-        initialized_app, service_tasks[0], faker.pyfloat(min_value=0)
+    await post_tasks_progress_message(
+        initialized_app,
+        tasks=service_tasks,
+        progress=faker.pyfloat(min_value=0),
+        progress_type=ProgressType.CLUSTER_UP_SCALING,
     )