vantage6 4.10.1rc1__tar.gz → 5.0.0a7__tar.gz

{vantage6-4.10.1rc1 → vantage6-5.0.0a7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: vantage6
-Version: 4.10.1rc1
+Version: 5.0.0a7
 Summary: vantage6 command line interface
 Home-page: https://github.com/vantage6/vantage6
 Requires-Python: >=3.10

{vantage6-4.10.1rc1 → vantage6-5.0.0a7}/setup.py

@@ -38,12 +38,12 @@ setup(
         "copier==9.2.0",
         "docker==7.1.0",
         "ipython==8.10.0",
-        "jinja2==3.1.6",
+        "jinja2==3.1.5",
         "pandas>=1.5.3",
         "questionary==1.10.0",
         "rich==13.5.2",
         "schema==0.7.5",
-        "SQLAlchemy==1.4.46",
+        "sqlalchemy==2.0.37",
         f'vantage6-common == {version_ns["__version__"]}',
         f'vantage6-client == {version_ns["__version__"]}',
     ],

{vantage6-4.10.1rc1 → vantage6-5.0.0a7}/tests_cli/test_server_cli.py

@@ -132,7 +132,7 @@ class ServerCLITest(unittest.TestCase):
         """Stop server without errors."""
 
         container1 = MagicMock()
-        container1.name = f"{APPNAME}-iknl-system-{InstanceType.SERVER.value}"
+        container1.name = f"{APPNAME}-iknl-system-{InstanceType.SERVER}"
         containers.containers.list.return_value = [container1]
 
         runner = CliRunner()
@@ -146,7 +146,7 @@ class ServerCLITest(unittest.TestCase):
     def test_attach(self, containers, sleep):
         """Attach log to the console without errors."""
         container1 = MagicMock()
-        container1.name = f"{APPNAME}-iknl-system-{InstanceType.SERVER.value}"
+        container1.name = f"{APPNAME}-iknl-system-{InstanceType.SERVER}"
         containers.list.return_value = [container1]
 
         sleep.side_effect = KeyboardInterrupt("Boom!")

vantage6-5.0.0a7/vantage6/cli/__build__

@@ -0,0 +1 @@
+7

{vantage6-4.10.1rc1 → vantage6-5.0.0a7}/vantage6/cli/_version.py

@@ -7,7 +7,7 @@ with open(os.path.join(here, "__build__")) as fp:
     __build__ = json.load(fp)
 
 # Module version
-version_info = (4, 10, 1, "candidate", __build__, 0)
+version_info = (5, 0, 0, "alpha", __build__, 0)
 
 # Module version stage suffix map
 _specifier_ = {"alpha": "a", "beta": "b", "candidate": "rc", "final": ""}

{vantage6-4.10.1rc1 → vantage6-5.0.0a7}/vantage6/cli/algostore/attach.py

@@ -25,7 +25,7 @@ def cli_algo_store_attach(name: str, system_folders: bool) -> None:
     client = docker.from_env()
 
     running_servers = client.containers.list(
-        filters={"label": f"{APPNAME}-type={InstanceType.ALGORITHM_STORE.value}"}
+        filters={"label": f"{APPNAME}-type={InstanceType.ALGORITHM_STORE}"}
     )
     running_server_names = [container.name for container in running_servers]
 
@@ -40,7 +40,7 @@ def cli_algo_store_attach(name: str, system_folders: bool) -> None:
             return
     else:
         post_fix = "system" if system_folders else "user"
-        name = f"{APPNAME}-{name}-{post_fix}-{InstanceType.ALGORITHM_STORE.value}"
+        name = f"{APPNAME}-{name}-{post_fix}-{InstanceType.ALGORITHM_STORE}"
 
     if name in running_server_names:
         container = client.containers.get(name)

{vantage6-4.10.1rc1 → vantage6-5.0.0a7}/vantage6/cli/algostore/list.py

@@ -12,4 +12,4 @@ def cli_algo_store_configuration_list() -> None:
     """
     check_docker_running()
 
-    get_server_configuration_list(InstanceType.ALGORITHM_STORE.value)
+    get_server_configuration_list(InstanceType.ALGORITHM_STORE)

{vantage6-4.10.1rc1 → vantage6-5.0.0a7}/vantage6/cli/algostore/start.py

@@ -54,7 +54,7 @@ def cli_algo_store_start(
     Start the algorithm store server.
     """
     info("Starting algorithm store...")
-    docker_client = check_for_start(ctx, InstanceType.ALGORITHM_STORE.value)
+    docker_client = check_for_start(ctx, InstanceType.ALGORITHM_STORE)
 
     image = get_image(image, ctx, "algorithm-store", DEFAULT_ALGO_STORE_IMAGE)
 
@@ -91,7 +91,7 @@ def cli_algo_store_start(
         mounts=mounts,
         detach=True,
         labels={
-            f"{APPNAME}-type": InstanceType.ALGORITHM_STORE.value,
+            f"{APPNAME}-type": InstanceType.ALGORITHM_STORE,
             "name": ctx.config_file_name,
         },
         environment=environment_vars,

{vantage6-4.10.1rc1 → vantage6-5.0.0a7}/vantage6/cli/algostore/stop.py

@@ -23,7 +23,7 @@ def cli_algo_store_stop(ctx: AlgorithmStoreContext, all_stores: bool):
     client = docker.from_env()
 
     running_stores = client.containers.list(
-        filters={"label": f"{APPNAME}-type={InstanceType.ALGORITHM_STORE.value}"}
+        filters={"label": f"{APPNAME}-type={InstanceType.ALGORITHM_STORE}"}
     )
 
     if not running_stores:

{vantage6-4.10.1rc1 → vantage6-5.0.0a7}/vantage6/cli/common/start.py

@@ -241,7 +241,7 @@ def mount_database(
     # try to mount database
     uri = ctx.config["uri"]
     url = make_url(uri)
-    environment_vars = None
+    environment_vars = {}
     mount = None
 
     # If host is None, we're dealing with a file-based DB, like SQLite

{vantage6-4.10.1rc1 → vantage6-5.0.0a7}/vantage6/cli/common/utils.py

@@ -1,4 +1,3 @@
-import enum
 import questionary as q
 from colorama import Fore, Style
 import click
@@ -88,11 +87,7 @@ def get_server_configuration_list(instance_type: InstanceType.SERVER) -> None:
     client = docker.from_env()
     ctx_class = select_context_class(instance_type)
 
-    instance_type_value = (
-        instance_type.value if isinstance(instance_type, enum.Enum) else instance_type
-    )
-
-    running_server_names = get_running_servers(client, instance_type_value)
+    running_server_names = get_running_servers(client, instance_type)
     header = "\nName" + (21 * " ") + "Status" + (10 * " ") + "System/User"
 
     click.echo(header)
@@ -106,8 +101,7 @@ def get_server_configuration_list(instance_type: InstanceType.SERVER) -> None:
     for config in configs:
         status = (
             running
-            if f"{APPNAME}-{config.name}-system-{instance_type_value}"
-            in running_server_names
+            if f"{APPNAME}-{config.name}-system-{instance_type}" in running_server_names
             else stopped
         )
         click.echo(f"{config.name:25}" f"{status:25} System ")
@@ -117,8 +111,7 @@ def get_server_configuration_list(instance_type: InstanceType.SERVER) -> None:
     for config in configs:
         status = (
             running
-            if f"{APPNAME}-{config.name}-user-{instance_type_value}"
-            in running_server_names
+            if f"{APPNAME}-{config.name}-user-{instance_type}" in running_server_names
             else stopped
         )
         click.echo(f"{config.name:25}" f"{status:25} User   ")

{vantage6-4.10.1rc1 → vantage6-5.0.0a7}/vantage6/cli/configuration_manager.py

@@ -29,7 +29,6 @@ class ServerConfiguration(Configuration):
         "allow_drop_all": Use(bool),
         "logging": {**LOGGING_VALIDATORS, "file": Use(str)},
         Optional("server_name"): str,
-        Optional("runs_data_cleanup_days"): Use(int),
     }
 
 

{vantage6-4.10.1rc1 → vantage6-5.0.0a7}/vantage6/cli/context/algorithm_store.py

@@ -53,7 +53,7 @@ class AlgorithmStoreContext(BaseServerContext):
         str
             Server's docker container name
         """
-        return f"{APPNAME}-{self.name}-{self.scope}-{ServerType.ALGORITHM_STORE.value}"
+        return f"{APPNAME}-{self.name}-{self.scope}-{ServerType.ALGORITHM_STORE}"
 
     @classmethod
     def from_external_config_file(

{vantage6-4.10.1rc1 → vantage6-5.0.0a7}/vantage6/cli/context/node.py

@@ -1,11 +1,12 @@
 from __future__ import annotations
 
+import hashlib
 import os.path
 
 from pathlib import Path
 
 from vantage6.common.context import AppContext
-from vantage6.common.globals import APPNAME, InstanceType
+from vantage6.common.globals import APPNAME, STRING_ENCODING, InstanceType
 from vantage6.cli.configuration_manager import NodeConfigurationManager
 from vantage6.cli.globals import DEFAULT_NODE_SYSTEM_FOLDERS as N_FOL
 from vantage6.cli._version import __version__
@@ -39,6 +40,7 @@ class NodeContext(AppContext):
         system_folders: bool = N_FOL,
         config_file: str = None,
         print_log_header: bool = True,
+        logger_prefix: str = "",
     ):
         super().__init__(
             InstanceType.NODE,
@@ -46,9 +48,11 @@ class NodeContext(AppContext):
             system_folders,
             config_file,
             print_log_header,
+            logger_prefix,
         )
         if print_log_header:
             self.log.info("vantage6 version '%s'", __version__)
+        self.identifier = self.__create_node_identifier()
 
     @classmethod
     def from_external_config_file(
@@ -132,7 +136,7 @@ class NodeContext(AppContext):
         Path
             Path to the data folder
         """
-        return AppContext.type_data_folder(InstanceType.NODE.value, system_folders)
+        return AppContext.type_data_folder(InstanceType.NODE, system_folders)
 
     @property
     def databases(self) -> dict:
@@ -230,36 +234,31 @@ class NodeContext(AppContext):
     def proxy_log_file(self):
         return self.log_file_name(type_="proxy_server")
 
-    def docker_temporary_volume_name(self, job_id: int) -> str:
+    def get_database_uri(self, label: str = "default") -> str:
         """
-        Docker volume in which temporary data is stored. Temporary data is
-        linked to a specific run. Multiple algorithm containers can have the
-        same run id, and therefore the share same temporary volume.
+        Obtain the database URI for a specific database.
 
         Parameters
         ----------
-        job_id : int
-            run id provided by the server
+        label : str, optional
+            Database label, by default "default"
 
         Returns
         -------
         str
-            Docker volume name
+            URI to the database
         """
-        return f"{APPNAME}-{self.name}-{self.scope}-{job_id}-tmpvol"
+        return self.config["databases"][label]
 
-    def get_database_uri(self, label: str = "default") -> str:
+    def __create_node_identifier(self) -> str:
         """
-        Obtain the database URI for a specific database.
-
-        Parameters
-        ----------
-        label : str, optional
-            Database label, by default "default"
+        Create a unique identifier for the node.
 
         Returns
         -------
         str
-            URI to the database
+            Unique identifier for the node
         """
-        return self.config["databases"][label]
+        return hashlib.sha256(
+            self.config.get("api_key").encode(STRING_ENCODING)
+        ).hexdigest()[:16]

{vantage6-4.10.1rc1 → vantage6-5.0.0a7}/vantage6/cli/dev/create.py

@@ -8,7 +8,7 @@ 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
+from vantage6.common import info, error, generate_apikey
 
 import vantage6.cli.dev.data as data_dir
 from vantage6.cli.context.algorithm_store import AlgorithmStoreContext
@@ -49,7 +49,7 @@ def create_node_data_files(num_nodes: int, server_name: str) -> list[Path]:
         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"
+        data_file = data_folder / f"{node_name}.csv"
 
         # write data to file
         data.to_csv(data_file, index=False)
@@ -114,15 +114,13 @@ def create_node_config_file(
         }
     )
 
-    # Check that we can write the node config
-    if not ensure_config_dir_writable():
-        error("Cannot write configuration file. Exiting...")
+    try:
+        with open(full_path, "x") as f:
+            f.write(node_config)
+    except Exception as e:
+        error(f"Could not write node configuration file: {e}")
         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}"

{vantage6-4.10.1rc1 → vantage6-5.0.0a7}/vantage6/cli/dev/remove.py

@@ -4,12 +4,9 @@ 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.common import info
 from vantage6.cli.context.server import ServerContext
 from vantage6.cli.context.node import NodeContext
 from vantage6.cli.server.remove import cli_server_remove
@@ -37,20 +34,6 @@ def remove_demo_network(
     """
     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()

{vantage6-4.10.1rc1 → vantage6-5.0.0a7}/vantage6/cli/node/common/__init__.py

@@ -130,6 +130,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-4.10.1rc1 → vantage6-5.0.0a7}/vantage6/cli/node/start.py

@@ -78,7 +78,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"
@@ -306,7 +306,7 @@ def cli_node_start(
         volumes=volumes,
         detach=True,
         labels={
-            f"{APPNAME}-type": InstanceType.NODE.value,
+            f"{APPNAME}-type": InstanceType.NODE,
             "system": str(system_folders),
             "name": ctx.config_file_name,
         },

{vantage6-4.10.1rc1 → vantage6-5.0.0a7}/vantage6/cli/node/stop.py

@@ -120,8 +120,10 @@ def _stop_node(
     scope = "system" if system_folders else "user"
     config_name = get_server_config_name(container_name, scope)
     ctx = NodeContext(config_name, system_folders, print_log_header=False)
+
+    # Do not delete the data volume as this would remove all sessions.
     for volume in [
-        ctx.docker_volume_name,
+        # ctx.docker_volume_name,
         ctx.docker_squid_volume_name,
         ctx.docker_ssh_volume_name,
         ctx.docker_vpn_volume_name,

{vantage6-4.10.1rc1 → vantage6-5.0.0a7}/vantage6/cli/server/attach.py

@@ -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={InstanceType.SERVER.value}"}
+        filters={"label": f"{APPNAME}-type={InstanceType.SERVER}"}
     )
     running_server_names = [node.name for node in running_servers]
 
@@ -43,7 +43,7 @@ def cli_server_attach(name: str, system_folders: bool) -> None:
             return
     else:
         post_fix = "system" if system_folders else "user"
-        name = f"{APPNAME}-{name}-{post_fix}-{InstanceType.SERVER.value}"
+        name = f"{APPNAME}-{name}-{post_fix}-{InstanceType.SERVER}"
 
     if name in running_server_names:
         container = client.containers.get(name)

{vantage6-4.10.1rc1 → vantage6-5.0.0a7}/vantage6/cli/server/import_.py

@@ -132,10 +132,7 @@ def cli_server_import(
         command=cmd,
         mounts=mounts,
         detach=True,
-        labels={
-            f"{APPNAME}-type": InstanceType.SERVER.value,
-            "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-4.10.1rc1 → vantage6-5.0.0a7}/vantage6/cli/server/list.py

@@ -11,5 +11,4 @@ def cli_server_configuration_list() -> None:
     Print the available server configurations.
     """
     check_docker_running()
-
-    get_server_configuration_list(InstanceType.SERVER.value)
+    get_server_configuration_list(InstanceType.SERVER)

{vantage6-4.10.1rc1 → vantage6-5.0.0a7}/vantage6/cli/server/shell.py

@@ -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={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-4.10.1rc1 → vantage6-5.0.0a7}/vantage6/cli/server/start.py

@@ -83,7 +83,7 @@ def cli_server_start(
     Start the server.
     """
     info("Starting server...")
-    docker_client = check_for_start(ctx, InstanceType.SERVER.value)
+    docker_client = check_for_start(ctx, InstanceType.SERVER)
 
     image = get_image(image, ctx, "server", DEFAULT_SERVER_IMAGE)
 
@@ -157,10 +157,7 @@ def cli_server_start(
         command=cmd,
         mounts=mounts,
         detach=True,
-        labels={
-            f"{APPNAME}-type": InstanceType.SERVER.value,
-            "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,

{vantage6-4.10.1rc1 → vantage6-5.0.0a7}/vantage6/cli/server/stop.py

@@ -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={InstanceType.SERVER.value}"}
+        filters={"label": f"{APPNAME}-type={InstanceType.SERVER}"}
     )
 
     if not running_servers:
@@ -62,7 +62,7 @@ def cli_server_stop(name: str, system_folders: bool, all_servers: bool):
             return
     else:
         post_fix = "system" if system_folders else "user"
-        container_name = f"{APPNAME}-{name}-{post_fix}-{InstanceType.SERVER.value}"
+        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!")

{vantage6-4.10.1rc1 → vantage6-5.0.0a7}/vantage6/cli/server/version.py

@@ -22,10 +22,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-4.10.1rc1 → vantage6-5.0.0a7}/vantage6/cli/template/algo_store_config.j2

@@ -1,4 +1,4 @@
-allow_drop_all: true
+allow_drop_all: 'True'
 description: 'default_algorithm_store'
 ip: 0.0.0.0
 logging:

{vantage6-4.10.1rc1 → vantage6-5.0.0a7}/vantage6/cli/template/node_config.j2

@@ -1,5 +1,5 @@
 api_key: {{ api_key }}
-api_path: /api
+api_path: {{ api_path }}
 databases:
   {% for label, path in databases.items() %}
   - label: {{ label }}
@@ -28,6 +28,8 @@ logging:
     name: docker.utils.config
   - level: warning
     name: docker.auth
+  - level: warning
+    name: kubernetes.client.rest
 port: {{ port }}
 server_url: {{ server_url }}
 task_dir: {{ task_dir}}

{vantage6-4.10.1rc1 → vantage6-5.0.0a7}/vantage6/cli/template/server_config.j2

@@ -1,4 +1,4 @@
-allow_drop_all: false
+allow_drop_all: 'False'
 api_path: /api
 description: 'defaultserver'
 ip: 0.0.0.0

{vantage6-4.10.1rc1 → vantage6-5.0.0a7}/vantage6.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: vantage6
-Version: 4.10.1rc1
+Version: 5.0.0a7
 Summary: vantage6 command line interface
 Home-page: https://github.com/vantage6/vantage6
 Requires-Python: >=3.10

{vantage6-4.10.1rc1 → vantage6-5.0.0a7}/vantage6.egg-info/SOURCES.txt

@@ -40,7 +40,6 @@ vantage6/cli/dev/remove.py
 vantage6/cli/dev/start.py
 vantage6/cli/dev/stop.py
 vantage6/cli/dev/utils.py
-vantage6/cli/dev/data/olympic_athletes_2016.csv
 vantage6/cli/node/attach.py
 vantage6/cli/node/clean.py
 vantage6/cli/node/create_private_key.py

{vantage6-4.10.1rc1 → vantage6-5.0.0a7}/vantage6.egg-info/requires.txt

@@ -3,14 +3,14 @@ colorama==0.4.6
 copier==9.2.0
 docker==7.1.0
 ipython==8.10.0
-jinja2==3.1.6
+jinja2==3.1.5
 pandas>=1.5.3
 questionary==1.10.0
 rich==13.5.2
 schema==0.7.5
-SQLAlchemy==1.4.46
-vantage6-common==4.10.1rc1
-vantage6-client==4.10.1rc1
+sqlalchemy==2.0.37
+vantage6-common==5.0.0a7
+vantage6-client==5.0.0a7
 
 [dev]
 coverage==6.4.4

vantage6-4.10.1rc1/vantage6/cli/__build__

@@ -1 +0,0 @@
-1