add test of task function itself

Author: bisgaard-itis

services/api-server/src/simcore_service_api_server/celery/worker_tasks/functions_tasks.py

@@ -8,7 +8,6 @@
 from ...api.dependencies.authentication import Identity
 from ...api.dependencies.rabbitmq import get_rabbitmq_rpc_client
 from ...api.dependencies.services import (
-    get_api_client,
     get_catalog_service,
     get_directorv2_service,
     get_function_job_service,
@@ -42,9 +41,9 @@ async def _assemble_function_job_service(*, app: FastAPI, user_identity: Identit
         app=app, session_cookies=session_cookie, identity=user_identity
     )
     web_api_rpc_client = await get_wb_api_rpc_client(app=app)
-    director2_api = get_api_client(DirectorV2Api)
+    director2_api = DirectorV2Api.get_instance(app=app)
     assert isinstance(director2_api, DirectorV2Api)  # nosec
-    storage_api = get_api_client(StorageApi)
+    storage_api = StorageApi.get_instance(app=app)
     assert isinstance(storage_api, StorageApi)  # nosec
     catalog_service = get_catalog_service(
         rpc_client=rpc_client,

services/api-server/src/simcore_service_api_server/models/api_resources.py

@@ -4,7 +4,7 @@
 from uuid import UUID
 
 import parse  # type: ignore[import-untyped]
-from pydantic import AfterValidator, BaseModel, Field, HttpUrl, TypeAdapter
+from pydantic import AfterValidator, BaseModel, ConfigDict, Field, HttpUrl, TypeAdapter
 from pydantic.types import StringConstraints
 
 # RESOURCE NAMES https://google.aip.dev/122
@@ -103,6 +103,18 @@ def _url_missing_only_job_id(url: str | None) -> str | None:
 
 
 class JobLinks(BaseModel):
+    model_config = ConfigDict(
+        json_schema_extra={
+            "examples": [
+                {
+                    "url_template": "https://api.osparc.io/v0/jobs/{job_id}",
+                    "runner_url_template": "https://runner.osparc.io/dashboard",
+                    "outputs_url_template": "https://api.osparc.io/v0/jobs/{job_id}/outputs",
+                }
+            ]
+        }
+    )
+
     url_template: Annotated[str | None, AfterValidator(_url_missing_only_job_id)]
     runner_url_template: str | None
     outputs_url_template: Annotated[

services/api-server/tests/unit/api_functions/test_api_routers_functions.py

@@ -14,7 +14,9 @@
 import httpx
 import pytest
 import respx
+from celery import Task
 from faker import Faker
+from fastapi import FastAPI
 from httpx import AsyncClient
 from models_library.api_schemas_long_running_tasks.tasks import TaskGet
 from models_library.functions import (
@@ -25,21 +27,30 @@
     RegisteredFunctionJob,
     RegisteredFunctionJobCollection,
     RegisteredProjectFunction,
+    RegisteredProjectFunctionJob,
 )
 from models_library.functions_errors import (
     FunctionIDNotFoundError,
     FunctionReadAccessDeniedError,
 )
 from models_library.rest_pagination import PageMetaInfoLimitOffset
 from models_library.users import UserID
+from pydantic import EmailStr
 from pytest_mock import MockerFixture, MockType
 from pytest_simcore.helpers.httpx_calls_capture_models import HttpApiCallCaptureModel
 from servicelib.aiohttp import status
+from servicelib.celery.app_server import BaseAppServer
+from servicelib.celery.models import TaskID
 from servicelib.common_headers import (
     X_SIMCORE_PARENT_NODE_ID,
     X_SIMCORE_PARENT_PROJECT_UUID,
 )
+from servicelib.rabbitmq._client_rpc import RabbitMQRPCClient
 from simcore_service_api_server._meta import API_VTAG
+from simcore_service_api_server.api.dependencies.authentication import Identity
+from simcore_service_api_server.celery.worker_tasks import functions_tasks
+from simcore_service_api_server.models.api_resources import JobLinks
+from simcore_service_api_server.services_rpc.wb_api_server import WbApiRpcClient
 
 _faker = Faker()
 
@@ -379,6 +390,103 @@ async def async_magic():
         )
 
 
+@pytest.mark.parametrize("capture", ["run_study_function_parent_info.json"])
+async def test_run_project_function(
+    mocker: MockerFixture,
+    mocked_webserver_rpc_api: dict[str, MockType],
+    app: FastAPI,
+    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_identity: Identity,
+    user_email: EmailStr,
+    job_links: JobLinks,
+    mocked_webserver_rest_api_base: respx.MockRouter,
+    mocked_directorv2_rest_api_base: respx.MockRouter,
+    create_respx_mock_from_capture,
+    project_tests_dir: Path,
+    capture: str,
+) -> None:
+
+    def _get_app_server(celery_app: Any) -> FastAPI:
+        app_server = mocker.Mock(spec=BaseAppServer)
+        app_server.app = app
+        return app_server
+
+    mocker.patch.object(functions_tasks, "get_app_server", _get_app_server)
+
+    def _get_rabbitmq_rpc_client(app: FastAPI) -> RabbitMQRPCClient:
+        return mocker.MagicMock(spec=RabbitMQRPCClient)
+
+    mocker.patch.object(
+        functions_tasks, "get_rabbitmq_rpc_client", _get_rabbitmq_rpc_client
+    )
+
+    async def _get_wb_api_rpc_client(app: FastAPI) -> WbApiRpcClient:
+        wb_api_rpc_client = WbApiRpcClient(
+            _client=mocker.MagicMock(spec=RabbitMQRPCClient)
+        )
+        return wb_api_rpc_client
+
+    mocker.patch.object(
+        functions_tasks, "get_wb_api_rpc_client", _get_wb_api_rpc_client
+    )
+
+    def _default_side_effect(
+        request: httpx.Request,
+        path_params: dict[str, Any],
+        capture: HttpApiCallCaptureModel,
+    ) -> Any:
+        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_identity.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_identity.user_id,
+            execute_functions=True,
+            write_functions=True,
+            read_functions=True,
+        ),
+    )
+
+    job = await functions_tasks.run_function(
+        task=MagicMock(spec=Task),
+        task_id=TaskID(_faker.uuid4()),
+        user_identity=user_identity,
+        function=mock_registered_project_function,
+        function_inputs={},
+        pricing_spec=None,
+        job_links=job_links,
+        x_simcore_parent_project_uuid=None,
+        x_simcore_parent_node_id=None,
+    )
+    assert isinstance(job, RegisteredProjectFunctionJob)
+
+
 @pytest.mark.parametrize(
     "parent_project_uuid, parent_node_uuid, expected_status_code",
     [

services/api-server/tests/unit/conftest.py

@@ -57,8 +57,10 @@
 from pytest_simcore.simcore_webserver_projects_rest_api import GET_PROJECT
 from requests.auth import HTTPBasicAuth
 from respx import MockRouter
+from simcore_service_api_server.api.dependencies.authentication import Identity
 from simcore_service_api_server.core.application import create_app
 from simcore_service_api_server.core.settings import ApplicationSettings
+from simcore_service_api_server.models.api_resources import JobLinks
 from simcore_service_api_server.repository.api_keys import UserAndProductTuple
 from simcore_service_api_server.services_http.solver_job_outputs import ResultsTypes
 from simcore_service_api_server.services_rpc.wb_api_server import WbApiRpcClient
@@ -69,6 +71,19 @@ def product_name() -> ProductName:
     return "osparc"
 
 
+@pytest.fixture
+def user_identity(
+    user_id: UserID,
+    user_email: EmailStr,
+    product_name: ProductName,
+) -> Identity:
+    return Identity(
+        user_id=user_id,
+        product_name=product_name,
+        email=user_email,
+    )
+
+
 @pytest.fixture
 def app_environment(
     monkeypatch: pytest.MonkeyPatch,
@@ -549,6 +564,15 @@ def project_job_rpc_get() -> ProjectJobRpcGet:
     return ProjectJobRpcGet.model_validate(example)
 
 
+@pytest.fixture
+def job_links() -> JobLinks:
+    extra = JobLinks.model_config.get("json_schema_extra")
+    assert isinstance(extra, dict)
+    examples = extra.get("examples")
+    assert isinstance(examples, list) and len(examples) > 0
+    return JobLinks.model_validate(examples[0])
+
+
 @pytest.fixture
 def mocked_webserver_rpc_api(
     mocked_app_dependencies: None,