vantage6 4.0.0a8__py3-none-any.whl → 4.0.0a10__py3-none-any.whl

vantage6/cli/__build__

@@ -1 +1 @@
-8
+10

vantage6/cli/dev.py

@@ -249,7 +249,10 @@ def create_vserver_config(server_name: str, port: int) -> Path:
         loader=FileSystemLoader(PACKAGE_FOLDER / APPNAME / "cli" / "template"),
         trim_blocks=True, lstrip_blocks=True, autoescape=True)
     template = environment.get_template("server_config.j2")
-    server_config = template.render(port=port)
+    server_config = template.render(
+        port=port,
+        jwt_secret_key=generate_apikey()
+    )
     folders = ServerContext.instance_folders(
         instance_type='server', instance_name=server_name,
         system_folders=True)

vantage6/cli/node.py

@@ -36,7 +36,8 @@ from vantage6.common.globals import (
     STRING_ENCODING,
     APPNAME,
     DEFAULT_DOCKER_REGISTRY,
-    DEFAULT_NODE_IMAGE
+    DEFAULT_NODE_IMAGE,
+    DEFAULT_NODE_IMAGE_WO_TAG,
 )
 from vantage6.common.globals import VPN_CONFIG_FILE
 from vantage6.common.docker.addons import (
@@ -312,6 +313,32 @@ def vnode_start(name: str, config: str, system_folders: bool,
         custom_images: dict = ctx.config.get('images')
         if custom_images:
             image = custom_images.get("node")
+
+        # if no custom image is specified, find the server version and use
+        # the latest images from that minor version
+        client = _create_client(ctx)
+        major_minor = None
+        try:
+            # try to get server version, skip if can't get a connection
+            version = client.util.get_server_version(
+                attempts_on_timeout=3
+            )['version']
+            major_minor = '.'.join(version.split('.')[:2])
+            image = (f"{DEFAULT_DOCKER_REGISTRY}/{DEFAULT_NODE_IMAGE_WO_TAG}"
+                     f":{major_minor}")
+        except Exception:
+            warning("Could not determine server version. Using default node "
+                    "image")
+            pass  # simply use the default image
+
+        if major_minor and not __version__.startswith(major_minor):
+            warning(
+                "Version mismatch between CLI and server/node. CLI is running "
+                f"on version {__version__}, while node and server are on "
+                f"version {major_minor}. This might cause unexpected issues; "
+                f"changing to {major_minor}.<latest> is recommended."
+            )
+
         if not image:
             image = f"{DEFAULT_DOCKER_REGISTRY}/{DEFAULT_NODE_IMAGE}"
 
@@ -970,36 +997,55 @@ def _print_log_worker(logs_stream: Iterable[bytes]) -> None:
         print(log.decode(STRING_ENCODING), end="")
 
 
-def _create_client_and_authenticate(ctx: NodeContext) -> UserClient:
+def _create_client(ctx: NodeContext) -> UserClient:
     """
-    Generate a client and authenticate with the server.
+    Create a client instance.
 
     Parameters
     ----------
     ctx : NodeContext
         Context of the node loaded from the configuration file
-
     Returns
     -------
     UserClient
         vantage6 client
     """
     host = ctx.config['server_url']
+    # if the server is run locally, we need to use localhost here instead of
+    # the host address of docker
+    if host in ['http://host.docker.internal', 'http://172.17.0.1']:
+        host = 'http://localhost'
     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')
+
+
+def _create_client_and_authenticate(ctx: NodeContext) -> UserClient:
+    """
+    Generate a client and authenticate with the server.
+
+    Parameters
+    ----------
+    ctx : NodeContext
+        Context of the node loaded from the configuration file
+
+    Returns
+    -------
+    UserClient
+        vantage6 client
+    """
+    client = _create_client(ctx)
+
     username = q.text("Username:").ask()
     password = q.password("Password:").ask()
 
-    client = UserClient(host, port, api_path)
-
     try:
         client.authenticate(username, password)
 
-    except Exception as e:
+    except Exception as exc:
         error("Could not authenticate with server!")
-        debug(e)
+        debug(exc)
         exit(1)
 
     return client

vantage6/cli/server.py

@@ -209,16 +209,6 @@ def vserver_start(ctx: ServerContext, ip: str, port: int, image: str,
     # Then we check if the image has been specified in the config file, and
     # finally we use the default settings from the package.
     if image is None:
-
-        # FIXME: remove me in version 4+, as this is to support older
-        # configuration files. So the outer `image` key is no longer supported
-        # Note that this was implicitly supported in version 3.* for server as
-        # well
-        if ctx.config.get('image'):
-            warning('Using the `image` option in the config file is to be '
-                    'removed in version 4+.')
-            image = ctx.config.get('image')
-
         custom_images: dict = ctx.config.get('images')
         if custom_images:
             image = custom_images.get('server')

vantage6/cli/template/server_config.j2

@@ -12,3 +12,4 @@ logging:
   use_console: true
 port: {{ port }}
 uri: sqlite:///default.sqlite
+jwt_secret_key: {{ jwt_secret_key }}

{vantage6-4.0.0a8.dist-info → vantage6-4.0.0a10.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: vantage6
-Version: 4.0.0a8
+Version: 4.0.0a10
 Summary: vantage6 command line interface
 Home-page: https://github.com/vantage6/vantage6
 Requires-Python: >=3.10
@@ -13,8 +13,8 @@ Requires-Dist: jinja2 ==3.1.2
 Requires-Dist: questionary ==1.10.0
 Requires-Dist: schema ==0.7.5
 Requires-Dist: SQLAlchemy ==1.4.46
-Requires-Dist: vantage6-common ==4.0.0a8
-Requires-Dist: vantage6-client ==4.0.0a8
+Requires-Dist: vantage6-common ==4.0.0a10
+Requires-Dist: vantage6-client ==4.0.0a10
 Provides-Extra: dev
 Requires-Dist: coverage ==6.4.4 ; extra == 'dev'
 

{vantage6-4.0.0a8.dist-info → vantage6-4.0.0a10.dist-info}/RECORD

@@ -3,26 +3,26 @@ tests_cli/test_example.py,sha256=TV8JA52UR-Yh1WeVwx8g8ngA9ZTiRCwsJkUKxsXUXMg,147
 tests_cli/test_node_cli.py,sha256=WnJ5IBbP-hT4WY7dxx0H3hvoG8hP13K7lPyCrFhGJyE,14667
 tests_cli/test_server_cli.py,sha256=of88K23UqY4puDEs-6Q7P-Au8p4cjOtFpf-EyK7eyvg,5858
 tests_cli/test_wizard.py,sha256=dRrOScN79z8nKGNWmn6tPAVfnDOmCsGckiDJMKufhms,3580
-vantage6/cli/__build__,sha256=LGJCMs3SIXcSlN-7MQrKAAoN9qyLZraW2Q7wb977ZKM,1
+vantage6/cli/__build__,sha256=SkTcFTZCBKgP6A6QOUVcwWCCgYIP4rJPHlIzreavHdU,2
 vantage6/cli/__init__.py,sha256=dEbhLHe9VfU3otY3CQkMVrj39uPGWjqzAvHW2B2Flgs,62
 vantage6/cli/_version.py,sha256=IZvEcyXbRmjO6iYbFQyllAnSW6LWidVvFrVIAyEhFS4,684
 vantage6/cli/configuration_manager.py,sha256=4EHlOW16nfIiplzA0sw9udc4-VLKcmdKgWzzFa5Nw7A,3841
 vantage6/cli/configuration_wizard.py,sha256=c8L4xm9_HYjAkyTmRmLDMwzTDqdKdgnBZy915TAIfRI,11569
 vantage6/cli/context.py,sha256=Q8d-PYq_hBB8chXv1qlI9jYfVVIv2X6BOC-PGmWgptw,13183
-vantage6/cli/dev.py,sha256=Nd5MS1gPVHyVoDCTpZxQkvSUSm7b06bIb7QSXKKqRmo,15742
+vantage6/cli/dev.py,sha256=wpoemItUXJW5aPDiMKwuS5YAhJJsWhIYdcLSWeJLPSE,15798
 vantage6/cli/globals.py,sha256=5mo7pv45gXhDtG7phSYdK_D9_LPFuBM8bVABgt-J-BY,778
-vantage6/cli/node.py,sha256=mV3Hx01JicWZiUJnD_uRiP3FRyCAui8HalvY45zsmh8,35785
-vantage6/cli/server.py,sha256=yIbGLyzY3FBZmR_0D8rNmsJn3-gtrLGyjoLw_0-Pf5M,34955
+vantage6/cli/node.py,sha256=J8fk3Lnw7XuaSs9KtkyHlKMtSNIbPt3btlPZNs7OZw4,37523
+vantage6/cli/server.py,sha256=DePFVddu0wm6hu5wEZhg8hRFp9tBpFZ80OKZ6orRAg8,34508
 vantage6/cli/utils.py,sha256=Lx1xYKXDBeHjJpXGkVAhidy79P-zV3TOQYfa2nMbvSs,2353
 vantage6/cli/rabbitmq/__init__.py,sha256=0cuoLZ3V1199PKI-Ew37leZmh77SOAYa8CKMLUUBgBs,737
 vantage6/cli/rabbitmq/definitions.py,sha256=aGFdwxzi7R28uaDS60iW3a-JCkV2F5w_T3oede0kWds,536
 vantage6/cli/rabbitmq/queue_manager.py,sha256=CG2Lx5RCpf2AjzaCvj9vrwrqJOlWbEqf89auX2iuXcU,7613
 vantage6/cli/rabbitmq/rabbitmq.config,sha256=LYAQAEoXaF472XeJDYXc9JfWSETIzPRIR2W-JB2i7fU,136
 vantage6/cli/template/node_config.j2,sha256=-IyUquZl4jRxb5DRBWvEbZFwz2lFtHG_1reZoSkeees,495
-vantage6/cli/template/server_config.j2,sha256=WIWdDA3qgp8UBeBdrKbrxZmyUg6F8hTTlG1v4ifgCSQ,331
+vantage6/cli/template/server_config.j2,sha256=d6O_K-VzJC3GHbCGVbXRWB4jTEzJHPz1VC7t3U8e0Tc,367
 vantage6/cli/template/server_import_config.j2,sha256=PRB0ym_FYjx9vhkmY9C0xzlv_85Y5kBfWdUYs089bNQ,1844
-vantage6-4.0.0a8.dist-info/METADATA,sha256=kUErERKV7oc8hY_jsPnWbfRAr4hv7dRo_S2j_4kVFBU,5710
-vantage6-4.0.0a8.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
-vantage6-4.0.0a8.dist-info/entry_points.txt,sha256=vSagHm3y33r8pUMgWW4kZCz-j35aDECRnYnViVNRvtI,126
-vantage6-4.0.0a8.dist-info/top_level.txt,sha256=CYDIBS8jEfFq5YCs_Fuit54K9-3wdosZppTrsymIoUk,19
-vantage6-4.0.0a8.dist-info/RECORD,,
+vantage6-4.0.0a10.dist-info/METADATA,sha256=Y7Th0V7F7P4JDCxUMB8fioYlWULVFoR7NS7ujB844Vw,5713
+vantage6-4.0.0a10.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
+vantage6-4.0.0a10.dist-info/entry_points.txt,sha256=vSagHm3y33r8pUMgWW4kZCz-j35aDECRnYnViVNRvtI,126
+vantage6-4.0.0a10.dist-info/top_level.txt,sha256=CYDIBS8jEfFq5YCs_Fuit54K9-3wdosZppTrsymIoUk,19
+vantage6-4.0.0a10.dist-info/RECORD,,