big move

Author: sanderegg

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

@@ -43,7 +43,7 @@
     UploadLinks,
 )
 from ...simcore_s3_dsm import SimcoreS3DataManager
-from ...utils import create_upload_completion_task_name
+from ...utils.utils import create_upload_completion_task_name
 
 _logger = logging.getLogger(__name__)
 

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

@@ -17,8 +17,8 @@
 from ..._meta import API_VERSION, API_VTAG, PROJECT_NAME, VERSION
 from ...constants import APP_CONFIG_KEY
 from ...core.settings import Settings
-from ...db import get_engine_state
-from ...db import is_service_responsive as is_pg_responsive
+from ...modules.db.db import get_engine_state
+from ...modules.db.db import is_service_responsive as is_pg_responsive
 from ...modules.s3 import get_s3_client
 
 _logger = logging.getLogger(__name__)

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

@@ -14,8 +14,10 @@
     ProjectAccessRightError,
     ProjectNotFoundError,
 )
-from ...datcore_adapter.datcore_adapter_exceptions import DatcoreAdapterTimeoutError
-from ...db_access_layer import InvalidFileIdentifierError
+from ...modules.datcore_adapter.datcore_adapter_exceptions import (
+    DatcoreAdapterTimeoutError,
+)
+from ...modules.db.db_access_layer import InvalidFileIdentifierError
 
 _logger = logging.getLogger(__name__)
 

services/storage/src/simcore_service_storage/core/application.py

@@ -19,7 +19,7 @@
 from ..api.rest.utils import dsm_exception_handler
 from ..dsm import setup_dsm
 from ..dsm_cleaner import setup_dsm_cleaner
-from ..modules.db import setup_db
+from ..modules.db.db import setup_db
 from ..modules.long_running_tasks import setup_rest_api_long_running_tasks
 from ..modules.redis import setup_redis
 from ..modules.s3 import setup_s3

services/storage/src/simcore_service_storage/core/settings.py

@@ -17,7 +17,7 @@
 from settings_library.tracing import TracingSettings
 from settings_library.utils_logging import MixinLoggingSettings
 
-from ..datcore_adapter.datcore_adapter_settings import DatcoreAdapterSettings
+from ..modules.datcore_adapter.datcore_adapter_settings import DatcoreAdapterSettings
 
 
 class Settings(BaseCustomSettings, MixinLoggingSettings):

services/storage/src/simcore_service_storage/datcore_dsm.py

@@ -13,11 +13,13 @@
 from pydantic import AnyUrl, ByteSize
 
 from .constants import DATCORE_ID, DATCORE_STR
-from .datcore_adapter import datcore_adapter
-from .datcore_adapter.datcore_adapter_exceptions import DatcoreAdapterMultipleFilesError
-from .db_tokens import get_api_token_and_secret
 from .dsm_factory import BaseDataManager
 from .models import DatasetMetaData, FileMetaData, UploadLinks
+from .modules.datcore_adapter import datcore_adapter
+from .modules.datcore_adapter.datcore_adapter_exceptions import (
+    DatcoreAdapterMultipleFilesError,
+)
+from .modules.db.db_tokens import get_api_token_and_secret
 
 
 @dataclass

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

@@ -13,8 +13,8 @@
 from servicelib.aiohttp.client_session import get_client_session
 from servicelib.utils import logged_gather
 
-from ..constants import DATCORE_ID, DATCORE_STR, MAX_CONCURRENT_REST_CALLS
-from ..models import DatasetMetaData, FileMetaData
+from ...constants import DATCORE_ID, DATCORE_STR, MAX_CONCURRENT_REST_CALLS
+from ...models import DatasetMetaData, FileMetaData
 from .datcore_adapter_exceptions import (
     DatcoreAdapterClientError,
     DatcoreAdapterError,

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

@@ -13,7 +13,7 @@
 )
 from tenacity import retry
 
-from .constants import APP_AIOPG_ENGINE_KEY, APP_CONFIG_KEY
+from ...constants import APP_AIOPG_ENGINE_KEY, APP_CONFIG_KEY
 
 _logger = logging.getLogger(__name__)
 

services/storage/src/simcore_service_storage/modules/db/db_file_meta_data.py

@@ -12,8 +12,8 @@
 from sqlalchemy import and_, literal_column
 from sqlalchemy.dialects.postgresql import insert as pg_insert
 
-from .core.exceptions import FileMetaDataNotFoundError
-from .models import FileMetaData, FileMetaDataAtDB, UserOrProjectFilter
+from ...core.exceptions import FileMetaDataNotFoundError
+from ...models import FileMetaData, FileMetaDataAtDB, UserOrProjectFilter
 
 
 async def exists(conn: SAConnection, file_id: SimcoreS3FileID) -> bool:

services/storage/src/simcore_service_storage/modules/db/db_tokens.py

@@ -7,7 +7,7 @@
 from models_library.users import UserID
 from simcore_postgres_database.storage_models import tokens
 
-from .constants import APP_AIOPG_ENGINE_KEY, APP_CONFIG_KEY
+from ...constants import APP_AIOPG_ENGINE_KEY, APP_CONFIG_KEY
 
 _logger = logging.getLogger(__name__)