vantage6 5.0.0a34__tar.gz → 5.0.0a36__tar.gz

{vantage6-5.0.0a34 → vantage6-5.0.0a36}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: vantage6
-Version: 5.0.0a34
+Version: 5.0.0a36
 Summary: vantage6 command line interface
 Author: Vantage6 Team
 Maintainer-email: Frank Martin <f.martin@iknl.nl>, Bart van Beusekom <b.vanbeusekom@iknl.nl>
@@ -18,8 +18,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-client==5.0.0a34
-Requires-Dist: vantage6-common==5.0.0a34
+Requires-Dist: vantage6-client==5.0.0a36
+Requires-Dist: vantage6-common==5.0.0a36
 Provides-Extra: dev
 Requires-Dist: black; extra == 'dev'
 Requires-Dist: coverage==7.10.2; extra == 'dev'

{vantage6-5.0.0a34 → vantage6-5.0.0a36}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "vantage6"
-version = "5.0.0a34"
+version = "5.0.0a36"
 description = "vantage6 command line interface"
 readme = "README.md"
 license = {text = "MIT"}
@@ -29,8 +29,8 @@ dependencies = [
     "rich==13.5.2",
     "schema==0.7.5",
     "sqlalchemy==2.0.37",
-    "vantage6-common==5.0.0a34",
-    "vantage6-client==5.0.0a34",
+    "vantage6-common==5.0.0a36",
+    "vantage6-client==5.0.0a36",
 ]
 
 [project.optional-dependencies]
@@ -56,9 +56,10 @@ where = ["vantage6/cli"]
 "vantage6/cli/" = [
     "rabbimq/rabbitmq.config",
     "template/node_config.j2",
+    "template/node_config_nonk8s.j2",
     "template/server_config.j2",
-    "template/server_import_config.j2",
     "template/algo_store_config.j2",
+    "template/auth_config.j2",
     "dev/data/olympic_athletes_2016.csv",
     "dev/data/km_dataset.csv",
     "prometheus/prometheus.yml",

{vantage6-5.0.0a34 → vantage6-5.0.0a36}/tests_cli/test_node_cli.py

@@ -1,28 +1,27 @@
-import unittest
+import contextlib
 import logging
 import os
-import contextlib
-
-from unittest.mock import MagicMock, patch
-from pathlib import Path
+import unittest
 from io import BytesIO, StringIO
+from pathlib import Path
+from unittest.mock import MagicMock, patch
+
 from click.testing import CliRunner
-from docker.errors import APIError
 
-from vantage6.common.globals import Ports
-from vantage6.cli.globals import APPNAME
 from vantage6.common import STRING_ENCODING
+from vantage6.common.globals import Ports
+
 from vantage6.cli.common.utils import print_log_worker
+from vantage6.cli.globals import APPNAME
+from vantage6.cli.node.attach import cli_node_attach
+from vantage6.cli.node.common import create_client_and_authenticate
+from vantage6.cli.node.create_private_key import cli_node_create_private_key
+from vantage6.cli.node.files import cli_node_files
 from vantage6.cli.node.list import cli_node_list
 from vantage6.cli.node.new import cli_node_new_configuration
-from vantage6.cli.node.files import cli_node_files
-from vantage6.cli.node.start import cli_node_start
 from vantage6.cli.node.restart import cli_node_restart
+from vantage6.cli.node.start import cli_node_start
 from vantage6.cli.node.stop import cli_node_stop
-from vantage6.cli.node.attach import cli_node_attach
-from vantage6.cli.node.create_private_key import cli_node_create_private_key
-from vantage6.cli.node.clean import cli_node_clean
-from vantage6.cli.node.common import create_client_and_authenticate
 
 
 class NodeCLITest(unittest.TestCase):
@@ -302,25 +301,6 @@ class NodeCLITest(unittest.TestCase):
         runner.invoke(cli_node_attach)
         attach_logs.assert_called_once_with("app=node")
 
-    @patch("vantage6.cli.node.clean.q")
-    @patch("docker.DockerClient.volumes")
-    @patch("vantage6.cli.node.clean.check_docker_running", return_value=True)
-    def test_clean(self, check_docker, volumes, q):
-        """Clean Docker volumes without errors."""
-        volume1 = MagicMock()
-        volume1.name = "some-name-tmpvol"
-        volumes.list.return_value = [volume1]
-
-        question = MagicMock(name="pop-the-question")
-        question.ask.return_value = True
-        q.confirm.return_value = question
-
-        runner = CliRunner()
-        result = runner.invoke(cli_node_clean)
-
-        # check exit code
-        self.assertEqual(result.exit_code, 0)
-
     @patch("vantage6.cli.node.create_private_key.create_client_and_authenticate")
     @patch("vantage6.cli.node.common.NodeContext")
     @patch("vantage6.cli.node.create_private_key.NodeContext")
@@ -387,24 +367,6 @@ class NodeCLITest(unittest.TestCase):
 
         self.assertEqual(result.exit_code, 1)
 
-    @patch("vantage6.cli.node.clean.q")
-    @patch("docker.DockerClient.volumes")
-    @patch("vantage6.common.docker.addons.check_docker_running")
-    def test_clean_docker_error(self, check_docker, volumes, q):
-        volume1 = MagicMock()
-        volume1.name = "some-name-tmpvol"
-        volume1.remove.side_effect = APIError("Testing")
-        volumes.list.return_value = [volume1]
-        question = MagicMock(name="pop-the-question")
-        question.ask.return_value = True
-        q.confirm.return_value = question
-
-        runner = CliRunner()
-        result = runner.invoke(cli_node_clean)
-
-        # check exit code
-        self.assertEqual(result.exit_code, 1)
-
     def test_print_log_worker(self):
         stream = BytesIO("Hello!".encode(STRING_ENCODING))
         temp_stdout = StringIO()

{vantage6-5.0.0a34 → vantage6-5.0.0a36}/vantage6/cli/algorithm/generate_algorithm_json.py

@@ -276,23 +276,23 @@ class Function:
         else:
             type_ = param.annotation
 
-        if type_ == str:
+        if type_ is str:
             return AlgorithmArgumentType.STRING
-        elif type_ == dict:
+        elif type_ is dict:
             return AlgorithmArgumentType.JSON
-        elif type_ == int:
+        elif type_ is int:
             return AlgorithmArgumentType.INTEGER
-        elif type_ == float:
+        elif type_ is float:
             return AlgorithmArgumentType.FLOAT
-        elif type_ == bool:
+        elif type_ is bool:
             return AlgorithmArgumentType.BOOLEAN
-        elif type_ == list:
+        elif type_ is list:
             return AlgorithmArgumentType.STRINGS
-        elif type_ == list[str]:
+        elif type_ is list[str]:
             return AlgorithmArgumentType.STRINGS
-        elif type_ == list[int]:
+        elif type_ is list[int]:
             return AlgorithmArgumentType.INTEGERS
-        elif type_ == list[float]:
+        elif type_ is list[float]:
             return AlgorithmArgumentType.FLOATS
         else:
             warning(

{vantage6-5.0.0a34 → vantage6-5.0.0a36}/vantage6/cli/algostore/attach.py

@@ -1,6 +1,7 @@
 import click
 
 from vantage6.common import info
+
 from vantage6.cli.common.utils import attach_logs
 
 

{vantage6-5.0.0a34 → vantage6-5.0.0a36}/vantage6/cli/algostore/files.py

@@ -1,10 +1,11 @@
 import click
 
 from vantage6.common import info
-from vantage6.cli.context.server import ServerContext
-from vantage6.cli.common.decorator import click_insert_context
 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_=InstanceType.ALGORITHM_STORE)

{vantage6-5.0.0a34 → vantage6-5.0.0a36}/vantage6/cli/algostore/list.py

@@ -1,6 +1,5 @@
 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
@@ -11,6 +10,4 @@ def cli_algo_store_configuration_list() -> None:
     """
     Print the available server configurations.
     """
-    check_docker_running()
-
     get_server_configuration_list(InstanceType.ALGORITHM_STORE)

vantage6-5.0.0a36/vantage6/cli/algostore/new.py

@@ -0,0 +1,120 @@
+import click
+import questionary as q
+
+from vantage6.common.globals import (
+    DEFAULT_API_PATH,
+    InstanceType,
+    Ports,
+)
+
+from vantage6.cli.common.new import new
+from vantage6.cli.configuration_wizard import add_common_server_config
+from vantage6.cli.globals import DEFAULT_SERVER_SYSTEM_FOLDERS
+
+
+@click.command()
+@click.option(
+    "-n", "--name", default=None, help="Name of the configuration you want to use."
+)
+@click.option(
+    "--system",
+    "system_folders",
+    flag_value=True,
+    help="Use system folders instead of user folders. This is the default",
+)
+@click.option(
+    "--user",
+    "system_folders",
+    flag_value=False,
+    default=DEFAULT_SERVER_SYSTEM_FOLDERS,
+    help="Use user folders instead of system folders",
+)
+@click.option("--context", default=None, help="Kubernetes context to use")
+@click.option(
+    "--namespace",
+    default=None,
+    help="Kubernetes namespace to use",
+)
+def cli_algo_store_new(
+    name: str, system_folders: bool, namespace: str, context: str
+) -> None:
+    """
+    Create a new server configuration.
+    """
+
+    new(
+        questionnaire_function=algo_store_configuration_questionaire,
+        name=name,
+        system_folders=system_folders,
+        namespace=namespace,
+        context=context,
+        type_=InstanceType.ALGORITHM_STORE,
+    )
+
+
+def algo_store_configuration_questionaire(instance_name: str) -> dict:
+    """
+    Questionary to generate a config file for the algorithm store server
+    instance.
+
+    Parameters
+    ----------
+    instance_name : str
+        Name of the server instance.
+
+    Returns
+    -------
+    dict
+        Dictionary with the new server configuration
+    """
+    config = {"store": {}, "database": {}}
+
+    config, is_production = add_common_server_config(
+        config, InstanceType.ALGORITHM_STORE, instance_name
+    )
+    if not is_production:
+        config["store"]["dev"] = {
+            "host_uri": "host.docker.internal",
+            "disable_review": True,
+            "review_own_algorithm": True,
+        }
+
+    default_v6_server_uri = f"http://localhost:{Ports.DEV_SERVER}{DEFAULT_API_PATH}"
+    default_root_username = "admin"
+
+    v6_server_uri = q.text(
+        "What is the Vantage6 server linked to the algorithm store? "
+        "Provide the link to the server endpoint.",
+        default=default_v6_server_uri,
+    ).unsafe_ask()
+
+    root_username = q.text(
+        "What is the username of the root user?",
+        default=default_root_username,
+    ).unsafe_ask()
+
+    config["root_user"] = {
+        "v6_server_uri": v6_server_uri,
+        "username": root_username,
+    }
+
+    # ask about openness of the algorithm store
+    config["policies"] = {}
+    is_open = q.confirm(
+        "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,
+    ).unsafe_ask()
+    if is_open:
+        open_algos_policy = "public"
+    else:
+        is_open_to_whitelist = q.confirm(
+            "Do you want to allow all authenticated users to access "
+            "the algorithms in the store? If not allowing this, you will have to assign"
+            " the appropriate permissions to each user individually.",
+            default=True,
+        ).unsafe_ask()
+        open_algos_policy = "authenticated" if is_open_to_whitelist else "private"
+    config["policies"]["algorithm_view"] = open_algos_policy
+
+    return config

vantage6-5.0.0a36/vantage6/cli/algostore/remove.py

@@ -0,0 +1,36 @@
+import click
+
+from vantage6.common.globals import InstanceType
+
+from vantage6.cli.common.decorator import click_insert_context
+from vantage6.cli.common.remove import execute_remove
+from vantage6.cli.context import AlgorithmStoreContext
+from vantage6.cli.globals import InfraComponentName
+
+
+@click.command()
+@click_insert_context(
+    type_=InstanceType.ALGORITHM_STORE, include_name=True, include_system_folders=True
+)
+@click.option("-f", "--force", "force", flag_value=True)
+def cli_algo_store_remove(
+    ctx: AlgorithmStoreContext, name: str, system_folders: bool, force: bool
+) -> None:
+    """
+    Function to remove an algorithm store.
+
+    Parameters
+    ----------
+    ctx : AlgorithmStoreContext
+        Algorithm store context object
+    force : bool
+        Whether to ask for confirmation before removing or not
+    """
+    execute_remove(
+        ctx,
+        InstanceType.ALGORITHM_STORE,
+        InfraComponentName.ALGORITHM_STORE,
+        name,
+        system_folders,
+        force,
+    )

{vantage6-5.0.0a34 → vantage6-5.0.0a36}/vantage6/cli/algostore/start.py

@@ -9,12 +9,12 @@ from vantage6.common.globals import (
 from vantage6.cli.common.decorator import click_insert_context
 from vantage6.cli.common.start import (
     helm_install,
+    prestart_checks,
     start_port_forward,
 )
 from vantage6.cli.common.utils import (
     attach_logs,
     create_directory_if_not_exists,
-    select_context_and_namespace,
 )
 from vantage6.cli.context.algorithm_store import AlgorithmStoreContext
 from vantage6.cli.globals import ChartName
@@ -30,9 +30,13 @@ from vantage6.cli.globals import ChartName
     default=False,
     help="Print server logs to the console after start",
 )
-@click_insert_context(InstanceType.ALGORITHM_STORE)
+@click_insert_context(
+    InstanceType.ALGORITHM_STORE, include_name=True, include_system_folders=True
+)
 def cli_algo_store_start(
     ctx: AlgorithmStoreContext,
+    name: str,
+    system_folders: bool,
     context: str,
     namespace: str,
     ip: str,
@@ -43,9 +47,9 @@ def cli_algo_store_start(
     Start the algorithm store.
     """
     info("Starting algorithm store...")
-    context, namespace = select_context_and_namespace(
-        context=context,
-        namespace=namespace,
+
+    prestart_checks(
+        ctx, InstanceType.ALGORITHM_STORE, name, system_folders, context, namespace
     )
 
     create_directory_if_not_exists(ctx.log_dir)
@@ -58,10 +62,9 @@ def cli_algo_store_start(
         namespace=namespace,
     )
 
-    # port forward for server
     info("Port forwarding for algorithm store")
     start_port_forward(
-        service_name=f"{ctx.helm_release_name}-vantage6-algorithm-store-service",
+        service_name=f"{ctx.helm_release_name}-store-service",
         service_port=ctx.config["store"].get("port", Ports.DEV_ALGO_STORE.value),
         port=port or ctx.config["store"].get("port", Ports.DEV_ALGO_STORE.value),
         ip=ip,

vantage6-5.0.0a36/vantage6/cli/algostore/stop.py

@@ -0,0 +1,58 @@
+import click
+
+from vantage6.common import info
+from vantage6.common.globals import InstanceType
+
+from vantage6.cli.common.stop import execute_stop, helm_uninstall, stop_port_forward
+from vantage6.cli.globals import DEFAULT_SERVER_SYSTEM_FOLDERS, InfraComponentName
+
+
+@click.command()
+@click.option("-n", "--name", default=None, help="Configuration name")
+@click.option("--context", default=None, help="Kubernetes context to use")
+@click.option("--namespace", default=None, help="Kubernetes namespace to use")
+@click.option(
+    "--system",
+    "system_folders",
+    flag_value=True,
+    default=DEFAULT_SERVER_SYSTEM_FOLDERS,
+    help="Search for configuration in system folders instead of user folders. "
+    "This is the default.",
+)
+@click.option(
+    "--user",
+    "system_folders",
+    flag_value=False,
+    help="Search for configuration in the user folders instead of system folders.",
+)
+@click.option("--all", "all_stores", flag_value=True, help="Stop all algorithm stores")
+def cli_algo_store_stop(
+    name: str,
+    context: str,
+    namespace: str,
+    system_folders: bool,
+    all_stores: bool,
+):
+    """
+    Stop one or all running algorithm store(s).
+    """
+    execute_stop(
+        stop_function=_stop_store,
+        instance_type=InstanceType.ALGORITHM_STORE,
+        infra_component=InfraComponentName.ALGORITHM_STORE,
+        stop_all=all_stores,
+        to_stop=name,
+        namespace=namespace,
+        context=context,
+        system_folders=system_folders,
+    )
+
+
+def _stop_store(store_name: str, namespace: str, context: str) -> None:
+    info(f"Stopping store {store_name}...")
+
+    helm_uninstall(release_name=store_name, context=context, namespace=namespace)
+
+    stop_port_forward(service_name=f"{store_name}-store-service")
+
+    info(f"Store {store_name} stopped successfully.")

vantage6-5.0.0a36/vantage6/cli/auth/attach.py

@@ -0,0 +1,60 @@
+import click
+
+from vantage6.common import error, info
+from vantage6.common.globals import InstanceType
+
+from vantage6.cli.common.utils import (
+    attach_logs,
+    find_running_service_names,
+    select_context_and_namespace,
+    select_running_service,
+)
+
+
+@click.command()
+@click.option("--context", default=None, help="Kubernetes context to use")
+@click.option("--namespace", default=None, help="Kubernetes namespace to use")
+@click.option(
+    "-n", "--name", default=None, help="Name of the auth service to attach to"
+)
+def cli_auth_attach(context: str, namespace: str, name: str) -> None:
+    """
+    Show the server logs in the current console.
+    """
+    info("Attaching to auth logs...")
+
+    context, namespace = select_context_and_namespace(
+        context=context,
+        namespace=namespace,
+    )
+
+    running_services = find_running_service_names(
+        instance_type=InstanceType.AUTH,
+        only_system_folders=False,
+        only_user_folders=False,
+        context=context,
+        namespace=namespace,
+    )
+
+    if not running_services:
+        error("No running auth services found.")
+        return
+
+    if name:
+        # search for a running auth service started up either in user or system folders
+        svc_name_options = [
+            f"vantage6-{name}-user-auth",
+            f"vantage6-{name}-system-auth",
+        ]
+        helm_name = next(
+            (svc for svc in svc_name_options if svc in running_services), None
+        )
+        if not helm_name:
+            error(f"No running auth service found for {name}.")
+            return
+    else:
+        helm_name = select_running_service(running_services, InstanceType.AUTH)
+
+    attach_logs(
+        f"app.kubernetes.io/instance={helm_name}",
+    )

vantage6-5.0.0a36/vantage6/cli/auth/files.py

@@ -0,0 +1,16 @@
+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.context.auth import AuthContext
+
+
+@click.command()
+@click_insert_context(type_=InstanceType.AUTH)
+def cli_auth_files(ctx: AuthContext) -> None:
+    """
+    List files that belong to a particular auth instance.
+    """
+    info(f"Configuration file = {ctx.config_file}")

vantage6-5.0.0a36/vantage6/cli/auth/list.py

@@ -0,0 +1,13 @@
+import click
+
+from vantage6.common.globals import InstanceType
+
+from vantage6.cli.common.utils import get_server_configuration_list
+
+
+@click.command()
+def cli_auth_configuration_list() -> None:
+    """
+    Print the available auth configurations.
+    """
+    get_server_configuration_list(InstanceType.AUTH)

vantage6-5.0.0a36/vantage6/cli/auth/new.py

@@ -0,0 +1,80 @@
+from typing import Any
+
+import click
+import questionary as q
+
+from vantage6.common.globals import (
+    InstanceType,
+)
+
+from vantage6.cli.common.new import new
+from vantage6.cli.globals import DEFAULT_SERVER_SYSTEM_FOLDERS
+
+
+@click.command()
+@click.option(
+    "-n", "--name", default=None, help="name of the configuration you want to use."
+)
+@click.option(
+    "--system",
+    "system_folders",
+    flag_value=True,
+    help="Use system folders instead of user folders. This is the default",
+)
+@click.option(
+    "--user",
+    "system_folders",
+    flag_value=False,
+    default=DEFAULT_SERVER_SYSTEM_FOLDERS,
+    help="Use user folders instead of system folders",
+)
+@click.option("--context", default=None, help="Kubernetes context to use")
+@click.option(
+    "--namespace",
+    default=None,
+    help="Kubernetes namespace to use",
+)
+def cli_auth_new(
+    name: str,
+    system_folders: bool,
+    namespace: str,
+    context: str,
+) -> None:
+    """
+    Create a new server configuration.
+    """
+    new(
+        questionnaire_function=auth_configuration_questionaire,
+        name=name,
+        system_folders=system_folders,
+        namespace=namespace,
+        context=context,
+        type_=InstanceType.AUTH,
+    )
+
+
+def auth_configuration_questionaire(instance_name: str) -> dict[str, Any]:
+    """
+    Kubernetes-specific questionnaire to generate Helm values for the Keycloak helm
+    chart.
+    """
+    config = {"keycloak": {}}
+
+    is_production = q.confirm(
+        "Do you want to use production settings? If not, the service will be configured"
+        " to be more suitable for development or testing purposes.",
+        default=True,
+    ).unsafe_ask()
+
+    config["keycloak"]["production"] = is_production
+
+    if is_production:
+        ui_url = q.text(
+            "Please provide the URL of the UI. This is the URL that users will use to "
+            "log in to the service.",
+            default="https://ui.vantage6.ai",
+        ).unsafe_ask()
+        # add http://localhost:7681 as that is used by the Python client
+        config["keycloak"]["redirectUris"] = [ui_url, "http://localhost:7681"]
+
+    return config

vantage6-5.0.0a36/vantage6/cli/auth/remove.py

@@ -0,0 +1,31 @@
+import click
+
+from vantage6.common.globals import InstanceType
+
+from vantage6.cli.common.decorator import click_insert_context
+from vantage6.cli.common.remove import execute_remove
+from vantage6.cli.context.auth import AuthContext
+from vantage6.cli.globals import InfraComponentName
+
+
+@click.command()
+@click_insert_context(
+    type_=InstanceType.AUTH, include_name=True, include_system_folders=True
+)
+@click.option("-f", "--force", "force", flag_value=True)
+def cli_auth_remove(
+    ctx: AuthContext, name: str, system_folders: bool, force: bool
+) -> None:
+    """
+    Function to remove a server.
+
+    Parameters
+    ----------
+    ctx : ServerContext
+        Server context object
+    force : bool
+        Whether to ask for confirmation before removing or not
+    """
+    execute_remove(
+        ctx, InstanceType.AUTH, InfraComponentName.AUTH, name, system_folders, force
+    )