add new repo

Author: giancarloromeo

packages/models-library/src/models_library/api_schemas_webserver/_base.py

@@ -22,27 +22,23 @@ class InputSchemaWithoutCamelCase(BaseModel):
     )
 
 
-class InputSchema(BaseModel):
+class InputSchema(InputSchemaWithoutCamelCase):
     model_config = ConfigDict(
-        **InputSchemaWithoutCamelCase.model_config,
         alias_generator=snake_to_camel,
     )
 
 
 class OutputSchemaWithoutCamelCase(BaseModel):
     model_config = ConfigDict(
         populate_by_name=True,
-        extra="ignore",
+        extra="ignore",  # Used to prune extra fields from internal data
         frozen=True,
     )
 
 
-class OutputSchema(BaseModel):
+class OutputSchema(OutputSchemaWithoutCamelCase):
     model_config = ConfigDict(
         alias_generator=snake_to_camel,
-        populate_by_name=True,
-        extra="ignore",  # Used to prune extra fields from internal data
-        frozen=True,
     )
 
     def data(

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

@@ -12,6 +12,7 @@
 from .models.groups import GroupType, groups, user_to_groups
 from .models.products import products
 from .models.projects import ProjectType, projects
+from .models.projects_nodes import projects_nodes
 from .models.projects_tags import projects_tags
 from .models.projects_to_wallet import projects_to_wallet
 from .models.scicrunch_resources import scicrunch_resources
@@ -32,6 +33,7 @@
     "NodeClass",
     "products",
     "projects",
+    "projects_nodes",
     "ProjectType",
     "scicrunch_resources",
     "StateType",

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

@@ -27,6 +27,7 @@
 )
 from models_library.groups import EVERYONE_GROUP_ID, Group, GroupID, GroupType
 from models_library.projects import Project, ProjectID
+from models_library.projects_nodes import Node
 from models_library.projects_nodes_io import NodeID, NodeIDStr
 from models_library.services import ServiceKeyVersion
 from models_library.services_resources import ServiceResourcesDict
@@ -234,7 +235,7 @@ async def patch_project_node(request: web.Request) -> web.Response:
         user_id=req_ctx.user_id,
         project_id=path_params.project_id,
         node_id=path_params.node_id,
-        node_patch=node_patch,
+        node_patch=Node.model_construct(**node_patch.model_dump()),
     )
 
     return web.json_response(status=status.HTTP_204_NO_CONTENT)

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

@@ -0,0 +1,35 @@
+import logging
+
+import sqlalchemy as sa
+from aiohttp import web
+from models_library.projects import ProjectID
+from models_library.projects_nodes import Node, NodeID
+from simcore_postgres_database.utils_repos import transaction_context
+from simcore_postgres_database.webserver_models import projects_nodes
+from sqlalchemy.ext.asyncio import AsyncConnection
+
+from ..db.plugin import get_asyncpg_engine
+from .models import NodeDB
+
+_logger = logging.getLogger(__name__)
+
+
+async def update(
+    app: web.Application,
+    connection: AsyncConnection | None = None,
+    *,
+    project_id: ProjectID,
+    node_id: NodeID,
+    node: Node,
+) -> None:
+    async with transaction_context(get_asyncpg_engine(app), connection) as conn:
+        await conn.stream(
+            projects_nodes.update()
+            .values(**NodeDB.model_validate(node.model_dump()).model_dump())
+            .where(
+                sa.and_(
+                    projects_nodes.c.project_uuid == f"{project_id}",
+                    projects_nodes.c.node_id == f"{node_id}",
+                )
+            )
+        )

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

@@ -1,11 +1,12 @@
-from datetime import datetime
+import datetime as dt
 from enum import Enum
 from typing import Any, TypeAlias
 
 from aiopg.sa.result import RowProxy
 from models_library.api_schemas_webserver.projects import ProjectPatch
 from models_library.folders import FolderID
 from models_library.projects import ClassifierID, ProjectID
+from models_library.projects_nodes import NodeID
 from models_library.projects_ui import StudyUI
 from models_library.users import UserID
 from models_library.utils.common_validators import (
@@ -42,16 +43,16 @@ class ProjectDB(BaseModel):
     description: str
     thumbnail: HttpUrl | None
     prj_owner: UserID
-    creation_date: datetime
-    last_change_date: datetime
+    creation_date: dt.datetime
+    last_change_date: dt.datetime
     ui: StudyUI | None
     classifiers: list[ClassifierID]
     dev: dict | None
     quality: dict[str, Any]
     published: bool
     hidden: bool
     workspace_id: WorkspaceID | None
-    trashed_at: datetime | None
+    trashed_at: dt.datetime | None
     trashed_explicitly: bool = False
 
     model_config = ConfigDict(from_attributes=True, arbitrary_types_allowed=True)
@@ -95,12 +96,36 @@ class UserProjectAccessRightsWithWorkspace(BaseModel):
 
 class ProjectPatchExtended(ProjectPatch):
     # Only used internally
-    trashed_at: datetime | None
+    trashed_at: dt.datetime | None
     trashed_explicitly: bool
 
     model_config = ConfigDict(populate_by_name=True, extra="forbid")
 
 
+class NodeDB(BaseModel):
+    node_id: NodeID
+    required_resources: dict[str, Any]
+    created: dt.datetime
+    modified: dt.datetime
+    project_uuid: ProjectID
+    project_node_id: int
+    key: str
+    version: str
+    label: str
+    progress: float | None
+    thumbnail: HttpUrl | None
+    input_access: dict[str, Any]
+    input_nodes: list[NodeID]
+    inputs: dict[str, Any]
+    inouts_units: dict[str, Any]
+    output_nodes: list[NodeID]
+    outputs: dict[str, Any]
+    run_hash: str | None
+    state: dict[str, Any] | None
+    parent: str | None
+    boot_options: dict[str, Any] | None
+
+
 __all__: tuple[str, ...] = (
     "ProjectDict",
     "ProjectProxy",

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

@@ -32,7 +32,6 @@
     DynamicServiceStop,
 )
 from models_library.api_schemas_webserver.projects import ProjectPatch
-from models_library.api_schemas_webserver.projects_nodes import NodePatch
 from models_library.basic_types import KeyIDStr
 from models_library.errors import ErrorDict
 from models_library.groups import GroupID
@@ -121,7 +120,7 @@
 from ..wallets import api as wallets_api
 from ..wallets.errors import WalletNotEnoughCreditsError
 from ..workspaces import _workspaces_db as workspaces_db
-from . import _crud_api_delete, _nodes_api, _projects_db
+from . import _crud_api_delete, _nodes_api, _projects_db, _projects_nodes_repository
 from ._access_rights_api import (
     check_user_project_permission,
     has_user_project_access_rights,
@@ -800,7 +799,7 @@ async def add_project_node(
             required_resources=jsonable_encoder(default_resources),
             key=service_key,
             version=service_version,
-            label=service_key.split("/")[-1]
+            label=service_key.split("/")[-1],
         ),
         Node.model_validate(
             {
@@ -1001,7 +1000,7 @@ async def patch_project_node(
     user_id: UserID,
     project_id: ProjectID,
     node_id: NodeID,
-    node_patch: NodePatch,
+    node_patch: Node,
 ) -> None:
     _node_patch_exclude_unset: dict[str, Any] = jsonable_encoder(
         node_patch, exclude_unset=True, by_alias=True
@@ -1044,6 +1043,13 @@ async def patch_project_node(
         new_node_data=_node_patch_exclude_unset,
     )
 
+    await _projects_nodes_repository.update(
+        app,
+        project_id=project_id,
+        node_id=node_id,
+        node=node_patch,
+    )
+
     # 4. Make calls to director-v2 to keep data in sync (ex. comp_tasks DB table)
     await director_v2_api.create_or_update_pipeline(
         app, user_id, project_id, product_name=product_name