⬆️ Upgrade API Server service (Pydantic v2) (#6580)

Author: giancarloromeo

packages/models-library/src/models_library/api_schemas_webserver/projects.py

@@ -9,7 +9,7 @@
 
 from models_library.folders import FolderID
 from models_library.workspaces import WorkspaceID
-from pydantic import Field, HttpUrl, field_validator
+from pydantic import ConfigDict, Field, HttpUrl, field_validator
 
 from ..api_schemas_long_running_tasks.tasks import TaskGet
 from ..basic_types import LongTruncatedStr, ShortTruncatedStr
@@ -78,14 +78,18 @@ class ProjectGet(OutputSchema):
     ui: EmptyModel | StudyUI | None = None
     quality: dict[str, Any] = {}
     dev: dict | None = None
-    permalink: ProjectPermalink = FieldNotRequired()
-    workspace_id: WorkspaceID | None
-    folder_id: FolderID | None
+    permalink: ProjectPermalink | None = FieldNotRequired()
+    workspace_id: WorkspaceID | None = None
+    folder_id: FolderID | None = None
 
     _empty_description = field_validator("description", mode="before")(
         none_to_empty_str_pre_validator
     )
 
+    model_config = ConfigDict(
+        frozen=False
+    )
+
 
 TaskProjectGet: TypeAlias = TaskGet
 

packages/models-library/src/models_library/api_schemas_webserver/wallets.py

@@ -1,8 +1,8 @@
 from datetime import datetime
 from decimal import Decimal
-from typing import Literal, TypeAlias
+from typing import Annotated, Literal, TypeAlias
 
-from pydantic import ConfigDict, Field, HttpUrl, field_validator
+from pydantic import ConfigDict, Field, HttpUrl, PlainSerializer, field_validator
 
 from ..basic_types import AmountDecimal, IDStr, NonNegativeDecimal
 from ..users import GroupID
@@ -21,9 +21,13 @@ class WalletGet(OutputSchema):
     created: datetime
     modified: datetime
 
+    model_config = ConfigDict(
+        frozen=False
+    )
+
 
 class WalletGetWithAvailableCredits(WalletGet):
-    available_credits: Decimal
+    available_credits: Annotated[Decimal, PlainSerializer(float)]
 
 
 class WalletGetPermissions(WalletGet):

packages/pytest-simcore/src/pytest_simcore/helpers/httpx_calls_capture_parameters.py

@@ -8,13 +8,13 @@
 class CapturedParameterSchema(BaseModel):
     title: str | None = None
     type_: Literal["str", "int", "float", "bool"] | None = Field(None, alias="type")
-    pattern: str | None
+    pattern: str | None = None
     format_: Literal["uuid"] | None = Field(None, alias="format")
-    exclusiveMinimum: bool | None
-    minimum: int | None
-    anyOf: list["CapturedParameterSchema"] | None
-    allOf: list["CapturedParameterSchema"] | None
-    oneOf: list["CapturedParameterSchema"] | None
+    exclusiveMinimum: bool | None = None
+    minimum: int | float | None = None
+    anyOf: list["CapturedParameterSchema"] | None = None
+    allOf: list["CapturedParameterSchema"] | None = None
+    oneOf: list["CapturedParameterSchema"] | None = None
 
     class Config:
         validate_always = True
@@ -34,15 +34,15 @@ def preprocess_type_(cls, val):
     @model_validator(mode="after")
     @classmethod
     def check_compatibility(cls, values):
-        type_ = values.get("type_")
-        pattern = values.get("pattern")
-        format_ = values.get("format_")
-        anyOf = values.get("anyOf")
-        allOf = values.get("allOf")
-        oneOf = values.get("oneOf")
+        type_ = values.type_
+        pattern = values.pattern
+        format_ = values.format_
+        anyOf = values.anyOf
+        allOf = values.allOf
+        oneOf = values.oneOf
         if not any([type_, oneOf, anyOf, allOf]):
             type_ = "str"  # this default is introduced because we have started using json query params in the webserver
-            values["type_"] = type_
+            values.type_ = type_
         if type_ != "str" and any([pattern, format_]):
             msg = f"For {type_=} both {pattern=} and {format_=} must be None"
             raise ValueError(msg)

services/api-server/Makefile

@@ -15,8 +15,8 @@ reqs: ## compiles pip requirements (.in -> .txt)
 
 
 # specification of the used openapi-generator-cli (see also https://github.com/ITISFoundation/openapi-generator)
-OPENAPI_GENERATOR_NAME := itisfoundation/openapi-generator-cli-openapi-generator-v4.2.3
-OPENAPI_GENERATOR_TAG := v0
+OPENAPI_GENERATOR_NAME := openapitools/openapi-generator-cli
+OPENAPI_GENERATOR_TAG := latest
 OPENAPI_GENERATOR_IMAGE := $(OPENAPI_GENERATOR_NAME):$(OPENAPI_GENERATOR_TAG)
 
 define _create_and_validate_openapi
@@ -25,10 +25,6 @@ define _create_and_validate_openapi
 	export API_SERVER_DEV_FEATURES_ENABLED=$1; \
 	python3 -c "import json; from $(APP_PACKAGE_NAME).main import *; print( json.dumps(the_app.openapi(), indent=2) )" > $@
 
-	# patching version until tools adapted
-	@sed -i 's/"openapi": "3.1.0",/"openapi": "3.0.2",/g' $@
-
-
 	# validates OAS file: $@
 	docker run --rm \
 			--volume "$(CURDIR):/local" \