refactor and migrated to yarl

Author: Andrei Neagu

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

@@ -0,0 +1,11 @@
+from collections.abc import Callable
+
+from yarl import URL
+
+
+def replace_storage_endpoint(host: str, port: int) -> Callable[[str], str]:
+    def _(url: str) -> str:
+        url_obj = URL(url).with_host(host).with_port(port)
+        return f"{url_obj}"
+
+    return _

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

@@ -10,13 +10,14 @@
 import tenacity
 from models_library.projects import ProjectID
 from models_library.projects_nodes_io import NodeID, SimcoreS3FileID
-from pydantic import AnyUrl, TypeAdapter
+from pydantic import TypeAdapter
 from pytest_mock import MockerFixture
 from servicelib.minio_utils import ServiceRetryPolicyUponInitialization
 from yarl import URL
 
 from .helpers.docker import get_service_published_port
 from .helpers.host import get_localhost_ip
+from .helpers.storage import replace_storage_endpoint
 
 
 @pytest.fixture(scope="module")
@@ -45,24 +46,12 @@ async def storage_service(
 ) -> URL:
     await wait_till_storage_responsive(storage_endpoint)
 
-    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
-
-        storage_endpoint_url = AnyUrl.build(
-            scheme=url_obj.scheme,
-            host=storage_endpoint.host,
-            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
+    assert storage_endpoint.host is not None
+    assert storage_endpoint.port is not None
     mocker.patch(
         "simcore_sdk.node_ports_common._filemanager._get_https_link_if_storage_secure",
-        _replace_storage_endpoint,
+        replace_storage_endpoint(storage_endpoint.host, storage_endpoint.port),
     )
 
     return storage_endpoint

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

@@ -23,11 +23,12 @@
 from models_library.projects import ProjectID
 from models_library.projects_nodes_io import NodeID, SimcoreS3FileID
 from models_library.users import UserID
-from pydantic import AnyUrl, TypeAdapter
+from pydantic import TypeAdapter
 from pytest_mock import MockerFixture
 from pytest_simcore.helpers.faker_factories import random_project
 from pytest_simcore.helpers.monkeypatch_envs import EnvVarsDict, setenvs_from_dict
 from pytest_simcore.helpers.postgres_tools import PostgresTestConfig
+from pytest_simcore.helpers.storage import replace_storage_endpoint
 from servicelib.fastapi.long_running_tasks.server import TaskProgress
 from servicelib.utils import logged_gather
 from settings_library.s3 import S3Settings
@@ -161,25 +162,13 @@ def state_paths_to_legacy_archives(
 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 _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
-
-        storage_endpoint_url = AnyUrl.build(
-            scheme=url_obj.scheme,
-            host=storage_host,
-            port=int(storage_port),
-            path=url_obj.path.lstrip("/"),
-            query=url_obj.query,
-        )
-        return f"{storage_endpoint_url}"
+    assert storage_host is not None
+    assert storage_port is not None
 
     # 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",
-        _replace_storage_endpoint,
+        replace_storage_endpoint(storage_host, int(storage_port)),
     )
 
 

tests/public-api/test_users_api.py

@@ -32,6 +32,7 @@ class ProfileDict(TypedDict):
     first_name: str
     last_name: str
     email: str
+    login: str
     role: osparc.UserRoleEnum
     groups: ProfileGroupsDict
     gravatar_id: str
@@ -44,7 +45,7 @@ def expected_profile(registered_user: RegisteredUserDict) -> ProfileDict:
     username = email.split("@")[0]
 
     return ProfileDict(
-        **{
+        **{  # noqa: PIE804
             "first_name": first_name,
             "last_name": registered_user["last_name"],
             "login": email,