refactor

Author: sanderegg

services/dask-sidecar/src/simcore_service_dask_sidecar/cli.py

@@ -4,7 +4,7 @@
 from settings_library.utils_cli import create_settings_command, create_version_callback
 
 from ._meta import PROJECT_NAME, __version__
-from .settings import Settings
+from .settings import ApplicationSettings
 
 # SEE setup entrypoint 'simcore_service_dask_sidecar.cli:the_app'
 _logger = logging.getLogger(__name__)
@@ -15,4 +15,6 @@
 # COMMANDS
 #
 main.callback()(create_version_callback(__version__))
-main.command()(create_settings_command(settings_cls=Settings, logger=_logger))
+main.command()(
+    create_settings_command(settings_cls=ApplicationSettings, logger=_logger)
+)

services/dask-sidecar/src/simcore_service_dask_sidecar/computational_sidecar/core.py

@@ -27,7 +27,7 @@
 
 from ..dask_utils import TaskPublisher
 from ..file_utils import pull_file_from_remote, push_file_to_remote
-from ..settings import Settings
+from ..settings import ApplicationSettings
 from .docker_utils import (
     create_container_config,
     get_computational_shared_data_mount_point,
@@ -172,7 +172,7 @@ async def run(self, command: list[str]) -> TaskOutputData:
         # NOTE: this is for tracing purpose
         _logger.info("Running task owner: %s", self.task_parameters.task_owner)
 
-        settings = Settings.create_from_envs()
+        settings = ApplicationSettings.create_from_envs()
         run_id = f"{uuid4()}"
         async with Docker() as docker_client, TaskSharedVolumes(
             Path(f"{settings.SIDECAR_COMP_SERVICES_SHARED_FOLDER}/{run_id}")

services/dask-sidecar/src/simcore_service_dask_sidecar/computational_sidecar/docker_utils.py

@@ -39,7 +39,7 @@
 
 from ..dask_utils import TaskPublisher
 from ..file_utils import push_file_to_remote
-from ..settings import Settings
+from ..settings import ApplicationSettings
 from .constants import LEGACY_SERVICE_LOG_FILE_NAME
 from .models import (
     LEGACY_INTEGRATION_VERSION,
@@ -457,7 +457,7 @@ async def get_image_labels(
 
 
 async def get_computational_shared_data_mount_point(docker_client: Docker) -> Path:
-    app_settings = Settings.create_from_envs()
+    app_settings = ApplicationSettings.create_from_envs()
     try:
         logger.debug(
             "getting computational shared data mount point for %s",

services/dask-sidecar/src/simcore_service_dask_sidecar/settings.py

@@ -8,9 +8,7 @@
 from settings_library.utils_logging import MixinLoggingSettings
 
 
-class Settings(BaseCustomSettings, MixinLoggingSettings):
-    """Dask-sidecar app settings"""
-
+class ApplicationSettings(BaseCustomSettings, MixinLoggingSettings):
     SC_BUILD_TARGET: str | None = None
     SC_BOOT_MODE: str | None = None
     LOG_LEVEL: Annotated[
@@ -22,15 +20,11 @@ class Settings(BaseCustomSettings, MixinLoggingSettings):
         ),
     ] = LogLevel.INFO
 
-    # sidecar config ---
-
     SIDECAR_COMP_SERVICES_SHARED_VOLUME_NAME: str
     SIDECAR_COMP_SERVICES_SHARED_FOLDER: Path
 
     SIDECAR_INTERVAL_TO_CHECK_TASK_ABORTED_S: int | None = 5
 
-    # dask config ----
-
     DASK_START_AS_SCHEDULER: bool | None = Field(
         default=False, description="If this env is set, then the app boots as scheduler"
     )

services/dask-sidecar/src/simcore_service_dask_sidecar/tasks.py

@@ -18,7 +18,7 @@
 from ._meta import print_dask_sidecar_banner
 from .computational_sidecar.core import ComputationalSidecar
 from .dask_utils import TaskPublisher, get_current_task_resources, monitor_task_abortion
-from .settings import Settings
+from .settings import ApplicationSettings
 
 _logger = logging.getLogger(__name__)
 
@@ -53,7 +53,7 @@ def exit_gracefully(self, *_args):
 
 async def dask_setup(worker: distributed.Worker) -> None:
     """This is a special function recognized by the dask worker when starting with flag --preload"""
-    settings = Settings.create_from_envs()
+    settings = ApplicationSettings.create_from_envs()
     # set up logging
     logging.basicConfig(level=settings.LOG_LEVEL.value)
     logging.root.setLevel(level=settings.LOG_LEVEL.value)