tools and fix

Author: pcrespov

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

@@ -7,7 +7,7 @@
 from sqlalchemy.ext.asyncio import AsyncConnection
 
 from .models.projects import projects
-from .utils_repos import transaction_context
+from .utils_repos import pass_or_acquire_connection, transaction_context
 
 
 class DBBaseProjectError(OsparcErrorMixin, Exception):
@@ -22,6 +22,23 @@ class ProjectsRepo:
     def __init__(self, engine):
         self.engine = engine
 
+    async def exists(
+        self,
+        project_uuid: uuid.UUID,
+        *,
+        connection: AsyncConnection | None = None,
+    ) -> bool:
+        async with pass_or_acquire_connection(self.engine, connection) as conn:
+            return (
+                await conn.scalar(
+                    sa.select(1)
+                    .select_from(projects)
+                    .where(projects.c.uuid == f"{project_uuid}")
+                    .limit(1)
+                )
+                is not None
+            )
+
     async def get_project_last_change_date(
         self,
         project_uuid: uuid.UUID,

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

@@ -4,19 +4,18 @@
 from typing import Annotated, Any
 
 import asyncpg.exceptions  # type: ignore[import-untyped]
-import sqlalchemy
 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 ._protocols import DBConnection
 from .aiopg_errors import ForeignKeyViolation, UniqueViolation
 from .models.projects_node_to_pricing_unit import projects_node_to_pricing_unit
 from .models.projects_nodes import projects_nodes
+from .utils_aiosqlalchemy import map_db_exception
 
 
 #
@@ -71,6 +70,22 @@ class ProjectNodeCreate(BaseModel):
     def get_field_names(cls, *, exclude: set[str]) -> set[str]:
         return cls.model_fields.keys() - exclude
 
+    def model_dump_as_node(self) -> dict[str, Any]:
+        """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"}
+        return self.model_dump(
+            # NOTE: this setup ensures using the defaults provided in Node model when the db does not
+            # provide them, e.g. `state`
+            exclude=exclude_fields,
+            exclude_none=True,
+            exclude_unset=True,
+        )
+
     model_config = ConfigDict(frozen=True)
 
 
@@ -80,6 +95,22 @@ class ProjectNode(ProjectNodeCreate):
 
     model_config = ConfigDict(from_attributes=True)
 
+    def model_dump_as_node(self) -> dict[str, Any]:
+        """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"}
+        return self.model_dump(
+            # NOTE: this setup ensures using the defaults provided in Node model when the db does not
+            # provide them, e.g. `state`
+            exclude=exclude_fields,
+            exclude_none=True,
+            exclude_unset=True,
+        )
+
 
 @dataclass(frozen=True, kw_only=True)
 class ProjectNodesRepo:
@@ -103,17 +134,18 @@ async def add(
         """
         if not nodes:
             return []
+
+        values = [
+            {
+                "project_uuid": f"{self.project_uuid}",
+                **node.model_dump(mode="json"),
+            }
+            for node in nodes
+        ]
+
         insert_stmt = (
             projects_nodes.insert()
-            .values(
-                [
-                    {
-                        "project_uuid": f"{self.project_uuid}",
-                        **node.model_dump(exclude_unset=True, mode="json"),
-                    }
-                    for node in nodes
-                ]
-            )
+            .values(values)
             .returning(
                 *[
                     c
@@ -129,14 +161,17 @@ async def add(
             rows = await maybe_await(result.fetchall())
             assert isinstance(rows, list)  # nosec
             return [ProjectNode.model_validate(r) for r in rows]
+
         except ForeignKeyViolation as exc:
             # this happens when the project does not exist, as we first check the node exists
             raise ProjectNodesProjectNotFoundError(
                 project_uuid=self.project_uuid
             ) from exc
+
         except UniqueViolation as exc:
             # this happens if the node already exists on creation
             raise ProjectNodesDuplicateNodeError from exc
+
         except sqlalchemy.exc.IntegrityError as exc:
             raise map_db_exception(
                 exc,