fixes tests

Author: pcrespov

packages/models-library/src/models_library/projects_nodes.py

@@ -272,19 +272,19 @@ def _convert_empty_str_to_none(cls, v):
             return None
         return v
 
-    @classmethod
-    def _convert_old_enum_name(cls, v) -> RunningState:
-        if v == "FAILURE":
-            return RunningState.FAILED
-        return RunningState(v)
-
     @field_validator("state", mode="before")
     @classmethod
     def _convert_from_enum(cls, v):
         if isinstance(v, str):
+
+            def _convert_old_enum_name(v) -> RunningState:
+                if v == "FAILURE":
+                    return RunningState.FAILED
+                return RunningState(v)
+
             # the old version of state was a enum of RunningState
-            running_state_value = cls._convert_old_enum_name(v)
-            return NodeState(currentStatus=running_state_value)
+            running_state_value = _convert_old_enum_name(v)
+            return NodeState.model_validate({"currentStatus": running_state_value})
         return v
 
     @staticmethod

packages/models-library/src/models_library/rpc/webserver/projects.py

@@ -29,8 +29,8 @@ class ProjectJobRpcGet(BaseModel):
     workbench: NodesDict
 
     # timestamps
-    creation_date: datetime
-    last_change_date: datetime
+    creation_at: datetime
+    modified_at: datetime
 
     # Specific to jobs
     job_parent_resource_name: str

packages/pytest-simcore/src/pytest_simcore/helpers/catalog_rpc_server.py

@@ -25,15 +25,17 @@
 )
 from models_library.services_types import ServiceKey, ServiceVersion
 from models_library.users import UserID
-from pydantic import NonNegativeInt, TypeAdapter
+from pydantic import NonNegativeInt, TypeAdapter, validate_call
+from pytest_mock import MockType
 from servicelib.rabbitmq._client_rpc import RabbitMQRPCClient
 
 
 class CatalogRpcSideEffects:
     # pylint: disable=no-self-use
+    @validate_call(config={"arbitrary_types_allowed": True})
     async def list_services_paginated(
         self,
-        rpc_client: RabbitMQRPCClient,
+        rpc_client: RabbitMQRPCClient | MockType,
         *,
         product_name: ProductName,
         user_id: UserID,
@@ -58,9 +60,10 @@ async def list_services_paginated(
             offset=offset,
         )
 
+    @validate_call(config={"arbitrary_types_allowed": True})
     async def get_service(
         self,
-        rpc_client: RabbitMQRPCClient,
+        rpc_client: RabbitMQRPCClient | MockType,
         *,
         product_name: ProductName,
         user_id: UserID,
@@ -87,9 +90,10 @@ async def get_service(
 
         return got
 
+    @validate_call(config={"arbitrary_types_allowed": True})
     async def update_service(
         self,
-        rpc_client: RabbitMQRPCClient,
+        rpc_client: RabbitMQRPCClient | MockType,
         *,
         product_name: ProductName,
         user_id: UserID,
@@ -108,9 +112,10 @@ async def update_service(
         got.key = service_key
         return got.model_copy(update=update.model_dump(exclude_unset=True))
 
+    @validate_call(config={"arbitrary_types_allowed": True})
     async def list_my_service_history_paginated(
         self,
-        rpc_client: RabbitMQRPCClient,
+        rpc_client: RabbitMQRPCClient | MockType,
         *,
         product_name: ProductName,
         user_id: UserID,
@@ -138,9 +143,10 @@ async def list_my_service_history_paginated(
             offset=offset,
         )
 
+    @validate_call(config={"arbitrary_types_allowed": True})
     async def get_service_ports(
         self,
-        rpc_client: RabbitMQRPCClient,
+        rpc_client: RabbitMQRPCClient | MockType,
         *,
         product_name: ProductName,
         user_id: UserID,

packages/pytest-simcore/src/pytest_simcore/helpers/webserver_rpc_server.py

@@ -7,8 +7,16 @@
 
 from models_library.products import ProductName
 from models_library.projects import ProjectID
+from models_library.rest_pagination import PageOffsetInt
+from models_library.rpc.webserver.projects import PageRpcProjectJobRpcGet
+from models_library.rpc_pagination import (
+    DEFAULT_NUMBER_OF_ITEMS_PER_PAGE,
+    PageLimitInt,
+)
 from models_library.users import UserID
 from pydantic import TypeAdapter, validate_call
+from pytest_mock import MockType
+from servicelib.rabbitmq import RabbitMQRPCClient
 from servicelib.rabbitmq._client_rpc import RabbitMQRPCClient
 
 
@@ -18,7 +26,7 @@ class WebserverRpcSideEffects:
     @validate_call(config={"arbitrary_types_allowed": True})
     async def mark_project_as_job(
         self,
-        rpc_client: RabbitMQRPCClient,
+        rpc_client: RabbitMQRPCClient | MockType,
         *,
         product_name: ProductName,
         user_id: UserID,
@@ -35,3 +43,32 @@ async def mark_project_as_job(
         assert user_id
 
         TypeAdapter(ProjectID).validate_python(project_uuid)
+
+    @validate_call(config={"arbitrary_types_allowed": True})
+    async def list_projects_marked_as_jobs(
+        self,
+        rpc_client: RabbitMQRPCClient | MockType,
+        *,
+        product_name: ProductName,
+        user_id: UserID,
+        # pagination
+        offset: PageOffsetInt = 0,
+        limit: PageLimitInt = DEFAULT_NUMBER_OF_ITEMS_PER_PAGE,
+        # filters
+        job_parent_resource_name_filter: str | None = None,
+    ) -> PageRpcProjectJobRpcGet:
+        assert rpc_client
+        assert product_name
+        assert user_id
+
+        if job_parent_resource_name_filter:
+            assert not job_parent_resource_name_filter.startswith("/")
+
+        items = PageRpcProjectJobRpcGet.model_json_schema()["examples"]
+
+        return PageRpcProjectJobRpcGet.create(
+            items[offset, : offset + limit],
+            total=len(items),
+            limit=limit,
+            offset=offset,
+        )

services/web/server/src/simcore_service_webserver/projects/_controller/projects_rpc.py

@@ -83,9 +83,9 @@ async def list_projects_marked_as_jobs(
             uuid=project.uuid,
             name=project.name,
             description=project.description,
-            workbench={},  # FIXME: this should be extracted
-            creation_date=project.creation_date,
-            last_change_date=project.last_change_date,
+            workbench=project.workbench,
+            creation_at=project.creation_date,
+            modified_at=project.last_change_date,
             job_parent_resource_name=project.job_parent_resource_name,
         )
         for project in projects

services/web/server/src/simcore_service_webserver/projects/_projects_service.py

@@ -1025,7 +1025,7 @@ async def update_project_node_state(
         project_id=project_id,
         node_id=node_id,
         partial_node=PartialNode.model_construct(
-            state=NodeState(currentStatus=RunningState(new_state))
+            state=NodeState(currentStatus=RunningState(new_state))  # type: ignore[call-arg]
         ),
     )
 

services/web/server/tests/unit/with_dbs/02/test_projects_rpc.py

@@ -120,8 +120,13 @@ async def test_rpc_client_list_my_projects_marked_as_jobs(
     assert page.meta.total == 1
     assert page.meta.offset == 0
     assert isinstance(page.data[0], ProjectJobRpcGet)
-    assert page.data[0].uuid == project_uuid
-    assert len(page.data[0].workbench) == len(user_project["workbench"])
+
+    project_job = page.data[0]
+    assert project_job.uuid == project_uuid
+    assert project_job.name == user_project["name"]
+    assert project_job.description == user_project["description"]
+
+    assert set(project_job.workbench.keys()) == set(user_project["workbench"].keys())
 
 
 @pytest.fixture