vantage6 4.11.0rc3__tar.gz → 4.12.0rc2__tar.gz

{vantage6-4.11.0rc3 → vantage6-4.12.0rc2}/PKG-INFO

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

vantage6-4.12.0rc2/vantage6/cli/__build__

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

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

{vantage6-4.11.0rc3 → vantage6-4.12.0rc2}/vantage6/cli/context/server.py

@@ -69,7 +69,7 @@ class ServerContext(BaseServerContext):
         str
             Prometheus container name, unique to this server instance.
         """
-        return f"{APPNAME}-prometheus"
+        return f"{APPNAME}-{self.name}-{self.scope}-prometheus"
 
     @property
     def prometheus_dir(self) -> Path:

{vantage6-4.11.0rc3 → vantage6-4.12.0rc2}/vantage6/cli/prometheus/monitoring_manager.py

@@ -37,7 +37,7 @@ class PrometheusServer:
         self.network_mgr = network_mgr
         self.docker = docker.from_env()
         self.image = image if image else DEFAULT_PROMETHEUS_IMAGE
-        self.config_file = Path(self.ctx.data_dir / PROMETHEUS_CONFIG)
+        self.config_file = Path(__file__).parent / PROMETHEUS_CONFIG
         self.data_dir = self.ctx.prometheus_dir
 
     def start(self):
@@ -96,8 +96,9 @@ class PrometheusServer:
             server_address = f"{server_hostname}:{prometheus_exporter_port}"
 
             info(
-                f"Using Docker container hostname '{server_hostname}' for Prometheus target. "
-                "Ensure Prometheus is in the same Docker network to resolve this address."
+                f"Using Docker container hostname '{server_hostname}' for Prometheus "
+                "target. Ensure Prometheus is in the same Docker network to resolve "
+                "this address."
             )
 
             with open(self.config_file, "r") as f:

{vantage6-4.11.0rc3 → vantage6-4.12.0rc2}/vantage6/cli/server/start.py

@@ -153,9 +153,9 @@ def cli_server_start(
     ):
         info("Starting Prometheus container")
         _start_prometheus(ctx, prometheus_image, server_network_mgr)
-    elif ctx.config.get("prometheus"):
+    elif ctx.config.get("prometheus", {}).get("enabled"):
         info(
-            "Prometheus is provided in the config file as external service. "
+            "Prometheus is enabled but is set not to be started by vantage6. "
             "Assuming this service is up and running."
         )
     else:

{vantage6-4.11.0rc3 → vantage6-4.12.0rc2}/vantage6/cli/server/stop.py

@@ -118,7 +118,7 @@ def _stop_server_containers(
                 f"{Style.RESET_ALL} container."
             )
 
-    if ctx.config.get("prometheus", {}).get("enabled"):
+    if ctx.config.get("prometheus", {}).get("start_with_server"):
         remove_container_if_exists(client, name=ctx.prometheus_container_name)
         info(
             f"Stopped the {Fore.GREEN}{ctx.prometheus_container_name}"

{vantage6-4.11.0rc3 → vantage6-4.12.0rc2}/vantage6/cli/test/algo_test_scripts/algo_test_script.py

@@ -71,10 +71,9 @@ def run_test(custom_args: dict | None = None):
 
     else:
         # Run the task for each algorithm in the arguments file
-        for algo in arguments.args:
-            logging.info(f"Running task for {algo}")
-
-            task_args = arguments.args[algo]
+        for algo, task_args in arguments.args.items():
+            logging.info("Running task for %s", algo)
+            logging.info("Task arguments: %s", task_args)
             create_and_run_task(client, task_args, algo)
 
 

{vantage6-4.11.0rc3 → vantage6-4.12.0rc2}/vantage6/cli/test/client_script.py

@@ -11,6 +11,7 @@ from vantage6.cli.dev.create import create_demo_network
 from vantage6.cli.dev.remove import remove_demo_network
 from vantage6.cli.dev.start import start_demo_network
 from vantage6.cli.dev.stop import stop_demo_network
+from vantage6.cli.utils import prompt_config_name
 from vantage6.common.globals import Ports
 
 TEST_FILE_PATH = Path(__file__).parent / "algo_test_scripts" / "algo_test_script.py"
@@ -69,8 +70,8 @@ TEST_FILE_PATH = Path(__file__).parent / "algo_test_scripts" / "algo_test_script
 @click.pass_context
 def cli_test_client_script(
     click_ctx: click.Context,
-    script: Path,
-    task_arguments: str,
+    script: Path | None,
+    task_arguments: str | None,
     name: str,
     server_url: str,
     create_dev_network: bool,
@@ -95,6 +96,8 @@ def cli_test_client_script(
         except json.JSONDecodeError:
             raise click.UsageError("task-arguments must be a valid JSON string.")
 
+    name = prompt_config_name(name)
+
     # create the network
     if create_dev_network:
         click_ctx.invoke(

{vantage6-4.11.0rc3 → vantage6-4.12.0rc2}/vantage6.egg-info/PKG-INFO

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

{vantage6-4.11.0rc3 → vantage6-4.12.0rc2}/vantage6.egg-info/requires.txt

@@ -9,8 +9,8 @@ questionary==1.10.0
 rich==13.5.2
 schema==0.7.5
 SQLAlchemy==1.4.46
-vantage6-common==4.11.0rc3
-vantage6-client==4.11.0rc3
+vantage6-common==4.12.0rc2
+vantage6-client==4.12.0rc2
 
 [dev]
 coverage==6.4.4

vantage6-4.11.0rc3/vantage6/cli/__build__

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