fix: node creation

Author: giancarloromeo

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

@@ -269,6 +269,10 @@ class Node(BaseModel):
         Field(default_factory=NodeState, description="The node's state object"),
     ] = DEFAULT_FACTORY
 
+    required_resources: Annotated[
+        dict[str, Any] | None, Field(default_factory=dict)
+    ] = DEFAULT_FACTORY
+
     boot_options: Annotated[
         dict[EnvVarKey, str] | None,
         Field(

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

@@ -43,6 +43,24 @@
 ]
 
 
+async def add(
+    app: web.Application,
+    connection: AsyncConnection | None = None,
+    *,
+    project_id: ProjectID,
+    node_id: NodeID,
+    node: Node,
+) -> None:
+    values = node.model_dump(mode="json", exclude_none=True, exclude_unset=True)
+
+    async with transaction_context(get_asyncpg_engine(app), connection) as conn:
+        await conn.execute(
+            projects_nodes.insert().values(
+                project_uuid=f"{project_id}", node_id=f"{node_id}", **values
+            )
+        )
+
+
 async def delete(
     app: web.Application,
     connection: AsyncConnection | None = None,

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

@@ -92,7 +92,6 @@
 from servicelib.utils import fire_and_forget_task, limited_gather, logged_gather
 from simcore_postgres_database.models.users import UserRole
 from simcore_postgres_database.utils_projects_nodes import (
-    ProjectNodeCreate,
     ProjectNodesNodeNotFoundError,
 )
 from simcore_postgres_database.webserver_models import ProjectType
@@ -169,6 +168,30 @@
 _logger = logging.getLogger(__name__)
 
 
+async def _create_project_document_and_notify(
+    app,
+    *,
+    project_id: ProjectID,
+    user_id: UserID,
+    client_session_id: ClientSessionID | None,
+):
+    (
+        project_document,
+        document_version,
+    ) = await create_project_document_and_increment_version(app, project_id)
+
+    user_primary_gid = await users_service.get_user_primary_group_id(app, user_id)
+
+    await notify_project_document_updated(
+        app=app,
+        project_id=project_id,
+        user_primary_gid=user_primary_gid,
+        client_session_id=client_session_id,
+        version=document_version,
+        document=project_document,
+    )
+
+
 async def patch_project_and_notify_users(
     app: web.Application,
     *,
@@ -937,26 +960,23 @@ async def add_project_node(
     default_resources = await catalog_service.get_service_resources(
         request.app, user_id, service_key, service_version
     )
-    db_legacy: ProjectDBAPI = ProjectDBAPI.get_from_app_context(request.app)
-    assert db_legacy  # nosec
-    await db_legacy.add_project_node(
-        user_id,
-        ProjectID(project["uuid"]),
-        ProjectNodeCreate(
-            node_id=node_uuid,
-            required_resources=jsonable_encoder(default_resources),
+
+    await _projects_nodes_repository.add(
+        request.app,
+        project_id=ProjectID(project["uuid"]),
+        node_id=node_uuid,
+        node=Node(
             key=service_key,
             version=service_version,
             label=service_key.split("/")[-1],
+            required_resources=jsonable_encoder(default_resources),
         ),
-        Node.model_validate(
-            {
-                "key": service_key,
-                "version": service_version,
-                "label": service_key.split("/")[-1],
-            }
-        ),
-        product_name,
+    )
+
+    await _create_project_document_and_notify(
+        request.app,
+        project_id=ProjectID(project["uuid"]),
+        user_id=user_id,
         client_session_id=client_session_id,
     )
 
@@ -1094,6 +1114,13 @@ async def delete_project_node(
         node_id=NodeID(node_uuid),
     )
 
+    await _create_project_document_and_notify(
+        request.app,
+        project_id=project_uuid,
+        user_id=user_id,
+        client_session_id=client_session_id,
+    )
+
     # also ensure the project is updated by director-v2 since services
     product_name = products_web.get_product_name(request)
     await director_v2_service.create_or_update_pipeline(
@@ -1103,24 +1130,6 @@ async def delete_project_node(
         request.app, project_id=project_uuid
     )
 
-    (
-        project_document,
-        document_version,
-    ) = await create_project_document_and_increment_version(request.app, project_uuid)
-
-    user_primary_gid = await users_service.get_user_primary_group_id(
-        request.app, user_id
-    )
-
-    await notify_project_document_updated(
-        app=request.app,
-        project_id=project_uuid,
-        user_primary_gid=user_primary_gid,
-        client_session_id=client_session_id,
-        version=document_version,
-        document=project_document,
-    )
-
 
 async def update_project_linked_product(
     app: web.Application, project_id: ProjectID, product_name: str
@@ -1249,20 +1258,11 @@ async def patch_project_node(
         partial_node=partial_node,
     )
 
-    (
-        project_document,
-        document_version,
-    ) = await create_project_document_and_increment_version(app, project_id)
-
-    user_primary_gid = await users_service.get_user_primary_group_id(app, user_id)
-
-    await notify_project_document_updated(
-        app=app,
+    await _create_project_document_and_notify(
+        app,
         project_id=project_id,
-        user_primary_gid=user_primary_gid,
+        user_id=user_id,
         client_session_id=client_session_id,
-        version=document_version,
-        document=project_document,
     )
 
     # 4. Make calls to director-v2 to keep data in sync (ex. comp_* DB tables)

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

@@ -371,16 +371,14 @@ async def test_create_node(
 
         # check database is updated
         assert "node_id" in data
-        create_node_id = data["node_id"]
+        node_id = data["node_id"]
         with postgres_db.connect() as conn:
             result = conn.execute(
-                sa.select(projects_db_model.c.workbench).where(
-                    projects_db_model.c.uuid == user_project["uuid"]
-                )
+                sa.select(sa.literal(1))
+                .where(projects_nodes.c.node_id == node_id)
+                .limit(1)
             )
-        assert result
-        workbench = result.one()[projects_db_model.c.workbench]
-        assert create_node_id in workbench
+        assert result.scalar() is not None
     else:
         assert error