moving modules prior to change of webserver

Author: sanderegg

services/storage/src/simcore_service_storage/api/rest/files.py

@@ -28,8 +28,8 @@
 
 from ..._meta import API_VTAG
 from ...constants import UPLOAD_TASKS_KEY
+from ...core.exceptions import FileMetaDataNotFoundError
 from ...dsm import get_dsm_provider
-from ...exceptions import FileMetaDataNotFoundError
 from ...models import (
     CopyAsSoftLinkParams,
     FileDownloadQueryParams,

services/storage/src/simcore_service_storage/api/rest/utils.py

@@ -7,15 +7,15 @@
 from pydantic import ValidationError
 from servicelib.aiohttp.aiopg_utils import DBAPIError
 
-from ...datcore_adapter.datcore_adapter_exceptions import DatcoreAdapterTimeoutError
-from ...db_access_layer import InvalidFileIdentifierError
-from ...exceptions import (
+from ...core.exceptions import (
     FileAccessRightError,
     FileMetaDataNotFoundError,
     LinkAlreadyExistsError,
     ProjectAccessRightError,
     ProjectNotFoundError,
 )
+from ...datcore_adapter.datcore_adapter_exceptions import DatcoreAdapterTimeoutError
+from ...db_access_layer import InvalidFileIdentifierError
 
 _logger = logging.getLogger(__name__)
 

services/storage/src/simcore_service_storage/exceptions.py renamed to services/storage/src/simcore_service_storage/core/exceptions.py

@@ -12,7 +12,7 @@
 from sqlalchemy import and_, literal_column
 from sqlalchemy.dialects.postgresql import insert as pg_insert
 
-from .exceptions import FileMetaDataNotFoundError
+from .core.exceptions import FileMetaDataNotFoundError
 from .models import FileMetaData, FileMetaDataAtDB, UserOrProjectFilter
 
 

services/storage/src/simcore_service_storage/db_file_meta_data.py

@@ -54,6 +54,13 @@
     SIMCORE_S3_ID,
     SIMCORE_S3_STR,
 )
+from .core.exceptions import (
+    FileAccessRightError,
+    FileMetaDataNotFoundError,
+    LinkAlreadyExistsError,
+    ProjectAccessRightError,
+    ProjectNotFoundError,
+)
 from .core.settings import Settings
 from .datcore_adapter import datcore_adapter
 from .db_access_layer import (
@@ -63,13 +70,6 @@
     get_readable_project_ids,
 )
 from .dsm_factory import BaseDataManager
-from .exceptions import (
-    FileAccessRightError,
-    FileMetaDataNotFoundError,
-    LinkAlreadyExistsError,
-    ProjectAccessRightError,
-    ProjectNotFoundError,
-)
 from .models import (
     DatasetMetaData,
     FileMetaData,

services/storage/src/simcore_service_storage/simcore_s3_dsm.py

@@ -13,7 +13,7 @@
 from servicelib.utils import ensure_ends_with
 
 from . import db_file_meta_data
-from .exceptions import FileMetaDataNotFoundError
+from .core.exceptions import FileMetaDataNotFoundError
 from .models import FileMetaData, FileMetaDataAtDB
 from .utils import convert_db_to_model
 

services/storage/src/simcore_service_storage/simcore_s3_dsm_utils.py

@@ -26,7 +26,7 @@
 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.exceptions import (
+from simcore_service_storage.core.exceptions import (
     FileAccessRightError,
     FileMetaDataNotFoundError,
 )

services/storage/tests/unit/test_dsm_dsmcleaner.py

@@ -11,13 +11,13 @@
 from pytest_mock import MockerFixture
 from servicelib.aiohttp.aiopg_utils import DBAPIError
 from simcore_service_storage.api.rest.utils import dsm_exception_handler
-from simcore_service_storage.db_access_layer import InvalidFileIdentifierError
-from simcore_service_storage.exceptions import (
+from simcore_service_storage.core.exceptions import (
     FileAccessRightError,
     FileMetaDataNotFoundError,
     ProjectAccessRightError,
     ProjectNotFoundError,
 )
+from simcore_service_storage.db_access_layer import InvalidFileIdentifierError
 
 
 @pytest.fixture()