vantage6 4.11.0rc4__py3-none-any.whl → 4.12.0__py3-none-any.whl

vantage6/cli/__build__

@@ -1 +1 @@
-4
+0

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

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/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/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.0rc4.dist-info → vantage6-4.12.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: vantage6
-Version: 4.11.0rc4
+Version: 4.12.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.11.0rc4
-Requires-Dist: vantage6-client==4.11.0rc4
+Requires-Dist: vantage6-common==4.12.0
+Requires-Dist: vantage6-client==4.12.0
 Provides-Extra: dev
 Requires-Dist: coverage==6.4.4; extra == "dev"
 Requires-Dist: black; extra == "dev"

{vantage6-4.11.0rc4.dist-info → vantage6-4.12.0.dist-info}/RECORD

@@ -4,9 +4,9 @@ tests_cli/test_example.py,sha256=0fw_v-lgZEacshWSDwLNyLMA1_xc48bKUGM3ll-n1L0,146
 tests_cli/test_node_cli.py,sha256=XAKRS1-SXdeBRz3ob25q467soCIB178pKVz8MJVZbCQ,17534
 tests_cli/test_server_cli.py,sha256=DLcOWM0ZCRTs-XMNsNKCOEELUMh22Ayow1FvAFLI0aA,5879
 tests_cli/test_wizard.py,sha256=NIj59eiCBuVNJXwhofrWLmLIKAsD45gSOzqOFWLmWhY,4916
-vantage6/cli/__build__,sha256=SyJ3d9TdH8Ycb4hPSGQdArTRIdP9Moywi1Ux_Kzav4o,1
+vantage6/cli/__build__,sha256=X-zrZv_IbzjZUnhsbWlsecLbwjndTpG0ZynXOif7V-k,1
 vantage6/cli/__init__.py,sha256=ZXbeQ_-g2-M4XYteWZkoO5lMFYhqjm5doQgGy1fq8i0,125
-vantage6/cli/_version.py,sha256=7g1VYEN766Mf9wGlm8bPgQO8QzE0d-l9gt02DbZwjWE,701
+vantage6/cli/_version.py,sha256=LjeQY0tglPN2Osq8hsxcMrAfs6MPxlwzHLhWl_upf0s,697
 vantage6/cli/cli.py,sha256=L_t0sHUwVkEumkYg6MsXm_sdAEWEjiz5DkUa51ihGtU,6318
 vantage6/cli/configuration_manager.py,sha256=YqObxbV4jl3K_0GiJcE0V7r2pFE2nETLEgP3yieYZaU,3695
 vantage6/cli/configuration_wizard.py,sha256=ifqvrVqHkxoM0ZVUVIwlYXFByzAbuVlahNjmwFGLVRU,20874
@@ -28,7 +28,7 @@ vantage6/cli/context/__init__.py,sha256=e8rfY2tCyu6_SLQ-rbVzEHkDtmbnGCZRHFN_HH-2
 vantage6/cli/context/algorithm_store.py,sha256=RimxNcoqfWeu2WQede6wsOu1rx-azzXIPVkCDqVJLWs,3944
 vantage6/cli/context/base_server.py,sha256=paKSzNrKWD-J6eakHAtGELk2cD05A8NqoCAuQfF7c2s,2972
 vantage6/cli/context/node.py,sha256=4R7X__u_pyZVvRSNO3ojTnVQFTWhuIemoHcGP6hsD5I,7444
-vantage6/cli/context/server.py,sha256=4BiccAakyXviGiV1SisZ0w0-0hrKAmCGVneZCRsSne8,4563
+vantage6/cli/context/server.py,sha256=qyslg6jY0I-29nktxROAb-KAVYZGh9TZsuby25rio0U,4588
 vantage6/cli/dev/create.py,sha256=ZN4BfExJVypl28ZKQEua0PIXpQCfcP8AC3RUhp1Cj-I,21280
 vantage6/cli/dev/remove.py,sha256=R_OU_LXLDCnoD-2xnegg4lh0B3t8EgpqzDqueLx16io,3730
 vantage6/cli/dev/start.py,sha256=fUMoPAEpmXoDAJidAmjIziaHZX1yqEErcrTKEXqPik8,4471
@@ -62,8 +62,8 @@ vantage6/cli/server/list.py,sha256=_kVBe7TrtUfT2ZLWPkVvKj4xx5AvS17e99Bwp0ajc_E,4
 vantage6/cli/server/new.py,sha256=JnUMMD0UUSCOdO0K7v19l5HOV7vnMd9D38WUoEJ2F00,2094
 vantage6/cli/server/remove.py,sha256=6tfKfVa5dYnZAKQYo_VlGZTuiugi7sh2F3U2cZ7mCmQ,1627
 vantage6/cli/server/shell.py,sha256=7cSdBOwvloWyCz3RXHaFZUnxgNRV4gZUDmIFecV8Hks,1589
-vantage6/cli/server/start.py,sha256=K_AacVvUOYovHGCXghllqZKh6rkmvoKPrHSP84au6Pc,9615
-vantage6/cli/server/stop.py,sha256=CP8WtMLkxRhKRr6PnATkCzjJoSVzy9XR9B1ETWtarmU,4422
+vantage6/cli/server/start.py,sha256=kFtiFQaBnUdtuP1oSXfXfSvU_-dPR1TnQuYGbSqv7D0,9635
+vantage6/cli/server/stop.py,sha256=NRU1wgmNEeIv9RiJZpcFVSU-mSLXOEPi4H-bc3vOinI,4432
 vantage6/cli/server/version.py,sha256=aXAztHEky_F2jPbfPdHPfsAY7rdTurl0_3S6bL94_QQ,1318
 vantage6/cli/server/common/__init__.py,sha256=htv0mFYa4GhIHdzA2xqUUgKhHcMh09UQERlIjIgrwOM,2062
 vantage6/cli/template/algo_store_config.j2,sha256=XR-ly-47p6egH8lVh4lZZDh3YSV4kFnkZprdsfSkS2Y,552
@@ -76,8 +76,8 @@ vantage6/cli/test/integration_test.py,sha256=yQVG72XKDNH_eOPTsf3pb65FCBwJzMxn5VN
 vantage6/cli/test/algo_test_scripts/algo_test_arguments.py,sha256=PfJUwXXbOUvs8W2i3XqIoNNkqvnXmRTv19kKcpg9ouk,888
 vantage6/cli/test/algo_test_scripts/algo_test_script.py,sha256=8x2KiSrsxLFbheq6_E_iNEOxDnFdEG3UV60cBfjxV8o,2684
 vantage6/cli/test/common/diagnostic_runner.py,sha256=x_4ikihgoSTKI914pqlgVziBSg5LpV6MheO6O_GBCeA,6657
-vantage6-4.11.0rc4.dist-info/METADATA,sha256=Q7bmxgxoynlUV_ENNH6jLGBQPE1X4RUm5OZOL6jTxkc,10890
-vantage6-4.11.0rc4.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-vantage6-4.11.0rc4.dist-info/entry_points.txt,sha256=YFBvwjxoeAGxYyPC-YevEgOBBYRGaXkS6jiOGGCLNy0,157
-vantage6-4.11.0rc4.dist-info/top_level.txt,sha256=CYDIBS8jEfFq5YCs_Fuit54K9-3wdosZppTrsymIoUk,19
-vantage6-4.11.0rc4.dist-info/RECORD,,
+vantage6-4.12.0.dist-info/METADATA,sha256=wHXDIPeLfK4njSNd0Vu5HDyadOpfKjNJQyRfXZEdVhM,10881
+vantage6-4.12.0.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+vantage6-4.12.0.dist-info/entry_points.txt,sha256=YFBvwjxoeAGxYyPC-YevEgOBBYRGaXkS6jiOGGCLNy0,157
+vantage6-4.12.0.dist-info/top_level.txt,sha256=CYDIBS8jEfFq5YCs_Fuit54K9-3wdosZppTrsymIoUk,19
+vantage6-4.12.0.dist-info/RECORD,,