glaip-sdk 0.1.0__py3-none-any.whl → 0.6.10__py3-none-any.whl

glaip_sdk/cli/update_notifier.py

@@ -6,10 +6,14 @@ Author:
 
 from __future__ import annotations
 
-import os
-from collections.abc import Callable
+import importlib
+import logging
+import sys
+from collections.abc import Callable, Iterable, Iterator
+from contextlib import contextmanager
 from typing import Any, Literal
 
+import click
 import httpx
 from packaging.version import InvalidVersion, Version
 from rich import box
@@ -17,10 +21,14 @@ from rich.console import Console
 
 from glaip_sdk.branding import (
     ACCENT_STYLE,
+    ERROR_STYLE,
     SUCCESS_STYLE,
     WARNING_STYLE,
 )
-from glaip_sdk.cli.utils import command_hint, format_command_hint
+from glaip_sdk.cli.commands.update import update_command
+from glaip_sdk.cli.constants import UPDATE_CHECK_ENABLED
+from glaip_sdk.cli.hints import format_command_hint
+from glaip_sdk.cli.utils import command_hint
 from glaip_sdk.rich_components import AIPPanel
 
 FetchLatestVersion = Callable[[], str | None]
@@ -28,6 +36,8 @@ FetchLatestVersion = Callable[[], str | None]
 PYPI_JSON_URL = "https://pypi.org/pypi/{package}/json"
 DEFAULT_TIMEOUT = 1.5  # seconds
 
+_LOGGER = logging.getLogger(__name__)
+
 
 def _parse_version(value: str) -> Version | None:
     """Parse a version string into a `Version`, returning None on failure."""
@@ -43,13 +53,16 @@ def _fetch_latest_version(package_name: str) -> str | None:
     timeout = httpx.Timeout(DEFAULT_TIMEOUT)
 
     try:
-        with httpx.Client(timeout=timeout) as client:
-            response = client.get(url, headers={"Accept": "application/json"})
-            response.raise_for_status()
-            payload = response.json()
-    except httpx.HTTPError:
+        with _suppress_library_logging():
+            with httpx.Client(timeout=timeout) as client:
+                response = client.get(url, headers={"Accept": "application/json"})
+                response.raise_for_status()
+                payload = response.json()
+    except httpx.HTTPError as exc:
+        _LOGGER.debug("Update check failed: %s", exc, exc_info=True)
         return None
-    except ValueError:
+    except ValueError as exc:
+        _LOGGER.debug("Invalid JSON while checking for updates: %s", exc, exc_info=True)
         return None
 
     info = payload.get("info") if isinstance(payload, dict) else None
@@ -61,13 +74,19 @@ def _fetch_latest_version(package_name: str) -> str | None:
 
 def _should_check_for_updates() -> bool:
     """Return False when update checks are explicitly disabled."""
-    return os.getenv("AIP_NO_UPDATE_CHECK") is None
+    # Check module attribute first (for test overrides), then fall back to imported constant
+    module = sys.modules.get(__name__)
+    if module and hasattr(module, "UPDATE_CHECK_ENABLED"):
+        return getattr(module, "UPDATE_CHECK_ENABLED")
+    return UPDATE_CHECK_ENABLED
 
 
 def _build_update_panel(
     current_version: str,
     latest_version: str,
     command_text: str,
+    *,
+    show_command_hint: bool,
 ) -> AIPPanel:
     """Create a Rich panel that prompts the user to update."""
     command_markup = format_command_hint(command_text) or command_text
@@ -75,9 +94,10 @@ def _build_update_panel(
         f"[{WARNING_STYLE}]✨ Update available![/] "
         f"{current_version} → {latest_version}\n\n"
         "See the latest release notes:\n"
-        f"https://pypi.org/project/glaip-sdk/{latest_version}/\n\n"
-        f"[{ACCENT_STYLE}]Run[/] {command_markup} to install."
+        f"https://pypi.org/project/glaip-sdk/{latest_version}/"
     )
+    if show_command_hint:
+        message += f"\n\n[{ACCENT_STYLE}]Run[/] {command_markup} to install."
     return AIPPanel(
         message,
         title=f"[{SUCCESS_STYLE}]AIP SDK Update[/]",
@@ -97,11 +117,7 @@ def maybe_notify_update(
     slash_command: str | None = None,
     style: Literal["panel", "inline"] = "panel",
 ) -> None:
-    """Check PyPI for a newer version and display a prompt if one exists.
-
-    This function deliberately swallows network errors to avoid impacting CLI
-    startup time when offline or when PyPI is unavailable.
-    """
+    """Check PyPI for a newer version and display a prompt if one exists."""
     if not _should_check_for_updates():
         return
 
@@ -120,18 +136,155 @@ def maybe_notify_update(
         return
 
     active_console = console or Console()
+    should_prompt = _should_prompt_for_action(active_console, ctx)
+
     if style == "inline":
+        if should_prompt:
+            message = (
+                f"[{WARNING_STYLE}]✨ Update[/] "
+                f"{current_version} → {latest_version} "
+                "- choose Update now or Skip to continue."
+            )
+            active_console.print(message)
+            _handle_update_decision(active_console, ctx)
+            return
+
         command_markup = format_command_hint(command_text) or command_text
-        message = (
-            f"[{WARNING_STYLE}]✨ Update[/] "
-            f"{current_version} → {latest_version} "
-            f"- {command_markup}"
-        )
-        active_console.print(message)
+        active_console.print(f"[{WARNING_STYLE}]✨ Update[/] {current_version} → {latest_version} - {command_markup}")
         return
 
-    panel = _build_update_panel(current_version, latest_version, command_text)
+    panel = _build_update_panel(
+        current_version,
+        latest_version,
+        command_text,
+        show_command_hint=not should_prompt,
+    )
     active_console.print(panel)
+    if should_prompt:
+        _handle_update_decision(active_console, ctx)
+
+
+def _handle_update_decision(console: Console, ctx: Any) -> None:
+    """Prompt the user to take action on the available update."""
+    choice = _prompt_update_decision(console)
+    if choice == "skip":
+        return
+
+    _run_update_command(console, ctx)
+
+
+def _should_prompt_for_action(console: Console, ctx: Any | None) -> bool:
+    """Return True when we can safely block for interactive input."""
+    if ctx is None or not hasattr(ctx, "invoke"):
+        return False
+
+    is_interactive = getattr(console, "is_interactive", False)
+    if not isinstance(is_interactive, bool) or not is_interactive:
+        return False
+
+    is_terminal = getattr(console, "is_terminal", False)
+    if not isinstance(is_terminal, bool) or not is_terminal:
+        return False
+
+    input_method = getattr(console, "input", None)
+    return callable(input_method)
+
+
+def _prompt_update_decision(console: Console) -> Literal["update", "skip"]:
+    """Ask the user to choose between updating now or skipping."""
+    console.print(
+        f"[{ACCENT_STYLE}]Select an option to continue:[/]\n"
+        f"  [{SUCCESS_STYLE}]1.[/] Update now\n"
+        f"  [{WARNING_STYLE}]2.[/] Skip\n"
+    )
+    console.print("[dim]Press Enter after typing your choice.[/]")
+
+    while True:
+        try:
+            response = console.input("Choice [1/2]: ").strip().lower()
+        except (KeyboardInterrupt, EOFError):
+            console.print(f"\n[{WARNING_STYLE}]Update skipped.[/]")
+            return "skip"
+
+        if response in {"1", "update", "u"}:
+            return "update"
+        if response in {"2", "skip", "s"}:
+            return "skip"
+
+        console.print(f"[{ERROR_STYLE}]Please enter 1 to update now or 2 to skip.[/]")
+
+
+def _run_update_command(console: Console, ctx: Any) -> None:
+    """Invoke the built-in update command and surface any errors."""
+    try:
+        ctx.invoke(update_command)
+    except click.ClickException as exc:
+        exc.show()
+        console.print(f"[{ERROR_STYLE}]Update command exited with an error.[/]")
+    except click.Abort:
+        console.print(f"[{WARNING_STYLE}]Update aborted by user.[/]")
+    except Exception as exc:  # pragma: no cover - defensive guard
+        console.print(f"[{ERROR_STYLE}]Unexpected error while running update: {exc}[/]")
+    else:
+        _refresh_installed_version(console, ctx)
+
+
+@contextmanager
+def _suppress_library_logging(
+    logger_names: Iterable[str] | None = None, *, level: int = logging.WARNING
+) -> Iterator[None]:
+    """Temporarily raise log level for selected libraries during update checks."""
+    names = tuple(logger_names) if logger_names is not None else ("httpx",)
+    captured: list[tuple[logging.Logger, int]] = []
+    try:
+        for name in names:
+            logger = logging.getLogger(name)
+            captured.append((logger, logger.level))
+            logger.setLevel(level)
+        yield
+    finally:
+        for logger, previous_level in captured:
+            logger.setLevel(previous_level)
+
+
+def _refresh_installed_version(console: Console, ctx: Any) -> None:
+    """Reload runtime metadata after an in-process upgrade."""
+    new_version: str | None = None
+    branding_module: Any | None = None
+
+    try:
+        version_module = importlib.reload(importlib.import_module("glaip_sdk._version"))
+        new_version = getattr(version_module, "__version__", None)
+    except Exception as exc:  # pragma: no cover - defensive guard
+        _LOGGER.debug("Failed to reload glaip_sdk._version: %s", exc, exc_info=True)
+
+    try:
+        branding_module = importlib.reload(importlib.import_module("glaip_sdk.branding"))
+        if new_version:
+            branding_module.SDK_VERSION = new_version
+    except Exception as exc:  # pragma: no cover - defensive guard
+        _LOGGER.debug("Failed to update branding metadata: %s", exc, exc_info=True)
+        branding_module = None
+
+    session = _get_slash_session(ctx)
+    if session and hasattr(session, "refresh_branding"):
+        try:
+            branding_cls = getattr(branding_module, "AIPBranding", None) if branding_module else None
+            session.refresh_branding(new_version, branding_cls=branding_cls)
+            return
+        except Exception as exc:  # pragma: no cover - defensive guard
+            _LOGGER.debug("Failed to refresh active slash session: %s", exc, exc_info=True)
+
+    if new_version:
+        console.print(f"[{SUCCESS_STYLE}]CLI now running glaip-sdk {new_version}.[/]")
+
+
+def _get_slash_session(ctx: Any) -> Any | None:
+    """Return active slash session from the Click context if present."""
+    ctx_obj = getattr(ctx, "obj", None)
+    if isinstance(ctx_obj, dict):
+        return ctx_obj.get("_slash_session")
+    return None
 
 
 __all__ = ["maybe_notify_update"]