glaip-sdk 0.0.14__py3-none-any.whl → 0.0.15__py3-none-any.whl

glaip_sdk/cli/commands/agents.py

@@ -23,6 +23,7 @@ from glaip_sdk.cli.agent_config import (
 from glaip_sdk.cli.agent_config import (
     sanitize_agent_config_for_cli as sanitize_agent_config,
 )
+from glaip_sdk.cli.context import detect_export_format, get_ctx_value, output_flags
 from glaip_sdk.cli.display import (
     build_resource_result_data,
     display_agent_run_suggestions,
@@ -48,10 +49,7 @@ from glaip_sdk.cli.utils import (
     _fuzzy_pick_for_resources,
     build_renderer,
     coerce_to_row,
-    detect_export_format,
     get_client,
-    get_ctx_value,
-    output_flags,
     output_list,
     output_result,
     spinner_context,

glaip_sdk/cli/commands/mcps.py

@@ -13,6 +13,7 @@ import click
 from rich.console import Console
 from rich.text import Text
 
+from glaip_sdk.cli.context import detect_export_format, get_ctx_value, output_flags
 from glaip_sdk.cli.display import (
     display_api_error,
     display_confirmation_prompt,
@@ -34,10 +35,7 @@ from glaip_sdk.cli.parsers.json_input import parse_json_input
 from glaip_sdk.cli.resolution import resolve_resource_reference
 from glaip_sdk.cli.utils import (
     coerce_to_row,
-    detect_export_format,
     get_client,
-    get_ctx_value,
-    output_flags,
     output_list,
     output_result,
     spinner_context,

glaip_sdk/cli/commands/models.py

@@ -9,9 +9,9 @@ from typing import Any
 import click
 from rich.console import Console
 
+from glaip_sdk.cli.context import output_flags
 from glaip_sdk.cli.utils import (
     get_client,
-    output_flags,
     output_list,
     spinner_context,
 )

glaip_sdk/cli/commands/tools.py

@@ -13,6 +13,7 @@ import click
 from rich.console import Console
 from rich.text import Text
 
+from glaip_sdk.cli.context import detect_export_format, get_ctx_value, output_flags
 from glaip_sdk.cli.display import (
     display_api_error,
     display_confirmation_prompt,
@@ -34,10 +35,7 @@ from glaip_sdk.cli.io import (
 from glaip_sdk.cli.resolution import resolve_resource_reference
 from glaip_sdk.cli.utils import (
     coerce_to_row,
-    detect_export_format,
     get_client,
-    get_ctx_value,
-    output_flags,
     output_list,
     output_result,
     spinner_context,

glaip_sdk/cli/context.py

@@ -0,0 +1,142 @@
+"""Context-related helpers for the glaip CLI.
+
+Authors:
+    Putu Ravindra Wiguna (putu.r.wiguna@gdplabs.id)
+"""
+
+from __future__ import annotations
+
+from collections.abc import Callable
+from pathlib import Path
+from typing import Any
+
+import click
+
+__all__ = [
+    "get_ctx_value",
+    "_get_view",
+    "_set_view",
+    "_set_json",
+    "output_flags",
+    "detect_export_format",
+]
+
+
+def get_ctx_value(ctx: Any, key: str, default: Any = None) -> Any:
+    """Safely resolve a value from a click context object.
+
+    Args:
+        ctx: Click context object to extract value from
+        key: Key to retrieve from the context
+        default: Default value if key is not found
+
+    Returns:
+        The value associated with the key, or the default if not found
+    """
+    if ctx is None:
+        return default
+
+    obj = getattr(ctx, "obj", None)
+    if obj is None:
+        return default
+
+    if isinstance(obj, dict):
+        return obj.get(key, default)
+
+    getter = getattr(obj, "get", None)
+    if callable(getter):
+        try:
+            return getter(key, default)
+        except TypeError:
+            return default
+
+    return getattr(obj, key, default) if hasattr(obj, key) else default
+
+
+def _get_view(ctx: Any) -> str:
+    """Resolve the active view preference from context.
+
+    Args:
+        ctx: Click context object containing view preferences
+
+    Returns:
+        The view format string (rich, plain, json, md), defaults to 'rich'
+    """
+    view = get_ctx_value(ctx, "view")
+    if view:
+        return view
+
+    fallback = get_ctx_value(ctx, "format")
+    return fallback or "rich"
+
+
+def _set_view(ctx: Any, _param: Any, value: str) -> None:
+    """Click callback to persist the `--view/--output` option.
+
+    Args:
+        ctx: Click context object to store the view preference
+        _param: Click parameter object (unused)
+        value: The view format string to store
+    """
+    if not value:
+        return
+    ctx.ensure_object(dict)
+    ctx.obj["view"] = value
+
+
+def _set_json(ctx: Any, _param: Any, value: bool) -> None:
+    """Click callback for the `--json` shorthand flag.
+
+    Args:
+        ctx: Click context object to store the view preference
+        _param: Click parameter object (unused)
+        value: Boolean flag indicating json mode
+    """
+    if not value:
+        return
+    ctx.ensure_object(dict)
+    ctx.obj["view"] = "json"
+
+
+def output_flags() -> Callable[[Callable[..., Any]], Callable[..., Any]]:
+    """Decorator to add shared output flags (`--view`, `--json`) to commands.
+
+    Returns:
+        A decorator function that adds output format options to click commands
+    """
+
+    def decorator(f: Callable[..., Any]) -> Callable[..., Any]:
+        f = click.option(
+            "--json",
+            "json_mode",
+            is_flag=True,
+            expose_value=False,
+            help="Shortcut for --view json",
+            callback=_set_json,
+        )(f)
+        f = click.option(
+            "-o",
+            "--output",
+            "--view",
+            "view_opt",
+            type=click.Choice(["rich", "plain", "json", "md"]),
+            expose_value=False,
+            help="Output format",
+            callback=_set_view,
+        )(f)
+        return f
+
+    return decorator
+
+
+def detect_export_format(file_path: str | Path) -> str:
+    """Detect the export format from the file extension.
+
+    Args:
+        file_path: Path to the file to analyze
+
+    Returns:
+        The format string ('yaml' or 'json') based on file extension
+    """
+    path = Path(file_path)
+    return "yaml" if path.suffix.lower() in {".yaml", ".yml"} else "json"

glaip_sdk/cli/masking.py

@@ -0,0 +1,148 @@
+"""Masking helpers for CLI output.
+
+Authors:
+    Putu Ravindra Wiguna (putu.r.wiguna@gdplabs.id)
+"""
+
+from __future__ import annotations
+
+import os
+from typing import Any
+
+__all__ = [
+    "mask_payload",
+    "mask_rows",
+    "_mask_value",
+    "_mask_any",
+    "_maybe_mask_row",
+    "_resolve_mask_fields",
+]
+
+_DEFAULT_MASK_FIELDS = {
+    "api_key",
+    "apikey",
+    "token",
+    "access_token",
+    "secret",
+    "client_secret",
+    "password",
+    "private_key",
+    "bearer",
+}
+
+
+def _mask_value(raw: Any) -> str:
+    """Return a masked representation of the provided value.
+
+    Args:
+        raw: The raw value to mask, converted to string.
+
+    Returns:
+        str: A masked representation showing first 4 and last 4 characters
+             separated by dots, or "••••" for strings ≤ 8 characters.
+    """
+    text = str(raw)
+    if len(text) <= 8:
+        return "••••"
+    return f"{text[:4]}••••••••{text[-4:]}"
+
+
+def _mask_any(value: Any, mask_fields: set[str]) -> Any:
+    """Recursively mask sensitive fields in mappings and iterables.
+
+    Args:
+        value: The value to process - can be dict, list, or any other type.
+        mask_fields: Set of field names (lowercase) that should be masked.
+
+    Returns:
+        Any: The processed value with sensitive fields masked. Dicts and lists
+             are processed recursively, other values are returned unchanged.
+    """
+    if isinstance(value, dict):
+        masked: dict[Any, Any] = {}
+        for key, raw in value.items():
+            if isinstance(key, str) and key.lower() in mask_fields and raw is not None:
+                masked[key] = _mask_value(raw)
+            else:
+                masked[key] = _mask_any(raw, mask_fields)
+        return masked
+
+    if isinstance(value, list):
+        return [_mask_any(item, mask_fields) for item in value]
+
+    return value
+
+
+def _maybe_mask_row(row: dict[str, Any], mask_fields: set[str]) -> dict[str, Any]:
+    """Mask a single row when masking is enabled.
+
+    Args:
+        row: A dictionary representing a single row of data.
+        mask_fields: Set of field names to mask. If empty, returns row unchanged.
+
+    Returns:
+        dict[str, Any]: The row with sensitive fields masked, or the original
+                       row if no mask_fields are provided.
+    """
+    if not mask_fields:
+        return row
+    return _mask_any(row, mask_fields)
+
+
+def _resolve_mask_fields() -> set[str]:
+    """Resolve the set of sensitive fields to mask based on environment.
+
+    Returns:
+        set[str]: Set of field names to mask. Empty set if masking is disabled
+                 via AIP_MASK_OFF environment variable, custom fields from
+                 AIP_MASK_FIELDS, or default fields if neither is set.
+    """
+    if os.getenv("AIP_MASK_OFF", "0") in {"1", "true", "on", "yes"}:
+        return set()
+
+    env_fields = (os.getenv("AIP_MASK_FIELDS") or "").strip()
+    if env_fields:
+        parts = [part.strip().lower() for part in env_fields.split(",") if part.strip()]
+        return set(parts)
+
+    return set(_DEFAULT_MASK_FIELDS)
+
+
+def mask_payload(payload: Any) -> Any:
+    """Mask sensitive values in an arbitrary payload when masking is enabled.
+
+    Args:
+        payload: Any data structure (dict, list, or primitive) to mask.
+
+    Returns:
+        Any: The payload with sensitive fields masked based on environment
+             configuration. Returns original payload if masking is disabled
+             or if an error occurs during masking.
+    """
+    mask_fields = _resolve_mask_fields()
+    if not mask_fields:
+        return payload
+    try:
+        return _mask_any(payload, mask_fields)
+    except Exception:
+        return payload
+
+
+def mask_rows(rows: list[dict[str, Any]]) -> list[dict[str, Any]]:
+    """Mask sensitive values in row-oriented data when masking is enabled.
+
+    Args:
+        rows: List of dictionaries representing rows of tabular data.
+
+    Returns:
+        list[dict[str, Any]]: List of rows with sensitive fields masked based
+                              on environment configuration. Returns original
+                              rows if masking is disabled or if an error occurs.
+    """
+    mask_fields = _resolve_mask_fields()
+    if not mask_fields:
+        return rows
+    try:
+        return [_maybe_mask_row(row, mask_fields) for row in rows]
+    except Exception:
+        return rows

glaip_sdk/cli/pager.py

@@ -0,0 +1,271 @@
+"""Pager-related helpers for CLI output.
+
+Authors:
+    Putu Ravindra Wiguna (putu.r.wiguna@gdplabs.id)
+"""
+
+from __future__ import annotations
+
+import io
+import os
+import platform
+import shlex
+import shutil
+import subprocess
+import tempfile
+from collections.abc import Callable
+from typing import Any
+
+from rich.console import Console
+
+__all__ = [
+    "console",
+    "_prepare_pager_env",
+    "_render_ansi",
+    "_pager_header",
+    "_should_use_pager",
+    "_resolve_pager_command",
+    "_run_less_pager",
+    "_run_more_pager",
+    "_run_pager_with_temp_file",
+    "_page_with_system_pager",
+    "_should_page_output",
+]
+
+console: Console | None = None
+
+
+def _get_console() -> Console:
+    """Return the active console instance.
+
+    Returns:
+        Console: The active Rich console instance
+    """
+    global console
+    try:
+        from glaip_sdk.cli import utils as cli_utils
+    except Exception:  # pragma: no cover - fallback during import cycles
+        cli_utils = None
+
+    current_console = getattr(cli_utils, "console", None) if cli_utils else None
+    if current_console is not None and current_console is not console:
+        console = current_console
+
+    if console is None:
+        console = Console()
+    return console
+
+
+def _prepare_pager_env(clear_on_exit: bool = True) -> None:
+    """
+    Configure LESS flags for a predictable, high-quality UX:
+      -R  : pass ANSI color escapes
+      -S  : chop long lines (horizontal scroll with ←/→)
+    (No -F, no -X) so we open a full-screen pager and clear on exit.
+    Toggle wrapping with AIP_PAGER_WRAP=1 to drop -S.
+    Power users can override via AIP_LESS_FLAGS.
+
+    Args:
+        clear_on_exit: Whether to clear the pager on exit (default: True)
+
+    Returns:
+        None
+    """
+    os.environ.pop("LESSSECURE", None)
+    if os.getenv("LESS") is None:
+        want_wrap = os.getenv("AIP_PAGER_WRAP", "0") == "1"
+        base = "-R" if want_wrap else "-RS"
+        default_flags = base if clear_on_exit else (base + "FX")
+        os.environ["LESS"] = os.getenv("AIP_LESS_FLAGS", default_flags)
+
+
+def _render_ansi(renderable: Any) -> str:
+    """Render a Rich renderable to an ANSI string suitable for piping to 'less'.
+
+    Args:
+        renderable: Any Rich-compatible renderable object
+
+    Returns:
+        str: ANSI string representation of the renderable
+    """
+    active_console = _get_console()
+    buf = io.StringIO()
+    tmp_console = Console(
+        file=buf,
+        force_terminal=True,
+        color_system=active_console.color_system or "auto",
+        width=active_console.size.width or 100,
+        legacy_windows=False,
+        soft_wrap=False,
+        record=False,
+    )
+    tmp_console.print(renderable)
+    return buf.getvalue()
+
+
+def _pager_header() -> str:
+    """Generate pager header with navigation instructions.
+
+    Returns:
+        str: Header text containing navigation help, or empty string if disabled
+    """
+    v = (os.getenv("AIP_PAGER_HEADER", "1") or "1").strip().lower()
+    if v in {"0", "false", "off"}:
+        return ""
+    return "\n".join(
+        [
+            "TABLE VIEW — ↑/↓ PgUp/PgDn, ←/→ horiz scroll (with -S), /search, n/N next/prev, h help, q quit",
+            "───────────────────────────────────────────────────────────────────────────────────────────────",
+            "",
+        ]
+    )
+
+
+def _should_use_pager() -> bool:
+    """Check if we should attempt to use a system pager.
+
+    Returns:
+        bool: True if we should use a pager, False otherwise
+    """
+    active_console = _get_console()
+    if not (active_console.is_terminal and os.isatty(1)):
+        return False
+    if (os.getenv("TERM") or "").lower() == "dumb":
+        return False
+    return True
+
+
+def _resolve_pager_command() -> tuple[list[str] | None, str | None]:
+    """Resolve the pager command and path to use.
+
+    Returns:
+        tuple[list[str] | None, str | None]: A tuple containing:
+            - list[str] | None: The pager command parts if PAGER is set to less, None otherwise
+            - str | None: The path to the less executable if found, None otherwise
+    """
+    pager_cmd = None
+    pager_env = os.getenv("PAGER")
+    if pager_env:
+        parts = shlex.split(pager_env)
+        if parts and os.path.basename(parts[0]).lower() == "less":
+            pager_cmd = parts
+
+    less_path = shutil.which("less")
+    return pager_cmd, less_path
+
+
+def _run_less_pager(
+    pager_cmd: list[str] | None, less_path: str | None, tmp_path: str
+) -> None:
+    """Run less pager with appropriate command and flags.
+
+    Args:
+        pager_cmd: Custom pager command parts if PAGER is set to less, None otherwise
+        less_path: Path to the less executable, None if not found
+        tmp_path: Path to temporary file containing content to display
+
+    Returns:
+        None
+    """
+    if pager_cmd:
+        subprocess.run([*pager_cmd, tmp_path], check=False)
+    else:
+        flags = os.getenv("LESS", "-RS").split()
+        subprocess.run([less_path, *flags, tmp_path], check=False)
+
+
+def _run_more_pager(tmp_path: str) -> None:
+    """Run more pager as fallback.
+
+    Args:
+        tmp_path: Path to temporary file containing content to display
+
+    Returns:
+        None
+
+    Raises:
+        FileNotFoundError: If more command is not found
+    """
+    more_path = shutil.which("more")
+    if more_path:
+        subprocess.run([more_path, tmp_path], check=False)
+    else:
+        raise FileNotFoundError("more command not found")
+
+
+def _run_pager_with_temp_file(
+    pager_runner: Callable[[str], None], ansi_text: str
+) -> bool:
+    """Run a pager using a temporary file containing the content.
+
+    Args:
+        pager_runner: Function that takes a temp file path and runs the pager
+        ansi_text: ANSI-formatted text content to display
+
+    Returns:
+        bool: True if pager executed successfully, False if there was an exception
+    """
+    _prepare_pager_env(clear_on_exit=True)
+    with tempfile.NamedTemporaryFile("w", delete=False, encoding="utf-8") as tmp:
+        tmp.write(_pager_header())
+        tmp.write(ansi_text)
+        tmp_path = tmp.name
+    try:
+        pager_runner(tmp_path)
+        return True
+    except Exception:
+        return False
+    finally:
+        try:
+            os.unlink(tmp_path)
+        except Exception:
+            pass
+
+
+def _page_with_system_pager(ansi_text: str) -> bool:
+    """Prefer 'less' with a temp file so stdin remains the TTY.
+
+    Args:
+        ansi_text: ANSI-formatted text content to display in the pager
+
+    Returns:
+        bool: True if pager was executed successfully, False otherwise
+    """
+    if not _should_use_pager():
+        return False
+
+    pager_cmd, less_path = _resolve_pager_command()
+
+    if pager_cmd or less_path:
+        return _run_pager_with_temp_file(
+            lambda tmp_path: _run_less_pager(pager_cmd, less_path, tmp_path), ansi_text
+        )
+
+    if platform.system().lower().startswith("win"):
+        return False
+
+    return _run_pager_with_temp_file(_run_more_pager, ansi_text)
+
+
+def _should_page_output(row_count: int, is_tty: bool) -> bool:
+    """Determine if output should be paginated based on content size and terminal.
+
+    Args:
+        row_count: Number of rows in the content to display
+        is_tty: Whether the output is going to a terminal
+
+    Returns:
+        bool: True if output should be paginated, False otherwise
+    """
+    active_console = _get_console()
+    pager_env = (os.getenv("AIP_PAGER", "auto") or "auto").lower()
+    if pager_env in ("0", "off", "false"):
+        return False
+    if pager_env in ("1", "on", "true"):
+        return is_tty
+    try:
+        term_h = active_console.size.height or 24
+        approx_lines = 5 + row_count
+        return is_tty and (approx_lines >= term_h * 0.5)
+    except Exception:
+        return is_tty

glaip_sdk/cli/utils.py

@@ -2,23 +2,17 @@
 
 Authors:
     Raymond Christopher (raymond.christopher@gdplabs.id)
+    Putu Ravindra Wiguna (putu.r.wiguna@gdplabs.id)
 """
 
 from __future__ import annotations
 
-import io
 import json
 import logging
 import os
-import platform
-import shlex
-import shutil
-import subprocess
 import sys
-import tempfile
 from collections.abc import Callable
 from contextlib import AbstractContextManager, nullcontext
-from pathlib import Path
 from typing import TYPE_CHECKING, Any
 
 import click
@@ -43,7 +37,9 @@ except Exception:  # pragma: no cover - optional dependency
 
 if TYPE_CHECKING:  # pragma: no cover - import-only during type checking
     from glaip_sdk import Client
+from glaip_sdk.cli import masking, pager
 from glaip_sdk.cli.commands.configure import load_config
+from glaip_sdk.cli.context import _get_view, get_ctx_value
 from glaip_sdk.rich_components import AIPPanel, AIPTable
 from glaip_sdk.utils import is_uuid
 from glaip_sdk.utils.rendering.renderer import (
@@ -53,182 +49,10 @@ from glaip_sdk.utils.rendering.renderer import (
 )
 
 console = Console()
+pager.console = console
 logger = logging.getLogger("glaip_sdk.cli.utils")
 
 
-# ----------------------------- Context helpers ---------------------------- #
-
-
-def get_ctx_value(ctx: Any, key: str, default: Any = None) -> Any:
-    """Safely resolve a value from click's context object."""
-    if ctx is None:
-        return default
-
-    obj = getattr(ctx, "obj", None)
-    if obj is None:
-        return default
-
-    if isinstance(obj, dict):
-        return obj.get(key, default)
-
-    getter = getattr(obj, "get", None)
-    if callable(getter):
-        try:
-            return getter(key, default)
-        except TypeError:
-            return default
-
-    return getattr(obj, key, default) if hasattr(obj, key) else default
-
-
-# ----------------------------- Pager helpers ----------------------------- #
-
-
-def _prepare_pager_env(
-    clear_on_exit: bool = True,
-) -> None:  # pragma: no cover - terminal UI setup
-    """
-    Configure LESS flags for a predictable, high-quality UX:
-      -R  : pass ANSI color escapes
-      -S  : chop long lines (horizontal scroll with ←/→)
-    (No -F, no -X) so we open a full-screen pager and clear on exit.
-    Toggle wrapping with AIP_PAGER_WRAP=1 to drop -S.
-    Power users can override via AIP_LESS_FLAGS.
-    """
-    os.environ.pop("LESSSECURE", None)
-    if os.getenv("LESS") is None:
-        want_wrap = os.getenv("AIP_PAGER_WRAP", "0") == "1"
-        base = "-R" if want_wrap else "-RS"
-        default_flags = base if clear_on_exit else (base + "FX")
-        os.environ["LESS"] = os.getenv("AIP_LESS_FLAGS", default_flags)
-
-
-def _render_ansi(
-    renderable: Any,
-) -> str:
-    """Render a Rich renderable to an ANSI string suitable for piping to 'less'."""
-    buf = io.StringIO()
-    tmp_console = Console(
-        file=buf,
-        force_terminal=True,
-        color_system=console.color_system or "auto",
-        width=console.size.width or 100,
-        legacy_windows=False,
-        soft_wrap=False,
-        record=False,
-    )
-    tmp_console.print(renderable)
-    return buf.getvalue()
-
-
-def _pager_header() -> str:
-    v = (os.getenv("AIP_PAGER_HEADER", "1") or "1").strip().lower()
-    if v in {"0", "false", "off"}:
-        return ""
-    return "\n".join(
-        [
-            "TABLE VIEW — ↑/↓ PgUp/PgDn, ←/→ horiz scroll (with -S), /search, n/N next/prev, h help, q quit",
-            "───────────────────────────────────────────────────────────────────────────────────────────────",
-            "",
-        ]
-    )
-
-
-def _should_use_pager() -> bool:
-    """Check if we should attempt to use a system pager."""
-    if not (console.is_terminal and os.isatty(1)):
-        return False
-    if (os.getenv("TERM") or "").lower() == "dumb":
-        return False
-    return True
-
-
-def _resolve_pager_command() -> tuple[list[str] | None, str | None]:
-    """Resolve the pager command and path to use."""
-    pager_cmd = None
-    pager_env = os.getenv("PAGER")
-    if pager_env:
-        parts = shlex.split(pager_env)
-        if parts and os.path.basename(parts[0]).lower() == "less":
-            pager_cmd = parts
-
-    less_path = shutil.which("less")
-    return pager_cmd, less_path
-
-
-def _run_less_pager(
-    pager_cmd: list[str] | None, less_path: str | None, tmp_path: str
-) -> None:
-    """Run less pager with appropriate command and flags."""
-    if pager_cmd:
-        subprocess.run([*pager_cmd, tmp_path], check=False)
-    else:
-        flags = os.getenv("LESS", "-RS").split()
-        subprocess.run([less_path, *flags, tmp_path], check=False)
-
-
-def _run_more_pager(tmp_path: str) -> None:
-    """Run more pager as fallback."""
-    more_path = shutil.which("more")
-    if more_path:
-        subprocess.run([more_path, tmp_path], check=False)
-    else:
-        raise FileNotFoundError("more command not found")
-
-
-def _run_pager_with_temp_file(
-    pager_runner: Callable[[str], None], ansi_text: str
-) -> bool:
-    """Run a pager using a temporary file containing the content."""
-    _prepare_pager_env(clear_on_exit=True)
-    with tempfile.NamedTemporaryFile("w", delete=False, encoding="utf-8") as tmp:
-        tmp.write(_pager_header())
-        tmp.write(ansi_text)
-        tmp_path = tmp.name
-    try:
-        pager_runner(tmp_path)
-        return True
-    except Exception:
-        # If pager fails, return False to indicate paging was not successful
-        return False
-    finally:
-        try:
-            os.unlink(tmp_path)
-        except Exception:
-            pass
-
-
-def _page_with_system_pager(
-    ansi_text: str,
-) -> bool:  # pragma: no cover - spawns real pager
-    """Prefer 'less' with a temp file so stdin remains the TTY."""
-    if not _should_use_pager():
-        return False
-
-    pager_cmd, less_path = _resolve_pager_command()
-
-    if pager_cmd or less_path:
-        return _run_pager_with_temp_file(
-            lambda tmp_path: _run_less_pager(pager_cmd, less_path, tmp_path), ansi_text
-        )
-
-    # Windows 'more' is poor with ANSI; let Rich fallback handle it
-    if platform.system().lower().startswith("win"):
-        return False
-
-    # POSIX 'more' fallback (may or may not honor ANSI)
-    return _run_pager_with_temp_file(_run_more_pager, ansi_text)
-
-
-def _get_view(ctx: Any) -> str:
-    view = get_ctx_value(ctx, "view")
-    if view:
-        return view
-
-    fallback = get_ctx_value(ctx, "format")
-    return fallback or "rich"
-
-
 def spinner_context(
     ctx: Any | None,
     message: str,
@@ -347,63 +171,6 @@ def get_client(ctx: Any) -> Client:  # pragma: no cover
     )
 
 
-# ----------------------------- Secret masking ---------------------------- #
-
-_DEFAULT_MASK_FIELDS = {
-    "api_key",
-    "apikey",
-    "token",
-    "access_token",
-    "secret",
-    "client_secret",
-    "password",
-    "private_key",
-    "bearer",
-}
-
-
-def _mask_value(v: Any) -> str:
-    s = str(v)
-    if len(s) <= 8:
-        return "••••"
-    return f"{s[:4]}••••••••{s[-4:]}"
-
-
-def _mask_any(value: Any, mask_fields: set[str]) -> Any:
-    """Recursively mask sensitive fields in mappings / lists."""
-
-    if isinstance(value, dict):
-        masked: dict[Any, Any] = {}
-        for key, raw in value.items():
-            if isinstance(key, str) and key.lower() in mask_fields and raw is not None:
-                masked[key] = _mask_value(raw)
-            else:
-                masked[key] = _mask_any(raw, mask_fields)
-        return masked
-
-    if isinstance(value, list):
-        return [_mask_any(item, mask_fields) for item in value]
-
-    return value
-
-
-def _maybe_mask_row(row: dict[str, Any], mask_fields: set[str]) -> dict[str, Any]:
-    """Mask a single row (legacy function, now uses _mask_any)."""
-    if not mask_fields:
-        return row
-    return _mask_any(row, mask_fields)
-
-
-def _resolve_mask_fields() -> set[str]:
-    if os.getenv("AIP_MASK_OFF", "0") in ("1", "true", "on", "yes"):
-        return set()
-    env_fields = (os.getenv("AIP_MASK_FIELDS") or "").strip()
-    if env_fields:
-        parts = [p.strip().lower() for p in env_fields.split(",") if p.strip()]
-        return set(parts)
-    return set(_DEFAULT_MASK_FIELDS)
-
-
 # ----------------------------- Fuzzy palette ----------------------------- #
 
 
@@ -667,16 +434,6 @@ def _coerce_result_payload(result: Any) -> Any:
     return result
 
 
-def _apply_mask_if_configured(payload: Any) -> Any:
-    mask_fields = _resolve_mask_fields()
-    if not mask_fields:
-        return payload
-    try:
-        return _mask_any(payload, mask_fields)
-    except Exception:
-        return payload
-
-
 def _ensure_displayable(payload: Any) -> Any:
     if isinstance(payload, dict | list | str | int | float | bool) or payload is None:
         return payload
@@ -713,7 +470,7 @@ def output_result(
     fmt = _get_view(ctx)
 
     data = _coerce_result_payload(result)
-    data = _apply_mask_if_configured(data)
+    data = masking.mask_payload(data)
     data = _ensure_displayable(data)
 
     if fmt == "json":
@@ -771,16 +528,6 @@ def _normalise_rows(
         return []
 
 
-def _mask_rows_if_configured(rows: list[dict[str, Any]]) -> list[dict[str, Any]]:
-    mask_fields = _resolve_mask_fields()
-    if not mask_fields:
-        return rows
-    try:
-        return [_maybe_mask_row(row, mask_fields) for row in rows]
-    except Exception:
-        return rows
-
-
 def _render_plain_list(
     rows: list[dict[str, Any]], title: str, columns: list[tuple]
 ) -> None:
@@ -832,20 +579,6 @@ def _build_table_group(
     return Group(table, footer)
 
 
-def _should_page_output(row_count: int, is_tty: bool) -> bool:
-    pager_env = (os.getenv("AIP_PAGER", "auto") or "auto").lower()
-    if pager_env in ("0", "off", "false"):
-        return False
-    if pager_env in ("1", "on", "true"):
-        return is_tty
-    try:
-        term_h = console.size.height or 24
-        approx_lines = 5 + row_count
-        return is_tty and (approx_lines >= term_h * 0.5)
-    except Exception:
-        return is_tty
-
-
 def _handle_json_output(items: list[Any], rows: list[dict[str, Any]]) -> None:
     """Handle JSON output format."""
     data = (
@@ -947,14 +680,14 @@ def _handle_table_output(
     """Handle table output with paging."""
     content = _build_table_group(rows, columns, title)
     should_page = (
-        _should_page_output(len(rows), console.is_terminal and os.isatty(1))
+        pager._should_page_output(len(rows), console.is_terminal and os.isatty(1))
         if use_pager is None
         else use_pager
     )
 
     if should_page:
-        ansi = _render_ansi(content)
-        if not _page_with_system_pager(ansi):
+        ansi = pager._render_ansi(content)
+        if not pager._page_with_system_pager(ansi):
             with console.pager(styles=True):
                 console.print(content)
     else:
@@ -974,7 +707,7 @@ def output_list(
     """Display a list with optional fuzzy palette for quick selection."""
     fmt = _get_view(ctx)
     rows = _normalise_rows(items, transform_func)
-    rows = _mask_rows_if_configured(rows)
+    rows = masking.mask_rows(rows)
 
     if fmt == "json":
         _handle_json_output(items, rows)
@@ -1004,50 +737,6 @@ def output_list(
     _handle_table_output(rows, columns, title, use_pager=use_pager)
 
 
-# ------------------------- Output flags decorator ------------------------ #
-
-
-def _set_view(ctx: Any, _param: Any, value: str) -> None:
-    if not value:
-        return
-    ctx.ensure_object(dict)
-    ctx.obj["view"] = value
-
-
-def _set_json(ctx: Any, _param: Any, value: bool) -> None:
-    if not value:
-        return
-    ctx.ensure_object(dict)
-    ctx.obj["view"] = "json"
-
-
-def output_flags() -> Callable[[Callable[..., Any]], Callable[..., Any]]:
-    """Decorator to allow output format flags on any subcommand."""
-
-    def decorator(f: Callable[..., Any]) -> Callable[..., Any]:
-        f = click.option(
-            "--json",
-            "json_mode",
-            is_flag=True,
-            expose_value=False,
-            help="Shortcut for --view json",
-            callback=_set_json,
-        )(f)
-        f = click.option(
-            "-o",
-            "--output",
-            "--view",
-            "view_opt",
-            type=click.Choice(["rich", "plain", "json", "md"]),
-            expose_value=False,
-            help="Output format",
-            callback=_set_view,
-        )(f)
-        return f
-
-    return decorator
-
-
 # ------------------------- Ambiguity handling --------------------------- #
 
 
@@ -1400,19 +1089,3 @@ def handle_ambiguous_resource(
         else:
             # Re-raise cancellation exceptions
             raise
-
-
-def detect_export_format(file_path: str | Path) -> str:
-    """Detect export format from file extension.
-
-    Args:
-        file_path: Path to the export file
-
-    Returns:
-        "yaml" if file extension is .yaml or .yml, "json" otherwise
-    """
-    path = Path(file_path)
-    if path.suffix.lower() in [".yaml", ".yml"]:
-        return "yaml"
-    else:
-        return "json"

{glaip_sdk-0.0.14.dist-info → glaip_sdk-0.0.15.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: glaip-sdk
-Version: 0.0.14
+Version: 0.0.15
 Summary: Python SDK for GL AIP (GDP Labs AI Agent Package) - Simplified CLI Design
 License: MIT
 Author: Raymond Christopher

{glaip_sdk-0.0.14.dist-info → glaip_sdk-0.0.15.dist-info}/RECORD

@@ -5,15 +5,18 @@ glaip_sdk/cli/__init__.py,sha256=xCCfuF1Yc7mpCDcfhHZTX0vizvtrDSLeT8MJ3V7m5A0,156
 glaip_sdk/cli/agent_config.py,sha256=VHjebw68wAdhGUzYdPH8qz10oADZPRgUQcPW6F7iHIU,2421
 glaip_sdk/cli/auth.py,sha256=eYdtGmJ3XgiO96hq_69GF6b3W-aRWZrDQ-6bHuaRX4M,13517
 glaip_sdk/cli/commands/__init__.py,sha256=x0CZlZbZHoHvuzfoTWIyEch6WmNnbPzxajrox6riYp0,173
-glaip_sdk/cli/commands/agents.py,sha256=97dzowjHgk5knyHuI-0z2ojvqNlkebNN1-ikGEoS5sc,40623
+glaip_sdk/cli/commands/agents.py,sha256=Ejg_IFXfvajW2q3IrmotiLjljEYknKEcMejdvVCWoDs,40644
 glaip_sdk/cli/commands/configure.py,sha256=eRDzsaKV4fl2lJt8ieS4g2-xRnaa02eAAPW8xBf-tqA,7507
-glaip_sdk/cli/commands/mcps.py,sha256=ENhasfSupmCSKs-Ycg-M9Gy-58Y55SMIQzeg3fBJj48,28186
-glaip_sdk/cli/commands/models.py,sha256=Ra3-50BPScNs0Q-j4b7U4iK0hNooucEyVgHpQ11-pt8,1700
-glaip_sdk/cli/commands/tools.py,sha256=MOM9Db3HGL1stF-WvL5cZXjw-iZo2qc-oyKQHy6VwIM,18690
+glaip_sdk/cli/commands/mcps.py,sha256=I-cqVqAGqSiUDgWOEB6eUeKg_wMtteoPyyXwu96qq6Q,28207
+glaip_sdk/cli/commands/models.py,sha256=G1ce-wZOfvMP6SMnIVuSQ89CF444Kz8Ja6nrNOQXCqU,1729
+glaip_sdk/cli/commands/tools.py,sha256=P3zuKVapoC3yV4rnHGdFPO_snjLGWo5IpfuYHIUfMeU,18711
+glaip_sdk/cli/context.py,sha256=M4weRf8dmp5bMtPLRF3w1StnRB7Lo8FPFq2GQMv3Rv8,3617
 glaip_sdk/cli/display.py,sha256=jE20swoRKzpYUmc0jgbeonaXKeE9x95hfjWAEdnBYRc,8727
 glaip_sdk/cli/io.py,sha256=GPkw3pQMLBGoD5GH-KlbKpNRlVWFZOXHE17F7V3kQsI,3343
 glaip_sdk/cli/main.py,sha256=3Bl8u9t1MekzaNrAZqsx4TukbzzFdi6Wss6jvTDos00,12930
+glaip_sdk/cli/masking.py,sha256=BOZjwUqxQf3LQlYgUMwq7UYgve8x4_1Qk04ixiJJPZ8,4399
 glaip_sdk/cli/mcp_validators.py,sha256=PEJRzb7ogRkwNJwJK9k5Xmb8hvoQ58L2Qywqd_3Wayo,10125
+glaip_sdk/cli/pager.py,sha256=KmOBhY66JHg2vRpiNJ69RnZiF8sFer7yR8NIdlxnALk,8007
 glaip_sdk/cli/parsers/__init__.py,sha256=Ycd4HDfYmA7GUGFt0ndBPBo5uTbv15XsXnYUj-a89ug,183
 glaip_sdk/cli/parsers/json_input.py,sha256=iISa31ZsDNYWfCVRy0cifRIg2gjnhI-XtdDLB-UOshg,4039
 glaip_sdk/cli/resolution.py,sha256=BOw2NchReLKewAwBAZLWw_3_bI7u3tfzQEO7kQbIiGE,2067
@@ -22,7 +25,7 @@ glaip_sdk/cli/slash/agent_session.py,sha256=pDOwGXNHuyJIulrGYu1pacyF3oxHWeDQY-Uv
 glaip_sdk/cli/slash/prompt.py,sha256=Pr5SSTOKFssRsi-AujOm5_BCW_f5MxgLwJ3CCji1ogM,7356
 glaip_sdk/cli/slash/session.py,sha256=U5UEL6eIvNkIJcSz04Uf8Ql0EptmLJukqHxDCAJ-nOQ,31097
 glaip_sdk/cli/update_notifier.py,sha256=uVbjZJnW4znTzx4AkqsDO4NfXiF-mtQiypTkJByAVuM,3236
-glaip_sdk/cli/utils.py,sha256=98n1tovTUSqS5BIUl4cz6zGoRSSJiXFGJW8oD0xIm2g,42537
+glaip_sdk/cli/utils.py,sha256=IG1h0wY6rIYvDRcTZuOmSgAHiYlx6yD9SKHrTbDFHmc,33077
 glaip_sdk/cli/validators.py,sha256=USbBgY86AwuDHO-Q_g8g7hu-ot4NgITBsWjTWIl62ms,5569
 glaip_sdk/client/__init__.py,sha256=nYLXfBVTTWwKjP0e63iumPYO4k5FifwWaELQPaPIKIg,188
 glaip_sdk/client/agents.py,sha256=FSKubF40wptMNIheC3_iawiX2CRbhTcNLFiz4qkPC6k,34659
@@ -58,7 +61,7 @@ glaip_sdk/utils/rich_utils.py,sha256=-Ij-1bIJvnVAi6DrfftchIlMcvOTjVmSE0Qqax0EY_s
 glaip_sdk/utils/run_renderer.py,sha256=d_VMI6LbvHPUUeRmGqh5wK_lHqDEIAcym2iqpbtDad0,1365
 glaip_sdk/utils/serialization.py,sha256=T1yt_8G2DCFpcxx7XnqFl5slksRXfBCUuLQJTreGYEQ,11806
 glaip_sdk/utils/validation.py,sha256=QNORcdyvuliEs4EH2_mkDgmoyT9utgl7YNhaf45SEf8,6992
-glaip_sdk-0.0.14.dist-info/METADATA,sha256=hLG4fJ5u_23gDgWSYD1THNIIRgkBh1i9OTp76TJMCzo,5168
-glaip_sdk-0.0.14.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-glaip_sdk-0.0.14.dist-info/entry_points.txt,sha256=EGs8NO8J1fdFMWA3CsF7sKBEvtHb_fujdCoNPhfMouE,47
-glaip_sdk-0.0.14.dist-info/RECORD,,
+glaip_sdk-0.0.15.dist-info/METADATA,sha256=Hp6gkY7Ci5eTGCScvyovsLl2j0g7Dlw1kQ3chFWYwrI,5168
+glaip_sdk-0.0.15.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+glaip_sdk-0.0.15.dist-info/entry_points.txt,sha256=EGs8NO8J1fdFMWA3CsF7sKBEvtHb_fujdCoNPhfMouE,47
+glaip_sdk-0.0.15.dist-info/RECORD,,