adding tests to webserver

Author: matusdrobuliak66

packages/models-library/src/models_library/api_schemas_directorv2/comp_runs.py

@@ -4,6 +4,7 @@
 from pydantic import (
     BaseModel,
     BeforeValidator,
+    ConfigDict,
     PositiveInt,
 )
 
@@ -21,6 +22,40 @@ class ComputationRunRpcGet(BaseModel):
     started_at: datetime | None
     ended_at: datetime | None
 
+    model_config = ConfigDict(
+        json_schema_extra={
+            "examples": [
+                {
+                    "project_uuid": "beb16d18-d57d-44aa-a638-9727fa4a72ef",
+                    "iteration": 1,
+                    "state": "SUCCESS",
+                    "info": {
+                        "wallet_id": 9866,
+                        "user_email": "[email protected]",
+                        "wallet_name": "test",
+                        "product_name": "osparc",
+                        "project_name": "test",
+                        "project_metadata": {
+                            "parent_node_id": "12e0c8b2-bad6-40fb-9948-8dec4f65d4d9",
+                            "parent_node_name": "UJyfwFVYySnPCaLuQIaz",
+                            "parent_project_id": "beb16d18-d57d-44aa-a638-9727fa4a72ef",
+                            "parent_project_name": "qTjDmYPxeqAWfCKCQCYF",
+                            "root_parent_node_id": "37176e84-d977-4993-bc49-d76fcfc6e625",
+                            "root_parent_node_name": "UEXExIZVPeFzGRmMglPr",
+                            "root_parent_project_id": "beb16d18-d57d-44aa-a638-9727fa4a72ef",
+                            "root_parent_project_name": "FuDpjjFIyeNTWRUWCuKo",
+                        },
+                        "node_id_names_map": {},
+                        "simcore_user_agent": "agent",
+                    },
+                    "submitted_at": "2023-01-11 13:11:47.293595",
+                    "started_at": "2023-01-11 13:11:47.293595",
+                    "ended_at": "2023-01-11 13:11:47.293595",
+                }
+            ]
+        }
+    )
+
 
 class ComputationRunRpcGetPage(NamedTuple):
     items: list[ComputationRunRpcGet]
@@ -42,6 +77,26 @@ class ComputationTaskRpcGet(BaseModel):
     started_at: datetime | None
     ended_at: datetime | None
 
+    model_config = ConfigDict(
+        json_schema_extra={
+            "examples": [
+                {
+                    "project_uuid": "beb16d18-d57d-44aa-a638-9727fa4a72ef",
+                    "node_id": "12e0c8b2-bad6-40fb-9948-8dec4f65d4d9",
+                    "state": "SUCCESS",
+                    "progress": 0.0,
+                    "image": {
+                        "name": "simcore/services/comp/ti-solutions-optimizer",
+                        "tag": "1.0.19",
+                        "node_requirements": {"CPU": 8.0, "RAM": 25769803776},
+                    },
+                    "started_at": "2023-01-11 13:11:47.293595",
+                    "ended_at": "2023-01-11 13:11:47.293595",
+                }
+            ]
+        }
+    )
+
 
 class ComputationTaskRpcGetPage(NamedTuple):
     items: list[ComputationTaskRpcGet]

services/web/server/src/simcore_service_webserver/director_v2/_computations_rest.py

@@ -3,24 +3,25 @@
 from aiohttp import web
 from models_library.api_schemas_webserver.computations import (
     ComputationRunRestGet,
-    ComputationRunRestGetPage,
     ComputationTaskRestGet,
-    ComputationTaskRestGetPage,
 )
 from models_library.rest_base import RequestParameters
+from models_library.rest_pagination import Page
+from models_library.rest_pagination_utils import paginate_data
 from models_library.users import UserID
 from pydantic import Field
 from servicelib.aiohttp.requests_validation import (
     parse_request_path_parameters_as,
     parse_request_query_parameters_as,
 )
+from servicelib.mimetype_constants import MIMETYPE_APPLICATION_JSON
 from servicelib.request_keys import RQT_USERID_KEY
+from servicelib.rest_constants import RESPONSE_MODEL_POLICY
 
 from .._meta import API_VTAG as VTAG
 from ..constants import RQ_PRODUCT_KEY
 from ..login.decorators import login_required
 from ..security.decorators import permission_required
-from ..utils_aiohttp import envelope_json_response
 from . import _computations_service
 from ._computations_rest_schema import (
     ComputationRunListQueryParams,
@@ -63,12 +64,20 @@ async def list_computations_latest_iteration(request: web.Request) -> web.Respon
         # ordering
         order_by=query_params.order_by,
     )
-    _output = ComputationRunRestGetPage(
-        items=[ComputationRunRestGet(**task.dict()) for task in _get.items],
-        total=_get.total,
-    )
 
-    return envelope_json_response(_output)
+    page = Page[ComputationRunRestGet].model_validate(
+        paginate_data(
+            chunk=[ComputationRunRestGet(**task.dict()) for task in _get.items],
+            total=_get.total,
+            limit=query_params.limit,
+            offset=query_params.offset,
+            request_url=request.url,
+        )
+    )
+    return web.Response(
+        text=page.model_dump_json(**RESPONSE_MODEL_POLICY),
+        content_type=MIMETYPE_APPLICATION_JSON,
+    )
 
 
 @routes.get(
@@ -99,9 +108,17 @@ async def list_computations_latest_iteration_tasks(
         # ordering
         order_by=query_params.order_by,
     )
-    _output = ComputationTaskRestGetPage(
-        items=[ComputationTaskRestGet(**task.dict()) for task in _get.items],
-        total=_get.total,
-    )
 
-    return envelope_json_response(_output)
+    page = Page[ComputationTaskRestGet].model_validate(
+        paginate_data(
+            chunk=[ComputationTaskRestGet(**task.dict()) for task in _get.items],
+            total=_get.total,
+            limit=query_params.limit,
+            offset=query_params.offset,
+            request_url=request.url,
+        )
+    )
+    return web.Response(
+        text=page.model_dump_json(**RESPONSE_MODEL_POLICY),
+        content_type=MIMETYPE_APPLICATION_JSON,
+    )

services/web/server/tests/unit/with_dbs/01/conftest.py

@@ -1,9 +1,14 @@
 # pylint: disable=redefined-outer-name
 # pylint: disable=unused-argument
 # pylint: disable=unused-variable
-
+from collections.abc import AsyncIterator
+from pathlib import Path
 
 import pytest
+from aiohttp.test_utils import TestClient
+from pytest_simcore.helpers.webserver_login import UserInfoDict
+from pytest_simcore.helpers.webserver_projects import NewProject
+from simcore_service_webserver.projects.models import ProjectDict
 
 
 @pytest.fixture
@@ -13,3 +18,23 @@ def app_environment(
     # NOTE: overrides app_environment
     monkeypatch.setenv("WEBSERVER_GARBAGE_COLLECTOR", "null")
     return app_environment | {"WEBSERVER_GARBAGE_COLLECTOR": "null"}
+
+
+@pytest.fixture
+async def user_project(
+    client: TestClient,
+    fake_project: ProjectDict,
+    logged_user: UserInfoDict,
+    tests_data_dir: Path,
+    osparc_product_name: str,
+) -> AsyncIterator[ProjectDict]:
+    async with NewProject(
+        fake_project,
+        client.app,
+        user_id=logged_user["id"],
+        product_name=osparc_product_name,
+        tests_data_dir=tests_data_dir,
+    ) as project:
+        print("-----> added project", project["name"])
+        yield project
+        print("<----- removed project", project["name"])

services/web/server/tests/unit/with_dbs/01/test_director_v2_handlers.py

@@ -6,7 +6,18 @@
 import pytest
 from aiohttp.test_utils import TestClient
 from faker import Faker
+from models_library.api_schemas_directorv2.comp_runs import (
+    ComputationRunRpcGet,
+    ComputationRunRpcGetPage,
+    ComputationTaskRpcGet,
+    ComputationTaskRpcGetPage,
+)
+from models_library.api_schemas_webserver.computations import (
+    ComputationRunRestGet,
+    ComputationTaskRestGet,
+)
 from models_library.projects import ProjectID
+from pytest_mock import MockerFixture
 from pytest_simcore.helpers.assert_checks import assert_status
 from pytest_simcore.helpers.webserver_login import LoggedUser
 from pytest_simcore.helpers.webserver_parametrizations import (
@@ -16,6 +27,7 @@
 from pytest_simcore.services_api_mocks_for_aiohttp_clients import AioResponsesMock
 from servicelib.aiohttp import status
 from simcore_service_webserver.db.models import UserRole
+from simcore_service_webserver.projects.models import ProjectDict
 
 
 @pytest.fixture
@@ -117,3 +129,74 @@ async def test_stop_computation(
             else expected.no_content
         ),
     )
+
+
+@pytest.fixture
+def mock_rpc_list_computations_latest_iteration_tasks(
+    mocker: MockerFixture,
+) -> ComputationRunRpcGetPage:
+    return mocker.patch(
+        "simcore_service_webserver.director_v2._computations_service.computations.list_computations_latest_iteration_page",
+        spec=True,
+        return_value=ComputationRunRpcGetPage(
+            items=[
+                ComputationRunRpcGet.model_validate(
+                    ComputationRunRpcGet.model_config["json_schema_extra"]["examples"][
+                        0
+                    ]
+                )
+            ],
+            total=1,
+        ),
+    )
+
+
+@pytest.fixture
+def mock_rpc_list_computations_latest_iteration_tasks_page(
+    mocker: MockerFixture,
+) -> ComputationTaskRpcGetPage:
+    return mocker.patch(
+        "simcore_service_webserver.director_v2._computations_service.computations.list_computations_latest_iteration_tasks_page",
+        spec=True,
+        return_value=ComputationTaskRpcGetPage(
+            items=[
+                ComputationTaskRpcGet.model_validate(
+                    ComputationTaskRpcGet.model_config["json_schema_extra"]["examples"][
+                        0
+                    ]
+                )
+            ],
+            total=1,
+        ),
+    )
+
+
+@pytest.mark.parametrize(*standard_role_response(), ids=str)
+async def test_list_computations_latest_iteration(
+    director_v2_service_mock: AioResponsesMock,
+    user_project: ProjectDict,
+    client: TestClient,
+    logged_user: LoggedUser,
+    user_role: UserRole,
+    expected: ExpectedResponse,
+    mock_rpc_list_computations_latest_iteration_tasks: None,
+    mock_rpc_list_computations_latest_iteration_tasks_page: None,
+):
+    assert client.app
+    url = client.app.router["list_computations_latest_iteration"].url_for()
+    resp = await client.get(f"{url}")
+    data, _ = await assert_status(
+        resp, status.HTTP_200_OK if user_role == UserRole.GUEST else expected.ok
+    )
+    if user_role != UserRole.ANONYMOUS:
+        assert ComputationRunRestGet.model_validate(data[0])
+
+    url = client.app.router["list_computations_latest_iteration_tasks"].url_for(
+        project_id=f"{user_project['uuid']}"
+    )
+    resp = await client.get(f"{url}")
+    data, _ = await assert_status(
+        resp, status.HTTP_200_OK if user_role == UserRole.GUEST else expected.ok
+    )
+    if user_role != UserRole.ANONYMOUS:
+        assert ComputationTaskRestGet.model_validate(data[0])