Merge branch 'pydantic_v2_migration' into upgrade-py2-migration

Author: GitHK

packages/common-library/src/common_library/serialization.py

@@ -3,6 +3,7 @@
 
 from common_library.pydantic_fields_extension import get_type
 from pydantic import BaseModel, SecretStr
+from pydantic_core import Url
 
 
 def model_dump_with_secrets(
@@ -19,11 +20,15 @@ def model_dump_with_secrets(
         if isinstance(field_data, timedelta):
             data[field_name] = field_data.total_seconds()
 
-        if isinstance(field_data, SecretStr):
+        elif isinstance(field_data, SecretStr):
             if show_secrets:
                 data[field_name] = field_data.get_secret_value()
             else:
                 data[field_name] = str(field_data)
+                
+        elif isinstance(field_data, Url):
+            data[field_name] = str(field_data)
+                
         elif isinstance(field_data, dict):
             field_type = get_type(settings_obj.model_fields[field_name])
             if issubclass(field_type, BaseModel):

packages/models-library/src/models_library/invitations.py

@@ -50,7 +50,7 @@ class InvitationContent(InvitationInputs):
     created: datetime = Field(..., description="Timestamp for creation")
 
     def as_invitation_inputs(self) -> InvitationInputs:
-        return self.copy(exclude={"created"})
+        return self.model_validate(self.model_dump(exclude={"created"}))    # copy excluding "created"
 
     @classmethod
     def create_from_inputs(

services/clusters-keeper/requirements/_base.txt

@@ -46,6 +46,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
@@ -129,20 +131,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
@@ -351,7 +341,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
@@ -362,7 +352,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
@@ -379,6 +368,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
@@ -389,6 +398,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
@@ -465,7 +476,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
@@ -531,6 +542,7 @@ typing-extensions==4.11.0
     #   faststream
     #   opentelemetry-sdk
     #   pydantic
+    #   pydantic-core
     #   typer
     #   types-aiobotocore
     #   types-aiobotocore-ec2

services/clusters-keeper/requirements/_test.txt

@@ -11,6 +11,10 @@ aiosignal==1.3.1
     # via
     #   -c requirements/_base.txt
     #   aiohttp
+annotated-types==0.7.0
+    # via
+    #   -c requirements/_base.txt
+    #   pydantic
 antlr4-python3-runtime==4.13.2
     # via moto
 anyio==4.3.0
@@ -201,11 +205,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
@@ -231,7 +239,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
@@ -306,6 +316,7 @@ typing-extensions==4.11.0
     #   aws-sam-translator
     #   cfn-lint
     #   pydantic
+    #   pydantic-core
 urllib3==2.2.1
     # via
     #   -c requirements/../../../requirements/constraints.txt

services/clusters-keeper/src/simcore_service_clusters_keeper/_meta.py

@@ -9,17 +9,21 @@
 
 from models_library.basic_types import VersionStr, VersionTag
 from packaging.version import Version
-from pydantic import parse_obj_as
+from pydantic import TypeAdapter
 
 _current_distribution = distribution("simcore-service-clusters-keeper")
 __version__: str = version("simcore-service-clusters-keeper")
 
 
 APP_NAME: Final[str] = _current_distribution.metadata["Name"]
-API_VERSION: Final[VersionStr] = parse_obj_as(VersionStr, __version__)
+API_VERSION: Final[VersionStr] = TypeAdapter(VersionStr).validate_python(__version__)
 VERSION: Final[Version] = Version(__version__)
-API_VTAG: Final[VersionTag] = parse_obj_as(VersionTag, f"v{VERSION.major}")
-RPC_VTAG: Final[VersionTag] = parse_obj_as(VersionTag, f"v{VERSION.major}")
+API_VTAG: Final[VersionTag] = TypeAdapter(VersionTag).validate_python(
+    f"v{VERSION.major}"
+)
+RPC_VTAG: Final[VersionTag] = TypeAdapter(VersionTag).validate_python(
+    f"v{VERSION.major}"
+)
 
 
 def get_summary() -> str:

services/clusters-keeper/src/simcore_service_clusters_keeper/core/application.py

@@ -27,7 +27,7 @@
 
 
 def create_app(settings: ApplicationSettings) -> FastAPI:
-    logger.info("app settings: %s", settings.json(indent=1))
+    logger.info("app settings: %s", settings.model_dump_json(indent=1))
 
     app = FastAPI(
         debug=settings.CLUSTERS_KEEPER_DEBUG,

services/clusters-keeper/src/simcore_service_clusters_keeper/core/errors.py

@@ -1,7 +1,7 @@
-from pydantic.errors import PydanticErrorMixin
+from common_library.errors_classes import OsparcErrorMixin
 
 
-class ClustersKeeperRuntimeError(PydanticErrorMixin, RuntimeError):
+class ClustersKeeperRuntimeError(OsparcErrorMixin, RuntimeError):
     msg_template: str = "clusters-keeper unexpected error"