refactor

Author: sanderegg

services/storage/src/simcore_service_storage/modules/datcore_adapter/datcore_adapter.py

@@ -21,12 +21,9 @@
     DatCorePackageName,
 )
 from models_library.users import UserID
-from pydantic import AnyUrl, BaseModel, ByteSize, NonNegativeInt, TypeAdapter
+from pydantic import AnyUrl, BaseModel, NonNegativeInt, TypeAdapter
 from servicelib.fastapi.client_session import get_client_session
 from servicelib.utils import logged_gather
-from simcore_service_storage.modules.datcore_adapter.utils import (
-    create_fmd_from_datcore_package,
-)
 
 from ...constants import DATCORE_ID, DATCORE_STR, MAX_CONCURRENT_REST_CALLS
 from ...core.settings import get_application_settings
@@ -39,6 +36,7 @@
 )
 from .datcore_adapter_client_utils import request, retrieve_all_pages
 from .datcore_adapter_exceptions import DatcoreAdapterError
+from .utils import create_fmd_from_datcore_fmd, create_fmd_from_datcore_package
 
 _logger = logging.getLogger(__file__)
 
@@ -204,23 +202,7 @@ async def list_top_level_objects_in_dataset(
                 last_modified=e.last_modified_at,
                 file_meta_data=None
                 if e.data_type == DatCoreDataType.FOLDER
-                else FileMetaData(
-                    file_uuid=f"{e.path}",
-                    location_id=DATCORE_ID,
-                    location=DATCORE_STR,
-                    bucket_name=e.dataset_id,
-                    object_name=f"{e.path}",
-                    file_name=e.name,
-                    file_id=e.package_id,
-                    file_size=ByteSize(e.size),
-                    created_at=e.created_at,
-                    last_modified=e.last_modified_at,
-                    project_id=None,
-                    node_id=None,
-                    user_id=user_id,
-                    is_soft_link=False,
-                    sha256_checksum=None,
-                ),
+                else create_fmd_from_datcore_fmd(user_id, e),
             )
             for e in entries
         ],
@@ -271,23 +253,7 @@ async def list_top_level_objects_in_collection(
                 last_modified=e.last_modified_at,
                 file_meta_data=None
                 if e.data_type == DatCoreDataType.FOLDER
-                else FileMetaData(
-                    file_uuid=f"{e.path}",
-                    location_id=DATCORE_ID,
-                    location=DATCORE_STR,
-                    bucket_name=e.dataset_id,
-                    object_name=f"{e.path}",
-                    file_name=e.name,
-                    file_id=e.package_id,
-                    file_size=ByteSize(e.size),
-                    created_at=e.created_at,
-                    last_modified=e.last_modified_at,
-                    project_id=None,
-                    node_id=None,
-                    user_id=user_id,
-                    is_soft_link=False,
-                    sha256_checksum=None,
-                ),
+                else create_fmd_from_datcore_fmd(user_id, e),
             )
             for e in entries
         ],

services/storage/src/simcore_service_storage/modules/datcore_adapter/utils.py

@@ -1,3 +1,6 @@
+from models_library.api_schemas_datcore_adapter.datasets import (
+    FileMetaData as DatCoreFileMetaData,
+)
 from models_library.api_schemas_datcore_adapter.datasets import PackageMetaData
 from models_library.users import UserID
 from pydantic import ByteSize
@@ -7,19 +10,41 @@
 
 
 def create_fmd_from_datcore_package(
-    user_id: UserID, dat_core_fmd: PackageMetaData
+    user_id: UserID, pck_metadata: PackageMetaData
 ) -> FileMetaData:
     return FileMetaData(
-        file_uuid=f"{dat_core_fmd.package_id}",
+        file_uuid=f"{pck_metadata.package_id}",
         location_id=DATCORE_ID,
         location=DATCORE_STR,
-        bucket_name=dat_core_fmd.s3_bucket,
+        bucket_name=pck_metadata.s3_bucket,
+        object_name=f"{pck_metadata.package_id}",
+        file_name=pck_metadata.name,
+        file_id=pck_metadata.package_id,
+        file_size=ByteSize(pck_metadata.size),
+        created_at=pck_metadata.created_at,
+        last_modified=pck_metadata.updated_at,
+        project_id=None,
+        node_id=None,
+        user_id=user_id,
+        is_soft_link=False,
+        sha256_checksum=None,
+    )
+
+
+def create_fmd_from_datcore_fmd(
+    user_id: UserID, dat_core_fmd: DatCoreFileMetaData
+) -> FileMetaData:
+    return FileMetaData(
+        file_uuid=f"{dat_core_fmd.path}",
+        location_id=DATCORE_ID,
+        location=DATCORE_STR,
+        bucket_name=dat_core_fmd.dataset_id,
         object_name=f"{dat_core_fmd.package_id}",
         file_name=dat_core_fmd.name,
         file_id=dat_core_fmd.package_id,
         file_size=ByteSize(dat_core_fmd.size),
         created_at=dat_core_fmd.created_at,
-        last_modified=dat_core_fmd.updated_at,
+        last_modified=dat_core_fmd.last_modified_at,
         project_id=None,
         node_id=None,
         user_id=user_id,