fix pylint

Author: giancarloromeo

services/storage/src/simcore_service_storage/simcore_s3_dsm.py

@@ -79,7 +79,11 @@
 from .s3 import get_s3_client
 from .s3_utils import S3TransferDataCB, update_task_progress
 from .settings import Settings
-from .simcore_s3_dsm_utils import expand_directory, get_directory_file_id
+from .simcore_s3_dsm_utils import (
+    expand_directory,
+    find_enclosing_file,
+    get_directory_file_id,
+)
 from .utils import (
     convert_db_to_model,
     download_to_file_or_raise,
@@ -499,22 +503,6 @@ async def __get_link(
 
         return link
 
-    async def __find_enclosing_file(
-        self, conn: SAConnection, user_id: UserID, file_id: SimcoreS3FileID
-    ) -> FileMetaDataAtDB | None:
-        kwnon_files = {
-            Path(known_file.file_id): known_file
-            for known_file in await db_file_meta_data.list_fmds(conn, user_id=user_id)
-        }
-        current_path = Path(file_id)
-        while current_path and current_path != Path(current_path).parent:
-            if current_path in kwnon_files:
-                return kwnon_files.get(current_path)
-
-            current_path = Path(current_path).parent
-
-        return None
-
     async def delete_file(
         self,
         user_id: UserID,
@@ -539,7 +527,7 @@ async def delete_file(
                 if not can.delete:
                     raise FileAccessRightError(access_right="delete", file_id=file_id)
 
-            enclosing_file = await self.__find_enclosing_file(conn, user_id, file_id)
+            enclosing_file = await find_enclosing_file(conn, user_id, file_id)
             if enclosing_file and enclosing_file.file_id == file_id:
                 await db_file_meta_data.delete(conn, [file_id])
 

services/storage/src/simcore_service_storage/simcore_s3_dsm_utils.py

@@ -14,7 +14,7 @@
 
 from . import db_file_meta_data
 from .exceptions import FileMetaDataNotFoundError
-from .models import FileMetaData, FileMetaDataAtDB
+from .models import FileMetaData, FileMetaDataAtDB, UserID
 from .utils import convert_db_to_model
 
 
@@ -119,3 +119,20 @@ async def _get_fmd(
     directory_file_id_fmd = await _get_fmd(conn, directory_file_id)
 
     return directory_file_id if directory_file_id_fmd else None
+
+
+async def find_enclosing_file(
+    conn: SAConnection, user_id: UserID, file_id: SimcoreS3FileID
+) -> FileMetaDataAtDB | None:
+    kwnon_files = {
+        Path(known_file.file_id): known_file
+        for known_file in await db_file_meta_data.list_fmds(conn, user_id=user_id)
+    }
+    current_path = Path(file_id)
+    while current_path and current_path != Path(current_path).parent:
+        if current_path in kwnon_files:
+            return kwnon_files.get(current_path)
+
+        current_path = Path(current_path).parent
+
+    return None