♻️Pydantic V2 upgrade: autoscaling (#6535)

ITISFoundation · Oct 22, 2024 · cac8134 · cac8134
1 parent 1c833e0
commit cac8134
Show file tree

Hide file tree

Showing 37 changed files with 3,302 additions and 2,137 deletions.
diff --git a/.env-devel b/.env-devel
@@ -31,7 +31,7 @@ AUTOSCALING_EC2_ACCESS=null
 AUTOSCALING_EC2_INSTANCES=null
 AUTOSCALING_LOGLEVEL=WARNING
 AUTOSCALING_NODES_MONITORING=null
-AUTOSCALING_POLL_INTERVAL=10
+AUTOSCALING_POLL_INTERVAL="00:00:10"
 AUTOSCALING_SSM_ACCESS=null
 
 AWS_S3_CLI_S3=null

diff --git a/packages/aws-library/src/aws_library/ec2/_models.py b/packages/aws-library/src/aws_library/ec2/_models.py
@@ -88,8 +88,8 @@ class EC2InstanceType:
     # quotes []{} were added as it allows to json encode. it seems to be accepted as a value
     str,
     StringConstraints(
-        min_length=0,
-        max_length=256,
+        min_length=AWS_TAG_VALUE_MIN_LENGTH,
+        max_length=AWS_TAG_VALUE_MAX_LENGTH,
         pattern=r"^[a-zA-Z0-9\s\+\-=\.,_:/@\"\'\[\]\{\}]*$",
     ),
 ]

diff --git a/packages/models-library/Makefile b/packages/models-library/Makefile
@@ -61,7 +61,7 @@ DOCKER_API_VERSION ?= 1.41
 docker_rest_api.py: ## auto-generates pydantic models for Docker REST API models
 	# auto-generates $@ from $<
 	@$(SCRIPTS_DIR)/openapi-pydantic-models-generator.bash \
-			--url https://docs.docker.com/engine/api/v$(DOCKER_API_VERSION).yaml \
+			--url https://docs.docker.com/reference/api/engine/version/v$(DOCKER_API_VERSION).yaml \
 			--output $@
 
 	# formats

diff --git a/packages/models-library/src/models_library/docker.py b/packages/models-library/src/models_library/docker.py
@@ -146,9 +146,9 @@ def to_simcore_runtime_docker_labels(self) -> dict[DockerLabelKey, str]:
 
     @classmethod
     def from_docker_task(cls, docker_task: Task) -> "StandardSimcoreDockerLabels":
-        assert docker_task.Spec  # nosec
-        assert docker_task.Spec.ContainerSpec_  # nosec
-        task_labels = docker_task.Spec.ContainerSpec_.Labels or {}
+        assert docker_task.spec  # nosec
+        assert docker_task.spec.container_spec  # nosec
+        task_labels = docker_task.spec.container_spec.labels or {}
         return cls.model_validate(task_labels)
 
     model_config = ConfigDict(