Merge branch 'pydantic_v2_migration_do_not_squash_updates' into is4481/upgrade-api-server-service

Author: giancarloromeo

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

@@ -1,13 +1,14 @@
 from datetime import timedelta
 from typing import Any
 
-from common_library.pydantic_fields_extension import get_type
 from pydantic import BaseModel, SecretStr
 from pydantic_core import Url
 
+from .pydantic_fields_extension import get_type
+
 
 def model_dump_with_secrets(
-    settings_obj: BaseModel, show_secrets: bool, **pydantic_export_options
+    settings_obj: BaseModel, *, show_secrets: bool, **pydantic_export_options
 ) -> dict[str, Any]:
     data = settings_obj.model_dump(**pydantic_export_options)
 
@@ -25,16 +26,16 @@ def model_dump_with_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):
                 data[field_name] = model_dump_with_secrets(
                     field_type.model_validate(field_data),
-                    show_secrets,
+                    show_secrets=show_secrets,
                     **pydantic_export_options,
                 )
 

packages/models-library/tests/test_error_codes.py renamed to packages/common-library/tests/test_error_codes.py

@@ -6,7 +6,7 @@
 import logging
 
 import pytest
-from models_library.error_codes import create_error_code, parse_error_code
+from common_library.error_codes import create_error_code, parse_error_code
 
 logger = logging.getLogger(__name__)
 

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

@@ -12,7 +12,7 @@
 from aiohttp import web
 from aiohttp.web_request import Request
 from aiohttp.web_response import StreamResponse
-from models_library.error_codes import create_error_code
+from common_library.error_codes import create_error_code
 from models_library.utils.json_serialization import json_dumps
 
 from ..logging_errors import create_troubleshotting_log_kwargs

packages/service-library/src/servicelib/aiohttp/rest_middlewares.py

@@ -2,8 +2,8 @@
 from pprint import pformat
 from typing import Any, TypedDict
 
+from common_library.error_codes import ErrorCodeStr
 from common_library.errors_classes import OsparcErrorMixin
-from models_library.error_codes import ErrorCodeStr
 
 from .logging_utils import LogExtra, get_log_record_extra
 

packages/service-library/src/servicelib/logging_errors.py

@@ -13,7 +13,7 @@
 import pytest
 from aiohttp import web
 from aiohttp.test_utils import TestClient
-from models_library.error_codes import parse_error_code
+from common_library.error_codes import parse_error_code
 from models_library.utils.json_serialization import json_dumps
 from servicelib.aiohttp import status
 from servicelib.aiohttp.rest_middlewares import (
@@ -99,7 +99,7 @@ async def raise_exception(cls, request: web.Request):
             case NotImplementedError.__name__:
                 raise NotImplementedError
             case asyncio.TimeoutError.__name__:
-                raise asyncio.TimeoutError
+                raise TimeoutError
             case web.HTTPOk.__name__:
                 raise web.HTTPOk  # 2XX
             case web.HTTPUnauthorized.__name__:

packages/service-library/tests/aiohttp/test_rest_middlewares.py

@@ -3,8 +3,8 @@
 import logging
 
 import pytest
-from models_library.error_codes import create_error_code
-from models_library.errors_classes import OsparcErrorMixin
+from common_library.error_codes import create_error_code
+from common_library.errors_classes import OsparcErrorMixin
 from servicelib.logging_errors import (
     create_troubleshotting_log_kwargs,
     create_troubleshotting_log_message,

packages/service-library/tests/test_logging_errors.py

@@ -8,7 +8,9 @@
 import rich
 import typer
 from common_library.serialization import model_dump_with_secrets
+from models_library.utils.json_serialization import json_dumps
 from pydantic import ValidationError
+from pydantic_core import to_jsonable_python
 from pydantic_settings import BaseSettings
 
 from ._constants import HEADER_STR
@@ -87,7 +89,7 @@ def print_as_json(
 def create_settings_command(
     settings_cls: type[BaseCustomSettings],
     logger: logging.Logger | None = None,
-    json_serializer=json.dumps,
+    json_serializer=json_dumps,
 ) -> Callable:
     """Creates typer command function for settings"""
 
@@ -112,14 +114,24 @@ def settings(
         """Resolves settings and prints envfile"""
 
         if as_json_schema:
-            typer.echo(settings_cls.schema_json(indent=0 if compact else 2))
+            typer.echo(
+                json.dumps(
+                    settings_cls.model_json_schema(),
+                    default=to_jsonable_python,
+                    indent=0 if compact else 2,
+                )
+            )
             return
 
         try:
             settings_obj = settings_cls.create_from_envs()
 
         except ValidationError as err:
-            settings_schema = settings_cls.schema_json(indent=2)
+            settings_schema = json.dumps(
+                settings_cls.model_json_schema(),
+                default=to_jsonable_python,
+                indent=2,
+            )
 
             assert logger is not None  # nosec
             logger.error(  # noqa: TRY400

packages/settings-library/src/settings_library/utils_cli.py

@@ -1,6 +1,6 @@
 from typing import Any
 
-from models_library.errors_classes import OsparcErrorMixin
+from common_library.errors_classes import OsparcErrorMixin
 
 
 class CatalogBaseError(OsparcErrorMixin, Exception):

services/catalog/src/simcore_service_catalog/exceptions/errors.py

@@ -25,6 +25,6 @@ dask[distributed, diagnostics]
 dask-gateway # needed for the osparc-dask-gateway to preload the module
 fsspec[http, s3] # sub types needed as we acces http and s3 here
 lz4 # for compression
-pydantic[email,dotenv]
+pydantic
 prometheus_client
 repro-zipfile