fix code

Author: giancarloromeo

services/api-server/src/simcore_service_api_server/api/routes/solvers.py

@@ -7,7 +7,6 @@
 from httpx import HTTPStatusError
 from models_library.api_schemas_api_server.pricing_plans import ServicePricingPlanGet
 from pydantic import ValidationError
-from pydantic.errors import PydanticValueError
 
 from ...exceptions.service_errors_utils import DEFAULT_BACKEND_SERVICE_STATUS_CODES
 from ...models.basic_types import VersionStr
@@ -230,7 +229,6 @@ async def get_solver_release(
         IndexError,
         ValidationError,
         HTTPStatusError,
-        PydanticValueError,
     ) as err:
         raise HTTPException(
             status_code=status.HTTP_404_NOT_FOUND,

services/api-server/src/simcore_service_api_server/api/routes/solvers_jobs.py

@@ -51,7 +51,7 @@
 def _compose_job_resource_name(solver_key, solver_version, job_id) -> str:
     """Creates a unique resource name for solver's jobs"""
     return Job.compose_resource_name(
-        parent_name=Solver.compose_resource_name(solver_key, solver_version),  # type: ignore
+        parent_name=Solver.compose_resource_name(solver_key, solver_version),
         job_id=job_id,
     )
 

services/api-server/src/simcore_service_api_server/core/application.py

@@ -53,7 +53,7 @@ def init_app(settings: ApplicationSettings | None = None) -> FastAPI:
     config_all_loggers(
         log_format_local_dev_enabled=settings.API_SERVER_LOG_FORMAT_LOCAL_DEV_ENABLED
     )
-    _logger.debug("App settings:\n%s", settings.json(indent=2))
+    _logger.debug("App settings:\n%s", settings.model_dump_json(indent=2))
 
     # Labeling
     title = "osparc.io public API"

services/api-server/src/simcore_service_api_server/core/settings.py

@@ -1,8 +1,14 @@
 from functools import cached_property
 
 from models_library.basic_types import BootModeEnum, LogLevel
-from pydantic import Field, NonNegativeInt, PositiveInt, SecretStr
-from pydantic.class_validators import validator
+from pydantic import (
+    AliasChoices,
+    Field,
+    NonNegativeInt,
+    PositiveInt,
+    SecretStr,
+    field_validator,
+)
 from settings_library.base import BaseCustomSettings
 from settings_library.catalog import CatalogSettings
 from settings_library.director_v2 import DirectorV2Settings
@@ -24,11 +30,14 @@ class WebServerSettings(WebServerBaseSettings, MixinSessionSettings):
         description="Secret key to encrypt cookies. "
         'TIP: python3 -c "from cryptography.fernet import *; print(Fernet.generate_key())"',
         min_length=44,
-        env=["SESSION_SECRET_KEY", "WEBSERVER_SESSION_SECRET_KEY"],
+        validation_alias=AliasChoices(
+            "SESSION_SECRET_KEY", "WEBSERVER_SESSION_SECRET_KEY"
+        ),
     )
     WEBSERVER_SESSION_NAME: str = DEFAULT_SESSION_COOKIE_NAME
 
-    @validator("WEBSERVER_SESSION_SECRET_KEY")
+    @field_validator("WEBSERVER_SESSION_SECRET_KEY")
+    @classmethod
     @classmethod
     def check_valid_fernet_key(cls, v):
         return cls.do_check_valid_fernet_key(v)
@@ -41,21 +50,25 @@ class BasicSettings(BaseCustomSettings, MixinLoggingSettings):
     # DEVELOPMENT
     API_SERVER_DEV_FEATURES_ENABLED: bool = Field(
         default=False,
-        env=["API_SERVER_DEV_FEATURES_ENABLED", "FAKE_API_SERVER_ENABLED"],
+        validation_alias=AliasChoices(
+            "API_SERVER_DEV_FEATURES_ENABLED", "FAKE_API_SERVER_ENABLED"
+        ),
     )
 
     # LOGGING
     LOG_LEVEL: LogLevel = Field(
         default=LogLevel.INFO.value,
-        env=["API_SERVER_LOGLEVEL", "LOG_LEVEL", "LOGLEVEL"],
+        validation_alias=AliasChoices("API_SERVER_LOGLEVEL", "LOG_LEVEL", "LOGLEVEL"),
     )
     API_SERVER_LOG_FORMAT_LOCAL_DEV_ENABLED: bool = Field(
         default=False,
-        env=["API_SERVER_LOG_FORMAT_LOCAL_DEV_ENABLED", "LOG_FORMAT_LOCAL_DEV_ENABLED"],
+        validation_alias=AliasChoices(
+            "API_SERVER_LOG_FORMAT_LOCAL_DEV_ENABLED", "LOG_FORMAT_LOCAL_DEV_ENABLED"
+        ),
         description="Enables local development log format. WARNING: make sure it is disabled if you want to have structured logs!",
     )
 
-    @validator("LOG_LEVEL", pre=True)
+    @field_validator("LOG_LEVEL", mode="before")
     @classmethod
     def _validate_loglevel(cls, value) -> str:
         log_level: str = cls.validate_log_level(value)
@@ -66,18 +79,27 @@ class ApplicationSettings(BasicSettings):
     # DOCKER BOOT
     SC_BOOT_MODE: BootModeEnum | None
 
-    API_SERVER_POSTGRES: PostgresSettings | None = Field(auto_default_from_env=True)
+    API_SERVER_POSTGRES: PostgresSettings | None = Field(
+        json_schema_extra={"auto_default_from_env": True}
+    )
 
     API_SERVER_RABBITMQ: RabbitSettings | None = Field(
-        auto_default_from_env=True, description="settings for service/rabbitmq"
+        json_schema_extra={"auto_default_from_env": True},
+        description="settings for service/rabbitmq",
     )
 
     # SERVICES with http API
-    API_SERVER_WEBSERVER: WebServerSettings | None = Field(auto_default_from_env=True)
-    API_SERVER_CATALOG: CatalogSettings | None = Field(auto_default_from_env=True)
-    API_SERVER_STORAGE: StorageSettings | None = Field(auto_default_from_env=True)
+    API_SERVER_WEBSERVER: WebServerSettings | None = Field(
+        json_schema_extra={"auto_default_from_env": True}
+    )
+    API_SERVER_CATALOG: CatalogSettings | None = Field(
+        json_schema_extra={"auto_default_from_env": True}
+    )
+    API_SERVER_STORAGE: StorageSettings | None = Field(
+        json_schema_extra={"auto_default_from_env": True}
+    )
     API_SERVER_DIRECTOR_V2: DirectorV2Settings | None = Field(
-        auto_default_from_env=True
+        json_schema_extra={"auto_default_from_env": True}
     )
     API_SERVER_LOG_CHECK_TIMEOUT_SECONDS: NonNegativeInt = 3 * 60
     API_SERVER_PROMETHEUS_INSTRUMENTATION_ENABLED: bool = True

services/api-server/src/simcore_service_api_server/exceptions/_base.py

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

services/api-server/src/simcore_service_api_server/models/api_resources.py

@@ -1,9 +1,9 @@
 import re
 import urllib.parse
-from typing import Any
+from typing import Annotated, Any, TypeAlias
 
-from pydantic import BaseModel, Field
-from pydantic.types import ConstrainedStr
+from pydantic import BaseModel, Field, TypeAdapter
+from pydantic.types import StringConstraints
 
 # RESOURCE NAMES https://cloud.google.com/apis/design/resource_names
 #
@@ -30,18 +30,16 @@
 _RELATIVE_RESOURCE_NAME_RE = r"^([^\s/]+/?){1,10}$"
 
 
-class RelativeResourceName(ConstrainedStr):
-    regex = re.compile(_RELATIVE_RESOURCE_NAME_RE)
-
-    class Config:
-        frozen = True
+RelativeResourceName: TypeAlias = Annotated[
+    str, StringConstraints(pattern=_RELATIVE_RESOURCE_NAME_RE)
+]
 
 
 # NOTE: we quote parts in a single resource_name and unquote when split
 
 
 def parse_last_resource_id(resource_name: RelativeResourceName) -> str:
-    if match := RelativeResourceName.regex.match(resource_name):
+    if match := re.match(_RELATIVE_RESOURCE_NAME_RE, resource_name):
         last_quoted_part = match.group(1)
         return urllib.parse.unquote_plus(last_quoted_part)
     msg = f"Invalid '{resource_name=}' does not match RelativeResourceName"
@@ -53,7 +51,7 @@ def compose_resource_name(*collection_or_resource_ids) -> RelativeResourceName:
         urllib.parse.quote_plus(f"{_id}".lstrip("/"))
         for _id in collection_or_resource_ids
     ]
-    return RelativeResourceName("/".join(quoted_parts))
+    return TypeAdapter(RelativeResourceName).validate_python("/".join(quoted_parts))
 
 
 def split_resource_name(resource_name: RelativeResourceName) -> list[str]:
@@ -67,10 +65,12 @@ def split_resource_name(resource_name: RelativeResourceName) -> list[str]:
 # Resource IDs must be clearly documented whether they are assigned by the client, the server, or either
 #
 class BaseResource(BaseModel):
-    name: RelativeResourceName = Field(None, example="solvers/isolve/releases/1.2.3")
-    id: Any = Field(None, description="Resource ID", example="1.2.3")  # noqa: A003
+    name: RelativeResourceName = Field(None, examples=["solvers/isolve/releases/1.2.3"])
+    id: Any = Field(None, description="Resource ID", examples=["1.2.3"])  # noqa: A003
 
 
 class BaseCollection(BaseModel):
-    name: RelativeResourceName = Field(None, example="solvers/isolve/releases")
-    id: Any = Field(None, description="Collection ID", example="releases")  # noqa: A003
+    name: RelativeResourceName = Field(None, examples=["solvers/isolve/releases"])
+    id: Any = Field(
+        None, description="Collection ID", examples=["releases"]
+    )  # noqa: A003

services/api-server/src/simcore_service_api_server/models/basic_types.py

@@ -1,17 +1,14 @@
-import re
+from typing import Annotated, TypeAlias
 
 from fastapi.responses import StreamingResponse
 from models_library.basic_regex import SIMPLE_VERSION_RE
-from pydantic import ConstrainedStr
+from pydantic import StringConstraints
 
+VersionStr: TypeAlias = Annotated[
+    str, StringConstraints(strip_whitespace=True, pattern=SIMPLE_VERSION_RE)
+]
 
-class VersionStr(ConstrainedStr):
-    strip_whitespace = True
-    regex = re.compile(SIMPLE_VERSION_RE)
-
-
-class FileNameStr(ConstrainedStr):
-    strip_whitespace = True
+FileNameStr: TypeAlias = Annotated[str, StringConstraints(strip_whitespace=True)]
 
 
 class LogStreamingResponse(StreamingResponse):

services/api-server/src/simcore_service_api_server/models/pagination.py

@@ -7,7 +7,7 @@
 """
 
 from collections.abc import Sequence
-from typing import Any, ClassVar, Generic, TypeAlias, TypeVar
+from typing import Generic, TypeAlias, TypeVar
 
 from fastapi_pagination.limit_offset import LimitOffsetParams
 from fastapi_pagination.links.limit_offset import (
@@ -18,8 +18,7 @@
     MAXIMUM_NUMBER_OF_ITEMS_PER_PAGE,
 )
 from models_library.utils.pydantic_tools_extension import FieldNotRequired
-from pydantic import Field, NonNegativeInt, validator
-from pydantic.generics import GenericModel
+from pydantic import BaseModel, ConfigDict, Field, NonNegativeInt, field_validator
 
 T = TypeVar("T")
 
@@ -35,7 +34,7 @@
 PaginationParams: TypeAlias = LimitOffsetParams
 
 
-class OnePage(GenericModel, Generic[T]):
+class OnePage(BaseModel, Generic[T]):
     """
     A single page is used to envelope a small sequence that does not require
     pagination
@@ -47,7 +46,7 @@ class OnePage(GenericModel, Generic[T]):
     items: Sequence[T]
     total: NonNegativeInt = FieldNotRequired()
 
-    @validator("total", pre=True)
+    @field_validator("total", mode="before")
     @classmethod
     def check_total(cls, v, values):
         items = values["items"]
@@ -60,9 +59,9 @@ def check_total(cls, v, values):
 
         return v
 
-    class Config:
-        frozen = True
-        schema_extra: ClassVar[dict[str, Any]] = {
+    model_config = ConfigDict(
+        frozen=True,
+        json_schema_extra={
             "examples": [
                 {
                     "total": 1,
@@ -72,7 +71,8 @@ class Config:
                     "items": ["one"],
                 },
             ],
-        }
+        },
+    )
 
 
 __all__: tuple[str, ...] = (

services/api-server/src/simcore_service_api_server/models/schemas/errors.py

@@ -1,6 +1,6 @@
-from typing import Any, ClassVar
+from typing import Any
 
-from pydantic import BaseModel
+from pydantic import BaseModel, ConfigDict
 
 
 class ErrorGet(BaseModel):
@@ -11,12 +11,13 @@ class ErrorGet(BaseModel):
     #   - https://github.com/ITISFoundation/osparc-simcore/issues/2446
     errors: list[Any]
 
-    class Config:
-        schema_extra: ClassVar[dict[str, Any]] = {
+    model_config = ConfigDict(
+        json_schema_extra={
             "example": {
                 "errors": [
                     "some error message",
                     "another error message",
                 ]
             }
         }
+    )