Refactor WbApiRpcClient setup and update test fixtures

- Moved the creation of WbApiRpcClient to a separate function `_create_obj` for better modularity.
- Updated the `setup` function to utilize the new `_create_obj` function.
- Renamed mock variables in tests from `mock_*` to `fake_*` for clarity and consistency.
- Adjusted test cases to use the new naming convention and updated references to the mock objects accordingly.
- Simplified the mock setup for WbApiRpcClient in `conftest.py` to directly use the new setup method.

Author: pcrespov

services/api-server/src/simcore_service_api_server/services_rpc/wb_api_server.py

@@ -661,14 +661,18 @@ async def get_functions_user_api_access_rights(
         )
 
 
-def setup(app: FastAPI, rabbitmq_rpc_client: RabbitMQRPCClient):
+def _create_obj(app: FastAPI, rabbitmq_rpc_client: RabbitMQRPCClient):
     webserver_settings: WebServerSettings = app.state.settings.API_SERVER_WEBSERVER
     if not webserver_settings:
         raise ConfigurationError(tip="Webserver settings are not configured")
 
-    wb_api_rpc_client = WbApiRpcClient(
+    return WbApiRpcClient(
         _rpc_client=WebServerRpcClient(
             rabbitmq_rpc_client, webserver_settings.WEBSERVER_RPC_NAMESPACE
         ),
     )
+
+
+def setup(app: FastAPI, rabbitmq_rpc_client: RabbitMQRPCClient):
+    wb_api_rpc_client = _create_obj(app, rabbitmq_rpc_client)
     wb_api_rpc_client.set_to_app_state(app=app)

services/api-server/tests/unit/api_functions/celery/test_functions_celery.py

@@ -168,8 +168,8 @@ async def test_with_fake_run_function(
     mock_handler_in_functions_rpc_interface: Callable[
         [str, Any, Exception | None, Callable | None], None
     ],
-    mock_registered_project_function: RegisteredProjectFunction,
-    mock_registered_project_function_job: RegisteredFunctionJob,
+    fake_registered_project_function: RegisteredProjectFunction,
+    fake_registered_project_function_job: RegisteredFunctionJob,
     user_id: UserID,
 ):
 
@@ -214,11 +214,11 @@ async def test_with_fake_run_function(
         None,
     )
     mock_handler_in_functions_rpc_interface(
-        "get_function", mock_registered_project_function, None, None
+        "get_function", fake_registered_project_function, None, None
     )
     mock_handler_in_functions_rpc_interface("find_cached_function_jobs", [], None, None)
     mock_handler_in_functions_rpc_interface(
-        "register_function_job", mock_registered_project_function_job, None, None
+        "register_function_job", fake_registered_project_function_job, None, None
     )
 
     mock_handler_in_functions_rpc_interface(
@@ -227,7 +227,7 @@ async def test_with_fake_run_function(
         None,
         partial(
             _patch_registered_function_job_side_effect,
-            mock_registered_project_function_job,
+            fake_registered_project_function_job,
         ),
     )
 
@@ -319,8 +319,8 @@ async def test_run_project_function_parent_info(
     mock_handler_in_functions_rpc_interface: Callable[
         [str, Any, Exception | None, Callable | None], None
     ],
-    mock_registered_project_function: RegisteredProjectFunction,
-    mock_registered_project_function_job: RegisteredFunctionJob,
+    fake_registered_project_function: RegisteredProjectFunction,
+    fake_registered_project_function_job: RegisteredFunctionJob,
     auth: httpx.BasicAuth,
     user_id: UserID,
     mocked_webserver_rest_api_base: respx.MockRouter,
@@ -367,11 +367,11 @@ def _default_side_effect(
         None,
     )
     mock_handler_in_functions_rpc_interface(
-        "get_function", mock_registered_project_function, None, None
+        "get_function", fake_registered_project_function, None, None
     )
     mock_handler_in_functions_rpc_interface("find_cached_function_jobs", [], None, None)
     mock_handler_in_functions_rpc_interface(
-        "register_function_job", mock_registered_project_function_job, None, None
+        "register_function_job", fake_registered_project_function_job, None, None
     )
     mock_handler_in_functions_rpc_interface(
         "get_functions_user_api_access_rights",
@@ -390,7 +390,7 @@ def _default_side_effect(
         None,
         partial(
             _patch_registered_function_job_side_effect,
-            mock_registered_project_function_job,
+            fake_registered_project_function_job,
         ),
     )
 
@@ -401,7 +401,7 @@ def _default_side_effect(
         headers[X_SIMCORE_PARENT_NODE_ID] = parent_node_uuid
 
     response = await client.post(
-        f"{API_VTAG}/functions/{mock_registered_project_function.uid}:run",
+        f"{API_VTAG}/functions/{fake_registered_project_function.uid}:run",
         json={},
         auth=auth,
         headers=headers,
@@ -435,8 +435,8 @@ async def test_map_function_parent_info(
     mock_handler_in_functions_rpc_interface: Callable[
         [str, Any, Exception | None, Callable | None], MockType
     ],
-    mock_registered_project_function: RegisteredProjectFunction,
-    mock_registered_project_function_job: RegisteredFunctionJob,
+    fake_registered_project_function: RegisteredProjectFunction,
+    fake_registered_project_function_job: RegisteredFunctionJob,
     auth: httpx.BasicAuth,
     user_id: UserID,
     mocked_webserver_rest_api_base: respx.MockRouter,
@@ -488,11 +488,11 @@ def _default_side_effect(
         None,
     )
     mock_handler_in_functions_rpc_interface(
-        "get_function", mock_registered_project_function, None, None
+        "get_function", fake_registered_project_function, None, None
     )
     mock_handler_in_functions_rpc_interface("find_cached_function_jobs", [], None, None)
     mock_handler_in_functions_rpc_interface(
-        "register_function_job", mock_registered_project_function_job, None, None
+        "register_function_job", fake_registered_project_function_job, None, None
     )
     mock_handler_in_functions_rpc_interface(
         "get_functions_user_api_access_rights",
@@ -524,7 +524,7 @@ def _default_side_effect(
         None,
         partial(
             _patch_registered_function_job_side_effect,
-            mock_registered_project_function_job,
+            fake_registered_project_function_job,
         ),
     )
 
@@ -535,7 +535,7 @@ def _default_side_effect(
         headers[X_SIMCORE_PARENT_NODE_ID] = parent_node_uuid
 
     response = await client.post(
-        f"{API_VTAG}/functions/{mock_registered_project_function.uid}:map",
+        f"{API_VTAG}/functions/{fake_registered_project_function.uid}:map",
         json=[{}, {}],
         auth=auth,
         headers=headers,
@@ -559,8 +559,8 @@ async def test_map_function(
     mock_handler_in_functions_rpc_interface: Callable[
         [str, Any, Exception | None, Callable | None], MockType
     ],
-    mock_registered_project_function: RegisteredProjectFunction,
-    mock_registered_project_function_job: RegisteredFunctionJob,
+    fake_registered_project_function: RegisteredProjectFunction,
+    fake_registered_project_function_job: RegisteredFunctionJob,
     auth: httpx.BasicAuth,
     user_id: UserID,
     mocked_webserver_rest_api_base: respx.MockRouter,
@@ -598,7 +598,7 @@ def _default_side_effect(
         None,
     )
     mock_handler_in_functions_rpc_interface(
-        "get_function", mock_registered_project_function, None, None
+        "get_function", fake_registered_project_function, None, None
     )
     mock_handler_in_functions_rpc_interface("find_cached_function_jobs", [], None, None)
 
@@ -609,7 +609,7 @@ async def _register_function_job_side_effect(
     ):
         uid = FunctionJobID(_faker.uuid4())
         generated_function_job_ids.append(uid)
-        return mock_registered_project_function_job.model_copy(update={"uid": uid})
+        return fake_registered_project_function_job.model_copy(update={"uid": uid})
 
     mock_handler_in_functions_rpc_interface(
         "register_function_job",
@@ -652,14 +652,14 @@ async def _register_function_job_collection_side_effect(*args, **kwargs):
         None,
         partial(
             _patch_registered_function_job_side_effect,
-            mock_registered_project_function_job,
+            fake_registered_project_function_job,
         ),
     )
 
     # act
     _inputs = [{}, {}]
     response = await client.post(
-        f"{API_VTAG}/functions/{mock_registered_project_function.uid}:map",
+        f"{API_VTAG}/functions/{fake_registered_project_function.uid}:map",
         json=_inputs,
         auth=auth,
         headers={