moved container_utils

Author: Andrei Neagu

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

@@ -14,14 +14,15 @@
     ActivityInfoOrNone,
 )
 from pydantic import TypeAdapter, ValidationError
-from servicelib.fastapi.requests_decorators import cancel_on_disconnect
-
-from ...core.docker_utils import docker_client
-from ...core.errors import (
+from servicelib.container_utils import (
     ContainerExecCommandFailedError,
     ContainerExecContainerNotFoundError,
     ContainerExecTimeoutError,
+    run_command_in_container,
 )
+from servicelib.fastapi.requests_decorators import cancel_on_disconnect
+
+from ...core.docker_utils import docker_client
 from ...core.settings import ApplicationSettings
 from ...core.validation import (
     ComposeSpecValidation,
@@ -30,7 +31,6 @@
 )
 from ...models.schemas.containers import ContainersComposeSpec
 from ...models.shared_store import SharedStore
-from ...modules.container_utils import run_command_in_container
 from ...modules.mounted_fs import MountedVolumes
 from ._dependencies import (
     get_container_restart_lock,

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

@@ -14,18 +14,3 @@ class VolumeNotFoundError(BaseDynamicSidecarError):
 
 class UnexpectedDockerError(BaseDynamicSidecarError):
     msg_template = "An unexpected Docker error occurred status_code={status_code}, message={message}"
-
-
-class ContainerExecContainerNotFoundError(BaseDynamicSidecarError):
-    msg_template = "Container '{container_name}' was not found"
-
-
-class ContainerExecTimeoutError(BaseDynamicSidecarError):
-    msg_template = "Timed out after {timeout} while executing: '{command}'"
-
-
-class ContainerExecCommandFailedError(BaseDynamicSidecarError):
-    msg_template = (
-        "Command '{command}' exited with code '{exit_code}'"
-        "and output: '{command_result}'"
-    )

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

@@ -5,16 +5,16 @@
 
 from aiodocker import DockerError
 from models_library.callbacks_mapping import UserServiceCommand
-from servicelib.logging_utils import log_context
-
-from ..core.errors import (
+from servicelib.container_utils import (
     ContainerExecCommandFailedError,
     ContainerExecContainerNotFoundError,
     ContainerExecTimeoutError,
+    run_command_in_container,
 )
+from servicelib.logging_utils import log_context
+
 from ..models.shared_store import SharedStore
 from ..modules.mounted_fs import MountedVolumes
-from .container_utils import run_command_in_container
 
 _logger = logging.getLogger(__name__)
 

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

@@ -10,14 +10,14 @@
 from fastapi import FastAPI, status
 from models_library.callbacks_mapping import CallbacksMapping, UserServiceCommand
 from pydantic import BaseModel, NonNegativeFloat, NonNegativeInt
-from servicelib.logging_utils import log_context
-from servicelib.sequences_utils import pairwise
-from simcore_service_dynamic_sidecar.core.errors import (
+from servicelib.container_utils import (
     ContainerExecContainerNotFoundError,
+    run_command_in_container,
 )
+from servicelib.logging_utils import log_context
+from servicelib.sequences_utils import pairwise
 
 from ..models.shared_store import SharedStore
-from .container_utils import run_command_in_container
 
 _logger = logging.getLogger(__name__)