vantage6 4.7.1__py3-none-any.whl → 4.8.0__py3-none-any.whl

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, 7, 1, "final", __build__, 0)
+version_info = (4, 8, 0, "final", __build__, 0)
 
 # Module version stage suffix map
 _specifier_ = {"alpha": "a", "beta": "b", "candidate": "rc", "final": ""}

vantage6/cli/configuration_wizard.py

@@ -3,7 +3,13 @@ import questionary as q
 from pathlib import Path
 
 from vantage6.common import generate_apikey
-from vantage6.common.globals import DATABASE_TYPES, InstanceType, NodePolicy, Ports
+from vantage6.common.globals import (
+    DATABASE_TYPES,
+    InstanceType,
+    NodePolicy,
+    Ports,
+    DEFAULT_API_PATH,
+)
 from vantage6.common.client.node_client import NodeClient
 from vantage6.common.context import AppContext
 from vantage6.common import error, warning, info
@@ -105,7 +111,7 @@ def node_configuration_questionaire(dirs: dict, instance_name: str) -> dict:
         ).ask()
 
     is_policies = q.confirm(
-        "Do you want to add limit the algorithms allowed to run on your node? This "
+        "Do you want to limit the algorithms allowed to run on your node? This "
         "should always be done for production scenarios.",
         default=True,
     ).ask()
@@ -269,9 +275,7 @@ def _get_allowed_algorithm_stores() -> list[str]:
     return allowed_algorithm_stores
 
 
-def _get_common_server_config(
-    instance_type: InstanceType, instance_name: str, include_api_path: bool = True
-) -> dict:
+def _get_common_server_config(instance_type: InstanceType, instance_name: str) -> dict:
     """
     Part of the questionaire that is common to all server types (vantage6
     server and algorithm store server).
@@ -282,8 +286,6 @@ def _get_common_server_config(
         Type of server instance.
     instance_name : str
         Name of the server instance.
-    include_api_path : bool
-        Whether to include the api path in the questionaire.
 
     Returns
     -------
@@ -312,21 +314,6 @@ def _get_common_server_config(
         ]
     )
 
-    # TODO v5+ remove api_path. It complicates configuration
-    if include_api_path:
-        config.update(
-            q.prompt(
-                [
-                    {
-                        "type": "text",
-                        "name": "api_path",
-                        "message": "Path of the api:",
-                        "default": "/api",
-                    }
-                ]
-            )
-        )
-
     config.update(
         q.prompt(
             [
@@ -369,6 +356,8 @@ def _get_common_server_config(
         ],
     }
 
+    config["api_path"] = DEFAULT_API_PATH
+
     return config
 
 
@@ -387,9 +376,7 @@ def server_configuration_questionaire(instance_name: str) -> dict:
         Dictionary with the new server configuration
     """
 
-    config = _get_common_server_config(
-        InstanceType.SERVER, instance_name, include_api_path=True
-    )
+    config = _get_common_server_config(InstanceType.SERVER, instance_name)
 
     constant_jwt_secret = q.confirm("Do you want a constant JWT secret?").ask()
     if constant_jwt_secret:
@@ -498,9 +485,7 @@ def algo_store_configuration_questionaire(instance_name: str) -> dict:
     dict
         Dictionary with the new server configuration
     """
-    config = _get_common_server_config(
-        InstanceType.ALGORITHM_STORE, instance_name, include_api_path=False
-    )
+    config = _get_common_server_config(InstanceType.ALGORITHM_STORE, instance_name)
 
     default_v6_server_uri = f"http://localhost:{Ports.DEV_SERVER.value}/api"
     default_root_username = "root"

vantage6/cli/dev/create.py

@@ -266,6 +266,7 @@ def create_vserver_config(
     port: int,
     server_url: str,
     extra_config_file: Path,
+    ui_image: str | None,
     ui_port: int,
     store_port: int,
 ) -> Path:
@@ -281,6 +282,9 @@ def create_vserver_config(
         Url of the server this
     extra_config_file : Path
         Path to file with additional server configuration.
+    ui_image : str | None
+        UI docker image to specify in configuration files. Will be used on startup of
+        the network.
     ui_port : int
         Port to run the UI on.
     store_port : int
@@ -299,6 +303,10 @@ def create_vserver_config(
     )
 
     extra_config = _read_extra_config_file(extra_config_file)
+    if ui_image is not None:
+        if extra_config:
+            extra_config += "\n"
+        extra_config += f"images:\n  ui: {ui_image}"
 
     template = environment.get_template("server_config.j2")
     server_config = template.render(
@@ -409,6 +417,7 @@ def demo_network(
     extra_server_config: Path,
     extra_node_config: Path,
     extra_store_config: Path,
+    ui_image: str,
     ui_port: int,
     algorithm_store_port: int,
 ) -> tuple[list[dict], Path, Path]:
@@ -430,6 +439,9 @@ def demo_network(
         Path to file with additional node configuration.
     extra_store_config : Path
         Path to file with additional algorithm store configuration.
+    ui_image : str | None
+        UI docker image to specify in configuration files. Will be used on startup of
+        the network.
     ui_port : int
         Port to run the UI on.
     algorithm_store_port : int
@@ -449,6 +461,7 @@ def demo_network(
         server_port,
         server_url,
         extra_server_config,
+        ui_image,
         ui_port,
         algorithm_store_port,
     )
@@ -504,6 +517,13 @@ def demo_network(
     help="Server docker image to use when setting up resources for "
     "the development server",
 )
+@click.option(
+    "--ui-image",
+    type=str,
+    default=None,
+    help="UI docker image to specify in configuration files. Will be used on startup of"
+    " the network",
+)
 @click.option(
     "--extra-server-config",
     type=click.Path(exists=True),
@@ -536,6 +556,7 @@ def create_demo_network(
     ui_port: int,
     algorithm_store_port: int,
     image: str = None,
+    ui_image: str = None,
     extra_server_config: Path = None,
     extra_node_config: Path = None,
     extra_store_config: Path = None,
@@ -557,6 +578,7 @@ def create_demo_network(
             extra_server_config,
             extra_node_config,
             extra_store_config,
+            ui_image,
             ui_port,
             algorithm_store_port,
         )

vantage6/cli/dev/start.py

@@ -8,6 +8,7 @@ from vantage6.cli.context.algorithm_store import AlgorithmStoreContext
 from vantage6.cli.context.node import NodeContext
 from vantage6.cli.server.start import cli_server_start
 from vantage6.cli.dev.utils import get_dev_server_context
+from vantage6.common.globals import DEFAULT_API_PATH
 
 
 @click.command()
@@ -96,7 +97,8 @@ def start_demo_network(
     client.authenticate(USERNAME, PASSWORD)
     existing_stores = client.store.list().get("data", [])
     existing_urls = [store["url"] for store in existing_stores]
-    local_store_url = f"http://localhost:{store_ctx.config['port']}"
+    api_path = store_ctx.config.get("api_path", DEFAULT_API_PATH)
+    local_store_url = f"http://localhost:{store_ctx.config['port']}{api_path}"
     if not local_store_url in existing_urls:
         client.store.create(
             algorithm_store_url=local_store_url,

vantage6/cli/globals.py

@@ -40,7 +40,7 @@ ALGORITHM_TEMPLATE_REPO = "gh:vantage6/v6-algorithm-template.git"
 DIAGNOSTICS_IMAGE = "harbor2.vantage6.ai/algorithms/diagnostic"
 
 # Address of community algorithm store
-COMMUNITY_STORE = "https://store.cotopaxi.vantage6.ai"
+COMMUNITY_STORE = "https://store.cotopaxi.vantage6.ai/api"
 
 
 class ServerType(str, Enum):

vantage6/cli/rabbitmq/queue_manager.py

@@ -87,7 +87,7 @@ class RabbitMQManager:
             volumes=volumes,
             ports=ports,
             detach=True,
-            restart_policy={"Name": "always"},
+            restart_policy={"Name": "unless-stopped"},
             hostname=self.host,
             labels={
                 f"{APPNAME}-type": "rabbitmq",

{vantage6-4.7.1.dist-info → vantage6-4.8.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: vantage6
-Version: 4.7.1
+Version: 4.8.0
 Summary: vantage6 command line interface
 Home-page: https://github.com/vantage6/vantage6
 Requires-Python: >=3.10
@@ -16,8 +16,8 @@ Requires-Dist: questionary==1.10.0
 Requires-Dist: rich==13.5.2
 Requires-Dist: schema==0.7.5
 Requires-Dist: SQLAlchemy==1.4.46
-Requires-Dist: vantage6-common==4.7.1
-Requires-Dist: vantage6-client==4.7.1
+Requires-Dist: vantage6-common==4.8.0
+Requires-Dist: vantage6-client==4.8.0
 Provides-Extra: dev
 Requires-Dist: coverage==6.4.4; extra == "dev"
 Requires-Dist: black; extra == "dev"
@@ -40,6 +40,8 @@ Requires-Dist: pre-commit; extra == "dev"
 [![Codacy Badge](https://app.codacy.com/project/badge/Grade/2e60ac3b3f284620805f7399cba317be)](https://app.codacy.com/gh/vantage6/vantage6/dashboard?utm_source=gh&utm_medium=referral&utm_content=&utm_campaign=Badge_grade)
 [![DOI](https://zenodo.org/badge/492818831.svg)](https://zenodo.org/badge/latestdoi/492818831)
 [![Discord](https://img.shields.io/discord/643526403207331841)](https://discord.gg/yAyFf6Y)
+[![Research software directory](https://img.shields.io/badge/rsd-vantage6-deepskyblue)](https://research-software-directory.org/software/vantage6)
+
 
 </h3>
 

{vantage6-4.7.1.dist-info → vantage6-4.8.0.dist-info}/RECORD

@@ -5,11 +5,11 @@ tests_cli/test_server_cli.py,sha256=61et2WpcVAr4SAsQTLJEeBy1RnewujMvFgFW6N_i7kg,
 tests_cli/test_wizard.py,sha256=eoa0WQ9yw7IjtaeAKzbK8-sOCBGow7gLrhhmUx024p8,4881
 vantage6/cli/__build__,sha256=X-zrZv_IbzjZUnhsbWlsecLbwjndTpG0ZynXOif7V-k,1
 vantage6/cli/__init__.py,sha256=-Ec-Z7ELDveGdSALXda3qdUGpkuKyJQfhN3eIm7koHE,127
-vantage6/cli/_version.py,sha256=aiDAnJ4bDnuUTbADE8SxVNtiEIb05bHjrZZYfII5eTY,696
+vantage6/cli/_version.py,sha256=8xKecq261CBLwA7BtdniKWHbRoprZaHHOxz-dowlQbg,696
 vantage6/cli/cli.py,sha256=AecGqgdDI_IaAbedeRN9F8E3hvSpqfbG9Ot7LiAfBTs,6074
 vantage6/cli/configuration_manager.py,sha256=cN4tQpQjLG5GaGrsjEP-5ed_LqvPApIkNkM1J6ai3n0,3588
-vantage6/cli/configuration_wizard.py,sha256=_8KNvHaige6zsqu_9Oh9C9NsOogZb5fk2ofOhIN44Wc,20977
-vantage6/cli/globals.py,sha256=KSnXnQK7jidAe6E0j2CsL5myDskQzHqWFsCgi-0oXTs,1612
+vantage6/cli/configuration_wizard.py,sha256=sgXKC_bZvZUtOlEQCVA_oe23aUiYHs0ITtHTD7ITcq8,20440
+vantage6/cli/globals.py,sha256=8AWI55FBbumVQTuI1bJzKp5hiRWtiwsVgTTKqWgRBes,1616
 vantage6/cli/utils.py,sha256=8_PZeihjopYXQU10gMwIKr87yDAq-_z2LKi0BcdhNEc,2365
 vantage6/cli/algorithm/create.py,sha256=2Ks0JnWNldsn9Eg2h_lqn-yIMaJ-OYs-B3cv58tCiIs,1628
 vantage6/cli/algorithm/update.py,sha256=qN1YzUK5oiBvDepQOvUGpSVxf_eGaD1DRjh522ythE8,1224
@@ -28,9 +28,9 @@ vantage6/cli/context/algorithm_store.py,sha256=NsmrgDCTJ10KqQ209Q1sq-hBhuU_4LRqf
 vantage6/cli/context/base_server.py,sha256=paKSzNrKWD-J6eakHAtGELk2cD05A8NqoCAuQfF7c2s,2972
 vantage6/cli/context/node.py,sha256=lfaPlb8llgOR-fUG8VFebzh0IEynROyFN1HAg6p9gI0,7438
 vantage6/cli/context/server.py,sha256=vBGJWNsJoVcIryX5OLiWnFklNRcjOVkhqm2U5tqW5b0,3946
-vantage6/cli/dev/create.py,sha256=yimdQJge7W3Nxai2XVzY-aJJlg00gKIpJNHh_-DOcWQ,18409
+vantage6/cli/dev/create.py,sha256=3QFZPtxgOu_lSO_zumaAWJhVpohFR_H4J2mIldUW1pk,19102
 vantage6/cli/dev/remove.py,sha256=1ZX5L3bqTsRUt8PkXUvH7tgSLR32viZ5Ve_Q1k-sQ5M,3055
-vantage6/cli/dev/start.py,sha256=-rkM6lcEq4Z-8woukHJrAHstpG4hb8Yzx2_C-g7j_sU,4318
+vantage6/cli/dev/start.py,sha256=XrBnRxkGUM371ZBs3JQRqlONB2Lo-s2uTqblv4H3tXg,4447
 vantage6/cli/dev/stop.py,sha256=gPy87r8T3nqe7RFJjlYE9Bns8N3RiPPcdzNIFCoqGRY,1430
 vantage6/cli/dev/utils.py,sha256=DOTwPVXKZWhJfto9FG7EFgMhMaFJHXuhLDSlBCUCR1o,888
 vantage6/cli/dev/data/olympic_athletes_2016.csv,sha256=WGycwcwMKEyOyJc3aEo4EhrnBJiTSE0kZAr50j2qzGk,77699
@@ -48,7 +48,7 @@ vantage6/cli/node/version.py,sha256=eYJ4ayQsEsHPL00V88UY1LhmlnQCzF-Te4lrw4SFbHQ,
 vantage6/cli/node/common/__init__.py,sha256=pketeJOFViQIPpa9nCNe-q_6Mb55BJ2R2k_2jMQOeX4,2862
 vantage6/cli/rabbitmq/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 vantage6/cli/rabbitmq/definitions.py,sha256=CcS9jG7ZGB6LjzHQqZ2FliDurPItUvNSjHrOYptORZg,637
-vantage6/cli/rabbitmq/queue_manager.py,sha256=xYx6zeGLKuNH8uba47xMUikzpgy9FrZJ6gQkIPCLNk8,7537
+vantage6/cli/rabbitmq/queue_manager.py,sha256=KGDGHy4NBN8O9xhjzfI7mh65i9lOQIqQwrOFqvGFdHI,7545
 vantage6/cli/rabbitmq/rabbitmq.config,sha256=LYAQAEoXaF472XeJDYXc9JfWSETIzPRIR2W-JB2i7fU,136
 vantage6/cli/server/attach.py,sha256=ov5wJ0veZLKQTam-gBka5lDxcrmHscFZgHV1qFQkXZw,2003
 vantage6/cli/server/files.py,sha256=LJhFyYHcEnCgFhVAM-lX6_EnfhMJ7YPdN21kVIpmwkc,507
@@ -68,8 +68,8 @@ vantage6/cli/template/server_import_config.j2,sha256=9WT2XeG9-ADoYLb4ahXhof3i9Fc
 vantage6/cli/test/feature_tester.py,sha256=rdxRvDelVuOceXvbZh5dRc5Pdw4bVNiotj0m__RWN5Q,2563
 vantage6/cli/test/integration_test.py,sha256=yQVG72XKDNH_eOPTsf3pb65FCBwJzMxn5VNfUGemJBM,3808
 vantage6/cli/test/common/diagnostic_runner.py,sha256=x_4ikihgoSTKI914pqlgVziBSg5LpV6MheO6O_GBCeA,6657
-vantage6-4.7.1.dist-info/METADATA,sha256=2QIi0dIPi0spThX8SGc0CvQQXuAw6itrVjZMwe_NkSc,10319
-vantage6-4.7.1.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
-vantage6-4.7.1.dist-info/entry_points.txt,sha256=YFBvwjxoeAGxYyPC-YevEgOBBYRGaXkS6jiOGGCLNy0,157
-vantage6-4.7.1.dist-info/top_level.txt,sha256=CYDIBS8jEfFq5YCs_Fuit54K9-3wdosZppTrsymIoUk,19
-vantage6-4.7.1.dist-info/RECORD,,
+vantage6-4.8.0.dist-info/METADATA,sha256=G1TnSaEgicYYWfuS5u_Plp8T2mdjF5OhusVCDm9dtjU,10467
+vantage6-4.8.0.dist-info/WHEEL,sha256=bFJAMchF8aTQGUgMZzHJyDDMPTO3ToJ7x23SLJa1SVo,92
+vantage6-4.8.0.dist-info/entry_points.txt,sha256=YFBvwjxoeAGxYyPC-YevEgOBBYRGaXkS6jiOGGCLNy0,157
+vantage6-4.8.0.dist-info/top_level.txt,sha256=CYDIBS8jEfFq5YCs_Fuit54K9-3wdosZppTrsymIoUk,19
+vantage6-4.8.0.dist-info/RECORD,,

{vantage6-4.7.1.dist-info → vantage6-4.8.0.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.44.0)
+Generator: bdist_wheel (0.45.0)
 Root-Is-Purelib: true
 Tag: py3-none-any