fix: use workbench subquery

Author: giancarloromeo

packages/postgres-database/src/simcore_postgres_database/utils_projects_nodes.py

@@ -4,14 +4,15 @@
 from typing import Annotated, Any
 
 import asyncpg.exceptions  # type: ignore[import-untyped]
-import sqlalchemy
+import sqlalchemy as sa
 import sqlalchemy.exc
 from common_library.async_tools import maybe_await
 from common_library.basic_types import DEFAULT_FACTORY
 from common_library.errors_classes import OsparcErrorMixin
 from pydantic import BaseModel, ConfigDict, Field
 from simcore_postgres_database.utils_aiosqlalchemy import map_db_exception
 from sqlalchemy.dialects.postgresql import insert as pg_insert
+from sqlalchemy.sql.selectable import Subquery
 
 from ._protocols import DBConnection
 from .aiopg_errors import ForeignKeyViolation, UniqueViolation
@@ -81,6 +82,53 @@ class ProjectNode(ProjectNodeCreate):
     model_config = ConfigDict(from_attributes=True)
 
 
+def make_workbench_subquery() -> Subquery:
+    return (
+        sa.select(
+            projects_nodes.c.project_uuid,
+            sa.func.json_object_agg(
+                projects_nodes.c.node_id,
+                sa.func.json_build_object(
+                    "key",
+                    projects_nodes.c.key,
+                    "version",
+                    projects_nodes.c.version,
+                    "label",
+                    projects_nodes.c.label,
+                    "progress",
+                    projects_nodes.c.progress,
+                    "thumbnail",
+                    projects_nodes.c.thumbnail,
+                    "inputAccess",
+                    projects_nodes.c.input_access,
+                    "inputNodes",
+                    projects_nodes.c.input_nodes,
+                    "inputs",
+                    projects_nodes.c.inputs,
+                    "inputsRequired",
+                    projects_nodes.c.inputs_required,
+                    "inputsUnits",
+                    projects_nodes.c.inputs_units,
+                    "outputNodes",
+                    projects_nodes.c.output_nodes,
+                    "outputs",
+                    projects_nodes.c.outputs,
+                    "runHash",
+                    projects_nodes.c.run_hash,
+                    "state",
+                    projects_nodes.c.state,
+                    "parent",
+                    projects_nodes.c.parent,
+                    "bootOptions",
+                    projects_nodes.c.boot_options,
+                ),
+            ).label("workbench"),
+        )
+        .group_by(projects_nodes.c.project_uuid)
+        .subquery()
+    )
+
+
 @dataclass(frozen=True, kw_only=True)
 class ProjectNodesRepo:
     project_uuid: uuid.UUID

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

@@ -30,7 +30,7 @@
 from ..resource_manager.registry import get_registry
 from ..resource_manager.service import list_opened_project_ids
 from ..socketio._utils import get_socket_server
-from . import _projects_nodes_repository, _projects_repository
+from . import _projects_repository
 
 _logger = logging.getLogger(__name__)
 
@@ -64,13 +64,9 @@ async def _create_project_document_and_increment_version() -> (
         - the project document and its version must be kept in sync
         """
         # Get the full project with workbench for document creation
-        project = await _projects_repository.get_project(
+        project = await _projects_repository.get_project_with_workbench(
             app=app, project_uuid=project_uuid
         )
-        project_nodes = await _projects_nodes_repository.get_by_project(
-            app=app, project_id=project_uuid
-        )
-        workbench = {f"{node_id}": node for node_id, node in project_nodes}
 
         # Create project document
         project_document = ProjectDocument(
@@ -83,7 +79,7 @@ async def _create_project_document_and_increment_version() -> (
             classifiers=project.classifiers,
             dev=project.dev,
             quality=project.quality,
-            workbench=workbench,
+            workbench=project.workbench,
             ui=project.ui,
             type=cast(ProjectTypeAPI, project.type),
             template_type=cast(ProjectTemplateType, project.template_type),

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

@@ -15,6 +15,7 @@
 from pydantic import NonNegativeInt, PositiveInt
 from simcore_postgres_database.models.projects import projects
 from simcore_postgres_database.models.users import users
+from simcore_postgres_database.utils_projects_nodes import make_workbench_subquery
 from simcore_postgres_database.utils_repos import (
     get_columns_from_db_model,
     pass_or_acquire_connection,
@@ -122,7 +123,12 @@ async def get_project_with_workbench(
     project_uuid: ProjectID,
 ) -> ProjectWithWorkbenchDBGet:
     async with pass_or_acquire_connection(get_asyncpg_engine(app), connection) as conn:
-        query = sql.select(*PROJECT_DB_COLS).where(projects.c.uuid == f"{project_uuid}")
+        query = sql.select(
+            *PROJECT_DB_COLS,
+            sa.func.coalesce(
+                make_workbench_subquery().c.workbench, sa.text("'{}'::json")
+            ).label("workbench"),
+        ).where(projects.c.uuid == f"{project_uuid}")
         result = await conn.execute(query)
         row = result.one_or_none()
         if row is None: