[DOP-19992] - remove importing class WorkerSettings

Author: maxim-lixakov

syncmaster/backend/api/v1/runs.py

@@ -22,9 +22,7 @@
     RunPageSchema,
 )
 from syncmaster.worker.config import celery
-
-# TODO: remove global import of WorkerSettings
-from syncmaster.worker.settings import WorkerSettings as Settings
+from syncmaster.worker.settings import get_worker_settings
 
 router = APIRouter(tags=["Runs"], responses=get_error_responses())
 
@@ -119,7 +117,7 @@ async def start_run(
             type=RunType.MANUAL,
         )
 
-        log_url = Template(Settings().LOG_URL_TEMPLATE).render(
+        log_url = Template(get_worker_settings().LOG_URL_TEMPLATE).render(
             run=run,
             correlation_id=correlation_id.get(),
         )

syncmaster/scheduler/settings/__init__.py

@@ -13,16 +13,16 @@ class SchedulerSettings(SyncmasterSettings):
 
     .. code-block:: bash
 
-        SYNCMASTER__SCHEDULER__TRANSFER_FETCHING_TIMEOUT=200
+        SYNCMASTER__SCHEDULER__TRANSFER_FETCHING_TIMEOUT_SECONDS=200
     """
 
     TRANSFER_FETCHING_TIMEOUT_SECONDS: int = Field(
         180,
         description="Timeout for fetching transfers in seconds",
-        alias="SCHEDULER__TRANSFER_FETCHING_TIMEOUT_SECONDS",
+        alias="SYNCMASTER__SCHEDULER__TRANSFER_FETCHING_TIMEOUT_SECONDS",
     )
     MISFIRE_GRACE_TIME_SECONDS: int = Field(
         300,
         description="Grace time for misfired jobs in seconds",
-        alias="SCHEDULER__MISFIRE_GRACE_TIME_SECONDS",
+        alias="SYNCMASTER__SCHEDULER__MISFIRE_GRACE_TIME_SECONDS",
     )

syncmaster/worker/base.py

@@ -3,13 +3,12 @@
 from celery import Task
 from sqlalchemy import create_engine
 
-# TODO: remove global import of WorkerSettings
-from syncmaster.worker.settings import WorkerSettings as Settings
+from syncmaster.worker.settings import get_worker_settings
 
 
 class WorkerTask(Task):
     def __init__(self) -> None:
-        self.settings = Settings()
+        self.settings = get_worker_settings()
         self.engine = create_engine(
             url=self.settings.database.sync_url,
         )

syncmaster/worker/config.py

@@ -3,11 +3,9 @@
 from celery import Celery
 
 from syncmaster.worker.base import WorkerTask
+from syncmaster.worker.settings import get_worker_settings
 
-# TODO: remove global import of WorkerSettings
-from syncmaster.worker.settings import WorkerSettings as Settings
-
-worker_settings = Settings()
+worker_settings = get_worker_settings()
 celery = Celery(
     __name__,
     broker=worker_settings.broker.url,

syncmaster/worker/controller.py

@@ -25,9 +25,7 @@
 from syncmaster.worker.handlers.db.postgres import PostgresHandler
 from syncmaster.worker.handlers.file.hdfs import HDFSHandler
 from syncmaster.worker.handlers.file.s3 import S3Handler
-
-# TODO: remove global import of WorkerSettings
-from syncmaster.worker.settings import WorkerSettings as Settings
+from syncmaster.worker.settings import WorkerSettings
 
 logger = logging.getLogger(__name__)
 
@@ -85,8 +83,8 @@ def __init__(
             connection_auth_data=target_auth_data,
         )
 
-    def perform_transfer(self) -> None:
-        spark = Settings().CREATE_SPARK_SESSION_FUNCTION(
+    def perform_transfer(self, settings: WorkerSettings) -> None:
+        spark = settings.CREATE_SPARK_SESSION_FUNCTION(
             run=self.run,
             source=self.source_handler.connection_dto,
             target=self.target_handler.connection_dto,

syncmaster/worker/settings/__init__.py

@@ -32,3 +32,7 @@ class WorkerSettings(SyncmasterSettings):
         description="Function to create Spark session for worker",
         alias="SYNCMASTER__WORKER__CREATE_SPARK_SESSION_FUNCTION",
     )
+
+
+def get_worker_settings(settings: WorkerSettings | None = None) -> WorkerSettings:
+    return WorkerSettings() if settings is None else settings

syncmaster/worker/transfer.py

@@ -18,12 +18,11 @@
 from syncmaster.worker.base import WorkerTask
 from syncmaster.worker.config import celery
 from syncmaster.worker.controller import TransferController
-from syncmaster.worker.settings import WorkerSettings as WorkerSettings
+from syncmaster.worker.settings import get_worker_settings
 
 logger = get_task_logger(__name__)
 
-# TODO: remove global import of WorkerSettings
-CORRELATION_CELERY_HEADER_ID = WorkerSettings().CORRELATION_CELERY_HEADER_ID
+CORRELATION_CELERY_HEADER_ID = get_worker_settings().CORRELATION_CELERY_HEADER_ID
 
 
 @celery.task(name="run_transfer_task", bind=True, track_started=True)