validio-cli 0.6.4__tar.gz → 0.6.6__tar.gz

{validio_cli-0.6.4 → validio_cli-0.6.6}/PKG-INFO

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

{validio_cli-0.6.4 → validio_cli-0.6.6}/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.6.4"
+version = "0.6.6"
 description = "CLI tool to interact with the Validio platform"
 authors = ["Validio <support@validio.io>"]
 license = "Apache-2.0"

{validio_cli-0.6.4 → validio_cli-0.6.6}/validio_cli/bin/entities/code.py

@@ -1,3 +1,4 @@
+import os
 import pathlib
 import re
 import sys
@@ -57,6 +58,11 @@ diff_option = typer.Option(
     help="Show only the changed lines (added, removed, or modified)",
 )
 
+color_option = typer.Option(
+    not os.environ.get("NO_COLOR", False),
+    help="Enable colored output",
+)
+
 destroy_option = typer.Option(
     False, help="Deletes all resources associated with the project"
 )
@@ -113,6 +119,7 @@ async def plan(
     diff_output: DiffOutput = diff_option,
     destroy: bool = destroy_option,
     show_secrets: bool = show_secrets_option,
+    color: bool = color_option,
 ):
     dir_path = directory_or_default(directory)
     client, _ = await get_client_and_config(config_dir)
@@ -129,6 +136,7 @@ async def plan(
         schema_reinference=schema_reinference,
         destroy=destroy,
         no_capture=no_capture,
+        color=color,
         show_schema=show_schema,
         diff_output=diff_output,
         show_secrets=show_secrets,
@@ -149,6 +157,7 @@ async def apply(
     diff_output: DiffOutput = diff_option,
     destroy: bool = destroy_option,
     show_secrets: bool = show_secrets_option,
+    color: bool = color_option,
 ):
     dir_path = directory_or_default(directory)
     client, _ = await get_client_and_config(config_dir)
@@ -165,6 +174,7 @@ async def apply(
         schema_reinference=schema_reinference,
         destroy=destroy,
         no_capture=no_capture,
+        color=color,
         show_schema=show_schema,
         diff_output=diff_output,
         show_secrets=show_secrets,
@@ -258,6 +268,7 @@ async def _import(
         directory=dir_path,
         schema_reinference=create_source_schema_reinference([], False),
         destroy=False,
+        color=False,
         no_capture=no_capture,
         show_schema=False,
         show_secrets=False,
@@ -289,6 +300,7 @@ async def _plan(
     schema_reinference: SourceSchemaReinference,
     destroy: bool,
     no_capture: bool,
+    color: bool,
     show_schema: bool = False,
     diff_output: DiffOutput = DiffOutput.FULL,
     show_secrets: bool = False,
@@ -313,7 +325,7 @@ async def _plan(
             diff=diff,
             show_schema=show_schema,
             show_secrets=show_secrets,
-            escape=sys.stdout.isatty(),
+            escape=sys.stdout.isatty() and color,
             diff_output=diff_output,
         )
 

{validio_cli-0.6.4 → validio_cli-0.6.6}/validio_cli/bin/entities/config.py

@@ -1,7 +1,5 @@
 import asyncio
-from collections.abc import Iterable
 from pathlib import Path
-from typing import Any
 
 import httpx
 import typer
@@ -18,10 +16,20 @@ from validio_sdk.config import (
 from validio_sdk.validio_client import UnauthorizedError, ValidioAPIClient
 
 import validio_cli
+from validio_cli import (
+    AsyncTyper,
+    ConfigDir,
+    OutputFormat,
+    OutputFormatOption,
+    output_json,
+)
 
+app = AsyncTyper(help="Configuration for Validio")
 
-def create_or_update(default_config_path: str | None = None):
-    config_path = Path(default_config_path) if default_config_path is not None else None
+
+@app.command(help="Create or edit current credentials")
+def edit(config_dir: str = ConfigDir):
+    config_path = Path(config_dir) if config_dir is not None else None
 
     cfg = Config(config_path)
     create_type = "updated" if cfg.config_path.is_file() else "created"
@@ -51,15 +59,30 @@ def create_or_update(default_config_path: str | None = None):
     print(f"\n🎉 Configuration {create_type} successfully!")
 
 
-def show(default_config_path: str | None = None):
-    config_path = Path(default_config_path) if default_config_path is not None else None
+@app.command(help="Set default namespace to target")
+def ns(
+    config_dir: str = ConfigDir,
+    namespace: str = typer.Argument(
+        "default",
+        help="Set default namespace to target from CLI",
+    ),
+):
+    set_default_namespace(namespace or "default", config_dir)
+
+
+@app.command(help="List current configuration")
+def get(
+    config_dir: str = ConfigDir,
+    output_format: OutputFormat = OutputFormatOption,
+):
+    config_path = Path(config_dir) if config_dir is not None else None
 
     cfg = Config(config_path)
     try:
         validio_config = cfg.read()
     except ConfigNotFoundError:
         if confirm("🚫 No configuration found - do you want to create one?"):
-            return create_or_update(default_config_path)
+            return edit(config_dir)
 
         raise typer.Exit(code=1)
     except ConfigInvalidError:
@@ -68,7 +91,7 @@ def show(default_config_path: str | None = None):
             " create a new one?"
         ):
             cfg.remove()
-            return create_or_update(default_config_path)
+            return edit(config_dir)
 
         raise typer.Exit(code=1)
 
@@ -78,15 +101,23 @@ def show(default_config_path: str | None = None):
 
         return value
 
-    table: Iterable[Iterable[Any]] = [
-        ["Path", cfg.config_path],
-        ["Default namespace", validio_config.default_namespace],
-        ["Endpoint", _highlight_if_missing(validio_config.endpoint)],
-        ["Access key", _highlight_if_missing(validio_config.access_key)],
-        ["Access secret", _highlight_if_missing(validio_config.access_secret)],
-    ]
+    settings = {
+        "config_path": cfg.config_path,
+        "default_namespace": validio_config.default_namespace,
+        "endpoint": validio_config.endpoint,
+        "access_key": validio_config.access_key,
+        "access_secret": validio_config.access_secret,
+    }
+
+    if output_format == OutputFormat.JSON:
+        return output_json(settings)
+
+    table = [["KEY", "VALUE"]]
+
+    for k, v in settings.items():
+        table.append([k.capitalize().replace("_", " "), _highlight_if_missing(v)])
 
-    print(tabulate(table))
+    print(tabulate(table, tablefmt="plain"))
 
     return None
 

{validio_cli-0.6.4 → validio_cli-0.6.6}/validio_cli/bin/entities/sources.py

@@ -121,7 +121,7 @@ async def start(
     if output_format == OutputFormat.JSON:
         return output_json(result)
 
-    return print(result.state.value)
+    return print(result.state)
 
 
 @app.async_command(help="Stop source")
@@ -144,7 +144,7 @@ async def stop(
     if output_format == OutputFormat.JSON:
         return output_json(result)
 
-    return print(result.state.value)
+    return print(result.state)
 
 
 @app.async_command(help="Backfill source")
@@ -167,7 +167,7 @@ async def backfill(
     if output_format == OutputFormat.JSON:
         return output_json(result)
 
-    return print(result.state.value)
+    return print(result.state)
 
 
 @infer_schema_app.callback(invoke_without_command=True)

{validio_cli-0.6.4 → validio_cli-0.6.6}/validio_cli/bin/main.py

@@ -8,10 +8,10 @@ from tabulate import tabulate
 from validio_sdk.validio_client import UnauthorizedError
 
 import validio_cli.metadata
-from validio_cli import ConfigDir
 from validio_cli.bin.entities import (
     channels,
     code,
+    config,
     credentials,
     destinations,
     incidents,
@@ -26,7 +26,6 @@ from validio_cli.bin.entities import (
     validators,
     windows,
 )
-from validio_cli.bin.entities import config as cfg
 
 app = typer.Typer(
     help="Validio CLI tool", no_args_is_help=True, pretty_exceptions_enable=False
@@ -34,6 +33,7 @@ app = typer.Typer(
 
 app.add_typer(channels.app, no_args_is_help=True, name="channels")
 app.add_typer(code.app, no_args_is_help=True, name="code")
+app.add_typer(config.app, no_args_is_help=True, name="config")
 app.add_typer(credentials.app, no_args_is_help=True, name="credentials")
 app.add_typer(destinations.app, no_args_is_help=True, name="destinations")
 app.add_typer(incidents.app, no_args_is_help=True, name="incidents")
@@ -49,29 +49,6 @@ app.add_typer(validators.app, no_args_is_help=True, name="validators")
 app.add_typer(windows.app, no_args_is_help=True, name="windows")
 
 
-@app.command()
-def config(
-    config_dir: str = ConfigDir,
-    show: bool = typer.Option(
-        False,
-        help="Show current configuration",
-    ),
-    default_namespace: str = typer.Option(
-        None,
-        help="Set default namespace to target from CLI",
-    ),
-):
-    """
-    Initialize the CLI tool to set endpoint, credentials and more.
-    """
-    if show:
-        cfg.show(config_dir)
-    elif default_namespace:
-        cfg.set_default_namespace(default_namespace, config_dir)
-    else:
-        cfg.create_or_update(config_dir)
-
-
 @app.command(help="Show current version")
 def version():
     print(