glaip-sdk 0.0.6a0__py3-none-any.whl → 0.0.7__py3-none-any.whl

glaip_sdk/_version.py

@@ -24,28 +24,51 @@ except Exception:  # pragma: no cover
         _toml = None  # type: ignore
 
 
-def _get_version() -> str:
+def _try_get_installed_version() -> str | None:
+    """Try to get version from installed package."""
     try:
         return version("glaip-sdk")
     except PackageNotFoundError:
-        # Not installed; try reading from local pyproject for dev
-        if _toml is not None:
-            try:
-                from pathlib import Path
-
-                here = Path(__file__).resolve()
-                root = here.parent.parent  # project root (contains pyproject.toml)
-                pyproject = root / "pyproject.toml"
-                if pyproject.is_file():
-                    data = _toml.loads(pyproject.read_text(encoding="utf-8"))
-                    ver = data.get("project", {}).get("version") or data.get(
-                        "tool", {}
-                    ).get("poetry", {}).get("version")
-                    if isinstance(ver, str) and ver:
-                        return ver
-            except Exception:
-                pass
-        return "0.0.0.dev0"
+        return None
+
+
+def _try_get_dev_version() -> str | None:
+    """Try to get version from local pyproject.toml for development."""
+    if _toml is None:
+        return None
+
+    try:
+        from pathlib import Path
+
+        here = Path(__file__).resolve()
+        root = here.parent.parent  # project root (contains pyproject.toml)
+        pyproject = root / "pyproject.toml"
+        if not pyproject.is_file():
+            return None
+
+        data = _toml.loads(pyproject.read_text(encoding="utf-8"))
+        ver = data.get("project", {}).get("version") or data.get("tool", {}).get(
+            "poetry", {}
+        ).get("version")
+        if isinstance(ver, str) and ver:
+            return ver
+    except Exception:
+        pass
+    return None
+
+
+def _get_version() -> str:
+    # Try installed version first
+    installed_version = _try_get_installed_version()
+    if installed_version:
+        return installed_version
+
+    # Try development version
+    dev_version = _try_get_dev_version()
+    if dev_version:
+        return dev_version
+
+    return "0.0.0.dev0"
 
 
 __version__ = _get_version()

glaip_sdk/cli/commands/agents.py

@@ -47,6 +47,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,
@@ -180,7 +181,7 @@ def _format_fallback_agent_data(client: Any, agent: Any) -> dict:
     result_data = build_resource_result_data(full_agent, fields)
 
     # Handle missing instruction
-    if not result_data.get("instruction"):
+    if result_data.get("instruction") in ["N/A", None, ""]:
         result_data["instruction"] = "-"
 
     # Format dates for better display
@@ -356,18 +357,15 @@ def get(ctx: Any, agent_ref: str, select: int | None, export: str | None) -> Non
         )
 
         # Handle export option
-        if export:  # pragma: no cover - requires filesystem verification
+        if export:
             export_path = Path(export)
             # Auto-detect format from file extension
-            if export_path.suffix.lower() in [".yaml", ".yml"]:
-                detected_format = "yaml"
-            else:
-                detected_format = "json"
+            detected_format = detect_export_format(export_path)
 
             # Always export comprehensive data - re-fetch agent with full details
             try:
                 agent = client.agents.get_agent_by_id(agent.id)
-            except Exception as e:  # pragma: no cover - best-effort fallback messaging
+            except Exception as e:
                 handle_rich_output(
                     ctx,
                     Text(
@@ -584,8 +582,7 @@ def run(
         handle_json_output(ctx, error=Exception(error_msg))
         raise click.ClickException(error_msg)
     except Exception as e:
-        handle_json_output(ctx, error=e)
-        raise click.ClickException(str(e))
+        _handle_command_exception(ctx, e)
 
 
 def _handle_import_file_logic(
@@ -798,8 +795,8 @@ def _handle_successful_creation(ctx: Any, agent: Any, model: str | None) -> None
     handle_rich_output(ctx, display_agent_run_suggestions(agent))
 
 
-def _handle_creation_exception(ctx: Any, e: Exception) -> None:
-    """Handle exceptions during agent creation."""
+def _handle_command_exception(ctx: Any, e: Exception) -> None:
+    """Handle exceptions during command execution with consistent error handling."""
     if isinstance(e, click.ClickException):
         if get_ctx_value(ctx, "view") == "json":
             handle_json_output(ctx, error=Exception(AGENT_NOT_FOUND_ERROR))
@@ -811,6 +808,11 @@ def _handle_creation_exception(ctx: Any, e: Exception) -> None:
     raise click.ClickException(str(e))
 
 
+def _handle_creation_exception(ctx: Any, e: Exception) -> None:
+    """Handle exceptions during agent creation."""
+    _handle_command_exception(ctx, e)
+
+
 @agents_group.command()
 @click.option("--name", help="Agent name")
 @click.option("--instruction", help="Agent instruction (prompt)")
@@ -1089,10 +1091,7 @@ def update(
         # Re-raise ClickExceptions without additional processing
         raise
     except Exception as e:
-        handle_json_output(ctx, error=e)
-        if get_ctx_value(ctx, "view") != "json":
-            print_api_error(e)
-        raise click.ClickException(str(e))
+        _handle_command_exception(ctx, e)
 
 
 @agents_group.command()
@@ -1133,10 +1132,7 @@ def delete(ctx: Any, agent_id: str, yes: bool) -> None:
         # Re-raise ClickExceptions without additional processing
         raise
     except Exception as e:
-        handle_json_output(ctx, error=e)
-        if get_ctx_value(ctx, "view") != "json":
-            print_api_error(e)
-        raise click.ClickException(str(e))
+        _handle_command_exception(ctx, e)
 
 
 @agents_group.command()
@@ -1149,9 +1145,7 @@ def delete(ctx: Any, agent_id: str, yes: bool) -> None:
 )
 @output_flags()
 @click.pass_context
-def sync_langflow(
-    ctx: Any, base_url: str | None, api_key: str | None
-) -> None:  # pragma: no cover - integration-only path
+def sync_langflow(ctx: Any, base_url: str | None, api_key: str | None) -> None:
     """Sync agents with LangFlow server flows.
 
     This command fetches all flows from the configured LangFlow server and
@@ -1192,7 +1186,4 @@ def sync_langflow(
             )
 
     except Exception as e:
-        handle_json_output(ctx, error=e)
-        if get_ctx_value(ctx, "view") != "json":
-            print_api_error(e)
-        raise click.ClickException(str(e))
+        _handle_command_exception(ctx, e)

glaip_sdk/cli/commands/configure.py

@@ -47,8 +47,8 @@ def save_config(config: dict[str, Any]) -> None:
     # Set secure file permissions
     try:
         os.chmod(CONFIG_FILE, 0o600)
-    except Exception:
-        pass  # Best effort
+    except Exception:  # pragma: no cover - platform dependent best effort
+        pass
 
 
 @click.group()

glaip_sdk/cli/commands/mcps.py

@@ -30,6 +30,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,
@@ -178,10 +179,7 @@ def get(ctx: Any, mcp_ref: str, export: str | None) -> None:
         if export:
             export_path = Path(export)
             # Auto-detect format from file extension
-            if export_path.suffix.lower() in [".yaml", ".yml"]:
-                detected_format = "yaml"
-            else:
-                detected_format = "json"
+            detected_format = detect_export_format(export_path)
 
             # Always export comprehensive data - re-fetch MCP with full details if needed
             try:

glaip_sdk/cli/commands/tools.py

@@ -34,6 +34,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,
@@ -328,10 +329,7 @@ def get(ctx: Any, tool_ref: str, select: int | None, export: str | None) -> None
         if export:
             export_path = Path(export)
             # Auto-detect format from file extension
-            if export_path.suffix.lower() in [".yaml", ".yml"]:
-                detected_format = "yaml"
-            else:
-                detected_format = "json"
+            detected_format = detect_export_format(export_path)
 
             # Always export comprehensive data - re-fetch tool with full details if needed
             try:

glaip_sdk/cli/display.py

@@ -134,17 +134,18 @@ _MISSING = object()
 def build_resource_result_data(resource: Any, fields: list[str]) -> dict[str, Any]:
     """Return a normalized mapping of ``fields`` extracted from ``resource``."""
 
-    return {
-        field: _normalise_field_value(field, _safe_get_attr(resource, field))
-        for field in fields
-    }
+    result: dict[str, Any] = {}
+    for field in fields:
+        try:
+            value = getattr(resource, field)
+        except AttributeError:
+            value = _MISSING
+        except Exception:
+            value = _MISSING
 
+        result[field] = _normalise_field_value(field, value)
 
-def _safe_get_attr(resource: Any, field: str) -> Any:
-    try:
-        return getattr(resource, field, _MISSING)
-    except Exception:
-        return _MISSING
+    return result
 
 
 def _normalise_field_value(field: str, value: Any) -> Any:
@@ -188,9 +189,7 @@ def _build_success_output_data(data: Any) -> dict[str, Any]:
     return data if data is not None else {"success": True}
 
 
-def handle_json_output(
-    ctx: Any, data: Any = None, error: Exception = None
-) -> None:  # pragma: no cover - formatting covered via integration tests
+def handle_json_output(ctx: Any, data: Any = None, error: Exception = None) -> None:
     """Handle JSON output format for CLI commands.
 
     Args:

glaip_sdk/cli/utils.py

@@ -15,6 +15,7 @@ import shutil
 import subprocess
 import tempfile
 from collections.abc import Callable
+from pathlib import Path
 from typing import TYPE_CHECKING, Any
 
 import click
@@ -29,15 +30,15 @@ try:
     from prompt_toolkit.shortcuts import prompt
 
     _HAS_PTK = True
-except Exception:
+except Exception:  # pragma: no cover - optional dependency
     _HAS_PTK = False
 
 try:
     import questionary
-except Exception:
+except Exception:  # pragma: no cover - optional dependency
     questionary = None
 
-if TYPE_CHECKING:
+if TYPE_CHECKING:  # pragma: no cover - import-only during type checking
     from glaip_sdk import Client
 from glaip_sdk.cli.commands.configure import load_config
 from glaip_sdk.rich_components import AIPPanel, AIPTable
@@ -100,7 +101,7 @@ def _prepare_pager_env(
 
 def _render_ansi(
     renderable: Any,
-) -> str:  # pragma: no cover - rendering requires real terminal
+) -> str:
     """Render a Rich renderable to an ANSI string suitable for piping to 'less'."""
     buf = io.StringIO()
     tmp_console = Console(
@@ -116,7 +117,7 @@ def _render_ansi(
     return buf.getvalue()
 
 
-def _pager_header() -> str:  # pragma: no cover - terminal UI helper
+def _pager_header() -> str:
     v = (os.getenv("AIP_PAGER_HEADER", "1") or "1").strip().lower()
     if v in {"0", "false", "off"}:
         return ""
@@ -227,7 +228,7 @@ def _get_view(ctx: Any) -> str:
 # ----------------------------- Client config ----------------------------- #
 
 
-def get_client(ctx: Any) -> Client:
+def get_client(ctx: Any) -> Client:  # pragma: no cover
     """Get configured client from context, env, and config file (ctx > env > file)."""
     from glaip_sdk import Client
 
@@ -433,7 +434,9 @@ class _FuzzyCompleter:
     def __init__(self, words: list[str]) -> None:
         self.words = words
 
-    def get_completions(self, document: Any, _complete_event: Any) -> Any:
+    def get_completions(
+        self, document: Any, _complete_event: Any
+    ) -> Any:  # pragma: no cover
         word = document.get_word_before_cursor()
         if not word:
             return
@@ -444,7 +447,7 @@ class _FuzzyCompleter:
             if self._fuzzy_match(word_lower, label_lower):
                 yield Completion(label, start_position=-len(word))
 
-    def _fuzzy_match(self, search: str, target: str) -> bool:
+    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
@@ -502,47 +505,37 @@ def _fuzzy_pick(
             complete_in_thread=True,
             complete_while_typing=True,
         )
-    except (KeyboardInterrupt, EOFError):
+    except (KeyboardInterrupt, EOFError):  # pragma: no cover - user cancelled input
         return None
 
     return _perform_fuzzy_search(answer, labels, by_label) if answer else None
 
 
-def _fuzzy_score(search: str, target: str) -> int:
-    """
-    Calculate fuzzy match score.
-    Higher score = better match.
-    Returns -1 if no match possible.
-    """
+def _is_fuzzy_match(search: str, target: str) -> bool:
+    """Check if search string is a fuzzy match for target."""
     if not search:
-        return 0
+        return True
 
-    # Check if it's a fuzzy match first
     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):
-                break
-
-    if search_idx < len(search):
-        return -1  # Not a fuzzy match
+                return True
+    return False
 
-    # Calculate score based on:
-    # 1. Exact substring match gets bonus points
-    # 2. Consecutive character matches get bonus points
-    # 3. Shorter search terms get bonus points
 
-    score = 0
+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
 
-    # Exact substring bonus
-    if search.lower() in target.lower():
-        score += 100
 
-    # Consecutive character bonus
+def _calculate_consecutive_bonus(search: str, target: str) -> int:
+    """Calculate bonus for consecutive character matches."""
     consecutive = 0
     max_consecutive = 0
     search_idx = 0
+
     for char in target:
         if search_idx < len(search) and search[search_idx] == char:
             consecutive += 1
@@ -551,10 +544,31 @@ def _fuzzy_score(search: str, target: str) -> int:
         else:
             consecutive = 0
 
-    score += max_consecutive * 10
+    return max_consecutive * 10
+
 
-    # Length bonus (shorter searches get higher scores)
-    score += (len(target) - len(search)) * 2
+def _calculate_length_bonus(search: str, target: str) -> int:
+    """Calculate bonus for shorter search terms."""
+    return (len(target) - len(search)) * 2
+
+
+def _fuzzy_score(search: str, target: str) -> int:
+    """
+    Calculate fuzzy match score.
+    Higher score = better match.
+    Returns -1 if no match possible.
+    """
+    if not search:
+        return 0
+
+    if not _is_fuzzy_match(search, target):
+        return -1  # Not a fuzzy match
+
+    # Calculate score based on different factors
+    score = 0
+    score += _calculate_exact_match_bonus(search, target)
+    score += _calculate_consecutive_bonus(search, target)
+    score += _calculate_length_bonus(search, target)
 
     return score
 
@@ -1222,3 +1236,19 @@ 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"