add test for full round trip of running function

Author: bisgaard-itis

services/api-server/tests/unit/celery/conftest.py renamed to services/api-server/tests/unit/api_functions/celery/conftest.py

@@ -1,7 +1,11 @@
 import inspect
 from collections.abc import Callable
+from pathlib import Path
+from typing import Any
 
+import httpx
 import pytest
+import respx
 from celery import Celery, Task
 from celery.contrib.testing.worker import TestWorkController
 from celery_library.task import register_task
@@ -20,11 +24,17 @@
     FunctionID,
     FunctionInputs,
     FunctionJobID,
+    FunctionUserAccessRights,
+    FunctionUserApiAccessRights,
     RegisteredFunction,
+    RegisteredFunctionJob,
     RegisteredProjectFunction,
     RegisteredProjectFunctionJob,
 )
 from models_library.projects import ProjectID
+from models_library.users import UserID
+from pytest_mock import MockType
+from pytest_simcore.helpers.httpx_calls_capture_models import HttpApiCallCaptureModel
 from servicelib.celery.models import TaskFilter, TaskID, TaskMetadata, TasksQueue
 from servicelib.common_headers import (
     X_SIMCORE_PARENT_NODE_ID,
@@ -221,3 +231,101 @@ async def test_celery_error_propagation(
         await poll_task_until_done(client, auth, f"{task_uuid}")
 
     assert exc_info.value.response.status_code == status.HTTP_500_INTERNAL_SERVER_ERROR
+
+
+@pytest.mark.parametrize(
+    "parent_project_uuid, parent_node_uuid, expected_status_code",
+    [
+        (None, None, status.HTTP_422_UNPROCESSABLE_ENTITY),
+        (f"{_faker.uuid4()}", None, status.HTTP_422_UNPROCESSABLE_ENTITY),
+        (None, f"{_faker.uuid4()}", status.HTTP_422_UNPROCESSABLE_ENTITY),
+        (f"{_faker.uuid4()}", f"{_faker.uuid4()}", status.HTTP_200_OK),
+        ("null", "null", status.HTTP_200_OK),
+    ],
+)
+@pytest.mark.parametrize("capture", ["run_study_function_parent_info.json"])
+@pytest.mark.parametrize("mocked_app_dependencies", [None])
+async def test_run_project_function_parent_info(
+    app: FastAPI,
+    with_api_server_celery_worker: TestWorkController,
+    client: AsyncClient,
+    mock_handler_in_functions_rpc_interface: Callable[[str, Any], None],
+    mock_registered_project_function: RegisteredProjectFunction,
+    mock_registered_project_function_job: RegisteredFunctionJob,
+    auth: httpx.BasicAuth,
+    user_id: UserID,
+    mocked_webserver_rest_api_base: respx.MockRouter,
+    mocked_directorv2_rest_api_base: respx.MockRouter,
+    mocked_webserver_rpc_api: dict[str, MockType],
+    create_respx_mock_from_capture,
+    project_tests_dir: Path,
+    parent_project_uuid: str | None,
+    parent_node_uuid: str | None,
+    expected_status_code: int,
+    capture: str,
+) -> None:
+    def _default_side_effect(
+        request: httpx.Request,
+        path_params: dict[str, Any],
+        capture: HttpApiCallCaptureModel,
+    ) -> Any:
+        if request.method == "POST" and request.url.path.endswith("/projects"):
+            if parent_project_uuid and parent_project_uuid != "null":
+                _parent_uuid = request.headers.get(X_SIMCORE_PARENT_PROJECT_UUID)
+                assert _parent_uuid is not None
+                assert parent_project_uuid == _parent_uuid
+            if parent_node_uuid and parent_node_uuid != "null":
+                _parent_node_uuid = request.headers.get(X_SIMCORE_PARENT_NODE_ID)
+                assert _parent_node_uuid is not None
+                assert parent_node_uuid == _parent_node_uuid
+        return capture.response_body
+
+    create_respx_mock_from_capture(
+        respx_mocks=[mocked_webserver_rest_api_base, mocked_directorv2_rest_api_base],
+        capture_path=project_tests_dir / "mocks" / capture,
+        side_effects_callbacks=[_default_side_effect] * 50,
+    )
+
+    mock_handler_in_functions_rpc_interface(
+        "get_function_user_permissions",
+        FunctionUserAccessRights(
+            user_id=user_id,
+            execute=True,
+            read=True,
+            write=True,
+        ),
+    )
+    mock_handler_in_functions_rpc_interface(
+        "get_function", mock_registered_project_function
+    )
+    mock_handler_in_functions_rpc_interface("find_cached_function_jobs", [])
+    mock_handler_in_functions_rpc_interface(
+        "register_function_job", mock_registered_project_function_job
+    )
+    mock_handler_in_functions_rpc_interface(
+        "get_functions_user_api_access_rights",
+        FunctionUserApiAccessRights(
+            user_id=user_id,
+            execute_functions=True,
+            write_functions=True,
+            read_functions=True,
+        ),
+    )
+
+    headers = {}
+    if parent_project_uuid:
+        headers[X_SIMCORE_PARENT_PROJECT_UUID] = parent_project_uuid
+    if parent_node_uuid:
+        headers[X_SIMCORE_PARENT_NODE_ID] = parent_node_uuid
+
+    response = await client.post(
+        f"{API_VTAG}/functions/{mock_registered_project_function.uid}:run",
+        json={},
+        auth=auth,
+        headers=headers,
+    )
+    assert response.status_code == expected_status_code
+    if response.status_code == status.HTTP_200_OK:
+        task = TaskGet.model_validate(response.json())
+        result = await poll_task_until_done(client, auth, task.task_id)
+        RegisteredProjectFunctionJob.model_validate(result.result)

services/api-server/tests/unit/celery/test_functions.py renamed to services/api-server/tests/unit/api_functions/celery/test_functions.py

@@ -487,97 +487,6 @@ def _default_side_effect(
     assert isinstance(job, RegisteredProjectFunctionJob)
 
 
-@pytest.mark.parametrize(
-    "parent_project_uuid, parent_node_uuid, expected_status_code",
-    [
-        (None, None, status.HTTP_422_UNPROCESSABLE_ENTITY),
-        (f"{_faker.uuid4()}", None, status.HTTP_422_UNPROCESSABLE_ENTITY),
-        (None, f"{_faker.uuid4()}", status.HTTP_422_UNPROCESSABLE_ENTITY),
-        (f"{_faker.uuid4()}", f"{_faker.uuid4()}", status.HTTP_200_OK),
-        ("null", "null", status.HTTP_200_OK),
-    ],
-)
-@pytest.mark.parametrize("capture", ["run_study_function_parent_info.json"])
-async def test_run_project_function_parent_info(
-    client: AsyncClient,
-    mock_handler_in_functions_rpc_interface: Callable[[str, Any], None],
-    mock_registered_project_function: RegisteredProjectFunction,
-    mock_registered_project_function_job: RegisteredFunctionJob,
-    auth: httpx.BasicAuth,
-    user_id: UserID,
-    mocked_webserver_rest_api_base: respx.MockRouter,
-    mocked_directorv2_rest_api_base: respx.MockRouter,
-    mocked_webserver_rpc_api: dict[str, MockType],
-    create_respx_mock_from_capture,
-    project_tests_dir: Path,
-    parent_project_uuid: str | None,
-    parent_node_uuid: str | None,
-    expected_status_code: int,
-    capture: str,
-) -> None:
-    def _default_side_effect(
-        request: httpx.Request,
-        path_params: dict[str, Any],
-        capture: HttpApiCallCaptureModel,
-    ) -> Any:
-        if request.method == "POST" and request.url.path.endswith("/projects"):
-            if parent_project_uuid and parent_project_uuid != "null":
-                _parent_uuid = request.headers.get(X_SIMCORE_PARENT_PROJECT_UUID)
-                assert _parent_uuid is not None
-                assert parent_project_uuid == _parent_uuid
-            if parent_node_uuid and parent_node_uuid != "null":
-                _parent_node_uuid = request.headers.get(X_SIMCORE_PARENT_NODE_ID)
-                assert _parent_node_uuid is not None
-                assert parent_node_uuid == _parent_node_uuid
-        return capture.response_body
-
-    create_respx_mock_from_capture(
-        respx_mocks=[mocked_webserver_rest_api_base, mocked_directorv2_rest_api_base],
-        capture_path=project_tests_dir / "mocks" / capture,
-        side_effects_callbacks=[_default_side_effect] * 50,
-    )
-
-    mock_handler_in_functions_rpc_interface(
-        "get_function_user_permissions",
-        FunctionUserAccessRights(
-            user_id=user_id,
-            execute=True,
-            read=True,
-            write=True,
-        ),
-    )
-    mock_handler_in_functions_rpc_interface(
-        "get_function", mock_registered_project_function
-    )
-    mock_handler_in_functions_rpc_interface("find_cached_function_jobs", [])
-    mock_handler_in_functions_rpc_interface(
-        "register_function_job", mock_registered_project_function_job
-    )
-    mock_handler_in_functions_rpc_interface(
-        "get_functions_user_api_access_rights",
-        FunctionUserApiAccessRights(
-            user_id=user_id,
-            execute_functions=True,
-            write_functions=True,
-            read_functions=True,
-        ),
-    )
-
-    headers = {}
-    if parent_project_uuid:
-        headers[X_SIMCORE_PARENT_PROJECT_UUID] = parent_project_uuid
-    if parent_node_uuid:
-        headers[X_SIMCORE_PARENT_NODE_ID] = parent_node_uuid
-
-    response = await client.post(
-        f"{API_VTAG}/functions/{mock_registered_project_function.uid}:run",
-        json={},
-        auth=auth,
-        headers=headers,
-    )
-    assert response.status_code == expected_status_code
-
-
 @pytest.mark.parametrize(
     "parent_project_uuid, parent_node_uuid, expected_status_code",
     [