fixing nodes

Author: pcrespov

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

@@ -102,6 +102,7 @@ class BaseProjectModel(BaseModel):
     last_change_date: datetime
 
     # Pipeline of nodes (SEE projects_nodes.py)
+    # FIXME: pedro removes this one
     workbench: Annotated[NodesDict, Field(description="Project's pipeline")]
 
     # validators

packages/pytest-simcore/src/pytest_simcore/db_entries_mocks.py

@@ -29,6 +29,7 @@
 )
 from sqlalchemy.ext.asyncio import AsyncEngine
 
+from .helpers.faker_factories import random_service_key, random_service_version
 from .helpers.postgres_tools import insert_and_get_row_lifespan
 from .helpers.postgres_users import sync_insert_and_get_user_and_secrets_lifespan
 
@@ -92,6 +93,7 @@ async def _(
         project_nodes_overrides: dict[str, Any] | None = None,
         **project_overrides,
     ) -> ProjectAtDB:
+
         project_uuid = uuid4()
         with log_context(
             logging.INFO,
@@ -100,22 +102,22 @@ async def _(
             logger=_logger,
         ) as log_ctx:
 
-            default_project_config = {
+            project_values = {
                 "uuid": f"{project_uuid}",
                 "name": faker.name(),
                 "type": ProjectType.STANDARD.name,
                 "description": faker.text(),
                 "prj_owner": user["id"],
                 "access_rights": {"1": {"read": True, "write": True, "delete": True}},
                 "thumbnail": "",
+                **project_overrides,
             }
-            default_project_config.update(**project_overrides)
-            project_workbench = default_project_config.pop("workbench", {})
+            project_workbench = project_values.pop("workbench", {})
 
             async with sqlalchemy_async_engine.connect() as con, con.begin():
                 result = await con.execute(
                     projects.insert()
-                    .values(**default_project_config)
+                    .values(**project_values)
                     .returning(sa.literal_column("*"))
                 )
 
@@ -124,25 +126,27 @@ async def _(
                 )
 
                 project_nodes_repo = ProjectNodesRepo(project_uuid=project_uuid)
-                # NOTE: currently no resources is passed until it becomes necessary
-                default_node_config = {
-                    "required_resources": {},
-                    "key": faker.pystr(),
-                    "version": faker.pystr(),
-                    "label": faker.pystr(),
-                }
-                if project_nodes_overrides:
-                    default_node_config.update(project_nodes_overrides)
-
-                await project_nodes_repo.add(
-                    con,
-                    nodes=[
-                        ProjectNodeCreate(
-                            node_id=NodeID(node_id), **default_node_config
-                        )
-                        for node_id in inserted_project.workbench
-                    ],
-                )
+
+                for node_id, node_data in project_workbench.items():
+                    # NOTE: currently no resources is passed until it becomes necessary
+                    node_values = {
+                        "required_resources": {},
+                        "key": random_service_key(fake=faker),
+                        "version": random_service_version(fake=faker),
+                        "label": faker.pystr(),
+                        **node_data,
+                    }
+
+                    if project_nodes_overrides:
+                        node_values.update(project_nodes_overrides)
+
+                    await project_nodes_repo.add(
+                        con,
+                        nodes=[
+                            ProjectNodeCreate(node_id=NodeID(node_id), **node_values)
+                        ],
+                    )
+
                 await con.execute(
                     projects_to_products.insert().values(
                         project_uuid=f"{inserted_project.uuid}",

services/director-v2/src/simcore_service_director_v2/modules/db/repositories/projects.py

@@ -2,8 +2,9 @@
 
 import sqlalchemy as sa
 from models_library.projects import ProjectAtDB, ProjectID
+from models_library.projects_nodes import Node
 from models_library.projects_nodes_io import NodeID
-from simcore_postgres_database.utils_projects_nodes import ProjectNodesRepo
+from simcore_postgres_database.utils_projects_nodes import ProjectNode, ProjectNodesRepo
 from simcore_postgres_database.utils_repos import pass_or_acquire_connection
 
 from ....core.errors import ProjectNotFoundError
@@ -13,6 +14,21 @@
 logger = logging.getLogger(__name__)
 
 
+def _project_node_to_node(project_node: ProjectNode) -> Node:
+    """Converts a ProjectNode from the database to a Node model for the API.
+
+    Handles field mapping and excludes database-specific fields that are not
+    part of the Node model.
+    """
+    # Get all ProjectNode fields except those that don't belong in Node
+    exclude_fields = {"node_id", "required_resources", "created", "modified"}
+    node_data = project_node.model_dump(
+        exclude=exclude_fields, exclude_none=True, exclude_unset=True
+    )
+
+    return Node.model_validate(node_data)
+
+
 class ProjectsRepository(BaseRepository):
     async def get_project(self, project_id: ProjectID) -> ProjectAtDB:
         async with self.db_engine.connect() as conn:
@@ -21,9 +37,17 @@ async def get_project(self, project_id: ProjectID) -> ProjectAtDB:
                     sa.select(projects).where(projects.c.uuid == str(project_id))
                 )
             ).one_or_none()
-        if not row:
-            raise ProjectNotFoundError(project_id=project_id)
-        return ProjectAtDB.model_validate(row)
+            if not row:
+                raise ProjectNotFoundError(project_id=project_id)
+
+            repo = ProjectNodesRepo(project_uuid=project_id)
+            nodes = await repo.list(conn)
+
+        project_workbench = {
+            f"{node.node_id}": _project_node_to_node(node) for node in nodes
+        }
+        data = {**row._asdict(), "workbench": project_workbench}
+        return ProjectAtDB.model_validate(data)
 
     async def is_node_present_in_workbench(
         self, project_id: ProjectID, node_uuid: NodeID