continue fixing

Author: giancarloromeo

packages/pytest-simcore/src/pytest_simcore/hypothesis_type_strategies.py

@@ -1,9 +1,5 @@
-from hypothesis import provisional
-from hypothesis import strategies as st
-from pydantic import AnyHttpUrl, AnyUrl, HttpUrl
-
 # FIXME: For now it seems the pydantic hypothesis plugin does not provide strategies for these types.
 # therefore we currently provide it
-st.register_type_strategy(AnyUrl, provisional.urls())
-st.register_type_strategy(HttpUrl, provisional.urls())
-st.register_type_strategy(AnyHttpUrl, provisional.urls())
+# st.register_type_strategy(AnyUrl, provisional.urls())
+# st.register_type_strategy(HttpUrl, provisional.urls())
+# st.register_type_strategy(AnyHttpUrl, provisional.urls())

services/web/server/src/simcore_service_webserver/notifications/_rabbitmq_exclusive_queue_consumers.py

@@ -13,7 +13,7 @@
 )
 from models_library.socketio import SocketMessageDict
 from models_library.users import GroupID
-from pydantic import parse_raw_as
+from pydantic import TypeAdapter
 from servicelib.logging_utils import log_catch, log_context
 from servicelib.rabbitmq import RabbitMQClient
 from servicelib.utils import logged_gather
@@ -58,17 +58,19 @@ async def _convert_to_node_update_event(
                     "data": project["workbench"][f"{message.node_id}"],
                 },
             )
-        _logger.warning("node not found: '%s'", message.dict())
+        _logger.warning("node not found: '%s'", message.model_dump())
     except ProjectNotFoundError:
-        _logger.warning("project not found: '%s'", message.dict())
+        _logger.warning("project not found: '%s'", message.model_dump())
     return None
 
 
 async def _progress_message_parser(app: web.Application, data: bytes) -> bool:
     rabbit_message: (
         ProgressRabbitMessageNode | ProgressRabbitMessageProject
-    ) = parse_raw_as(
-        ProgressRabbitMessageNode | ProgressRabbitMessageProject, data  # type: ignore[arg-type] # from pydantic v2 --> https://github.com/pydantic/pydantic/discussions/4950
+    ) = TypeAdapter(
+        ProgressRabbitMessageNode | ProgressRabbitMessageProject
+    ).validate_json(
+        data
     )
     message: SocketMessageDict | None = None
     if isinstance(rabbit_message, ProgressRabbitMessageProject):
@@ -126,7 +128,7 @@ async def _events_message_parser(app: web.Application, data: bytes) -> bool:
 
 
 async def _osparc_credits_message_parser(app: web.Application, data: bytes) -> bool:
-    rabbit_message = parse_raw_as(WalletCreditsMessage, data)
+    rabbit_message = TypeAdapter(WalletCreditsMessage).validate_json(data)
     wallet_groups = await wallets_api.list_wallet_groups_with_read_access_by_wallet(
         app, wallet_id=rabbit_message.wallet_id
     )

services/web/server/src/simcore_service_webserver/projects/_crud_handlers_models.py

@@ -18,9 +18,13 @@
 )
 from models_library.workspaces import WorkspaceID
 from pydantic import (
-    TypeAdapter, field_validator, ConfigDict, BaseModel,
+    BaseModel,
+    ConfigDict,
     Field,
     Json,
+    TypeAdapter,
+    field_validator,
+    model_validator,
 )
 from servicelib.common_headers import (
     UNDEFINED_DEFAULT_SIMCORE_USER_AGENT_VALUE,
@@ -65,6 +69,7 @@ def check_parent_valid(cls, values: dict[str, Any]) -> dict[str, Any]:
             msg = "Both parent_project_uuid and parent_node_id must be set or both null or both unset"
             raise ValueError(msg)
         return values
+
     model_config = ConfigDict(populate_by_name=False)
 
 
@@ -115,9 +120,9 @@ def search_check_empty_string(cls, v):
             return None
         return v
 
-    _null_or_none_str_to_none_validator = field_validator(
-        "folder_id", mode="before"
-    )(null_or_none_str_to_none_validator)
+    _null_or_none_str_to_none_validator = field_validator("folder_id", mode="before")(
+        null_or_none_str_to_none_validator
+    )
 
     _null_or_none_str_to_none_validator2 = field_validator(
         "workspace_id", mode="before"
@@ -147,6 +152,7 @@ def validate_order_by_field(cls, v):
             msg = f"We do not support ordering by provided field {v.field}"
             raise ValueError(msg)
         return v
+
     model_config = ConfigDict(extra="forbid")
 
 

services/web/server/src/simcore_service_webserver/scicrunch/_rest.py

@@ -18,7 +18,7 @@
 from typing import Any
 
 from aiohttp import ClientSession
-from pydantic import BaseModel, Field
+from pydantic import BaseModel, Field, RootModel
 from yarl import URL
 
 from .models import ResourceHit
@@ -49,7 +49,7 @@ class ResourceView(BaseModel):
 
     @classmethod
     def from_response_payload(cls, payload: dict):
-        assert payload["success"] == True  # nosec
+        assert payload["success"] is True  # nosec
         return cls(**payload["data"])
 
     @property
@@ -72,8 +72,8 @@ def get_resource_url(self):
         return URL(str(self._get_field("Resource URL")))
 
 
-class ListOfResourceHits(BaseModel):
-    __root__: list[ResourceHit]
+class ListOfResourceHits(RootModel[list[ResourceHit]]):
+    ...
 
 
 # REQUESTS
@@ -120,4 +120,4 @@ async def autocomplete_by_name(
     ) as resp:
         body = await resp.json()
         assert body.get("success")  # nosec
-        return ListOfResourceHits.parse_obj(body.get("data", []))
+        return ListOfResourceHits.model_validate(body.get("data", []))

services/web/server/src/simcore_service_webserver/scicrunch/settings.py

@@ -1,5 +1,5 @@
 from aiohttp import web
-from pydantic import Field, HttpUrl, SecretStr, parse_obj_as
+from pydantic import Field, HttpUrl, SecretStr, TypeAdapter
 from settings_library.base import BaseCustomSettings
 
 from .._constants import APP_SETTINGS_KEY
@@ -11,7 +11,7 @@
 class SciCrunchSettings(BaseCustomSettings):
 
     SCICRUNCH_API_BASE_URL: HttpUrl = Field(
-        default=parse_obj_as(HttpUrl, f"{SCICRUNCH_DEFAULT_URL}/api/1"),
+        default=TypeAdapter(HttpUrl).validate_python(f"{SCICRUNCH_DEFAULT_URL}/api/1"),
         description="Base url to scicrunch API's entrypoint",
     )
 
@@ -20,7 +20,9 @@ class SciCrunchSettings(BaseCustomSettings):
     SCICRUNCH_API_KEY: SecretStr
 
     SCICRUNCH_RESOLVER_BASE_URL: HttpUrl = Field(
-        default=parse_obj_as(HttpUrl, f"{SCICRUNCH_DEFAULT_URL}/resolver"),
+        default=TypeAdapter(HttpUrl).validate_python(
+            f"{SCICRUNCH_DEFAULT_URL}/resolver"
+        ),
         description="Base url to scicrunch resolver entrypoint",
     )
 

services/web/server/src/simcore_service_webserver/storage/schemas.py

@@ -2,7 +2,7 @@
 from typing import Any, TypeAlias
 
 from models_library.api_schemas_storage import TableSynchronisation
-from pydantic import ConfigDict, BaseModel, Field
+from pydantic import BaseModel, ConfigDict, Field, RootModel
 
 # NOTE: storage generates URLs that contain double encoded
 # slashes, and when applying validation via `StorageFileID`
@@ -24,8 +24,8 @@ class FileLocation(BaseModel):
     )
 
 
-class FileLocationArray(BaseModel):
-    __root__: list[FileLocation]
+class FileLocationArray(RootModel[list[FileLocation]]):
+    ...
 
 
 class Links(BaseModel):
@@ -70,8 +70,8 @@ class DatasetMetaData(BaseModel):
     )
 
 
-class DatasetMetaDataArray(BaseModel):
-    __root__: list[DatasetMetaData]
+class DatasetMetaDataArray(RootModel[list[DatasetMetaData]]):
+    ...
 
 
 class FileLocationEnveloped(BaseModel):
@@ -141,8 +141,8 @@ class FileMetaData(BaseModel):
     )
 
 
-class FileMetaDataArray(BaseModel):
-    __root__: list[FileMetaData]
+class FileMetaDataArray(RootModel[list[FileMetaData]]):
+    ...
 
 
 class FileMetaEnvelope(BaseModel):
@@ -153,9 +153,8 @@ class FileMetaEnvelope(BaseModel):
 class PresignedLink(BaseModel):
     link: str | None = None
 
-    model_config = ConfigDict(
-        json_schema_extra={"example": {"link": "example_link"}}
-    )
+    model_config = ConfigDict(json_schema_extra={"example": {"link": "example_link"}})
+
 
 class PresignedLinkEnveloped(BaseModel):
     data: PresignedLink

services/web/server/src/simcore_service_webserver/tags/schemas.py

@@ -1,9 +1,10 @@
 import re
 from datetime import datetime
+from typing import Annotated
 
 from models_library.api_schemas_webserver._base import InputSchema, OutputSchema
 from models_library.users import GroupID, UserID
-from pydantic import ConstrainedStr, Field, PositiveInt
+from pydantic import Field, PositiveInt, StringConstraints
 from servicelib.aiohttp.requests_validation import RequestParams, StrictRequestParams
 from servicelib.request_keys import RQT_USERID_KEY
 from simcore_postgres_database.utils_tags import TagDict
@@ -17,8 +18,9 @@ class TagPathParams(StrictRequestParams):
     tag_id: PositiveInt
 
 
-class ColorStr(ConstrainedStr):
-    regex = re.compile(r"^#([A-Fa-f0-9]{6}|[A-Fa-f0-9]{3})$")
+ColorStr = Annotated[
+    str, StringConstraints(pattern=re.compile(r"^#([A-Fa-f0-9]{6}|[A-Fa-f0-9]{3})$"))
+]
 
 
 class TagUpdate(InputSchema):

services/web/server/src/simcore_service_webserver/utils.py

@@ -10,11 +10,12 @@
 import tracemalloc
 from datetime import datetime
 from pathlib import Path
-from typing import Any, TypedDict, cast
+from typing import Any, cast
 
 import orjson
 from models_library.basic_types import SHA1Str
 from models_library.error_codes import ErrorCodeStr
+from typing_extensions import TypedDict
 
 _CURRENT_DIR = (
     Path(sys.argv[0] if __name__ == "__main__" else __file__).resolve().parent

services/web/server/tests/unit/isolated/test_dynamic_scheduler.py

@@ -47,18 +47,23 @@ def mock_rpc_client(
 
 @pytest.fixture
 def dynamic_service_start() -> DynamicServiceStart:
-    return DynamicServiceStart.parse_obj(
-        DynamicServiceStart.Config.schema_extra["example"]
+    return DynamicServiceStart.model_validate(
+        DynamicServiceStart.model_config["json_schema_extra"]["example"]
     )
 
 
 @pytest.mark.parametrize(
     "expected_response",
     [
-        *[NodeGet.parse_obj(x) for x in NodeGet.Config.schema_extra["examples"]],
-        NodeGetIdle.parse_obj(NodeGetIdle.Config.schema_extra["example"]),
-        DynamicServiceGet.parse_obj(
-            DynamicServiceGet.Config.schema_extra["examples"][0]
+        *[
+            NodeGet.model_validate(x)
+            for x in NodeGet.model_config["json_schema_extra"]["examples"]
+        ],
+        NodeGetIdle.model_validate(
+            NodeGetIdle.model_config["json_schema_extra"]["example"]
+        ),
+        DynamicServiceGet.model_validate(
+            DynamicServiceGet.model_config["json_schema_extra"]["examples"][0]
         ),
     ],
 )
@@ -98,9 +103,12 @@ async def test_get_service_status_raises_rpc_server_error(
 @pytest.mark.parametrize(
     "expected_response",
     [
-        *[NodeGet.parse_obj(x) for x in NodeGet.Config.schema_extra["examples"]],
-        DynamicServiceGet.parse_obj(
-            DynamicServiceGet.Config.schema_extra["examples"][0]
+        *[
+            NodeGet.model_validate(x)
+            for x in NodeGet.model_config["json_schema_extra"]["examples"]
+        ],
+        DynamicServiceGet.model_validate(
+            DynamicServiceGet.model_config["json_schema_extra"]["examples"][0]
         ),
     ],
 )

services/web/server/tests/unit/isolated/test_projects__nodes_resources.py

@@ -18,7 +18,9 @@
     "resources",
     [
         parse_obj_as(ServiceResourcesDict, example)
-        for example in ServiceResourcesDictHelpers.Config.schema_extra["examples"]
+        for example in ServiceResourcesDictHelpers.model_config["json_schema_extra"][
+            "examples"
+        ]
     ],
 )
 def test_check_can_update_service_resources_with_same_does_not_raise(
@@ -32,7 +34,9 @@ def test_check_can_update_service_resources_with_same_does_not_raise(
     "resources",
     [
         parse_obj_as(ServiceResourcesDict, example)
-        for example in ServiceResourcesDictHelpers.Config.schema_extra["examples"]
+        for example in ServiceResourcesDictHelpers.model_config["json_schema_extra"][
+            "examples"
+        ]
     ],
 )
 def test_check_can_update_service_resources_with_invalid_container_name_raises(
@@ -51,7 +55,9 @@ def test_check_can_update_service_resources_with_invalid_container_name_raises(
     "resources",
     [
         parse_obj_as(ServiceResourcesDict, example)
-        for example in ServiceResourcesDictHelpers.Config.schema_extra["examples"]
+        for example in ServiceResourcesDictHelpers.model_config["json_schema_extra"][
+            "examples"
+        ]
     ],
 )
 def test_check_can_update_service_resources_with_invalid_image_name_raises(