refactor interface

Author: Andrei Neagu

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

@@ -14,7 +14,7 @@
 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.outputs import OutputsManager
 from ...modules.prometheus_metrics import UserServicesMetrics
 
 
@@ -62,12 +62,6 @@ def get_outputs_manager(
     return cast(OutputsManager, app_state.outputs_manager)
 
 
-def get_outputs_context(
-    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)],
 ) -> InputsState:

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

@@ -7,13 +7,10 @@
 from fastapi import Request, Response, status
 from models_library.services import ServiceOutput
 from pydantic.main import BaseModel
-from simcore_sdk.node_ports_v2.port_utils import is_file_type
 
 from ...core.docker_utils import docker_client
-from ...modules.mounted_fs import MountedVolumes
-from ...modules.outputs import OutputsContext
 from ...services import container_extensions
-from ._dependencies import get_application, get_mounted_volumes, get_outputs_context
+from ._dependencies import get_application
 
 _logger = logging.getLogger(__name__)
 
@@ -75,26 +72,11 @@ async def toggle_ports_io(
 )
 async def create_output_dirs(
     request_mode: CreateDirsRequestItem,
-    mounted_volumes: Annotated[MountedVolumes, Depends(get_mounted_volumes)],
-    outputs_context: Annotated[OutputsContext, Depends(get_outputs_context)],
+    app: Annotated[FastAPI, Depends(get_application)],
 ) -> None:
-    outputs_path = mounted_volumes.disk_outputs_path
-    file_type_port_keys = []
-    non_file_port_keys = []
-    for port_key, service_output in request_mode.outputs_labels.items():
-        _logger.debug("Parsing output labels, detected: %s", f"{port_key=}")
-        if is_file_type(service_output.property_type):
-            dir_to_create = outputs_path / port_key
-            dir_to_create.mkdir(parents=True, exist_ok=True)
-            file_type_port_keys.append(port_key)
-        else:
-            non_file_port_keys.append(port_key)
-
-    _logger.debug(
-        "Setting: %s, %s", f"{file_type_port_keys=}", f"{non_file_port_keys=}"
+    await container_extensions.create_output_dirs(
+        app, outputs_labels=request_mode.outputs_labels
     )
-    await outputs_context.set_file_type_port_keys(file_type_port_keys)
-    outputs_context.non_file_type_port_keys = non_file_port_keys
 
 
 @router.post(

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

@@ -1,7 +1,18 @@
+import logging
+
 from fastapi import FastAPI
+from models_library.services import ServiceOutput
+from simcore_sdk.node_ports_v2.port_utils import is_file_type
 
 from ..modules.inputs import disable_inputs_pulling, enable_inputs_pulling
-from ..modules.outputs import disable_event_propagation, enable_event_propagation
+from ..modules.mounted_fs import MountedVolumes
+from ..modules.outputs import (
+    OutputsContext,
+    disable_event_propagation,
+    enable_event_propagation,
+)
+
+_logger = logging.getLogger(__name__)
 
 
 async def toggle_ports_io(
@@ -16,3 +27,28 @@ async def toggle_ports_io(
         enable_inputs_pulling(app)
     else:
         disable_inputs_pulling(app)
+
+
+async def create_output_dirs(
+    app: FastAPI, outputs_labels: dict[str, ServiceOutput]
+) -> None:
+    mounted_volumes: MountedVolumes = app.state.mounted_volumes
+    outputs_context: OutputsContext = app.state.outputs_context
+
+    outputs_path = mounted_volumes.disk_outputs_path
+    file_type_port_keys = []
+    non_file_port_keys = []
+    for port_key, service_output in outputs_labels.items():
+        _logger.debug("Parsing output labels, detected: %s", f"{port_key=}")
+        if is_file_type(service_output.property_type):
+            dir_to_create = outputs_path / port_key
+            dir_to_create.mkdir(parents=True, exist_ok=True)
+            file_type_port_keys.append(port_key)
+        else:
+            non_file_port_keys.append(port_key)
+
+    _logger.debug(
+        "Setting: %s, %s", f"{file_type_port_keys=}", f"{non_file_port_keys=}"
+    )
+    await outputs_context.set_file_type_port_keys(file_type_port_keys)
+    outputs_context.non_file_type_port_keys = non_file_port_keys