glaip-sdk 0.5.1__py3-none-any.whl → 0.5.2__py3-none-any.whl

glaip_sdk/cli/commands/accounts.py

@@ -106,6 +106,9 @@ def list_accounts(output_json: bool) -> None:
     if active_account:
         console.print(f"\n[{SUCCESS_STYLE}]Active account[/]: {active_account}")
 
+    # Show hint for updating accounts
+    console.print(f"\n[{INFO}]💡 Tip[/]: To update an account's URL or key, use: [bold]aip accounts edit <name>[/bold]")
+
 
 def _check_account_overwrite(name: str, store: AccountStore, overwrite: bool) -> dict[str, str] | None:
     """Check if account exists and handle overwrite logic.
@@ -128,13 +131,19 @@ def _check_account_overwrite(name: str, store: AccountStore, overwrite: bool) ->
     return existing
 
 
-def _get_credentials_non_interactive(url: str, read_key_from_stdin: bool, name: str) -> tuple[str, str]:
+def _get_credentials_non_interactive(
+    url: str,
+    read_key_from_stdin: bool,
+    name: str,
+    command_name: str = "aip accounts add",
+) -> tuple[str, str]:
     """Get credentials in non-interactive mode.
 
     Args:
         url: API URL from flag.
         read_key_from_stdin: Whether to read key from stdin.
         name: Account name (for error messages).
+        command_name: Command name for guidance text.
 
     Returns:
         Tuple of (api_url, api_key).
@@ -147,7 +156,7 @@ def _get_credentials_non_interactive(url: str, read_key_from_stdin: bool, name:
             return url, sys.stdin.read().strip()
         console.print(
             f"[{ERROR_STYLE}]Error: --key requires stdin input. "
-            f"Use: cat key.txt | aip accounts add {name} --url {url} --key[/]",
+            f"Use: cat key.txt | {command_name} {name} --url {url} --key[/]",
         )
         raise click.Abort()
     # URL provided, prompt for key
@@ -178,6 +187,88 @@ def _get_credentials_interactive(read_key_from_stdin: bool, existing: dict[str,
     return _prompt_account_inputs(existing)
 
 
+def _handle_key_rotation(
+    name: str,
+    existing_url: str,
+    command_name: str,
+) -> tuple[str, str]:
+    """Handle key rotation using stored URL.
+
+    Args:
+        name: Account name (for error messages).
+        existing_url: Existing account URL.
+        command_name: Command name for error messages.
+
+    Returns:
+        Tuple of (api_url, api_key).
+
+    Raises:
+        click.Abort: If existing URL is missing.
+    """
+    if not existing_url:
+        console.print(f"[{ERROR_STYLE}]Error: Account '{name}' is missing an API URL. Provide --url to set it.[/]")
+        raise click.Abort()
+    return _get_credentials_non_interactive(existing_url, True, name, command_name)
+
+
+def _preserve_existing_values(
+    api_url: str,
+    api_key: str,
+    existing_url: str,
+    existing_key: str,
+) -> tuple[str, str]:
+    """Preserve stored values when blank input is provided during edit.
+
+    Args:
+        api_url: Collected API URL.
+        api_key: Collected API key.
+        existing_url: Existing account URL.
+        existing_key: Existing account key.
+
+    Returns:
+        Tuple of (api_url, api_key) with preserved values.
+    """
+    if not api_url and existing_url:
+        api_url = existing_url
+    if not api_key and existing_key:
+        api_key = existing_key
+    return api_url, api_key
+
+
+def _collect_credentials_from_inputs(
+    url: str | None,
+    read_key_from_stdin: bool,
+    name: str,
+    existing: dict[str, str] | None,
+    command_name: str,
+    existing_url: str,
+) -> tuple[str, str]:
+    """Collect credentials based on input flags and existing data.
+
+    Args:
+        url: Optional URL from flag.
+        read_key_from_stdin: Whether to read key from stdin.
+        name: Account name (for error messages).
+        existing: Existing account data.
+        command_name: Command name for error messages.
+        existing_url: Existing account URL.
+
+    Returns:
+        Tuple of (api_url, api_key).
+    """
+    if url and read_key_from_stdin:
+        # Non-interactive: URL from flag, key from stdin
+        return _get_credentials_non_interactive(url, True, name, command_name)
+    if url:
+        # URL provided, prompt for key
+        return _get_credentials_non_interactive(url, False, name, command_name)
+    if read_key_from_stdin and existing:
+        # Key rotation using stored URL
+        return _handle_key_rotation(name, existing_url, command_name)
+    # Fully interactive or error case
+    return _get_credentials_interactive(read_key_from_stdin, existing)
+
+
 def _collect_account_credentials(
     url: str | None,
     read_key_from_stdin: bool,
@@ -198,15 +289,16 @@ def _collect_account_credentials(
     Raises:
         click.Abort: If credentials cannot be collected or are invalid.
     """
-    if url and read_key_from_stdin:
-        # Non-interactive: URL from flag, key from stdin
-        api_url, api_key = _get_credentials_non_interactive(url, True, name)
-    elif url:
-        # URL provided, prompt for key
-        api_url, api_key = _get_credentials_non_interactive(url, False, name)
-    else:
-        # Fully interactive or error case
-        api_url, api_key = _get_credentials_interactive(read_key_from_stdin, existing)
+    command_name = "aip accounts edit" if existing else "aip accounts add"
+    existing_url = existing.get("api_url", "") if existing else ""
+    existing_key = existing.get("api_key", "") if existing else ""
+
+    api_url, api_key = _collect_credentials_from_inputs(
+        url, read_key_from_stdin, name, existing, command_name, existing_url
+    )
+
+    # Preserve stored values when blank input is provided during edit
+    api_url, api_key = _preserve_existing_values(api_url, api_key, existing_url, existing_key)
 
     if not api_url or not api_key:
         console.print(f"[{ERROR_STYLE}]Error: Both API URL and API key are required.[/]")
@@ -235,12 +327,15 @@ def add_account(
     read_key_from_stdin: bool,
     overwrite: bool,
 ) -> None:
-    """Add or update an account profile.
+    """Add a new account profile.
 
     NAME is the account name (1-32 chars, alphanumeric, dash, underscore).
 
     By default, this command runs interactively, prompting for API URL and key.
     For non-interactive use, both --url and --key (stdin) are required.
+
+    If the account already exists, use --yes to overwrite without prompting.
+    To update an existing account, use [bold]aip accounts edit <name>[/bold] instead.
     """
     store = get_account_store()
 
@@ -263,6 +358,55 @@ def add_account(
         raise click.Abort() from e
 
 
+@accounts_group.command("edit")
+@click.argument("name")
+@click.option("--url", help="API URL (optional, leave blank to keep current)")
+@click.option(
+    "--key",
+    "read_key_from_stdin",
+    is_flag=True,
+    help="Read API key from stdin (secure, for scripts). Uses stored URL unless --url is provided.",
+)
+def edit_account(
+    name: str,
+    url: str | None,
+    read_key_from_stdin: bool,
+) -> None:
+    """Edit an existing account profile's URL or key.
+
+    NAME is the account name to edit.
+
+    By default, this command runs interactively, showing current values and
+    prompting for new ones. Leave fields blank to keep current values.
+
+    For non-interactive use, provide --url to change the URL, --key (stdin) to rotate the key,
+    or both. Stored values are reused for any fields not provided.
+    """
+    store = get_account_store()
+
+    # Account must exist for edit
+    existing = store.get_account(name)
+    if not existing:
+        console.print(f"[{ERROR_STYLE}]Error: Account '{name}' not found.[/]")
+        console.print(f"Use [bold]aip accounts add {name}[/bold] to create a new account.")
+        raise click.Abort()
+
+    # Collect credentials (will pre-fill existing values in interactive mode)
+    api_url, api_key = _collect_account_credentials(url, read_key_from_stdin, name, existing)
+
+    # Save account
+    try:
+        store.add_account(name, api_url, api_key, overwrite=True)
+        console.print(Text(f"✅ Account '{name}' updated successfully", style=SUCCESS_STYLE))
+        _print_active_account_footer(store)
+    except InvalidAccountNameError as e:
+        console.print(f"[{ERROR_STYLE}]Error: {e}[/]")
+        raise click.Abort() from e
+    except AccountStoreError as e:
+        console.print(f"[{ERROR_STYLE}]Error: {e}[/]")
+        raise click.Abort() from e
+
+
 @accounts_group.command("use")
 @click.argument("name")
 def use_account(name: str) -> None:
@@ -281,7 +425,8 @@ def use_account(name: str) -> None:
 
         if not url or not api_key:
             console.print(
-                f"[{ERROR_STYLE}]Error: Account '{name}' is missing credentials. Re-run 'aip accounts add {name}'.[/]"
+                f"[{ERROR_STYLE}]Error: Account '{name}' is missing credentials. "
+                f"Use [bold]aip accounts edit {name}[/bold] to update credentials.[/]"
             )
             raise click.Abort()
 

glaip_sdk/cli/commands/agents.py

@@ -594,9 +594,12 @@ def list_agents(
             f"{ICON_AGENT} Available Agents",
             columns,
             transform_agent,
-            skip_picker=picker_attempted
-            or simple
-            or any(param is not None for param in (agent_type, framework, name, version)),
+            skip_picker=(
+                not interactive_enabled
+                or picker_attempted
+                or simple
+                or any(param is not None for param in (agent_type, framework, name, version))
+            ),
             use_pager=False,
         )
 

glaip_sdk/cli/utils.py

@@ -875,10 +875,10 @@ def _strip_spaces_for_matching(value: str) -> str:
     return re.sub(r"\s+", "", value)
 
 
-def _is_fuzzy_match(search: Any, target: str) -> bool:
-    """Case-insensitive fuzzy match with optional spaces."""
+def _is_fuzzy_match(search: Any, target: Any) -> bool:
+    """Case-insensitive fuzzy match with optional spaces; returns False for non-string inputs."""
     # Ensure search is a string
-    if not isinstance(search, str):
+    if not isinstance(search, str) or not isinstance(target, str):
         return False
 
     if not search:
@@ -1000,13 +1000,15 @@ def _rank_labels(labels: list[str], query: Any) -> list[str]:
         Labels sorted by fuzzy score (descending), then case-insensitive label,
         then id suffix for deterministic ordering.
     """
+    suffix_cache = {label: _extract_id_suffix(label) for label in labels}
+
     if not query:
         # No query: sort by case-insensitive label, then id suffix
-        return sorted(labels, key=lambda lbl: (lbl.lower(), _extract_id_suffix(lbl)))
+        return sorted(labels, key=lambda lbl: (lbl.lower(), suffix_cache[lbl]))
 
     # Ensure query is a string
     if not isinstance(query, str):
-        return sorted(labels, key=lambda lbl: (lbl.lower(), _extract_id_suffix(lbl)))
+        return sorted(labels, key=lambda lbl: (lbl.lower(), suffix_cache[lbl]))
 
     query_lower = query.lower()
 
@@ -1016,11 +1018,11 @@ def _rank_labels(labels: list[str], query: Any) -> list[str]:
         label_lower = label.lower()
         score = _fuzzy_score(query_lower, label_lower)
         if score >= 0:  # Only include matches
-            scored_labels.append((score, label_lower, _extract_id_suffix(label), label))
+            scored_labels.append((score, label_lower, suffix_cache[label], label))
 
     if not scored_labels:
         # No fuzzy matches: fall back to deterministic label sorting
-        return sorted(labels, key=lambda lbl: (lbl.lower(), _extract_id_suffix(lbl)))
+        return sorted(labels, key=lambda lbl: (lbl.lower(), suffix_cache[lbl]))
 
     # Sort by: score (desc), label (case-insensitive), id suffix, original label
     scored_labels.sort(key=lambda x: (-x[0], x[1], x[2], x[3]))

{glaip_sdk-0.5.1.dist-info → glaip_sdk-0.5.2.dist-info}/METADATA

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

{glaip_sdk-0.5.1.dist-info → glaip_sdk-0.5.2.dist-info}/RECORD

@@ -6,8 +6,8 @@ glaip_sdk/cli/account_store.py,sha256=NXuAVPaJS_32Aw1VTaZCNwIID-gADw4F_UMieoWmg3
 glaip_sdk/cli/agent_config.py,sha256=YAbFKrTNTRqNA6b0i0Q3pH-01rhHDRi5v8dxSFwGSwM,2401
 glaip_sdk/cli/auth.py,sha256=9hfjZyd4cx2_mImqykJ1sWQsuVTR2gy6D4hFqAQNKL4,24129
 glaip_sdk/cli/commands/__init__.py,sha256=6Z3ASXDut0lAbUX_umBFtxPzzFyqoiZfVeTahThFu1A,219
-glaip_sdk/cli/commands/accounts.py,sha256=VCG-JZGY86DlWO5bAfDZ70RuyKQ5q-Rh4U0iM8NwO6M,13755
-glaip_sdk/cli/commands/agents.py,sha256=y89okY-a5sM_QCS3F3C66DF7yhhHFbUJ7ZzIl2DUEck,47880
+glaip_sdk/cli/commands/accounts.py,sha256=B5itsUzqoH_hBRYOVd2m4nPoIuBbPDIoK974zKMm9NE,18635
+glaip_sdk/cli/commands/agents.py,sha256=35Ra1PLZYiSainYTtMBB40Iio5gDY_tyaDpeujoVdHw,47963
 glaip_sdk/cli/commands/common_config.py,sha256=IY13gPkeifXxSdpzRFUvfRin8J7s38p6Y7TYjdGw7w4,2474
 glaip_sdk/cli/commands/configure.py,sha256=8vfgtNEMK2lnEk3i6H1ZevsjxnYA6jAj4evhWmsHi6w,14494
 glaip_sdk/cli/commands/mcps.py,sha256=tttqQnfM89iI9Pm94u8YRhiHMQNYNouecFX0brsT4cQ,42551
@@ -44,7 +44,7 @@ glaip_sdk/cli/transcript/history.py,sha256=2FBjawxP8CX9gRPMUMP8bDjG50BGM2j2zk6If
 glaip_sdk/cli/transcript/launcher.py,sha256=z5ivkPXDQJpATIqtRLUK8jH3p3WIZ72PvOPqYRDMJvw,2327
 glaip_sdk/cli/transcript/viewer.py,sha256=ar1SzRkhKIf3_DgFz1EG1RZGDmd2w2wogAe038DLL_M,13037
 glaip_sdk/cli/update_notifier.py,sha256=qv-GfwTYZdrhlSbC_71I1AvKY9cV4QVBmtees16S2Xg,9807
-glaip_sdk/cli/utils.py,sha256=iPtt4xAqtCW-dwQ-JWVwoPVPAm-P1R8C-1kih6ZIYXU,57255
+glaip_sdk/cli/utils.py,sha256=fV6PZlQ7K5zckpFWvwh3yLmETGrVylK9AXtN7zKBp-A,57374
 glaip_sdk/cli/validators.py,sha256=d-kq4y7HWMo6Gc7wLXWUsCt8JwFvJX_roZqRm1Nko1I,5622
 glaip_sdk/client/__init__.py,sha256=F-eE_dRSzA0cc1it06oi0tZetZBHmSUjWSHGhJMLCls,263
 glaip_sdk/client/_agent_payloads.py,sha256=VfBHoijuoqUOixGBf2SA2vlQIXQmBsjB3sXHZhXYiec,17681
@@ -107,7 +107,7 @@ glaip_sdk/utils/resource_refs.py,sha256=vF34kyAtFBLnaKnQVrsr2st1JiSxVbIZ4yq0DelJ
 glaip_sdk/utils/run_renderer.py,sha256=d_VMI6LbvHPUUeRmGqh5wK_lHqDEIAcym2iqpbtDad0,1365
 glaip_sdk/utils/serialization.py,sha256=z-qpvWLSBrGK3wbUclcA1UIKLXJedTnMSwPdq-FF4lo,13308
 glaip_sdk/utils/validation.py,sha256=Vt8oSnn7OM6ns5vjOl5FwGIMWBPb0yI6RD5XL_L5_4M,6826
-glaip_sdk-0.5.1.dist-info/METADATA,sha256=jxEyfPZqz2g7nLHnFidlNnMPkljgrLyKVYk3qVnThLE,7053
-glaip_sdk-0.5.1.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-glaip_sdk-0.5.1.dist-info/entry_points.txt,sha256=EGs8NO8J1fdFMWA3CsF7sKBEvtHb_fujdCoNPhfMouE,47
-glaip_sdk-0.5.1.dist-info/RECORD,,
+glaip_sdk-0.5.2.dist-info/METADATA,sha256=yYVEtAsyIJBd3p6bgZxlvSIzUeOwSK-tI3DQVPAP0tI,7053
+glaip_sdk-0.5.2.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+glaip_sdk-0.5.2.dist-info/entry_points.txt,sha256=EGs8NO8J1fdFMWA3CsF7sKBEvtHb_fujdCoNPhfMouE,47
+glaip_sdk-0.5.2.dist-info/RECORD,,