import

Author: sanderegg

services/autoscaling/src/simcore_service_autoscaling/core/errors.py

@@ -1,14 +1,23 @@
-from pydantic.errors import PydanticErrorMixin
+from typing import Any
 
+from models_library.errors_classes import OsparcErrorMixin
+
+
+class AutoscalingRuntimeError(OsparcErrorMixin, RuntimeError):
+    def __init__(self, **ctx: Any) -> None:
+        super().__init__(**ctx)
 
-class AutoscalingRuntimeError(PydanticErrorMixin, RuntimeError):
     msg_template: str = "Autoscaling unexpected error"
 
 
 class ConfigurationError(AutoscalingRuntimeError):
     msg_template: str = "Application misconfiguration: {msg}"
 
 
+class Ec2InstanceInvalidError(AutoscalingRuntimeError):
+    msg_template: str = "Invalid EC2 defined: {msg}"
+
+
 class Ec2InvalidDnsNameError(AutoscalingRuntimeError):
     msg_template: str = "Invalid EC2 private DNS name {aws_private_dns_name}"
 

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

@@ -626,7 +626,7 @@ async def _start_instances(
         capped_needed_machines = await _cap_needed_instances(
             app, needed_instances, new_instance_tags
         )
-    except Ec2TooManyInstancesError:
+    except EC2TooManyInstancesError:
         await auto_scaling_mode.log_message_from_tasks(
             app,
             tasks,
@@ -668,7 +668,7 @@ async def _start_instances(
     last_issue = ""
     new_pending_instances: list[EC2InstanceData] = []
     for r in results:
-        if isinstance(r, Ec2TooManyInstancesError):
+        if isinstance(r, EC2TooManyInstancesError):
             await auto_scaling_mode.log_message_from_tasks(
                 app,
                 tasks,