Merge branch 'is4481/upgrade-libs' into is4481/upgrade-services

Author: giancarloromeo

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

@@ -7,7 +7,7 @@
 """
 
 from pathlib import Path
-from typing import Annotated, TypeAlias
+from typing import Annotated, Final, TypeAlias
 from uuid import UUID
 
 from models_library.basic_types import ConstrainedStr, KeyIDStr
@@ -45,7 +45,7 @@
 ]
 
 
-_ANY_URL_ADAPTER: TypeAdapter[AnyUrl] = TypeAdapter(AnyUrl)
+_ANY_URL_ADAPTER: Final[TypeAdapter[AnyUrl]] = TypeAdapter(AnyUrl)
 
 
 class SimcoreS3DirectoryID(ConstrainedStr):

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

@@ -19,7 +19,7 @@
     UploadedPart,
 )
 from moto.server import ThreadedMotoServer
-from pydantic import AnyUrl, ByteSize, TypeAdapter, parse_obj_as
+from pydantic import AnyUrl, ByteSize, TypeAdapter
 from pytest_mock import MockerFixture
 from servicelib.aiohttp import status
 from servicelib.progress_bar import ProgressBarData
@@ -212,8 +212,7 @@ async def _creator(num_upload_links: int, chunk_size: ByteSize) -> FileUploadSch
         assert "UploadId" in response
         upload_id = response["UploadId"]
 
-        upload_links = parse_obj_as(
-            list[AnyUrl],
+        upload_links = TypeAdapter(list[AnyUrl]).validate_python(
             await asyncio.gather(
                 *[
                     aiobotocore_s3_client.generate_presigned_url(
@@ -258,6 +257,7 @@ async def test_upload_file_to_presigned_links(
     create_file_of_size: Callable[[ByteSize], Path],
     file_size: ByteSize,
     used_chunk_size: ByteSize,
+    faker: Faker,
 ):
     """This test is here to reproduce the issue https://github.com/ITISFoundation/osparc-simcore/issues/3531
     One theory is that something might be wrong in how the chunking is done and that AWS times out
@@ -272,11 +272,11 @@ async def test_upload_file_to_presigned_links(
     """
     local_file = create_file_of_size(file_size)
     num_links = 2080
-    effective_chunk_size = parse_obj_as(ByteSize, local_file.stat().st_size / num_links)
+    effective_chunk_size = TypeAdapter(ByteSize).validate_python(local_file.stat().st_size / num_links)
     assert effective_chunk_size <= used_chunk_size
     upload_links = await create_upload_links(num_links, used_chunk_size)
     assert len(upload_links.urls) == num_links
-    async with ProgressBarData(num_steps=1) as progress_bar:
+    async with ProgressBarData(num_steps=1, description=faker.pystr()) as progress_bar:
         uploaded_parts: list[UploadedPart] = await upload_file_to_presigned_links(
             session=client_session,
             file_upload_links=upload_links,

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

@@ -50,6 +50,7 @@ async def mock_node_port_creator_cb(*args, **kwargs):
             user_id=user_id,
             project_id=project_id,
             node_uuid=node_uuid,
+            io_log_redirect_cb=None,
             save_to_db_cb=mock_save_db_cb,
             node_port_creator_cb=mock_node_port_creator_cb,
             auto_update=False,
@@ -62,6 +63,7 @@ async def mock_node_port_creator_cb(*args, **kwargs):
         user_id=user_id,
         project_id=project_id,
         node_uuid=node_uuid,
+        io_log_redirect_cb=None,
         save_to_db_cb=mock_save_db_cb,
         node_port_creator_cb=mock_node_port_creator_cb,
         auto_update=auto_update,
@@ -101,6 +103,7 @@ async def mock_node_port_creator_cb(*args, **kwargs):
             user_id=user_id,
             project_id=project_id,
             node_uuid=node_uuid,
+            io_log_redirect_cb=None,
             save_to_db_cb=mock_save_db_cb,
             node_port_creator_cb=mock_node_port_creator_cb,
             auto_update=False,
@@ -113,6 +116,7 @@ async def mock_node_port_creator_cb(*args, **kwargs):
         user_id=user_id,
         project_id=project_id,
         node_uuid=node_uuid,
+        io_log_redirect_cb=None,
         save_to_db_cb=mock_save_db_cb,
         node_port_creator_cb=mock_node_port_creator_cb,
         auto_update=False,
@@ -182,6 +186,7 @@ async def mock_node_port_creator_cb(*args, **kwargs):
             user_id=user_id,
             project_id=project_id,
             node_uuid=node_uuid,
+            io_log_redirect_cb=None,
             save_to_db_cb=mock_save_db_cb,
             node_port_creator_cb=mock_node_port_creator_cb,
             auto_update=False,
@@ -194,6 +199,7 @@ async def mock_node_port_creator_cb(*args, **kwargs):
         user_id=user_id,
         project_id=project_id,
         node_uuid=node_uuid,
+        io_log_redirect_cb=None,
         save_to_db_cb=mock_save_db_cb,
         node_port_creator_cb=mock_node_port_creator_cb,
         auto_update=False,

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

@@ -341,7 +341,7 @@ class PortParams(NamedTuple):
                 exp_new_value=FileLink(
                     store=simcore_store_id(),
                     path=f"{project_id()}/{node_uuid()}/no_file_with_default/{this_node_file_name().name}",
-                    eTag=e_tag(),
+                    e_tag=e_tag(),
                 ),
                 exp_new_get_value=download_file_folder_name()
                 / "no_file_with_default"
@@ -429,7 +429,7 @@ class PortParams(NamedTuple):
                 exp_new_value=FileLink(
                     store=simcore_store_id(),
                     path=f"{project_id()}/{node_uuid()}/some_file_on_datcore/{this_node_file_name().name}",
-                    eTag=e_tag(),
+                    e_tag=e_tag(),
                 ),
                 exp_new_get_value=download_file_folder_name()
                 / "some_file_on_datcore"
@@ -458,7 +458,7 @@ class PortParams(NamedTuple):
                 exp_new_value=FileLink(
                     store=simcore_store_id(),
                     path=f"{project_id()}/{node_uuid()}/download_link/{this_node_file_name().name}",
-                    eTag=e_tag(),
+                    e_tag=e_tag(),
                 ),
                 exp_new_get_value=download_file_folder_name()
                 / "download_link"
@@ -490,7 +490,7 @@ class PortParams(NamedTuple):
                 exp_new_value=FileLink(
                     store=simcore_store_id(),
                     path=f"{project_id()}/{node_uuid()}/download_link_with_file_to_key/{this_node_file_name().name}",
-                    eTag=e_tag(),
+                    e_tag=e_tag(),
                 ),
                 exp_new_get_value=download_file_folder_name()
                 / "download_link_with_file_to_key"
@@ -521,7 +521,7 @@ class PortParams(NamedTuple):
                 exp_new_value=FileLink(
                     store=simcore_store_id(),
                     path=f"{project_id()}/{node_uuid()}/file_port_link/{this_node_file_name().name}",
-                    eTag=e_tag(),
+                    e_tag=e_tag(),
                 ),
                 exp_new_get_value=download_file_folder_name()
                 / "file_port_link"
@@ -555,7 +555,7 @@ class PortParams(NamedTuple):
                 exp_new_value=FileLink(
                     store=simcore_store_id(),
                     path=f"{project_id()}/{node_uuid()}/file_port_link_with_file_to_key_map/{this_node_file_name().name}",
-                    eTag=e_tag(),
+                    e_tag=e_tag(),
                 ),
                 exp_new_get_value=download_file_folder_name()
                 / "file_port_link_with_file_to_key_map"

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

@@ -14,7 +14,7 @@
 
 import pytest
 from pydantic import BaseModel, Field, schema_of
-from pydantic.error_wrappers import ValidationError
+from pydantic import ValidationError
 from simcore_sdk.node_ports_v2.port import Port
 from simcore_sdk.node_ports_v2.port_validation import (
     PortUnitError,