vantage6 4.3.4rc3__tar.gz → 4.4.0rc3__tar.gz

{vantage6-4.3.4rc3 → vantage6-4.4.0rc3}/PKG-INFO

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

{vantage6-4.3.4rc3 → vantage6-4.4.0rc3}/setup.py

@@ -35,7 +35,7 @@ setup(
     install_requires=[
         "click==8.1.3",
         "colorama==0.4.6",
-        "copier==8.3.0",
+        "copier==9.2.0",
         "docker==6.1.2",
         "ipython==8.10.0",
         "jinja2==3.1.3",

{vantage6-4.3.4rc3 → vantage6-4.4.0rc3}/tests_cli/test_node_cli.py

@@ -207,7 +207,7 @@ class NodeCLITest(unittest.TestCase):
         self.assertNotEqual(result.exit_code, 0)
 
     @patch("docker.DockerClient.volumes")
-    @patch("vantage6.cli.node.start.pull_if_newer")
+    @patch("vantage6.cli.node.start.pull_image")
     @patch("vantage6.cli.common.decorator.get_context")
     @patch("docker.DockerClient.containers")
     @patch("vantage6.cli.node.start.check_docker_running", return_value=True)

{vantage6-4.3.4rc3 → vantage6-4.4.0rc3}/tests_cli/test_server_cli.py

@@ -18,7 +18,7 @@ class ServerCLITest(unittest.TestCase):
     @patch("vantage6.cli.server.start.NetworkManager")
     @patch("vantage6.cli.server.start.docker.types.Mount")
     @patch("os.makedirs")
-    @patch("vantage6.cli.common.start.pull_if_newer")
+    @patch("vantage6.cli.server.start.pull_image")
     @patch("vantage6.cli.common.decorator.get_context")
     @patch("vantage6.cli.server.start.docker.from_env")
     @patch("vantage6.cli.common.start.check_docker_running", return_value=True)
@@ -91,9 +91,10 @@ class ServerCLITest(unittest.TestCase):
     @patch("docker.DockerClient.containers")
     @patch("vantage6.cli.server.import_.print_log_worker")
     @patch("vantage6.cli.server.import_.click.Path")
+    @patch("vantage6.cli.server.import_.pull_image")
     @patch("vantage6.cli.server.import_.check_docker_running", return_value=True)
     @patch("vantage6.cli.common.decorator.get_context")
-    def test_import(self, context, docker_check, click_path, log, containers):
+    def test_import(self, context, docker_check, pull, click_path, log, containers):
         """Import entities without errors."""
         click_path.return_value = MagicMock()
 

{vantage6-4.3.4rc3 → vantage6-4.4.0rc3}/tests_cli/test_wizard.py

@@ -71,7 +71,15 @@ class WizardTest(unittest.TestCase):
     def test_server_wizard(self):
         with patch(f"{module_path}.q") as q:
             q.prompt.side_effect = self.prompts
-            q.confirm.return_value.ask.side_effect = [True, True, True, True, True]
+            q.confirm.return_value.ask.side_effect = [
+                True,
+                True,
+                True,
+                True,
+                True,
+                True,
+                False,
+            ]
 
             config = server_configuration_questionaire("vantage6")
 
@@ -87,6 +95,7 @@ class WizardTest(unittest.TestCase):
                 "vpn_server",
                 "rabbitmq",
                 "two_factor_auth",
+                "algorithm_stores",
             ]
 
             for key in keys:

{vantage6-4.3.4rc3 → vantage6-4.4.0rc3}/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, 3, 4, "candidate", __build__, 0)
+version_info = (4, 4, 0, "candidate", __build__, 0)
 
 # Module version stage suffix map
 _specifier_ = {"alpha": "a", "beta": "b", "candidate": "rc", "final": ""}

{vantage6-4.3.4rc3 → vantage6-4.4.0rc3}/vantage6/cli/algorithm/create.py

@@ -42,6 +42,10 @@ def cli_algorithm_create(name: str, directory: str) -> dict:
             "Directory to put the algorithm in:", default=default_dir
         ).ask()
 
-    run_copy(ALGORITHM_TEMPLATE_REPO, directory, data={"algorithm_name": name})
+    # Create the template. The `unsafe` flag is used to allow running a Python script
+    # after creating the template that cleans up some things.
+    run_copy(
+        ALGORITHM_TEMPLATE_REPO, directory, data={"algorithm_name": name}, unsafe=True
+    )
     info("Template created!")
     info(f"You can find your new algorithm in: {directory}")

{vantage6-4.3.4rc3 → vantage6-4.4.0rc3}/vantage6/cli/algorithm/update.py

@@ -4,8 +4,9 @@ from pathlib import Path
 import click
 import questionary as q
 from copier import run_update
+import copier.errors
 
-from vantage6.cli.utils import info
+from vantage6.common import info, warning
 
 
 @click.command()
@@ -17,7 +18,14 @@ from vantage6.cli.utils import info
     type=str,
     help="Directory to put the algorithm into",
 )
-def cli_algorithm_update(directory: str) -> dict:
+@click.option(
+    "--change-answers",
+    is_flag=True,
+    flag_value=True,
+    help="Change answers to questions that were already answered",
+    default=False,
+)
+def cli_algorithm_update(directory: str, change_answers: bool) -> dict:
     """Update an algorithm template
 
     When a new version of the algorithm template is released, you can update
@@ -28,6 +36,11 @@ def cli_algorithm_update(directory: str) -> dict:
         default_dir = str(Path(os.getcwd()))
         directory = q.text("Algorithm directory:", default=default_dir).ask()
 
-    run_update(directory, overwrite=True)
-
-    info("Template updated!")
+    info("Updating template...")
+    try:
+        run_update(
+            directory, overwrite=True, skip_answered=not change_answers, unsafe=True
+        )
+        info("Template updated!")
+    except copier.errors.UserMessageError as exc:
+        warning(f"Update failed: {exc}")

{vantage6-4.3.4rc3 → vantage6-4.4.0rc3}/vantage6/cli/algostore/start.py

@@ -2,6 +2,7 @@ import click
 
 from vantage6.common import info
 from vantage6.common.globals import APPNAME, DEFAULT_ALGO_STORE_IMAGE, InstanceType
+from vantage6.common.docker.addons import pull_image
 from vantage6.cli.common.start import (
     attach_logs,
     check_for_start,
@@ -9,7 +10,6 @@ from vantage6.cli.common.start import (
     mount_config_file,
     mount_database,
     mount_source,
-    pull_image,
 )
 from vantage6.cli.globals import AlgoStoreGlobals
 from vantage6.cli.context.algorithm_store import AlgorithmStoreContext
@@ -54,6 +54,7 @@ def cli_algo_store_start(
 
     image = get_image(image, ctx, "algorithm-store", DEFAULT_ALGO_STORE_IMAGE)
 
+    info("Pulling algorithm store image...")
     pull_image(docker_client, image)
 
     config_file = "/mnt/config.yaml"

{vantage6-4.3.4rc3 → vantage6-4.4.0rc3}/vantage6/cli/common/start.py

@@ -11,7 +11,7 @@ from sqlalchemy.engine.url import make_url
 from vantage6.common import error, info, warning
 from vantage6.common.context import AppContext
 from vantage6.common.globals import InstanceType, APPNAME, DEFAULT_DOCKER_REGISTRY
-from vantage6.common.docker.addons import check_docker_running, pull_if_newer
+from vantage6.common.docker.addons import check_docker_running
 from vantage6.cli.context import AlgorithmStoreContext, ServerContext
 from vantage6.cli.common.utils import print_log_worker
 from vantage6.cli.utils import check_config_name_allowed
@@ -28,6 +28,11 @@ def check_for_start(ctx: AppContext, type_: InstanceType) -> DockerClient:
         The context object
     type_ : InstanceType
         The type of instance to check for
+
+    Returns
+    -------
+    DockerClient
+        A Docker client instance
     """
     # will print an error if not
     check_docker_running()
@@ -83,27 +88,6 @@ def get_image(
     return image
 
 
-def pull_image(docker_client: DockerClient, image: str) -> None:
-    """
-    Pull the image if it is not already available.
-
-    Parameters
-    ----------
-    docker : DockerClient
-        The docker client
-    image : str
-        The image name
-    """
-    info(f"Pulling latest image '{image}'.")
-    try:
-        pull_if_newer(docker_client.from_env(), image)
-    except Exception as e:
-        warning(" ... Getting latest server image failed:")
-        warning(f"     {e}")
-    else:
-        info(" ... success!")
-
-
 def mount_config_file(ctx: AppContext, config_file: str) -> list[docker.types.Mount]:
     """
     Mount the config file in the container.

{vantage6-4.3.4rc3 → vantage6-4.4.0rc3}/vantage6/cli/configuration_manager.py

@@ -50,6 +50,7 @@ class NodeConfiguration(Configuration):
         "encryption": {"enabled": bool, Optional("private_key"): Use(str)},
         Optional("node_extra_env"): dict,
         Optional("node_extra_mounts"): [str],
+        Optional("node_extra_hosts"): dict,
     }
 
 

{vantage6-4.3.4rc3 → vantage6-4.4.0rc3}/vantage6/cli/configuration_wizard.py

@@ -371,6 +371,28 @@ def server_configuration_questionaire(instance_name: str) -> dict:
             "start_with_server": run_rabbit_locally,
         }
 
+    # add algorithm stores to this server
+    is_add_community_store = q.confirm(
+        "Do you want to make the algorithms from the community algorithm store "
+        "available to your users?"
+    ).ask()
+    algorithm_stores = []
+    if is_add_community_store:
+        algorithm_stores.append(
+            {"name": "Community store", "url": "https://store.cotopaxi.vantage6.ai"}
+        )
+    add_more_stores = q.confirm(
+        "Do you want to add more algorithm stores?", default=False
+    ).ask()
+    while add_more_stores:
+        store_name = q.text(message="Enter the name of the store:").ask()
+        store_url = q.text(message="Enter the URL of the store:").ask()
+        algorithm_stores.append({"name": store_name, "url": store_url})
+        add_more_stores = q.confirm(
+            "Do you want to add more algorithm stores?", default=False
+        ).ask()
+    config["algorithm_stores"] = algorithm_stores
+
     return config
 
 

{vantage6-4.3.4rc3 → vantage6-4.4.0rc3}/vantage6/cli/node/start.py

@@ -9,6 +9,7 @@ import docker
 from colorama import Fore, Style
 
 from vantage6.common import warning, error, info, debug, get_database_config
+from vantage6.common.docker.addons import pull_image
 from vantage6.common.globals import (
     APPNAME,
     DEFAULT_DOCKER_REGISTRY,
@@ -17,7 +18,6 @@ from vantage6.common.globals import (
     InstanceType,
 )
 from vantage6.common.docker.addons import (
-    pull_if_newer,
     remove_container_if_exists,
     check_docker_running,
 )
@@ -135,17 +135,7 @@ def cli_node_start(
             image = f"{DEFAULT_DOCKER_REGISTRY}/{DEFAULT_NODE_IMAGE}"
 
     info(f"Pulling latest node image '{image}'")
-    try:
-        # docker_client.images.pull(image)
-        pull_if_newer(docker.from_env(), image)
-
-    except Exception as e:
-        warning(" ... Getting latest node image failed:")
-        warning(f"     {e}")
-    else:
-        info(" ... success!")
-
-    info("Creating Docker data volume")
+    pull_image(docker_client, image)
 
     data_volume = docker_client.volumes.create(ctx.docker_volume_name)
     vpn_volume = docker_client.volumes.create(ctx.docker_vpn_volume_name)
@@ -294,6 +284,9 @@ def cli_node_start(
         exit(1)
     env.update(extra_env)
 
+    # Add extra hosts to the environment
+    extra_hosts = ctx.config.get("node_extra_hosts", {})
+
     remove_container_if_exists(
         docker_client=docker_client, name=ctx.docker_container_name
     )
@@ -313,6 +306,7 @@ def cli_node_start(
         name=ctx.docker_container_name,
         auto_remove=not keep,
         tty=True,
+        extra_hosts=extra_hosts,
     )
 
     info("Node container was successfully started!")

{vantage6-4.3.4rc3 → vantage6-4.4.0rc3}/vantage6/cli/server/import_.py

@@ -7,7 +7,7 @@ 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
+from vantage6.common.docker.addons import check_docker_running, pull_image
 from vantage6.common.globals import (
     APPNAME,
     DEFAULT_DOCKER_REGISTRY,
@@ -77,13 +77,7 @@ def cli_server_import(
             "image", f"{DEFAULT_DOCKER_REGISTRY}/{DEFAULT_SERVER_IMAGE}"
         )
     info(f"Pulling latest server image '{image}'.")
-    try:
-        docker_client.images.pull(image)
-    except Exception as e:
-        warning(" ... Getting latest node image failed:")
-        warning(f"     {e}")
-    else:
-        info(" ... success!")
+    pull_image(docker_client, image)
 
     info("Creating mounts")
     mounts = [

{vantage6-4.3.4rc3 → vantage6-4.4.0rc3}/vantage6/cli/server/start.py

@@ -4,6 +4,7 @@ from docker.client import DockerClient
 
 from vantage6.common import info, warning, error
 from vantage6.common.docker.network_manager import NetworkManager
+from vantage6.common.docker.addons import pull_image
 from vantage6.common.globals import (
     APPNAME,
     DEFAULT_SERVER_IMAGE,
@@ -22,7 +23,6 @@ from vantage6.cli.common.start import (
     get_image,
     mount_database,
     mount_source,
-    pull_image,
 )
 
 
@@ -90,6 +90,7 @@ def cli_server_start(
     # check that log directory exists - or create it
     ctx.log_dir.mkdir(parents=True, exist_ok=True)
 
+    info("Pulling server image...")
     pull_image(docker_client, image)
 
     info("Creating mounts")

{vantage6-4.3.4rc3 → vantage6-4.4.0rc3}/vantage6.egg-info/PKG-INFO

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

{vantage6-4.3.4rc3 → vantage6-4.4.0rc3}/vantage6.egg-info/requires.txt

@@ -1,6 +1,6 @@
 click==8.1.3
 colorama==0.4.6
-copier==8.3.0
+copier==9.2.0
 docker==6.1.2
 ipython==8.10.0
 jinja2==3.1.3
@@ -8,8 +8,8 @@ questionary==1.10.0
 rich==13.5.2
 schema==0.7.5
 SQLAlchemy==1.4.46
-vantage6-common==4.3.4rc3
-vantage6-client==4.3.4rc3
+vantage6-common==4.4.0rc3
+vantage6-client==4.4.0rc3
 
 [dev]
 coverage==6.4.4