big move

Author: sanderegg

services/storage/tests/unit/test_dsm_dsmcleaner.py

@@ -25,12 +25,12 @@
 from pydantic import ByteSize, TypeAdapter
 from pytest_simcore.helpers.parametrizations import byte_size_ids
 from simcore_postgres_database.storage_models import file_meta_data
-from simcore_service_storage import db_file_meta_data
 from simcore_service_storage.core.exceptions import (
     FileAccessRightError,
     FileMetaDataNotFoundError,
 )
 from simcore_service_storage.models import FileMetaData, S3BucketName, UploadID
+from simcore_service_storage.modules.db import db_file_meta_data
 from simcore_service_storage.simcore_s3_dsm import SimcoreS3DataManager
 
 pytest_simcore_core_services_selection = ["postgres"]

services/storage/tests/unit/test_dsm_soft_links.py

@@ -3,8 +3,8 @@
 # pylint: disable=unused-variable
 
 import uuid
+from collections.abc import AsyncIterator
 from functools import lru_cache
-from typing import AsyncIterator
 
 import pytest
 from aiopg.sa.engine import Engine

services/storage/tests/unit/test_handlers_simcore_s3.py

@@ -397,10 +397,7 @@ async def with_random_project_with_files(
             ]
         ],
     ],
-) -> tuple[
-    dict[str, Any],
-    dict[NodeID, dict[SimcoreS3FileID, dict[str, Path | str]]],
-]:
+) -> tuple[dict[str, Any], dict[NodeID, dict[SimcoreS3FileID, dict[str, Path | str]]],]:
     return await random_project_with_files(
         file_sizes=(
             TypeAdapter(ByteSize).validate_python("1Mib"),

services/storage/tests/unit/test_utils.py

@@ -21,7 +21,7 @@
 from simcore_service_storage.constants import S3_UNDEFINED_OR_EXTERNAL_MULTIPART_ID
 from simcore_service_storage.models import ETag, FileMetaData, S3BucketName, UploadID
 from simcore_service_storage.simcore_s3_dsm import SimcoreS3DataManager
-from simcore_service_storage.utils import (
+from simcore_service_storage.utils.utils import (
     MAX_CHUNK_SIZE,
     download_to_file_or_raise,
     is_file_entry_valid,

services/storage/tests/unit/test_utils_handlers.py

@@ -17,7 +17,9 @@
     ProjectAccessRightError,
     ProjectNotFoundError,
 )
-from simcore_service_storage.db_access_layer import InvalidFileIdentifierError
+from simcore_service_storage.modules.db.db_access_layer import (
+    InvalidFileIdentifierError,
+)
 
 
 @pytest.fixture()