removed the file filter error

Author: sanderegg

services/storage/src/simcore_service_storage/exceptions/errors.py

@@ -41,10 +41,3 @@ class AccessLayerError(StorageRuntimeError):
 
 class InvalidFileIdentifierError(AccessLayerError):
     msg_template: str = "Error in {identifier}: {details}"
-
-
-class FileFilterInvalidError(StorageRuntimeError):
-    msg_template: str = (
-        "Invalid filter `{file_filter}` used. "
-        "\nTIP: currently only files starting with a project identifier are accepted."
-    )

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

@@ -158,7 +158,7 @@ async def try_get_directory(
             # there should be only 1 entry if this is a directory
             result = await conn.execute(
                 sa.select(file_meta_data).where(
-                    file_meta_data.c.file_id.startswith(f"{file_id}")
+                    file_meta_data.c.file_id == f"{file_id}"
                 )
             )
             if row := result.one_or_none():
@@ -265,8 +265,9 @@ async def list_child_paths(
 
     items = [
         PathMetaData(
-            path=row.path,
-            display_path=row.path,
+            path=row.path
+            or row.file_id,  # NOTE: if path_prefix is partial then path is None
+            display_path=row.path or row.file_id,
             location_id=row.location_id,
             location=row.location,
             bucket_name=row.bucket_name,

services/storage/src/simcore_service_storage/simcore_s3_dsm.py

@@ -55,7 +55,6 @@
 from .dsm_factory import BaseDataManager
 from .exceptions.errors import (
     FileAccessRightError,
-    FileFilterInvalidError,
     FileMetaDataNotFoundError,
     LinkAlreadyExistsError,
     ProjectAccessRightError,
@@ -182,14 +181,12 @@ async def list_paths(
     ) -> tuple[list[PathMetaData], PathCursor | None, TotalNumber | None]:
         """returns a page of the file meta data a user has access to"""
 
-        # if we have a file_filter, that means that we have at least a partial project ID
+        # if we have a file_filter, that means that we have potentially a project ID
         try:
             # NOTE: we currently do not support anything else than project_id/node_id/file_path here, sorry chap
             project_id = ProjectID(file_filter.parts[0]) if file_filter else None
-        except ValueError as exc:
-            raise FileFilterInvalidError(
-                user_id=user_id, file_filter=file_filter
-            ) from exc
+        except ValueError:
+            project_id = None
 
         next_cursor: PathCursor | None = None
         total: TotalNumber | None = None
@@ -224,7 +221,20 @@ async def list_paths(
                     start_after=None,
                     limit=limit,
                     next_cursor=objects_cursor,
+                    is_partial_prefix=False,
                 )
+                if not list_s3_objects:
+                    list_s3_objects, objects_next_cursor = await get_s3_client(
+                        self.app
+                    ).list_objects(
+                        bucket=self.simcore_bucket_name,
+                        prefix=file_filter,
+                        start_after=None,
+                        limit=limit,
+                        next_cursor=objects_cursor,
+                        is_partial_prefix=True,
+                    )
+
                 paths_metadata = [
                     PathMetaData.from_s3_object_in_dir(s3_object, dir_fmd)
                     for s3_object in list_s3_objects