fix: projects states handlers

Author: giancarloromeo

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_repository
+from . import _projects_nodes_repository, _projects_repository
 
 _logger = logging.getLogger(__name__)
 
@@ -64,26 +64,29 @@ 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_with_workbench = await _projects_repository.get_project_with_workbench(
+        project = await _projects_repository.get_project(
             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(
-            uuid=project_with_workbench.uuid,
-            workspace_id=project_with_workbench.workspace_id,
-            name=project_with_workbench.name,
-            description=project_with_workbench.description,
-            thumbnail=project_with_workbench.thumbnail,
-            last_change_date=project_with_workbench.last_change_date,
-            classifiers=project_with_workbench.classifiers,
-            dev=project_with_workbench.dev,
-            quality=project_with_workbench.quality,
-            workbench=project_with_workbench.workbench,
-            ui=project_with_workbench.ui,
-            type=cast(ProjectTypeAPI, project_with_workbench.type),
-            template_type=cast(
-                ProjectTemplateType, project_with_workbench.template_type
-            ),
+            uuid=project.uuid,
+            workspace_id=project.workspace_id,
+            name=project.name,
+            description=project.description,
+            thumbnail=project.thumbnail,
+            last_change_date=project.last_change_date,
+            classifiers=project.classifiers,
+            dev=project.dev,
+            quality=project.quality,
+            workbench=workbench,
+            ui=project.ui,
+            type=cast(ProjectTypeAPI, project.type),
+            template_type=cast(ProjectTemplateType, project.template_type),
         )
         # Increment document version
         redis_client_sdk = get_redis_document_manager_client_sdk(app)

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

@@ -122,9 +122,7 @@ 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, projects.c.workbench).where(
-            projects.c.uuid == f"{project_uuid}"
-        )
+        query = sql.select(*PROJECT_DB_COLS).where(projects.c.uuid == f"{project_uuid}")
         result = await conn.execute(query)
         row = result.one_or_none()
         if row is None:

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

@@ -177,7 +177,7 @@ def _reraise_if_not_unique_uuid_error(err: UniqueViolation):
                 with attempt:
                     async with conn.begin():
                         project_index = None
-                        project_uuid = ProjectID(f"{insert_values['uuid']}")
+                        project_uuid = ProjectID(insert_values["uuid"])
 
                         try:
                             result: ResultProxy = await conn.execute(
@@ -296,12 +296,22 @@ async def insert_project(
 
         # must be valid uuid
         try:
-            ProjectID(str(insert_values.get("uuid")))
+            ProjectID(f"{insert_values.get('uuid')}")
         except ValueError:
             if force_project_uuid:
                 raise
             insert_values["uuid"] = f"{uuid1()}"
 
+        # extract workbench nodes
+        workbench: dict[str, Any] = insert_values.pop("workbench", {})
+        project_nodes = project_nodes or {}
+        project_nodes |= {
+            NodeID(node_id): ProjectNodeCreate(
+                node_id=NodeID(node_id), **project_workbench_node
+            )
+            for node_id, project_workbench_node in workbench.items()
+        }
+
         inserted_project = await self._insert_project_in_db(
             insert_values,
             force_project_uuid=force_project_uuid,
@@ -310,6 +320,8 @@ async def insert_project(
             project_nodes=project_nodes,
         )
 
+        inserted_project["workbench"] = workbench
+
         async with self.engine.acquire() as conn:
             # Returns created project with names as in the project schema
             user_email = await self._get_user_email(conn, user_id)
@@ -365,7 +377,6 @@ def _create_private_workspace_query(
             private_workspace_query = (
                 sa.select(
                     *PROJECT_DB_COLS,
-                    projects.c.workbench,
                     projects_to_products.c.product_name,
                     projects_to_folders.c.folder_id,
                 )
@@ -648,8 +659,11 @@ async def list_projects_dicts(  # pylint: disable=too-many-arguments,too-many-st
                 # Therefore, if we use this model, it will return those default values, which is not backward-compatible
                 # with the frontend. The frontend would need to check and adapt how it handles default values in
                 # Workbench nodes, which are currently not returned if not set in the DB.
-                ProjectListAtDB.model_validate(row)
-                prjs_output.append(dict(row.items()))
+                prj_dict = dict(row.items()) | {
+                    "workbench": await self._get_workbench(conn, row.uuid),
+                }
+                ProjectListAtDB.model_validate(prj_dict)
+                prjs_output.append(prj_dict)
 
             return (
                 prjs_output,
@@ -847,7 +861,7 @@ async def update_project_node_data(
             extra=get_log_record_extra(user_id=user_id),
         ):
             partial_workbench_data: dict[NodeIDStr, Any] = {
-                NodeIDStr(f"{node_id}"): new_node_data,
+                f"{node_id}": new_node_data,
             }
             return await self._update_project_workbench_with_lock_and_notify(
                 partial_workbench_data,
@@ -1021,7 +1035,7 @@ async def add_project_node(
     ) -> None:
         # NOTE: permission check is done currently in update_project_workbench!
         partial_workbench_data: dict[NodeIDStr, Any] = {
-            NodeIDStr(f"{node.node_id}"): jsonable_encoder(
+            f"{node.node_id}": jsonable_encoder(
                 old_struct_node,
                 exclude_unset=True,
             ),

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

@@ -21,6 +21,7 @@
 from simcore_postgres_database.webserver_models import (
     projects,
 )
+from simcore_service_webserver.projects._nodes_repository import ProjectNodesRepo
 from sqlalchemy.dialects.postgresql import insert as pg_insert
 
 from ..db.models import GroupType, groups, projects_tags, user_to_groups, users
@@ -32,7 +33,7 @@
     ProjectInvalidUsageError,
     ProjectNotFoundError,
 )
-from .models import ProjectDict
+from .models import NodesDict, ProjectDict
 from .utils import find_changed_node_keys
 
 logger = logging.getLogger(__name__)
@@ -187,6 +188,23 @@ async def _upsert_tags_in_project(
                 .on_conflict_do_nothing()
             )
 
+    async def _get_workbench(
+        self,
+        connection: SAConnection,
+        project_uuid: str,
+    ) -> NodesDict:
+        project_nodes_repo = ProjectNodesRepo(project_uuid=ProjectID(project_uuid))
+        exclude_fields = {"node_id", "required_resources", "created", "modified"}
+        workbench: NodesDict = {}
+
+        project_nodes = await project_nodes_repo.list(connection)
+        for project_node in project_nodes:
+            node_data = project_node.model_dump(
+                exclude=exclude_fields, exclude_none=True, exclude_unset=True
+            )
+            workbench[f"{project_node.node_id}"] = Node.model_validate(node_data)
+        return workbench
+
     async def _get_project(
         self,
         connection: SAConnection,
@@ -263,6 +281,7 @@ async def _get_project(
             )
 
         project: dict[str, Any] = dict(project_row.items())
+        project["workbench"] = await self._get_workbench(connection, project_uuid)
 
         if "tags" not in exclude_foreign:
             tags = await self._get_tags_by_project(