validio-cli 0.26.1__tar.gz → 0.27.0__tar.gz

{validio_cli-0.26.1 → validio_cli-0.27.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: validio-cli
-Version: 0.26.1
+Version: 0.27.0
 Summary: CLI tool to interact with the Validio platform
 Home-page: https://validio.io/
 License: Apache-2.0

{validio_cli-0.26.1 → validio_cli-0.27.0}/pyproject.toml

@@ -3,7 +3,7 @@ name = "validio-cli"
 # This version does not represent the released version or any tag. For each
 # release we automatically bump this before building and publishing so this
 # should be kept at 0.0.1dev1
-version = "0.26.1"
+version = "0.27.0"
 description = "CLI tool to interact with the Validio platform"
 authors = ["Validio <support@validio.io>"]
 license = "Apache-2.0"

{validio_cli-0.26.1 → validio_cli-0.27.0}/validio_cli/__init__.py

@@ -18,7 +18,6 @@ from validio_sdk import config
 from validio_sdk._api.api import APIClient
 from validio_sdk.config import Config, ValidioConfig
 from validio_sdk.util import ClassJSONEncoder
-from validio_sdk.validio_client import ValidioAPIClient
 
 F = TypeVar("F", bound=Callable[..., Any])
 T = TypeVar("T", bound="OutputSettings")
@@ -101,15 +100,6 @@ def get_client(
     return APIClient(config=cfg), cfg
 
 
-async def get_client_and_config(
-    config_dir: str = ConfigDir,
-) -> tuple[ValidioAPIClient, ValidioConfig]:
-    cfg = Config(Path(config_dir)).read()
-    vc = ValidioAPIClient(validio_config=cfg)
-
-    return vc, cfg
-
-
 @dataclass
 class OutputSettings:
     attribute_name: str | None = None

{validio_cli-0.26.1 → validio_cli-0.27.0}/validio_cli/bin/entities/config.py

@@ -1,5 +1,6 @@
 from pathlib import Path
 from typing import Any
+from urllib.parse import urlparse
 
 import typer
 from prompt_toolkit import PromptSession
@@ -13,6 +14,7 @@ from validio_sdk.config import (
     ConfigNotFoundError,
     ValidioConfig,
 )
+from validio_sdk.exception import _show_trace
 
 import validio_cli
 from validio_cli import (
@@ -35,7 +37,11 @@ async def init(config_dir: str = ConfigDir) -> None:
 
     current_config = cfg.read() if cfg.config_path.is_file() else None
 
+    print("Address to Validio, should start with 'https://' and usually have no path")
+    print("Example: https://my-company.validio.io\n")
+
     while True:
+        print("-" * 50)
         current_config = await _prompt_for_config(current_config)
 
         print()
@@ -53,8 +59,7 @@ async def init(config_dir: str = ConfigDir) -> None:
         if failure_reason is None:
             break
 
-        print(f"\n⛔️ Configuration test failed: {failure_reason}\n")
-        print("Please correct the configuration\n")
+        print(f"\n{failure_reason}\n")
 
     cfg.write(current_config)
 
@@ -150,20 +155,44 @@ async def _prompt_for_config(current_config: ValidioConfig | None) -> ValidioCon
     endpoint_completer = WordCompleter(["http://localhost:8889"])
 
     session: PromptSession = PromptSession()
-    current_config.endpoint = (
-        await session.prompt_async(
-            validio_cli._fixed_width("Validio endpoint URI"),
-            completer=endpoint_completer,
-            default=current_config.endpoint,
-        )
-    ).strip()
 
-    current_config.access_key = (
-        await session.prompt_async(
-            validio_cli._fixed_width("API access key ID"),
-            default=current_config.access_key,
+    while True:
+        validio_endpoint = (
+            (
+                await session.prompt_async(
+                    validio_cli._fixed_width("Validio URL"),
+                    completer=endpoint_completer,
+                    default=current_config.endpoint,
+                )
+            )
+            .strip()
+            .strip("/")
         )
-    ).strip()
+
+        current_config.endpoint = validio_endpoint
+
+        try:
+            result = urlparse(validio_endpoint)
+            assert all([result.scheme, result.netloc])
+
+            break
+        except Exception:
+            print("\nValidio URL must be a valid URL")
+
+    while True:
+        api_key = (
+            await session.prompt_async(
+                validio_cli._fixed_width("API access key ID"),
+                default=current_config.access_key,
+            )
+        ).strip()
+
+        current_config.access_key = api_key
+
+        if api_key.startswith("APK_"):
+            break
+
+        print("\nAPI access key ID should start with 'APK_'")
 
     current_config.access_secret = (
         await session.prompt_async(
@@ -178,4 +207,13 @@ async def _prompt_for_config(current_config: ValidioConfig | None) -> ValidioCon
 
 async def _test_configuration(config: ValidioConfig) -> str | None:
     vc = APIClient(config=config)
-    return await vc.test_connection()
+
+    try:
+        await vc.test_connection()
+    except Exception as e:
+        if _show_trace():
+            raise e
+
+        return str(e)
+
+    return None