moved inputs to services

Author: Andrei Neagu

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

@@ -1,5 +1,4 @@
-""" Free functions to inject dependencies in routes handlers
-"""
+"""Free functions to inject dependencies in routes handlers"""
 
 from asyncio import Lock
 from typing import Annotated, cast
@@ -13,10 +12,10 @@
 from ...core.settings import ApplicationSettings
 from ...models.schemas.application_health import ApplicationHealth
 from ...models.shared_store import SharedStore
-from ...modules.inputs import InputsState
 from ...modules.mounted_fs import MountedVolumes
 from ...modules.outputs import OutputsContext, OutputsManager
 from ...modules.prometheus_metrics import UserServicesMetrics
+from ...services.inputs import InputsState
 
 
 def get_application(request: Request) -> FastAPI:
@@ -28,66 +27,66 @@ def get_app_state(request: Request) -> State:
 
 
 def get_application_health(
-    app_state: Annotated[State, Depends(get_app_state)]
+    app_state: Annotated[State, Depends(get_app_state)],
 ) -> ApplicationHealth:
     return cast(ApplicationHealth, app_state.application_health)
 
 
 def get_settings(
-    app_state: Annotated[State, Depends(get_app_state)]
+    app_state: Annotated[State, Depends(get_app_state)],
 ) -> ApplicationSettings:
     return cast(ApplicationSettings, app_state.settings)
 
 
 def get_shared_store(
-    app_state: Annotated[State, Depends(get_app_state)]
+    app_state: Annotated[State, Depends(get_app_state)],
 ) -> SharedStore:
     return cast(SharedStore, app_state.shared_store)
 
 
 def get_mounted_volumes(
-    app_state: Annotated[State, Depends(get_app_state)]
+    app_state: Annotated[State, Depends(get_app_state)],
 ) -> MountedVolumes:
     return cast(MountedVolumes, app_state.mounted_volumes)
 
 
 def get_container_restart_lock(
-    app_state: Annotated[State, Depends(get_app_state)]
+    app_state: Annotated[State, Depends(get_app_state)],
 ) -> Lock:
     return cast(Lock, app_state.container_restart_lock)
 
 
 def get_outputs_manager(
-    app_state: Annotated[State, Depends(get_app_state)]
+    app_state: Annotated[State, Depends(get_app_state)],
 ) -> OutputsManager:
     return cast(OutputsManager, app_state.outputs_manager)
 
 
 def get_outputs_context(
-    app_state: Annotated[State, Depends(get_app_state)]
+    app_state: Annotated[State, Depends(get_app_state)],
 ) -> OutputsContext:
     return cast(OutputsContext, app_state.outputs_context)
 
 
 def get_inputs_state(
-    app_state: Annotated[State, Depends(get_app_state)]
+    app_state: Annotated[State, Depends(get_app_state)],
 ) -> InputsState:
     return cast(InputsState, app_state.inputs_state)
 
 
 def get_user_services_metrics(
-    app_state: Annotated[State, Depends(get_app_state)]
+    app_state: Annotated[State, Depends(get_app_state)],
 ) -> UserServicesMetrics:
     return cast(UserServicesMetrics, app_state.user_service_metrics)
 
 
 def get_rabbitmq_client(
-    app: Annotated[FastAPI, Depends(get_application)]
+    app: Annotated[FastAPI, Depends(get_application)],
 ) -> RabbitMQClient:
     return rabbitmq.get_rabbitmq_client(app)
 
 
 def get_rabbitmq_rpc_server(
-    app: Annotated[FastAPI, Depends(get_application)]
+    app: Annotated[FastAPI, Depends(get_application)],
 ) -> RabbitMQRPCClient:
     return rabbitmq.get_rabbitmq_rpc_server(app)

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

@@ -10,13 +10,10 @@
 from simcore_sdk.node_ports_v2.port_utils import is_file_type
 
 from ...core.docker_utils import docker_client
-from ...modules.inputs import disable_inputs_pulling, enable_inputs_pulling
 from ...modules.mounted_fs import MountedVolumes
-from ...modules.outputs import (
-    OutputsContext,
-    disable_event_propagation,
-    enable_event_propagation,
-)
+from ...modules.outputs import OutputsContext
+from ...services.inputs import disable_inputs_pulling, enable_inputs_pulling
+from ...services.outputs import disable_event_propagation, enable_event_propagation
 from ._dependencies import get_application, get_mounted_volumes, get_outputs_context
 
 _logger = logging.getLogger(__name__)

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

@@ -13,7 +13,6 @@
 from ...models.schemas.application_health import ApplicationHealth
 from ...models.schemas.containers import ContainersCreate
 from ...models.shared_store import SharedStore
-from ...modules.inputs import InputsState
 from ...modules.long_running_tasks import (
     task_containers_restart,
     task_create_service_containers,
@@ -27,6 +26,7 @@
 )
 from ...modules.mounted_fs import MountedVolumes
 from ...modules.outputs import OutputsManager
+from ...services.inputs import InputsState
 from ._dependencies import (
     get_application,
     get_application_health,

services/dynamic-sidecar/src/simcore_service_dynamic_sidecar/api/rpc/_containers_extension.py

@@ -0,0 +1,22 @@
+from fastapi import FastAPI
+from servicelib.rabbitmq import RPCRouter
+
+from ...services.inputs import disable_inputs_pulling, enable_inputs_pulling
+from ...services.outputs import disable_event_propagation, enable_event_propagation
+
+router = RPCRouter()
+
+
+@router.expose()
+async def toggle_ports_io(
+    app: FastAPI, *, enable_outputs: bool, enable_inputs: bool
+) -> None:
+    if enable_outputs:
+        await enable_event_propagation(app)
+    else:
+        await disable_event_propagation(app)
+
+    if enable_inputs:
+        enable_inputs_pulling(app)
+    else:
+        disable_inputs_pulling(app)

services/dynamic-sidecar/src/simcore_service_dynamic_sidecar/api/rpc/routes.py

@@ -4,9 +4,10 @@
 
 from ...core.rabbitmq import get_rabbitmq_rpc_server
 from ...core.settings import ApplicationSettings
-from . import _disk, _disk_usage, _volumes
+from . import _containers_extension, _disk, _disk_usage, _volumes
 
 ROUTERS: list[RPCRouter] = [
+    _containers_extension.router,
     _disk_usage.router,
     _disk.router,
     _volumes.router,

services/dynamic-sidecar/src/simcore_service_dynamic_sidecar/core/application.py

@@ -23,14 +23,14 @@
 from ..models.schemas.application_health import ApplicationHealth
 from ..models.shared_store import SharedStore, setup_shared_store
 from ..modules.attribute_monitor import setup_attribute_monitor
-from ..modules.inputs import setup_inputs
 from ..modules.mounted_fs import MountedVolumes, setup_mounted_fs
 from ..modules.notifications import setup_notifications
 from ..modules.outputs import setup_outputs
 from ..modules.prometheus_metrics import setup_prometheus_metrics
 from ..modules.resource_tracking import setup_resource_tracking
 from ..modules.system_monitor import setup_system_monitor
 from ..modules.user_services_preferences import setup_user_services_preferences
+from ..services.inputs import setup_inputs
 from .docker_compose_utils import docker_compose_down
 from .docker_logs import setup_background_log_fetcher
 from .error_handlers import http_error_handler, node_not_found_error_handler

services/dynamic-sidecar/src/simcore_service_dynamic_sidecar/modules/inputs.py renamed to services/dynamic-sidecar/src/simcore_service_dynamic_sidecar/services/inputs.py

@@ -0,0 +1,4 @@
+__all__: tuple[str, ...] = (
+    "disable_event_propagation",
+    "enable_event_propagation",
+)