glaip-sdk 0.0.20__py3-none-any.whl → 0.7.7__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,20 @@ from rich.console import Console
 
 from glaip_sdk.branding import (
     ACCENT_STYLE,
+    ERROR_STYLE,
+    INFO_STYLE,
     SUCCESS_STYLE,
     WARNING_STYLE,
 )
-from glaip_sdk.cli.utils import command_hint, format_command_hint
+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 command_hint, format_command_hint
 from glaip_sdk.rich_components import AIPPanel
 
 FetchLatestVersion = Callable[[], str | None]
@@ -28,6 +42,9 @@ FetchLatestVersion = Callable[[], str | None]
 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:
     """Parse a version string into a `Version`, returning None on failure."""
@@ -43,13 +60,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 +81,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 +101,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 +124,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 +143,356 @@ 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)
+            _stash_update_versions(ctx, current_version, latest_version)
+            _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:
+        _stash_update_versions(ctx, current_version, latest_version)
+        _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:
+            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"
+
+        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 _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:
+        new_version = _refresh_installed_version(console, ctx)
+        _maybe_retry_update(console, ctx, new_version, is_uv)
+
+
+@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) -> str | 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 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:
+    """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
+
+
+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,6 +13,7 @@ from typing import Any
 
 import click
 
+from glaip_sdk.cli.core.context import handle_best_effort_check
 from glaip_sdk.utils.validation import (
     coerce_timeout,
     validate_agent_instruction,
@@ -42,7 +43,7 @@ def validate_agent_name_cli(name: str) -> str:
     try:
         return validate_agent_name(name)
     except ValueError as e:
-        raise click.ClickException(str(e))
+        raise click.ClickException(str(e)) from e
 
 
 def validate_agent_instruction_cli(instruction: str) -> str:
@@ -60,7 +61,7 @@ def validate_agent_instruction_cli(instruction: str) -> str:
     try:
         return validate_agent_instruction(instruction)
     except ValueError as e:
-        raise click.ClickException(str(e))
+        raise click.ClickException(str(e)) from e
 
 
 def validate_timeout_cli(timeout: int) -> int:
@@ -78,7 +79,7 @@ def validate_timeout_cli(timeout: int) -> int:
     try:
         return validate_timeout(timeout)
     except ValueError as e:
-        raise click.ClickException(str(e))
+        raise click.ClickException(str(e)) from e
 
 
 def validate_tool_name_cli(name: str) -> str:
@@ -96,7 +97,7 @@ def validate_tool_name_cli(name: str) -> str:
     try:
         return validate_tool_name(name)
     except ValueError as e:
-        raise click.ClickException(str(e))
+        raise click.ClickException(str(e)) from e
 
 
 def validate_mcp_name_cli(name: str) -> str:
@@ -114,7 +115,7 @@ def validate_mcp_name_cli(name: str) -> str:
     try:
         return validate_mcp_name(name)
     except ValueError as e:
-        raise click.ClickException(str(e))
+        raise click.ClickException(str(e)) from e
 
 
 def validate_file_path_cli(file_path: str | Path, must_exist: bool = True) -> Path:
@@ -133,7 +134,7 @@ def validate_file_path_cli(file_path: str | Path, must_exist: bool = True) -> Pa
     try:
         return validate_file_path(file_path, must_exist)
     except ValueError as e:
-        raise click.ClickException(str(e))
+        raise click.ClickException(str(e)) from e
 
 
 def validate_directory_path_cli(dir_path: str | Path, must_exist: bool = True) -> Path:
@@ -152,7 +153,7 @@ def validate_directory_path_cli(dir_path: str | Path, must_exist: bool = True) -
     try:
         return validate_directory_path(dir_path, must_exist)
     except ValueError as e:
-        raise click.ClickException(str(e))
+        raise click.ClickException(str(e)) from e
 
 
 def validate_url_cli(url: str) -> str:
@@ -170,7 +171,7 @@ def validate_url_cli(url: str) -> str:
     try:
         return validate_url(url)
     except ValueError as e:
-        raise click.ClickException(str(e))
+        raise click.ClickException(str(e)) from e
 
 
 def validate_api_key_cli(api_key: str) -> str:
@@ -188,7 +189,7 @@ def validate_api_key_cli(api_key: str) -> str:
     try:
         return validate_api_key(api_key)
     except ValueError as e:
-        raise click.ClickException(str(e))
+        raise click.ClickException(str(e)) from e
 
 
 def coerce_timeout_cli(value: int | float | str) -> int:
@@ -206,7 +207,7 @@ def coerce_timeout_cli(value: int | float | str) -> int:
     try:
         return coerce_timeout(value)
     except ValueError as e:
-        raise click.ClickException(str(e))
+        raise click.ClickException(str(e)) from e
 
 
 def validate_name_uniqueness_cli(
@@ -226,15 +227,12 @@ def validate_name_uniqueness_cli(
     Raises:
         click.ClickException: If name is not unique
     """
-    try:
+
+    def _check_duplicate() -> None:
         existing = finder_func(name=name)
         if existing:
             raise click.ClickException(
-                f"A {resource_type.lower()} named '{name}' already exists. "
-                "Please choose a unique name."
+                f"A {resource_type.lower()} named '{name}' already exists. Please choose a unique name."
             )
-    except click.ClickException:
-        raise
-    except Exception:
-        # Non-fatal: best-effort duplicate check
-        pass
+
+    handle_best_effort_check(_check_duplicate)

glaip_sdk/client/__init__.py

@@ -5,6 +5,8 @@ Authors:
     Raymond Christopher (raymond.christopher@gdplabs.id)
 """
 
+from glaip_sdk.client.agent_runs import AgentRunsClient
 from glaip_sdk.client.main import Client
+from glaip_sdk.client.schedules import AgentScheduleManager, ScheduleClient
 
-__all__ = ["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__}")