after renaming fix

Author: sanderegg

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

@@ -25,8 +25,6 @@
 
 routes = RouteTableDef()
 
-UPLOAD_TASKS_KEY = f"{__name__}.upload_tasks"
-
 
 @routes.get(
     f"/{API_VTAG}/locations/{{location_id}}/datasets", name="list_datasets_metadata"

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

@@ -27,6 +27,7 @@
 )
 
 from ..._meta import API_VTAG
+from ...constants import UPLOAD_TASKS_KEY
 from ...dsm import get_dsm_provider
 from ...exceptions import FileMetaDataNotFoundError
 from ...models import (
@@ -48,8 +49,6 @@
 
 routes = RouteTableDef()
 
-UPLOAD_TASKS_KEY = f"{__name__}.upload_tasks"
-
 
 @routes.get(
     f"/{API_VTAG}/locations/{{location_id}}/files/metadata", name="list_files_metadata"

services/storage/src/simcore_service_storage/application.py

@@ -74,7 +74,7 @@ def create(settings: Settings) -> web.Application:
     if settings.STORAGE_PROFILING:
         app.middlewares.append(profiling_middleware)
 
-    if settings.STORAGE_LOG_LEVEL == "DEBUG":
+    if settings.LOG_LEVEL == "DEBUG":
         setup_dev_error_logger(app)
 
     if settings.STORAGE_MONITORING_ENABLED:

services/storage/src/simcore_service_storage/constants.py

@@ -9,6 +9,7 @@
 MAX_CHUNK_SIZE = 1024
 MINUTE = 60
 
+UPLOAD_TASKS_KEY = f"{__name__}.upload_tasks"
 
 APP_CONFIG_KEY = application_keys.APP_CONFIG_KEY  # app-storage-key for config object
 

services/storage/src/simcore_service_storage/routes.py

@@ -11,6 +11,7 @@
 
 from ._meta import API_VTAG
 from .api.rest import datasets, files, health, locations, simcore_s3
+from .constants import UPLOAD_TASKS_KEY
 from .resources import storage_resources
 
 _logger = logging.getLogger(__name__)
@@ -45,7 +46,7 @@ def setup_rest_api_routes(app: web.Application):
     _logger.debug("routes: %s", get_named_routes_as_message(app))
 
     # prepare container for upload tasks
-    app[files.UPLOAD_TASKS_KEY] = {}
+    app[UPLOAD_TASKS_KEY] = {}
 
     # Enable error, validation and envelop middleware on API routes
     append_rest_middlewares(app, api_version=f"/{API_VTAG}")

services/storage/src/simcore_service_storage/settings.py

@@ -24,7 +24,7 @@ class Settings(BaseCustomSettings, MixinLoggingSettings):
     STORAGE_HOST: str = "0.0.0.0"  # nosec
     STORAGE_PORT: PortInt = TypeAdapter(PortInt).validate_python(8080)
 
-    STORAGE_LOG_LEVEL: Annotated[
+    LOG_LEVEL: Annotated[
         LogLevel,
         Field(
             validation_alias=AliasChoices("STORAGE_LOGLEVEL", "LOG_LEVEL", "LOGLEVEL"),

services/storage/tests/conftest.py

@@ -50,8 +50,8 @@
 from settings_library.s3 import S3Settings
 from simcore_postgres_database.storage_models import file_meta_data, projects, users
 from simcore_service_storage.application import create
+from simcore_service_storage.constants import UPLOAD_TASKS_KEY
 from simcore_service_storage.dsm import get_dsm_provider
-from simcore_service_storage.files import UPLOAD_TASKS_KEY
 from simcore_service_storage.models import S3BucketName
 from simcore_service_storage.s3 import get_s3_client
 from simcore_service_storage.settings import Settings

services/storage/tests/unit/test_handlers_files.py

@@ -50,8 +50,10 @@
 from pytest_simcore.helpers.parametrizations import byte_size_ids
 from pytest_simcore.helpers.s3 import upload_file_part, upload_file_to_presigned_link
 from servicelib.aiohttp import status
-from simcore_service_storage.constants import S3_UNDEFINED_OR_EXTERNAL_MULTIPART_ID
-from simcore_service_storage.files import UPLOAD_TASKS_KEY
+from simcore_service_storage.constants import (
+    S3_UNDEFINED_OR_EXTERNAL_MULTIPART_ID,
+    UPLOAD_TASKS_KEY,
+)
 from simcore_service_storage.models import S3BucketName, UploadID
 from tenacity.asyncio import AsyncRetrying
 from tenacity.retry import retry_if_exception_type

services/storage/tests/unit/test_handlers_health.py

@@ -6,12 +6,11 @@
 
 import simcore_service_storage._meta
 from aiohttp.test_utils import TestClient
-from models_library.api_schemas_storage import S3BucketName
+from models_library.api_schemas_storage import HealthCheck, S3BucketName
 from models_library.app_diagnostics import AppStatusCheck
 from moto.server import ThreadedMotoServer
 from pytest_simcore.helpers.assert_checks import assert_status
 from servicelib.aiohttp import status
-from simcore_service_storage.health import HealthCheck
 from types_aiobotocore_s3 import S3Client
 
 pytest_simcore_core_services_selection = ["postgres"]