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

glaip_sdk/cli/auth.py

@@ -109,6 +109,24 @@ def _get_token_value(prompt_for_secrets: bool, placeholder: str, console: Consol
     return placeholder
 
 
+def _normalize_header_keys(
+    header_keys: Iterable[str] | str | None,
+    *,
+    default: Iterable[str] | None = None,
+) -> list[str]:
+    """Normalize header_keys to a list, handling strings and None safely."""
+    if header_keys is None:
+        return list(default or [])
+    if isinstance(header_keys, str):
+        return [header_keys] if header_keys else list(default or [])
+    try:
+        return list(header_keys)
+    except TypeError:
+        raise click.ClickException(
+            f"Invalid header_keys type: expected string or iterable, got {type(header_keys).__name__}"
+        ) from None
+
+
 def _build_bearer_headers(auth: dict[str, Any], token_value: str) -> dict[str, str]:
     """Build headers for bearer token authentication.
 
@@ -120,7 +138,10 @@ def _build_bearer_headers(auth: dict[str, Any], token_value: str) -> dict[str, s
         A dictionary of HTTP headers including the Authorization header when
         applicable.
     """
-    header_keys = auth.get("header_keys", ["Authorization"])
+    default_header_keys = ["Authorization"]
+    has_header_keys = "header_keys" in auth
+    header_keys_raw = auth.get("header_keys") if has_header_keys else default_header_keys
+    header_keys = _normalize_header_keys(header_keys_raw, default=None if has_header_keys else default_header_keys)
     headers = {}
     for key in header_keys:
         # Prepend "Bearer " if this is Authorization header
@@ -179,8 +200,8 @@ def _extract_api_key_name(auth: dict[str, Any]) -> str | None:
     """
     key_name = auth.get("key")
     if not key_name and "header_keys" in auth:
-        header_keys = auth["header_keys"]
-        if isinstance(header_keys, list) and header_keys:
+        header_keys = _normalize_header_keys(auth["header_keys"])
+        if header_keys:
             key_name = header_keys[0]
     return key_name
 
@@ -228,8 +249,12 @@ def _build_api_key_headers(auth: dict[str, Any], key_name: str | None, key_value
     Returns:
         A dictionary of HTTP headers for API key authentication.
     """
-    header_keys = [k for k in auth.get("header_keys", [key_name] if key_name else []) if k]
-    return dict.fromkeys(header_keys, key_value)
+    default_header_keys = [key_name] if key_name else []
+    has_header_keys = "header_keys" in auth
+    header_keys_raw = auth.get("header_keys") if has_header_keys else default_header_keys
+    header_keys_list = _normalize_header_keys(header_keys_raw, default=None if has_header_keys else default_header_keys)
+    filtered_keys = [k for k in header_keys_list if k]
+    return dict.fromkeys(filtered_keys, key_value)
 
 
 def _prepare_api_key_auth(
@@ -315,9 +340,7 @@ def _extract_header_names(existing_headers: Mapping[str, Any] | None, header_key
     """
     if existing_headers:
         return list(existing_headers.keys())
-    if header_keys:
-        return list(header_keys)
-    return []
+    return _normalize_header_keys(header_keys)
 
 
 def _is_valid_secret(value: Any) -> bool:

glaip_sdk/cli/commands/agents.py

@@ -576,7 +576,10 @@ def list_agents(
             and len(agents) > 0
         )
 
+        # Track picker attempt so the fallback table doesn't re-open the palette
+        picker_attempted = False
         if interactive_enabled:
+            picker_attempted = True
             picked_agent = _fuzzy_pick_for_resources(agents, "agent", "")
             if picked_agent:
                 _display_agent_details(ctx, client, picked_agent)
@@ -591,7 +594,9 @@ def list_agents(
             f"{ICON_AGENT} Available Agents",
             columns,
             transform_agent,
-            skip_picker=simple or any(param is not None for param in (agent_type, framework, name, version)),
+            skip_picker=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

@@ -12,6 +12,7 @@ import importlib
 import json
 import logging
 import os
+import re
 import sys
 from collections.abc import Callable, Iterable
 from contextlib import AbstractContextManager, contextmanager, nullcontext
@@ -787,56 +788,60 @@ class _FuzzyCompleter:
         self.words = words
 
     def get_completions(self, document: Any, _complete_event: Any) -> Any:  # pragma: no cover
-        """Get fuzzy completions for the current word.
+        """Get fuzzy completions for the current word, ranked by score.
 
         Args:
             document: Document object from prompt_toolkit.
             _complete_event: Completion event (unused).
 
         Yields:
-            Completion objects matching the current word.
+            Completion objects matching the current word, in ranked order.
         """
-        word = document.get_word_before_cursor()
-        if not word:
+        # Get the entire buffer text (not just word before cursor)
+        buffer_text = document.text_before_cursor
+        if not buffer_text or not isinstance(buffer_text, str):
             return
 
-        word_lower = word.lower()
-        for label in self.words:
-            label_lower = label.lower()
-            if self._fuzzy_match(word_lower, label_lower):
-                yield Completion(label, start_position=-len(word))
-
-    def _fuzzy_match(self, search: str, target: str) -> bool:  # pragma: no cover
-        """True fuzzy matching: checks if all characters in search appear in order in target."""
-        if not search:
-            return True
-
-        search_idx = 0
-        for char in target:
-            if search_idx < len(search) and search[search_idx] == char:
-                search_idx += 1
-                if search_idx == len(search):
-                    return True
-        return False
+        # Rank labels by fuzzy score
+        ranked_labels = _rank_labels(self.words, buffer_text)
+
+        # Yield ranked completions
+        for label in ranked_labels:
+            # Replace entire buffer text, not just the word before cursor
+            # This prevents concatenation issues with hyphenated names
+            yield Completion(label, start_position=-len(buffer_text))
 
 
 def _perform_fuzzy_search(answer: str, labels: list[str], by_label: dict[str, dict[str, Any]]) -> dict[str, Any] | None:
-    """Perform fuzzy search fallback and return best match."""
+    """Perform fuzzy search fallback and return best match.
+
+    Returns:
+        Selected resource dict or None if cancelled/no match.
+    """
     # Exact label match
     if answer in by_label:
         return by_label[answer]
 
-    # Fuzzy search fallback
-    best_match = None
-    best_score = -1
-
+    # Fuzzy search fallback using ranked labels
+    # Check if query actually matches anything before ranking
+    query_lower = answer.lower()
+    has_match = False
     for label in labels:
-        score = _fuzzy_score(answer.lower(), label.lower())
-        if score > best_score:
-            best_score = score
-            best_match = label
+        if _fuzzy_score(query_lower, label.lower()) >= 0:
+            has_match = True
+            break
 
-    return by_label[best_match] if best_match and best_score > 0 else None
+    if not has_match:
+        return None
+
+    ranked_labels = _rank_labels(labels, answer)
+    if ranked_labels:
+        # Return the top-ranked match
+        best_match = ranked_labels[0]
+        if best_match in by_label:
+            return by_label[best_match]
+
+    return None
 
 
 def _fuzzy_pick(
@@ -865,33 +870,61 @@ def _fuzzy_pick(
     return _perform_fuzzy_search(answer, labels, by_label) if answer else None
 
 
-def _is_fuzzy_match(search: str, target: str) -> bool:
-    """Check if search string is a fuzzy match for target."""
+def _strip_spaces_for_matching(value: str) -> str:
+    """Remove whitespace from a query for consistent fuzzy matching."""
+    return re.sub(r"\s+", "", value)
+
+
+def _is_fuzzy_match(search: Any, target: str) -> bool:
+    """Case-insensitive fuzzy match with optional spaces."""
+    # Ensure search is a string
+    if not isinstance(search, str):
+        return False
+
     if not search:
         return True
 
+    # Strip spaces from search query - treat them as optional separators
+    # This allows "test agent" to match "test-agent", "test_agent", etc.
+    search_no_spaces = _strip_spaces_for_matching(search).lower()
+    if not search_no_spaces:
+        # If search is only spaces, match everything
+        return True
+
     search_idx = 0
-    for char in target:
-        if search_idx < len(search) and search[search_idx] == char:
+    for char in target.lower():
+        if search_idx < len(search_no_spaces) and search_no_spaces[search_idx] == char:
             search_idx += 1
-            if search_idx == len(search):
+            if search_idx == len(search_no_spaces):
                 return True
     return False
 
 
 def _calculate_exact_match_bonus(search: str, target: str) -> int:
-    """Calculate bonus for exact substring matches."""
-    return 100 if search.lower() in target.lower() else 0
+    """Calculate bonus for exact substring matches.
+
+    Spaces in search are treated as optional separators (stripped before matching).
+    """
+    # Strip spaces from search - treat them as optional separators
+    search_no_spaces = _strip_spaces_for_matching(search).lower()
+    if not search_no_spaces:
+        return 0
+    return 100 if search_no_spaces in target.lower() else 0
 
 
 def _calculate_consecutive_bonus(search: str, target: str) -> int:
-    """Calculate bonus for consecutive character matches."""
+    """Case-insensitive consecutive-character bonus."""
+    # Strip spaces from search - treat them as optional separators
+    search_no_spaces = _strip_spaces_for_matching(search).lower()
+    if not search_no_spaces:
+        return 0
+
     consecutive = 0
     max_consecutive = 0
     search_idx = 0
 
-    for char in target:
-        if search_idx < len(search) and search[search_idx] == char:
+    for char in target.lower():
+        if search_idx < len(search_no_spaces) and search_no_spaces[search_idx] == char:
             consecutive += 1
             max_consecutive = max(max_consecutive, consecutive)
             search_idx += 1
@@ -902,16 +935,31 @@ def _calculate_consecutive_bonus(search: str, target: str) -> int:
 
 
 def _calculate_length_bonus(search: str, target: str) -> int:
-    """Calculate bonus for shorter search terms."""
-    return (len(target) - len(search)) * 2
+    """Calculate bonus for shorter search terms.
+
+    Spaces in search are treated as optional separators (stripped before calculation).
+    """
+    # Strip spaces from search - treat them as optional separators
+    search_no_spaces = _strip_spaces_for_matching(search)
+    if not search_no_spaces:
+        return 0
+    return max(0, (len(target) - len(search_no_spaces)) * 2)
 
 
-def _fuzzy_score(search: str, target: str) -> int:
+def _fuzzy_score(search: Any, target: str) -> int:
     """Calculate fuzzy match score.
 
     Higher score = better match.
     Returns -1 if no match possible.
+
+    Args:
+        search: Search string (or any type - non-strings return -1)
+        target: Target string to match against
     """
+    # Ensure search is a string first
+    if not isinstance(search, str):
+        return -1
+
     if not search:
         return 0
 
@@ -927,6 +975,59 @@ def _fuzzy_score(search: str, target: str) -> int:
     return score
 
 
+def _extract_id_suffix(label: str) -> str:
+    """Extract ID suffix from label for tie-breaking.
+
+    Args:
+        label: Display label (e.g., "name • [abc123...]")
+
+    Returns:
+        ID suffix string (e.g., "abc123") or empty string if not found
+    """
+    # Look for pattern like "[abc123...]" or "[abc123]"
+    match = re.search(r"\[([^\]]+)\]", label)
+    return match.group(1) if match else ""
+
+
+def _rank_labels(labels: list[str], query: Any) -> list[str]:
+    """Rank labels by fuzzy score with deterministic tie-breaks.
+
+    Args:
+        labels: List of display labels to rank
+        query: Search query string (or any type - non-strings return sorted labels)
+
+    Returns:
+        Labels sorted by fuzzy score (descending), then case-insensitive label,
+        then id suffix for deterministic ordering.
+    """
+    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)))
+
+    # Ensure query is a string
+    if not isinstance(query, str):
+        return sorted(labels, key=lambda lbl: (lbl.lower(), _extract_id_suffix(lbl)))
+
+    query_lower = query.lower()
+
+    # Calculate scores and create tuples for sorting
+    scored_labels = []
+    for label in labels:
+        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))
+
+    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)))
+
+    # 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]))
+
+    return [label for _score, _label_lower, _id_suffix, label in scored_labels]
+
+
 # ----------------------- Structured renderer helpers -------------------- #
 
 
@@ -1172,7 +1273,12 @@ def _print_selection_tip(title: str) -> None:
 
 
 def _handle_fuzzy_pick_selection(rows: list[dict[str, Any]], columns: list[tuple], title: str) -> bool:
-    """Handle fuzzy picker selection, returns True if selection was made."""
+    """Handle fuzzy picker selection.
+
+    Returns:
+        True if a resource was selected and displayed,
+        False if cancelled/no selection.
+    """
     picked = _try_fuzzy_pick(rows, columns, title)
     if picked is None:
         return False

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

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

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

@@ -4,10 +4,10 @@ glaip_sdk/branding.py,sha256=tLqYCIHMkUf8p2smpuAGNptwaKUN38G4mlh0A0DOl_w,7823
 glaip_sdk/cli/__init__.py,sha256=xCCfuF1Yc7mpCDcfhHZTX0vizvtrDSLeT8MJ3V7m5A0,156
 glaip_sdk/cli/account_store.py,sha256=NXuAVPaJS_32Aw1VTaZCNwIID-gADw4F_UMieoWmg3g,17336
 glaip_sdk/cli/agent_config.py,sha256=YAbFKrTNTRqNA6b0i0Q3pH-01rhHDRi5v8dxSFwGSwM,2401
-glaip_sdk/cli/auth.py,sha256=ycT6CepbJDfUqRT0KBYXfBhnJYd-zJ_np1-DSiY3EWs,23040
+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=CGYWTPpcFXUms_3SMB5Mr-YRpBh7c8iu-Mj245XhSCc,47686
+glaip_sdk/cli/commands/agents.py,sha256=y89okY-a5sM_QCS3F3C66DF7yhhHFbUJ7ZzIl2DUEck,47880
 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=Dtvi8mkrU3v88ZO2HwHL2iuzY8Ic3PTDL0YySWsvy0Q,53510
+glaip_sdk/cli/utils.py,sha256=iPtt4xAqtCW-dwQ-JWVwoPVPAm-P1R8C-1kih6ZIYXU,57255
 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.0.dist-info/METADATA,sha256=869wDTHn4xaN_DBTqmlZG7bQ7UXzKuhqGp1Mx_umkV8,7053
-glaip_sdk-0.5.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-glaip_sdk-0.5.0.dist-info/entry_points.txt,sha256=EGs8NO8J1fdFMWA3CsF7sKBEvtHb_fujdCoNPhfMouE,47
-glaip_sdk-0.5.0.dist-info/RECORD,,
+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,,