added director-v0 client to dynamic-scheduler

Author: Andrei Neagu

packages/common-library/src/common_library/unset.py

@@ -10,3 +10,7 @@ class UnSet:
 
 def as_dict_exclude_unset(**params) -> dict[str, Any]:
     return {k: v for k, v in params.items() if not isinstance(v, UnSet)}
+
+
+def as_dict_exclude_none(**params) -> dict[str, Any]:
+    return {k: v for k, v in params.items() if v is not None}

packages/models-library/src/models_library/service_settings_labels.py

@@ -589,7 +589,7 @@ class SimcoreServiceLabels(DynamicSidecarServiceLabels):
     settings: Annotated[
         Json[SimcoreServiceSettingsLabel],
         Field(
-            default_factory=dict,
+            default_factory=lambda: SimcoreServiceSettingsLabel.model_validate([]),
             alias="simcore.service.settings",
             description=(
                 "Json encoded. Contains setting like environment variables and "

packages/service-library/src/servicelib/fastapi/http_client_thin.py

@@ -203,7 +203,7 @@ def __init__(
         base_url: URLTypes | None = None,
         default_http_client_timeout: TimeoutTypes | None = None,
         extra_allowed_method_names: set[str] | None = None,
-        tracing_settings: TracingSettings | None,
+        tracing_settings: TracingSettings | None = None,
     ) -> None:
         _assert_public_interface(self, extra_allowed_method_names)
 

packages/settings-library/src/settings_library/director_v0.py

@@ -0,0 +1,25 @@
+from functools import cached_property
+
+from pydantic import AnyHttpUrl, Field, TypeAdapter
+from settings_library.base import BaseCustomSettings
+from settings_library.basic_types import PortInt, VersionTag
+
+
+class DirectorV0Settings(BaseCustomSettings):
+    DIRECTOR_V0_ENABLED: bool = True
+
+    DIRECTOR_HOST: str = "director"
+    DIRECTOR_PORT: PortInt = TypeAdapter(PortInt).validate_python(8000)
+    DIRECTOR_V0_VTAG: VersionTag = Field(
+        default="v0", description="Director-v0 service API's version tag"
+    )
+
+    @cached_property
+    def endpoint(self) -> str:
+        url = AnyHttpUrl.build(  # pylint: disable=no-member
+            scheme="http",
+            host=self.DIRECTOR_HOST,
+            port=self.DIRECTOR_PORT,
+            path=f"{self.DIRECTOR_V0_VTAG}",
+        )
+        return f"{url}"

services/director-v2/src/simcore_service_director_v2/core/settings.py

@@ -8,7 +8,7 @@
 
 from common_library.pydantic_validators import validate_numeric_string_as_timedelta
 from fastapi import FastAPI
-from models_library.basic_types import LogLevel, PortInt, VersionTag
+from models_library.basic_types import LogLevel, PortInt
 from models_library.clusters import (
     BaseCluster,
     ClusterAuthentication,
@@ -28,6 +28,7 @@
 from settings_library.application import BaseApplicationSettings
 from settings_library.base import BaseCustomSettings
 from settings_library.catalog import CatalogSettings
+from settings_library.director_v0 import DirectorV0Settings
 from settings_library.docker_registry import RegistrySettings
 from settings_library.http_client_request import ClientRequestSettings
 from settings_library.node_ports import (
@@ -49,26 +50,6 @@
 from .dynamic_services_settings import DynamicServicesSettings
 
 
-class DirectorV0Settings(BaseCustomSettings):
-    DIRECTOR_V0_ENABLED: bool = True
-
-    DIRECTOR_HOST: str = "director"
-    DIRECTOR_PORT: PortInt = PortInt(8080)
-    DIRECTOR_V0_VTAG: VersionTag = Field(
-        default="v0", description="Director-v0 service API's version tag"
-    )
-
-    @cached_property
-    def endpoint(self) -> str:
-        url = AnyHttpUrl.build(  # pylint: disable=no-member
-            scheme="http",
-            host=self.DIRECTOR_HOST,
-            port=self.DIRECTOR_PORT,
-            path=f"{self.DIRECTOR_V0_VTAG}",
-        )
-        return f"{url}"
-
-
 class ComputationalBackendSettings(BaseCustomSettings):
     COMPUTATIONAL_BACKEND_ENABLED: bool = Field(
         default=True,

services/director-v2/src/simcore_service_director_v2/modules/director_v0.py

@@ -95,7 +95,7 @@ async def get_service_extras(
         raise HTTPException(status_code=resp.status_code, detail=resp.content)
 
     @log_decorator(logger=logger)
-    async def get_running_service_details(
+    async def get_running_service_details(  # required
         self, service_uuid: NodeID
     ) -> RunningDynamicServiceDetails:
         resp = await self._request(
@@ -108,7 +108,7 @@ async def get_running_service_details(
         raise HTTPException(status_code=resp.status_code, detail=resp.content)
 
     @log_decorator(logger=logger)
-    async def get_service_labels(
+    async def get_service_labels(  # required
         self, service: ServiceKeyVersion
     ) -> SimcoreServiceLabels:
         resp = await self._request(
@@ -121,7 +121,7 @@ async def get_service_labels(
         raise HTTPException(status_code=resp.status_code, detail=resp.content)
 
     @log_decorator(logger=logger)
-    async def get_running_services(
+    async def get_running_services(  # required
         self, user_id: UserID | None = None, project_id: ProjectID | None = None
     ) -> list[RunningDynamicServiceDetails]:
         query_params = {}

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

@@ -19,6 +19,7 @@
 from ..api.rest.routes import setup_rest_api
 from ..api.rpc.routes import setup_rpc_api_routes
 from ..services.deferred_manager import setup_deferred_manager
+from ..services.director_v0 import setup_director_v0
 from ..services.director_v2 import setup_director_v2
 from ..services.notifier import setup_notifier
 from ..services.rabbitmq import setup_rabbitmq
@@ -62,6 +63,7 @@ def create_app(settings: ApplicationSettings | None = None) -> FastAPI:
     # PLUGINS SETUP
 
     setup_director_v2(app)
+    setup_director_v0(app)
 
     setup_rabbitmq(app)
     setup_rpc_api_routes(app)

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

@@ -5,7 +5,9 @@
 from servicelib.logging_utils_filtering import LoggerName, MessageSubstring
 from settings_library.application import BaseApplicationSettings
 from settings_library.basic_types import LogLevel, VersionTag
+from settings_library.director_v0 import DirectorV0Settings
 from settings_library.director_v2 import DirectorV2Settings
+from settings_library.http_client_request import ClientRequestSettings
 from settings_library.rabbit import RabbitSettings
 from settings_library.redis import RedisSettings
 from settings_library.tracing import TracingSettings
@@ -128,6 +130,15 @@ class ApplicationSettings(_BaseApplicationSettings):
         default=True, description="If true, it displays swagger doc at /doc"
     )
 
+    CLIENT_REQUEST: ClientRequestSettings = Field(
+        json_schema_extra={"auto_default_from_env": True}
+    )
+
+    DYNAMIC_SCHEDULER_DIRECTOR_V0_SETTINGS: DirectorV0Settings = Field(
+        json_schema_extra={"auto_default_from_env": True},
+        description="settings for director service",
+    )
+
     DYNAMIC_SCHEDULER_DIRECTOR_V2_SETTINGS: DirectorV2Settings = Field(
         json_schema_extra={"auto_default_from_env": True},
         description="settings for director-v2 service",

services/dynamic-scheduler/src/simcore_service_dynamic_scheduler/services/director_v0/__init__.py

@@ -0,0 +1,7 @@
+from ._public_client import DirectorV0PublicClient
+from ._setup import setup_director_v0
+
+__all__: tuple[str, ...] = (
+    "DirectorV0PublicClient",
+    "setup_director_v0",
+)

services/dynamic-scheduler/src/simcore_service_dynamic_scheduler/services/director_v0/_public_client.py

@@ -0,0 +1,71 @@
+import logging
+from typing import Any, cast
+
+import httpx
+from fastapi import FastAPI
+from models_library.api_schemas_directorv2.dynamic_services_service import (
+    RunningDynamicServiceDetails,
+)
+from models_library.projects import ProjectID
+from models_library.projects_nodes_io import NodeID
+from models_library.service_settings_labels import SimcoreServiceLabels
+from models_library.services_base import ServiceKeyVersion
+from models_library.users import UserID
+from pydantic import TypeAdapter
+from servicelib.fastapi.app_state import SingletonInAppStateMixin
+
+from ._thin_client import DirectorV0ThinClient
+
+logger = logging.getLogger(__name__)
+
+
+def _unenvelope_or_raise_error(resp: httpx.Response) -> list[Any] | dict[str, Any]:
+    """
+    Director responses are enveloped
+    If successful response, we un-envelop it and return data as a dict
+    If error, is detected raise an ValueError
+    """
+    body = resp.json()
+    if "data" in body:
+        return body["data"]
+
+    msg = f"Unexpected, data was not returned: {body=}"
+    raise ValueError(msg)
+
+
+class DirectorV0PublicClient(SingletonInAppStateMixin):
+    app_state_name: str = "director_v0_public_client"
+
+    def __init__(self, app: FastAPI) -> None:
+        self.app = app
+
+    async def get_running_service_details(
+        self, node_id: NodeID
+    ) -> RunningDynamicServiceDetails:
+        response = await DirectorV0ThinClient.get_from_app_state(
+            self.app
+        ).get_running_interactive_service_details(node_id)
+        return TypeAdapter(RunningDynamicServiceDetails).validate_python(
+            _unenvelope_or_raise_error(response)
+        )
+
+    async def get_service_labels(  # required
+        self, service: ServiceKeyVersion
+    ) -> SimcoreServiceLabels:
+        response = await DirectorV0ThinClient.get_from_app_state(
+            self.app
+        ).get_services_labels(service)
+        return TypeAdapter(SimcoreServiceLabels).validate_python(
+            _unenvelope_or_raise_error(response)
+        )
+
+    async def get_running_services(  # required
+        self, user_id: UserID | None = None, project_id: ProjectID | None = None
+    ) -> list[RunningDynamicServiceDetails]:
+        response = await DirectorV0ThinClient.get_from_app_state(
+            self.app
+        ).get_running_interactive_services(user_id=user_id, project_id=project_id)
+        return [
+            RunningDynamicServiceDetails(**x)
+            for x in cast(list[dict[str, Any]], _unenvelope_or_raise_error(response))
+        ]