vantage6 5.0.0a7__py3-none-any.whl → 5.0.0a14__py3-none-any.whl

tests_cli/test_node_cli.py

@@ -295,29 +295,12 @@ class NodeCLITest(unittest.TestCase):
             result = runner.invoke(cli_node_restart, ["--name", "iknl"])
         self.assertEqual(result.exit_code, 0)
 
-    @patch("vantage6.cli.node.attach.time")
-    @patch("vantage6.cli.node.attach.print_log_worker")
-    @patch("docker.DockerClient.containers")
-    @patch("vantage6.cli.node.attach.check_docker_running", return_value=True)
-    def test_attach(self, check_docker, containers, log_worker, time_):
+    @patch("vantage6.cli.node.attach.attach_logs")
+    def test_attach(self, attach_logs):
         """Attach docker logs without errors."""
-        container1 = MagicMock()
-        container1.name = f"{APPNAME}-iknl-user"
-        containers.list.return_value = [container1]
-
-        log_worker.return_value = ""
-        time_.sleep.side_effect = KeyboardInterrupt()
-
         runner = CliRunner()
-        result = runner.invoke(cli_node_attach, ["--name", "iknl"])
-
-        self.assertEqual(
-            result.output,
-            "[info ] - Closing log file. Keyboard Interrupt.\n"
-            "[info ] - Note that your node is still running! Shut it down "
-            "with 'v6 node stop'\n",
-        )
-        self.assertEqual(result.exit_code, 0)
+        runner.invoke(cli_node_attach)
+        attach_logs.assert_called_once_with("app=node")
 
     @patch("vantage6.cli.node.clean.q")
     @patch("docker.DockerClient.volumes")

tests_cli/test_server_cli.py

@@ -5,6 +5,7 @@ from pathlib import Path
 from click.testing import CliRunner
 
 from vantage6.common.globals import APPNAME, InstanceType
+from vantage6.cli.common.utils import attach_logs
 from vantage6.cli.server.start import cli_server_start
 from vantage6.cli.server.list import cli_server_configuration_list
 from vantage6.cli.server.files import cli_server_files
@@ -132,7 +133,7 @@ class ServerCLITest(unittest.TestCase):
         """Stop server without errors."""
 
         container1 = MagicMock()
-        container1.name = f"{APPNAME}-iknl-system-{InstanceType.SERVER}"
+        container1.name = f"{APPNAME}-iknl-system-{InstanceType.SERVER.value}"
         containers.containers.list.return_value = [container1]
 
         runner = CliRunner()
@@ -141,18 +142,38 @@ class ServerCLITest(unittest.TestCase):
         self.assertIsNone(result.exception)
         self.assertEqual(result.exit_code, 0)
 
-    @patch("vantage6.cli.server.attach.time.sleep")
-    @patch("docker.DockerClient.containers")
-    def test_attach(self, containers, sleep):
-        """Attach log to the console without errors."""
-        container1 = MagicMock()
-        container1.name = f"{APPNAME}-iknl-system-{InstanceType.SERVER}"
-        containers.list.return_value = [container1]
-
-        sleep.side_effect = KeyboardInterrupt("Boom!")
-
+    @patch("vantage6.cli.server.attach.attach_logs")
+    def test_attach(self, attach_logs):
+        """Attach logs to the console without errors."""
         runner = CliRunner()
-        result = runner.invoke(cli_server_attach, ["--name", "iknl"])
+        result = runner.invoke(cli_server_attach)
 
         self.assertIsNone(result.exception)
         self.assertEqual(result.exit_code, 0)
+        attach_logs.assert_called_once_with(
+            "app=vantage6-server", "component=vantage6-server"
+        )
+
+    @patch("vantage6.cli.common.utils.Popen")
+    def test_attach_logs(self, mock_popen):
+        # Mock the Popen instance and its methods
+        mock_process = mock_popen.return_value
+        mock_process.wait.return_value = None
+
+        # Call the function with a sample label
+        attach_logs("app=node", "env=dev")
+
+        # Construct the expected command
+        expected_command = [
+            "devspace",
+            "logs",
+            "--follow",
+            "--label-selector",
+            "app=node,env=dev",
+        ]
+
+        # Verify that Popen was called with the expected command
+        mock_popen.assert_called_once_with(expected_command, stdout=None, stderr=None)
+
+        # Verify that wait was called on the process
+        mock_process.wait.assert_called_once()

vantage6/cli/__build__

@@ -1 +1 @@
-7
+14

vantage6/cli/algostore/attach.py

@@ -1,49 +1,13 @@
 import click
-import docker
-import questionary as q
 
-from colorama import Fore, Style
-
-from vantage6.common import error
-from vantage6.common.docker.addons import check_docker_running
-from vantage6.common.globals import APPNAME, InstanceType
-from vantage6.cli.common.start import attach_logs
-from vantage6.cli.globals import DEFAULT_SERVER_SYSTEM_FOLDERS
+from vantage6.common import info
+from vantage6.cli.common.utils import attach_logs
 
 
 @click.command()
-@click.option("-n", "--name", default=None, help="configuration name")
-@click.option("--system", "system_folders", flag_value=True)
-@click.option(
-    "--user", "system_folders", flag_value=False, default=DEFAULT_SERVER_SYSTEM_FOLDERS
-)
-def cli_algo_store_attach(name: str, system_folders: bool) -> None:
+def cli_algo_store_attach() -> None:
     """
-    Show the server logs in the current console.
+    Show the store logs in the current console.
     """
-    check_docker_running()
-    client = docker.from_env()
-
-    running_servers = client.containers.list(
-        filters={"label": f"{APPNAME}-type={InstanceType.ALGORITHM_STORE}"}
-    )
-    running_server_names = [container.name for container in running_servers]
-
-    if not name:
-        try:
-            name = q.select(
-                "Select the algorithm store you wish to attach:",
-                choices=running_server_names,
-            ).unsafe_ask()
-        except KeyboardInterrupt:
-            error("Aborted by user!")
-            return
-    else:
-        post_fix = "system" if system_folders else "user"
-        name = f"{APPNAME}-{name}-{post_fix}-{InstanceType.ALGORITHM_STORE}"
-
-    if name in running_server_names:
-        container = client.containers.get(name)
-        attach_logs(container, InstanceType.ALGORITHM_STORE)
-    else:
-        error(f"{Fore.RED}{name}{Style.RESET_ALL} is not running!")
+    info("Attaching to store logs...")
+    attach_logs("app=store", "component=store-server")

vantage6/cli/algostore/list.py

@@ -12,4 +12,4 @@ def cli_algo_store_configuration_list() -> None:
     """
     check_docker_running()
 
-    get_server_configuration_list(InstanceType.ALGORITHM_STORE)
+    get_server_configuration_list(InstanceType.ALGORITHM_STORE.value)

vantage6/cli/algostore/start.py

@@ -54,7 +54,7 @@ def cli_algo_store_start(
     Start the algorithm store server.
     """
     info("Starting algorithm store...")
-    docker_client = check_for_start(ctx, InstanceType.ALGORITHM_STORE)
+    docker_client = check_for_start(ctx, InstanceType.ALGORITHM_STORE.value)
 
     image = get_image(image, ctx, "algorithm-store", DEFAULT_ALGO_STORE_IMAGE)
 
@@ -91,7 +91,7 @@ def cli_algo_store_start(
         mounts=mounts,
         detach=True,
         labels={
-            f"{APPNAME}-type": InstanceType.ALGORITHM_STORE,
+            f"{APPNAME}-type": InstanceType.ALGORITHM_STORE.value,
             "name": ctx.config_file_name,
         },
         environment=environment_vars,

vantage6/cli/algostore/stop.py

@@ -23,7 +23,7 @@ def cli_algo_store_stop(ctx: AlgorithmStoreContext, all_stores: bool):
     client = docker.from_env()
 
     running_stores = client.containers.list(
-        filters={"label": f"{APPNAME}-type={InstanceType.ALGORITHM_STORE}"}
+        filters={"label": f"{APPNAME}-type={InstanceType.ALGORITHM_STORE.value}"}
     )
 
     if not running_stores:

vantage6/cli/cli.py

@@ -22,14 +22,11 @@ from vantage6.cli.node.set_api_key import cli_node_set_api_key
 from vantage6.cli.node.start import cli_node_start
 from vantage6.cli.node.stop import cli_node_stop
 from vantage6.cli.node.version import cli_node_version
-from vantage6.cli.dev.create import create_demo_network
-from vantage6.cli.dev.remove import remove_demo_network
-from vantage6.cli.dev.start import start_demo_network
-from vantage6.cli.dev.stop import stop_demo_network
 from vantage6.cli.algorithm.create import cli_algorithm_create
 from vantage6.cli.algorithm.update import cli_algorithm_update
 from vantage6.cli.test.feature_tester import cli_test_features
-from vantage6.cli.test.integration_test import cli_test_integration
+
+# from vantage6.cli.test.integration_test import cli_test_integration
 from vantage6.cli.algostore.attach import cli_algo_store_attach
 from vantage6.cli.algostore.new import cli_algo_store_new
 from vantage6.cli.algostore.start import cli_algo_store_start
@@ -93,11 +90,7 @@ def cli_dev() -> None:
     """
 
 
-# Define the commands for the dev group
-cli_dev.add_command(create_demo_network, name="create-demo-network")
-cli_dev.add_command(remove_demo_network, name="remove-demo-network")
-cli_dev.add_command(start_demo_network, name="start-demo-network")
-cli_dev.add_command(stop_demo_network, name="stop-demo-network")
+# TODO add commands for the dev group
 
 
 # Define the algorithm group
@@ -123,7 +116,7 @@ def cli_test() -> None:
 
 # Define the commands for the test group
 cli_test.add_command(cli_test_features, name="feature-test")
-cli_test.add_command(cli_test_integration, name="integration-test")
+# cli_test.add_command(cli_test_integration, name="integration-test")
 
 
 # Define the algorithm-store group

vantage6/cli/common/utils.py

@@ -1,8 +1,10 @@
+import enum
 import questionary as q
 from colorama import Fore, Style
 import click
 from typing import Iterable
 import docker
+from subprocess import Popen
 
 
 from vantage6.common import warning, error
@@ -87,7 +89,11 @@ def get_server_configuration_list(instance_type: InstanceType.SERVER) -> None:
     client = docker.from_env()
     ctx_class = select_context_class(instance_type)
 
-    running_server_names = get_running_servers(client, instance_type)
+    instance_type_value = (
+        instance_type.value if isinstance(instance_type, enum.Enum) else instance_type
+    )
+
+    running_server_names = get_running_servers(client, instance_type_value)
     header = "\nName" + (21 * " ") + "Status" + (10 * " ") + "System/User"
 
     click.echo(header)
@@ -101,7 +107,8 @@ def get_server_configuration_list(instance_type: InstanceType.SERVER) -> None:
     for config in configs:
         status = (
             running
-            if f"{APPNAME}-{config.name}-system-{instance_type}" in running_server_names
+            if f"{APPNAME}-{config.name}-system-{instance_type_value}"
+            in running_server_names
             else stopped
         )
         click.echo(f"{config.name:25}" f"{status:25} System ")
@@ -111,7 +118,8 @@ def get_server_configuration_list(instance_type: InstanceType.SERVER) -> None:
     for config in configs:
         status = (
             running
-            if f"{APPNAME}-{config.name}-user-{instance_type}" in running_server_names
+            if f"{APPNAME}-{config.name}-user-{instance_type_value}"
+            in running_server_names
             else stopped
         )
         click.echo(f"{config.name:25}" f"{status:25} User   ")
@@ -158,3 +166,17 @@ def get_name_from_container_name(container_name: str) -> str:
     # 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 attach_logs(*labels: list[str]) -> None:
+    """
+    Attach to the logs of the given labels.
+
+    Parameters
+    ----------
+    labels : list[str]
+        The labels to attach to
+    """
+    command = ["devspace", "logs", "--follow", "--label-selector", ",".join(labels)]
+    process = Popen(command, stdout=None, stderr=None)
+    process.wait()

vantage6/cli/configuration_manager.py

@@ -29,6 +29,7 @@ class ServerConfiguration(Configuration):
         "allow_drop_all": Use(bool),
         "logging": {**LOGGING_VALIDATORS, "file": Use(str)},
         Optional("server_name"): str,
+        Optional("runs_data_cleanup_days"): Use(int),
     }
 
 

vantage6/cli/context/algorithm_store.py

@@ -53,7 +53,7 @@ class AlgorithmStoreContext(BaseServerContext):
         str
             Server's docker container name
         """
-        return f"{APPNAME}-{self.name}-{self.scope}-{ServerType.ALGORITHM_STORE}"
+        return f"{APPNAME}-{self.name}-{self.scope}-{ServerType.ALGORITHM_STORE.value}"
 
     @classmethod
     def from_external_config_file(

vantage6/cli/context/node.py

@@ -136,7 +136,7 @@ class NodeContext(AppContext):
         Path
             Path to the data folder
         """
-        return AppContext.type_data_folder(InstanceType.NODE, system_folders)
+        return AppContext.type_data_folder(InstanceType.NODE.value, system_folders)
 
     @property
     def databases(self) -> dict:

vantage6/cli/node/attach.py

@@ -1,74 +1,13 @@
-import time
-from threading import Thread
 import click
-import questionary as q
-import docker
 
-from colorama import Fore, Style
-
-from vantage6.common import warning, error, info
-from vantage6.common.globals import APPNAME
-from vantage6.common.docker.addons import check_docker_running
-
-from vantage6.cli.common.utils import print_log_worker
-from vantage6.cli.globals import DEFAULT_NODE_SYSTEM_FOLDERS as N_FOL
-from vantage6.cli.node.common import find_running_node_names
+from vantage6.common import info
+from vantage6.cli.common.utils import attach_logs
 
 
 @click.command()
-@click.option("-n", "--name", default=None, help="Configuration name")
-@click.option(
-    "--system",
-    "system_folders",
-    flag_value=True,
-    help="Search for configuration in system folders rather than " "user folders",
-)
-@click.option(
-    "--user",
-    "system_folders",
-    flag_value=False,
-    default=N_FOL,
-    help="Search for configuration in user folders rather than "
-    "system folders. This is the default",
-)
-def cli_node_attach(name: str, system_folders: bool) -> None:
+def cli_node_attach() -> None:
     """
     Show the node logs in the current console.
     """
-    check_docker_running()
-    client = docker.from_env()
-
-    running_node_names = find_running_node_names(client)
-
-    if not running_node_names:
-        warning("No nodes are currently running. Cannot show any logs!")
-        return
-
-    if not name:
-        try:
-            name = q.select(
-                "Select the node you wish to attach:", choices=running_node_names
-            ).unsafe_ask()
-        except KeyboardInterrupt:
-            error("Aborted by user!")
-            return
-    else:
-        post_fix = "system" if system_folders else "user"
-        name = f"{APPNAME}-{name}-{post_fix}"
-
-    if name in running_node_names:
-        container = client.containers.get(name)
-        logs = container.attach(stream=True, logs=True)
-        Thread(target=print_log_worker, args=(logs,), daemon=True).start()
-        while True:
-            try:
-                time.sleep(1)
-            except KeyboardInterrupt:
-                info("Closing log file. Keyboard Interrupt.")
-                info(
-                    "Note that your node is still running! Shut it down with "
-                    f"'{Fore.RED}v6 node stop{Style.RESET_ALL}'"
-                )
-                exit(0)
-    else:
-        error(f"{Fore.RED}{name}{Style.RESET_ALL} was not running!?")
+    info("Attaching to node logs...")
+    attach_logs("app=node")

vantage6/cli/node/common/__init__.py

@@ -130,6 +130,6 @@ def find_running_node_names(client: docker.DockerClient) -> list[str]:
         List of names of running nodes
     """
     running_nodes = client.containers.list(
-        filters={"label": f"{APPNAME}-type={InstanceType.NODE}"}
+        filters={"label": f"{APPNAME}-type={InstanceType.NODE.value}"}
     )
     return [node.name for node in running_nodes]

vantage6/cli/node/start.py

@@ -78,7 +78,7 @@ def cli_node_start(
 
     # check that this node is not already running
     running_nodes = docker_client.containers.list(
-        filters={"label": f"{APPNAME}-type={InstanceType.NODE}"}
+        filters={"label": f"{APPNAME}-type={InstanceType.NODE.value}"}
     )
 
     suffix = "system" if system_folders else "user"
@@ -306,7 +306,7 @@ def cli_node_start(
         volumes=volumes,
         detach=True,
         labels={
-            f"{APPNAME}-type": InstanceType.NODE,
+            f"{APPNAME}-type": InstanceType.NODE.value,
             "system": str(system_folders),
             "name": ctx.config_file_name,
         },

vantage6/cli/server/attach.py

@@ -1,63 +1,13 @@
-import time
-from threading import Thread
-
 import click
-import questionary as q
-import docker
-
-from colorama import Fore, Style
-
-from vantage6.common import info, error
-from vantage6.common.docker.addons import check_docker_running
-from vantage6.common.globals import APPNAME, InstanceType
 
-from vantage6.cli.globals import DEFAULT_SERVER_SYSTEM_FOLDERS
-from vantage6.cli.common.utils import print_log_worker
+from vantage6.common import info
+from vantage6.cli.common.utils import attach_logs
 
 
 @click.command()
-@click.option("-n", "--name", default=None, help="configuration name")
-@click.option("--system", "system_folders", flag_value=True)
-@click.option(
-    "--user", "system_folders", flag_value=False, default=DEFAULT_SERVER_SYSTEM_FOLDERS
-)
-def cli_server_attach(name: str, system_folders: bool) -> None:
+def cli_server_attach() -> None:
     """
     Show the server logs in the current console.
     """
-    check_docker_running()
-    client = docker.from_env()
-
-    running_servers = client.containers.list(
-        filters={"label": f"{APPNAME}-type={InstanceType.SERVER}"}
-    )
-    running_server_names = [node.name for node in running_servers]
-
-    if not name:
-        try:
-            name = q.select(
-                "Select the server you wish to attach:", choices=running_server_names
-            ).unsafe_ask()
-        except KeyboardInterrupt:
-            error("Aborted by user!")
-            return
-    else:
-        post_fix = "system" if system_folders else "user"
-        name = f"{APPNAME}-{name}-{post_fix}-{InstanceType.SERVER}"
-
-    if name in running_server_names:
-        container = client.containers.get(name)
-        logs = container.attach(stream=True, logs=True, stdout=True)
-        Thread(target=print_log_worker, args=(logs,), daemon=True).start()
-        while True:
-            try:
-                time.sleep(1)
-            except KeyboardInterrupt:
-                info("Closing log file. Keyboard Interrupt.")
-                info(
-                    "Note that your server is still running! Shut it down "
-                    f"with {Fore.RED}v6 server stop{Style.RESET_ALL}"
-                )
-                exit(0)
-    else:
-        error(f"{Fore.RED}{name}{Style.RESET_ALL} was not running!?")
+    info("Attaching to server logs...")
+    attach_logs("app=vantage6-server", "component=vantage6-server")

vantage6/cli/server/import_.py

@@ -132,7 +132,10 @@ def cli_server_import(
         command=cmd,
         mounts=mounts,
         detach=True,
-        labels={f"{APPNAME}-type": InstanceType.SERVER, "name": ctx.config_file_name},
+        labels={
+            f"{APPNAME}-type": InstanceType.SERVER.value,
+            "name": ctx.config_file_name,
+        },
         environment=environment_vars,
         auto_remove=not keep,
         tty=True,

vantage6/cli/server/list.py

@@ -11,4 +11,5 @@ def cli_server_configuration_list() -> None:
     Print the available server configurations.
     """
     check_docker_running()
-    get_server_configuration_list(InstanceType.SERVER)
+
+    get_server_configuration_list(InstanceType.SERVER.value)

vantage6/cli/server/shell.py

@@ -28,7 +28,7 @@ def cli_server_shell(ctx: ServerContext) -> None:
     docker_client = docker.from_env()
 
     running_servers = docker_client.containers.list(
-        filters={"label": f"{APPNAME}-type={InstanceType.SERVER}"}
+        filters={"label": f"{APPNAME}-type={InstanceType.SERVER.value}"}
     )
 
     if ctx.docker_container_name not in [s.name for s in running_servers]:

vantage6/cli/server/start.py

@@ -83,7 +83,7 @@ def cli_server_start(
     Start the server.
     """
     info("Starting server...")
-    docker_client = check_for_start(ctx, InstanceType.SERVER)
+    docker_client = check_for_start(ctx, InstanceType.SERVER.value)
 
     image = get_image(image, ctx, "server", DEFAULT_SERVER_IMAGE)
 
@@ -157,7 +157,10 @@ def cli_server_start(
         command=cmd,
         mounts=mounts,
         detach=True,
-        labels={f"{APPNAME}-type": InstanceType.SERVER, "name": ctx.config_file_name},
+        labels={
+            f"{APPNAME}-type": InstanceType.SERVER.value,
+            "name": ctx.config_file_name,
+        },
         environment=environment_vars,
         ports={f"{internal_port}/tcp": (ip, port_)},
         name=ctx.docker_container_name,

vantage6/cli/server/stop.py

@@ -37,7 +37,7 @@ def cli_server_stop(name: str, system_folders: bool, all_servers: bool):
     client = docker.from_env()
 
     running_servers = client.containers.list(
-        filters={"label": f"{APPNAME}-type={InstanceType.SERVER}"}
+        filters={"label": f"{APPNAME}-type={InstanceType.SERVER.value}"}
     )
 
     if not running_servers:
@@ -62,7 +62,7 @@ def cli_server_stop(name: str, system_folders: bool, all_servers: bool):
             return
     else:
         post_fix = "system" if system_folders else "user"
-        container_name = f"{APPNAME}-{name}-{post_fix}-{InstanceType.SERVER}"
+        container_name = f"{APPNAME}-{name}-{post_fix}-{InstanceType.SERVER.value}"
 
     if container_name not in running_server_names:
         error(f"{Fore.RED}{name}{Style.RESET_ALL} is not running!")

vantage6/cli/server/version.py

@@ -22,10 +22,10 @@ def cli_server_version(name: str, system_folders: bool) -> None:
     check_docker_running()
     client = docker.from_env()
 
-    running_server_names = get_running_servers(client, InstanceType.SERVER)
+    running_server_names = get_running_servers(client, InstanceType.SERVER.value)
 
     name = get_server_name(
-        name, system_folders, running_server_names, InstanceType.SERVER
+        name, system_folders, running_server_names, InstanceType.SERVER.value
     )
 
     if name in running_server_names:

vantage6/cli/template/algo_store_config.j2

@@ -1,4 +1,4 @@
-allow_drop_all: 'True'
+allow_drop_all: true
 description: 'default_algorithm_store'
 ip: 0.0.0.0
 logging:

vantage6/cli/template/node_config.j2

@@ -33,4 +33,5 @@ logging:
 port: {{ port }}
 server_url: {{ server_url }}
 task_dir: {{ task_dir}}
+task_namespace: {{ task_namespace }}
 {{ user_provided_config }}

vantage6/cli/template/server_config.j2

@@ -1,4 +1,4 @@
-allow_drop_all: 'False'
+allow_drop_all: false
 api_path: /api
 description: 'defaultserver'
 ip: 0.0.0.0

vantage6/cli/test/common/diagnostic_runner.py

@@ -97,9 +97,7 @@ class DiagnosticRunner:
             name="test",
             description="Basic Diagnostic test",
             image=DIAGNOSTICS_IMAGE,
-            input_={
-                "method": "base_features",
-            },
+            method="base_features",
             organizations=self.organization_ids,
             databases=[{"label": "default"}],
         )
@@ -123,8 +121,8 @@ class DiagnosticRunner:
             name="test",
             description="VPN Diagnostic test",
             image=DIAGNOSTICS_IMAGE,
+            method="vpn_features",
             input_={
-                "method": "vpn_features",
                 "kwargs": {"other_nodes": self.organization_ids},
             },
             organizations=self.organization_ids,