vantage6 5.0.0a26__py3-none-any.whl → 5.0.0a29__py3-none-any.whl

vantage6/cli/dev/create.py

@@ -1,20 +1,20 @@
-from pathlib import Path
 from importlib import resources as impresources
-import yaml
+from pathlib import Path
+
 import click
 import pandas as pd
-
-from jinja2 import Environment, FileSystemLoader
+import yaml
 from colorama import Fore, Style
+from jinja2 import Environment, FileSystemLoader
 
+from vantage6.common import ensure_config_dir_writable, error, generate_apikey, info
 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, DefaultDatasets
-from vantage6.cli.context.server import ServerContext
 from vantage6.cli.context.node import NodeContext
+from vantage6.cli.context.server import ServerContext
+from vantage6.cli.globals import PACKAGE_FOLDER, DefaultDatasets
 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
@@ -428,7 +428,7 @@ def create_algo_store_config(
     )
     folders = AlgorithmStoreContext.instance_folders(
         instance_type=InstanceType.ALGORITHM_STORE,
-        instance_name="{server_name}_store",
+        instance_name=f"{server_name}_store",
         system_folders=False,
     )
 
@@ -546,21 +546,19 @@ def demo_network(
     "--server-port",
     type=int,
     default=Ports.DEV_SERVER.value,
-    help=f"Port to run the server on. Default is {Ports.DEV_SERVER.value}.",
+    help=f"Port to run the server on. Default is {Ports.DEV_SERVER}.",
 )
 @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}.",
+    help=f"Port to run the UI on. Default is {Ports.DEV_UI}.",
 )
 @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}."
-    ),
+    help=(f"Port to run the algorithm store on. Default is {Ports.DEV_ALGO_STORE}."),
 )
 @click.option(
     "-i",

vantage6/cli/dev/remove.py

@@ -41,10 +41,10 @@
 #     # check that the server is not running
 #     client = docker.from_env()
 #     running_servers = client.containers.list(
-#         filters={"label": f"{APPNAME}-type={InstanceType.SERVER.value}"}
+#         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.value}"
+#     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 "

vantage6/cli/globals.py

@@ -2,9 +2,9 @@
 This module contains global variables that are used throughout the CLI.
 """
 
-from enum import Enum
 from pathlib import Path
 
+from vantage6.common.enum import StrEnumBase
 from vantage6.common.globals import APPNAME
 
 #
@@ -58,28 +58,28 @@ PROMETHEUS_DIR = "prometheus"
 
 
 # datasets included in the nodes of the dev network
-class DefaultDatasets(str, Enum):
+class DefaultDatasets(StrEnumBase):
     """Enum containing default datasets"""
 
     OLYMPIC_ATHLETES = "olympic_athletes_2016.csv"
     KAPLAN_MEIER_TEST = "km_dataset.csv"
 
 
-class ServerType(str, Enum):
+class ServerType(StrEnumBase):
     """Enum containing server types"""
 
     V6SERVER = "server"
     ALGORITHM_STORE = "algorithm-store"
 
 
-class ServerGlobals(str, Enum):
+class ServerGlobals(StrEnumBase):
     """Enum containing server environment variables"""
 
     DB_URI_ENV_VAR = "VANTAGE6_DB_URI"
     CONFIG_NAME_ENV_VAR = "VANTAGE6_CONFIG_NAME"
 
 
-class AlgoStoreGlobals(str, Enum):
+class AlgoStoreGlobals(StrEnumBase):
     """Enum containing algorithm store environment variables"""
 
     DB_URI_ENV_VAR = "VANTAGE6_ALGO_STORE_DB_URI"

vantage6/cli/node/common/__init__.py

@@ -3,15 +3,17 @@ Common functions that are used in node CLI commands
 """
 
 import os
+
 import docker
 from colorama import Fore, Style
 
-from vantage6.common import error, info, debug
+from vantage6.common import debug, error, info
 from vantage6.common.globals import APPNAME, InstanceType, RequiredNodeEnvVars
+
 from vantage6.client import UserClient
 
-from vantage6.cli.context.node import NodeContext
 from vantage6.cli.configuration_wizard import select_configuration_questionaire
+from vantage6.cli.context.node import NodeContext
 
 
 def create_client(ctx: NodeContext) -> UserClient:
@@ -86,8 +88,7 @@ def select_node(name: str, system_folders: bool) -> tuple[str, str]:
     # raise error if config could not be found
     if not NodeContext.config_exists(name, system_folders):
         error(
-            f"The configuration {Fore.RED}{name}{Style.RESET_ALL} could "
-            f"not be found."
+            f"The configuration {Fore.RED}{name}{Style.RESET_ALL} could not be found."
         )
         exit(1)
     return name
@@ -108,6 +109,6 @@ def find_running_node_names(client: docker.DockerClient) -> list[str]:
         List of names of running nodes
     """
     running_nodes = client.containers.list(
-        filters={"label": f"{APPNAME}-type={InstanceType.NODE.value}"}
+        filters={"label": f"{APPNAME}-type={InstanceType.NODE}"}
     )
     return [node.name for node in running_nodes]

vantage6/cli/node/start.py

@@ -1,16 +1,18 @@
+import os.path
+import time
 from pathlib import Path
 from threading import Thread
-import time
-import os.path
 
 import click
 import docker
-
 from colorama import Fore, Style
 
-from vantage6.cli.common.start import pull_infra_image
-from vantage6.common import warning, error, info, debug
+from vantage6.common import debug, error, info, warning
 from vantage6.common.dataclass import TaskDB
+from vantage6.common.docker.addons import (
+    check_docker_running,
+    remove_container_if_exists,
+)
 from vantage6.common.globals import (
     APPNAME,
     DEFAULT_DOCKER_REGISTRY,
@@ -18,17 +20,14 @@ from vantage6.common.globals import (
     DEFAULT_NODE_IMAGE_WO_TAG,
     InstanceType,
 )
-from vantage6.common.docker.addons import (
-    remove_container_if_exists,
-    check_docker_running,
-)
 
+from vantage6.cli import __version__
 from vantage6.cli.common.decorator import click_insert_context
-from vantage6.cli.context.node import NodeContext
+from vantage6.cli.common.start import pull_infra_image
 from vantage6.cli.common.utils import print_log_worker
+from vantage6.cli.context.node import NodeContext
 from vantage6.cli.node.common import create_client
 from vantage6.cli.utils import check_config_name_allowed
-from vantage6.cli import __version__
 
 
 @click.command()
@@ -41,18 +40,17 @@ from vantage6.cli import __version__
 @click.option(
     "--force-db-mount",
     is_flag=True,
-    help="Always mount node databases; skip the check if they are " "existing files.",
+    help="Always mount node databases; skip the check if they are existing files.",
 )
 @click.option(
     "--attach/--detach",
     default=False,
-    help="Show node logs on the current console after starting the " "node",
+    help="Show node logs on the current console after starting the node",
 )
 @click.option(
     "--mount-src",
     default="",
-    help="Override vantage6 source code in container with the source"
-    " code in this path",
+    help="Override vantage6 source code in container with the source code in this path",
 )
 @click_insert_context(InstanceType.NODE, include_name=True, include_system_folders=True)
 def cli_node_start(
@@ -79,7 +77,7 @@ def cli_node_start(
 
     # check that this node is not already running
     running_nodes = docker_client.containers.list(
-        filters={"label": f"{APPNAME}-type={InstanceType.NODE.value}"}
+        filters={"label": f"{APPNAME}-type={InstanceType.NODE}"}
     )
 
     suffix = "system" if system_folders else "user"
@@ -117,9 +115,7 @@ def cli_node_start(
                     f":{major_minor}"
                 )
             except Exception:
-                warning(
-                    "Could not determine server version. Using default " "node image"
-                )
+                warning("Could not determine server version. Using default node image")
 
             if major_minor and not __version__.startswith(major_minor):
                 warning(
@@ -243,8 +239,8 @@ def cli_node_start(
         if db.type.is_file_based() and not db_file_exists:
             error(
                 f"Database {Fore.RED}{db.uri}{Style.RESET_ALL} not found. Databases of "
-                f"type '{db.type}' must be present on the harddrive. Please update "
-                "your node configuration file."
+                f"type '{db.type}' must be present on the harddrive. Please "
+                "update your node configuration file."
             )
             exit(1)
 
@@ -283,9 +279,7 @@ def cli_node_start(
     # we won't accept overwrites of existing env vars
     env_overwrites = extra_env.keys() & env.keys()
     if env_overwrites:
-        error(
-            "Cannot overwrite existing node environment variables: " f"{env_overwrites}"
-        )
+        error(f"Cannot overwrite existing node environment variables: {env_overwrites}")
         exit(1)
     env.update(extra_env)
 

vantage6/cli/server/files.py

@@ -1,12 +1,14 @@
 import click
 
 from vantage6.common import info
-from vantage6.cli.context.server import ServerContext
+from vantage6.common.globals import InstanceType
+
 from vantage6.cli.common.decorator import click_insert_context
+from vantage6.cli.context.server import ServerContext
 
 
 @click.command()
-@click_insert_context(type_="server")
+@click_insert_context(type_=InstanceType.SERVER)
 def cli_server_files(ctx: ServerContext) -> None:
     """
     List files that belong to a particular server instance.

vantage6/cli/server/import_.py

@@ -4,7 +4,6 @@ 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, pull_image
@@ -14,10 +13,12 @@ from vantage6.common.globals import (
     DEFAULT_SERVER_IMAGE,
     InstanceType,
 )
-from vantage6.cli.context.server import ServerContext
-from vantage6.cli.utils import check_config_name_allowed
+
 from vantage6.cli.common.decorator import click_insert_context
 from vantage6.cli.common.utils import print_log_worker
+from vantage6.cli.context.server import ServerContext
+from vantage6.cli.globals import ServerGlobals
+from vantage6.cli.utils import check_config_name_allowed
 
 
 # TODO this method has a lot of duplicated code from `start`
@@ -33,8 +34,7 @@ from vantage6.cli.common.utils import print_log_worker
 @click.option(
     "--mount-src",
     default="",
-    help="Override vantage6 source code in container with the source"
-    " code in this path",
+    help="Override vantage6 source code in container with the source code in this path",
 )
 @click.option(
     "--keep/--auto-remove",
@@ -42,7 +42,7 @@ from vantage6.cli.common.utils import print_log_worker
     help="Keep image after finishing. Useful for debugging",
 )
 @click.option("--wait", default=False, help="Wait for the import to finish")
-@click_insert_context(type_="server")
+@click_insert_context(type_=InstanceType.SERVER)
 def cli_server_import(
     ctx: ServerContext,
     file: str,
@@ -111,7 +111,7 @@ def cli_server_import(
         mounts.append(docker.types.Mount("/mnt/database/", dirname, type="bind"))
 
         environment_vars = {
-            ServerGlobals.DB_URI_ENV_VAR: f"sqlite:////mnt/database/{basename}"
+            ServerGlobals.DB_URI_ENV_VAR.value: f"sqlite:////mnt/database/{basename}"
         }
 
     else:

vantage6/cli/server/list.py

@@ -2,6 +2,7 @@ import click
 
 from vantage6.common.docker.addons import check_docker_running
 from vantage6.common.globals import InstanceType
+
 from vantage6.cli.common.utils import get_server_configuration_list
 
 
@@ -12,4 +13,4 @@ def cli_server_configuration_list() -> None:
     """
     check_docker_running()
 
-    get_server_configuration_list(InstanceType.SERVER.value)
+    get_server_configuration_list(InstanceType.SERVER)

vantage6/cli/server/shell.py

@@ -4,15 +4,16 @@ import click
 import docker
 from colorama import Fore, Style
 
-from vantage6.common import info, error, debug as debug_msg
+from vantage6.common import debug as debug_msg, error, info
 from vantage6.common.docker.addons import check_docker_running
 from vantage6.common.globals import APPNAME, InstanceType
-from vantage6.cli.context.server import ServerContext
+
 from vantage6.cli.common.decorator import click_insert_context
+from vantage6.cli.context.server import ServerContext
 
 
 @click.command()
-@click_insert_context(type_="server")
+@click_insert_context(type_=InstanceType.SERVER)
 def cli_server_shell(ctx: ServerContext) -> None:
     """
     Run an iPython shell within a running server. This can be used to modify
@@ -28,7 +29,7 @@ def cli_server_shell(ctx: ServerContext) -> None:
     docker_client = docker.from_env()
 
     running_servers = docker_client.containers.list(
-        filters={"label": f"{APPNAME}-type={InstanceType.SERVER.value}"}
+        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,6 +1,7 @@
 import click
 
 from vantage6.common import info
+from vantage6.common.globals import InstanceType
 
 from vantage6.cli.common.decorator import click_insert_context
 from vantage6.cli.common.start import (
@@ -27,7 +28,7 @@ from vantage6.cli.context.server import ServerContext
     default=False,
     help="Print server logs to the console after start",
 )
-@click_insert_context(type_="server")
+@click_insert_context(type_=InstanceType.SERVER)
 def cli_server_start(
     ctx: ServerContext,
     context: str,

vantage6/cli/server/stop.py

@@ -1,18 +1,19 @@
 import click
 
 from vantage6.common import info
+from vantage6.common.globals import InstanceType
 
 from vantage6.cli.common.decorator import click_insert_context
+from vantage6.cli.common.stop import helm_uninstall, stop_port_forward
 from vantage6.cli.config import CliConfig
 from vantage6.cli.context.server import ServerContext
-from vantage6.cli.common.stop import helm_uninstall, stop_port_forward
 
 
 @click.command()
 # add context and namespace options
 @click.option("--context", default=None, help="Kubernetes context to use")
 @click.option("--namespace", default=None, help="Kubernetes namespace to use")
-@click_insert_context(type_="server")
+@click_insert_context(type_=InstanceType.SERVER)
 def cli_server_stop(
     ctx: ServerContext,
     context: str,

vantage6/cli/server/version.py

@@ -4,9 +4,10 @@ import docker
 from vantage6.common import error
 from vantage6.common.docker.addons import check_docker_running
 from vantage6.common.globals import InstanceType
-from vantage6.cli.common.utils import get_server_name, get_running_servers
-from vantage6.cli.globals import DEFAULT_SERVER_SYSTEM_FOLDERS
+
 from vantage6.cli import __version__
+from vantage6.cli.common.utils import get_running_servers, get_server_name
+from vantage6.cli.globals import DEFAULT_SERVER_SYSTEM_FOLDERS
 
 
 @click.command()
@@ -22,10 +23,10 @@ def cli_server_version(name: str, system_folders: bool) -> None:
     check_docker_running()
     client = docker.from_env()
 
-    running_server_names = get_running_servers(client, InstanceType.SERVER.value)
+    running_server_names = get_running_servers(client, InstanceType.SERVER)
 
     name = get_server_name(
-        name, system_folders, running_server_names, InstanceType.SERVER.value
+        name, system_folders, running_server_names, InstanceType.SERVER
     )
 
     if name in running_server_names:

vantage6/cli/template/node_config.j2

@@ -27,5 +27,7 @@ node_proxy_port: {{ node_proxy_port }}
 port: {{ port }}
 server_url: {{ server_url }}
 task_dir: {{ task_dir}}
+dev:
+  task_dir_extension: {{ task_dir_extension }}
 task_namespace: {{ task_namespace }}
 {{- user_provided_config -}}

vantage6/cli/test/algo_test_scripts/algo_test_script.py

@@ -1,12 +1,13 @@
-import logging
 import json
+import logging
 import sys
 
+from vantage6.common import error
 from vantage6.common.enum import TaskStatus
+from vantage6.common.globals import Ports
 
 from vantage6.client import Client
-from vantage6.common import error
-from vantage6.common.globals import Ports
+
 import vantage6.cli.test.algo_test_scripts.algo_test_arguments as arguments
 
 
@@ -33,7 +34,7 @@ def create_and_run_task(client: Client, task_args: dict, algo_name: str = "algor
 
     try:
         # check if the task has failed
-        assert client.task.get(task_id)["status"] != TaskStatus.FAILED.value
+        assert client.task.get(task_id)["status"] != TaskStatus.FAILED
 
         logging.info("Task for %s completed successfully.", algo_name)
 
@@ -57,7 +58,7 @@ def run_test(custom_args: dict | None = None):
     """
     # Create a client and authenticate
     client = Client(
-        server_url=f"http://localhost:{Ports.DEV_SERVER.value}/api",
+        server_url=f"http://localhost:{Ports.DEV_SERVER}/api",
         auth_url="http://localhost:8080",
     )
     try:

vantage6/cli/test/feature_tester.py

@@ -1,17 +1,20 @@
 import sys
+
 import click
 
 from vantage6.common.globals import Ports
+
 from vantage6.client import UserClient
-from vantage6.cli.utils import error
+
 from vantage6.cli.test.common.diagnostic_runner import DiagnosticRunner
+from vantage6.cli.utils import error
 
 
 @click.command()
 @click.option(
     "--server-url",
     type=str,
-    default=f"http://localhost:{Ports.DEV_SERVER.value}/api",
+    default=f"http://localhost:{Ports.DEV_SERVER}/api",
     help="URL of the server",
 )
 @click.option(

{vantage6-5.0.0a26.dist-info → vantage6-5.0.0a29.dist-info}/METADATA

@@ -1,9 +1,9 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: vantage6
-Version: 5.0.0a26
+Version: 5.0.0a29
 Summary: vantage6 command line interface
 Home-page: https://github.com/vantage6/vantage6
-Requires-Python: >=3.10
+Requires-Python: >=3.13
 Description-Content-Type: text/markdown
 Requires-Dist: click==8.1.3
 Requires-Dist: colorama==0.4.6
@@ -12,17 +12,24 @@ Requires-Dist: docker==7.1.0
 Requires-Dist: ipython==8.10.0
 Requires-Dist: jinja2==3.1.6
 Requires-Dist: kubernetes==28.1.0
-Requires-Dist: pandas>=1.5.3
+Requires-Dist: pandas>=2.2.3
 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.0a26
-Requires-Dist: vantage6-client==5.0.0a26
+Requires-Dist: vantage6-common==5.0.0a29
+Requires-Dist: vantage6-client==5.0.0a29
 Provides-Extra: dev
 Requires-Dist: coverage==6.4.4; extra == "dev"
 Requires-Dist: black; extra == "dev"
 Requires-Dist: pre-commit; extra == "dev"
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: provides-extra
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
 
 <h1 align="center">
   <br>