refactored interfaces

Author: Andrei Neagu

packages/models-library/src/models_library/api_schemas_directorv2/dynamic_services.py

@@ -5,6 +5,7 @@
 
 from ..resource_tracker import HardwareInfo, PricingInfo
 from ..services import ServicePortKey
+from ..services_creation import CreateServiceMetricsAdditionalParams
 from ..services_resources import ServiceResourcesDict, ServiceResourcesDictHelpers
 from ..wallets import WalletInfo
 from .dynamic_services_service import RunningDynamicServiceDetails, ServiceDetails
@@ -104,3 +105,7 @@ class GetProjectInactivityResponse(BaseModel):
     is_inactive: bool
 
     model_config = ConfigDict(json_schema_extra={"example": {"is_inactive": "false"}})
+
+
+class ContainersCreate(BaseModel):
+    metrics_params: CreateServiceMetricsAdditionalParams

services/dynamic-sidecar/src/simcore_service_dynamic_sidecar/api/rest/containers_long_running_tasks.py

@@ -2,15 +2,13 @@
 from typing import Annotated
 
 from fastapi import APIRouter, Depends, Request, status
+from models_library.api_schemas_directorv2.dynamic_services import ContainersCreate
 from servicelib.fastapi.long_running_tasks._manager import FastAPILongRunningManager
 from servicelib.fastapi.long_running_tasks.server import get_long_running_manager
 from servicelib.fastapi.requests_decorators import cancel_on_disconnect
 from servicelib.long_running_tasks.models import TaskId
 
-from ...models.schemas.containers import ContainersCreate
-from ...modules.inputs import InputsState
 from ...services import containers_long_running_tasks
-from ._dependencies import get_inputs_state
 
 router = APIRouter()
 
@@ -134,15 +132,11 @@ async def ports_inputs_pull_task(
     long_running_manager: Annotated[
         FastAPILongRunningManager, Depends(get_long_running_manager)
     ],
-    inputs_state: Annotated[InputsState, Depends(get_inputs_state)],
     port_keys: list[str] | None = None,
 ) -> TaskId:
     _ = request
     return await containers_long_running_tasks.ports_inputs_pull_task(
-        long_running_manager.rpc_client,
-        long_running_manager.lrt_namespace,
-        inputs_state,
-        port_keys,
+        long_running_manager.rpc_client, long_running_manager.lrt_namespace, port_keys
     )
 
 

services/dynamic-sidecar/src/simcore_service_dynamic_sidecar/models/schemas/containers.py

@@ -1,10 +1,5 @@
-from models_library.services_creation import CreateServiceMetricsAdditionalParams
 from pydantic import BaseModel
 
 
 class ContainersComposeSpec(BaseModel):
     docker_compose_yaml: str
-
-
-class ContainersCreate(BaseModel):
-    metrics_params: CreateServiceMetricsAdditionalParams

services/dynamic-sidecar/src/simcore_service_dynamic_sidecar/modules/long_running_tasks.py

@@ -6,6 +6,7 @@
 from typing import Any, Final
 
 from fastapi import FastAPI
+from models_library.api_schemas_directorv2.dynamic_services import ContainersCreate
 from models_library.api_schemas_long_running_tasks.base import TaskProgress
 from models_library.generated_models.docker_rest_api import ContainerState
 from models_library.rabbitmq_messages import ProgressType, SimcorePlatformStatus
@@ -48,9 +49,9 @@
 from ..core.utils import CommandResult
 from ..core.validation import parse_compose_spec
 from ..models.schemas.application_health import ApplicationHealth
-from ..models.schemas.containers import ContainersCreate
 from ..models.shared_store import SharedStore
 from ..modules import nodeports, user_services_preferences
+from ..modules.inputs import InputsState
 from ..modules.mounted_fs import MountedVolumes
 from ..modules.notifications._notifications_ports import PortNotifier
 from ..modules.outputs import OutputsManager, event_propagation_disabled
@@ -488,11 +489,10 @@ async def task_ports_inputs_pull(
     app: FastAPI,
     settings: ApplicationSettings,
     mounted_volumes: MountedVolumes,
+    inputs_state: InputsState,
     port_keys: list[str] | None,
-    *,
-    inputs_pulling_enabled: bool,
 ) -> int:
-    if not inputs_pulling_enabled:
+    if not inputs_state.inputs_pulling_enabled:
         _logger.info("Received request to pull inputs but was ignored")
         return 0
 
@@ -647,6 +647,7 @@ async def on_startup() -> None:
         application_health: ApplicationHealth = app.state.application_health
         mounted_volumes: MountedVolumes = app.state.mounted_volumes
         outputs_manager: OutputsManager = app.state.outputs_manager
+        inputs_state: InputsState = app.state.inputs_state
 
         task_context.update(
             {
@@ -680,6 +681,7 @@ async def on_startup() -> None:
                     app=app,
                     settings=settings,
                     mounted_volumes=mounted_volumes,
+                    inputs_state=inputs_state,
                 ),
                 task_ports_outputs_pull: dict(
                     app=app,

services/dynamic-sidecar/src/simcore_service_dynamic_sidecar/services/containers_long_running_tasks.py

@@ -1,12 +1,11 @@
 from typing import cast
 
+from models_library.api_schemas_directorv2.dynamic_services import ContainersCreate
 from servicelib.long_running_tasks import lrt_api
 from servicelib.long_running_tasks.errors import TaskAlreadyRunningError
 from servicelib.long_running_tasks.models import LRTNamespace, TaskId
 from servicelib.rabbitmq._client_rpc import RabbitMQRPCClient
 
-from ..models.schemas.containers import ContainersCreate
-from ..modules.inputs import InputsState
 from ..modules.long_running_tasks import (
     task_containers_restart,
     task_create_service_containers,
@@ -100,7 +99,6 @@ async def state_save_task(
 async def ports_inputs_pull_task(
     rpc_client: RabbitMQRPCClient,
     lrt_namespace: LRTNamespace,
-    inputs_state: InputsState,
     port_keys: list[str] | None = None,
 ) -> TaskId:
     try:
@@ -110,7 +108,6 @@ async def ports_inputs_pull_task(
             task_ports_inputs_pull.__name__,
             unique=True,
             port_keys=port_keys,
-            inputs_pulling_enabled=inputs_state.inputs_pulling_enabled,
         )
     except TaskAlreadyRunningError as e:
         return _get_task_id_from_error(e)

services/dynamic-sidecar/tests/unit/test_api_rest_containers_long_running_tasks.py

@@ -21,6 +21,7 @@
 from fastapi import FastAPI
 from fastapi.routing import APIRoute
 from httpx import ASGITransport, AsyncClient
+from models_library.api_schemas_directorv2.dynamic_services import ContainersCreate
 from models_library.api_schemas_dynamic_sidecar.containers import DockerComposeYamlStr
 from models_library.api_schemas_long_running_tasks.base import (
     ProgressMessage,
@@ -42,7 +43,6 @@
 from simcore_service_dynamic_sidecar.core.validation import InvalidComposeSpecError
 from simcore_service_dynamic_sidecar.models.schemas.containers import (
     ContainersComposeSpec,
-    ContainersCreate,
 )
 from simcore_service_dynamic_sidecar.models.shared_store import SharedStore
 from simcore_service_dynamic_sidecar.modules.inputs import enable_inputs_pulling

services/dynamic-sidecar/tests/unit/test_api_rest_prometheus_metrics.py

@@ -12,6 +12,7 @@
 from common_library.serialization import model_dump_with_secrets
 from fastapi import FastAPI, status
 from httpx import ASGITransport, AsyncClient
+from models_library.api_schemas_directorv2.dynamic_services import ContainersCreate
 from models_library.api_schemas_dynamic_sidecar.containers import DockerComposeYamlStr
 from models_library.callbacks_mapping import CallbacksMapping
 from models_library.services_creation import CreateServiceMetricsAdditionalParams
@@ -24,7 +25,6 @@
 from simcore_service_dynamic_sidecar._meta import API_VTAG
 from simcore_service_dynamic_sidecar.models.schemas.containers import (
     ContainersComposeSpec,
-    ContainersCreate,
 )
 from simcore_service_dynamic_sidecar.modules.prometheus_metrics import (
     _USER_SERVICES_NOT_STARTED,

services/dynamic-sidecar/tests/unit/test_api_rest_workflow_service_metrics.py

@@ -19,6 +19,7 @@
 from common_library.serialization import model_dump_with_secrets
 from fastapi import FastAPI
 from httpx import ASGITransport, AsyncClient
+from models_library.api_schemas_directorv2.dynamic_services import ContainersCreate
 from models_library.api_schemas_dynamic_sidecar.containers import DockerComposeYamlStr
 from models_library.generated_models.docker_rest_api import ContainerState
 from models_library.generated_models.docker_rest_api import Status2 as ContainerStatus
@@ -43,7 +44,6 @@
 from simcore_service_dynamic_sidecar.core.docker_utils import get_container_states
 from simcore_service_dynamic_sidecar.models.schemas.containers import (
     ContainersComposeSpec,
-    ContainersCreate,
 )
 from simcore_service_dynamic_sidecar.models.shared_store import SharedStore
 from tenacity import AsyncRetrying, TryAgain