fix behaviour

Author: matusdrobuliak66

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

@@ -99,17 +99,17 @@ async def _aggregate_data_to_projects_from_other_sources(
 async def _legacy_convert_db_projects_to_api_projects(
     app: web.Application,
     db,
-    db_projects: list,
+    db_projects: list[dict[str, Any]],
 ) -> list[dict]:
     """
     Converts db schema projects to API schema (legacy postprocessing).
     """
     api_projects: list[dict] = []
     for db_prj in db_projects:
-        db_prj_dict = db_prj.model_dump()
+        db_prj_dict = db_prj
         db_prj_dict.pop("product_name", None)
-        db_prj_dict["tags"] = await db.get_tags_by_project(project_id=f"{db_prj.id}")
-        user_email = await get_user_email_legacy(app, db_prj.prj_owner)
+        db_prj_dict["tags"] = await db.get_tags_by_project(project_id=f"{db_prj['id']}")
+        user_email = await get_user_email_legacy(app, db_prj["prj_owner"])
         api_projects.append(convert_to_schema_names(db_prj_dict, user_email))
     return api_projects
 

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

@@ -588,7 +588,7 @@ async def list_projects_dicts(  # pylint: disable=too-many-arguments,too-many-st
         limit: int | None = None,
         # order
         order_by: OrderBy = DEFAULT_ORDER_BY,
-    ) -> tuple[list[ProjectListAtDB], int]:
+    ) -> tuple[list[dict[str, Any]], int]:
         async with self.engine.acquire() as conn:
             user_groups_proxy: list[RowProxy] = await self._list_user_groups(
                 conn, user_id
@@ -671,12 +671,15 @@ async def list_projects_dicts(  # pylint: disable=too-many-arguments,too-many-st
                     projects.c.id,
                 )
 
-            prjs_output = [
+            prjs_output = []
+            async for row in conn.execute(combined_query.offset(offset).limit(limit)):
+                # NOTE: Historically, projects were returned as a dictionary. I have created a model that
+                # validates the DB row, but this model includes some default values inside the Workbench Node model.
+                # Therefore, if we use this model, it will return those default values, which is not backward-compatible
+                # with the frontend. The frontend would need to check and adapt how it handles default values in
+                # Workbench nodes, which are currently not returned if not set in the DB.
                 ProjectListAtDB.model_validate(row)
-                async for row in conn.execute(
-                    combined_query.offset(offset).limit(limit)
-                )
-            ]
+                prjs_output.append(dict(row.items()))
 
             return (
                 prjs_output,

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

@@ -8,13 +8,19 @@
 import sqlalchemy as sa
 from aiopg.sa.connection import SAConnection
 from aiopg.sa.result import RowProxy
-from models_library.projects import ProjectID, ProjectTemplateType
+from models_library.projects import ProjectID, ProjectType
 from models_library.projects_nodes import Node
 from models_library.projects_nodes_io import NodeIDStr
 from models_library.utils.change_case import camel_to_snake, snake_to_camel
 from pydantic import ValidationError
 from simcore_postgres_database.models.project_to_groups import project_to_groups
-from simcore_postgres_database.webserver_models import ProjectType, projects
+from simcore_postgres_database.webserver_models import (
+    ProjectTemplateType as ProjectTemplateTypeDB,
+)
+from simcore_postgres_database.webserver_models import ProjectType as ProjectTypeDB
+from simcore_postgres_database.webserver_models import (
+    projects,
+)
 from sqlalchemy.dialects.postgresql import insert as pg_insert
 
 from ..db.models import GroupType, groups, projects_tags, user_to_groups, users
@@ -88,9 +94,9 @@ def convert_to_schema_names(
         if col_name == "prj_owner":
             # this entry has to be converted to the owner e-mail address
             converted_value = user_email
-        if col_name == "type" and isinstance(col_value, ProjectType):
+        if col_name == "type" and isinstance(col_value, ProjectTypeDB):
             converted_value = col_value.value
-        if col_name == "template_type" and isinstance(col_value, ProjectTemplateType):
+        if col_name == "template_type" and isinstance(col_value, ProjectTemplateTypeDB):
             converted_value = col_value.value
 
         if col_name in SCHEMA_NON_NULL_KEYS and col_value is None: