moving modules

Author: sanderegg

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

@@ -16,10 +16,10 @@
 
 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 ...s3 import get_s3_client
-from ...settings import Settings
 
 _logger = logging.getLogger(__name__)
 

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

@@ -19,14 +19,14 @@
 
 # Exclusive for simcore-s3 storage -----------------------
 from ..._meta import API_VTAG
+from ...core.settings import Settings
 from ...dsm import get_dsm_provider
 from ...models import (
     LocationPathParams,
     StorageQueryParamsBase,
     SyncMetadataQueryParams,
     SyncMetadataResponse,
 )
-from ...settings import Settings
 from ...simcore_s3_dsm import SimcoreS3DataManager
 
 _logger = logging.getLogger(__name__)

services/storage/src/simcore_service_storage/cli.py

@@ -4,8 +4,8 @@
 from servicelib.logging_utils import config_all_loggers
 from settings_library.utils_cli import create_settings_command
 
-from . import application
-from .settings import Settings
+from .core import application
+from .core.settings import Settings
 
 LOG_LEVEL_STEP = logging.CRITICAL - logging.ERROR
 

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

@@ -15,15 +15,15 @@
 from servicelib.aiohttp.tracing import setup_tracing
 from settings_library.tracing import TracingSettings
 
-from ._meta import APP_NAME, APP_STARTED_BANNER_MSG, VERSION
-from .api.rest.utils import dsm_exception_handler
-from .db import setup_db
-from .dsm import setup_dsm
-from .dsm_cleaner import setup_dsm_cleaner
-from .long_running_tasks import setup_rest_api_long_running_tasks
-from .redis import setup_redis
-from .routes import setup_rest_api_routes
-from .s3 import setup_s3
+from .._meta import APP_NAME, APP_STARTED_BANNER_MSG, VERSION
+from ..api.rest.utils import dsm_exception_handler
+from ..db import setup_db
+from ..dsm import setup_dsm
+from ..dsm_cleaner import setup_dsm_cleaner
+from ..long_running_tasks import setup_rest_api_long_running_tasks
+from ..redis import setup_redis
+from ..routes import setup_rest_api_routes
+from ..s3 import setup_s3
 from .settings import Settings
 
 _ACCESS_LOG_FORMAT: Final[

services/storage/src/simcore_service_storage/application.py renamed to services/storage/src/simcore_service_storage/core/application.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 ..datcore_adapter.datcore_adapter_settings import DatcoreAdapterSettings
 
 
 class Settings(BaseCustomSettings, MixinLoggingSettings):

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

@@ -29,9 +29,9 @@
 from servicelib.logging_utils import log_catch, log_context
 
 from .constants import APP_CONFIG_KEY, APP_DSM_KEY
+from .core.settings import Settings
 from .dsm_factory import DataManagerProvider
 from .redis import get_redis_client
-from .settings import Settings
 from .simcore_s3_dsm import SimcoreS3DataManager
 
 _logger = logging.getLogger(__name__)

services/storage/src/simcore_service_storage/dsm_cleaner.py

@@ -7,7 +7,7 @@
 
 from ._meta import APP_NAME
 from .constants import APP_CONFIG_KEY
-from .settings import Settings
+from .core.settings import Settings
 
 _logger = logging.getLogger(__name__)
 

services/storage/src/simcore_service_storage/models/__init__.py

@@ -13,7 +13,7 @@
 from tenacity.wait import wait_fixed
 
 from .constants import APP_CONFIG_KEY, APP_S3_KEY, RETRY_WAIT_SECS
-from .settings import Settings
+from .core.settings import Settings
 
 _logger = logging.getLogger(__name__)