by_alias since Page is strict

Author: pcrespov

packages/models-library/tests/test_project_nodes.py

@@ -25,6 +25,7 @@ def test_create_minimal_node(minimal_node_data_sample: dict[str, Any]):
     # a nice way to see how the simplest node looks like
     assert node.inputs == {}
     assert node.outputs == {}
+    assert node.state is not None
     assert node.state.current_status == RunningState.NOT_STARTED
     assert node.state.modified is True
     assert node.state.dependencies == set()

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

@@ -440,7 +440,9 @@ async def create_project(  # pylint: disable=too-many-arguments,too-many-branche
                 for gid, access in workspace.access_rights.items()
             }
 
-        data = ProjectGet.from_domain_model(new_project).data(**RESPONSE_MODEL_POLICY)
+        data = ProjectGet.from_domain_model(new_project).model_dump(
+            **RESPONSE_MODEL_POLICY
+        )
 
         raise web.HTTPCreated(
             text=json_dumps({"data": data}),

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

@@ -214,7 +214,10 @@ async def list_projects(request: web.Request):
 
     page = Page[ProjectListItem].model_validate(
         paginate_data(
-            chunk=[ProjectListItem.from_domain_model(prj) for prj in projects],
+            chunk=[
+                ProjectListItem.from_domain_model(prj).model_dump(by_alias=True)
+                for prj in projects
+            ],
             request_url=request.url,
             total=total_number_of_projects,
             limit=query_params.limit,
@@ -256,7 +259,10 @@ async def list_projects_full_search(request: web.Request):
 
     page = Page[ProjectListItem].model_validate(
         paginate_data(
-            chunk=[ProjectListItem.from_domain_model(prj) for prj in projects],
+            chunk=[
+                ProjectListItem.from_domain_model(prj).model_dump(by_alias=True)
+                for prj in projects
+            ],
             request_url=request.url,
             total=total_number_of_projects,
             limit=query_params.limit,

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

@@ -56,14 +56,15 @@ async def get_trashed_by_primary_gid(
     *,
     projects_uuid: ProjectID,
 ) -> GroupID | None:
-    async with pass_or_acquire_connection(get_asyncpg_engine(app), connection) as conn:
-        query = (
-            sa.select(
-                users.c.primary_gid.label("trashed_by_primary_gid"),
-            )
-            .select_from(projects.outerjoin(users, projects.c.trashed_by == users.c.id))
-            .where(projects.c.uuid == projects_uuid)
+    query = (
+        sa.select(
+            users.c.primary_gid.label("trashed_by_primary_gid"),
         )
+        .select_from(projects.outerjoin(users, projects.c.trashed_by == users.c.id))
+        .where(projects.c.uuid == projects_uuid)
+    )
+
+    async with pass_or_acquire_connection(get_asyncpg_engine(app), connection) as conn:
         result = await conn.stream(query)
         row = await result.first()
         return row.trashed_by_primary_gid if row else None
@@ -75,24 +76,27 @@ async def batch_get_trashed_by_primary_gid(
     *,
     projects_uuids: list[ProjectID],
 ) -> list[GroupID | None]:
+    """Batch version of get_trashed_by_primary_gid
+
+    Returns:
+        values of trashed_by_primary_gid in the SAME ORDER as projects_uuids
     """
-    Batch version of get_trashed_by_primary_gid preserving ORDER of projects_uuids
-    """
-    async with pass_or_acquire_connection(get_asyncpg_engine(app), connection) as conn:
-        query = (
-            sa.select(
-                users.c.primary_gid.label("trashed_by_primary_gid"),
-            )
-            .select_from(projects.outerjoin(users, projects.c.trashed_by == users.c.id))
-            .where(projects.c.uuid.in_(projects_uuids))
-        ).order_by(
-            # Preserves the order of projects_uuids
-            sa.case(
-                *[
-                    (projects.c.uuid == uuid, index)
-                    for index, uuid in enumerate(projects_uuids)
-                ]
-            )
+    projects_uuids_str = [f"{uuid}" for uuid in projects_uuids]
+    query = (
+        sa.select(
+            users.c.primary_gid.label("trashed_by_primary_gid"),
         )
+        .select_from(projects.outerjoin(users, projects.c.trashed_by == users.c.id))
+        .where(projects.c.uuid.in_(projects_uuids_str))
+    ).order_by(
+        # Preserves the order of projects_uuids
+        sa.case(
+            *[
+                (projects.c.uuid == uuid, index)
+                for index, uuid in enumerate(projects_uuids_str)
+            ]
+        )
+    )
+    async with pass_or_acquire_connection(get_asyncpg_engine(app), connection) as conn:
         result = await conn.stream(query)
         return [row.trashed_by_primary_gid async for row in result]

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

@@ -180,12 +180,10 @@ async def get_project_for_user(
     include_trashed_by_primary_gid: bool = False,
     check_permissions: str = "read",
 ) -> ProjectDict:
-    """Returns a VALID project accessible to user
+    """
+    Raises:
+        ProjectNotFoundError: _description_
 
-    :raises ProjectNotFoundError: if no match found
-    :
-    :return: schema-compliant project data
-    :rtype: Dict
     """
     db = ProjectDBAPI.get_from_app_context(app)