improve DB list project model

Author: matusdrobuliak66

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

@@ -8,9 +8,6 @@
 from uuid import UUID
 
 from common_library.basic_types import DEFAULT_FACTORY
-from models_library.basic_types import ConstrainedStr
-from models_library.folders import FolderID
-from models_library.workspaces import WorkspaceID
 from pydantic import (
     BaseModel,
     ConfigDict,
@@ -21,8 +18,11 @@
 )
 
 from .basic_regex import DATE_RE, UUID_RE_BASE
+from .basic_types import ConstrainedStr
 from .emails import LowerCaseEmailStr
+from .folders import FolderID
 from .groups import GroupID
+from .products import ProductName
 from .projects_access import AccessRights, GroupIDStr
 from .projects_nodes import Node
 from .projects_nodes_io import NodeIDStr
@@ -33,6 +33,7 @@
     none_to_empty_str_pre_validator,
 )
 from .utils.enums import StrAutoEnum
+from .workspaces import WorkspaceID
 
 ProjectID: TypeAlias = UUID
 CommitID: TypeAlias = int
@@ -147,6 +148,32 @@ def _convert_sql_alchemy_enum(cls, v):
     )
 
 
+class ProjectListAtDB(BaseProjectModel):
+    # uuid  <- BaseProjectModel
+    # name  <- BaseProjectModel
+    # description  <- BaseProjectModel
+    # thumbnail  <- BaseProjectModel
+    # workbench  <- BaseProjectModel
+    # creation_date  <- BaseProjectModel
+    # last_change_date  <- BaseProjectModel
+    id: int
+    type: ProjectType
+    template_type: ProjectTemplateType | None
+    prj_owner: int | None
+    ui: dict[str, Any] | None
+    classifiers: list[ClassifierID] | None
+    dev: dict[str, Any] | None
+    quality: dict[str, Any]
+    published: bool | None
+    hidden: bool
+    workspace_id: WorkspaceID | None
+    trashed: datetime | None
+    trashed_by: UserID | None
+    trashed_explicitly: bool
+    product_name: ProductName
+    folder_id: FolderID | None
+
+
 class Project(BaseProjectModel):
     # NOTE: This is the pydantic pendant of project-v0.0.1.json used in the API of the webserver/webclient
     # NOT for usage with DB!!

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

@@ -10,7 +10,7 @@
 
 from aiohttp import web
 from models_library.folders import FolderID, FolderQuery, FolderScope
-from models_library.projects import ProjectID, ProjectTemplateType
+from models_library.projects import ProjectTemplateType
 from models_library.rest_ordering import OrderBy
 from models_library.users import UserID
 from models_library.workspaces import WorkspaceID, WorkspaceQuery, WorkspaceScope
@@ -21,14 +21,15 @@
     ProjectTemplateType as ProjectTemplateTypeDB,
 )
 from simcore_postgres_database.webserver_models import ProjectType as ProjectTypeDB
-from simcore_service_webserver.users.api import get_user_email_legacy
 
 from ..folders import _folders_repository
+from ..users.api import get_user_email_legacy
 from ..workspaces.api import check_user_workspace_access
 from . import _projects_service
 from ._access_rights_repository import batch_get_project_access_rights
 from ._projects_repository import batch_get_trashed_by_primary_gid
-from ._projects_repository_legacy import ProjectDBAPI, convert_to_schema_names
+from ._projects_repository_legacy import ProjectDBAPI
+from ._projects_repository_legacy_utils import convert_to_schema_names
 from .models import ProjectDict, ProjectTypeAPI
 
 
@@ -61,7 +62,7 @@ async def _aggregate_data_to_projects_from_other_sources(
     """
     # updating `project.trashed_by_primary_gid`
     trashed_by_primary_gid_values = await batch_get_trashed_by_primary_gid(
-        app, projects_uuids=[ProjectID(p["uuid"]) for p in db_projects]
+        app, projects_uuids=[p["uuid"] for p in db_projects]
     )
 
     _batch_update("trashed_by_primary_gid", trashed_by_primary_gid_values, db_projects)
@@ -70,7 +71,7 @@ async def _aggregate_data_to_projects_from_other_sources(
     project_to_access_rights = await batch_get_project_access_rights(
         app=app,
         projects_uuids_with_workspace_id=[
-            (ProjectID(p["uuid"]), p["workspaceId"]) for p in db_projects
+            (p["uuid"], p["workspaceId"]) for p in db_projects
         ],
     )
 
@@ -90,7 +91,7 @@ async def _aggregate_data_to_projects_from_other_sources(
     )
 
     for project in updated_projects:
-        project["accessRights"] = project_to_access_rights[project["uuid"]]
+        project["accessRights"] = project_to_access_rights[f"{project['uuid']}"]
 
     return updated_projects
 

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

@@ -19,7 +19,11 @@
 from models_library.folders import FolderQuery, FolderScope
 from models_library.groups import GroupID
 from models_library.products import ProductName
-from models_library.projects import ProjectAtDB, ProjectID, ProjectIDStr
+from models_library.projects import (
+    ProjectID,
+    ProjectIDStr,
+    ProjectListAtDB,
+)
 from models_library.projects_comments import CommentID, ProjectsCommentsDB
 from models_library.projects_nodes import Node
 from models_library.projects_nodes_io import NodeID, NodeIDStr
@@ -584,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[ProjectAtDB], int]:
+    ) -> tuple[list[ProjectListAtDB], int]:
         async with self.engine.acquire() as conn:
             user_groups_proxy: list[RowProxy] = await self._list_user_groups(
                 conn, user_id
@@ -667,15 +671,19 @@ async def list_projects_dicts(  # pylint: disable=too-many-arguments,too-many-st
                     projects.c.id,
                 )
 
-            prjs_at_db = [
-                ProjectAtDB.model_validate(row)
+            prjs_output = [
+                ProjectListAtDB.model_validate(row)
                 async for row in conn.execute(
                     combined_query.offset(offset).limit(limit)
                 )
             ]
+            # async for row in conn.execute(combined_query.offset(offset).limit(limit)):
+            #     ProjectListAtDB.model_validate(row)
+            #     prj: dict[str, Any] = dict(row.items())
+            #     prjs_output.append(prj)
 
             return (
-                prjs_at_db,
+                prjs_output,
                 cast(int, total_count),
             )