vantage6 5.0.0a41__py3-none-any.whl → 5.0.0a43__py3-none-any.whl

vantage6/cli/common/list.py

@@ -44,7 +44,7 @@ def get_configuration_list(instance_type: InstanceType) -> None:
             in running_server_names
             else stopped
         )
-        click.echo(f"{config.name:25}{status:25} System ")
+        click.echo(f"{config.name:25}{status:25}System ")
 
     # user folders
     configs, failed_imports_user = ctx_class.available_configurations(
@@ -58,9 +58,9 @@ def get_configuration_list(instance_type: InstanceType) -> None:
             in running_server_names
             else stopped
         )
-        click.echo(f"{config.name:25}{status:25} User   ")
+        click.echo(f"{config.name:25}{status:25}User   ")
 
-    click.echo("-" * 85)
+    click.echo("-" * len(header))
     if len(failed_imports_system) + len(failed_imports_user):
         warning(
             f"{Fore.RED}Failed imports: "

vantage6/cli/common/new.py

@@ -6,8 +6,10 @@ from colorama import Fore, Style
 from vantage6.common import ensure_config_dir_writable, error, info
 from vantage6.common.globals import InstanceType
 
-from vantage6.cli.common.utils import get_main_cli_command_name
-from vantage6.cli.config import CliConfig
+from vantage6.cli.common.utils import (
+    get_main_cli_command_name,
+    select_context_and_namespace,
+)
 from vantage6.cli.configuration_create import make_configuration
 from vantage6.cli.context import select_context_class
 from vantage6.cli.utils import check_config_name_allowed, prompt_config_name
@@ -50,11 +52,7 @@ def new(
     Path | None
         Path to the configuration file. None if the process is aborted for any reason.
     """
-    cli_config = CliConfig()
-    context, namespace = cli_config.compare_changes_config(
-        context=context,
-        namespace=namespace,
-    )
+    context, namespace = select_context_and_namespace(context, namespace)
 
     name = prompt_config_name(name)
 

vantage6/cli/common/start.py

@@ -6,19 +6,10 @@ import time
 from os import PathLike
 from pathlib import Path
 
-import docker
-from docker.client import DockerClient
-
-from vantage6.common import error, info, warning
+from vantage6.common import error, info
 from vantage6.common.context import AppContext
-from vantage6.common.docker.addons import pull_image
 from vantage6.common.globals import (
-    DEFAULT_ALGO_STORE_IMAGE,
     DEFAULT_CHART_REPO,
-    DEFAULT_DOCKER_REGISTRY,
-    DEFAULT_NODE_IMAGE,
-    DEFAULT_SERVER_IMAGE,
-    DEFAULT_UI_IMAGE,
     LOCALHOST,
     InstanceType,
 )
@@ -38,95 +29,13 @@ def prestart_checks(
     Run pre-start checks for an instance.
     """
 
-    check_config_name_allowed(ctx.name)
+    check_config_name_allowed(name)
 
     if check_running(ctx.helm_release_name, instance_type, name, system_folders):
         error(f"Instance '{name}' is already running.")
         exit(1)
 
 
-def pull_infra_image(
-    client: DockerClient, image: str, instance_type: InstanceType
-) -> None:
-    """
-    Try to pull an infrastructure image. If the image is a default infrastructure image,
-    exit if in cannot be pulled. If it is not a default image, exit if it cannot be
-    pulled and it is also not available locally. If a local image is available, a
-    warning is printed.
-
-    Parameters
-    ----------
-    client : DockerClient
-        The Docker client
-    image : str
-        The image name to pull
-    instance_type : InstanceType
-        The type of instance to pull the image for
-    """
-    try:
-        pull_image(client, image, suppress_error=True)
-    except docker.errors.APIError:
-        if not _is_default_infra_image(image, instance_type):
-            if _image_exists_locally(client, image):
-                warning("Failed to pull infrastructure image! Will use local image...")
-            else:
-                error("Failed to pull infrastructure image!")
-                error("Image also not found locally. Exiting...")
-                exit(1)
-        else:
-            error("Failed to pull infrastructure image! Exiting...")
-            exit(1)
-
-
-def _is_default_infra_image(image: str, instance_type: InstanceType) -> bool:
-    """
-    Check if an infrastructure image is the default image.
-
-    Parameters
-    ----------
-    image : str
-        The image name to check
-    instance_type : InstanceType
-        The type of instance to check the image for
-
-    Returns
-    -------
-    bool
-        True if the image is the default image, False otherwise
-    """
-    if instance_type == InstanceType.SERVER:
-        return image == f"{DEFAULT_DOCKER_REGISTRY}/{DEFAULT_SERVER_IMAGE}"
-    elif instance_type == InstanceType.ALGORITHM_STORE:
-        return image == f"{DEFAULT_DOCKER_REGISTRY}/{DEFAULT_ALGO_STORE_IMAGE}"
-    elif instance_type == InstanceType.UI:
-        return image == f"{DEFAULT_DOCKER_REGISTRY}/{DEFAULT_UI_IMAGE}"
-    elif instance_type == InstanceType.NODE:
-        return image == f"{DEFAULT_DOCKER_REGISTRY}/{DEFAULT_NODE_IMAGE}"
-
-
-def _image_exists_locally(client: DockerClient, image: str) -> bool:
-    """
-    Check if the image exists locally.
-
-    Parameters
-    ----------
-    client : DockerClient
-        The Docker client
-    image : str
-        The image name to check
-
-    Returns
-    -------
-    bool
-        True if the image exists locally, False otherwise
-    """
-    try:
-        client.images.get(image)
-    except docker.errors.ImageNotFound:
-        return False
-    return True
-
-
 def helm_install(
     release_name: str,
     chart_name: ChartName,
@@ -134,6 +43,7 @@ def helm_install(
     context: str | None = None,
     namespace: str | None = None,
     local_chart_dir: str | None = None,
+    custom_values: list[str] | None = None,
 ) -> None:
     """
     Manage the `helm install` command.
@@ -152,6 +62,9 @@ def helm_install(
         The Kubernetes namespace to use.
     local_chart_dir : str, optional
         The local directory containing the Helm charts.
+    custom_values : list[str], optional
+        Custom values to pass to the Helm chart, that override the values in the values
+        file. Each item in the list is a string in the format "key=value".
     """
     # Input validation
     validate_input_cmd_args(release_name, "release name")
@@ -197,6 +110,10 @@ def helm_install(
     if namespace:
         command.extend(["--namespace", namespace])
 
+    if custom_values:
+        for custom_value in custom_values:
+            command.extend(["--set", custom_value])
+
     try:
         subprocess.run(
             command,

vantage6/cli/common/utils.py

@@ -1,16 +1,13 @@
 import json
 import subprocess
 from pathlib import Path
-from typing import Iterable
 
-import docker
 import questionary as q
 
 from vantage6.common import error
 from vantage6.common.globals import (
     APPNAME,
     SANDBOX_SUFFIX,
-    STRING_ENCODING,
     InstanceType,
 )
 
@@ -187,110 +184,6 @@ def select_running_service(
     return name
 
 
-def get_server_name(
-    name: str,
-    system_folders: bool,
-    running_server_names: list[str],
-    instance_type: InstanceType,
-) -> str:
-    """
-    Get the full name of a running server.
-
-    Parameters
-    ----------
-    name : str
-        Name of the server to get the full name from
-    system_folders : bool
-        Whether to use system folders or not
-    running_server_names : list[str]
-        The names of the running servers
-    instance_type : InstanceType
-        The type of instance to get the full name from
-    """
-
-    if not name:
-        if not running_server_names:
-            error(
-                f"No {instance_type.value}s are running! You can only check the version"
-                f" for {instance_type.value}s that are running"
-            )
-            exit(1)
-        try:
-            name = q.select(
-                f"Select the {instance_type.value} you wish to inspect:",
-                choices=running_server_names,
-            ).unsafe_ask()
-        except KeyboardInterrupt:
-            error("Aborted by user!")
-            exit(1)
-    else:
-        post_fix = "system" if system_folders else "user"
-        name = f"{APPNAME}-{name}-{post_fix}"
-    return name
-
-
-def get_running_servers(
-    client: docker.DockerClient, instance_type: InstanceType
-) -> list[str]:
-    """Get the running servers of a certain type.
-
-    Parameters
-    ----------
-    client : docker.DockerClient
-        The docker client to use
-    instance_type : InstanceType
-        The type of instance to get the running servers from
-
-    Returns
-    -------
-    list[str]
-        The names of the running servers
-    """
-    running_servers = client.containers.list(
-        filters={"label": f"{APPNAME}-type={instance_type.value}"}
-    )
-    return [server.name for server in running_servers]
-
-
-def print_log_worker(logs_stream: Iterable[bytes]) -> None:
-    """
-    Print the logs from the logs stream.
-
-    Parameters
-    ----------
-    logs_stream : Iterable[bytes]
-        Output of the container.attach() method
-    """
-    for log in logs_stream:
-        try:
-            print(log.decode(STRING_ENCODING), end="")
-        except UnicodeDecodeError:
-            print(
-                "ERROR DECODING LOGS!!! Printing raw bytes. Please check the logs in "
-                "the container."
-            )
-            print(log)
-
-
-def get_name_from_container_name(container_name: str) -> str:
-    """
-    Get the node/server/store name from a container name.
-
-    Parameters
-    ----------
-    container_name : str
-        The name of the container
-
-    Returns
-    -------
-    str
-        The name of the node/server/store
-    """
-    # Container name is structured as: f"{APPNAME}-{name}-{post_fix}"
-    # Take into account that name can contain '-'
-    return "-".join(container_name.split("-")[1:-1])
-
-
 def get_config_name_from_service_name(service_name: str) -> str:
     """
     Get the config name from a service name.

vantage6/cli/configuration_create.py

@@ -207,6 +207,7 @@ def select_configuration_questionnaire(
         Whether to use the system folders or not
     is_sandbox : bool
         Whether to show only the sandbox configurations or not
+
     Returns
     -------
     str

vantage6/cli/context/algorithm_store.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from vantage6.common.globals import APPNAME, InstanceType
+from vantage6.common.globals import InstanceType
 
 from vantage6.cli import __version__
 from vantage6.cli.configuration_manager import AlgorithmStoreConfigurationManager
@@ -48,18 +48,6 @@ class AlgorithmStoreContext(BaseServerContext):
         """
         return super().get_database_uri()
 
-    @property
-    def docker_container_name(self) -> str:
-        """
-        Name of the docker container that the server is running in.
-
-        Returns
-        -------
-        str
-            Server's docker container name
-        """
-        return f"{APPNAME}-{self.name}-{self.scope}-{ServerType.ALGORITHM_STORE}"
-
     @classmethod
     def from_external_config_file(
         cls, path: str, system_folders: bool = S_FOL, in_container: bool = False

vantage6/cli/context/node.py

@@ -5,7 +5,7 @@ import os.path
 from pathlib import Path
 
 from vantage6.common.context import AppContext
-from vantage6.common.globals import APPNAME, STRING_ENCODING, InstanceType
+from vantage6.common.globals import STRING_ENCODING, InstanceType
 
 from vantage6.cli import __version__
 from vantage6.cli.configuration_manager import NodeConfigurationManager
@@ -172,43 +172,6 @@ class NodeContext(AppContext):
         else:
             return self.config["node"]["databases"]
 
-    @property
-    def docker_container_name(self) -> str:
-        """
-        Docker container name of the node.
-
-        Returns
-        -------
-        str
-            Node's Docker container name
-        """
-        return f"{APPNAME}-{self.name}-{self.scope}"
-
-    @property
-    def docker_network_name(self) -> str:
-        """
-        Private Docker network name which is unique for this node.
-
-        Returns
-        -------
-        str
-            Docker network name
-        """
-        return f"{APPNAME}-{self.name}-{self.scope}-net"
-
-    @property
-    def docker_volume_name(self) -> str:
-        """
-        Docker volume in which task data is stored. In case a file based
-        database is used, this volume contains the database file as well.
-
-        Returns
-        -------
-        str
-            Docker volume name
-        """
-        return os.environ.get("DATA_VOLUME_NAME", f"{self.docker_container_name}-vol")
-
     @property
     def proxy_log_file(self):
         return self.log_file_name(type_="proxy_server")

vantage6/cli/context/server.py

@@ -58,22 +58,10 @@ class ServerContext(BaseServerContext):
         """
         return super().get_database_uri()
 
-    @property
-    def docker_container_name(self) -> str:
-        """
-        Name of the docker container that the server is running in.
-
-        Returns
-        -------
-        str
-            Server's docker container name
-        """
-        return f"{APPNAME}-{self.name}-{self.scope}-{ServerType.V6SERVER.value}"
-
     @property
     def prometheus_container_name(self) -> str:
         """
-        Get the name of the Prometheus Docker container for this server.
+        Get the name of the Prometheus pod for this server.
 
         Returns
         -------

vantage6/cli/node/attach.py

@@ -28,7 +28,7 @@ def cli_node_attach(
     """
     info("Attaching to node logs...")
     attach_logs(
-        name,
+        name=name,
         instance_type=InstanceType.NODE,
         infra_component=InfraComponentName.NODE,
         system_folders=system_folders,

vantage6/cli/node/common/__init__.py

@@ -4,12 +4,10 @@ Common functions that are used in node CLI commands
 
 import os
 
-import docker
 from colorama import Fore, Style
 
 from vantage6.common import debug, error, info
 from vantage6.common.globals import (
-    APPNAME,
     HTTP_LOCALHOST,
     InstanceType,
     Ports,
@@ -48,7 +46,7 @@ def create_client(ctx: NodeContext) -> UserClient:
     host = ctx.config["node"]["server"]["url"]
     port = ctx.config["node"]["server"]["port"]
     api_path = ctx.config["node"]["server"]["path"]
-    # if the server is run locally, we need to use localhost here instead of
+    # if the server is run locally in Docker, we need to use localhost here instead of
     # the host address of docker
     if host in ["http://host.docker.internal", "http://172.17.0.1"]:
         host = HTTP_LOCALHOST
@@ -133,23 +131,3 @@ def select_node(name: str, system_folders: bool) -> str:
         )
         exit(1)
     return name
-
-
-def find_running_node_names(client: docker.DockerClient) -> list[str]:
-    """
-    Returns a list of names of running nodes.
-
-    Parameters
-    ----------
-    client : docker.DockerClient
-        Docker client instance
-
-    Returns
-    -------
-    list[str]
-        List of names of running nodes
-    """
-    running_nodes = client.containers.list(
-        filters={"label": f"{APPNAME}-type={InstanceType.NODE.value}"}
-    )
-    return [node.name for node in running_nodes]

vantage6/cli/node/files.py

@@ -18,12 +18,12 @@ def cli_node_files(ctx: NodeContext) -> None:
     """
     info(f"Configuration file = {ctx.config_file}")
     info(f"Log file           = {ctx.log_file}")
-    info(f"data folders       = {ctx.data_dir}")
+    info(f"Data folders       = {ctx.data_dir}")
     info("Database labels and files")
-    for db in ctx.databases["fileBased"] or []:
+    for db in ctx.databases.get("fileBased", []):
         info(
             f" - {db['name']:15} = {db['volumePath']}/{db['originalName']} "
             f"(type: {db['type']})"
         )
-    for db in ctx.databases["serviceBased"] or []:
+    for db in ctx.databases.get("serviceBased", []):
         info(f" - {db['name']:15} = {db['uri']} (type: {db['type']})")

vantage6/cli/node/new.py

@@ -128,7 +128,6 @@ def node_configuration_questionaire(data_dir: str, instance_name: str) -> dict:
             },
         ]
     )
-
     config["databases"] = {"fileBased": [], "serviceBased": []}
     while q.confirm("Do you want to add a database?").unsafe_ask():
         db_label = q.select(
@@ -195,8 +194,6 @@ def node_configuration_questionaire(data_dir: str, instance_name: str) -> dict:
             {"name": "urllib3", "level": "warning"},
             {"name": "requests", "level": "warning"},
             {"name": "engineio.client", "level": "warning"},
-            {"name": "docker.utils.config", "level": "warning"},
-            {"name": "docker.auth", "level": "warning"},
         ],
     }
 

vantage6/cli/node/remove.py

@@ -24,7 +24,7 @@ def cli_node_remove(
     """
     Delete a node permanently.
 
-    Remove the configuration file, log file, and docker volumes attached to
+    Remove the configuration file, log file, and kubernetes resources attached to
     the node.
     """
 

vantage6/cli/node/start.py

@@ -1,8 +1,14 @@
 import click
 
-from vantage6.common import info
-from vantage6.common.globals import InstanceType
+from vantage6.common import info, warning
+from vantage6.common.globals import (
+    DEFAULT_DOCKER_REGISTRY,
+    DEFAULT_NODE_IMAGE,
+    DEFAULT_NODE_IMAGE_WO_TAG,
+    InstanceType,
+)
 
+from vantage6.cli import __version__
 from vantage6.cli.common.attach import attach_logs
 from vantage6.cli.common.decorator import click_insert_context
 from vantage6.cli.common.start import (
@@ -16,6 +22,7 @@ from vantage6.cli.common.utils import (
 )
 from vantage6.cli.context.node import NodeContext
 from vantage6.cli.globals import ChartName, InfraComponentName
+from vantage6.cli.node.common import create_client
 
 from vantage6.node.globals import DEFAULT_PROXY_SERVER_PORT
 
@@ -60,49 +67,37 @@ def cli_node_start(
     create_directory_if_not_exists(ctx.log_dir)
     create_directory_if_not_exists(ctx.data_dir)
 
-    # TODO issue #2256 - run same version node as server
-    # # Determine image-name. First we check if the option --image has been used.
-    # # Then we check if the image has been specified in the config file, and
-    # # finally we use the default settings from the package.
-    # if not image:
-    #     custom_images: dict = ctx.config.get("images")
-    #     if custom_images:
-    #         image = custom_images.get("node")
-    #     else:
-    #         # if no custom image is specified, find the server version and use
-    #         # the latest images from that minor version
-    #         client = create_client(ctx)
-    #         major_minor = None
-    #         try:
-    #             # try to get server version, skip if can't get a connection
-    #             version = client.util.get_server_version(attempts_on_timeout=3)[
-    #                 "version"
-    #             ]
-    #             major_minor = ".".join(version.split(".")[:2])
-    #             image = (
-    #                 f"{DEFAULT_DOCKER_REGISTRY}/"
-    #                 f"{DEFAULT_NODE_IMAGE_WO_TAG}"
-    #                 f":{major_minor}"
-    #             )
-    #         except Exception:
-    #             warning("Could not determine server version. Using default node image")
-
-    #         if major_minor and not __version__.startswith(major_minor):
-    #             warning(
-    #                 "Version mismatch between CLI and server/node. CLI is "
-    #                 f"running on version {__version__}, while node and server "
-    #                 f"are on version {major_minor}. This might cause "
-    #                 f"unexpected issues; changing to {major_minor}.<latest> "
-    #                 "is recommended."
-    #             )
+    # Determine image-name. First we check if the image is set in the config file.
+    # If so, we use it. Otherwise, we use the same version as the server.
+    if custom_image := ctx.config.get("node", {}).get("image"):
+        image = custom_image
+    else:
+        # if no custom image is specified, find the server version and use
+        # the latest images from that minor version
+        client = create_client(ctx)
+        major_minor = None
+        try:
+            # try to get server version, skip if can't get a connection
+            version = client.util.get_server_version(attempts_on_timeout=3)["version"]
+            major_minor = ".".join(version.split(".")[:2])
+            image = (
+                f"{DEFAULT_DOCKER_REGISTRY}/{DEFAULT_NODE_IMAGE_WO_TAG}:{major_minor}"
+            )
+        except Exception:
+            warning("Could not determine server version. Using default node image")
 
-    #     # fail safe, in case no custom image is specified and we can't get the
-    #     # server version
-    #     if not image:
-    #         image = f"{DEFAULT_DOCKER_REGISTRY}/{DEFAULT_NODE_IMAGE}"
+        if major_minor and not __version__.startswith(major_minor):
+            warning(
+                "Version mismatch between CLI and server/node. CLI is running on "
+                f"version {__version__}, while node and server are on version "
+                f"{major_minor}. This might cause unexpected issues; changing to "
+                f"{major_minor}.<latest> is recommended."
+            )
 
-    # info(f"Pulling latest node image '{image}'")
-    # pull_infra_image(docker_client, image, InstanceType.NODE)
+    # fail safe, in case no custom image is specified and we can't get the
+    # server version
+    if not image:
+        image = f"{DEFAULT_DOCKER_REGISTRY}/{DEFAULT_NODE_IMAGE}"
 
     helm_install(
         release_name=ctx.helm_release_name,
@@ -111,6 +106,7 @@ def cli_node_start(
         context=context,
         namespace=namespace,
         local_chart_dir=local_chart_dir,
+        custom_values=[f"node.image={image}"],
     )
 
     # start port forward for the node proxy server

vantage6/cli/sandbox/config/node.py

@@ -259,11 +259,6 @@ class NodeSandboxConfigManager(BaseSandboxConfigManager):
                 "proxyPort": 7676 + int(node_specific_config["org_id"]),
                 "apiKey": node_specific_config["api_key"],
                 "name": node_specific_config["node_name"],
-                "image": (
-                    self.node_image
-                    # TODO v5+ update
-                    or "harbor2.vantage6.ai/infrastructure/node:5.0.0a37"
-                ),
                 "logging": {
                     "level": "DEBUG",
                     "file": f"{node_specific_config['node_name']}.log",
@@ -303,6 +298,8 @@ class NodeSandboxConfigManager(BaseSandboxConfigManager):
                 },
             },
         }
+        if self.node_image:
+            config["node"]["image"] = self.node_image
 
         # merge the extra config with the node config
         if extra_config is not None:

vantage6/cli/sandbox/remove.py

@@ -152,4 +152,11 @@ def cli_sandbox_remove(
     click_ctx.invoke(
         cli_server_remove, ctx=ctx, name=name, system_folders=False, force=True
     )
-    # TODO remove the right data in the custom data directory if it is provided
+
+    # remove the right data in the custom data directory if it is provided. If a custom
+    # data directory is provided, all files related to the sandbox have been stored in
+    # a subfolder with the name of the sandbox.
+    if custom_data_dir:
+        sandbox_data_dir = custom_data_dir / ctx.name
+        if sandbox_data_dir.is_dir():
+            rmtree(sandbox_data_dir)

vantage6/cli/server/attach.py

@@ -28,7 +28,7 @@ def cli_server_attach(
     """
     info("Attaching to server logs...")
     attach_logs(
-        name,
+        name=name,
         instance_type=InstanceType.SERVER,
         infra_component=InfraComponentName.SERVER,
         system_folders=system_folders,

vantage6/cli/template/node_config.j2

@@ -29,7 +29,15 @@ node:
   {% endif %}
 
 
-  image: {{ node.image | default('harbor2.vantage6.ai/infrastructure/node:latest') }}
+  {% if node.image is defined %}
+  # Fixed image to use to run the node. Note that if specified, the node will not
+  # automatically run the version matching the server version.
+  image: {{ node.image }}
+  {% else %}
+  # You may specify a fixed image to use to run the node. Note that if specified, the
+  # node will not automatically run the version matching the server version.
+  # image: harbor2.vantage6.ai/infrastructure/node:latest
+  {% endif %}
 
   # Namespace in which the task kubernetes resources are created. This must be a
   # namespace where the node has access to create pods.
@@ -319,6 +327,21 @@ node:
     # report_interval_seconds: 45
   {% endif %}
 
+  # Provide additional environment variables to the algorithm containers. This can be
+  # useful for instance to provide threshold values, database credentials, etc.
+  # Note that variable names should consist of only letters, numbers and underscores,
+  # and start with a letter.
+  {% if node.algorithm_env is defined %}
+  algorithm_env:
+    {% for key, value in node.algorithm_env.items() %}
+    {{ key }}: {{ value }}
+    {% endfor %}
+  {% endif %}
+  {% else %}
+  # algorithm_env:
+  #     threshold_example: 10
+  {% endif %}
+
   {% if node.debug is defined %}
   # Debug settings
   debug:

vantage6/cli/template/node_config_nonk8s.j2

@@ -17,10 +17,6 @@ logging:
     name: requests
   - level: warning
     name: engineio.client
-  - level: warning
-    name: docker.utils.config
-  - level: warning
-    name: docker.auth
   - level: warning
     name: kubernetes.client.rest
 node_proxy_port: {{ node_proxy_port }}

vantage6/cli/test/integration_test.py

@@ -115,8 +115,8 @@
 #         click_ctx.invoke(remove_demo_network, name=name)
 #     else:
 #         info(
-#             f"Keeping the demo network {name}. You can start it with `v6 dev "
-#             "start-demo-network`"
+#             f"Keeping the demo network {name}. You can start it with `v6 sandbox "
+#             "start`"
 #         )
 
 #     return diagnose_results

vantage6/cli/utils.py

@@ -9,7 +9,6 @@ import re
 import subprocess
 from pathlib import Path
 
-import docker
 import questionary as q
 
 from vantage6.common import error, info, warning
@@ -63,22 +62,6 @@ def check_config_name_allowed(name: str) -> None:
         exit(1)
 
 
-def check_if_docker_daemon_is_running(docker_client: docker.DockerClient) -> None:
-    """
-    Check if Docker daemon is running
-
-    Parameters
-    ----------
-    docker_client : docker.DockerClient
-        The docker client
-    """
-    try:
-        docker_client.ping()
-    except Exception:
-        error("Docker socket can not be found. Make sure Docker is running.")
-        exit(1)
-
-
 def remove_file(file: str | Path, file_type: str) -> None:
     """
     Remove a file if it exists.

{vantage6-5.0.0a41.dist-info → vantage6-5.0.0a43.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: vantage6
-Version: 5.0.0a41
+Version: 5.0.0a43
 Summary: vantage6 command line interface
 Author: Vantage6 Team
 Maintainer-email: Frank Martin <f.martin@iknl.nl>, Bart van Beusekom <b.vanbeusekom@iknl.nl>
@@ -18,8 +18,8 @@ Requires-Dist: questionary==2.1.1
 Requires-Dist: rich==13.5.2
 Requires-Dist: schema==0.7.5
 Requires-Dist: sqlalchemy==2.0.37
-Requires-Dist: vantage6-client==5.0.0a41
-Requires-Dist: vantage6-common==5.0.0a41
+Requires-Dist: vantage6-client==5.0.0a43
+Requires-Dist: vantage6-common==5.0.0a43
 Provides-Extra: dev
 Requires-Dist: black; extra == 'dev'
 Requires-Dist: coverage==7.10.2; extra == 'dev'

{vantage6-5.0.0a41.dist-info → vantage6-5.0.0a43.dist-info}/RECORD

@@ -1,10 +1,10 @@
 vantage6/cli/__init__.py,sha256=8KIgMPbZTNdkYlUrB8irpsUA7KdkFdLbNbMKixOP2dE,277
 vantage6/cli/cli.py,sha256=uEazjKFMpVWP3rQ0FtHNcOg70qYTymoqPqc8dF5saKg,8591
 vantage6/cli/config.py,sha256=vaHNrgJTaAeYLpxfsXOHkYmsI1gLSipkKzyEOPXF1w4,8258
-vantage6/cli/configuration_create.py,sha256=Q8qnfDZ7gVEPgIqZJNJl4nEqc13ZVJh9K3U-O4XRk_Y,7354
+vantage6/cli/configuration_create.py,sha256=kQzmsokRiKtWU7ZThbSlK-utSSJPJawUpaWLqMe5QxM,7355
 vantage6/cli/configuration_manager.py,sha256=zsk6dkdUA9zggUeFSkzXrNZ_XkxmQf26_oZsmLYYsu8,8096
 vantage6/cli/globals.py,sha256=VBa49tjuy9KjeF1eKtZre5QSohnWvlI1hsHeDZNMblA,2738
-vantage6/cli/utils.py,sha256=kq1Nv8SJPG5STII9DAcTSR4yCsZcoOvM8rygA5cWa28,5199
+vantage6/cli/utils.py,sha256=6JJAvGWbRr_nY_T859BwNRXND-rvGQtthJMXlH-6Onk,4795
 vantage6/cli/utils_kubernetes.py,sha256=zMdarsuWeeZdrDBTczIjC920HadM_5BcOnhOFXBHk0Q,8200
 vantage6/cli/algorithm/create.py,sha256=kRT1BlBcb0fDaB2Q988WxtA6EyAZmOW5QoU2uhbwBIo,2075
 vantage6/cli/algorithm/generate_algorithm_json.py,sha256=p22wKt3y3J6G8ZQZ7qy5aNe7KppXdY7au9MKsnRWwwU,19525
@@ -26,46 +26,46 @@ vantage6/cli/auth/start.py,sha256=cH5bYvectyliobd6ybpGYf9wI7FyML5-5HS3jsjIyu8,28
 vantage6/cli/auth/stop.py,sha256=oWy7jDZ45zEyqSzwJr5-T14vp01D1TTcTYWxjXNtJ_U,1882
 vantage6/cli/common/attach.py,sha256=bw9-Q1JjKa_f8Q7-xI5lpI2WoUmlGKZSvULlGoSmnH8,3423
 vantage6/cli/common/decorator.py,sha256=N08qVbEokkV-XYLwEgEYRzjvgauiUdhIygBQqxR-XoM,4693
-vantage6/cli/common/list.py,sha256=j2q6B4k7wX5UMJ0gkuMrkYPl5I3NmkVuV6eV70hM36I,2075
-vantage6/cli/common/new.py,sha256=_srwNExvphy2SImbeFhGxuSsarkztPxxYXMwGMBy7g8,3278
+vantage6/cli/common/list.py,sha256=uCKfPxng0-WLYBMGhUphOC-kmi6kXsmK5hUpkRFjXhI,2082
+vantage6/cli/common/new.py,sha256=3ZhRFyzW04aRKJzLgn-Bh5t_T3EWei3YnYiI9-xr0aY,3204
 vantage6/cli/common/remove.py,sha256=q8YOihk5aClvPuw2cADulHrxeXv_0JhqpaNUVH1zhlQ,2206
-vantage6/cli/common/start.py,sha256=kMDjL_sObSkx4TqhnukyD9Jb7vOGXJ9Bo0pJBcxpbsg,10095
+vantage6/cli/common/start.py,sha256=mBoTrlVERpbP77N93udB_c1J1Fy82faN3lLhIZrKEG4,7648
 vantage6/cli/common/stop.py,sha256=qIJ1COJWvQlbIpyMqh6ao2WKuXDqPBbU7-wF7IuOgQc,5614
-vantage6/cli/common/utils.py,sha256=-XP-JslNpnveR37v4vwiCgdj4kXOMlluoPJRmNECtFk,11473
+vantage6/cli/common/utils.py,sha256=WSzbhleOasPLtS7vLjg1xoCrmydcqTCNM_SIGb8vqko,8577
 vantage6/cli/common/version.py,sha256=2XPeZm5NMYSqTGjHLUFcRFZZRhtDVLwytQjoDad3utU,2489
 vantage6/cli/context/__init__.py,sha256=umHNotzJjd2TQCela7V8MTUwN4iAKDy8AR4s7ask5Ic,3135
-vantage6/cli/context/algorithm_store.py,sha256=4_lglDDUyIss_H8iKzNAB0qWzCIppua4q-IvPp_i7A0,4332
+vantage6/cli/context/algorithm_store.py,sha256=twVcy8jah4uqq04udX_o-BVCAG2MeIUUDBbQOngXhBs,4002
 vantage6/cli/context/auth.py,sha256=CozmEzFtpL8K3Pq4rEiHl8MMPnCI7vKwmzsPAIF2Szc,3911
 vantage6/cli/context/base_server.py,sha256=vln405k6b4z4L_VIfPCycy7gIfpJs0nqvJa8enl2HsA,2390
-vantage6/cli/context/node.py,sha256=1jjDw3u1Vf0maycEA0lyiBkXrh_qcw2wGLd_b2tnX4k,7972
-vantage6/cli/context/server.py,sha256=nuTUSfe08xnMMREhy8TN_PND9Ay3CASeUcgcCV6ti9A,5308
+vantage6/cli/context/node.py,sha256=xsoNWBoZaPD-p5hUbUn7tztKyOqMmiqEQ698Bh1WI8I,7026
+vantage6/cli/context/server.py,sha256=FC4lnQeA3DIWQNVVbstVRlmK7DYSbdFDmLIJtOuiqxQ,4975
 vantage6/cli/dev/clean.py,sha256=4fk5zNU7mi43YTPmgHwl6AC43_uZZyt1SUFy-JXGkRU,829
 vantage6/cli/dev/common.py,sha256=fiERHE0o2-m0ZAgIbyaZnFhYdeVMddrHiUoiLjmAR8o,929
 vantage6/cli/dev/rebuild.py,sha256=3iMIqAxiwdZkx4Q0xQyqcWHvXUzOQT-9cyRuOiulwR8,1290
 vantage6/cli/dev/start.py,sha256=DzFtD_jQaVIIawfPdMwBLjY1E_YOokiWm27oanci8k4,1000
 vantage6/cli/dev/stop.py,sha256=-yrLCadDfeLES9pFJz9yxm33XtzEXpdqvHvwakLQNEE,663
-vantage6/cli/node/attach.py,sha256=xOTB_79pShvn6B4Ky1bZ3TI_F3gOkGS9huzbEE0DRYc,1217
+vantage6/cli/node/attach.py,sha256=JbBNYSvfou0ezKFrQt4ZGT4PgpYqz5gFuRKspQVreoI,1222
 vantage6/cli/node/create_private_key.py,sha256=UTsoJ04OCVjubC8b7AZhxrLzdwG-wQ_63ROw5uruxqs,5229
-vantage6/cli/node/files.py,sha256=y7WOGHCTE3DnmxgbweLcu51t0YLS9Jvl24zgCHKkQTQ,1003
+vantage6/cli/node/files.py,sha256=aVuTyq1R8YnpGDRHXm9A8QrK0tJ1dJUiuzJ04c4Mokk,1007
 vantage6/cli/node/list.py,sha256=cydU5tByy0bHWCApcaZ8Pl_2SEbiqkK-mjVhWeChiCc,361
-vantage6/cli/node/new.py,sha256=XEVsnkI1UBngWwE96-KIOcs4zdPCuq3coTGHPNQxepQ,12717
-vantage6/cli/node/remove.py,sha256=alInSH_3E-yJthQ8JrGaopvAZ7GgxuRBppnpC8BRTBU,1061
+vantage6/cli/node/new.py,sha256=EjlhlV1vAl3KhMIYz3hDqZFkYJTcSKJVKfd8J1kqiDk,12594
+vantage6/cli/node/remove.py,sha256=WwgFtoJ8MLxewfjN-Hz9bctXzgPUm5cn3yF_0KKuVqI,1067
 vantage6/cli/node/restart.py,sha256=hJWzyJjetfNe8YYkOt5ZEUE_t-LpvQOwUGcQH0pXfNQ,3122
 vantage6/cli/node/set_api_key.py,sha256=eLB-NVpvXROlGKPAMua6vBAs5l08-AkENWiTfOB82FM,2103
-vantage6/cli/node/start.py,sha256=dn9wlDzq-XCV4ruMSTt0Nt01TOuJKZbXt3WJ3PPqZQY,4691
+vantage6/cli/node/start.py,sha256=tVwJINgMGAC7_tTC3MXBDHVWL1G9n-7vtvKVr-VbIq0,4361
 vantage6/cli/node/stop.py,sha256=9936hGZu8EuYFF2NZ2of8U33jc8hKRLc4bXFu1ImuLw,6814
 vantage6/cli/node/version.py,sha256=vuQlq2SFWxHsA2_hqXtYK8c06mS2KqPCPU48F7-XXFU,4001
-vantage6/cli/node/common/__init__.py,sha256=B05W_dhjzhbk056xgxoGDDWlOM0YYGM6ZMslalR-nyw,3977
+vantage6/cli/node/common/__init__.py,sha256=HO5eMantNY174C1K-XAgEPtCz6NpcR3H8N5yw-4j_sU,3482
 vantage6/cli/node/common/task_cleanup.py,sha256=bNa72P_gmGeQ3Z-Vl6Q7tKG8-deSAqk_02gvG--eHIY,4515
 vantage6/cli/prometheus/monitoring_manager.py,sha256=I4iR_2i6EgLMR2dM2e4bOVbTyGN4jPPRDPKHd8_CbRk,4908
 vantage6/cli/prometheus/prometheus.yml,sha256=Q4i9lVknITBodHUMgarRnEsXfXTNuSdI6a-9pW4YCoI,98
 vantage6/cli/sandbox/new.py,sha256=bsHHd7nVVOcoIpl0yhM15LxG_6adOvnIkh8e4h4HwPA,6077
-vantage6/cli/sandbox/remove.py,sha256=xCLE1ayjaDimby9Out0XgyLZRY0wbwmVpuEBDCrcPkM,5228
+vantage6/cli/sandbox/remove.py,sha256=C4jzb1dlYfLsDeIMsofytDQfefSv2hovhVC2cYhshSo,5525
 vantage6/cli/sandbox/start.py,sha256=5qJawSH4HBO23RZgaPQd3UUYIJ0tVMcGdzNaKIUE6PU,10256
 vantage6/cli/sandbox/stop.py,sha256=gjNfcoXfB4pVy7x3CvdiJ1yC2x36UO17rBlAaKS_-QE,2782
 vantage6/cli/sandbox/config/base.py,sha256=24Ebo9mVa6KjqZllGkFvzjiD29o1gAVz0KQn6tZCHZU,3948
 vantage6/cli/sandbox/config/core.py,sha256=mScKMiaxpxR9rkuHr8mxjTtk2Dgoh4B4ZlxMrx60f1A,10004
-vantage6/cli/sandbox/config/node.py,sha256=qyxAotGwJStTpO91J0plvgUZsyB_GyRBFNHuCHO0uQ4,10239
+vantage6/cli/sandbox/config/node.py,sha256=s75W3ZU7-E-s0MQCrN0vVSUS8kPIh5rNjVWoJpAfMI8,10127
 vantage6/cli/sandbox/data/km_dataset.csv,sha256=OrYF2ympb2QndiUOX_nTFGGB1HbAp2eOvZzrQ_PqJs4,31283
 vantage6/cli/sandbox/data/olympic_athletes_2016.csv,sha256=WGycwcwMKEyOyJc3aEo4EhrnBJiTSE0kZAr50j2qzGk,77699
 vantage6/cli/sandbox/populate/__init__.py,sha256=xzrDMnmX60kuuDA7u-E-aABdMO1rZKNwmxOo4cL68L4,4706
@@ -73,7 +73,7 @@ vantage6/cli/sandbox/populate/helpers/connect_store.py,sha256=Wb4shAbrNU7AARK7KZ
 vantage6/cli/sandbox/populate/helpers/delete_fixtures.py,sha256=fIAgzxvJqTfB1BCC-Nsdt1ltBL-o4Afl08zx6ZITb6I,2101
 vantage6/cli/sandbox/populate/helpers/load_fixtures.py,sha256=PQpEo0Q5PyWwYDaenAMqPrgRG6DF_SiFGK1V0BFNY3g,16225
 vantage6/cli/sandbox/populate/helpers/utils.py,sha256=5LSGZ-h7QtMB51IDzawXPIQFF7i2CIm6oYzEsdVKG4Y,1213
-vantage6/cli/server/attach.py,sha256=FrSdpRLJeRKWt0VBifj8oPKZsLNDaKJaI2Hy0D2m3kY,1282
+vantage6/cli/server/attach.py,sha256=4zT4MJdqff0paCvDj2V1diRI0_qMXoBuJCBnzaz8xsM,1287
 vantage6/cli/server/files.py,sha256=MsnLaY91F2m49mm_FpVboFrSsZiEsu175KioN1alZfk,568
 vantage6/cli/server/import_.py,sha256=m7yjhXhGvL3dJ-8pEN0NMrE3CjMTcf0A0hEhJ5kTBIk,8276
 vantage6/cli/server/list.py,sha256=m-g1k8pmScK_CdhKiVFrLIUZsPnPsHr5CrfHmmI6KJk,299
@@ -85,18 +85,18 @@ vantage6/cli/server/version.py,sha256=iVYem8Gye4dCChC70s_FTqiWi1AF4VQfvhebnh0jur
 vantage6/cli/server/common/__init__.py,sha256=Frh_4V8ssoGy8rO3o7mRnlKkpOlNSjA5J6eReN1Yluo,1386
 vantage6/cli/template/algo_store_config.j2,sha256=dlKiUzZ-zYGdFCBArMMRpXvoQFG7rYz4vmv6rCwp6fM,7470
 vantage6/cli/template/auth_config.j2,sha256=mFNL7H3plnqN7kpptk2WPXPsnuGddCP_ktbzBZHi5ic,10866
-vantage6/cli/template/node_config.j2,sha256=ZHx-PvjldyKLcE3e8V1K0k5LkDUaS1uZunvbQWfgA2E,13963
-vantage6/cli/template/node_config_nonk8s.j2,sha256=mrS-YQwg_9i7zBKuEFG5pe3ZbHCLtl5hGgzk2etXTvo,783
+vantage6/cli/template/node_config.j2,sha256=uiZSGuo6lGokCqd6fOc0SRsJOQgFWWSsNrJa4oFsFdc,14858
+vantage6/cli/template/node_config_nonk8s.j2,sha256=J4r-ZtGX_PGSqnPBcobSjKUaWlDd-WjMz93kHs9OPW0,693
 vantage6/cli/template/server_config.j2,sha256=0uksEkCf4lRcBD39brOGdwoF_vCtieA-FjTiSUxNvo0,10195
 vantage6/cli/test/client_script.py,sha256=AHQ4fhzbtD-VcJAm0rxUDteepXNa4Bef9SKWnzobTd0,4825
 vantage6/cli/test/feature_tester.py,sha256=AsZam91KqaAo_yIFxyZ5Hmy1ZPw83d02BDyO4TzKFQo,2631
-vantage6/cli/test/integration_test.py,sha256=MctR_t-WEyxzFpMdc6ByTcX1BQglZiT5-CIOQXTBBWo,4034
+vantage6/cli/test/integration_test.py,sha256=dOAHTr1Ids1vGL4E_T1kPid4Z0KDh5mvzIRzKboe4ys,4025
 vantage6/cli/test/algo_test_scripts/algo_test_arguments.py,sha256=HIKAhJ5zKkWMGXpCb_KLukbcwbyeMK5j3wcqubalbyM,791
 vantage6/cli/test/algo_test_scripts/algo_test_script.py,sha256=jfzXPmpL0HlE_eq1jXLV3HuZgh_aV-ZOaawHcYIuwQE,2741
 vantage6/cli/test/common/diagnostic_runner.py,sha256=jFFHqlj3v0WRpVEBa7Ovek3DL6RX6W5cQd9w5hWHtZA,6597
 vantage6/cli/use/context.py,sha256=cTp9kwC4hhq4FkPz1wYAeYWUGK4054S19FxpZYLF7lM,1665
 vantage6/cli/use/namespace.py,sha256=ev22EuixwW7ZWqhGo8SiSKgtGq4yy8gEXmMhR31khkE,1729
-vantage6-5.0.0a41.dist-info/METADATA,sha256=4aR_JWhmZV4yqZ9JyQBrlRgziI_a-0CblbUxiOMMxXk,1778
-vantage6-5.0.0a41.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-vantage6-5.0.0a41.dist-info/entry_points.txt,sha256=RKVCMsD70s_Gp6If89uDlCphsZ9uLIOMt1gciv8EMDQ,53
-vantage6-5.0.0a41.dist-info/RECORD,,
+vantage6-5.0.0a43.dist-info/METADATA,sha256=U-Tw-Up8VO7WXhb-W4zmz5goWxF558yNbIDwjzZeyZk,1778
+vantage6-5.0.0a43.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+vantage6-5.0.0a43.dist-info/entry_points.txt,sha256=RKVCMsD70s_Gp6If89uDlCphsZ9uLIOMt1gciv8EMDQ,53
+vantage6-5.0.0a43.dist-info/RECORD,,