fix workbench access

Author: giancarloromeo

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

@@ -165,7 +165,7 @@ class Node(BaseModel):
     ] = DEFAULT_FACTORY
 
     inputs_required: Annotated[
-        list[InputID],
+        list[InputID] | None,
         Field(
             default_factory=list,
             description="Defines inputs that are required in order to run the service",

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

@@ -82,9 +82,7 @@ async def create_project(
                 required_resources=ServiceResourcesDictHelpers.model_config[
                     "json_schema_extra"
                 ]["examples"][0],
-                key=node_info.get("key"),
-                version=node_info.get("version"),
-                label=node_info.get("label"),
+                **node_info,
             )
             for node_id, node_info in project_data.get("workbench", {}).items()
         },

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

@@ -112,6 +112,45 @@
 # NOTE: https://github.com/ITISFoundation/osparc-simcore/issues/3516
 
 
+def _make_workbench_subquery():
+    return (
+        sa.select(
+            projects_nodes.c.project_uuid,
+            sa.func.jsonb_object_agg(
+                projects_nodes.c.node_id,
+                sa.func.jsonb_build_object(
+                    "key",
+                    projects_nodes.c.key,
+                    "version",
+                    projects_nodes.c.version,
+                    "label",
+                    projects_nodes.c.label,
+                    "input_access",
+                    projects_nodes.c.input_access,
+                    "input_nodes",
+                    projects_nodes.c.input_nodes,
+                    "inputs",
+                    projects_nodes.c.inputs,
+                    "inputs_required",
+                    projects_nodes.c.inputs_required,
+                    "output_nodes",
+                    projects_nodes.c.output_nodes,
+                    "outputs",
+                    projects_nodes.c.outputs,
+                    "run_hash",
+                    projects_nodes.c.run_hash,
+                    "state",
+                    projects_nodes.c.state,
+                    "parent",
+                    projects_nodes.c.parent,
+                    "boot_options",
+                    projects_nodes.c.boot_options,
+                ),
+            ).label("workbench"),
+        ).group_by(projects_nodes.c.project_uuid)
+    ).subquery("workbench_subquery")
+
+
 class ProjectDBAPI(BaseProjectDB):
     def __init__(self, app: web.Application) -> None:
         self._app = app
@@ -167,6 +206,7 @@ def _reraise_if_not_unique_uuid_error(err: UniqueViolation):
                         project_index = None
                         project_uuid = ProjectID(f"{insert_values['uuid']}")
 
+                        workbench = insert_values.pop("workbench")
                         try:
                             result: ResultProxy = await conn.execute(
                                 projects.insert()
@@ -183,6 +223,7 @@ def _reraise_if_not_unique_uuid_error(err: UniqueViolation):
                             assert row  # nosec
 
                             selected_values = ProjectDict(row.items())
+                            selected_values["workbench"] = workbench
                             project_index = selected_values.pop("id")
 
                         except UniqueViolation as err:
@@ -222,9 +263,7 @@ def _reraise_if_not_unique_uuid_error(err: UniqueViolation):
                                     NodeID(node_id): ProjectNodeCreate(
                                         node_id=NodeID(node_id),
                                         required_resources={},
-                                        key=node_info.get("key"),
-                                        version=node_info.get("version"),
-                                        label=node_info.get("label"),
+                                        **node_info,
                                     )
                                     for node_id, node_info in selected_values[
                                         "workbench"
@@ -237,9 +276,7 @@ def _reraise_if_not_unique_uuid_error(err: UniqueViolation):
                                     ProjectNodeCreate(
                                         node_id=NodeID(node_id),
                                         required_resources={},
-                                        key=node_info.get("key"),
-                                        version=node_info.get("version"),
-                                        label=node_info.get("label"),
+                                        **node_info,
                                     ),
                                 )
                                 for node_id, node_info in selected_values[
@@ -390,7 +427,7 @@ def _create_private_workspace_query(
             private_workspace_query = (
                 sa.select(
                     *PROJECT_DB_COLS,
-                    projects.c.workbench,
+                    _make_workbench_subquery().c.workbench,
                     access_rights_subquery.c.access_rights,
                     projects_to_products.c.product_name,
                     projects_to_folders.c.folder_id,
@@ -472,7 +509,7 @@ def _create_shared_workspace_query(
             shared_workspace_query = (
                 sa.select(
                     *PROJECT_DB_COLS,
-                    projects.c.workbench,
+                    _make_workbench_subquery().c.workbench,
                     workspace_access_rights_subquery.c.access_rights,
                     projects_to_products.c.product_name,
                     projects_to_folders.c.folder_id,
@@ -770,7 +807,7 @@ async def get_project_db(self, project_uuid: ProjectID) -> ProjectDB:
             result = await conn.execute(
                 sa.select(
                     *PROJECT_DB_COLS,
-                    projects.c.workbench,
+                    # projects.c.workbench, TODO GCR
                 ).where(projects.c.uuid == f"{project_uuid}")
             )
             row = await result.fetchone()