pydantic2 migration made integration tests green

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

@@ -118,6 +118,10 @@ def env_file_for_testing(
             file=fh,
         )
         for key, value in sorted(testing_environ_vars.items()):
+            # ensure OpenTelemetry is not enabled
+            if key.startswith("TRACING_") or key.endswith("_TRACING"):
+                continue
+
             # NOTE: python-dotenv parses JSON encoded strings correctly, but
             # writing them back shows an issue. if the original ENV is something like MY_ENV='{"correct": "encodedjson"}'
             # it goes to MY_ENV={"incorrect": "encodedjson"}!

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

@@ -45,22 +45,24 @@ async def storage_service(
 ) -> URL:
     await wait_till_storage_responsive(storage_endpoint)
 
-    def correct_ip(url: AnyUrl):
+    def _replace_storage_endpoint(url: str) -> str:
+        url_obj = TypeAdapter(AnyUrl).validate_python(url)
         assert storage_endpoint.host is not None
         assert storage_endpoint.port is not None
 
-        return AnyUrl.build(
-            scheme=url.scheme,
+        storage_endpoint_url = AnyUrl.build(
+            scheme=url_obj.scheme,
             host=storage_endpoint.host,
-            port=f"{storage_endpoint.port}",
-            path=url.path,
-            query=url.query,
+            port=storage_endpoint.port,
+            path=url_obj.path.lstrip("/"),
+            query=url_obj.query,
         )
+        return f"{storage_endpoint_url}"
 
     # NOTE: Mock to ensure container IP agrees with host IP when testing
     mocker.patch(
         "simcore_sdk.node_ports_common._filemanager._get_https_link_if_storage_secure",
-        correct_ip,
+        _replace_storage_endpoint,
     )
 
     return storage_endpoint

packages/simcore-sdk/src/simcore_sdk/node_ports_common/_filemanager.py

@@ -69,18 +69,18 @@ async def _complete_upload(
     :rtype: ETag
     """
     async with session.post(
-        _get_https_link_if_storage_secure(str(upload_completion_link)),
+        _get_https_link_if_storage_secure(f"{upload_completion_link}"),
         json=jsonable_encoder(FileUploadCompletionBody(parts=parts)),
         auth=get_basic_auth(),
     ) as resp:
         resp.raise_for_status()
         # now poll for state
-        file_upload_complete_response = TypeAdapter(Envelope[FileUploadCompleteResponse]).validate_python(
-            await resp.json()
-        )
+        file_upload_complete_response = TypeAdapter(
+            Envelope[FileUploadCompleteResponse]
+        ).validate_python(await resp.json())
         assert file_upload_complete_response.data  # nosec
     state_url = _get_https_link_if_storage_secure(
-        str(file_upload_complete_response.data.links.state)
+        f"{file_upload_complete_response.data.links.state}"
     )
     _logger.info("completed upload of %s", f"{len(parts)} parts, received {state_url}")
 
@@ -96,9 +96,9 @@ async def _complete_upload(
         with attempt:
             async with session.post(state_url, auth=get_basic_auth()) as resp:
                 resp.raise_for_status()
-                future_enveloped = TypeAdapter(Envelope[FileUploadCompleteFutureResponse]).validate_python(
-                    await resp.json()
-                )
+                future_enveloped = TypeAdapter(
+                    Envelope[FileUploadCompleteFutureResponse]
+                ).validate_python(await resp.json())
                 assert future_enveloped.data  # nosec
                 if future_enveloped.data.state == FileUploadCompleteState.NOK:
                     msg = "upload not ready yet"
@@ -142,7 +142,8 @@ async def _abort_upload(
     # abort the upload correctly, so it can revert back to last version
     try:
         async with session.post(
-            _get_https_link_if_storage_secure(str(abort_upload_link)), auth=get_basic_auth()
+            _get_https_link_if_storage_secure(f"{abort_upload_link}"),
+            auth=get_basic_auth(),
         ) as resp:
             resp.raise_for_status()
     except ClientError:

packages/simcore-sdk/src/simcore_sdk/node_ports_common/r_clone_utils.py

@@ -78,9 +78,7 @@ async def __call__(self, logs: str) -> None:
         with log_catch(_logger, reraise=False):
             rclone_message: _RCloneSyncMessages = TypeAdapter(
                 _RCloneSyncMessages
-            ).validate_strings(
-                logs,
-            )
+            ).validate_json(logs)
 
             if isinstance(rclone_message, _RCloneSyncTransferringMessage):
                 await self.progress_bar.set_(rclone_message.stats.bytes)

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

@@ -80,7 +80,7 @@ def project_id(user_id: int, postgres_db: sa.engine.Engine) -> Iterable[str]:
 
 @pytest.fixture(scope="module")
 def node_uuid() -> NodeIDStr:
-    return NodeIDStr(f"{uuid4()}")
+    return TypeAdapter(NodeIDStr).validate_python(f"{uuid4()}")
 
 
 @pytest.fixture(scope="session")
@@ -156,7 +156,7 @@ async def _create(file_path: Path) -> dict[str, Any]:
                 "Content-Type": "application/binary",
             }
             async with session.put(
-                link, data=file_path.read_bytes(), headers=extra_hdr
+                f"{link}", data=file_path.read_bytes(), headers=extra_hdr
             ) as resp:
                 resp.raise_for_status()
 

services/dynamic-sidecar/tests/integration/test_modules_long_running_tasks.py

@@ -162,23 +162,24 @@ async def simcore_storage_service(mocker: MockerFixture, app: FastAPI) -> None:
     storage_host: Final[str] | None = os.environ.get("STORAGE_HOST")
     storage_port: Final[str] | None = os.environ.get("STORAGE_PORT")
 
-    def correct_ip(url: AnyUrl):
-
+    def _replace_storage_endpoint(url: str) -> str:
+        url_obj = TypeAdapter(AnyUrl).validate_python(url)
         assert storage_host is not None
         assert storage_port is not None
 
-        return AnyUrl.build(
-            scheme=url.scheme,
+        storage_endpoint_url = AnyUrl.build(
+            scheme=url_obj.scheme,
             host=storage_host,
-            port=storage_port,
-            path=url.path,
-            query=url.query,
+            port=int(storage_port),
+            path=url_obj.path.lstrip("/"),
+            query=url_obj.query,
         )
+        return f"{storage_endpoint_url}"
 
     # NOTE: Mock to ensure container IP agrees with host IP when testing
     mocker.patch(
         "simcore_sdk.node_ports_common._filemanager._get_https_link_if_storage_secure",
-        correct_ip,
+        _replace_storage_endpoint,
     )
 
 

services/storage/requirements/prod.txt

@@ -11,6 +11,7 @@
 
 # installs this repo's packages
 simcore-aws-library @ ../../packages/aws-library/
+simcore-common-library @ ../../packages/common-library/
 simcore-models-library @ ../../packages/models-library/
 simcore-postgres-database @ ../../packages/postgres-database/
 simcore-service-library[aiohttp] @ ../../packages/service-library

services/storage/src/simcore_service_storage/models.py

@@ -191,7 +191,7 @@ def convert_from_lower_case(cls, v: str) -> str:
     def when_directory_force_link_type_and_file_size(cls, data: Any) -> Any:
         assert isinstance(data, dict)
 
-        if bool(data.get("is_directory", False)) is True:
+        if TypeAdapter(bool).validate_python(data.get("is_directory", "false")):
             # sets directory size by default to undefined
             if int(data.get("file_size", -1)) < 0:
                 data["file_size"] = None

services/web/server/src/simcore_service_webserver/exporter/_formatter/xlsx/code_description.py

@@ -28,8 +28,8 @@ class RRIDEntry(BaseModel):
 
 class TSREntry(BaseModel):
     references: list[str]
-    target_level: int | None  # max value allowed
-    current_level: int | None  # current selection
+    target_level: int | None = None  # max value allowed
+    current_level: int | None = None  # current selection
 
 
 class CodeDescriptionModel(BaseModel):

services/web/server/tests/integration/01/test_exporter_requests_handlers.py

@@ -43,7 +43,12 @@
 from simcore_service_webserver.projects.models import ProjectDict
 from yarl import URL
 
-pytest_simcore_core_services_selection = ["migration", "postgres", "redis", "rabbit"]
+pytest_simcore_core_services_selection = [
+    "migration",
+    "postgres",
+    "redis",
+    "rabbit",
+]
 
 _logger = logging.getLogger(__name__)