vantage6 5.0.0a19__tar.gz → 5.0.0a20__tar.gz

{vantage6-5.0.0a19 → vantage6-5.0.0a20}/PKG-INFO

@@ -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
@@ -112,7 +112,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 → vantage6-5.0.0a20}/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-5.0.0a20/vantage6/cli/__build__

@@ -0,0 +1 @@
+20

{vantage6-5.0.0a19 → vantage6-5.0.0a20}/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-5.0.0a19 → vantage6-5.0.0a20}/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-5.0.0a19 → vantage6-5.0.0a20}/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 → vantage6-5.0.0a20}/vantage6.egg-info/PKG-INFO

@@ -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
@@ -112,7 +112,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 → vantage6-5.0.0a20}/vantage6.egg-info/requires.txt

@@ -9,8 +9,8 @@ questionary==1.10.0
 rich==13.5.2
 schema==0.7.5
 sqlalchemy==2.0.37
-vantage6-common==5.0.0a19
-vantage6-client==5.0.0a19
+vantage6-common==5.0.0a20
+vantage6-client==5.0.0a20
 
 [dev]
 coverage==6.4.4

vantage6-5.0.0a19/vantage6/cli/__build__

@@ -1 +0,0 @@
-19