[DOP-21268] - split Settings to SyncmasterSettings, WorkerSettings(SyncmasterSettings), BackendSettings(SyncmasterSettings)

Author: maxim-lixakov

syncmaster/backend/__init__.py

@@ -17,9 +17,9 @@
 from syncmaster.backend.middlewares import apply_middlewares
 from syncmaster.backend.providers.auth import AuthProvider
 from syncmaster.backend.services.unit_of_work import UnitOfWork
+from syncmaster.backend.settings import BackendSettings as Settings
 from syncmaster.db.factory import create_session_factory, get_uow
 from syncmaster.exceptions import SyncmasterError
-from syncmaster.settings import Settings
 
 
 def application_factory(settings: Settings) -> FastAPI:

syncmaster/backend/api/v1/runs.py

@@ -2,14 +2,12 @@
 # SPDX-License-Identifier: Apache-2.0
 import asyncio
 from datetime import datetime
-from typing import Annotated
 
 from asgi_correlation_id import correlation_id
 from fastapi import APIRouter, Depends, Query
 from jinja2 import Template
 from kombu.exceptions import KombuError
 
-from syncmaster.backend.dependencies import Stub
 from syncmaster.backend.services import UnitOfWork, get_user
 from syncmaster.db.models import RunType, Status, User
 from syncmaster.db.utils import Permission
@@ -23,8 +21,8 @@
     ReadRunSchema,
     RunPageSchema,
 )
-from syncmaster.settings import Settings
 from syncmaster.worker.config import celery
+from syncmaster.worker.settings import worker_settings
 
 router = APIRouter(tags=["Runs"], responses=get_error_responses())
 
@@ -83,7 +81,6 @@ async def read_run(
 @router.post("/runs")
 async def start_run(
     create_run_data: CreateRunSchema,
-    settings: Annotated[Settings, Depends(Stub(Settings))],
     unit_of_work: UnitOfWork = Depends(UnitOfWork),
     current_user: User = Depends(get_user(is_active=True)),
 ) -> ReadRunSchema:
@@ -120,7 +117,7 @@ async def start_run(
             type=RunType.MANUAL,
         )
 
-        log_url = Template(settings.worker.LOG_URL_TEMPLATE).render(
+        log_url = Template(worker_settings.LOG_URL_TEMPLATE).render(
             run=run,
             correlation_id=correlation_id.get(),
         )

syncmaster/backend/export_openapi_schema.py

@@ -8,7 +8,7 @@
 from fastapi import FastAPI
 
 from syncmaster.backend import application_factory
-from syncmaster.settings import Settings
+from syncmaster.backend.settings import BackendSettings as Settings
 
 
 def get_openapi_schema(app: FastAPI) -> dict:

syncmaster/backend/middlewares/__init__.py

@@ -12,7 +12,7 @@
 from syncmaster.backend.middlewares.request_id import apply_request_id_middleware
 from syncmaster.backend.middlewares.session import apply_session_middleware
 from syncmaster.backend.middlewares.static_files import apply_static_files
-from syncmaster.settings import Settings
+from syncmaster.backend.settings import BackendSettings as Settings
 
 
 def apply_middlewares(

syncmaster/backend/middlewares/cors.py

@@ -3,7 +3,7 @@
 from fastapi import FastAPI
 from starlette.middleware.cors import CORSMiddleware
 
-from syncmaster.settings.server import CORSSettings
+from syncmaster.backend.settings.server import CORSSettings
 
 
 def apply_cors_middleware(app: FastAPI, settings: CORSSettings) -> FastAPI:

syncmaster/backend/middlewares/monitoring/metrics.py

@@ -4,8 +4,8 @@
 from starlette.responses import PlainTextResponse
 from starlette_exporter import PrometheusMiddleware, handle_metrics
 
+from syncmaster.backend.settings.server.monitoring import MonitoringSettings
 from syncmaster.backend.utils.slug import slugify
-from syncmaster.settings.server.monitoring import MonitoringSettings
 
 DEFAULT_SKIP_PATHS = {
     "/monitoring/metrics",

syncmaster/backend/middlewares/openapi.py

@@ -12,7 +12,7 @@
 from starlette.requests import Request
 from starlette.responses import JSONResponse
 
-from syncmaster.settings.server.openapi import OpenAPISettings
+from syncmaster.backend.settings.server.openapi import OpenAPISettings
 
 
 async def custom_openapi(request: Request) -> JSONResponse:

syncmaster/backend/middlewares/request_id.py

@@ -4,7 +4,7 @@
 from fastapi import FastAPI
 from uuid6 import uuid7
 
-from syncmaster.settings.server import RequestIDSettings
+from syncmaster.backend.settings.server import RequestIDSettings
 
 
 def apply_request_id_middleware(app: FastAPI, settings: RequestIDSettings) -> FastAPI:

syncmaster/backend/middlewares/static_files.py

@@ -3,7 +3,7 @@
 from fastapi import FastAPI
 from fastapi.staticfiles import StaticFiles
 
-from syncmaster.settings.server.static_files import StaticFilesSettings
+from syncmaster.backend.settings.server.static_files import StaticFilesSettings
 
 
 def apply_static_files(app: FastAPI, settings: StaticFilesSettings) -> FastAPI:

syncmaster/backend/providers/auth/dummy_provider.py

@@ -11,11 +11,11 @@
 from syncmaster.backend.dependencies import Stub
 from syncmaster.backend.providers.auth.base_provider import AuthProvider
 from syncmaster.backend.services import UnitOfWork
+from syncmaster.backend.settings.auth.dummy import DummyAuthProviderSettings
 from syncmaster.backend.utils.jwt import decode_jwt, sign_jwt
 from syncmaster.db.models import User
 from syncmaster.exceptions import EntityNotFoundError
 from syncmaster.exceptions.auth import AuthorizationError
-from syncmaster.settings.auth.dummy import DummyAuthProviderSettings
 
 log = logging.getLogger(__name__)