vantage6 5.0.0a38__py3-none-any.whl → 5.0.0a40__py3-none-any.whl

vantage6/cli/algorithm/generate_algorithm_json.py

@@ -3,6 +3,7 @@ import inspect
 import json
 import os
 import sys
+from collections.abc import Callable
 from inspect import getmembers, isfunction, ismodule, signature
 from pathlib import Path
 from types import ModuleType, UnionType
@@ -62,7 +63,7 @@ class FunctionArgumentType(StrEnumBase):
 class Function:
     """Class to handle a function and its JSON representation"""
 
-    def __init__(self, func: callable):
+    def __init__(self, func: Callable):
         self.func = func
         self.name = func.__name__
         self.signature = signature(func)

vantage6/cli/common/decorator.py

@@ -1,3 +1,4 @@
+from collections.abc import Callable
 from functools import wraps
 from pathlib import Path
 
@@ -17,7 +18,7 @@ def click_insert_context(
     include_system_folders: bool = False,
     is_sandbox: bool = False,
     sandbox_param: str | None = None,
-) -> callable:
+) -> Callable:
     """
     Supply the Click function with an additional context parameter. The context
     is passed to the function as the first argument.
@@ -49,7 +50,7 @@ def click_insert_context(
     >>>     pass
     """
 
-    def protection_decorator(func: callable) -> callable:
+    def protection_decorator(func: Callable) -> Callable:
         @click.option("-n", "--name", default=None, help="Name of the configuration.")
         @click.option(
             "-c",
@@ -73,7 +74,7 @@ def click_insert_context(
         @wraps(func)
         def decorator(
             name: str, config: str, system_folders: bool, *args, **kwargs
-        ) -> callable:
+        ) -> Callable:
             """
             Decorator function that adds the context to the function.
 

vantage6/cli/common/new.py

@@ -1,3 +1,4 @@
+from collections.abc import Callable
 from pathlib import Path
 
 from colorama import Fore, Style
@@ -13,7 +14,7 @@ from vantage6.cli.utils import check_config_name_allowed, prompt_config_name
 
 
 def new(
-    config_producing_func: callable,
+    config_producing_func: Callable,
     config_producing_func_args: tuple,
     name: str,
     system_folders: bool,
@@ -27,7 +28,7 @@ def new(
 
     Parameters
     ----------
-    config_producing_func : callable
+    config_producing_func : Callable
         Function to generate the configuration
     config_producing_func_args : tuple
         Arguments to pass to the config producing function

vantage6/cli/common/stop.py

@@ -1,6 +1,7 @@
 from __future__ import annotations
 
 import subprocess
+from collections.abc import Callable
 
 from colorama import Fore, Style
 
@@ -19,7 +20,7 @@ from vantage6.cli.utils import validate_input_cmd_args
 
 
 def execute_stop(
-    stop_function: callable,
+    stop_function: Callable,
     instance_type: InstanceType,
     infra_component: InfraComponentName,
     stop_all: bool,
@@ -35,7 +36,7 @@ def execute_stop(
 
     Parameters
     ----------
-    stop_function : callable
+    stop_function : Callable
         The function to stop the service.
     instance_type : InstanceType
         The instance type of the service.

vantage6/cli/configuration_create.py

@@ -1,3 +1,4 @@
+from collections.abc import Callable
 from pathlib import Path
 
 import questionary as q
@@ -127,7 +128,7 @@ def _add_production_server_config(config: dict) -> dict:
 
 
 def make_configuration(
-    config_producing_func: callable,
+    config_producing_func: Callable,
     config_producing_func_args: tuple,
     type_: InstanceType,
     instance_name: str,
@@ -139,7 +140,7 @@ def make_configuration(
 
     Parameters
     ----------
-    config_producing_func : callable
+    config_producing_func : Callable
         Function to generate the configuration
     config_producing_func_args : tuple
         Arguments to pass to the config producing function

vantage6/cli/node/common/__init__.py

@@ -12,6 +12,7 @@ from vantage6.common.globals import (
     APPNAME,
     HTTP_LOCALHOST,
     InstanceType,
+    Ports,
     RequiredNodeEnvVars,
 )
 
@@ -21,6 +22,16 @@ from vantage6.cli.configuration_create import select_configuration_questionnaire
 from vantage6.cli.context.node import NodeContext
 
 
+def _convert_k8s_url_to_localhost(url: str) -> str:
+    """
+    Convert a Kubernetes URL to a localhost URL.
+    """
+    if "svc.cluster.local" in url:
+        port_and_api_path = url.split(":")[-1]
+        return f"{HTTP_LOCALHOST}:{port_and_api_path}"
+    return url
+
+
 def create_client(ctx: NodeContext) -> UserClient:
     """
     Create a client instance.
@@ -34,17 +45,31 @@ def create_client(ctx: NodeContext) -> UserClient:
     UserClient
         vantage6 client
     """
-    host = ctx.config["server_url"]
+    host = ctx.config["node"]["server"]["url"]
+    port = ctx.config["node"]["server"]["port"]
+    api_path = ctx.config["node"]["server"]["path"]
     # if the server is run locally, we need to use localhost here instead of
     # the host address of docker
     if host in ["http://host.docker.internal", "http://172.17.0.1"]:
         host = HTTP_LOCALHOST
-    port = ctx.config["port"]
-    api_path = ctx.config["api_path"]
-    info(f"Connecting to server at '{host}:{port}{api_path}'")
+
+    url = f"{host}:{port}{api_path}"
+
+    auth_url = ctx.config.get("node", {}).get("keycloakUrl", None) or os.environ.get(
+        RequiredNodeEnvVars.KEYCLOAK_URL.value
+    )
+    # append the port to the auth URL as it is not included in the config
+    auth_url = f"{auth_url}:{Ports.DEV_AUTH.value}"
+
+    # if the server is a Kubernetes address, we need to use localhost because here
+    # we are connecting from the CLI outside the cluster
+    url = _convert_k8s_url_to_localhost(url)
+    auth_url = _convert_k8s_url_to_localhost(auth_url)
+
+    info(f"Connecting to server at '{url}' using auth URL '{auth_url}'")
     return UserClient(
-        server_url=f"{host}:{port}{api_path}",
-        auth_url=os.environ.get(RequiredNodeEnvVars.KEYCLOAK_URL.value),
+        server_url=url,
+        auth_url=auth_url,
         log_level="warn",
     )
 

vantage6/cli/node/create_private_key.py

@@ -11,10 +11,12 @@ from vantage6.common import (
     warning,
 )
 from vantage6.common.encryption import RSACryptor
+from vantage6.common.globals import InstanceType
 
+from vantage6.cli.configuration_create import select_configuration_questionnaire
 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 create_client_and_authenticate, select_node
+from vantage6.cli.node.common import create_client_and_authenticate
 
 
 @click.command()
@@ -80,12 +82,13 @@ def cli_node_create_private_key(
     if config:
         name = Path(config).stem
         ctx = NodeContext(name, system_folders, config)
-    else:
-        # retrieve context
-        name = select_node(name, system_folders)
-
-        # Create node context
-        ctx = NodeContext(name, system_folders)
+    elif not name:
+        try:
+            name = select_configuration_questionnaire(InstanceType.NODE, system_folders)
+        except Exception:
+            error("No configurations could be found!")
+            exit(1)
+    ctx = NodeContext(name, system_folders)
 
     # Authenticate with the server to obtain organization name if it wasn't
     # provided
@@ -138,9 +141,7 @@ def cli_node_create_private_key(
 
     # update config file
     info("Updating configuration")
-    # TODO v5+ this probably messes up the current config as the template is used...
-    # Fix when reimplementing this in v5
-    ctx.config["encryption"]["private_key"] = str(file_)
+    ctx.config["node"]["encryption"]["private_key"] = str(file_)
     ctx.config_manager.put(ctx.config)
     ctx.config_manager.save(ctx.config_file)
 

vantage6/cli/node/set_api_key.py

@@ -2,11 +2,14 @@ import click
 import questionary as q
 
 from vantage6.common import ensure_config_dir_writable, error, info
+from vantage6.common.globals import InstanceType
 
-from vantage6.cli.configuration_create import NodeConfigurationManager
+from vantage6.cli.configuration_create import (
+    NodeConfigurationManager,
+    select_configuration_questionnaire,
+)
 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
 
 
 @click.command()
@@ -31,7 +34,12 @@ def cli_node_set_api_key(name: str, api_key: str, system_folders: bool) -> None:
     Put a new API key into the node configuration file
     """
     # select node name
-    name = select_node(name, system_folders)
+    if not name:
+        try:
+            name = select_configuration_questionnaire(InstanceType.NODE, system_folders)
+        except Exception:
+            error("No configurations could be found!")
+            exit(1)
 
     # Check that we can write in the config folder
     if not ensure_config_dir_writable(system_folders):
@@ -50,9 +58,7 @@ def cli_node_set_api_key(name: str, api_key: str, system_folders: bool) -> None:
     conf_mgr = NodeConfigurationManager.from_file(ctx.config_file)
 
     # set new api key, and save the file
-    ctx.config["api_key"] = api_key
-    # TODO v5+ this probably messes up the current config as the template is used...
-    # Fix when reimplementing this in v5
+    ctx.config["node"]["apiKey"] = api_key
     conf_mgr.put(ctx.config)
     conf_mgr.save(ctx.config_file)
     info(f"Your new API key has been uploaded to the config file {ctx.config_file}.")

vantage6/cli/server/import_.py

@@ -1,6 +1,7 @@
 import click
 import requests
 import yaml
+from marshmallow import Schema, ValidationError, fields, post_load
 
 from vantage6.common import error, info
 from vantage6.common.globals import (
@@ -64,7 +65,8 @@ def cli_server_import(ctx: ServerContext, file: str, drop_all: bool) -> None:
     info("Loading and validating import file")
     with open(file, "r") as f:
         import_data = yaml.safe_load(f)
-    # TODO: validate import file
+
+    _check_import_file(import_data)
 
     client = UserClient(
         server_url=f"{ctx.config['server']['baseUrl']}{ctx.config['server']['apiPath']}",
@@ -77,7 +79,9 @@ def cli_server_import(ctx: ServerContext, file: str, drop_all: bool) -> None:
     info("Authenticate using admin credentials (opens browser for login)")
     client.authenticate()
 
-    # TODO: validate that the user has the correct permissions to import data
+    # Note: we do not validate that the user has the correct permissions to import data.
+    # As the user has access to the `v6 server import` command, they already have
+    # access to the server+database.
 
     if drop_all:
         info("Dropping all existing data")
@@ -91,11 +95,12 @@ def cli_server_import(ctx: ServerContext, file: str, drop_all: bool) -> None:
     for organization in import_data["organizations"]:
         org = client.organization.create(
             name=organization["name"],
-            address1=organization["address1"] or "",
-            address2=organization["address2"] or "",
-            zipcode=organization["zipcode"] or "",
-            country=organization["country"] or "",
-            domain=organization["domain"] or "",
+            address1=organization.get("address1", ""),
+            address2=organization.get("address2", ""),
+            zipcode=str(organization.get("zipcode", "")),
+            country=organization.get("country", ""),
+            domain=organization.get("domain", ""),
+            public_key=organization.get("public_key", ""),
         )
         organizations.append(org)
 
@@ -152,16 +157,79 @@ def _drop_all(client: UserClient) -> None:
             info(f"Deleting collaboration {collaboration['name']}")
             client.collaboration.delete(collaboration["id"], delete_dependents=True)
 
-    # TODO: For some reason, the `delete_dependents` parameter is not working for users,
-    # so we delete them here first.
-    while users := [u for u in client.user.list()["data"] if u["username"] != "admin"]:
-        for user in users:
-            info(f"Deleting user {user['username']}")
-            client.user.delete(user["id"])
-
-    while orgs := [
-        o for o in client.organization.list()["data"] if o["name"] != "root"
-    ]:
+    # remove all organizations but keep the root organization
+    while orgs := [o for o in client.organization.list()["data"] if o["id"] != 1]:
         for org in orgs:
             info(f"Deleting organization {org['name']}")
             client.organization.delete(org["id"], delete_dependents=True)
+
+
+class StrOrInt(fields.Field):
+    """Field that can be a string or an integer"""
+
+    def _serialize(self, value, attr, obj, **kwargs):
+        if isinstance(value, str):
+            return value
+        elif isinstance(value, int):
+            return str(value)
+        else:
+            raise ValidationError("Value must be a string or an integer")
+
+
+class UserSchema(Schema):
+    username = fields.Str(required=True)
+    password = fields.Str(required=True)
+
+
+class OrganizationSchema(Schema):
+    name = fields.Str(required=True)
+    address1 = fields.Str(missing="")
+    address2 = fields.Str(missing="")
+    zipcode = StrOrInt(missing="")
+    country = fields.Str(missing="")
+    domain = fields.Str(missing="")
+    public_key = fields.Str(missing="")
+    users = fields.List(fields.Nested(UserSchema), missing=[])
+
+
+class ParticipantSchema(Schema):
+    name = fields.Str(required=True)
+
+
+class CollaborationSchema(Schema):
+    name = fields.Str(required=True)
+    participants = fields.List(fields.Nested(ParticipantSchema), required=True)
+    encrypted = fields.Bool(missing=False)
+
+
+class ImportDataSchema(Schema):
+    organizations = fields.List(fields.Nested(OrganizationSchema), missing=[])
+    collaborations = fields.List(fields.Nested(CollaborationSchema), missing=[])
+
+    @post_load
+    def validate_participants_exist(self, data, **kwargs):
+        """Validate that all participants exist in organizations"""
+        org_names = {org["name"] for org in data.get("organizations", [])}
+
+        for collaboration in data.get("collaborations", []):
+            for participant in collaboration.get("participants", []):
+                if participant["name"] not in org_names:
+                    raise ValidationError(
+                        f"Participant {participant['name']} not found in organizations",
+                        field_name="collaborations",
+                    )
+        return data
+
+
+def _check_import_file(import_data: dict) -> dict:
+    """
+    Validate import file using Marshmallow schemas.
+    Returns the validated and cleaned data.
+    """
+    schema = ImportDataSchema()
+    try:
+        return schema.load(import_data)
+    except ValidationError as err:
+        # Handle validation errors gracefully
+        error(f"Validation error: {err.messages}")
+        exit(1)

vantage6/cli/template/node_config.j2

@@ -90,7 +90,7 @@ node:
     enabled: {{ node.encryption.enabled | default(false) }}
 
     # Location to the private key file. Required if encryption is enabled.
-    {% if node.encryption.enabled | default(false) %}
+    {% if node.encryption.private_key is defined and node.encryption.private_key != '' %}
     private_key: {{ node.encryption.private_key | default('/path/to/private_key.pem') }}
     {% else %}
     # private_key: /path/to/private_key.pem

{vantage6-5.0.0a38.dist-info → vantage6-5.0.0a40.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: vantage6
-Version: 5.0.0a38
+Version: 5.0.0a40
 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==2.1.1
 Requires-Dist: rich==13.5.2
 Requires-Dist: schema==0.7.5
 Requires-Dist: sqlalchemy==2.0.37
-Requires-Dist: vantage6-client==5.0.0a38
-Requires-Dist: vantage6-common==5.0.0a38
+Requires-Dist: vantage6-client==5.0.0a40
+Requires-Dist: vantage6-common==5.0.0a40
 Provides-Extra: dev
 Requires-Dist: black; extra == 'dev'
 Requires-Dist: coverage==7.10.2; extra == 'dev'

{vantage6-5.0.0a38.dist-info → vantage6-5.0.0a40.dist-info}/RECORD

@@ -1,13 +1,13 @@
 vantage6/cli/__init__.py,sha256=8KIgMPbZTNdkYlUrB8irpsUA7KdkFdLbNbMKixOP2dE,277
 vantage6/cli/cli.py,sha256=uEazjKFMpVWP3rQ0FtHNcOg70qYTymoqPqc8dF5saKg,8591
 vantage6/cli/config.py,sha256=vaHNrgJTaAeYLpxfsXOHkYmsI1gLSipkKzyEOPXF1w4,8258
-vantage6/cli/configuration_create.py,sha256=IehzaaLQtovlT9MnEjAQpEdXQNeFXwa1FvmPFmX0lLE,7317
+vantage6/cli/configuration_create.py,sha256=Q8qnfDZ7gVEPgIqZJNJl4nEqc13ZVJh9K3U-O4XRk_Y,7354
 vantage6/cli/configuration_manager.py,sha256=zsk6dkdUA9zggUeFSkzXrNZ_XkxmQf26_oZsmLYYsu8,8096
 vantage6/cli/globals.py,sha256=VBa49tjuy9KjeF1eKtZre5QSohnWvlI1hsHeDZNMblA,2738
 vantage6/cli/utils.py,sha256=kq1Nv8SJPG5STII9DAcTSR4yCsZcoOvM8rygA5cWa28,5199
 vantage6/cli/utils_kubernetes.py,sha256=zMdarsuWeeZdrDBTczIjC920HadM_5BcOnhOFXBHk0Q,8200
 vantage6/cli/algorithm/create.py,sha256=kRT1BlBcb0fDaB2Q988WxtA6EyAZmOW5QoU2uhbwBIo,2075
-vantage6/cli/algorithm/generate_algorithm_json.py,sha256=WbSetOXr8XWh-tfvuQtIPeU0jZGQyAJEoAHH7NR9eQ4,19488
+vantage6/cli/algorithm/generate_algorithm_json.py,sha256=p22wKt3y3J6G8ZQZ7qy5aNe7KppXdY7au9MKsnRWwwU,19525
 vantage6/cli/algorithm/update.py,sha256=oReCQaOQHfZe-o-zTLD2RyjzhwAaXRQkFHyZZ-JUb4s,1338
 vantage6/cli/algostore/attach.py,sha256=GoB1pGLDndKGmzNt5jJCck3yH_cnXkNuPKxDNJ_MZz8,1299
 vantage6/cli/algostore/files.py,sha256=oqjdGeoyUdCGfoSLbQA6r7GZtJtzSbXMyvojQ80xVCE,581
@@ -25,12 +25,12 @@ vantage6/cli/auth/remove.py,sha256=664X1gl77RrHpzJo1xYiAmZMw4K6muqhtytYk50iiWs,3
 vantage6/cli/auth/start.py,sha256=cH5bYvectyliobd6ybpGYf9wI7FyML5-5HS3jsjIyu8,2805
 vantage6/cli/auth/stop.py,sha256=oWy7jDZ45zEyqSzwJr5-T14vp01D1TTcTYWxjXNtJ_U,1882
 vantage6/cli/common/attach.py,sha256=bw9-Q1JjKa_f8Q7-xI5lpI2WoUmlGKZSvULlGoSmnH8,3423
-vantage6/cli/common/decorator.py,sha256=7eyCbCk572__g0SfQl5Z9Uo1b0sSknFY7kn6UBYkSgg,4656
+vantage6/cli/common/decorator.py,sha256=N08qVbEokkV-XYLwEgEYRzjvgauiUdhIygBQqxR-XoM,4693
 vantage6/cli/common/list.py,sha256=j2q6B4k7wX5UMJ0gkuMrkYPl5I3NmkVuV6eV70hM36I,2075
-vantage6/cli/common/new.py,sha256=10I_8NRIMjJJw9SaEBIC0Xz7w0NWSeQ4yqLntFjYpR0,3241
+vantage6/cli/common/new.py,sha256=_srwNExvphy2SImbeFhGxuSsarkztPxxYXMwGMBy7g8,3278
 vantage6/cli/common/remove.py,sha256=q8YOihk5aClvPuw2cADulHrxeXv_0JhqpaNUVH1zhlQ,2206
 vantage6/cli/common/start.py,sha256=kMDjL_sObSkx4TqhnukyD9Jb7vOGXJ9Bo0pJBcxpbsg,10095
-vantage6/cli/common/stop.py,sha256=7SB70N4Qwk5AQUz9LYtNF1D04oWRbVBrF7qzuZviSHY,5577
+vantage6/cli/common/stop.py,sha256=qIJ1COJWvQlbIpyMqh6ao2WKuXDqPBbU7-wF7IuOgQc,5614
 vantage6/cli/common/utils.py,sha256=-XP-JslNpnveR37v4vwiCgdj4kXOMlluoPJRmNECtFk,11473
 vantage6/cli/common/version.py,sha256=2XPeZm5NMYSqTGjHLUFcRFZZRhtDVLwytQjoDad3utU,2489
 vantage6/cli/context/__init__.py,sha256=umHNotzJjd2TQCela7V8MTUwN4iAKDy8AR4s7ask5Ic,3135
@@ -45,17 +45,17 @@ vantage6/cli/dev/rebuild.py,sha256=3iMIqAxiwdZkx4Q0xQyqcWHvXUzOQT-9cyRuOiulwR8,1
 vantage6/cli/dev/start.py,sha256=DzFtD_jQaVIIawfPdMwBLjY1E_YOokiWm27oanci8k4,1000
 vantage6/cli/dev/stop.py,sha256=-yrLCadDfeLES9pFJz9yxm33XtzEXpdqvHvwakLQNEE,663
 vantage6/cli/node/attach.py,sha256=xOTB_79pShvn6B4Ky1bZ3TI_F3gOkGS9huzbEE0DRYc,1217
-vantage6/cli/node/create_private_key.py,sha256=gmgI9Gtcx3z0esxyLw-96HcrfmAJFOjjXbVvA9ZGN3g,5129
+vantage6/cli/node/create_private_key.py,sha256=UTsoJ04OCVjubC8b7AZhxrLzdwG-wQ_63ROw5uruxqs,5229
 vantage6/cli/node/files.py,sha256=y7WOGHCTE3DnmxgbweLcu51t0YLS9Jvl24zgCHKkQTQ,1003
 vantage6/cli/node/list.py,sha256=cydU5tByy0bHWCApcaZ8Pl_2SEbiqkK-mjVhWeChiCc,361
 vantage6/cli/node/new.py,sha256=XEVsnkI1UBngWwE96-KIOcs4zdPCuq3coTGHPNQxepQ,12717
 vantage6/cli/node/remove.py,sha256=alInSH_3E-yJthQ8JrGaopvAZ7GgxuRBppnpC8BRTBU,1061
 vantage6/cli/node/restart.py,sha256=hJWzyJjetfNe8YYkOt5ZEUE_t-LpvQOwUGcQH0pXfNQ,3122
-vantage6/cli/node/set_api_key.py,sha256=Ou7VnyHpqNqmy0O53ogG7VX_-jWsN3hWR2_GIiYJVo0,1998
+vantage6/cli/node/set_api_key.py,sha256=eLB-NVpvXROlGKPAMua6vBAs5l08-AkENWiTfOB82FM,2103
 vantage6/cli/node/start.py,sha256=dn9wlDzq-XCV4ruMSTt0Nt01TOuJKZbXt3WJ3PPqZQY,4691
 vantage6/cli/node/stop.py,sha256=9936hGZu8EuYFF2NZ2of8U33jc8hKRLc4bXFu1ImuLw,6814
 vantage6/cli/node/version.py,sha256=vuQlq2SFWxHsA2_hqXtYK8c06mS2KqPCPU48F7-XXFU,4001
-vantage6/cli/node/common/__init__.py,sha256=M7xJb_AL8vXgpTI_ZojgsVO1i8BovmZMJrF3NOq1PZ8,3165
+vantage6/cli/node/common/__init__.py,sha256=B05W_dhjzhbk056xgxoGDDWlOM0YYGM6ZMslalR-nyw,3977
 vantage6/cli/node/common/task_cleanup.py,sha256=bNa72P_gmGeQ3Z-Vl6Q7tKG8-deSAqk_02gvG--eHIY,4515
 vantage6/cli/prometheus/monitoring_manager.py,sha256=I4iR_2i6EgLMR2dM2e4bOVbTyGN4jPPRDPKHd8_CbRk,4908
 vantage6/cli/prometheus/prometheus.yml,sha256=Q4i9lVknITBodHUMgarRnEsXfXTNuSdI6a-9pW4YCoI,98
@@ -75,7 +75,7 @@ vantage6/cli/sandbox/populate/helpers/load_fixtures.py,sha256=PQpEo0Q5PyWwYDaenA
 vantage6/cli/sandbox/populate/helpers/utils.py,sha256=5LSGZ-h7QtMB51IDzawXPIQFF7i2CIm6oYzEsdVKG4Y,1213
 vantage6/cli/server/attach.py,sha256=FrSdpRLJeRKWt0VBifj8oPKZsLNDaKJaI2Hy0D2m3kY,1282
 vantage6/cli/server/files.py,sha256=MsnLaY91F2m49mm_FpVboFrSsZiEsu175KioN1alZfk,568
-vantage6/cli/server/import_.py,sha256=nCnODyuMoDXxpKakCJnasGRdPcxL6gJJorGoZTWEEas,5984
+vantage6/cli/server/import_.py,sha256=m7yjhXhGvL3dJ-8pEN0NMrE3CjMTcf0A0hEhJ5kTBIk,8276
 vantage6/cli/server/list.py,sha256=m-g1k8pmScK_CdhKiVFrLIUZsPnPsHr5CrfHmmI6KJk,299
 vantage6/cli/server/new.py,sha256=6KF07KMmdSQTSbXCxfAztVFb2M10uQdQjLmzCXnnfUo,3802
 vantage6/cli/server/remove.py,sha256=dwylIP5uEUPTRP9bd6_7rWhyUoCJuYoe1Kon9WUV4tY,891
@@ -85,7 +85,7 @@ vantage6/cli/server/version.py,sha256=iVYem8Gye4dCChC70s_FTqiWi1AF4VQfvhebnh0jur
 vantage6/cli/server/common/__init__.py,sha256=Frh_4V8ssoGy8rO3o7mRnlKkpOlNSjA5J6eReN1Yluo,1386
 vantage6/cli/template/algo_store_config.j2,sha256=dlKiUzZ-zYGdFCBArMMRpXvoQFG7rYz4vmv6rCwp6fM,7470
 vantage6/cli/template/auth_config.j2,sha256=mFNL7H3plnqN7kpptk2WPXPsnuGddCP_ktbzBZHi5ic,10866
-vantage6/cli/template/node_config.j2,sha256=DvqZ5KnMZXJkyu4v25N6po3ieEURpteGZtl6Pj2gjYo,13927
+vantage6/cli/template/node_config.j2,sha256=ZHx-PvjldyKLcE3e8V1K0k5LkDUaS1uZunvbQWfgA2E,13963
 vantage6/cli/template/node_config_nonk8s.j2,sha256=mrS-YQwg_9i7zBKuEFG5pe3ZbHCLtl5hGgzk2etXTvo,783
 vantage6/cli/template/server_config.j2,sha256=0uksEkCf4lRcBD39brOGdwoF_vCtieA-FjTiSUxNvo0,10195
 vantage6/cli/test/client_script.py,sha256=AHQ4fhzbtD-VcJAm0rxUDteepXNa4Bef9SKWnzobTd0,4825
@@ -96,7 +96,7 @@ vantage6/cli/test/algo_test_scripts/algo_test_script.py,sha256=jfzXPmpL0HlE_eq1j
 vantage6/cli/test/common/diagnostic_runner.py,sha256=jFFHqlj3v0WRpVEBa7Ovek3DL6RX6W5cQd9w5hWHtZA,6597
 vantage6/cli/use/context.py,sha256=cTp9kwC4hhq4FkPz1wYAeYWUGK4054S19FxpZYLF7lM,1665
 vantage6/cli/use/namespace.py,sha256=ev22EuixwW7ZWqhGo8SiSKgtGq4yy8gEXmMhR31khkE,1729
-vantage6-5.0.0a38.dist-info/METADATA,sha256=QPIrz4VCQuIpjB2_z94BzvC2jP6oR3NAP_lZsn0DotM,1778
-vantage6-5.0.0a38.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-vantage6-5.0.0a38.dist-info/entry_points.txt,sha256=RKVCMsD70s_Gp6If89uDlCphsZ9uLIOMt1gciv8EMDQ,53
-vantage6-5.0.0a38.dist-info/RECORD,,
+vantage6-5.0.0a40.dist-info/METADATA,sha256=fqvEBppeIDSNK1PfILwVHFAI_pboxwjq28EYSeyOAf8,1778
+vantage6-5.0.0a40.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+vantage6-5.0.0a40.dist-info/entry_points.txt,sha256=RKVCMsD70s_Gp6If89uDlCphsZ9uLIOMt1gciv8EMDQ,53
+vantage6-5.0.0a40.dist-info/RECORD,,