reverted inputs placement

Author: Andrei Neagu

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

@@ -12,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:

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

@@ -10,9 +10,9 @@
 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
-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
 

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

@@ -13,6 +13,7 @@
 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,
@@ -26,7 +27,6 @@
 )
 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

@@ -1,7 +1,7 @@
 from fastapi import FastAPI
 from servicelib.rabbitmq import RPCRouter
 
-from ...services.inputs import disable_inputs_pulling, enable_inputs_pulling
+from ...modules.inputs import disable_inputs_pulling, enable_inputs_pulling
 from ...services.outputs import disable_event_propagation, enable_event_propagation
 
 router = RPCRouter()

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/services/inputs.py renamed to services/dynamic-sidecar/src/simcore_service_dynamic_sidecar/modules/inputs.py

@@ -9,8 +9,8 @@
 from servicelib.rabbitmq import RabbitMQRPCClient
 from servicelib.rabbitmq.rpc_interfaces.dynamic_sidecar import container_extensions
 from simcore_service_dynamic_sidecar.core.settings import ApplicationSettings
+from simcore_service_dynamic_sidecar.modules.inputs import InputsState
 from simcore_service_dynamic_sidecar.modules.outputs._watcher import OutputsWatcher
-from simcore_service_dynamic_sidecar.services.inputs import InputsState
 
 pytest_simcore_core_services_selection = [
     "rabbit",