refactor: update RPC client usage and service name in tests

Author: pcrespov

services/web/server/tests/unit/with_dbs/02/test_projects_rpc.py

@@ -4,7 +4,7 @@
 # pylint: disable=too-many-arguments
 
 
-from collections.abc import AsyncIterator, Awaitable, Callable
+from collections.abc import AsyncIterator
 from uuid import UUID
 
 import pytest
@@ -23,7 +23,6 @@
 from pytest_simcore.helpers.monkeypatch_envs import setenvs_from_dict
 from pytest_simcore.helpers.typing_env import EnvVarsDict
 from pytest_simcore.helpers.webserver_users import NewUser, UserInfoDict
-from servicelib.rabbitmq import RabbitMQRPCClient
 from servicelib.rabbitmq.rpc_interfaces.webserver.errors import (
     ProjectForbiddenRpcError,
     ProjectNotFoundRpcError,
@@ -32,7 +31,6 @@
 from settings_library.rabbit import RabbitSettings
 from simcore_service_webserver.application_settings import (
     ApplicationSettings,
-    get_application_settings,
 )
 from simcore_service_webserver.projects.models import ProjectDict
 
@@ -44,7 +42,7 @@
 @pytest.fixture(scope="session")
 def service_name() -> str:
     # Overrides  service_name fixture needed in docker_compose_service_environment_dict fixture
-    return "webserver"
+    return "wb-api-server"
 
 
 @pytest.fixture
@@ -79,22 +77,6 @@ def app_environment(
     return new_envs
 
 
-@pytest.fixture
-async def webserver_rpc_client(
-    rabbitmq_rpc_client: Callable[[str], Awaitable[RabbitMQRPCClient]],
-    client: TestClient,  # app started
-) -> WebServerRpcClient:
-
-    rpc_client = await rabbitmq_rpc_client("webserver-rpc-client")
-
-    app = client.app
-    assert app
-
-    settings = get_application_settings(app)  # nosec
-    assert settings.WEBSERVER_RPC_NAMESPACE
-    return WebServerRpcClient(rpc_client, settings.WEBSERVER_RPC_NAMESPACE)
-
-
 async def test_rpc_client_mark_project_as_job(
     product_name: ProductName,
     webserver_rpc_client: WebServerRpcClient,

services/web/server/tests/unit/with_dbs/04/functions/conftest.py

@@ -43,15 +43,23 @@
 from sqlalchemy.ext.asyncio import AsyncEngine
 
 
+@pytest.fixture(scope="session")
+def service_name() -> str:
+    # Overrides  service_name fixture needed in docker_compose_service_environment_dict fixture
+    return "wb-api-server"
+
+
 @pytest.fixture
 def app_environment(
     rabbit_service: RabbitSettings,
     app_environment: EnvVarsDict,
+    docker_compose_service_environment_dict: EnvVarsDict,
     monkeypatch: pytest.MonkeyPatch,
 ) -> EnvVarsDict:
     new_envs = setenvs_from_dict(
         monkeypatch,
         {
+            **docker_compose_service_environment_dict,
             **app_environment,
             "RABBIT_HOST": rabbit_service.RABBIT_HOST,
             "RABBIT_PORT": f"{rabbit_service.RABBIT_PORT}",

services/web/server/tests/unit/with_dbs/04/functions/test_function_job_collections_controller_rpc.py

@@ -26,10 +26,7 @@
 )
 from models_library.products import ProductName
 from pytest_simcore.helpers.webserver_users import UserInfoDict
-from servicelib.rabbitmq import RabbitMQRPCClient
-from servicelib.rabbitmq.rpc_interfaces.webserver.functions import (
-    functions_rpc_interface as functions_rpc,
-)
+from servicelib.rabbitmq.rpc_interfaces.webserver.v1 import WebServerRpcClient
 
 pytest_simcore_core_services_selection = ["rabbit"]
 
@@ -42,15 +39,14 @@ async def test_function_job_collection(
     client: TestClient,
     add_user_function_api_access_rights: None,
     mock_function_factory: Callable[[FunctionClass], Function],
-    rpc_client: RabbitMQRPCClient,
+    webserver_rpc_client: WebServerRpcClient,
     logged_user: UserInfoDict,
     other_logged_user: UserInfoDict,
     user_without_function_api_access_rights: UserInfoDict,
     osparc_product_name: ProductName,
 ):
     # Register the function first
-    registered_function = await functions_rpc.register_function(
-        rabbitmq_rpc_client=rpc_client,
+    registered_function = await webserver_rpc_client.functions.register_function(
         function=mock_function_factory(FunctionClass.PROJECT),
         user_id=logged_user["id"],
         product_name=osparc_product_name,
@@ -79,8 +75,7 @@ async def test_function_job_collection(
             job_creation_task_id=None,
         )
         # Register the function job
-        registered_job = await functions_rpc.register_function_job(
-            rabbitmq_rpc_client=rpc_client,
+        registered_job = await webserver_rpc_client.functions.register_function_job(
             function_job=registered_function_job,
             user_id=logged_user["id"],
             product_name=osparc_product_name,
@@ -95,73 +90,69 @@ async def test_function_job_collection(
     )
 
     # Register the function job collection
-    registered_collection = await functions_rpc.register_function_job_collection(
-        rabbitmq_rpc_client=rpc_client,
-        function_job_collection=function_job_collection,
-        user_id=logged_user["id"],
-        product_name=osparc_product_name,
+    registered_collection = (
+        await webserver_rpc_client.functions.register_function_job_collection(
+            function_job_collection=function_job_collection,
+            user_id=logged_user["id"],
+            product_name=osparc_product_name,
+        )
     )
     assert registered_collection.uid is not None
     assert registered_collection.created_at - datetime.datetime.now(
         datetime.UTC
     ) < datetime.timedelta(seconds=60)
 
     # Get the function job collection
-    retrieved_collection = await functions_rpc.get_function_job_collection(
-        rabbitmq_rpc_client=rpc_client,
-        function_job_collection_id=registered_collection.uid,
-        user_id=logged_user["id"],
-        product_name=osparc_product_name,
+    retrieved_collection = (
+        await webserver_rpc_client.functions.get_function_job_collection(
+            function_job_collection_id=registered_collection.uid,
+            user_id=logged_user["id"],
+            product_name=osparc_product_name,
+        )
     )
     assert retrieved_collection.uid == registered_collection.uid
     assert registered_collection.job_ids == function_job_ids
 
     # Test denied access for another user
     with pytest.raises(FunctionJobCollectionReadAccessDeniedError):
-        await functions_rpc.get_function_job_collection(
-            rabbitmq_rpc_client=rpc_client,
+        await webserver_rpc_client.functions.get_function_job_collection(
             function_job_collection_id=registered_collection.uid,
             user_id=other_logged_user["id"],
             product_name=osparc_product_name,
         )
 
     # Test denied access for another user
     with pytest.raises(FunctionJobCollectionsReadApiAccessDeniedError):
-        await functions_rpc.get_function_job_collection(
-            rabbitmq_rpc_client=rpc_client,
+        await webserver_rpc_client.functions.get_function_job_collection(
             function_job_collection_id=registered_collection.uid,
             user_id=user_without_function_api_access_rights["id"],
             product_name=osparc_product_name,
         )
 
     # Test denied access for another product
     with pytest.raises(FunctionJobCollectionsReadApiAccessDeniedError):
-        await functions_rpc.get_function_job_collection(
-            rabbitmq_rpc_client=rpc_client,
+        await webserver_rpc_client.functions.get_function_job_collection(
             function_job_collection_id=registered_collection.uid,
             user_id=other_logged_user["id"],
             product_name="this_is_not_osparc",
         )
 
     # Attempt to delete the function job collection by another user
     with pytest.raises(FunctionJobCollectionWriteAccessDeniedError):
-        await functions_rpc.delete_function_job_collection(
-            rabbitmq_rpc_client=rpc_client,
+        await webserver_rpc_client.functions.delete_function_job_collection(
             function_job_collection_id=registered_collection.uid,
             user_id=other_logged_user["id"],
             product_name=osparc_product_name,
         )
 
-    await functions_rpc.delete_function_job_collection(
-        rabbitmq_rpc_client=rpc_client,
+    await webserver_rpc_client.functions.delete_function_job_collection(
         function_job_collection_id=registered_collection.uid,
         user_id=logged_user["id"],
         product_name=osparc_product_name,
     )
     # Attempt to retrieve the deleted collection
     with pytest.raises(FunctionJobIDNotFoundError):
-        await functions_rpc.get_function_job(
-            rabbitmq_rpc_client=rpc_client,
+        await webserver_rpc_client.functions.get_function_job(
             function_job_id=registered_collection.uid,
             user_id=logged_user["id"],
             product_name=osparc_product_name,
@@ -176,19 +167,20 @@ async def test_list_function_job_collections(
     client: TestClient,
     add_user_function_api_access_rights: None,
     mock_function_factory: Callable[[FunctionClass], Function],
-    rpc_client: RabbitMQRPCClient,
+    webserver_rpc_client: WebServerRpcClient,
     clean_functions: None,
     clean_function_job_collections: None,
     logged_user: UserInfoDict,
     osparc_product_name: ProductName,
 ):
     # List function job collections when none are registered
-    collections, page_meta = await functions_rpc.list_function_job_collections(
-        rabbitmq_rpc_client=rpc_client,
-        pagination_limit=10,
-        pagination_offset=0,
-        user_id=logged_user["id"],
-        product_name=osparc_product_name,
+    collections, page_meta = (
+        await webserver_rpc_client.functions.list_function_job_collections(
+            pagination_limit=10,
+            pagination_offset=0,
+            user_id=logged_user["id"],
+            product_name=osparc_product_name,
+        )
     )
 
     # Assert the list is empty
@@ -198,8 +190,7 @@ async def test_list_function_job_collections(
     assert len(collections) == 0
 
     # Register the function first
-    registered_function = await functions_rpc.register_function(
-        rabbitmq_rpc_client=rpc_client,
+    registered_function = await webserver_rpc_client.functions.register_function(
         function=mock_function_factory(FunctionClass.PROJECT),
         user_id=logged_user["id"],
         product_name=osparc_product_name,
@@ -219,8 +210,7 @@ async def test_list_function_job_collections(
             job_creation_task_id=None,
         )
         # Register the function job
-        registered_job = await functions_rpc.register_function_job(
-            rabbitmq_rpc_client=rpc_client,
+        registered_job = await webserver_rpc_client.functions.register_function_job(
             function_job=registered_function_job,
             user_id=logged_user["id"],
             product_name=osparc_product_name,
@@ -236,8 +226,7 @@ async def test_list_function_job_collections(
 
     # Register the function job collection
     registered_collections = [
-        await functions_rpc.register_function_job_collection(
-            rabbitmq_rpc_client=rpc_client,
+        await webserver_rpc_client.functions.register_function_job_collection(
             function_job_collection=function_job_collection,
             user_id=logged_user["id"],
             product_name=osparc_product_name,
@@ -250,12 +239,13 @@ async def test_list_function_job_collections(
     )
 
     # List function job collections
-    collections, page_params = await functions_rpc.list_function_job_collections(
-        rabbitmq_rpc_client=rpc_client,
-        pagination_limit=2,
-        pagination_offset=1,
-        user_id=logged_user["id"],
-        product_name=osparc_product_name,
+    collections, page_params = (
+        await webserver_rpc_client.functions.list_function_job_collections(
+            pagination_limit=2,
+            pagination_offset=1,
+            user_id=logged_user["id"],
+            product_name=osparc_product_name,
+        )
     )
 
     # Assert the list contains the registered collection
@@ -278,22 +268,20 @@ async def test_list_function_job_collections(
 async def test_list_function_job_collections_filtered_function_id(
     client: TestClient,
     add_user_function_api_access_rights: None,
-    rpc_client: RabbitMQRPCClient,
+    webserver_rpc_client: WebServerRpcClient,
     mock_function_factory: Callable[[FunctionClass], Function],
     clean_functions: None,
     clean_function_job_collections: None,
     logged_user: UserInfoDict,
     osparc_product_name: ProductName,
 ):
     # Register the function first
-    registered_function = await functions_rpc.register_function(
-        rabbitmq_rpc_client=rpc_client,
+    registered_function = await webserver_rpc_client.functions.register_function(
         function=mock_function_factory(FunctionClass.PROJECT),
         user_id=logged_user["id"],
         product_name=osparc_product_name,
     )
-    other_registered_function = await functions_rpc.register_function(
-        rabbitmq_rpc_client=rpc_client,
+    other_registered_function = await webserver_rpc_client.functions.register_function(
         function=mock_function_factory(FunctionClass.PROJECT),
         user_id=logged_user["id"],
         product_name=osparc_product_name,
@@ -318,8 +306,7 @@ async def test_list_function_job_collections_filtered_function_id(
                 job_creation_task_id=None,
             )
             # Register the function job
-            registered_job = await functions_rpc.register_function_job(
-                rabbitmq_rpc_client=rpc_client,
+            registered_job = await webserver_rpc_client.functions.register_function_job(
                 function_job=registered_function_job,
                 user_id=logged_user["id"],
                 product_name=osparc_product_name,
@@ -334,24 +321,26 @@ async def test_list_function_job_collections_filtered_function_id(
         )
 
         # Register the function job collection
-        registered_collection = await functions_rpc.register_function_job_collection(
-            rabbitmq_rpc_client=rpc_client,
-            function_job_collection=function_job_collection,
-            user_id=logged_user["id"],
-            product_name=osparc_product_name,
+        registered_collection = (
+            await webserver_rpc_client.functions.register_function_job_collection(
+                function_job_collection=function_job_collection,
+                user_id=logged_user["id"],
+                product_name=osparc_product_name,
+            )
         )
         registered_collections.append(registered_collection)
 
     # List function job collections with a specific function ID
-    collections, page_meta = await functions_rpc.list_function_job_collections(
-        rabbitmq_rpc_client=rpc_client,
-        pagination_limit=10,
-        pagination_offset=1,
-        filters=FunctionJobCollectionsListFilters(
-            has_function_id=FunctionIDString(registered_function.uid)
-        ),
-        user_id=logged_user["id"],
-        product_name=osparc_product_name,
+    collections, page_meta = (
+        await webserver_rpc_client.functions.list_function_job_collections(
+            pagination_limit=10,
+            pagination_offset=1,
+            filters=FunctionJobCollectionsListFilters(
+                has_function_id=FunctionIDString(registered_function.uid)
+            ),
+            user_id=logged_user["id"],
+            product_name=osparc_product_name,
+        )
     )
 
     # Assert the list contains the registered collection