renaming

Author: sanderegg

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

@@ -11,9 +11,9 @@
 )
 
 # Exclusive for simcore-s3 storage -----------------------
-from ._meta import API_VTAG
-from .dsm import get_dsm_provider
-from .models import (
+from ..._meta import API_VTAG
+from ...dsm import get_dsm_provider
+from ...models import (
     FileMetaData,
     FilesMetadataDatasetPathParams,
     FilesMetadataDatasetQueryParams,

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

@@ -26,10 +26,10 @@
     parse_request_query_parameters_as,
 )
 
-from ._meta import API_VTAG
-from .dsm import get_dsm_provider
-from .exceptions import FileMetaDataNotFoundError
-from .models import (
+from ..._meta import API_VTAG
+from ...dsm import get_dsm_provider
+from ...exceptions import FileMetaDataNotFoundError
+from ...models import (
     CopyAsSoftLinkParams,
     FileDownloadQueryParams,
     FileMetaData,
@@ -41,8 +41,8 @@
     StorageQueryParamsBase,
     UploadLinks,
 )
-from .simcore_s3_dsm import SimcoreS3DataManager
-from .utils import create_upload_completion_task_name
+from ...simcore_s3_dsm import SimcoreS3DataManager
+from ...utils import create_upload_completion_task_name
 
 _logger = logging.getLogger(__name__)
 

services/storage/src/simcore_service_storage/api/rest/handlers_datasets.py renamed to services/storage/src/simcore_service_storage/api/rest/datasets.py

@@ -14,12 +14,12 @@
 from pydantic import TypeAdapter
 from servicelib.rest_constants import RESPONSE_MODEL_POLICY
 
-from ._meta import API_VERSION, API_VTAG, PROJECT_NAME, VERSION
-from .constants import APP_CONFIG_KEY
-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
+from ..._meta import API_VERSION, API_VTAG, PROJECT_NAME, VERSION
+from ...constants import APP_CONFIG_KEY
+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/handlers_files.py renamed to services/storage/src/simcore_service_storage/api/rest/files.py

@@ -18,11 +18,15 @@
 from servicelib.utils import fire_and_forget_task
 
 # Exclusive for simcore-s3 storage -----------------------
-from ._meta import API_VTAG
-from .dsm import get_dsm_provider
-from .models import LocationPathParams, StorageQueryParamsBase, SyncMetadataQueryParams
-from .settings import Settings
-from .simcore_s3_dsm import SimcoreS3DataManager
+from ..._meta import API_VTAG
+from ...dsm import get_dsm_provider
+from ...models import (
+    LocationPathParams,
+    StorageQueryParamsBase,
+    SyncMetadataQueryParams,
+)
+from ...settings import Settings
+from ...simcore_s3_dsm import SimcoreS3DataManager
 
 _logger = logging.getLogger(__name__)
 
@@ -81,7 +85,7 @@ async def _go():
                     "Sync metadata table completed: %d entries removed",
                     len(result),
                 )
-            except asyncio.TimeoutError:
+            except TimeoutError:
                 _logger.exception("Sync metadata table timed out (%s seconds)", timeout)
 
         fire_and_forget_task(

services/storage/src/simcore_service_storage/api/rest/handlers_health.py renamed to services/storage/src/simcore_service_storage/api/rest/health.py

@@ -20,17 +20,17 @@
 from servicelib.logging_utils import log_context
 from settings_library.s3 import S3Settings
 
-from . import sts
-from ._meta import API_VTAG
-from .dsm import get_dsm_provider
-from .models import (
+from ... import sts
+from ..._meta import API_VTAG
+from ...dsm import get_dsm_provider
+from ...models import (
     DeleteFolderQueryParams,
     FileMetaData,
     SearchFilesQueryParams,
     SimcoreS3FoldersParams,
     StorageQueryParamsBase,
 )
-from .simcore_s3_dsm import SimcoreS3DataManager
+from ...simcore_s3_dsm import SimcoreS3DataManager
 
 _logger = logging.getLogger(__name__)
 

services/storage/src/simcore_service_storage/api/rest/handlers_locations.py renamed to services/storage/src/simcore_service_storage/api/rest/locations.py

@@ -16,13 +16,13 @@
 from settings_library.tracing import TracingSettings
 
 from ._meta import APP_NAME, APP_STARTED_BANNER_MSG, VERSION
-from .api.rest.utils_handlers import dsm_exception_handler
+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 .rest import setup_rest
+from .routes import setup_rest_api_routes
 from .s3 import setup_s3
 from .settings import Settings
 
@@ -62,7 +62,7 @@ def create(settings: Settings) -> web.Application:
     setup_s3(app)
 
     setup_rest_api_long_running_tasks(app)
-    setup_rest(app)
+    setup_rest_api_routes(app)
 
     setup_dsm(app)
     if settings.STORAGE_CLEANER_INTERVAL_S:

services/storage/src/simcore_service_storage/api/rest/handlers_simcore_s3.py renamed to services/storage/src/simcore_service_storage/api/rest/simcore_s3.py

@@ -1,7 +1,3 @@
-""" RESTful API for simcore_service_storage
-
-"""
-
 import logging
 from pathlib import Path
 
@@ -13,21 +9,14 @@
     set_default_route_names,
 )
 
-from . import (
-    handlers_datasets,
-    handlers_files,
-    handlers_health,
-    handlers_locations,
-    handlers_simcore_s3,
-)
 from ._meta import API_VTAG
-from .handlers_files import UPLOAD_TASKS_KEY
+from .api.rest import datasets, files, health, locations, simcore_s3
 from .resources import storage_resources
 
 _logger = logging.getLogger(__name__)
 
 
-def setup_rest(app: web.Application):
+def setup_rest_api_routes(app: web.Application):
     """Setup the rest API module in the application in aiohttp fashion.
 
     - loads and validate openapi specs from a remote (e.g. apihub) or local location
@@ -44,19 +33,19 @@ def setup_rest(app: web.Application):
 
     # Connects handlers
     for routes in [
-        handlers_health.routes,
-        handlers_locations.routes,
-        handlers_datasets.routes,
-        handlers_files.routes,
-        handlers_simcore_s3.routes,
+        health.routes,
+        locations.routes,
+        datasets.routes,
+        files.routes,
+        simcore_s3.routes,
     ]:
         set_default_route_names(routes)
         app.router.add_routes(routes)
 
     _logger.debug("routes: %s", get_named_routes_as_message(app))
 
     # prepare container for upload tasks
-    app[UPLOAD_TASKS_KEY] = {}
+    app[files.UPLOAD_TASKS_KEY] = {}
 
     # Enable error, validation and envelop middleware on API routes
     append_rest_middlewares(app, api_version=f"/{API_VTAG}")