Skip to content

WIP: Upgrade autoscaling service (Pydantic v2) #6523

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 8 commits into from
Closed

WIP: Upgrade autoscaling service (Pydantic v2) #6523

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
35557ba
upgrade reqs
giancarloromeo Oct 14, 2024
53c6c89
fix code
giancarloromeo Oct 14, 2024
f686120
fix timedelta validation
giancarloromeo Oct 14, 2024
c222920
remove deprecated
giancarloromeo Oct 14, 2024
861792b
Merge branch 'pydantic_v2_migration' into is4481/upgrade-autoscaling
giancarloromeo Oct 14, 2024
72f1628
fix settings
giancarloromeo Oct 14, 2024
27e40cb
fix minor
giancarloromeo Oct 14, 2024
b9efd79
fix validator
giancarloromeo Oct 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 28 additions & 16 deletions services/autoscaling/requirements/_base.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,8 @@ aiormq==6.8.0
# via aio-pika
aiosignal==1.3.1
# via aiohttp
annotated-types==0.7.0
# via pydantic
anyio==4.3.0
# via
# fast-depends
Expand Down Expand Up @@ -131,20 +133,8 @@ email-validator==2.1.1
# via pydantic
fast-depends==2.4.2
# via faststream
fastapi==0.99.1
fastapi==0.115.0
# via
# -c requirements/../../../packages/aws-library/requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt
# -c requirements/../../../packages/aws-library/requirements/../../../packages/service-library/requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt
# -c requirements/../../../packages/aws-library/requirements/../../../packages/service-library/requirements/../../../packages/settings-library/requirements/../../../requirements/constraints.txt
# -c requirements/../../../packages/aws-library/requirements/../../../packages/service-library/requirements/../../../requirements/constraints.txt
# -c requirements/../../../packages/aws-library/requirements/../../../packages/settings-library/requirements/../../../requirements/constraints.txt
# -c requirements/../../../packages/aws-library/requirements/../../../requirements/constraints.txt
# -c requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt
# -c requirements/../../../packages/service-library/requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt
# -c requirements/../../../packages/service-library/requirements/../../../packages/settings-library/requirements/../../../requirements/constraints.txt
# -c requirements/../../../packages/service-library/requirements/../../../requirements/constraints.txt
# -c requirements/../../../packages/settings-library/requirements/../../../requirements/constraints.txt
# -c requirements/../../../requirements/constraints.txt
# -r requirements/../../../packages/service-library/requirements/_fastapi.in
# -r requirements/_base.in
# prometheus-fastapi-instrumentator
Expand Down Expand Up @@ -353,7 +343,7 @@ psutil==6.0.0
# -r requirements/../../../packages/aws-library/requirements/../../../packages/service-library/requirements/_base.in
# -r requirements/../../../packages/service-library/requirements/_base.in
# distributed
pydantic==1.10.15
pydantic==2.9.2
# via
# -c requirements/../../../packages/aws-library/requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt
# -c requirements/../../../packages/aws-library/requirements/../../../packages/service-library/requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt
Expand All @@ -364,7 +354,6 @@ pydantic==1.10.15
# -c requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt
# -c requirements/../../../packages/service-library/requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt
# -c requirements/../../../packages/service-library/requirements/../../../packages/settings-library/requirements/../../../requirements/constraints.txt
# -c requirements/../../../packages/service-library/requirements/../../../packages/settings-library/requirements/_base.in
# -c requirements/../../../packages/service-library/requirements/../../../requirements/constraints.txt
# -c requirements/../../../packages/settings-library/requirements/../../../requirements/constraints.txt
# -c requirements/../../../requirements/constraints.txt
Expand All @@ -381,6 +370,26 @@ pydantic==1.10.15
# -r requirements/../../../packages/settings-library/requirements/_base.in
# fast-depends
# fastapi
# pydantic-extra-types
# pydantic-settings
pydantic-core==2.23.4
# via pydantic
pydantic-extra-types==2.9.0
# via
# -r requirements/../../../packages/aws-library/requirements/../../../packages/models-library/requirements/_base.in
# -r requirements/../../../packages/aws-library/requirements/../../../packages/service-library/requirements/../../../packages/models-library/requirements/_base.in
# -r requirements/../../../packages/models-library/requirements/_base.in
# -r requirements/../../../packages/service-library/requirements/../../../packages/models-library/requirements/_base.in
pydantic-settings==2.5.2
# via
# -r requirements/../../../packages/aws-library/requirements/../../../packages/models-library/requirements/_base.in
# -r requirements/../../../packages/aws-library/requirements/../../../packages/service-library/requirements/../../../packages/models-library/requirements/_base.in
# -r requirements/../../../packages/aws-library/requirements/../../../packages/service-library/requirements/../../../packages/settings-library/requirements/_base.in
# -r requirements/../../../packages/aws-library/requirements/../../../packages/settings-library/requirements/_base.in
# -r requirements/../../../packages/models-library/requirements/_base.in
# -r requirements/../../../packages/service-library/requirements/../../../packages/models-library/requirements/_base.in
# -r requirements/../../../packages/service-library/requirements/../../../packages/settings-library/requirements/_base.in
# -r requirements/../../../packages/settings-library/requirements/_base.in
pygments==2.18.0
# via rich
pyinstrument==4.6.2
Expand All @@ -391,6 +400,8 @@ python-dateutil==2.9.0.post0
# via
# arrow
# botocore
python-dotenv==1.0.1
# via pydantic-settings
pyyaml==6.0.1
# via
# -c requirements/../../../packages/aws-library/requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt
Expand Down Expand Up @@ -467,7 +478,7 @@ sortedcontainers==2.4.0
# via
# -c requirements/../../../services/dask-sidecar/requirements/_dask-distributed.txt
# distributed
starlette==0.27.0
starlette==0.38.6
# via
# -c requirements/../../../packages/aws-library/requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt
# -c requirements/../../../packages/aws-library/requirements/../../../packages/service-library/requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt
Expand Down Expand Up @@ -533,6 +544,7 @@ typing-extensions==4.11.0
# faststream
# opentelemetry-sdk
# pydantic
# pydantic-core
# typer
# types-aiobotocore
# types-aiobotocore-ec2
Expand Down
15 changes: 13 additions & 2 deletions services/autoscaling/requirements/_test.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
annotated-types==0.7.0
# via
# -c requirements/_base.txt
# pydantic
antlr4-python3-runtime==4.13.2
# via moto
anyio==4.3.0
Expand Down Expand Up @@ -181,11 +185,15 @@ py-partiql-parser==0.5.6
# via moto
pycparser==2.22
# via cffi
pydantic==1.10.15
pydantic==2.9.2
# via
# -c requirements/../../../requirements/constraints.txt
# -c requirements/_base.txt
# aws-sam-translator
pydantic-core==2.23.4
# via
# -c requirements/_base.txt
# pydantic
pyparsing==3.1.4
# via moto
pytest==8.3.3
Expand Down Expand Up @@ -217,7 +225,9 @@ python-dateutil==2.9.0.post0
# faker
# moto
python-dotenv==1.0.1
# via -r requirements/_test.in
# via
# -c requirements/_base.txt
# -r requirements/_test.in
pyyaml==6.0.1
# via
# -c requirements/../../../requirements/constraints.txt
Expand Down Expand Up @@ -315,6 +325,7 @@ typing-extensions==4.11.0
# aws-sam-translator
# cfn-lint
# pydantic
# pydantic-core
# types-aiobotocore
# types-aiobotocore-ec2
# types-aiobotocore-iam
Expand Down
5 changes: 4 additions & 1 deletion services/autoscaling/src/simcore_service_autoscaling/_meta.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

from models_library.basic_types import VersionStr, VersionTag
from packaging.version import Version
from pydantic import TypeAdapter
from servicelib.utils_meta import PackageInfo

info: Final = PackageInfo(package_name="simcore-service-autoscaling")
Expand All @@ -10,7 +11,9 @@
APP_NAME: Final[str] = info.project_name
API_VERSION: Final[VersionStr] = info.__version__
VERSION: Final[Version] = info.version
API_VTAG: Final[VersionTag] = VersionTag(info.api_prefix_path_tag)
API_VTAG: Final[VersionTag] = TypeAdapter(VersionTag).validate_python(
info.api_prefix_path_tag
)
SUMMARY: Final[str] = info.get_summary()


Expand Down
32 changes: 16 additions & 16 deletions services/autoscaling/src/simcore_service_autoscaling/constants.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,38 +2,38 @@
from typing import Final

from aws_library.ec2._models import AWSTagKey, AWSTagValue, EC2Tags
from pydantic import parse_obj_as
from pydantic import TypeAdapter

BUFFER_MACHINE_PULLING_EC2_TAG_KEY: Final[AWSTagKey] = parse_obj_as(
AWSTagKey, "pulling"
)
BUFFER_MACHINE_PULLING_COMMAND_ID_EC2_TAG_KEY: Final[AWSTagKey] = parse_obj_as(
AWSTagKey, "ssm-command-id"
)
BUFFER_MACHINE_PULLING_EC2_TAG_KEY: Final[AWSTagKey] = TypeAdapter(
AWSTagKey
).validate_python("pulling")
BUFFER_MACHINE_PULLING_COMMAND_ID_EC2_TAG_KEY: Final[AWSTagKey] = TypeAdapter(
AWSTagKey
).validate_python("ssm-command-id")
PREPULL_COMMAND_NAME: Final[str] = "docker images pulling"

DOCKER_JOIN_COMMAND_NAME: Final[str] = "docker swarm join"
DOCKER_JOIN_COMMAND_EC2_TAG_KEY: Final[AWSTagKey] = parse_obj_as(
AWSTagKey, "io.simcore.autoscaling.joined_command_sent"
DOCKER_JOIN_COMMAND_EC2_TAG_KEY: Final[AWSTagKey] = TypeAdapter(AWSTagKey).validate_python(
"io.simcore.autoscaling.joined_command_sent"
)


DOCKER_PULL_COMMAND: Final[str] = (
"docker compose -f /docker-pull.compose.yml -p buffering pull"
)

PRE_PULLED_IMAGES_EC2_TAG_KEY: Final[AWSTagKey] = parse_obj_as(
AWSTagKey, "io.simcore.autoscaling.pre_pulled_images"
)
PRE_PULLED_IMAGES_EC2_TAG_KEY: Final[AWSTagKey] = TypeAdapter(
AWSTagKey
).validate_python("io.simcore.autoscaling.pre_pulled_images")

BUFFER_MACHINE_TAG_KEY: Final[AWSTagKey] = parse_obj_as(
AWSTagKey, "io.simcore.autoscaling.buffer_machine"
BUFFER_MACHINE_TAG_KEY: Final[AWSTagKey] = TypeAdapter(AWSTagKey).validate_python(
"io.simcore.autoscaling.buffer_machine"
)
DEACTIVATED_BUFFER_MACHINE_EC2_TAGS: Final[EC2Tags] = {
BUFFER_MACHINE_TAG_KEY: parse_obj_as(AWSTagValue, "true")
BUFFER_MACHINE_TAG_KEY: TypeAdapter(AWSTagValue).validate_python("true")
}
ACTIVATED_BUFFER_MACHINE_EC2_TAGS: Final[EC2Tags] = {
BUFFER_MACHINE_TAG_KEY: parse_obj_as(AWSTagValue, "false")
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+)\)"
Expand Down
7 changes: 1 addition & 6 deletions services/autoscaling/src/simcore_service_autoscaling/core/errors.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,7 @@
from typing import Any

from models_library.errors_classes import OsparcErrorMixin
from common_library.errors_classes import OsparcErrorMixin


class AutoscalingRuntimeError(OsparcErrorMixin, RuntimeError):
def __init__(self, **ctx: Any) -> None:
super().__init__(**ctx)

msg_template: str = "Autoscaling unexpected error"


Expand Down
Loading
Loading