adding tests

Author: matusdrobuliak66

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

@@ -1,8 +1,9 @@
 from datetime import datetime
-from typing import Any, NamedTuple
+from typing import Annotated, Any, NamedTuple
 
 from pydantic import (
     BaseModel,
+    BeforeValidator,
     PositiveInt,
 )
 
@@ -26,11 +27,17 @@ class ComputationRunRpcGetPage(NamedTuple):
     total: PositiveInt
 
 
+def _none_to_zero_float_pre_validator(value: Any):
+    if value is None:
+        return 0.0
+    return value
+
+
 class ComputationTaskRpcGet(BaseModel):
     project_uuid: ProjectID
     node_id: NodeID
     state: RunningState
-    progress: float
+    progress: Annotated[float, BeforeValidator(_none_to_zero_float_pre_validator)]
     image: dict[str, Any]
     started_at: datetime | None
     ended_at: datetime | None

services/director-v2/src/simcore_service_director_v2/modules/db/repositories/comp_tasks/_core.py

@@ -92,7 +92,7 @@ async def list_computational_tasks_for_frontend_client(
 
         base_select_query = (
             sa.select(
-                comp_tasks.c.project_id,
+                comp_tasks.c.project_id.label("project_uuid"),
                 comp_tasks.c.node_id,
                 comp_tasks.c.state,
                 comp_tasks.c.progress,

services/director-v2/tests/unit/with_dbs/comp_scheduler/test_api_rpc_computations.py

@@ -7,10 +7,15 @@
 # pylint: disable=too-many-positional-arguments
 
 from collections.abc import Awaitable, Callable
+from datetime import datetime, timezone
 from typing import Any
 
-from models_library.api_schemas_directorv2.comp_runs import ComputationRunRpcGetPage
+from models_library.api_schemas_directorv2.comp_runs import (
+    ComputationRunRpcGetPage,
+    ComputationTaskRpcGetPage,
+)
 from models_library.projects import ProjectAtDB
+from models_library.projects_state import RunningState
 from servicelib.rabbitmq import RabbitMQRPCClient
 from servicelib.rabbitmq.rpc_interfaces.director_v2 import (
     computations as rpc_computations,
@@ -48,16 +53,14 @@
 #     monkeypatch.setenv("S3_BUCKET_NAME", faker.pystr())
 
 
-async def test_get_computation_from_published_computation_task(
-    # minimal_configuration: None,
+async def test_rpc_list_computation_runs_and_tasks(
     fake_workbench_without_outputs: dict[str, Any],
     fake_workbench_adjacency: dict[str, Any],
     registered_user: Callable[..., dict[str, Any]],
     project: Callable[..., Awaitable[ProjectAtDB]],
     create_pipeline: Callable[..., Awaitable[CompPipelineAtDB]],
     create_tasks: Callable[..., Awaitable[list[CompTaskAtDB]]],
     create_comp_run: Callable[..., Awaitable[CompRunsAtDB]],
-    # async_client: httpx.AsyncClient,
     rpc_client: RabbitMQRPCClient,
 ):
     user = registered_user()
@@ -67,10 +70,10 @@ async def test_get_computation_from_published_computation_task(
         dag_adjacency_list=fake_workbench_adjacency,
     )
     comp_tasks = await create_tasks(
-        user=user, project=proj, state=StateType.PUBLISHED, progress=0
+        user=user, project=proj, state=StateType.PUBLISHED, progress=None
     )
     comp_runs = await create_comp_run(
-        user=user, project=proj, result=StateType.PUBLISHED
+        user=user, project=proj, result=RunningState.PUBLISHED
     )
     assert comp_runs
 
@@ -79,14 +82,46 @@ async def test_get_computation_from_published_computation_task(
     )
     assert output.total == 1
     assert isinstance(output, ComputationRunRpcGetPage)
+    assert output.items[0].iteration == 1
 
-    # get_computation_url = httpx.URL(
-    #     f"/v2/computations/{proj.uuid}?user_id={user['id']}"
-    # )
-    # response = await async_client.get(get_computation_url)
-    # assert response.status_code == status.HTTP_200_OK, response.text
-    # returned_computation = ComputationGet.model_validate(response.json())
-    # assert returned_computation
-    # expected_stop_url = async_client.base_url.join(
-    #     f"/v2/computations/{proj.uuid}:stop?user_id={user['id']}"
-    # )
+    comp_runs_2 = await create_comp_run(
+        user=user,
+        project=proj,
+        result=RunningState.PENDING,
+        started=datetime.now(tz=timezone.utc),
+        iteration=2,
+    )
+    output = await rpc_computations.list_computations_latest_iteration_page(
+        rpc_client, product_name="osparc", user_id=user["id"]
+    )
+    assert output.total == 1
+    assert isinstance(output, ComputationRunRpcGetPage)
+    assert output.items[0].iteration == 2
+    assert output.items[0].started_at is not None
+    assert output.items[0].ended_at is None
+
+    comp_runs_3 = await create_comp_run(
+        user=user,
+        project=proj,
+        result=RunningState.SUCCESS,
+        started=datetime.now(tz=timezone.utc),
+        ended=datetime.now(tz=timezone.utc),
+        iteration=3,
+    )
+    output = await rpc_computations.list_computations_latest_iteration_page(
+        rpc_client, product_name="osparc", user_id=user["id"]
+    )
+    assert output.total == 1
+    assert isinstance(output, ComputationRunRpcGetPage)
+    assert output.items[0].iteration == 3
+    assert output.items[0].ended_at is not None
+
+    # Tasks
+
+    output = await rpc_computations.list_computations_latest_iteration_tasks_page(
+        rpc_client, product_name="osparc", user_id=user["id"], project_id=proj.uuid
+    )
+    assert output
+    assert output.total == 4
+    assert isinstance(output, ComputationTaskRpcGetPage)
+    assert len(output.items) == 4

services/director-v2/tests/unit/with_dbs/conftest.py

@@ -18,6 +18,7 @@
 from fastapi.encoders import jsonable_encoder
 from models_library.projects import ProjectAtDB, ProjectID
 from models_library.projects_nodes_io import NodeID
+from models_library.projects_state import RunningState
 from pydantic.main import BaseModel
 from simcore_postgres_database.models.comp_pipeline import StateType, comp_pipeline
 from simcore_postgres_database.models.comp_runs import comp_runs
@@ -193,7 +194,7 @@ async def _(
             "project_uuid": f"{project.uuid}",
             "user_id": user["id"],
             "iteration": 1,
-            "result": StateType.NOT_STARTED,
+            "result": RunningState.NOT_STARTED,
             "metadata": jsonable_encoder(run_metadata),
             "use_on_demand_clusters": False,
         }
@@ -247,7 +248,7 @@ async def _() -> PublishedProject:
 
 @pytest.fixture
 async def published_project(
-    publish_project: Callable[[], Awaitable[PublishedProject]]
+    publish_project: Callable[[], Awaitable[PublishedProject]],
 ) -> PublishedProject:
     return await publish_project()