adding final tests

Author: matusdrobuliak66

packages/models-library/src/models_library/api_schemas_webserver/computations.py

@@ -164,6 +164,10 @@ class ComputationTaskRestGet(OutputSchema):
 class ComputationCollectionRunListQueryParams(
     PageQueryParameters,
 ):
+    filter_only_running: bool = Field(
+        default=False,
+        description="If true, only running collection runs are returned",
+    )
     filter_by_root_project_id: ProjectID | None = Field(
         default=None,
     )

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

@@ -8,9 +8,10 @@
 
 
 class CompRunCollectionDBGet(BaseModel):
-    collection_id: CollectionRunID
-    client_generated_id: str
-    client_generated_display_name: str
+    collection_run_id: CollectionRunID
+    client_or_system_generated_id: str
+    client_or_system_generated_display_name: str
+    generated_by_system: bool
     created: datetime
 
     model_config = ConfigDict(from_attributes=True)

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

@@ -42,10 +42,10 @@ async def get_comp_run_collection_or_none_by_id(
     """Get a computational run collection by collection_run_id."""
     result = await conn.execute(
         comp_run_collections.select().where(
-            comp_run_collections.c.collection_run_id == collection_run_id
+            comp_run_collections.c.collection_run_id == f"{collection_run_id}"
         )
     )
-    row = await result.one_or_none()
+    row = await result.first()
     if row is None:
         return None
     return CompRunCollectionDBGet.model_validate(row)

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

@@ -376,8 +376,8 @@ async def list_computation_collection_runs(
             started_at=item.started_at,
             ended_at=item.ended_at,
             name=(
-                run_collection.client_generated_display_name
-                if run_collection
+                run_collection.client_or_system_generated_display_name
+                if run_collection and run_collection.generated_by_system is False
                 else project_root_name
             ),
         )

services/web/server/src/simcore_service_webserver/director_v2/_controller/computations_rest.py

@@ -205,15 +205,16 @@ async def list_computations_latest_iteration_tasks(
 @permission_required("services.pipeline.*")
 @permission_required("project.read")
 async def list_computation_collection_runs(request: web.Request) -> web.Response:
-    # Add: Filter by root project ID
-
     req_ctx = ComputationsRequestContext.model_validate(request)
     query_params: ComputationCollectionRunListQueryParams = (
         parse_request_query_parameters_as(
             ComputationCollectionRunListQueryParams, request
         )
     )
 
+    if query_params.filter_only_running is True:
+        raise NotImplementedError
+
     total, items = await _computations_service.list_computation_collection_runs(
         request.app,
         product_name=req_ctx.product_name,
@@ -247,15 +248,13 @@ async def list_computation_collection_runs(request: web.Request) -> web.Response
 
 
 @routes.get(
-    f"/{VTAG}/computation-collection-runs/{{collection_run_id}}/tasks",  #: Who should be the owner of computation_collection_id ?
+    f"/{VTAG}/computation-collection-runs/{{collection_run_id}}/tasks",
     name="list_computation_collection_run_tasks",
 )
 @login_required
 @permission_required("services.pipeline.*")
 @permission_required("project.read")
 async def list_computation_collection_run_tasks(request: web.Request) -> web.Response:
-    # Add: Filter by root project ID
-
     req_ctx = ComputationsRequestContext.model_validate(request)
     path_params = parse_request_path_parameters_as(
         ComputationCollectionRunPathParams, request

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

@@ -4,15 +4,22 @@
 
 
 import pytest
+import sqlalchemy as sa
 from aiohttp.test_utils import TestClient
 from faker import Faker
 from models_library.api_schemas_directorv2.comp_runs import (
+    ComputationCollectionRunRpcGet,
+    ComputationCollectionRunRpcGetPage,
+    ComputationCollectionRunTaskRpcGet,
+    ComputationCollectionRunTaskRpcGetPage,
     ComputationRunRpcGet,
     ComputationRunRpcGetPage,
     ComputationTaskRpcGet,
     ComputationTaskRpcGetPage,
 )
 from models_library.api_schemas_webserver.computations import (
+    ComputationCollectionRunRestGet,
+    ComputationCollectionRunTaskRestGet,
     ComputationRunRestGet,
     ComputationTaskRestGet,
 )
@@ -26,6 +33,8 @@
 )
 from pytest_simcore.services_api_mocks_for_aiohttp_clients import AioResponsesMock
 from servicelib.aiohttp import status
+from simcore_postgres_database.models.comp_run_collections import comp_run_collections
+from simcore_postgres_database.models.projects_metadata import projects_metadata
 from simcore_service_webserver.db.models import UserRole
 from simcore_service_webserver.projects.models import ProjectDict
 
@@ -287,3 +296,190 @@ async def test_list_computations_latest_iteration(
     )
     if user_role != UserRole.ANONYMOUS:
         assert ComputationTaskRestGet.model_validate(data[0])
+
+
+### NEW:
+
+
+@pytest.fixture
+def mock_rpc_list_computation_collection_runs_page(
+    mocker: MockerFixture,
+    user_project: ProjectDict,
+) -> ComputationCollectionRunRpcGetPage:
+    project_uuid = user_project["uuid"]
+    example = ComputationCollectionRunRpcGet.model_config["json_schema_extra"][
+        "examples"
+    ][0]
+    example["project_ids"] = [project_uuid]
+    example["info"]["project_metadata"]["root_parent_project_id"] = project_uuid
+
+    return mocker.patch(
+        "simcore_service_webserver.director_v2._computations_service.computations.list_computation_collection_runs_page",
+        spec=True,
+        return_value=ComputationCollectionRunRpcGetPage(
+            items=[ComputationCollectionRunRpcGet.model_validate(example)],
+            total=1,
+        ),
+    )
+
+
+@pytest.fixture
+def mock_rpc_list_computation_collection_run_tasks_page(
+    mocker: MockerFixture,
+    user_project: ProjectDict,
+) -> str:
+    project_uuid = user_project["uuid"]
+    workbench_ids = list(user_project["workbench"].keys())
+    example = ComputationCollectionRunTaskRpcGet.model_config["json_schema_extra"][
+        "examples"
+    ][0]
+    example["node_id"] = workbench_ids[0]
+    example["project_uuid"] = project_uuid
+
+    mocker.patch(
+        "simcore_service_webserver.director_v2._computations_service.computations.list_computation_collection_run_tasks_page",
+        spec=True,
+        return_value=ComputationCollectionRunTaskRpcGetPage(
+            items=[ComputationCollectionRunTaskRpcGet.model_validate(example)],
+            total=1,
+        ),
+    )
+
+    return workbench_ids[0]
+
+
+@pytest.mark.parametrize(*standard_role_response(), ids=str)
+async def test_list_computation_collection_runs_and_tasks(
+    director_v2_service_mock: AioResponsesMock,
+    user_project: ProjectDict,
+    client: TestClient,
+    logged_user: LoggedUser,
+    user_role: UserRole,
+    expected: ExpectedResponse,
+    mock_rpc_list_computation_collection_runs_page: None,
+    mock_rpc_list_computation_collection_run_tasks_page: str,
+    faker: Faker,
+):
+    assert client.app
+    url = client.app.router["list_computation_collection_runs"].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 ComputationCollectionRunRestGet.model_validate(data[0])
+        assert data[0]["name"] == user_project["name"]
+
+    url = client.app.router["list_computation_collection_run_tasks"].url_for(
+        collection_run_id=faker.uuid4()
+    )
+    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 ComputationCollectionRunTaskRestGet.model_validate(data[0])
+        assert len(data) == 1
+        assert (
+            data[0]["name"]
+            == user_project["workbench"][
+                mock_rpc_list_computation_collection_run_tasks_page
+            ]["label"]
+        )
+
+
+@pytest.fixture
+async def populated_comp_run_collection(
+    client: TestClient,
+    postgres_db: sa.engine.Engine,
+):
+    assert client.app
+    example = ComputationCollectionRunRpcGet.model_config["json_schema_extra"][
+        "examples"
+    ][0]
+    collection_run_id = example["collection_run_id"]
+
+    with postgres_db.connect() as con:
+        con.execute(
+            comp_run_collections.insert()
+            .values(
+                collection_run_id=collection_run_id,
+                client_or_system_generated_id=collection_run_id,
+                client_or_system_generated_display_name="My Collection Run",
+                generated_by_system=False,
+                created=sa.func.now(),
+                modified=sa.func.now(),
+            )
+            .returning(comp_run_collections.c.collection_run_id)
+        )
+        yield
+        con.execute(comp_run_collections.delete())
+
+
+@pytest.mark.parametrize(*standard_role_response(), ids=str)
+async def test_list_computation_collection_runs_with_client_defined_name(
+    director_v2_service_mock: AioResponsesMock,
+    user_project: ProjectDict,
+    client: TestClient,
+    logged_user: LoggedUser,
+    user_role: UserRole,
+    expected: ExpectedResponse,
+    populated_comp_run_collection: None,
+    mock_rpc_list_computation_collection_runs_page: None,
+):
+    assert client.app
+    url = client.app.router["list_computation_collection_runs"].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 ComputationCollectionRunRestGet.model_validate(data[0])
+        assert data[0]["name"] == "My Collection Run"
+
+
+@pytest.fixture
+async def populated_project_metadata(
+    client: TestClient,
+    logged_user: LoggedUser,
+    user_project: ProjectDict,
+    postgres_db: sa.engine.Engine,
+):
+    assert client.app
+    project_uuid = user_project["uuid"]
+    with postgres_db.connect() as con:
+        con.execute(
+            projects_metadata.insert().values(
+                **{
+                    "project_uuid": project_uuid,
+                    "custom": {"job_name": "My Job Name"},
+                }
+            )
+        )
+        yield
+        con.execute(projects_metadata.delete())
+
+
+@pytest.mark.parametrize(*standard_role_response(), ids=str)
+async def test_list_computation_collection_runs_and_tasks_with_different_names(
+    director_v2_service_mock: AioResponsesMock,
+    user_project: ProjectDict,
+    client: TestClient,
+    logged_user: LoggedUser,
+    user_role: UserRole,
+    expected: ExpectedResponse,
+    populated_project_metadata: None,
+    mock_rpc_list_computation_collection_run_tasks_page: str,
+    faker: Faker,
+):
+    assert client.app
+    url = client.app.router["list_computation_collection_run_tasks"].url_for(
+        collection_run_id=faker.uuid4()
+    )
+    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 ComputationCollectionRunTaskRestGet.model_validate(data[0])
+        assert data[0]["name"] == "My Job Name"