glaip-sdk 0.6.5b3__py3-none-any.whl → 0.7.17__py3-none-any.whl

glaip_sdk/cli/update_notifier.py

@@ -22,13 +22,19 @@ from rich.console import Console
 from glaip_sdk.branding import (
     ACCENT_STYLE,
     ERROR_STYLE,
+    INFO_STYLE,
     SUCCESS_STYLE,
     WARNING_STYLE,
 )
-from glaip_sdk.cli.commands.update import update_command
+from glaip_sdk.cli.commands.update import (
+    PACKAGE_NAME,
+    _build_command_parts,
+    _build_manual_upgrade_command,
+    _is_uv_managed_environment,
+    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.cli.hints import command_hint, format_command_hint
 from glaip_sdk.rich_components import AIPPanel
 
 FetchLatestVersion = Callable[[], str | None]
@@ -37,6 +43,7 @@ PYPI_JSON_URL = "https://pypi.org/pypi/{package}/json"
 DEFAULT_TIMEOUT = 1.5  # seconds
 
 _LOGGER = logging.getLogger(__name__)
+_UPDATE_VERSIONS_KEY = "_update_notifier_versions"
 
 
 def _parse_version(value: str) -> Version | None:
@@ -146,6 +153,7 @@ def maybe_notify_update(
                 "- choose Update now or Skip to continue."
             )
             active_console.print(message)
+            _stash_update_versions(ctx, current_version, latest_version)
             _handle_update_decision(active_console, ctx)
             return
 
@@ -161,6 +169,7 @@ def maybe_notify_update(
     )
     active_console.print(panel)
     if should_prompt:
+        _stash_update_versions(ctx, current_version, latest_version)
         _handle_update_decision(active_console, ctx)
 
 
@@ -201,7 +210,13 @@ def _prompt_update_decision(console: Console) -> Literal["update", "skip"]:
 
     while True:
         try:
-            response = console.input("Choice [1/2]: ").strip().lower()
+            raw_response = console.input("Choice [1/2]: ")
+            # Strip whitespace and convert to lowercase
+            response = raw_response.strip().lower()
+            # Remove any non-printable control characters (but keep printable chars)
+            # This handles cases where ANSI escape sequences or other control chars leak into input
+            response = "".join(char for char in response if char.isprintable() or char.isspace())
+            response = response.strip()  # Strip again after filtering
         except (KeyboardInterrupt, EOFError):
             console.print(f"\n[{WARNING_STYLE}]Update skipped.[/]")
             return "skip"
@@ -214,19 +229,93 @@ def _prompt_update_decision(console: Console) -> Literal["update", "skip"]:
         console.print(f"[{ERROR_STYLE}]Please enter 1 to update now or 2 to skip.[/]")
 
 
+def _get_manual_upgrade_command(is_uv: bool) -> str:
+    """Get the manual upgrade command for the given environment type.
+
+    Args:
+        is_uv: True if running in uv tool environment, False for pip environment.
+
+    Returns:
+        Manual upgrade command string.
+    """
+    try:
+        return _build_manual_upgrade_command(include_prerelease=False, is_uv=is_uv)
+    except Exception:
+        # Fallback: rebuild from shared command parts to avoid hardcoded strings.
+        try:
+            command_parts, _ = _build_command_parts(
+                package_name=PACKAGE_NAME,
+                is_uv=is_uv,
+                force_reinstall=False,
+                include_prerelease=False,
+            )
+        except Exception:
+            command_parts = (
+                ["uv", "tool", "install", "--upgrade", PACKAGE_NAME]
+                if is_uv
+                else ["pip", "install", "--upgrade", PACKAGE_NAME]
+            )
+        return " ".join(command_parts)
+
+
+def _show_proactive_uv_guidance(console: Console, is_uv: bool) -> None:
+    """Show proactive guidance for uv environments before update attempt.
+
+    Args:
+        console: Rich console for output.
+        is_uv: True if running in uv tool environment.
+    """
+    if not is_uv:
+        return
+
+    manual_cmd = _get_manual_upgrade_command(is_uv=True)
+    console.print(
+        f"[{INFO_STYLE}]💡 Detected uv tool environment.[/] "
+        f"If automatic update fails, run: [{ACCENT_STYLE}]{manual_cmd}[/]"
+    )
+
+
+def _show_error_guidance(console: Console, is_uv: bool) -> None:
+    """Show error guidance with correct manual command based on environment.
+
+    Args:
+        console: Rich console for output.
+        is_uv: True if running in uv tool environment.
+    """
+    try:
+        manual_cmd = _get_manual_upgrade_command(is_uv=is_uv)
+        console.print(f"[{INFO_STYLE}]💡 Tip:[/] Run this command manually:\n   [{ACCENT_STYLE}]{manual_cmd}[/]")
+    except Exception as exc:  # pragma: no cover - defensive guard
+        _LOGGER.debug("Failed to render update tip: %s", exc, exc_info=True)
+
+
 def _run_update_command(console: Console, ctx: Any) -> None:
     """Invoke the built-in update command and surface any errors."""
+    # Detect uv environment proactively before attempting update
+    is_uv = _is_uv_managed_environment()
+
+    # Provide proactive guidance for uv environments
+    # This helps users on older versions (e.g., 0.6.19) that don't have uv detection
+    # in their update command
+    _show_proactive_uv_guidance(console, is_uv)
+
     try:
         ctx.invoke(update_command)
     except click.ClickException as exc:
         exc.show()
         console.print(f"[{ERROR_STYLE}]Update command exited with an error.[/]")
+        _show_error_guidance(console, is_uv)
     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}[/]")
+        # Also provide guidance for unexpected errors in uv environments
+        if is_uv:
+            manual_cmd = _get_manual_upgrade_command(is_uv=True)
+            console.print(f"[{INFO_STYLE}]💡 Tip:[/] Try running manually:\n   [{ACCENT_STYLE}]{manual_cmd}[/]")
     else:
-        _refresh_installed_version(console, ctx)
+        new_version = _refresh_installed_version(console, ctx)
+        _maybe_retry_update(console, ctx, new_version, is_uv)
 
 
 @contextmanager
@@ -247,7 +336,7 @@ def _suppress_library_logging(
             logger.setLevel(previous_level)
 
 
-def _refresh_installed_version(console: Console, ctx: Any) -> None:
+def _refresh_installed_version(console: Console, ctx: Any) -> str | None:
     """Reload runtime metadata after an in-process upgrade."""
     new_version: str | None = None
     branding_module: Any | None = None
@@ -271,12 +360,13 @@ def _refresh_installed_version(console: Console, ctx: Any) -> None:
         try:
             branding_cls = getattr(branding_module, "AIPBranding", None) if branding_module else None
             session.refresh_branding(new_version, branding_cls=branding_cls)
-            return
+            return new_version
         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}.[/]")
+    return new_version
 
 
 def _get_slash_session(ctx: Any) -> Any | None:
@@ -287,4 +377,122 @@ def _get_slash_session(ctx: Any) -> Any | None:
     return None
 
 
+def _stash_update_versions(ctx: Any | None, current_version: str, latest_version: str) -> None:
+    """Persist update versions in the Click context for post-update checks."""
+    if ctx is None:
+        return
+    ctx_obj = getattr(ctx, "obj", None)
+    if isinstance(ctx_obj, dict):
+        ctx_obj[_UPDATE_VERSIONS_KEY] = {"current": current_version, "latest": latest_version}
+
+
+def _get_update_versions(ctx: Any | None) -> tuple[str | None, str | None]:
+    """Return current/latest versions captured during the update prompt."""
+    if ctx is None:
+        return None, None
+    ctx_obj = getattr(ctx, "obj", None)
+    if not isinstance(ctx_obj, dict):
+        return None, None
+    payload = ctx_obj.get(_UPDATE_VERSIONS_KEY)
+    if not isinstance(payload, dict):
+        return None, None
+    current = payload.get("current")
+    latest = payload.get("latest")
+    return (
+        current if isinstance(current, str) else None,
+        latest if isinstance(latest, str) else None,
+    )
+
+
+def _should_retry_update(
+    ctx: Any,
+    console: Console,
+    new_version: str | None,
+) -> tuple[str, str, Version, Version, Version] | None:
+    """Check if update retry is needed and return parsed versions if so."""
+    if ctx is None or not hasattr(ctx, "invoke"):
+        return None
+    if not _should_prompt_for_action(console, ctx):
+        return None
+
+    current_version, latest_version = _get_update_versions(ctx)
+    if not current_version or not latest_version or not new_version:
+        return None
+
+    current = _parse_version(current_version)
+    latest = _parse_version(latest_version)
+    installed = _parse_version(new_version)
+    if current is None or latest is None or installed is None:
+        return None
+
+    if installed >= latest:
+        return None
+
+    # Note: installed > current case is handled in _maybe_retry_update()
+    # to allow warning message to be printed before returning
+
+    return current_version, latest_version, current, latest, installed
+
+
+def _handle_reinstall_error(console: Console, exc: Exception, is_uv: bool) -> None:
+    """Handle errors during reinstall attempt."""
+    if isinstance(exc, click.ClickException):
+        exc.show()
+        console.print(f"[{ERROR_STYLE}]Reinstall attempt failed.[/]")
+        _show_error_guidance(console, is_uv)
+    elif isinstance(exc, click.Abort):
+        console.print(f"[{WARNING_STYLE}]Reinstall skipped by user.[/]")
+    else:
+        console.print(f"[{ERROR_STYLE}]Unexpected error while reinstalling: {exc}[/]")
+        if is_uv:
+            manual_cmd = _get_manual_upgrade_command(is_uv=True)
+            console.print(f"[{INFO_STYLE}]💡 Tip:[/] Try running manually:\n   [{ACCENT_STYLE}]{manual_cmd}[/]")
+
+
+def _check_final_version(
+    console: Console, new_version: str | None, latest_version: str, latest: Version, is_uv: bool
+) -> None:
+    """Check and report final version status after reinstall."""
+    installed = _parse_version(new_version) if isinstance(new_version, str) else None
+    if installed is None or installed < latest:
+        console.print(
+            f"[{WARNING_STYLE}]Still on {new_version}. Your package index may not have {latest_version} yet.[/]"
+        )
+        if is_uv:
+            console.print(
+                f"[{INFO_STYLE}]💡 Tip:[/] If you need PyPI immediately, set "
+                f"[{ACCENT_STYLE}]UV_INDEX_URL=https://pypi.org/simple[/]."
+            )
+
+
+def _maybe_retry_update(
+    console: Console,
+    ctx: Any,
+    new_version: str | None,
+    is_uv: bool,
+) -> None:
+    """Retry once with reinstall when the update did not advance versions."""
+    versions = _should_retry_update(ctx, console, new_version)
+    if versions is None:
+        return
+
+    current_version, latest_version, current, latest, installed = versions
+    if installed > current:
+        console.print(f"[{WARNING_STYLE}]Update installed {new_version}, but {latest_version} is still available.[/]")
+        return
+
+    console.print(
+        f"[{WARNING_STYLE}]Update completed but version stayed at {new_version}. Retrying with reinstall...[/]"
+    )
+
+    try:
+        ctx.invoke(update_command, force_reinstall=True)
+    except Exception as exc:
+        _handle_reinstall_error(console, exc, is_uv)
+        return
+
+    new_version = _refresh_installed_version(console, ctx)
+    _check_final_version(console, new_version, latest_version, latest, is_uv)
+
+
 __all__ = ["maybe_notify_update"]

glaip_sdk/cli/validators.py

@@ -13,7 +13,7 @@ from typing import Any
 
 import click
 
-from glaip_sdk.cli.utils import handle_best_effort_check
+from glaip_sdk.cli.core.context import handle_best_effort_check
 from glaip_sdk.utils.validation import (
     coerce_timeout,
     validate_agent_instruction,

glaip_sdk/client/__init__.py

@@ -7,5 +7,6 @@ Authors:
 
 from glaip_sdk.client.agent_runs import AgentRunsClient
 from glaip_sdk.client.main import Client
+from glaip_sdk.client.schedules import AgentScheduleManager, ScheduleClient
 
-__all__ = ["AgentRunsClient", "Client"]
+__all__ = ["AgentRunsClient", "AgentScheduleManager", "Client", "ScheduleClient"]

glaip_sdk/client/_schedule_payloads.py

@@ -0,0 +1,89 @@
+"""Schedule request payload builders for AIP SDK.
+
+Authors:
+    Christian Trisno Sen Long Chen (christian.t.s.l.chen@gdplabs.id)
+"""
+
+from dataclasses import dataclass
+from typing import Any
+
+from glaip_sdk.models.schedule import ScheduleConfig
+
+
+@dataclass
+class ScheduleListParams:
+    """Parameters for listing schedules.
+
+    Args:
+        limit: Maximum number of schedules to return (1-100, default 50)
+        page: Page number for pagination (default 1)
+        agent_id: Filter schedules by agent ID
+    """
+
+    limit: int | None = None
+    page: int | None = None
+    agent_id: str | None = None
+
+    def to_query_params(self) -> dict[str, Any]:
+        """Convert to query parameters dictionary.
+
+        Returns:
+            Dictionary of non-None parameters for the API request
+        """
+        params: dict[str, Any] = {}
+        if self.limit is not None:
+            params["limit"] = self.limit
+        if self.page is not None:
+            params["page"] = self.page
+        if self.agent_id is not None:
+            params["agent_id"] = self.agent_id
+        return params
+
+
+def normalize_schedule(
+    schedule: ScheduleConfig | dict[str, str] | str | None,
+) -> dict[str, str] | None:
+    """Normalize schedule input to a dictionary for API requests.
+
+    Accepts multiple input formats for user convenience:
+    - ScheduleConfig: Pydantic model with cron fields
+    - dict: Dictionary with cron fields (minute, hour, etc.)
+    - str: Cron string like "0 9 * * 1-5"
+    - None: Returns None
+
+    Args:
+        schedule: Schedule in various formats
+
+    Returns:
+        Dictionary suitable for API request or None
+
+    Raises:
+        ValueError: If cron string format is invalid
+        TypeError: If schedule is an unsupported type
+
+    Examples:
+        >>> normalize_schedule(ScheduleConfig(minute="0", hour="9"))
+        {'minute': '0', 'hour': '9', 'day_of_month': '*', 'month': '*', 'day_of_week': '*'}
+
+        >>> normalize_schedule({"minute": "0", "hour": "9"})
+        {'minute': '0', 'hour': '9', 'day_of_month': '*', 'month': '*', 'day_of_week': '*'}
+
+        >>> normalize_schedule("0 9 * * 1-5")
+        {'minute': '0', 'hour': '9', 'day_of_month': '*', 'month': '*', 'day_of_week': '1-5'}
+    """
+    if schedule is None:
+        return None
+
+    if isinstance(schedule, ScheduleConfig):
+        return schedule.model_dump()
+
+    if isinstance(schedule, dict):
+        # Validate and merge with defaults
+        return ScheduleConfig(**schedule).model_dump()
+
+    if isinstance(schedule, str):
+        # Parse cron string
+        config = ScheduleConfig.from_cron_string(schedule)
+        return config.model_dump()
+
+    raise TypeError(f"schedule must be ScheduleConfig, dict, or str, got {type(schedule).__name__}")