vantage6 4.9.1__py3-none-any.whl → 4.10.0__py3-none-any.whl

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):

tests_cli/test_server_cli.py

@@ -132,7 +132,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()
@@ -146,7 +146,7 @@ class ServerCLITest(unittest.TestCase):
     def test_attach(self, containers, sleep):
         """Attach log to the console without errors."""
         container1 = MagicMock()
-        container1.name = f"{APPNAME}-iknl-system-{InstanceType.SERVER}"
+        container1.name = f"{APPNAME}-iknl-system-{InstanceType.SERVER.value}"
         containers.list.return_value = [container1]
 
         sleep.side_effect = KeyboardInterrupt("Boom!")

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/cli/__init__.py

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

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, "final", __build__, 0)
 
 # Module version stage suffix map
 _specifier_ = {"alpha": "a", "beta": "b", "candidate": "rc", "final": ""}

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/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/cli/algostore/attach.py

@@ -25,18 +25,22 @@ def cli_algo_store_attach(name: str, system_folders: bool) -> None:
     client = docker.from_env()
 
     running_servers = client.containers.list(
-        filters={"label": f"{APPNAME}-type={InstanceType.ALGORITHM_STORE}"}
+        filters={"label": f"{APPNAME}-type={InstanceType.ALGORITHM_STORE.value}"}
     )
     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}"
+        name = f"{APPNAME}-{name}-{post_fix}-{InstanceType.ALGORITHM_STORE.value}"
 
     if name in running_server_names:
         container = client.containers.get(name)

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/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/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/common/utils.py

@@ -1,3 +1,4 @@
+import enum
 import questionary as q
 from colorama import Fore, Style
 import click
@@ -38,10 +39,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}"
@@ -83,7 +88,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)
@@ -97,7 +106,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 ")
@@ -107,7 +117,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   ")

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/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/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

@@ -132,7 +132,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/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}"