Skip to content

Commit 119b892

Browse files
author
Andrei Neagu
committed
makes settings manadatory
1 parent 14eede7 commit 119b892

File tree

2 files changed

+9
-7
lines changed

2 files changed

+9
-7
lines changed

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

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -75,10 +75,7 @@ class ApplicationSettings(BaseApplicationSettings, MixinLoggingSettings):
7575
]
7676

7777
STORAGE_RABBITMQ: Annotated[
78-
RabbitSettings | None,
79-
Field(
80-
json_schema_extra={"auto_default_from_env": True},
81-
),
78+
RabbitSettings, Field(json_schema_extra={"auto_default_from_env": True})
8279
]
8380

8481
STORAGE_S3_CLIENT_MAX_TRANSFER_CONCURRENCY: Annotated[

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

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,23 @@
22

33
from fastapi import FastAPI
44
from servicelib.fastapi.long_running_tasks._server import setup
5+
from servicelib.long_running_tasks.models import RabbitNamespace
56
from servicelib.long_running_tasks.task import RedisNamespace
67

78
from .._meta import API_VTAG
89
from ..core.settings import get_application_settings
910

10-
_LONG_RUNNING_TASKS_NAMESPACE: Final[RedisNamespace] = "storage"
11+
_LRT_REDIS_NAMESPACE: Final[RedisNamespace] = "storage"
12+
_LRT_RABBIT_NAMESPACE: Final[RabbitNamespace] = "storage"
1113

1214

1315
def setup_rest_api_long_running_tasks_for_uploads(app: FastAPI) -> None:
16+
settings = get_application_settings(app)
1417
setup(
1518
app,
1619
router_prefix=f"/{API_VTAG}/futures",
17-
redis_settings=get_application_settings(app).STORAGE_REDIS,
18-
redis_namespace=_LONG_RUNNING_TASKS_NAMESPACE,
20+
redis_settings=settings.STORAGE_REDIS,
21+
redis_namespace=_LRT_REDIS_NAMESPACE,
22+
rabbit_settings=settings.STORAGE_RABBITMQ,
23+
rabbit_namespace=_LRT_RABBIT_NAMESPACE,
1924
)

0 commit comments

Comments
 (0)