fixed regex

Author: Andrei Neagu

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

@@ -46,15 +46,7 @@
 )
 
 # Storage basic file ID
-SIMCORE_S3_FILE_ID_RE = (
-    "^("
-    rf"api\/{UUID_RE_BASE}\/.+"
-    "|"
-    rf"exports\/\d+\/{UUID_RE_BASE}\.zip"
-    "|"
-    rf"{UUID_RE_BASE}\/{UUID_RE_BASE}\/.+"
-    ")$"
-)
+SIMCORE_S3_FILE_ID_RE = rf"^(exports\/\d+\/{UUID_RE_BASE}\.zip)|((api|({UUID_RE_BASE}))\/({UUID_RE_BASE})\/(.+)$)"
 
 
 SIMCORE_S3_DIRECTORY_ID_RE = rf"^({UUID_RE_BASE})\/({UUID_RE_BASE})\/(.+)\/$"

services/storage/tests/unit/test_simcore_s3_dsm.py

@@ -203,7 +203,7 @@ def _get_folder_and_files_selection(
     ]
 
     all_containing_folders: set[SimcoreS3FileID] = {
-        TypeAdapter(SimcoreS3FileID).validate_python(f"{Path(f).parent}/")
+        TypeAdapter(SimcoreS3FileID).validate_python(f"{Path(f).parent}")
         for f in random_files
     }