simcore sdk

Author: Andrei Neagu

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

@@ -95,8 +95,7 @@ class JupyterHubTokenAuthentication(BaseAuthentication):
 class NoAuthentication(BaseAuthentication):
     type: Literal["none"] = "none"
 
-    class Config(BaseAuthentication.Config):
-        schema_extra: ClassVar[dict[str, Any]] = {"examples": [{"type": "none"}]}
+    model_config = ConfigDict(json_schema_extra={"examples": [{"type": "none"}]})
 
 
 class TLSAuthentication(BaseAuthentication):

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

@@ -45,16 +45,17 @@ async def storage_service(
 ) -> URL:
     await wait_till_storage_responsive(storage_endpoint)
 
-    def correct_ip(url: AnyUrl):
+    def correct_ip(url: str):
+        any_url = AnyUrl(url)
         assert storage_endpoint.host is not None
         assert storage_endpoint.port is not None
 
         return AnyUrl.build(
-            scheme=url.scheme,
+            scheme=any_url.scheme,
             host=storage_endpoint.host,
-            port=f"{storage_endpoint.port}",
-            path=url.path,
-            query=url.query,
+            port=storage_endpoint.port,
+            path=any_url.path,
+            query=any_url.query,
         )
 
     # NOTE: Mock to ensure container IP agrees with host IP when testing

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

@@ -14,9 +14,9 @@ class ServiceRetryPolicyUponInitialization:
     def __init__(self, logger: logging.Logger | None = None):
         logger = logger or log
 
-        self.kwargs = dict(
-            wait=wait_fixed(self.WAIT_SECS),
-            stop=stop_after_attempt(self.ATTEMPTS_COUNT),
-            before_sleep=before_sleep_log(logger, logging.INFO),
-            reraise=True,
-        )
+        self.kwargs = {
+            "wait": wait_fixed(self.WAIT_SECS),
+            "stop": stop_after_attempt(self.ATTEMPTS_COUNT),
+            "before_sleep": before_sleep_log(logger, logging.INFO),
+            "reraise": True,
+        }

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

@@ -4,6 +4,7 @@
 from inspect import isawaitable
 from typing import Final, Optional, Protocol, runtime_checkable
 
+from common_library.pydantic_basic_types import IDStr
 from models_library.progress_bar import (
     ProgressReport,
     ProgressStructuredMessage,

packages/simcore-sdk/src/simcore_sdk/node_ports_v2/nodeports_v2.py

@@ -238,7 +238,7 @@ async def _set_with_notifications(
         # groups all ValidationErrors pre-pending 'port_key' to loc and raises ValidationError
         if error_details := [
             _get_error_details(r, port_key)
-            for port_key, r in zip(port_values.keys(), results)
+            for port_key, r in zip(port_values.keys(), results, strict=True)
             if r is not None
         ]:
             raise ValidationError.from_exception_data(

packages/simcore-sdk/tests/integration/test_node_data_data_manager.py

@@ -17,7 +17,7 @@
 from models_library.projects import ProjectID
 from models_library.projects_nodes_io import NodeID, SimcoreS3FileID
 from models_library.users import UserID
-from pydantic import parse_obj_as
+from pydantic import TypeAdapter
 from servicelib.progress_bar import ProgressBarData
 from settings_library.aws_s3_cli import AwsS3CliSettings
 from settings_library.r_clone import RCloneSettings
@@ -263,8 +263,8 @@ async def test_delete_legacy_archive(
             user_id=user_id,
             store_id=SIMCORE_LOCATION,
             store_name=None,
-            s3_object=parse_obj_as(
-                SimcoreS3FileID, f"{project_id}/{node_uuid}/{legacy_archive_name.name}"
+            s3_object=TypeAdapter(SimcoreS3FileID).validate_python(
+                f"{project_id}/{node_uuid}/{legacy_archive_name.name}"
             ),
             path_to_upload=legacy_archive_name,
             io_log_redirect_cb=None,

packages/simcore-sdk/tests/unit/test_node_ports_common_r_clone_utils.py

@@ -2,7 +2,7 @@
 from unittest.mock import AsyncMock
 
 import pytest
-from pydantic import parse_raw_as
+from pydantic import TypeAdapter
 from simcore_sdk.node_ports_common.r_clone_utils import (
     SyncProgressLogParser,
     _RCloneSyncMessageBase,
@@ -68,7 +68,7 @@
     ],
 )
 async def test_rclone_stbc_message_parsing_regression(log_message: str, expected: type):
-    parsed_log = parse_raw_as(_RCloneSyncMessages, log_message)  # type: ignore[arg-type]
+    parsed_log = TypeAdapter(_RCloneSyncMessages).validate_json(log_message)
     assert isinstance(parsed_log, expected)
 
     progress_log_parser = SyncProgressLogParser(AsyncMock())

packages/simcore-sdk/tests/unit/test_node_ports_v2_nodeports_v2.py

@@ -9,8 +9,9 @@
 from unittest.mock import AsyncMock
 
 import pytest
+from common_library.pydantic_basic_types import IDStr
 from faker import Faker
-from pydantic import ValidationError
+from pydantic import BaseModel, ValidationError
 from pytest_mock import MockFixture
 from servicelib.progress_bar import ProgressBarData
 from simcore_sdk.node_ports_common.filemanager import UploadedFile
@@ -231,9 +232,13 @@ async def test_node_ports_v2_packages(
 def mock_port_set(mocker: MockFixture) -> None:
     async def _always_raise_error(*args, **kwargs):
         async def _i_raise_errors():
-            raise ValidationError("invalid")
+            class User(BaseModel):
+                name: str
+                age: int
 
-        return asyncio.create_task(_i_raise_errors())
+            User(**kwargs)
+
+        return await asyncio.create_task(_i_raise_errors())
 
     mocker.patch(
         "simcore_sdk.node_ports_v2.port.Port._set", side_effect=_always_raise_error
@@ -269,7 +274,11 @@ async def _mock_callback(*args, **kwargs):
         node_port_creator_cb=_mock_callback,
         auto_update=False,
     )
-    async with ProgressBarData(num_steps=1, description=faker.pystr()) as progress_bar:
+
+    callback = AsyncMock()
+    async with ProgressBarData(
+        num_steps=1, description=IDStr(faker.pystr())
+    ) as progress_bar:
         with pytest.raises(ValidationError):
             await node_ports.set_multiple(
                 {
@@ -278,4 +287,5 @@ async def _mock_callback(*args, **kwargs):
                     + list(original_outputs.values())
                 },
                 progress_bar=progress_bar,
+                outputs_callbacks=callback,
             )