vantage6 4.9.1__tar.gz → 4.10.0rc2__tar.gz

{vantage6-4.9.1 → vantage6-4.10.0rc2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: vantage6
-Version: 4.9.1
+Version: 4.10.0rc2
 Summary: vantage6 command line interface
 Home-page: https://github.com/vantage6/vantage6
 Requires-Python: >=3.10

{vantage6-4.9.1 → vantage6-4.10.0rc2}/tests_cli/test_node_cli.py

@@ -244,9 +244,15 @@ class NodeCLITest(unittest.TestCase):
 
         runner = CliRunner()
 
+        # Should fail when starting node with non-existing database CSV file
         with runner.isolated_filesystem():
             result = runner.invoke(cli_node_start, ["--name", "some-name"])
+        self.assertEqual(result.exit_code, 1)
 
+        # now do it with a SQL database which doesn't have to be an existing file
+        ctx.databases = [{"label": "some_label", "uri": "data.db", "type": "sql"}]
+        with runner.isolated_filesystem():
+            result = runner.invoke(cli_node_start, ["--name", "some-name"])
         self.assertEqual(result.exit_code, 0)
 
     def _setup_stop_test(self, containers):

{vantage6-4.9.1 → vantage6-4.10.0rc2}/tests_cli/test_wizard.py

@@ -33,8 +33,8 @@ class WizardTest(unittest.TestCase):
         """An error is printed when docker is not running"""
 
         with patch(f"{module_path}.q") as q:
-            q.prompt.side_effect = self.prompts
-            q.confirm.return_value.ask.side_effect = [
+            q.unsafe_prompt.side_effect = self.prompts
+            q.confirm.return_value.unsafe_ask.side_effect = [
                 True,  # add a database
                 False,  # don't enable two-factor authentication
                 True,  # add VPN server
@@ -79,8 +79,8 @@ class WizardTest(unittest.TestCase):
 
     def test_server_wizard(self):
         with patch(f"{module_path}.q") as q:
-            q.prompt.side_effect = self.prompts
-            q.confirm.return_value.ask.side_effect = [
+            q.unsafe_prompt.side_effect = self.prompts
+            q.confirm.return_value.unsafe_ask.side_effect = [
                 True,
                 True,
                 True,
@@ -134,7 +134,7 @@ class WizardTest(unittest.TestCase):
         available_configurations.return_value = [[config], []]
 
         with patch(f"{module_path}.q") as q:
-            q.select.return_value.ask.return_value = "vtg6"
+            q.select.return_value.unsafe_ask.return_value = "vtg6"
             name = select_configuration_questionaire(InstanceType.NODE, True)
 
         self.assertEqual(name, "vtg6")

vantage6-4.10.0rc2/vantage6/cli/__build__

@@ -0,0 +1 @@
+2

vantage6-4.10.0rc2/vantage6/cli/__init__.py

@@ -0,0 +1,3 @@
+"""Command line interface for the vantage6 infrastructure."""
+
+from ._version import version_info, __version__  # noqa: F401

{vantage6-4.9.1 → vantage6-4.10.0rc2}/vantage6/cli/_version.py

@@ -7,7 +7,7 @@ with open(os.path.join(here, "__build__")) as fp:
     __build__ = json.load(fp)
 
 # Module version
-version_info = (4, 9, 1, "final", __build__, 0)
+version_info = (4, 10, 0, "candidate", __build__, 0)
 
 # Module version stage suffix map
 _specifier_ = {"alpha": "a", "beta": "b", "candidate": "rc", "final": ""}

{vantage6-4.9.1 → vantage6-4.10.0rc2}/vantage6/cli/algorithm/create.py

@@ -33,14 +33,11 @@ def cli_algorithm_create(name: str, directory: str) -> dict:
     can be used to build an appropriate Docker image that can be used as a
     vantage6 algorithm.
     """
-    if not name:
-        name = q.text("Name of your new algorithm:").ask()
-
-    if not directory:
-        default_dir = str(Path(os.getcwd()) / name)
-        directory = q.text(
-            "Directory to put the algorithm in:", default=default_dir
-        ).ask()
+    try:
+        name, directory = _get_user_input(name, directory)
+    except KeyboardInterrupt:
+        info("Aborted by user!")
+        return
 
     # Create the template. The `unsafe` flag is used to allow running a Python script
     # after creating the template that cleans up some things.
@@ -49,3 +46,24 @@ def cli_algorithm_create(name: str, directory: str) -> dict:
     )
     info("Template created!")
     info(f"You can find your new algorithm in: {directory}")
+
+
+def _get_user_input(name: str, directory: str) -> None:
+    """Get user input for the algorithm creation
+
+    Parameters
+    ----------
+    name : str
+        Name for the new algorithm
+    directory : str
+        Directory to put the algorithm into
+    """
+    if not name:
+        name = q.text("Name of your new algorithm:").unsafe_ask()
+
+    if not directory:
+        default_dir = str(Path(os.getcwd()) / name)
+        directory = q.text(
+            "Directory to put the algorithm in:", default=default_dir
+        ).unsafe_ask()
+    return name, directory

{vantage6-4.9.1 → vantage6-4.10.0rc2}/vantage6/cli/algorithm/update.py

@@ -34,7 +34,11 @@ def cli_algorithm_update(directory: str, change_answers: bool) -> dict:
     """
     if not directory:
         default_dir = str(Path(os.getcwd()))
-        directory = q.text("Algorithm directory:", default=default_dir).ask()
+        try:
+            directory = q.text("Algorithm directory:", default=default_dir).unsafe_ask()
+        except KeyboardInterrupt:
+            info("Aborted by user!")
+            return
 
     info("Updating template...")
     try:

{vantage6-4.9.1 → vantage6-4.10.0rc2}/vantage6/cli/algostore/attach.py

@@ -30,10 +30,14 @@ def cli_algo_store_attach(name: str, system_folders: bool) -> None:
     running_server_names = [container.name for container in running_servers]
 
     if not name:
-        name = q.select(
-            "Select the algorithm store you wish to attach:",
-            choices=running_server_names,
-        ).ask()
+        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}"

{vantage6-4.9.1 → vantage6-4.10.0rc2}/vantage6/cli/algostore/new.py

@@ -45,7 +45,13 @@ def cli_algo_store_new(name: str, system_folders: bool) -> None:
         exit(1)
 
     # create config in ctx location
-    cfg_file = configuration_wizard(InstanceType.ALGORITHM_STORE, name, system_folders)
+    try:
+        cfg_file = configuration_wizard(
+            InstanceType.ALGORITHM_STORE, name, system_folders
+        )
+    except KeyboardInterrupt:
+        error("Configuration creation aborted.")
+        exit(1)
     info(f"New configuration created: {Fore.GREEN}{cfg_file}{Style.RESET_ALL}")
 
     flag = "" if system_folders else "--user"

{vantage6-4.9.1 → vantage6-4.10.0rc2}/vantage6/cli/common/utils.py

@@ -38,10 +38,14 @@ def get_server_name(
                 f"{instance_type}s that are running"
             )
             exit(1)
-        name = q.select(
-            f"Select the {instance_type} you wish to inspect:",
-            choices=running_server_names,
-        ).ask()
+        try:
+            name = q.select(
+                f"Select the {instance_type} 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}"

{vantage6-4.9.1 → vantage6-4.10.0rc2}/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-4.9.1 → vantage6-4.10.0rc2}/vantage6/cli/configuration_wizard.py

@@ -1,7 +1,7 @@
-import questionary as q
-
 from pathlib import Path
 
+import questionary as q
+
 from vantage6.common import generate_apikey
 from vantage6.common.globals import (
     DATABASE_TYPES,
@@ -36,7 +36,7 @@ def node_configuration_questionaire(dirs: dict, instance_name: str) -> dict:
     dict
         Dictionary with the new node configuration
     """
-    config = q.prompt(
+    config = q.unsafe_prompt(
         [
             {"type": "text", "name": "api_key", "message": "Enter given api-key:"},
             {
@@ -57,7 +57,7 @@ def node_configuration_questionaire(dirs: dict, instance_name: str) -> dict:
         else str(Ports.DEV_SERVER.value)
     )
 
-    config = config | q.prompt(
+    config = config | q.unsafe_prompt(
         [
             {
                 "type": "text",
@@ -81,8 +81,8 @@ def node_configuration_questionaire(dirs: dict, instance_name: str) -> dict:
     )
 
     config["databases"] = list()
-    while q.confirm("Do you want to add a database?").ask():
-        db_label = q.prompt(
+    while q.confirm("Do you want to add a database?").unsafe_ask():
+        db_label = q.unsafe_prompt(
             [
                 {
                     "type": "text",
@@ -92,10 +92,10 @@ def node_configuration_questionaire(dirs: dict, instance_name: str) -> dict:
                 }
             ]
         )
-        db_path = q.prompt(
+        db_path = q.unsafe_prompt(
             [{"type": "text", "name": "uri", "message": "Database URI:"}]
         )
-        db_type = q.select("Database type:", choices=DATABASE_TYPES).ask()
+        db_type = q.select("Database type:", choices=DATABASE_TYPES).unsafe_ask()
 
         config["databases"].append(
             {"label": db_label.get("label"), "uri": db_path.get("uri"), "type": db_type}
@@ -103,18 +103,18 @@ def node_configuration_questionaire(dirs: dict, instance_name: str) -> dict:
 
     is_add_vpn = q.confirm(
         "Do you want to connect to a VPN server?", default=False
-    ).ask()
+    ).unsafe_ask()
     if is_add_vpn:
         config["vpn_subnet"] = q.text(
             message="Subnet of the VPN server you want to connect to:",
             default="10.76.0.0/16",
-        ).ask()
+        ).unsafe_ask()
 
     is_policies = q.confirm(
         "Do you want to limit the algorithms allowed to run on your node? This "
         "should always be done for production scenarios.",
         default=True,
-    ).ask()
+    ).unsafe_ask()
     policies = {}
     if is_policies:
         info(
@@ -124,12 +124,12 @@ def node_configuration_questionaire(dirs: dict, instance_name: str) -> dict:
         )
         ask_single_algorithms = q.confirm(
             "Do you want to enter a list of allowed algorithms?"
-        ).ask()
+        ).unsafe_ask()
         if ask_single_algorithms:
             policies[NodePolicy.ALLOWED_ALGORITHMS.value] = _get_allowed_algorithms()
         ask_algorithm_stores = q.confirm(
             "Do you want to allow algorithms from specific algorithm stores?"
-        ).ask()
+        ).unsafe_ask()
         if ask_algorithm_stores:
             policies[NodePolicy.ALLOWED_ALGORITHM_STORES.value] = (
                 _get_allowed_algorithm_stores()
@@ -141,7 +141,7 @@ def node_configuration_questionaire(dirs: dict, instance_name: str) -> dict:
                 "stores? If not, algorithms will be allowed if they are in either the "
                 "list of allowed algorithms or one of the allowed algorithm stores.",
                 default=True,
-            ).ask()
+            ).unsafe_ask()
             policies["allow_either_whitelist_or_store"] = not require_both_whitelists
     if policies:
         config["policies"] = policies
@@ -149,7 +149,7 @@ def node_configuration_questionaire(dirs: dict, instance_name: str) -> dict:
     res = q.select(
         "Which level of logging would you like?",
         choices=["DEBUG", "INFO", "WARNING", "ERROR", "CRITICAL", "NOTSET"],
-    ).ask()
+    ).unsafe_ask()
 
     config["logging"] = {
         "level": res,
@@ -178,7 +178,7 @@ def node_configuration_questionaire(dirs: dict, instance_name: str) -> dict:
             "If you continue, you should provide your collaboration "
             "settings manually."
         )
-        if q.confirm("Do you want to abort?", default=True).ask():
+        if q.confirm("Do you want to abort?", default=True).unsafe_ask():
             exit(0)
 
     if client.whoami is not None:
@@ -190,11 +190,13 @@ def node_configuration_questionaire(dirs: dict, instance_name: str) -> dict:
             f"Encryption is {'enabled' if encryption else 'disabled'}"
             f" for this collaboration. Accept?",
             default=True,
-        ).ask()
+        ).unsafe_ask()
     else:
-        encryption = q.confirm("Enable encryption?", default=True).ask()
+        encryption = q.confirm("Enable encryption?", default=True).unsafe_ask()
 
-    private_key = "" if not encryption else q.text("Path to private key file:").ask()
+    private_key = (
+        "" if not encryption else q.text("Path to private key file:").unsafe_ask()
+    )
 
     config["encryption"] = {
         "enabled": encryption is True or encryption == "true",
@@ -219,24 +221,22 @@ def _get_allowed_algorithms() -> list[str]:
         "use strings to provide one algorithm at a time."
     )
     info("Examples:")
-    # pylint: disable=W1401
-    # flake8: noqa: W605
-    info("^harbor2\.vantage6\.ai/demo/average$    Allow the demo average algorithm")
+    info(r"^harbor2\.vantage6\.ai/demo/average$    Allow the demo average algorithm")
     info(
-        "^harbor2\.vantage6\.ai/algorithms/.*   Allow all algorithms from "
+        r"^harbor2\.vantage6\.ai/algorithms/.*   Allow all algorithms from "
         "harbor2.vantage6.ai/algorithms"
     )
     info(
-        "^harbor2\.vantage6\.ai/demo/average@sha256:82becede...$    Allow a "
+        r"^harbor2\.vantage6\.ai/demo/average@sha256:82becede...$    Allow a "
         "specific hash of average algorithm"
     )
     allowed_algorithms = []
     while True:
-        algo = q.text(message="Enter your algorithm expression:").ask()
+        algo = q.text(message="Enter your algorithm expression:").unsafe_ask()
         allowed_algorithms.append(algo)
         if not q.confirm(
             "Do you want to add another algorithm expression?", default=True
-        ).ask():
+        ).unsafe_ask():
             break
     return allowed_algorithms
 
@@ -261,16 +261,16 @@ def _get_allowed_algorithm_stores() -> list[str]:
         "community store"
     )
     info(
-        "^https://*\.vantage6\.ai$               Allow all algorithms from any "
+        r"^https://*\.vantage6\.ai$               Allow all algorithms from any "
         "store hosted on vantage6.ai"
     )
     allowed_algorithm_stores = []
     while True:
-        store = q.text(message="Enter the URL of the algorithm store:").ask()
+        store = q.text(message="Enter the URL of the algorithm store:").unsafe_ask()
         allowed_algorithm_stores.append(store)
         if not q.confirm(
             "Do you want to add another algorithm store?", default=True
-        ).ask():
+        ).unsafe_ask():
             break
     return allowed_algorithm_stores
 
@@ -292,7 +292,7 @@ def _get_common_server_config(instance_type: InstanceType, instance_name: str) -
     dict
         Dictionary with new (partial) server configuration
     """
-    config = q.prompt(
+    config = q.unsafe_prompt(
         [
             {
                 "type": "text",
@@ -315,7 +315,7 @@ def _get_common_server_config(instance_type: InstanceType, instance_name: str) -
     )
 
     config.update(
-        q.prompt(
+        q.unsafe_prompt(
             [
                 {
                     "type": "text",
@@ -336,7 +336,7 @@ def _get_common_server_config(instance_type: InstanceType, instance_name: str) -
     res = q.select(
         "Which level of logging would you like?",
         choices=["DEBUG", "INFO", "WARNING", "ERROR", "CRITICAL", "NOTSET"],
-    ).ask()
+    ).unsafe_ask()
 
     config["logging"] = {
         "level": res,
@@ -378,11 +378,11 @@ def server_configuration_questionaire(instance_name: str) -> dict:
 
     config = _get_common_server_config(InstanceType.SERVER, instance_name)
 
-    constant_jwt_secret = q.confirm("Do you want a constant JWT secret?").ask()
+    constant_jwt_secret = q.confirm("Do you want a constant JWT secret?").unsafe_ask()
     if constant_jwt_secret:
         config["jwt_secret_key"] = generate_apikey()
 
-    is_mfa = q.confirm("Do you want to enforce two-factor authentication?").ask()
+    is_mfa = q.confirm("Do you want to enforce two-factor authentication?").unsafe_ask()
     if is_mfa:
         config["two_factor_auth"] = is_mfa
 
@@ -393,11 +393,13 @@ def server_configuration_questionaire(instance_name: str) -> dict:
         "server url. If you are running a production server, this is the "
         "url that users will connect to.",
         default=current_server_url,
-    ).ask()
+    ).unsafe_ask()
 
-    is_add_vpn = q.confirm("Do you want to add a VPN server?", default=False).ask()
+    is_add_vpn = q.confirm(
+        "Do you want to add a VPN server?", default=False
+    ).unsafe_ask()
     if is_add_vpn:
-        vpn_config = q.prompt(
+        vpn_config = q.unsafe_prompt(
             [
                 {
                     "type": "text",
@@ -434,12 +436,14 @@ def server_configuration_questionaire(instance_name: str) -> dict:
         )
         config["vpn_server"] = vpn_config
 
-    is_add_rabbitmq = q.confirm("Do you want to add a RabbitMQ message queue?").ask()
+    is_add_rabbitmq = q.confirm(
+        "Do you want to add a RabbitMQ message queue?"
+    ).unsafe_ask()
     if is_add_rabbitmq:
-        rabbit_uri = q.text(message="Enter the URI for your RabbitMQ:").ask()
+        rabbit_uri = q.text(message="Enter the URI for your RabbitMQ:").unsafe_ask()
         run_rabbit_locally = q.confirm(
             "Do you want to run RabbitMQ locally? (Use only for testing)"
-        ).ask()
+        ).unsafe_ask()
         config["rabbitmq"] = {
             "uri": rabbit_uri,
             "start_with_server": run_rabbit_locally,
@@ -449,7 +453,7 @@ def server_configuration_questionaire(instance_name: str) -> dict:
     is_add_community_store = q.confirm(
         "Do you want to make the algorithms from the community algorithm store "
         "available to your users?"
-    ).ask()
+    ).unsafe_ask()
     algorithm_stores = []
     if is_add_community_store:
         algorithm_stores.append(
@@ -457,14 +461,14 @@ def server_configuration_questionaire(instance_name: str) -> dict:
         )
     add_more_stores = q.confirm(
         "Do you want to add more algorithm stores?", default=False
-    ).ask()
+    ).unsafe_ask()
     while add_more_stores:
-        store_name = q.text(message="Enter the name of the store:").ask()
-        store_url = q.text(message="Enter the URL of the store:").ask()
+        store_name = q.text(message="Enter the name of the store:").unsafe_ask()
+        store_url = q.text(message="Enter the URL of the store:").unsafe_ask()
         algorithm_stores.append({"name": store_name, "url": store_url})
         add_more_stores = q.confirm(
             "Do you want to add more algorithm stores?", default=False
-        ).ask()
+        ).unsafe_ask()
     config["algorithm_stores"] = algorithm_stores
 
     return config
@@ -496,12 +500,12 @@ def algo_store_configuration_questionaire(instance_name: str) -> dict:
         "What is the Vantage6 server linked to the algorithm store? "
         "Provide the link to the server endpoint.",
         default=default_v6_server_uri,
-    ).ask()
+    ).unsafe_ask()
 
     root_username = q.text(
         "What is the username of the root user?",
         default=default_root_username,
-    ).ask()
+    ).unsafe_ask()
 
     config["root_user"] = {
         "v6_server_uri": v6_server_uri,
@@ -514,7 +518,7 @@ def algo_store_configuration_questionaire(instance_name: str) -> dict:
         "Do you want to open the algorithm store to the public? This will allow anyone "
         "to view the algorithms, but they cannot modify them.",
         default=False,
-    ).ask()
+    ).unsafe_ask()
     if is_open:
         open_algos_policy = "public"
     else:
@@ -523,7 +527,7 @@ def algo_store_configuration_questionaire(instance_name: str) -> dict:
             "the algorithms in the store? If not allowing this, you will have to assign"
             " the appropriate permissions to each user individually.",
             default=True,
-        ).ask()
+        ).unsafe_ask()
         open_algos_policy = "whitelisted" if is_open_to_whitelist else "private"
     config["policies"]["algorithm_view"] = open_algos_policy
 
@@ -612,4 +616,10 @@ def select_configuration_questionaire(type_: InstanceType, system_folders: bool)
         raise Exception("No configurations could be found!")
 
     # pop the question
-    return q.select("Select the configuration you want to use:", choices=choices).ask()
+    try:
+        return q.select(
+            "Select the configuration you want to use:", choices=choices
+        ).unsafe_ask()
+    except KeyboardInterrupt:
+        error("Aborted by user!")
+        exit(1)

{vantage6-4.9.1 → vantage6-4.10.0rc2}/vantage6/cli/dev/create.py

@@ -8,7 +8,7 @@ from jinja2 import Environment, FileSystemLoader
 from colorama import Fore, Style
 
 from vantage6.common.globals import APPNAME, InstanceType, Ports
-from vantage6.common import info, error, generate_apikey
+from vantage6.common import ensure_config_dir_writable, info, error, generate_apikey
 
 import vantage6.cli.dev.data as data_dir
 from vantage6.cli.context.algorithm_store import AlgorithmStoreContext
@@ -114,13 +114,15 @@ def create_node_config_file(
         }
     )
 
-    try:
-        with open(full_path, "x") as f:
-            f.write(node_config)
-    except Exception as e:
-        error(f"Could not write node configuration file: {e}")
+    # Check that we can write the node config
+    if not ensure_config_dir_writable():
+        error("Cannot write configuration file. Exiting...")
         exit(1)
 
+    Path(full_path).parent.mkdir(parents=True, exist_ok=True)
+    with open(full_path, "x", encoding="utf-8") as f:
+        f.write(node_config)
+
     info(
         f"Spawned node for organization {Fore.GREEN}{config['org_id']}"
         f"{Style.RESET_ALL}"

{vantage6-4.9.1 → vantage6-4.10.0rc2}/vantage6/cli/dev/remove.py

@@ -4,9 +4,12 @@ from shutil import rmtree
 from pathlib import Path
 
 import click
+import docker
+from colorama import Fore, Style
 
 from vantage6.cli.context.algorithm_store import AlgorithmStoreContext
-from vantage6.common import info
+from vantage6.common import info, error
+from vantage6.common.globals import APPNAME
 from vantage6.cli.context.server import ServerContext
 from vantage6.cli.context.node import NodeContext
 from vantage6.cli.server.remove import cli_server_remove
@@ -34,6 +37,20 @@ def remove_demo_network(
     """
     ctx = get_dev_server_context(config, name)
 
+    # check that the server is not running
+    client = docker.from_env()
+    running_servers = client.containers.list(
+        filters={"label": f"{APPNAME}-type={InstanceType.SERVER}"}
+    )
+    running_server_names = [server.name for server in running_servers]
+    container_name = f"{APPNAME}-{name}-user-{InstanceType.SERVER}"
+    if container_name in running_server_names:
+        error(
+            f"Server {Fore.RED}{name}{Style.RESET_ALL} is still running! First stop "
+            "the network with 'v6 dev stop-demo-network'."
+        )
+        return
+
     # remove the server
     for handler in itertools.chain(ctx.log.handlers, ctx.log.root.handlers):
         handler.close()

{vantage6-4.9.1 → vantage6-4.10.0rc2}/vantage6/cli/node/attach.py

@@ -45,9 +45,13 @@ def cli_node_attach(name: str, system_folders: bool) -> None:
         return
 
     if not name:
-        name = q.select(
-            "Select the node you wish to attach:", choices=running_node_names
-        ).ask()
+        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}"

{vantage6-4.9.1 → vantage6-4.10.0rc2}/vantage6/cli/node/clean.py

@@ -26,8 +26,12 @@ def cli_node_clean() -> None:
             msg += volume.name + ","
     info(msg)
 
-    confirm = q.confirm("Are you sure?")
-    if confirm.ask():
+    try:
+        confirm = q.confirm("Are you sure?").unsafe_ask()
+    except KeyboardInterrupt:
+        confirm = False
+
+    if confirm:
         for volume in candidates:
             try:
                 volume.remove()

{vantage6-4.9.1 → vantage6-4.10.0rc2}/vantage6/cli/node/common/__init__.py

@@ -58,9 +58,11 @@ def create_client_and_authenticate(
     """
     client = create_client(ctx)
 
-    username = q.text("Username:").ask()
-    password = q.password("Password:").ask()
-    mfa_code = q.text("MFA code:").ask() if ask_mfa else None
+    try:
+        username, password, mfa_code = _get_auth_data()
+    except KeyboardInterrupt:
+        error("Authentication aborted.")
+        exit(1)
 
     try:
         client.authenticate(username, password, mfa_code=mfa_code)
@@ -73,6 +75,21 @@ def create_client_and_authenticate(
     return client
 
 
+def _get_auth_data() -> tuple[str, str, str]:
+    """
+    Get authentication data from the user.
+
+    Returns
+    -------
+    tuple[str, str, str]
+        Tuple containing username, password and MFA code
+    """
+    username = q.text("Username:").unsafe_ask()
+    password = q.password("Password:").unsafe_ask()
+    mfa_code = q.text("MFA code:").unsafe_ask()
+    return username, password, mfa_code
+
+
 def select_node(name: str, system_folders: bool) -> tuple[str, str]:
     """
     Let user select node through questionnaire if name is not given.

{vantage6-4.9.1 → vantage6-4.10.0rc2}/vantage6/cli/node/new.py

@@ -47,7 +47,11 @@ def cli_node_new_configuration(name: str, system_folders: bool) -> None:
 
     # create config in ctx location
     flag = "--system" if system_folders else ""
-    cfg_file = configuration_wizard(InstanceType.NODE, name, system_folders)
+    try:
+        cfg_file = configuration_wizard(InstanceType.NODE, name, system_folders)
+    except KeyboardInterrupt:
+        error("Configuration creation aborted.")
+        exit(1)
     info(f"New configuration created: {Fore.GREEN}{cfg_file}{Style.RESET_ALL}")
     info(
         f"You can start the node by running "

{vantage6-4.9.1 → vantage6-4.10.0rc2}/vantage6/cli/node/restart.py

@@ -92,9 +92,13 @@ def cli_node_restart(
         ]
     else:
         if not name:
-            container_name = q.select(
-                "Select the node you wish to restart:", choices=running_node_names
-            ).ask()
+            try:
+                container_name = q.select(
+                    "Select the node you wish to restart:", choices=running_node_names
+                ).unsafe_ask()
+            except KeyboardInterrupt:
+                error("Aborted by user!")
+                return
             names = [get_name_from_container_name(container_name)]
         else:
             names = [name]

{vantage6-4.9.1 → vantage6-4.10.0rc2}/vantage6/cli/node/set_api_key.py

@@ -38,7 +38,11 @@ def cli_node_set_api_key(name: str, api_key: str, system_folders: bool) -> None:
         exit(1)
 
     if not api_key:
-        api_key = q.text("Please enter your new API key:").ask()
+        try:
+            api_key = q.text("Please enter your new API key:").unsafe_ask()
+        except KeyboardInterrupt:
+            error("API key input aborted.")
+            exit(1)
 
     # get configuration manager
     ctx = NodeContext(name, system_folders=system_folders)

{vantage6-4.9.1 → vantage6-4.10.0rc2}/vantage6/cli/node/start.py

@@ -235,15 +235,23 @@ def cli_node_start(
         label_capitals = label.upper()
 
         try:
-            file_based = Path(uri).exists()
+            db_file_exists = Path(uri).exists()
         except Exception:
             # If the database uri cannot be parsed, it is definitely not a
             # file. In case of http servers or sql servers, checking the path
             # of the the uri will lead to an OS-dependent error, which is why
             # we catch all exceptions here.
-            file_based = False
+            db_file_exists = False
 
-        if not file_based and not force_db_mount:
+        if db_type in ["folder", "csv", "parquet", "excel"] and not db_file_exists:
+            error(
+                f"Database {Fore.RED}{uri}{Style.RESET_ALL} not found. Databases of "
+                f"type '{db_type}' must be present on the harddrive. Please update "
+                "your node configuration file."
+            )
+            exit(1)
+
+        if not db_file_exists and not force_db_mount:
             debug("  - non file-based database added")
             env[f"{label_capitals}_DATABASE_URI"] = uri
         else:

{vantage6-4.9.1 → vantage6-4.10.0rc2}/vantage6/cli/node/stop.py

@@ -69,9 +69,13 @@ def cli_node_stop(
             _stop_node(client, container_name, force, system_folders)
     else:
         if not name:
-            container_name = q.select(
-                "Select the node you wish to stop:", choices=running_node_names
-            ).ask()
+            try:
+                container_name = q.select(
+                    "Select the node you wish to stop:", choices=running_node_names
+                ).unsafe_ask()
+            except KeyboardInterrupt:
+                error("Aborted by user!")
+                return
         else:
             post_fix = "system" if system_folders else "user"
             container_name = f"{APPNAME}-{name}-{post_fix}"

{vantage6-4.9.1 → vantage6-4.10.0rc2}/vantage6/cli/node/version.py

@@ -42,9 +42,13 @@ def cli_node_version(name: str, system_folders: bool) -> None:
                 "nodes that are running"
             )
             exit(1)
-        name = q.select(
-            "Select the node you wish to inspect:", choices=running_node_names
-        ).ask()
+        try:
+            name = q.select(
+                "Select the node you wish to inspect:", 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}"

{vantage6-4.9.1 → vantage6-4.10.0rc2}/vantage6/cli/server/attach.py

@@ -34,9 +34,13 @@ def cli_server_attach(name: str, system_folders: bool) -> None:
     running_server_names = [node.name for node in running_servers]
 
     if not name:
-        name = q.select(
-            "Select the server you wish to attach:", choices=running_server_names
-        ).ask()
+        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}"

{vantage6-4.9.1 → vantage6-4.10.0rc2}/vantage6/cli/server/new.py

@@ -45,7 +45,11 @@ def cli_server_new(name: str, system_folders: bool) -> None:
         exit(1)
 
     # create config in ctx location
-    cfg_file = configuration_wizard(InstanceType.SERVER, name, system_folders)
+    try:
+        cfg_file = configuration_wizard(InstanceType.SERVER, name, system_folders)
+    except KeyboardInterrupt:
+        error("Configuration creation aborted.")
+        exit(1)
     info(f"New configuration created: {Fore.GREEN}{cfg_file}{Style.RESET_ALL}")
 
     # info(f"root user created.")

{vantage6-4.9.1 → vantage6-4.10.0rc2}/vantage6/cli/server/start.py

@@ -131,7 +131,7 @@ def cli_server_start(
         )
     else:
         warning(
-            "Message queue disabled! This means that the vantage6 server "
+            "Message queue is not set up! This means that the vantage6 server "
             "cannot be scaled horizontally!"
         )
 

{vantage6-4.9.1 → vantage6-4.10.0rc2}/vantage6/cli/server/stop.py

@@ -53,9 +53,13 @@ def cli_server_stop(name: str, system_folders: bool, all_servers: bool):
 
     # make sure we have a configuration name to work with
     if not name:
-        container_name = q.select(
-            "Select the server you wish to stop:", choices=running_server_names
-        ).ask()
+        try:
+            container_name = q.select(
+                "Select the server you wish to stop:", choices=running_server_names
+            ).unsafe_ask()
+        except KeyboardInterrupt:
+            error("Aborted by user!")
+            return
     else:
         post_fix = "system" if system_folders else "user"
         container_name = f"{APPNAME}-{name}-{post_fix}-{InstanceType.SERVER}"

{vantage6-4.9.1 → vantage6-4.10.0rc2}/vantage6/cli/test/feature_tester.py

@@ -16,13 +16,13 @@ from vantage6.cli.test.common.diagnostic_runner import DiagnosticRunner
 @click.option(
     "--username",
     type=str,
-    default="root",
+    default="dev_admin",
     help="Username of vantage6 user account to create the task with",
 )
 @click.option(
     "--password",
     type=str,
-    default="root",
+    default="password",
     help="Password of vantage6 user account to create the task with",
 )
 @click.option(
@@ -56,6 +56,12 @@ from vantage6.cli.test.common.diagnostic_runner import DiagnosticRunner
     default=None,
     help="Path to the private key for end-to-end encryption",
 )
+@click.option(
+    "--mfa-code",
+    type=str,
+    help="Multi-factor authentication code. Use this if MFA is enabled on the "
+    "server.",
+)
 def cli_test_features(
     host: str,
     port: int,
@@ -68,6 +74,7 @@ def cli_test_features(
     online_only: bool,
     no_vpn: bool,
     private_key: str | None,
+    mfa_code: str | None,
 ) -> list[dict]:
     """
     Run diagnostic checks on an existing vantage6 network.
@@ -83,7 +90,7 @@ def cli_test_features(
         organizations = None
 
     client = UserClient(host=host, port=port, path=api_path, log_level="critical")
-    client.authenticate(username=username, password=password)
+    client.authenticate(username=username, password=password, mfa_code=mfa_code)
     client.setup_encryption(private_key)
     diagnose = DiagnosticRunner(client, collaboration, organizations, online_only)
     res = diagnose(base=True, vpn=not no_vpn)

{vantage6-4.9.1 → vantage6-4.10.0rc2}/vantage6/cli/utils.py

@@ -90,7 +90,11 @@ def prompt_config_name(name: str | None) -> None:
         The name of the configuration
     """
     if not name:
-        name = q.text("Please enter a configuration-name:").ask()
+        try:
+            name = q.text("Please enter a configuration-name:").unsafe_ask()
+        except KeyboardInterrupt:
+            error("Aborted by user!")
+            exit(1)
         if name.count(" ") > 0:
             name = name.replace(" ", "-")
             info(f"Replaced spaces from configuration name: {name}")

{vantage6-4.9.1 → vantage6-4.10.0rc2}/vantage6.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: vantage6
-Version: 4.9.1
+Version: 4.10.0rc2
 Summary: vantage6 command line interface
 Home-page: https://github.com/vantage6/vantage6
 Requires-Python: >=3.10

{vantage6-4.9.1 → vantage6-4.10.0rc2}/vantage6.egg-info/requires.txt

@@ -9,8 +9,8 @@ questionary==1.10.0
 rich==13.5.2
 schema==0.7.5
 SQLAlchemy==1.4.46
-vantage6-common==4.9.1
-vantage6-client==4.9.1
+vantage6-common==4.10.0rc2
+vantage6-client==4.10.0rc2
 
 [dev]
 coverage==6.4.4

vantage6-4.9.1/vantage6/cli/__build__

@@ -1 +0,0 @@
-0

vantage6-4.9.1/vantage6/cli/__init__.py

@@ -1,3 +0,0 @@
-""" Command line interface for the vantage6 infrastructure. """
-
-from ._version import version_info, __version__  # noqa: F401