vantage6 5.0.0a19__py3-none-any.whl → 5.0.0a20__py3-none-any.whl

tests_cli/test_node_cli.py

@@ -417,8 +417,7 @@ class NodeCLITest(unittest.TestCase):
     @patch("vantage6.cli.node.common.debug")
     @patch("vantage6.cli.node.common.error")
     @patch("vantage6.cli.node.common.UserClient")
-    @patch("vantage6.cli.node.common.q")
-    def test_client(self, q, client, error, debug, info):
+    def test_client(self, client, error, debug, info):
         ctx = MagicMock(
             config={
                 "server_url": "localhost",

vantage6/cli/__build__

@@ -1 +1 @@
-19
+20

vantage6/cli/configuration_wizard.py

@@ -1,3 +1,4 @@
+import os
 from pathlib import Path
 
 import questionary as q
@@ -9,6 +10,7 @@ from vantage6.common.globals import (
     NodePolicy,
     Ports,
     DEFAULT_API_PATH,
+    RequiredNodeEnvVars,
 )
 from vantage6.common.client.node_client import NodeClient
 from vantage6.common.context import AppContext
@@ -171,9 +173,8 @@ def node_configuration_questionaire(dirs: dict, instance_name: str) -> dict:
     client = NodeClient(
         instance_name,
         config["api_key"],
-        config["server_url"],
-        config["port"],
-        config["api_path"],
+        server_url=f"{config['server_url']}:{config['port']}{config['api_path']}",
+        auth_url=os.environ.get(RequiredNodeEnvVars.KEYCLOAK_URL.value),
     )
     try:
         client.authenticate()

vantage6/cli/node/common/__init__.py

@@ -2,12 +2,12 @@
 Common functions that are used in node CLI commands
 """
 
-import questionary as q
+import os
 import docker
 from colorama import Fore, Style
 
 from vantage6.common import error, info, debug
-from vantage6.common.globals import APPNAME, InstanceType
+from vantage6.common.globals import APPNAME, InstanceType, RequiredNodeEnvVars
 from vantage6.client import UserClient
 
 from vantage6.cli.context.node import NodeContext
@@ -35,7 +35,11 @@ def create_client(ctx: NodeContext) -> UserClient:
     port = ctx.config["port"]
     api_path = ctx.config["api_path"]
     info(f"Connecting to server at '{host}:{port}{api_path}'")
-    return UserClient(host, port, api_path, log_level="warn")
+    return UserClient(
+        server_url=f"{host}:{port}{api_path}",
+        auth_url=os.environ.get(RequiredNodeEnvVars.KEYCLOAK_URL.value),
+        log_level="warn",
+    )
 
 
 def create_client_and_authenticate(ctx: NodeContext) -> UserClient:

vantage6/cli/test/feature_tester.py

@@ -8,11 +8,30 @@ from vantage6.cli.test.common.diagnostic_runner import DiagnosticRunner
 
 
 @click.command()
-@click.option("--host", type=str, default="http://localhost", help="URL of the server")
 @click.option(
-    "--port", type=int, default=Ports.DEV_SERVER.value, help="Port of the server"
+    "--server-url",
+    type=str,
+    default=f"http://localhost:{Ports.DEV_SERVER.value}/api",
+    help="URL of the server",
+)
+@click.option(
+    "--auth-url",
+    type=str,
+    default="http://localhost:8080",
+    help="URL of the authentication server (Keycloak)",
+)
+@click.option(
+    "--auth-realm",
+    type=str,
+    default="vantage6",
+    help="Realm of the authentication server (Keycloak)",
+)
+@click.option(
+    "--auth-client",
+    type=str,
+    default="public_client",
+    help="Client ID of the authentication server (Keycloak)",
 )
-@click.option("--api-path", type=str, default="/api", help="API path of the server")
 @click.option(
     "--collaboration",
     type=int,
@@ -45,9 +64,10 @@ from vantage6.cli.test.common.diagnostic_runner import DiagnosticRunner
     help="Path to the private key for end-to-end encryption",
 )
 def cli_test_features(
-    host: str,
-    port: int,
-    api_path: str,
+    server_url: str,
+    auth_url: str,
+    auth_realm: str,
+    auth_client: str,
     collaboration: int,
     organizations: list[int] | None,
     all_nodes: bool,
@@ -68,7 +88,13 @@ def cli_test_features(
     if all_nodes or not organizations:
         organizations = None
 
-    client = UserClient(host=host, port=port, path=api_path, log_level="critical")
+    client = UserClient(
+        server_url=server_url,
+        auth_url=auth_url,
+        auth_realm=auth_realm,
+        auth_client=auth_client,
+        log_level="critical",
+    )
     client.authenticate()
     client.setup_encryption(private_key)
     diagnose = DiagnosticRunner(client, collaboration, organizations, online_only)

{vantage6-5.0.0a19.dist-info → vantage6-5.0.0a20.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: vantage6
-Version: 5.0.0a19
+Version: 5.0.0a20
 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==2.0.37
-Requires-Dist: vantage6-common==5.0.0a19
-Requires-Dist: vantage6-client==5.0.0a19
+Requires-Dist: vantage6-common==5.0.0a20
+Requires-Dist: vantage6-client==5.0.0a20
 Provides-Extra: dev
 Requires-Dist: coverage==6.4.4; extra == "dev"
 Requires-Dist: black; extra == "dev"
@@ -128,7 +128,11 @@ For example, you can create a new organization by running:
 ```python
 from vantage6.client import Client
 
-client = Client('http://127.0.0.1', 7601, '/api', log_level='debug')
+client = Client(
+  server_url='http://127.0.0.1:7601/api',
+  auth_url='http://127.0.0.1:8080',
+  log_level='debug'
+)
 client.authenticate()
 client.setup_encryption(None)
 

{vantage6-5.0.0a19.dist-info → vantage6-5.0.0a20.dist-info}/RECORD

@@ -1,14 +1,14 @@
 tests_cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests_cli/test_example.py,sha256=0fw_v-lgZEacshWSDwLNyLMA1_xc48bKUGM3ll-n1L0,146
-tests_cli/test_node_cli.py,sha256=ajFdG1sTa9H7PjqK2dhcp3k59HGsJyO6ZoRfxgIUHcA,16842
+tests_cli/test_node_cli.py,sha256=jM-nZkcvdEwwHVgQi8C7cYAbTJOzVmFl60MFXYVH9ig,16798
 tests_cli/test_server_cli.py,sha256=Yv6k0mkqElrpPgFtro_OH2Bjixz7mDXioxhvXr9VsAQ,6550
 tests_cli/test_wizard.py,sha256=D0bIMqYJ8vgl4_hTQOH5Tb8JAFt1bIfPzU9zNSvYf8o,5009
-vantage6/cli/__build__,sha256=lADxshy1J9f6PT6rupNVehjr56LKTkcc_l5MW0yn92c,2
+vantage6/cli/__build__,sha256=9co490ih1ur3JrikL7V1w8cfGGSoFDMBeC3hPaLZICs,2
 vantage6/cli/__init__.py,sha256=ZXbeQ_-g2-M4XYteWZkoO5lMFYhqjm5doQgGy1fq8i0,125
 vantage6/cli/_version.py,sha256=iDijqhgy5jzZ0LAyzW1LlXeeuMcHWMyg9D8xbXtV7Ck,696
 vantage6/cli/cli.py,sha256=B0F328FSBBslwplMPk8lIlr0r-taKuCgb8v9DIdyE3Q,5699
 vantage6/cli/configuration_manager.py,sha256=CHGyYkHT8sIaEZjRrmWuiiDPfFdpFEbpl-yV5jG7OgM,3563
-vantage6/cli/configuration_wizard.py,sha256=XyR1Pa0pjYuO90D9F5KmBGV1Yb9PQl27Cdk67uzUmLE,20939
+vantage6/cli/configuration_wizard.py,sha256=aNpddEbUAye9HTVgo63_bwvnyKlC6FydDgURcmkkpzI,21048
 vantage6/cli/globals.py,sha256=ZmZHYG5Zm38L5eBSNXUaEznmL9bZHOU6F86aYAExq0I,1732
 vantage6/cli/utils.py,sha256=Jfr6IeHMQDk_wU5X7rJ1dRY118dhVVX8PwzwMYMv9Vw,2481
 vantage6/cli/algorithm/create.py,sha256=kRT1BlBcb0fDaB2Q988WxtA6EyAZmOW5QoU2uhbwBIo,2075
@@ -42,7 +42,7 @@ vantage6/cli/node/set_api_key.py,sha256=2kB8wveTy9_N8kX4huVhJhY86Ppd2BI8v-d7MRXQ
 vantage6/cli/node/start.py,sha256=mV4vDBBtFcxva4MJdg5ymsstefDM4bV4pmhSsVX1o4k,12407
 vantage6/cli/node/stop.py,sha256=Hf5z2r6ttbW-DeU0cdHNXIJcgL-eIVRv8i7zZLo4foY,4159
 vantage6/cli/node/version.py,sha256=X921xyIvIPYObPac2Si5msZ2tay5ySidnPWmGj1ilZw,1959
-vantage6/cli/node/common/__init__.py,sha256=sAjXbmiSlRxA7rbW9aV2AxfxKsMb4Nr5R2sFqAtmnxQ,2762
+vantage6/cli/node/common/__init__.py,sha256=-nNEqN4Cfzkkz7ughjm0FErGI8NgcOzpKw4va5-0W-E,2882
 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=KGDGHy4NBN8O9xhjzfI7mh65i9lOQIqQwrOFqvGFdHI,7545
@@ -62,11 +62,11 @@ vantage6/cli/template/algo_store_config.j2,sha256=XR-ly-47p6egH8lVh4lZZDh3YSV4kF
 vantage6/cli/template/node_config.j2,sha256=EyVKeyW0qAyvdUNSXTHUzPKRNunAMyn-cDTKiSyTbDc,730
 vantage6/cli/template/server_config.j2,sha256=K7svQM6HTmMrlKPVW9cbNPloH7LicBoLdIEiarD6CP8,765
 vantage6/cli/template/server_import_config.j2,sha256=9WT2XeG9-ADoYLb4ahXhof3i9Fcvg0oqwNPyFwLJpvc,1827
-vantage6/cli/test/feature_tester.py,sha256=AGXhq2VDgYFRHfgy2dLmEtt7BPzrSccodVZhIBE8AtY,2211
+vantage6/cli/test/feature_tester.py,sha256=Jd-dSB_4HRcvkDnAMs57m4WK0SDHsqTmg9ON56wnEOc,2634
 vantage6/cli/test/integration_test.py,sha256=MctR_t-WEyxzFpMdc6ByTcX1BQglZiT5-CIOQXTBBWo,4034
 vantage6/cli/test/common/diagnostic_runner.py,sha256=F8vEaCD6HeKWDcQGVzRkPYxdvEk9owqfciOVdN3bHbw,6607
-vantage6-5.0.0a19.dist-info/METADATA,sha256=uBTY7_jM6Jr-dX_eUtJrUpneLioXfsTrWaPKI-MWpe8,10859
-vantage6-5.0.0a19.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-vantage6-5.0.0a19.dist-info/entry_points.txt,sha256=YFBvwjxoeAGxYyPC-YevEgOBBYRGaXkS6jiOGGCLNy0,157
-vantage6-5.0.0a19.dist-info/top_level.txt,sha256=CYDIBS8jEfFq5YCs_Fuit54K9-3wdosZppTrsymIoUk,19
-vantage6-5.0.0a19.dist-info/RECORD,,
+vantage6-5.0.0a20.dist-info/METADATA,sha256=tqcWvRAB1eIY-PC3aIUZjkodH9F-1-ZtGdDH56x6xyk,10907
+vantage6-5.0.0a20.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+vantage6-5.0.0a20.dist-info/entry_points.txt,sha256=YFBvwjxoeAGxYyPC-YevEgOBBYRGaXkS6jiOGGCLNy0,157
+vantage6-5.0.0a20.dist-info/top_level.txt,sha256=CYDIBS8jEfFq5YCs_Fuit54K9-3wdosZppTrsymIoUk,19
+vantage6-5.0.0a20.dist-info/RECORD,,