✨ [Projects] Enhance project job models and RPCs to include workbench structure

Author: pcrespov

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

@@ -3,7 +3,10 @@
 from models_library.products import ProductName
 from models_library.projects import ProjectID
 from models_library.rest_pagination import PageLimitInt, PageOffsetInt
-from models_library.rpc.webserver.projects import PageRpcProjectRpcGet, ProjectRpcGet
+from models_library.rpc.webserver.projects import (
+    PageRpcProjectJobRpcGet,
+    ProjectJobRpcGet,
+)
 from models_library.users import UserID
 from pydantic import ValidationError, validate_call
 from servicelib.rabbitmq import RPCRouter
@@ -64,7 +67,7 @@ async def list_projects_marked_as_jobs(
     limit: PageLimitInt,
     # filters
     job_parent_resource_name_filter: str | None,
-) -> PageRpcProjectRpcGet:
+) -> PageRpcProjectJobRpcGet:
 
     total, projects = await _jobs_service.list_my_projects_marked_as_jobs(
         app,
@@ -76,17 +79,19 @@ async def list_projects_marked_as_jobs(
     )
 
     job_projects = [
-        ProjectRpcGet(
+        ProjectJobRpcGet(
             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,
+            job_parent_resource_name=project.job_parent_resource_name,
         )
         for project in projects
     ]
 
-    page: PageRpcProjectRpcGet = PageRpcProjectRpcGet.create(
+    page: PageRpcProjectJobRpcGet = PageRpcProjectJobRpcGet.create(
         job_projects,
         total=total,
         limit=limit,

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

@@ -113,6 +113,7 @@ async def list_projects_marked_as_jobs(
         list_query = (
             sa.select(
                 *_PROJECT_DB_COLS,
+                projects.c.workbench,
                 base_query.c.job_parent_resource_name,
             )
             .select_from(

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

@@ -8,7 +8,7 @@
 from models_library.api_schemas_webserver.projects_ui import StudyUI
 from models_library.folders import FolderID
 from models_library.groups import GroupID
-from models_library.projects import ClassifierID, ProjectID
+from models_library.projects import ClassifierID, NodesDict, ProjectID
 from models_library.users import UserID
 from models_library.utils.common_validators import (
     empty_str_to_none_pre_validator,
@@ -72,6 +72,8 @@ class ProjectDBGet(BaseModel):
 
 
 class ProjectJobDBGet(ProjectDBGet):
+    workbench: NodesDict
+
     job_parent_resource_name: str
 
 

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

@@ -81,6 +81,7 @@ async def test_user_can_see_marked_project(
     client: TestClient,
     osparc_product_name: ProductName,
     project_job_fixture: ProjectJobFixture,
+    user_project: ProjectDict,
 ):
     assert client.app
     total_count, result = await list_my_projects_marked_as_jobs(
@@ -97,6 +98,34 @@ async def test_user_can_see_marked_project(
         project.job_parent_resource_name == project_job_fixture.job_parent_resource_name
     )
 
+    # Verify workbench structure is maintained
+    assert project.workbench is not None
+    assert isinstance(project.workbench, dict)
+
+    # Compare with original user_project
+    assert len(project.workbench) == len(user_project["workbench"])
+
+    # Check that all node IDs from original project are present
+    for node_id in user_project["workbench"]:
+        assert node_id in project.workbench
+
+        # Check some properties of the nodes
+        original_node = user_project["workbench"][node_id]
+        project_node = project.workbench[node_id]
+
+        assert project_node.key == original_node["key"]
+        assert project_node.version == original_node["version"]
+        assert project_node.label == original_node["label"]
+
+        # Check inputs/outputs if they exist
+        if "inputs" in original_node:
+            assert project_node.inputs is not None
+            assert len(project_node.inputs) == len(original_node["inputs"])
+
+        if "outputs" in original_node:
+            assert project_node.outputs is not None
+            assert len(project_node.outputs) == len(original_node["outputs"])
+
 
 async def test_other_user_cannot_see_marked_project(
     client: TestClient,

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

@@ -12,7 +12,10 @@
 from common_library.users_enums import UserRole
 from models_library.products import ProductName
 from models_library.projects import ProjectID
-from models_library.rpc.webserver.projects import PageRpcProjectRpcGet, ProjectRpcGet
+from models_library.rpc.webserver.projects import (
+    PageRpcProjectJobRpcGet,
+    ProjectJobRpcGet,
+)
 from pydantic import ValidationError
 from pytest_simcore.helpers.monkeypatch_envs import setenvs_from_dict
 from pytest_simcore.helpers.typing_env import EnvVarsDict
@@ -107,7 +110,7 @@ async def test_rpc_client_list_my_projects_marked_as_jobs(
     )
 
     # List projects marked as jobs
-    page: PageRpcProjectRpcGet = await projects_rpc.list_projects_marked_as_jobs(
+    page: PageRpcProjectJobRpcGet = await projects_rpc.list_projects_marked_as_jobs(
         rpc_client=rpc_client,
         product_name=product_name,
         user_id=user_id,
@@ -116,8 +119,9 @@ 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], ProjectRpcGet)
+    assert isinstance(page.data[0], ProjectJobRpcGet)
     assert page.data[0].uuid == project_uuid
+    assert len(page.data[0].workbench) == len(user_project["workbench"])
 
 
 @pytest.fixture