fix workbench reference

Author: giancarloromeo

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

@@ -16,6 +16,7 @@
 from models_library.utils.change_case import camel_to_snake, snake_to_camel
 from pydantic import ValidationError
 from simcore_postgres_database.models.project_to_groups import project_to_groups
+from simcore_postgres_database.models.projects_nodes import projects_nodes
 from simcore_postgres_database.models.projects_to_products import projects_to_products
 from simcore_postgres_database.webserver_models import ProjectType, projects
 from sqlalchemy.dialects.postgresql import insert as pg_insert
@@ -110,6 +111,45 @@ def assemble_array_groups(user_groups: list[RowProxy]) -> str:
     )
 
 
+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 BaseProjectDB:
     @classmethod
     async def _get_everyone_group(cls, conn: SAConnection) -> RowProxy:
@@ -278,7 +318,7 @@ async def _get_project(
         query = (
             sa.select(
                 *PROJECT_DB_COLS,
-                projects.c.workbench,
+                _make_workbench_subquery().c.workbench,
                 users.c.primary_gid.label("trashed_by_primary_gid"),
                 access_rights_subquery.c.access_rights,
             )

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

@@ -206,7 +206,11 @@ def _reraise_if_not_unique_uuid_error(err: UniqueViolation):
                         project_index = None
                         project_uuid = ProjectID(f"{insert_values['uuid']}")
 
-                        workbench = insert_values.pop("workbench")
+                        workbench = (
+                            insert_values.pop("workbench")
+                            if "workbench" in insert_values
+                            else None
+                        )
                         try:
                             result: ResultProxy = await conn.execute(
                                 projects.insert()
@@ -223,7 +227,8 @@ def _reraise_if_not_unique_uuid_error(err: UniqueViolation):
                             assert row  # nosec
 
                             selected_values = ProjectDict(row.items())
-                            selected_values["workbench"] = workbench
+                            if workbench:
+                                selected_values["workbench"] = workbench
                             project_index = selected_values.pop("id")
 
                         except UniqueViolation as err:
@@ -254,7 +259,7 @@ def _reraise_if_not_unique_uuid_error(err: UniqueViolation):
                         selected_values["tags"] = project_tag_ids
 
                         # NOTE: this will at some point completely replace workbench in the DB
-                        if selected_values["workbench"]:
+                        if workbench:
                             project_nodes_repo = ProjectNodesRepo(
                                 project_uuid=project_uuid
                             )
@@ -265,9 +270,7 @@ def _reraise_if_not_unique_uuid_error(err: UniqueViolation):
                                         required_resources={},
                                         **node_info,
                                     )
-                                    for node_id, node_info in selected_values[
-                                        "workbench"
-                                    ].items()
+                                    for node_id, node_info in workbench.items()
                                 }
 
                             nodes = [

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

@@ -555,8 +555,9 @@ def _check_required_input(required_input_key: KeyIDStr) -> None:
         if output_entry is None:
             unset_outputs_in_upstream.append((source_output_key, source_node.label))
 
-    for required_input in node.inputs_required:
-        _check_required_input(required_input)
+    if node.inputs_required:
+        for required_input in node.inputs_required:
+            _check_required_input(required_input)
 
     node_with_required_inputs = node.label
     if unset_required_inputs: