renamed env var

Author: Andrei Neagu

.env-devel

@@ -126,7 +126,7 @@ DIRECTOR_V2_TRACING={}
 # DYNAMIC_SCHEDULER ----
 DYNAMIC_SCHEDULER_LOGLEVEL=DEBUG
 DYNAMIC_SCHEDULER_PROFILING=1
-DYNAMIC_SCHEDULER_SCHEDULING_MODE=VIA_DIRECTOR_V2
+DYNAMIC_SCHEDULER_USE_INTERNAL_SCHEDULER=0
 DYNAMIC_SCHEDULER_STOP_SERVICE_TIMEOUT=01:00:00
 DYNAMIC_SCHEDULER_TRACING={}
 

services/docker-compose.yml

@@ -562,7 +562,7 @@ services:
       REDIS_PASSWORD: ${REDIS_PASSWORD}
       DIRECTOR_V2_HOST: ${DIRECTOR_V2_HOST}
       DIRECTOR_V2_PORT: ${DIRECTOR_V2_PORT}
-      DYNAMIC_SCHEDULER_SCHEDULING_MODE: ${DYNAMIC_SCHEDULER_SCHEDULING_MODE}
+      DYNAMIC_SCHEDULER_USE_INTERNAL_SCHEDULER: ${DYNAMIC_SCHEDULER_USE_INTERNAL_SCHEDULER}
       DYNAMIC_SCHEDULER_LOGLEVEL: ${DYNAMIC_SCHEDULER_LOGLEVEL}
       DYNAMIC_SCHEDULER_STOP_SERVICE_TIMEOUT: ${DYNAMIC_SCHEDULER_STOP_SERVICE_TIMEOUT}
       DYNAMIC_SCHEDULER_PROFILING: ${DYNAMIC_SCHEDULER_PROFILING}

services/dynamic-scheduler/src/simcore_service_dynamic_scheduler/core/settings.py

@@ -1,5 +1,4 @@
 import datetime
-from enum import StrEnum
 from typing import Annotated
 
 from pydantic import AliasChoices, Field, TypeAdapter, field_validator
@@ -15,11 +14,6 @@
 from .._meta import API_VERSION, API_VTAG, PROJECT_NAME
 
 
-class SchedulingMode(StrEnum):
-    INTERNAL = "INTERNAL"
-    VIA_DIRECTOR_V2 = "VIA_DIRECTOR_V2"
-
-
 class _BaseApplicationSettings(BaseApplicationSettings, MixinLoggingSettings):
     """Base settings of any osparc service's app"""
 
@@ -74,8 +68,8 @@ class _BaseApplicationSettings(BaseApplicationSettings, MixinLoggingSettings):
         ),
     )
 
-    DYNAMIC_SCHEDULER_SCHEDULING_MODE: SchedulingMode = Field(
-        SchedulingMode.VIA_DIRECTOR_V2,
+    DYNAMIC_SCHEDULER_USE_INTERNAL_SCHEDULER: bool = Field(
+        default=False,
         description=(
             "this is a way to switch between different dynamic schedulers for the new style services"
             # NOTE: this option should be removed when the scheduling will be done via this service

services/dynamic-scheduler/src/simcore_service_dynamic_scheduler/services/scheduler_interface.py

@@ -7,7 +7,7 @@
 from models_library.api_schemas_webserver.projects_nodes import NodeGet, NodeGetIdle
 from models_library.projects_nodes_io import NodeID
 
-from ..core.settings import ApplicationSettings, SchedulingMode
+from ..core.settings import ApplicationSettings
 from .director_v2 import DirectorV2Client
 from .service_tracker import set_request_as_running, set_request_as_stopped
 
@@ -16,7 +16,7 @@ async def get_service_status(
     app: FastAPI, *, node_id: NodeID
 ) -> NodeGet | DynamicServiceGet | NodeGetIdle:
     settings: ApplicationSettings = app.state.settings
-    if settings.DYNAMIC_SCHEDULER_SCHEDULING_MODE == SchedulingMode.INTERNAL:
+    if settings.DYNAMIC_SCHEDULER_USE_INTERNAL_SCHEDULER:
         raise NotImplementedError
 
     director_v2_client = DirectorV2Client.get_from_app_state(app)
@@ -30,7 +30,7 @@ async def run_dynamic_service(
     app: FastAPI, *, dynamic_service_start: DynamicServiceStart
 ) -> NodeGet | DynamicServiceGet:
     settings: ApplicationSettings = app.state.settings
-    if settings.DYNAMIC_SCHEDULER_SCHEDULING_MODE == SchedulingMode.INTERNAL:
+    if settings.DYNAMIC_SCHEDULER_USE_INTERNAL_SCHEDULER:
         raise NotImplementedError
 
     director_v2_client = DirectorV2Client.get_from_app_state(app)
@@ -46,7 +46,7 @@ async def stop_dynamic_service(
     app: FastAPI, *, dynamic_service_stop: DynamicServiceStop
 ) -> None:
     settings: ApplicationSettings = app.state.settings
-    if settings.DYNAMIC_SCHEDULER_SCHEDULING_MODE == SchedulingMode.INTERNAL:
+    if settings.DYNAMIC_SCHEDULER_USE_INTERNAL_SCHEDULER:
         raise NotImplementedError
 
     director_v2_client = DirectorV2Client.get_from_app_state(app)

services/dynamic-scheduler/tests/unit/api_rpc/test_api_rpc__services.py

@@ -30,7 +30,6 @@
 )
 from settings_library.rabbit import RabbitSettings
 from settings_library.redis import RedisSettings
-from simcore_service_dynamic_scheduler.core.settings import SchedulingMode
 
 pytest_simcore_core_services_selection = [
     "redis",
@@ -137,12 +136,12 @@ def mock_director_v2_service_state(
 
 @pytest.fixture(
     params=[
-        SchedulingMode.VIA_DIRECTOR_V2,
-        # NOTE: enable below when INTERNAL scheduler is impelmented
-        #   SchedulingMode.INTERNAL,
+        False,
+        # NOTE: enable below when INTERNAL scheduler is implemented
+        #   True,
     ]
 )
-def scheduling_mode(request: pytest.FixtureRequest) -> SchedulingMode:
+def use_internal_scheduler(request: pytest.FixtureRequest) -> bool:
     return request.param
 
 
@@ -151,13 +150,13 @@ def app_environment(
     app_environment: EnvVarsDict,
     rabbit_service: RabbitSettings,
     redis_service: RedisSettings,
-    scheduling_mode: SchedulingMode,
+    use_internal_scheduler: bool,
     monkeypatch: pytest.MonkeyPatch,
 ) -> EnvVarsDict:
     setenvs_from_dict(
         monkeypatch,
         {
-            "DYNAMIC_SCHEDULER_SCHEDULING_MODE": scheduling_mode,
+            "DYNAMIC_SCHEDULER_USE_INTERNAL_SCHEDULER": f"{use_internal_scheduler}",
         },
     )
     return app_environment