@pcrespov _service_api_units.py -> _service_units.py

Author: bisgaard-itis

services/web/server/src/simcore_service_webserver/catalog/_service.py

@@ -28,7 +28,7 @@
 
 from ..rabbitmq import get_rabbitmq_rpc_client
 from . import _service_catalog_rest_client
-from ._service_api_units import can_connect, replace_service_input_outputs
+from ._service_units import can_connect, replace_service_input_outputs
 from .controller_rest_schemas import (
     CatalogRequestContext,
     ServiceInputGetFactory,

…_webserver/catalog/_service_api_units.py …vice_webserver/catalog/_service_units.pyservices/web/server/src/simcore_service_webserver/catalog/_service_api_units.py renamed to services/web/server/src/simcore_service_webserver/catalog/_service_units.py services/web/server/src/simcore_service_webserver/catalog/_service_api_units.py renamed to services/web/server/src/simcore_service_webserver/catalog/_service_units.py

@@ -9,7 +9,7 @@
 from models_library.function_services_catalog.services import demo_units
 from models_library.services import ServiceInput, ServiceOutput
 from pint import UnitRegistry
-from simcore_service_webserver.catalog._service_api_units import can_connect
+from simcore_service_webserver.catalog._service_units import can_connect
 
 
 def _create_port_data(schema: dict[str, Any]):

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

@@ -10,7 +10,7 @@
 from pint import UnitRegistry
 from pytest_benchmark.fixture import BenchmarkFixture
 from simcore_service_webserver.catalog._controller_rest import RESPONSE_MODEL_POLICY
-from simcore_service_webserver.catalog._service_api_units import (
+from simcore_service_webserver.catalog._service_units import (
     replace_service_input_outputs,
 )
 

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

@@ -59,7 +59,7 @@ def fake_project(
 @pytest.fixture
 def mock_catalog_api_get_service_access_rights_response(mocker: MockerFixture):
     mocker.patch(
-        "simcore_service_webserver.projects._nodes_handlers.catalog_client.get_service_access_rights",
+        "simcore_service_webserver.projects._nodes_handlers.catalog_service.get_service_access_rights",
         spec=True,
         side_effect=[
             ServiceAccessRightsGet(
@@ -130,7 +130,7 @@ async def test_accessible_thanks_to_everyone_group_id(
     logged_user: UserInfoDict,
 ):
     mocker.patch(
-        "simcore_service_webserver.projects._nodes_handlers.catalog_client.get_service_access_rights",
+        "simcore_service_webserver.projects._nodes_handlers.catalog_service.get_service_access_rights",
         spec=True,
         side_effect=[
             ServiceAccessRightsGet(
@@ -185,7 +185,7 @@ async def test_accessible_thanks_to_concrete_group_id(
     for_gid = logged_user["primary_gid"]
 
     mocker.patch(
-        "simcore_service_webserver.projects._nodes_handlers.catalog_client.get_service_access_rights",
+        "simcore_service_webserver.projects._nodes_handlers.catalog_service.get_service_access_rights",
         spec=True,
         side_effect=[
             ServiceAccessRightsGet(
@@ -238,7 +238,7 @@ async def test_accessible_through_product_group(
     for_gid = logged_user["primary_gid"]
 
     mocker.patch(
-        "simcore_service_webserver.projects._nodes_handlers.catalog_client.get_service_access_rights",
+        "simcore_service_webserver.projects._nodes_handlers.catalog_service.get_service_access_rights",
         spec=True,
         side_effect=[
             ServiceAccessRightsGet(
@@ -297,7 +297,7 @@ async def test_accessible_for_one_service(
     for_gid = logged_user["primary_gid"]
 
     mocker.patch(
-        "simcore_service_webserver.projects._nodes_handlers.catalog_client.get_service_access_rights",
+        "simcore_service_webserver.projects._nodes_handlers.catalog_service.get_service_access_rights",
         spec=True,
         side_effect=[
             ServiceAccessRightsGet(
@@ -355,7 +355,7 @@ async def test_not_accessible_for_more_services(
     logged_user: UserInfoDict,
 ):
     mocker.patch(
-        "simcore_service_webserver.projects._nodes_handlers.catalog_client.get_service_access_rights",
+        "simcore_service_webserver.projects._nodes_handlers.catalog_service.get_service_access_rights",
         spec=True,
         side_effect=[
             ServiceAccessRightsGet(
@@ -421,7 +421,7 @@ async def test_not_accessible_for_service_because_of_execute_access_false(
     for_gid = logged_user["primary_gid"]
 
     mocker.patch(
-        "simcore_service_webserver.projects._nodes_handlers.catalog_client.get_service_access_rights",
+        "simcore_service_webserver.projects._nodes_handlers.catalog_service.get_service_access_rights",
         spec=True,
         side_effect=[
             ServiceAccessRightsGet(