vantage6 4.2.2__py3-none-any.whl → 4.3.0b3__py3-none-any.whl

vantage6/cli/node/common/__init__.py

@@ -8,10 +8,10 @@ import docker
 from colorama import Fore, Style
 
 from vantage6.common import error, info, debug
-from vantage6.common.globals import STRING_ENCODING, APPNAME
+from vantage6.common.globals import STRING_ENCODING, APPNAME, InstanceType
 from vantage6.client import UserClient
 
-from vantage6.cli.context import NodeContext
+from vantage6.cli.context.node import NodeContext
 from vantage6.cli.configuration_wizard import select_configuration_questionaire
 
 
@@ -92,7 +92,11 @@ def select_node(name: str, system_folders: bool) -> tuple[str, str]:
     str
         Name of the configuration file
     """
-    name = name if name else select_configuration_questionaire("node", system_folders)
+    name = (
+        name
+        if name
+        else select_configuration_questionaire(InstanceType.NODE, system_folders)
+    )
 
     # raise error if config could not be found
     if not NodeContext.config_exists(name, system_folders):
@@ -118,5 +122,7 @@ def find_running_node_names(client: docker.DockerClient) -> list[str]:
     list[str]
         List of names of running nodes
     """
-    running_nodes = client.containers.list(filters={"label": f"{APPNAME}-type=node"})
+    running_nodes = client.containers.list(
+        filters={"label": f"{APPNAME}-type={InstanceType.NODE}"}
+    )
     return [node.name for node in running_nodes]

vantage6/cli/node/create_private_key.py

@@ -11,7 +11,7 @@ from vantage6.common import (
 )
 
 from vantage6.common.encryption import RSACryptor
-from vantage6.cli.context import NodeContext
+from vantage6.cli.context.node import NodeContext
 from vantage6.cli.globals import DEFAULT_NODE_SYSTEM_FOLDERS as N_FOL
 from vantage6.cli.node.common import select_node, create_client_and_authenticate
 

vantage6/cli/node/files.py

@@ -1,7 +1,7 @@
 import click
 
 from vantage6.common import info
-from vantage6.cli.context import NodeContext
+from vantage6.cli.context.node import NodeContext
 from vantage6.cli.globals import DEFAULT_NODE_SYSTEM_FOLDERS as N_FOL
 from vantage6.cli.node.common import select_node
 

vantage6/cli/node/list.py

@@ -5,7 +5,7 @@ from colorama import Fore, Style
 from vantage6.common import warning
 from vantage6.common.globals import APPNAME
 from vantage6.common.docker.addons import check_docker_running
-from vantage6.cli.context import NodeContext
+from vantage6.cli.context.node import NodeContext
 from vantage6.cli.node.common import find_running_node_names
 
 

vantage6/cli/node/new.py

@@ -2,10 +2,11 @@ import click
 from colorama import Fore, Style
 
 from vantage6.common import error, info, check_config_writeable
-from vantage6.cli.context import NodeContext
+from vantage6.cli.context.node import NodeContext
 from vantage6.cli.globals import DEFAULT_NODE_SYSTEM_FOLDERS as N_FOL
 from vantage6.cli.configuration_wizard import configuration_wizard
 from vantage6.cli.utils import check_config_name_allowed, prompt_config_name
+from vantage6.common.globals import InstanceType
 
 
 @click.command()
@@ -46,7 +47,7 @@ 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("node", name, system_folders)
+    cfg_file = configuration_wizard(InstanceType.NODE, name, system_folders)
     info(f"New configuration created: {Fore.GREEN}{cfg_file}{Style.RESET_ALL}")
     info(
         f"You can start the node by running "

vantage6/cli/node/remove.py

@@ -17,7 +17,7 @@ from vantage6.common.globals import APPNAME
 from vantage6.common.globals import VPN_CONFIG_FILE
 
 
-from vantage6.cli.context import NodeContext
+from vantage6.cli.context.node import NodeContext
 from vantage6.cli.globals import DEFAULT_NODE_SYSTEM_FOLDERS as N_FOL
 from vantage6.cli.utils import check_if_docker_daemon_is_running, remove_file
 from vantage6.cli.node.common import select_node, find_running_node_names

vantage6/cli/node/set_api_key.py

@@ -2,7 +2,7 @@ import click
 import questionary as q
 
 from vantage6.common import error, info, check_config_writeable
-from vantage6.cli.context import NodeContext
+from vantage6.cli.context.node import NodeContext
 from vantage6.cli.globals import DEFAULT_NODE_SYSTEM_FOLDERS as N_FOL
 from vantage6.cli.configuration_wizard import NodeConfigurationManager
 from vantage6.cli.node.common import select_node

vantage6/cli/node/start.py

@@ -16,6 +16,7 @@ from vantage6.common.globals import (
     DEFAULT_DOCKER_REGISTRY,
     DEFAULT_NODE_IMAGE,
     DEFAULT_NODE_IMAGE_WO_TAG,
+    InstanceType,
 )
 from vantage6.common.docker.addons import (
     pull_if_newer,
@@ -23,7 +24,7 @@ from vantage6.common.docker.addons import (
     check_docker_running,
 )
 
-from vantage6.cli.context import NodeContext
+from vantage6.cli.context.node import NodeContext
 from vantage6.cli.globals import DEFAULT_NODE_SYSTEM_FOLDERS as N_FOL
 from vantage6.cli.configuration_wizard import (
     configuration_wizard,
@@ -99,14 +100,14 @@ def cli_node_start(
     else:
         # in case no name is supplied, ask the user to select one
         if not name:
-            name = select_configuration_questionaire("node", system_folders)
+            name = select_configuration_questionaire(InstanceType.NODE, system_folders)
 
         # check that config exists, if not a questionaire will be invoked
         if not NodeContext.config_exists(name, system_folders):
             warning(f"Configuration {Fore.RED}{name}{Style.RESET_ALL} does not exist.")
 
             if q.confirm("Create this configuration now?").ask():
-                configuration_wizard("node", name, system_folders)
+                configuration_wizard(InstanceType.NODE, name, system_folders)
 
             else:
                 error("Config file couldn't be loaded")
@@ -119,7 +120,7 @@ def cli_node_start(
 
     # check that this node is not already running
     running_nodes = docker_client.containers.list(
-        filters={"label": f"{APPNAME}-type=node"}
+        filters={"label": f"{APPNAME}-type={InstanceType.NODE}"}
     )
 
     suffix = "system" if system_folders else "user"
@@ -197,7 +198,7 @@ def cli_node_start(
     # FIXME: should obtain mount points from DockerNodeContext
     mounts = [
         # (target, source)
-        ("/mnt/log", str(ctx.log_dir)),
+        (f"/mnt/log/{name}", str(ctx.log_dir)),
         ("/mnt/data", data_volume.name),
         ("/mnt/vpn", vpn_volume.name),
         ("/mnt/ssh", ssh_volume.name),
@@ -346,7 +347,7 @@ def cli_node_start(
         volumes=volumes,
         detach=True,
         labels={
-            f"{APPNAME}-type": "node",
+            f"{APPNAME}-type": InstanceType.NODE,
             "system": str(system_folders),
             "name": ctx.config_file_name,
         },

vantage6/cli/rabbitmq/queue_manager.py

@@ -12,7 +12,7 @@ from vantage6.common.globals import APPNAME
 from vantage6.common import debug, info, error
 from vantage6.common.docker.addons import get_container
 from vantage6.common.docker.network_manager import NetworkManager
-from vantage6.cli.context import ServerContext
+from vantage6.cli.context.server import ServerContext
 from vantage6.cli.rabbitmq.definitions import RABBITMQ_DEFINITIONS
 from vantage6.cli.globals import RABBIT_TIMEOUT
 from vantage6.cli.rabbitmq import split_rabbitmq_uri

vantage6/cli/server/attach.py

@@ -9,7 +9,7 @@ from colorama import Fore, Style
 
 from vantage6.common import info, error
 from vantage6.common.docker.addons import check_docker_running
-from vantage6.common.globals import APPNAME
+from vantage6.common.globals import APPNAME, InstanceType
 
 from vantage6.cli.globals import DEFAULT_SERVER_SYSTEM_FOLDERS
 from vantage6.cli.server.common import print_log_worker
@@ -29,7 +29,7 @@ def cli_server_attach(name: str, system_folders: bool) -> None:
     client = docker.from_env()
 
     running_servers = client.containers.list(
-        filters={"label": f"{APPNAME}-type=server"}
+        filters={"label": f"{APPNAME}-type={InstanceType.SERVER}"}
     )
     running_server_names = [node.name for node in running_servers]
 
@@ -39,7 +39,7 @@ def cli_server_attach(name: str, system_folders: bool) -> None:
         ).ask()
     else:
         post_fix = "system" if system_folders else "user"
-        name = f"{APPNAME}-{name}-{post_fix}-server"
+        name = f"{APPNAME}-{name}-{post_fix}-{InstanceType.SERVER}"
 
     if name in running_server_names:
         container = client.containers.get(name)

vantage6/cli/server/common/__init__.py

@@ -6,11 +6,11 @@ import click
 from colorama import Fore, Style
 
 from vantage6.common import error, info
-from vantage6.common.globals import STRING_ENCODING, APPNAME
+from vantage6.common.globals import STRING_ENCODING, APPNAME, InstanceType
 from vantage6.common.docker.addons import remove_container, get_container
 
 from vantage6.cli.globals import DEFAULT_SERVER_SYSTEM_FOLDERS
-from vantage6.cli.context import ServerContext
+from vantage6.cli.context.server import ServerContext
 from vantage6.cli.configuration_wizard import select_configuration_questionaire
 
 
@@ -77,7 +77,9 @@ def click_insert_context(func: callable) -> callable:
             if not name:
                 try:
                     # select configuration if none supplied
-                    name = select_configuration_questionaire("server", system_folders)
+                    name = select_configuration_questionaire(
+                        InstanceType.SERVER, system_folders
+                    )
                 except Exception:
                     error("No configurations could be found!")
                     exit(1)

vantage6/cli/server/files.py

@@ -1,7 +1,7 @@
 import click
 
 from vantage6.common import info
-from vantage6.cli.context import ServerContext
+from vantage6.cli.context.server import ServerContext
 from vantage6.cli.server.common import click_insert_context
 
 

vantage6/cli/server/import_.py

@@ -4,6 +4,7 @@ from threading import Thread
 import click
 import docker
 from sqlalchemy.engine.url import make_url
+from vantage6.cli.globals import ServerGlobals
 
 from vantage6.common import info, warning
 from vantage6.common.docker.addons import check_docker_running
@@ -11,8 +12,9 @@ from vantage6.common.globals import (
     APPNAME,
     DEFAULT_DOCKER_REGISTRY,
     DEFAULT_SERVER_IMAGE,
+    InstanceType,
 )
-from vantage6.cli.context import ServerContext
+from vantage6.cli.context.server import ServerContext
 from vantage6.cli.utils import check_config_name_allowed
 from vantage6.cli.server.common import click_insert_context, print_log_worker
 
@@ -113,7 +115,9 @@ def cli_server_import(
         # we're mounting the entire folder that contains the database
         mounts.append(docker.types.Mount("/mnt/database/", dirname, type="bind"))
 
-        environment_vars = {"VANTAGE6_DB_URI": f"sqlite:////mnt/database/{basename}"}
+        environment_vars = {
+            ServerGlobals.DB_URI_ENV_VAR: f"sqlite:////mnt/database/{basename}"
+        }
 
     else:
         warning(
@@ -133,7 +137,7 @@ def cli_server_import(
         command=cmd,
         mounts=mounts,
         detach=True,
-        labels={f"{APPNAME}-type": "server", "name": ctx.config_file_name},
+        labels={f"{APPNAME}-type": InstanceType.SERVER, "name": ctx.config_file_name},
         environment=environment_vars,
         auto_remove=not keep,
         tty=True,

vantage6/cli/server/list.py

@@ -5,8 +5,8 @@ from colorama import Fore, Style
 
 from vantage6.common import warning
 from vantage6.common.docker.addons import check_docker_running
-from vantage6.common.globals import APPNAME
-from vantage6.cli.context import ServerContext
+from vantage6.common.globals import APPNAME, InstanceType
+from vantage6.cli.context.server import ServerContext
 
 
 @click.command()
@@ -17,7 +17,9 @@ def cli_server_configuration_list() -> None:
     check_docker_running()
     client = docker.from_env()
 
-    running_server = client.containers.list(filters={"label": f"{APPNAME}-type=server"})
+    running_server = client.containers.list(
+        filters={"label": f"{APPNAME}-type={InstanceType.SERVER}"}
+    )
     running_node_names = []
     for node in running_server:
         running_node_names.append(node.name)
@@ -35,7 +37,8 @@ def cli_server_configuration_list() -> None:
     for config in configs:
         status = (
             running
-            if f"{APPNAME}-{config.name}-system-server" in running_node_names
+            if f"{APPNAME}-{config.name}-system-{InstanceType.SERVER}"
+            in running_node_names
             else stopped
         )
         click.echo(f"{config.name:25}" f"{status:25} System ")
@@ -45,7 +48,8 @@ def cli_server_configuration_list() -> None:
     for config in configs:
         status = (
             running
-            if f"{APPNAME}-{config.name}-user-server" in running_node_names
+            if f"{APPNAME}-{config.name}-user-{InstanceType.SERVER}"
+            in running_node_names
             else stopped
         )
         click.echo(f"{config.name:25}" f"{status:25} User   ")

vantage6/cli/server/new.py

@@ -3,9 +3,10 @@ from colorama import Fore, Style
 
 from vantage6.common import info, error, check_config_writeable
 from vantage6.cli.globals import DEFAULT_SERVER_SYSTEM_FOLDERS
-from vantage6.cli.context import ServerContext
+from vantage6.cli.context.server import ServerContext
 from vantage6.cli.configuration_wizard import configuration_wizard
 from vantage6.cli.utils import check_config_name_allowed, prompt_config_name
+from vantage6.common.globals import InstanceType
 
 
 @click.command()
@@ -44,7 +45,7 @@ def cli_server_new(name: str, system_folders: bool) -> None:
         exit(1)
 
     # create config in ctx location
-    cfg_file = configuration_wizard("server", name, system_folders)
+    cfg_file = configuration_wizard(InstanceType.SERVER, name, system_folders)
     info(f"New configuration created: {Fore.GREEN}{cfg_file}{Style.RESET_ALL}")
 
     # info(f"root user created.")

vantage6/cli/server/shell.py

@@ -6,8 +6,8 @@ from colorama import Fore, Style
 
 from vantage6.common import info, error, debug as debug_msg
 from vantage6.common.docker.addons import check_docker_running
-from vantage6.common.globals import APPNAME
-from vantage6.cli.context import ServerContext
+from vantage6.common.globals import APPNAME, InstanceType
+from vantage6.cli.context.server import ServerContext
 from vantage6.cli.server.common import click_insert_context
 
 
@@ -28,7 +28,7 @@ def cli_server_shell(ctx: ServerContext) -> None:
     docker_client = docker.from_env()
 
     running_servers = docker_client.containers.list(
-        filters={"label": f"{APPNAME}-type=server"}
+        filters={"label": f"{APPNAME}-type={InstanceType.SERVER}"}
     )
 
     if ctx.docker_container_name not in [s.name for s in running_servers]:

vantage6/cli/server/start.py

@@ -1,28 +1,28 @@
-import os
-from threading import Thread
-import time
-
 import click
 import docker
-from colorama import Fore, Style
-from sqlalchemy.engine.url import make_url
 from docker.client import DockerClient
 
 from vantage6.common import info, warning, error
-from vantage6.common.docker.addons import pull_if_newer, check_docker_running
 from vantage6.common.docker.network_manager import NetworkManager
 from vantage6.common.globals import (
     APPNAME,
-    DEFAULT_DOCKER_REGISTRY,
     DEFAULT_SERVER_IMAGE,
     DEFAULT_UI_IMAGE,
+    InstanceType,
 )
 
-from vantage6.cli.globals import DEFAULT_UI_PORT
-from vantage6.cli.context import ServerContext
-from vantage6.cli.utils import check_config_name_allowed
+from vantage6.cli.globals import DEFAULT_UI_PORT, ServerGlobals
+from vantage6.cli.context.server import ServerContext
 from vantage6.cli.rabbitmq.queue_manager import RabbitMQManager
-from vantage6.cli.server.common import click_insert_context, print_log_worker, stop_ui
+from vantage6.cli.server.common import click_insert_context, stop_ui
+from vantage6.cli.common.start import (
+    attach_logs,
+    check_for_start,
+    get_image,
+    mount_database,
+    mount_source,
+    pull_image,
+)
 
 
 @click.command()
@@ -81,47 +81,15 @@ def cli_server_start(
     """
     Start the server.
     """
-    # will print an error if not
-    check_docker_running()
-
     info("Starting server...")
-    info("Finding Docker daemon.")
-    docker_client = docker.from_env()
-
-    # check if name is allowed for docker volume, else exit
-    check_config_name_allowed(ctx.name)
+    docker_client = check_for_start(ctx, InstanceType.SERVER)
 
-    # check that this server is not already running
-    running_servers = docker_client.containers.list(
-        filters={"label": f"{APPNAME}-type=server"}
-    )
-    for server in running_servers:
-        if server.name == f"{APPNAME}-{ctx.name}-{ctx.scope}-server":
-            error(f"Server {Fore.RED}{ctx.name}{Style.RESET_ALL} " "is already running")
-            exit(1)
+    image = get_image(image, ctx, "server", DEFAULT_SERVER_IMAGE)
 
     # check that log directory exists - or create it
     ctx.log_dir.mkdir(parents=True, exist_ok=True)
 
-    # Determine image-name. First we check if the option --image has been used.
-    # Then we check if the image has been specified in the config file, and
-    # finally we use the default settings from the package.
-    if image is None:
-        custom_images: dict = ctx.config.get("images")
-        if custom_images:
-            image = custom_images.get("server")
-        if not image:
-            image = f"{DEFAULT_DOCKER_REGISTRY}/{DEFAULT_SERVER_IMAGE}"
-
-    info(f"Pulling latest server image '{image}'.")
-    try:
-        pull_if_newer(docker.from_env(), image)
-        # docker_client.images.pull(image)
-    except Exception as e:
-        warning(" ... Getting latest server image failed:")
-        warning(f"     {e}")
-    else:
-        info(" ... success!")
+    pull_image(docker_client, image)
 
     info("Creating mounts")
     config_file = "/mnt/config.yaml"
@@ -130,41 +98,13 @@ def cli_server_start(
         docker.types.Mount("/mnt/log/", str(ctx.log_dir), type="bind"),
     ]
 
-    if mount_src:
-        mount_src = os.path.abspath(mount_src)
-        mounts.append(docker.types.Mount("/vantage6", mount_src, type="bind"))
-    # FIXME: code duplication with cli_server_import()
-    # try to mount database
-    uri = ctx.config["uri"]
-    url = make_url(uri)
-    environment_vars = None
-
-    # If host is None, we're dealing with a file-based DB, like SQLite
-    if url.host is None:
-        db_path = url.database
+    src_mount = mount_source(mount_src)
+    if src_mount:
+        mounts.append(src_mount)
 
-        if not os.path.isabs(db_path):
-            # We're dealing with a relative path here -> make it absolute
-            db_path = ctx.data_dir / url.database
-
-        basename = os.path.basename(db_path)
-        dirname = os.path.dirname(db_path)
-        os.makedirs(dirname, exist_ok=True)
-
-        # we're mounting the entire folder that contains the database
-        mounts.append(docker.types.Mount("/mnt/database/", dirname, type="bind"))
-
-        environment_vars = {
-            "VANTAGE6_DB_URI": f"sqlite:////mnt/database/{basename}",
-            "VANTAGE6_CONFIG_NAME": ctx.config_file_name,
-        }
-
-    else:
-        warning(
-            f"Database could not be transferred, make sure {url.host} "
-            "is reachable from the Docker container"
-        )
-        info("Consider using the docker-compose method to start a server")
+    mount, environment_vars = mount_database(ctx, InstanceType.SERVER)
+    if mount:
+        mounts.append(mount)
 
     # Create a docker network for the server and other services like RabbitMQ
     # to reside in
@@ -209,13 +149,13 @@ def cli_server_start(
     info(cmd)
 
     info("Run Docker container")
-    port_ = str(port or ctx.config["port"] or 5000)
+    port_ = str(port or ctx.config["port"] or ServerGlobals.PORT)
     container = docker_client.containers.run(
         image,
         command=cmd,
         mounts=mounts,
         detach=True,
-        labels={f"{APPNAME}-type": "server", "name": ctx.config_file_name},
+        labels={f"{APPNAME}-type": InstanceType.SERVER, "name": ctx.config_file_name},
         environment=environment_vars,
         ports={f"{internal_port}/tcp": (ip, port_)},
         name=ctx.docker_container_name,
@@ -227,18 +167,7 @@ def cli_server_start(
     info(f"Success! container id = {container.id}")
 
     if attach:
-        logs = container.attach(stream=True, logs=True, stdout=True)
-        Thread(target=print_log_worker, args=(logs,), daemon=True).start()
-        while True:
-            try:
-                time.sleep(1)
-            except KeyboardInterrupt:
-                info("Closing log file. Keyboard Interrupt.")
-                info(
-                    "Note that your server is still running! Shut it down "
-                    f"with {Fore.RED}v6 server stop{Style.RESET_ALL}"
-                )
-                exit(0)
+        attach_logs(container, InstanceType.SERVER)
 
 
 def _start_rabbitmq(
@@ -296,22 +225,9 @@ def _start_ui(client: DockerClient, ctx: ServerContext, ui_port: int) -> None:
         ui_port = DEFAULT_UI_PORT
 
     # find image to use
-    custom_images: dict = ctx.config.get("images")
-    image = None
-    if custom_images:
-        image = custom_images.get("ui")
-    if not image:
-        image = f"{DEFAULT_DOCKER_REGISTRY}/{DEFAULT_UI_IMAGE}"
+    image = get_image(None, ctx, "ui", DEFAULT_UI_IMAGE)
 
-    info(f"Pulling latest UI image '{image}'.")
-    try:
-        pull_if_newer(docker.from_env(), image)
-        # docker_client.images.pull(image)
-    except Exception as e:
-        warning(" ... Getting latest node image failed:")
-        warning(f"     {e}")
-    else:
-        info(" ... success!")
+    pull_image(client, image)
 
     # set environment variables
     env_vars = {

vantage6/cli/server/stop.py

@@ -15,7 +15,7 @@ from vantage6.common.docker.addons import (
     delete_network,
     remove_container_if_exists,
 )
-from vantage6.common.globals import APPNAME
+from vantage6.common.globals import APPNAME, InstanceType
 from vantage6.cli.rabbitmq import split_rabbitmq_uri
 
 from vantage6.cli.globals import DEFAULT_SERVER_SYSTEM_FOLDERS
@@ -37,7 +37,7 @@ def cli_server_stop(name: str, system_folders: bool, all_servers: bool):
     client = docker.from_env()
 
     running_servers = client.containers.list(
-        filters={"label": f"{APPNAME}-type=server"}
+        filters={"label": f"{APPNAME}-type={InstanceType.SERVER}"}
     )
 
     if not running_servers:
@@ -58,7 +58,7 @@ def cli_server_stop(name: str, system_folders: bool, all_servers: bool):
         ).ask()
     else:
         post_fix = "system" if system_folders else "user"
-        container_name = f"{APPNAME}-{name}-{post_fix}-server"
+        container_name = f"{APPNAME}-{name}-{post_fix}-{InstanceType.SERVER}"
 
     if container_name not in running_server_names:
         error(f"{Fore.RED}{name}{Style.RESET_ALL} is not running!")
@@ -88,7 +88,6 @@ def _stop_server_containers(
     info(f"Stopped the {Fore.GREEN}{container_name}{Style.RESET_ALL} server.")
 
     # find the configuration name from the docker container name
-    # server name is formatted as f"{APPNAME}-{self.name}-{self.scope}-server"
     scope = "system" if system_folders else "user"
     config_name = get_server_config_name(container_name, scope)
 

vantage6/cli/server/version.py

@@ -4,7 +4,7 @@ import docker
 
 from vantage6.common import error
 from vantage6.common.docker.addons import check_docker_running
-from vantage6.common.globals import APPNAME
+from vantage6.common.globals import APPNAME, InstanceType
 from vantage6.cli.globals import DEFAULT_SERVER_SYSTEM_FOLDERS
 from vantage6.cli import __version__
 
@@ -23,7 +23,7 @@ def cli_server_version(name: str, system_folders: bool) -> None:
     client = docker.from_env()
 
     running_servers = client.containers.list(
-        filters={"label": f"{APPNAME}-type=server"}
+        filters={"label": f"{APPNAME}-type={InstanceType.SERVER}"}
     )
     running_server_names = [server.name for server in running_servers]
 

{vantage6-4.2.2.dist-info → vantage6-4.3.0b3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: vantage6
-Version: 4.2.2
+Version: 4.3.0b3
 Summary: vantage6 command line interface
 Home-page: https://github.com/vantage6/vantage6
 Requires-Python: >=3.10
@@ -15,8 +15,8 @@ Requires-Dist: questionary ==1.10.0
 Requires-Dist: rich ==13.5.2
 Requires-Dist: schema ==0.7.5
 Requires-Dist: SQLAlchemy ==1.4.46
-Requires-Dist: vantage6-common ==4.2.2
-Requires-Dist: vantage6-client ==4.2.2
+Requires-Dist: vantage6-common ==4.3.0b3
+Requires-Dist: vantage6-client ==4.3.0b3
 Provides-Extra: dev
 Requires-Dist: coverage ==6.4.4 ; extra == 'dev'
 Requires-Dist: black ; extra == 'dev'