pass displayed path

Author: sanderegg

services/storage/src/simcore_service_storage/models.py

@@ -108,6 +108,12 @@ class FileMetaData(FileMetaDataGet):
     user_id: UserID | None
     sha256_checksum: SHA256Str | None
 
+    def update_display_fields(self, id_name_mapping: dict[str, str]) -> None:
+        if self.project_id:
+            self.project_name = id_name_mapping.get(f"{self.project_id}")
+        if self.node_id:
+            self.node_name = id_name_mapping.get(f"{self.node_id}")
+
     @classmethod
     @validate_call
     def from_simcore_node(
@@ -343,6 +349,7 @@ def none(cls) -> "AccessRights":
 
 class PathMetaData(BaseModel):
     path: Path
+    display_path: Path
     location_id: LocationID
     location: LocationName
     bucket_name: str
@@ -355,14 +362,22 @@ class PathMetaData(BaseModel):
 
     file_meta_data: FileMetaData | None
 
-    model_config = ConfigDict(from_attributes=True)
+    def update_display_fields(self, id_name_mapping: dict[str, str]) -> None:
+        display_path = f"{self.path}"
+        for old, new in id_name_mapping.items():
+            display_path = display_path.replace(old, new)
+        self.display_path = Path(display_path)
+
+        if self.file_meta_data:
+            self.file_meta_data.update_display_fields(id_name_mapping)
 
     @classmethod
     def from_s3_object_in_dir(
         cls, s3_object: S3MetaData | S3DirectoryMetaData, dir_fmd: FileMetaData
     ) -> "PathMetaData":
         return cls(
             path=s3_object.as_path(),
+            display_path=s3_object.as_path(),
             location_id=dir_fmd.location_id,
             location=dir_fmd.location,
             bucket_name=dir_fmd.bucket_name,
@@ -379,6 +394,6 @@ def from_s3_object_in_dir(
     def to_api_model(self) -> PathMetaDataGet:
         return PathMetaDataGet.model_construct(
             path=self.path,
-            display_path=self.path,
+            display_path=self.display_path,
             file_meta_data=self.file_meta_data,
         )

services/storage/src/simcore_service_storage/modules/db/projects.py

@@ -2,7 +2,8 @@
 from contextlib import suppress
 
 import sqlalchemy as sa
-from models_library.projects import ProjectAtDB, ProjectID
+from models_library.projects import ProjectAtDB, ProjectID, ProjectIDStr
+from models_library.projects_nodes_io import NodeIDStr
 from pydantic import ValidationError
 from simcore_postgres_database.storage_models import projects
 from sqlalchemy.ext.asyncio import AsyncConnection
@@ -37,3 +38,19 @@ async def project_exists(
         )
         == 1
     )
+
+
+async def get_project_id_and_node_id_to_names_map(
+    conn: AsyncConnection, project_uuids: list[ProjectID]
+) -> dict[ProjectID, dict[ProjectIDStr | NodeIDStr, str]]:
+    mapping = {}
+    async for row in await conn.stream(
+        sa.select(projects.c.uuid, projects.c.name, projects.c.workbench).where(
+            projects.c.uuid.in_(f"{pid}" for pid in project_uuids)
+        )
+    ):
+        mapping[ProjectID(f"{row.uuid}")] = {f"{row.uuid}": row.name} | {
+            f"{node_id}": node["label"] for node_id, node in row.workbench.items()
+        }
+
+    return mapping

services/storage/src/simcore_service_storage/simcore_s3_dsm.py

@@ -250,6 +250,20 @@ async def list_paths(
                     cursor=cursor,
                 )
 
+        # extract the returned project_ids
+        project_ids = list(
+            {path.project_id for path in paths_metadata if path.project_id is not None}
+        )
+        async with self.engine.connect() as conn:
+            ids_names_map = await projects.get_project_id_and_node_id_to_names_map(
+                conn, project_ids
+            )
+
+        for path in paths_metadata:
+            if path.project_id is not None:
+                id_name_map = ids_names_map.get(path.project_id, {})
+                path.update_display_fields(id_name_map)
+
         return paths_metadata, next_cursor, total
 
     async def list_files(