vantage6 5.0.0a15__py3-none-any.whl → 5.0.0a17__py3-none-any.whl

vantage6/cli/__build__

@@ -1 +1 @@
-15
+17

vantage6/cli/configuration_manager.py

@@ -40,12 +40,10 @@ class NodeConfiguration(Configuration):
     """
 
     VALIDATORS = {
-        "api_key": Use(str),
         "server_url": Use(str),
         "port": Or(Use(int), None),
         "task_dir": Use(str),
         # TODO: remove `dict` validation from databases
-        "databases": Or([Use(dict)], dict, None),
         "api_path": Use(str),
         "logging": LOGGING_VALIDATORS,
         "encryption": {"enabled": bool, Optional("private_key"): Use(str)},

vantage6/cli/context/node.py

@@ -260,5 +260,5 @@ class NodeContext(AppContext):
             Unique identifier for the node
         """
         return hashlib.sha256(
-            self.config.get("api_key").encode(STRING_ENCODING)
+            os.environ.get("V6_API_KEY").encode(STRING_ENCODING)
         ).hexdigest()[:16]

vantage6/cli/dev/create.py

@@ -0,0 +1,635 @@
+from pathlib import Path
+from importlib import resources as impresources
+import yaml
+import click
+import pandas as pd
+
+from jinja2 import Environment, FileSystemLoader
+from colorama import Fore, Style
+
+from vantage6.common.globals import APPNAME, InstanceType, Ports
+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
+from vantage6.cli.globals import PACKAGE_FOLDER
+from vantage6.cli.context.server import ServerContext
+from vantage6.cli.context.node import NodeContext
+from vantage6.cli.server.common import get_server_context
+from vantage6.cli.server.import_ import cli_server_import
+from vantage6.cli.utils import prompt_config_name
+
+
+def create_node_data_files(num_nodes: int, server_name: str) -> list[Path]:
+    """Create data files for nodes.
+
+    Parameters
+    ----------
+    num_nodes : int
+        Number of nodes to create data files for.
+    server_name : str
+        Name of the server.
+
+    Returns
+    -------
+    list[Path]
+        List of paths to the created data files.
+    """
+    info(f"Creating data files for {num_nodes} nodes.")
+    data_files = []
+    full_df = pd.read_csv(impresources.files(data_dir) / "olympic_athletes_2016.csv")
+    length_df = len(full_df)
+    for i in range(num_nodes):
+        node_name = f"{server_name}_node_{i + 1}"
+        dev_folder = NodeContext.instance_folders("node", node_name, False)["dev"]
+        data_folder = Path(dev_folder / server_name)
+        data_folder.mkdir(parents=True, exist_ok=True)
+
+        # Split the data over the nodes
+        start = i * length_df // num_nodes
+        end = (i + 1) * length_df // num_nodes
+        data = full_df[start:end]
+        data_file = data_folder / f"df_{node_name}.csv"
+
+        # write data to file
+        data.to_csv(data_file, index=False)
+        data_files.append(data_file)
+    return data_files
+
+
+def create_node_config_file(
+    server_url: str, port: int, config: dict, server_name: str, datafile: Path
+) -> None:
+    """Create a node configuration file (YAML).
+
+    Creates a node configuration for a simulated organization. Organization ID
+    is used for generating both the organization name and node_name as each
+    organization only houses one node.
+
+    Parameters
+    ----------
+    server_url : str
+        Url of the dummy server.
+    port : int
+        Port of the dummy server.
+    config : dict
+        Configuration dictionary containing org_id, api_key, node name and
+        additional user_defined_config.
+    server_name : str
+        Configuration name of the dummy server.
+    datafile : Path
+        Path to the data file for the node to use.
+    """
+    environment = Environment(
+        loader=FileSystemLoader(PACKAGE_FOLDER / APPNAME / "cli" / "template"),
+        trim_blocks=True,
+        lstrip_blocks=True,
+        autoescape=True,
+    )
+    template = environment.get_template("node_config.j2")
+
+    # TODO: make this name specific to the server it connects
+    node_name = config["node_name"]
+    folders = NodeContext.instance_folders("node", node_name, False)
+    path_to_dev_dir = Path(folders["dev"] / server_name)
+    path_to_dev_dir.mkdir(parents=True, exist_ok=True)
+
+    path_to_data_dir = Path(folders["data"])
+    path_to_data_dir.mkdir(parents=True, exist_ok=True)
+    full_path = Path(folders["config"] / f"{node_name}.yaml")
+
+    if full_path.exists():
+        error(f"Node configuration file already exists: {full_path}")
+        exit(1)
+
+    node_config = template.render(
+        {
+            "api_key": config["api_key"],
+            "databases": {"default": datafile},
+            "logging": {"file": f"{node_name}.log"},
+            "port": port,
+            "server_url": server_url,
+            "task_dir": str(path_to_data_dir),
+            "user_provided_config": config["user_defined_config"],
+        }
+    )
+
+    # 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}"
+    )
+
+
+def _read_extra_config_file(extra_config_file: Path | None) -> str:
+    """Reads extra configuration file.
+
+    Parameters
+    ----------
+    extra_config_file : Path | None
+        Path to file with additional configuration.
+
+    Returns
+    -------
+    str
+        Extra configuration file content
+    """
+    if extra_config_file:
+        # read the YAML file as string, so it can be appended to the
+        # configuration easily
+        with open(extra_config_file, "r", encoding="utf-8") as f:
+            return f.read()
+    return ""
+
+
+def generate_node_configs(
+    num_nodes: int,
+    server_url: str,
+    port: int,
+    server_name: str,
+    extra_node_config: Path | None,
+) -> list[dict]:
+    """Generates ``num_nodes`` node configuration files.
+
+    Parameters
+    ----------
+    num_nodes : int
+        Integer to determine how many configurations to create.
+    server_url : str
+        Url of the dummy server.
+    port : int
+        Port of the dummy server.
+    server_name : str
+        Configuration name of the dummy server.
+    extra_node_config : Path | None
+        Path to file with additional node configuration.
+
+    Returns
+    -------
+    list[dict]
+        List of dictionaries containing node configurations.
+    """
+    configs = []
+    extra_config = _read_extra_config_file(extra_node_config)
+    node_data_files = create_node_data_files(num_nodes, server_name)
+    for i in range(num_nodes):
+        config = {
+            "org_id": i + 1,
+            "api_key": generate_apikey(),
+            "node_name": f"{server_name}_node_{i + 1}",
+            "user_defined_config": extra_config,
+        }
+        create_node_config_file(
+            server_url, port, config, server_name, node_data_files[i]
+        )
+        configs.append(config)
+
+    return configs
+
+
+def create_vserver_import_config(node_configs: list[dict], server_name: str) -> Path:
+    """Create server configuration import file (YAML).
+
+    Utilized by the ``v6 server import`` command.
+
+    Parameters
+    ----------
+    node_configs : list[dict]
+        List of dictionaries containing the node configurations, returned from
+        ``generate_node_configs()``.
+    server_name : str
+        Server name.
+
+    Returns
+    -------
+    Path
+        Path object where the server import configuration is stored.
+    """
+    environment = Environment(
+        loader=FileSystemLoader(PACKAGE_FOLDER / APPNAME / "cli" / "template"),
+        trim_blocks=True,
+        lstrip_blocks=True,
+        autoescape=True,
+    )
+    template = environment.get_template("server_import_config.j2")
+
+    organizations = []
+    collaboration = {"name": "demo", "participants": []}
+    for config in node_configs:
+        org_id = config["org_id"]
+        org_data = {"name": f"org_{org_id}"}
+
+        organizations.append(org_data)
+        collaboration["participants"].append(
+            {"name": f"org_{org_id}", "api_key": config["api_key"]}
+        )
+    organizations[0]["make_admin"] = True
+    info(
+        f"Organization {Fore.GREEN}{node_configs[0]['org_id']}"
+        f"{Style.RESET_ALL} is the admin"
+    )
+
+    server_import_config = template.render(
+        organizations=organizations, collaboration=collaboration
+    )
+    folders = ServerContext.instance_folders(InstanceType.SERVER, server_name, False)
+
+    demo_dir = Path(folders["dev"])
+    demo_dir.mkdir(parents=True, exist_ok=True)
+    full_path = demo_dir / f"{server_name}.yaml"
+    if full_path.exists():
+        error(f"Server configuration file already exists: {full_path}")
+        exit(1)
+
+    try:
+        with open(full_path, "x") as f:
+            f.write(server_import_config)
+            info(
+                "Server import configuration ready, writing to "
+                f"{Fore.GREEN}{full_path}{Style.RESET_ALL}"
+            )
+    except Exception as e:
+        error(f"Could not write server import configuration file: {e}")
+        exit(1)
+
+    return full_path
+
+
+def create_vserver_config(
+    server_name: str,
+    port: int,
+    server_url: str,
+    extra_config_file: Path,
+    ui_image: str | None,
+    ui_port: int,
+    store_port: int,
+) -> Path:
+    """Creates server configuration file (YAML).
+
+    Parameters
+    ----------
+    server_name : str
+        Server name.
+    port : int
+        Server port.
+    server_url : str
+        Url of the server this
+    extra_config_file : Path
+        Path to file with additional server configuration.
+    ui_image : str | None
+        UI docker image to specify in configuration files. Will be used on startup of
+        the network.
+    ui_port : int
+        Port to run the UI on.
+    store_port : int
+        Port to run the algorithm store on.
+
+    Returns
+    -------
+    Path
+        Path object where server configuration is stored.
+    """
+    environment = Environment(
+        loader=FileSystemLoader(PACKAGE_FOLDER / APPNAME / "cli" / "template"),
+        trim_blocks=True,
+        lstrip_blocks=True,
+        autoescape=True,
+    )
+
+    extra_config = _read_extra_config_file(extra_config_file)
+    if ui_image is not None:
+        if extra_config:
+            extra_config += "\n"
+        extra_config += f"images:\n  ui: {ui_image}"
+
+    template = environment.get_template("server_config.j2")
+    server_config = template.render(
+        port=port,
+        host_uri=server_url,
+        jwt_secret_key=generate_apikey(),
+        user_provided_config=extra_config,
+        ui_port=ui_port,
+        store_port=store_port,
+    )
+    folders = ServerContext.instance_folders(
+        instance_type=InstanceType.SERVER,
+        instance_name=server_name,
+        system_folders=False,
+    )
+
+    config_dir = Path(folders["config"] / server_name)
+    config_dir.mkdir(parents=True, exist_ok=True)
+    full_path = folders["config"] / f"{server_name}.yaml"
+    if full_path.exists():
+        error(f"Server configuration file already exists: {full_path}")
+        exit(1)
+
+    try:
+        with open(full_path, "x") as f:
+            f.write(server_config)
+            info(
+                "Server configuration read, writing to "
+                f"{Fore.GREEN}{full_path}{Style.RESET_ALL}"
+            )
+    except Exception as e:
+        error(f"Could not write server configuration file: {e}")
+        exit(1)
+
+    return full_path
+
+
+def create_algo_store_config(
+    server_name: str,
+    server_url: str,
+    server_port: int,
+    store_port: int,
+    extra_config_file: Path,
+) -> Path:
+    """Create algorithm store configuration file (YAML).
+
+    Parameters
+    ----------
+    server_name : str
+        Server name.
+    server_url : str
+        Url of the server this store connects to.
+    server_port : int
+        Port of the server this store connects to.
+    port : int
+        Port of the algorithm store.
+    extra_config_file : Path
+        Path to file with additional algorithm store configuration.
+    """
+    environment = Environment(
+        loader=FileSystemLoader(PACKAGE_FOLDER / APPNAME / "cli" / "template"),
+        trim_blocks=True,
+        lstrip_blocks=True,
+        autoescape=True,
+    )
+
+    extra_config = _read_extra_config_file(extra_config_file)
+
+    template = environment.get_template("algo_store_config.j2")
+    store_config = template.render(
+        port=store_port,
+        server_port=server_port,
+        host_uri=server_url,
+        user_provided_config=extra_config,
+    )
+    folders = AlgorithmStoreContext.instance_folders(
+        instance_type=InstanceType.ALGORITHM_STORE,
+        instance_name="{server_name}_store",
+        system_folders=False,
+    )
+
+    config_dir = Path(folders["config"] / f"{server_name}_store")
+    config_dir.mkdir(parents=True, exist_ok=True)
+    full_path = folders["config"] / f"{server_name}_store.yaml"
+    if full_path.exists():
+        error(f"Algorithm store configuration file already exists: {full_path}")
+        exit(1)
+
+    try:
+        with open(full_path, "x") as f:
+            f.write(store_config)
+            info(
+                "Algorithm store configuration ready, writing to "
+                f"{Fore.GREEN}{full_path}{Style.RESET_ALL}"
+            )
+    except Exception as e:
+        error(f"Could not write algorithm store configuration file: {e}")
+        exit(1)
+
+    return full_path
+
+
+def demo_network(
+    num_nodes: int,
+    server_url: str,
+    server_port: int,
+    server_name: str,
+    extra_server_config: Path,
+    extra_node_config: Path,
+    extra_store_config: Path,
+    ui_image: str,
+    ui_port: int,
+    algorithm_store_port: int,
+) -> tuple[list[dict], Path, Path]:
+    """Generates the demo network.
+
+    Parameters
+    ----------
+    num_nodes : int
+        Integer to determine how many configurations to create.
+    server_url : str
+        Url of the dummy server.
+    server_port : int
+        Port of the dummy server.
+    server_name : str
+        Server name.
+    extra_server_config : Path
+        Path to file with additional server configuration.
+    extra_node_config : Path
+        Path to file with additional node configuration.
+    extra_store_config : Path
+        Path to file with additional algorithm store configuration.
+    ui_image : str | None
+        UI docker image to specify in configuration files. Will be used on startup of
+        the network.
+    ui_port : int
+        Port to run the UI on.
+    algorithm_store_port : int
+        Port to run the algorithm store on.
+
+    Returns
+    -------
+    tuple[list[dict], Path, Path]
+        Tuple containing node, server import and server configurations.
+    """
+    node_configs = generate_node_configs(
+        num_nodes, server_url, server_port, server_name, extra_node_config
+    )
+    server_import_config = create_vserver_import_config(node_configs, server_name)
+    server_config = create_vserver_config(
+        server_name,
+        server_port,
+        server_url,
+        extra_server_config,
+        ui_image,
+        ui_port,
+        algorithm_store_port,
+    )
+    store_config = create_algo_store_config(
+        server_name, server_url, server_port, algorithm_store_port, extra_store_config
+    )
+    return (node_configs, server_import_config, server_config, store_config)
+
+
+@click.command()
+@click.option(
+    "-n", "--name", default=None, type=str, help="Name for your development setup"
+)
+@click.option(
+    "--num-nodes",
+    type=int,
+    default=3,
+    help="Generate this number of nodes in the development network",
+)
+@click.option(
+    "--server-url",
+    type=str,
+    default="http://host.docker.internal",
+    help="Server URL to point to. If you are using Docker Desktop, the default "
+    "http://host.docker.internal should not be changed. If you are using Linux without"
+    " Docker Desktop, you should set this to http://172.17.0.1",
+)
+@click.option(
+    "-p",
+    "--server-port",
+    type=int,
+    default=Ports.DEV_SERVER.value,
+    help=f"Port to run the server on. Default is {Ports.DEV_SERVER.value}.",
+)
+@click.option(
+    "--ui-port",
+    type=int,
+    default=Ports.DEV_UI.value,
+    help=f"Port to run the UI on. Default is {Ports.DEV_UI.value}.",
+)
+@click.option(
+    "--algorithm-store-port",
+    type=int,
+    default=Ports.DEV_ALGO_STORE.value,
+    help=(
+        f"Port to run the algorithm store on. Default is {Ports.DEV_ALGO_STORE.value}."
+    ),
+)
+@click.option(
+    "-i",
+    "--image",
+    type=str,
+    default=None,
+    help="Server docker image to use when setting up resources for "
+    "the development server",
+)
+@click.option(
+    "--ui-image",
+    type=str,
+    default=None,
+    help="UI docker image to specify in configuration files. Will be used on startup of"
+    " the network",
+)
+@click.option(
+    "--extra-server-config",
+    type=click.Path(exists=True),
+    default=None,
+    help="YAML File with additional server "
+    "configuration. This will be appended to the server "
+    "configuration file",
+)
+@click.option(
+    "--extra-node-config",
+    type=click.Path("rb"),
+    default=None,
+    help="YAML File with additional node configuration. This will be"
+    " appended to each of the node configuration files",
+)
+@click.option(
+    "--extra-store-config",
+    type=click.Path("rb"),
+    default=None,
+    help="YAML File with additional algorithm store configuration. This will be"
+    " appended to the algorithm store configuration file",
+)
+@click.pass_context
+def create_demo_network(
+    click_ctx: click.Context,
+    name: str,
+    num_nodes: int,
+    server_url: str,
+    server_port: int,
+    ui_port: int,
+    algorithm_store_port: int,
+    image: str = None,
+    ui_image: str = None,
+    extra_server_config: Path = None,
+    extra_node_config: Path = None,
+    extra_store_config: Path = None,
+) -> dict:
+    """Creates a demo network.
+
+    Creates server instance as well as its import configuration file. Server
+    name is set to 'dev_default_server'. Generates `n` node configurations, but
+    by default this is set to 3. Then runs a Batch import of
+    organizations/collaborations/users and tasks.
+    """
+    server_name = prompt_config_name(name)
+    if not ServerContext.config_exists(server_name, False):
+        demo = demo_network(
+            num_nodes,
+            server_url,
+            server_port,
+            server_name,
+            extra_server_config,
+            extra_node_config,
+            extra_store_config,
+            ui_image,
+            ui_port,
+            algorithm_store_port,
+        )
+        info(
+            f"Created {Fore.GREEN}{len(demo[0])}{Style.RESET_ALL} node "
+            f"configuration(s), attaching them to {Fore.GREEN}{server_name}"
+            f"{Style.RESET_ALL}."
+        )
+    else:
+        error(f"Configuration {Fore.RED}{server_name}{Style.RESET_ALL} already exists!")
+        exit(1)
+    (node_config, server_import_config, server_config, store_config) = demo
+    ctx = get_server_context(server_name, False, ServerContext)
+    click_ctx.invoke(
+        cli_server_import,
+        ctx=ctx,
+        file=server_import_config,
+        drop_all=False,
+        image=image,
+        mount_src="",
+        keep=False,
+        wait=True,
+    )
+    info(
+        "Development network was set up successfully! You can now start the "
+        f"server and nodes with {Fore.GREEN}v6 dev start-demo-network"
+        f"{Style.RESET_ALL}"
+    )
+    # find user credentials to print. Read from server import file
+    with open(server_import_config, "r") as f:
+        server_import_config = yaml.safe_load(f)
+
+    try:
+        user = server_import_config["organizations"][0]["users"][0]
+        username = user["username"]
+        password = user["password"]
+        info(
+            "You can login with the following credentials:\n"
+            f"Username: {username}\n"
+            f"Password: {password}\n"
+        )
+    except KeyError:
+        # No user found, skip printing credentials
+        pass
+
+    return {
+        "node_configs": node_config,
+        "server_import_config": server_import_config,
+        "server_config": server_config,
+        "store_config": store_config,
+    }

vantage6/cli/dev/remove.py

@@ -0,0 +1,111 @@
+import subprocess
+import itertools
+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, 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
+from vantage6.cli.utils import remove_file
+from vantage6.common.globals import InstanceType
+from vantage6.cli.dev.utils import get_dev_server_context
+
+
+@click.command()
+@click.option("-n", "--name", default=None, help="Name of the configuration.")
+@click.option(
+    "-c",
+    "--config",
+    default=None,
+    help="Path to configuration-file; overrides --name",
+)
+@click.pass_context
+def remove_demo_network(
+    click_ctx: click.Context, name: str | None, config: str | None
+) -> None:
+    """Remove all related demo network files and folders.
+
+    Select a server configuration to remove that server and the nodes attached
+    to it.
+    """
+    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.value}"}
+    )
+    running_server_names = [server.name for server in running_servers]
+    container_name = f"{APPNAME}-{name}-user-{InstanceType.SERVER.value}"
+    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()
+    click_ctx.invoke(cli_server_remove, ctx=ctx, force=True)
+
+    # removing the server import config
+    info("Deleting demo import config file")
+    server_configs = ServerContext.instance_folders(
+        InstanceType.SERVER, ctx.name, system_folders=False
+    )
+    import_config_to_del = Path(server_configs["dev"]) / f"{ctx.name}.yaml"
+    remove_file(import_config_to_del, "import_configuration")
+
+    # also remove the server folder
+    server_configs = ServerContext.instance_folders(
+        InstanceType.SERVER, ctx.name, system_folders=False
+    )
+    server_folder = server_configs["data"]
+    if server_folder.is_dir():
+        rmtree(server_folder)
+
+    # remove the store folder
+    store_configs = AlgorithmStoreContext.instance_folders(
+        InstanceType.ALGORITHM_STORE, f"{ctx.name}_store", system_folders=False
+    )
+    store_folder = store_configs["data"]
+    if store_folder.is_dir():
+        rmtree(store_folder)
+
+    # remove the store config file
+    subprocess.run(
+        [
+            "v6",
+            "algorithm-store",
+            "remove",
+            "-n",
+            f"{ctx.name}_store",
+            "--force",
+            "--user",
+        ]
+    )
+
+    # remove the nodes
+    configs, _ = NodeContext.available_configurations(system_folders=False)
+    node_names = [
+        config.name for config in configs if config.name.startswith(f"{ctx.name}_node_")
+    ]
+    for name in node_names:
+        node_ctx = NodeContext(name, False)
+        for handler in itertools.chain(
+            node_ctx.log.handlers, node_ctx.log.root.handlers
+        ):
+            handler.close()
+        subprocess.run(["v6", "node", "remove", "-n", name, "--user", "--force"])
+
+    # remove data files attached to the network
+    data_dirs_nodes = NodeContext.instance_folders("node", "", False)["dev"]
+    rmtree(Path(data_dirs_nodes / ctx.name))

vantage6/cli/globals.py

@@ -23,7 +23,9 @@ PACKAGE_FOLDER = Path(__file__).parent.parent.parent
 
 # FIXME BvB 22-06-28 think this is also defined in the node globals, and this
 # one appears not to be used
-NODE_PROXY_SERVER_HOSTNAME = "proxyserver"
+# TODO Check and remove
+# HCR: This constants is indeed not used, as well as the other defined in node/globals.py
+# NODE_PROXY_SERVER_HOSTNAME = "proxyserver"
 
 DATA_FOLDER = PACKAGE_FOLDER / APPNAME / "_data"
 

vantage6/cli/template/node_config.j2

@@ -1,11 +1,4 @@
-api_key: {{ api_key }}
 api_path: {{ api_path }}
-databases:
-  {% for label, path in databases.items() %}
-  - label: {{ label }}
-    uri: {{ path }}
-    type: csv
-  {% endfor %}
 encryption:
   enabled: false
   private_key: null
@@ -30,6 +23,7 @@ logging:
     name: docker.auth
   - level: warning
     name: kubernetes.client.rest
+node_proxy_port: {{ node_proxy_port }}
 port: {{ port }}
 server_url: {{ server_url }}
 task_dir: {{ task_dir}}

{vantage6-5.0.0a15.dist-info → vantage6-5.0.0a17.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: vantage6
-Version: 5.0.0a15
+Version: 5.0.0a17
 Summary: vantage6 command line interface
 Home-page: https://github.com/vantage6/vantage6
 Requires-Python: >=3.10
@@ -16,8 +16,8 @@ Requires-Dist: questionary==1.10.0
 Requires-Dist: rich==13.5.2
 Requires-Dist: schema==0.7.5
 Requires-Dist: sqlalchemy==2.0.37
-Requires-Dist: vantage6-common==5.0.0a15
-Requires-Dist: vantage6-client==5.0.0a15
+Requires-Dist: vantage6-common==5.0.0a17
+Requires-Dist: vantage6-client==5.0.0a17
 Provides-Extra: dev
 Requires-Dist: coverage==6.4.4; extra == "dev"
 Requires-Dist: black; extra == "dev"

{vantage6-5.0.0a15.dist-info → vantage6-5.0.0a17.dist-info}/RECORD

@@ -3,13 +3,13 @@ tests_cli/test_example.py,sha256=0fw_v-lgZEacshWSDwLNyLMA1_xc48bKUGM3ll-n1L0,146
 tests_cli/test_node_cli.py,sha256=ajFdG1sTa9H7PjqK2dhcp3k59HGsJyO6ZoRfxgIUHcA,16842
 tests_cli/test_server_cli.py,sha256=Yv6k0mkqElrpPgFtro_OH2Bjixz7mDXioxhvXr9VsAQ,6550
 tests_cli/test_wizard.py,sha256=NIj59eiCBuVNJXwhofrWLmLIKAsD45gSOzqOFWLmWhY,4916
-vantage6/cli/__build__,sha256=5in6ZZjXMnaPfHJrS2IShfnDuFMDkAqpEgF9t2F9i9s,2
+vantage6/cli/__build__,sha256=RSNUDxUEzRcQDEg16Ft-79SZEVgPjv_wWZqPKDvmueM,2
 vantage6/cli/__init__.py,sha256=ZXbeQ_-g2-M4XYteWZkoO5lMFYhqjm5doQgGy1fq8i0,125
 vantage6/cli/_version.py,sha256=iDijqhgy5jzZ0LAyzW1LlXeeuMcHWMyg9D8xbXtV7Ck,696
 vantage6/cli/cli.py,sha256=B0F328FSBBslwplMPk8lIlr0r-taKuCgb8v9DIdyE3Q,5699
-vantage6/cli/configuration_manager.py,sha256=QuR8Lvgjfp36aLnMV3PdbjddVJHOCvOv2Vci1bYHDHY,3642
+vantage6/cli/configuration_manager.py,sha256=CHGyYkHT8sIaEZjRrmWuiiDPfFdpFEbpl-yV5jG7OgM,3563
 vantage6/cli/configuration_wizard.py,sha256=ifqvrVqHkxoM0ZVUVIwlYXFByzAbuVlahNjmwFGLVRU,20874
-vantage6/cli/globals.py,sha256=8AWI55FBbumVQTuI1bJzKp5hiRWtiwsVgTTKqWgRBes,1616
+vantage6/cli/globals.py,sha256=ZmZHYG5Zm38L5eBSNXUaEznmL9bZHOU6F86aYAExq0I,1732
 vantage6/cli/utils.py,sha256=Jfr6IeHMQDk_wU5X7rJ1dRY118dhVVX8PwzwMYMv9Vw,2481
 vantage6/cli/algorithm/create.py,sha256=kRT1BlBcb0fDaB2Q988WxtA6EyAZmOW5QoU2uhbwBIo,2075
 vantage6/cli/algorithm/update.py,sha256=WwAfTnq0kTOgePUsBzGoo1AJQqGMn82E9Bjk1wf61CQ,1338
@@ -26,8 +26,10 @@ vantage6/cli/common/utils.py,sha256=eYlR-n2r3j7rW-EPSUnJR98Df8ye551WOl8tW912p3A,
 vantage6/cli/context/__init__.py,sha256=e8rfY2tCyu6_SLQ-rbVzEHkDtmbnGCZRHFN_HH-2bnA,2683
 vantage6/cli/context/algorithm_store.py,sha256=RimxNcoqfWeu2WQede6wsOu1rx-azzXIPVkCDqVJLWs,3944
 vantage6/cli/context/base_server.py,sha256=paKSzNrKWD-J6eakHAtGELk2cD05A8NqoCAuQfF7c2s,2972
-vantage6/cli/context/node.py,sha256=u9UYBgRxcVaAJQqMEuVHdY-OLfO6w7Nc8GOB2ftbT6k,7368
+vantage6/cli/context/node.py,sha256=vEmlWtx7V0e5yqRp9Yi-FhIzSDd4LgnXPVXKYn2n048,7370
 vantage6/cli/context/server.py,sha256=vBGJWNsJoVcIryX5OLiWnFklNRcjOVkhqm2U5tqW5b0,3946
+vantage6/cli/dev/create.py,sha256=6LiK0MUZjZK_W932WnlMMVeCqX1L11F87Rk1UkU6O-4,19347
+vantage6/cli/dev/remove.py,sha256=R_OU_LXLDCnoD-2xnegg4lh0B3t8EgpqzDqueLx16io,3730
 vantage6/cli/node/attach.py,sha256=cmouPrkbIbg21_wlAe-L-ecmrKVxiDkzGmEtRaCnKQY,276
 vantage6/cli/node/clean.py,sha256=uCty2GNuwoTybs1nIOygQLxtbleQ-rnnS6_4ieWVmCw,1199
 vantage6/cli/node/create_private_key.py,sha256=yciL1DtACxrBeEGxeaDi0NefDTvegG6s4rr5jA9J5TY,5207
@@ -57,14 +59,14 @@ vantage6/cli/server/stop.py,sha256=DY3r9VsUk_r3cqIm1iL-U-kstLVb9pZsiGDSZyAMrKA,4
 vantage6/cli/server/version.py,sha256=aXAztHEky_F2jPbfPdHPfsAY7rdTurl0_3S6bL94_QQ,1318
 vantage6/cli/server/common/__init__.py,sha256=htv0mFYa4GhIHdzA2xqUUgKhHcMh09UQERlIjIgrwOM,2062
 vantage6/cli/template/algo_store_config.j2,sha256=XR-ly-47p6egH8lVh4lZZDh3YSV4kFnkZprdsfSkS2Y,552
-vantage6/cli/template/node_config.j2,sha256=-4i3efdtDbEzzfj5BrJ02m3ETFBb8Tc1gMsmTga7Xx0,842
+vantage6/cli/template/node_config.j2,sha256=EyVKeyW0qAyvdUNSXTHUzPKRNunAMyn-cDTKiSyTbDc,730
 vantage6/cli/template/server_config.j2,sha256=3gEPY8YlqUMAQEgfR7a1HTU8WaCRhVzTS-IwPhsU1Gg,802
 vantage6/cli/template/server_import_config.j2,sha256=9WT2XeG9-ADoYLb4ahXhof3i9Fcvg0oqwNPyFwLJpvc,1827
 vantage6/cli/test/feature_tester.py,sha256=M8hvebupPwYjcBZoUB8GB3qb8G1-d3ipNzRMc_3-Z8E,2761
 vantage6/cli/test/integration_test.py,sha256=MctR_t-WEyxzFpMdc6ByTcX1BQglZiT5-CIOQXTBBWo,4034
 vantage6/cli/test/common/diagnostic_runner.py,sha256=F8vEaCD6HeKWDcQGVzRkPYxdvEk9owqfciOVdN3bHbw,6607
-vantage6-5.0.0a15.dist-info/METADATA,sha256=bRl_OC-079RNRUeEMKi791fDu5ynSHuGhgFP6W5M5ak,10887
-vantage6-5.0.0a15.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-vantage6-5.0.0a15.dist-info/entry_points.txt,sha256=YFBvwjxoeAGxYyPC-YevEgOBBYRGaXkS6jiOGGCLNy0,157
-vantage6-5.0.0a15.dist-info/top_level.txt,sha256=CYDIBS8jEfFq5YCs_Fuit54K9-3wdosZppTrsymIoUk,19
-vantage6-5.0.0a15.dist-info/RECORD,,
+vantage6-5.0.0a17.dist-info/METADATA,sha256=qZCsGI_e56LUdkCfygiclglhDwX1Akfnl6ozLVoiFaA,10887
+vantage6-5.0.0a17.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+vantage6-5.0.0a17.dist-info/entry_points.txt,sha256=YFBvwjxoeAGxYyPC-YevEgOBBYRGaXkS6jiOGGCLNy0,157
+vantage6-5.0.0a17.dist-info/top_level.txt,sha256=CYDIBS8jEfFq5YCs_Fuit54K9-3wdosZppTrsymIoUk,19
+vantage6-5.0.0a17.dist-info/RECORD,,