glaip-sdk 0.1.2__py3-none-any.whl → 0.7.17__py3-none-any.whl

glaip_sdk/client/agents.py

@@ -1,41 +1,52 @@
-#!/usr/bin/env python3
+# pylint: disable=duplicate-code
 """Agent client for AIP SDK.
 
 Authors:
     Raymond Christopher (raymond.christopher@gdplabs.id)
+    Christian Trisno Sen Long Chen (christian.t.s.l.chen@gdplabs.id)
 """
 
+import asyncio
 import json
 import logging
+import warnings
 from collections.abc import AsyncGenerator, Callable, Iterator, Mapping
+from contextlib import asynccontextmanager
 from os import PathLike
 from pathlib import Path
-from typing import Any, BinaryIO
+from typing import TYPE_CHECKING, Any, BinaryIO
 
-import httpx
+if TYPE_CHECKING:
+    from glaip_sdk.client.schedules import ScheduleClient
+    from glaip_sdk.hitl.remote import RemoteHITLHandler
 
-from glaip_sdk.client._agent_payloads import (
+import httpx
+from glaip_sdk.agents import Agent
+from glaip_sdk.client.agent_runs import AgentRunsClient
+from glaip_sdk.client.base import BaseClient
+from glaip_sdk.client.mcps import MCPClient
+from glaip_sdk.client.payloads.agent import (
     AgentCreateRequest,
     AgentListParams,
     AgentListResult,
     AgentUpdateRequest,
 )
-from glaip_sdk.client.base import BaseClient
-from glaip_sdk.client.mcps import MCPClient
 from glaip_sdk.client.run_rendering import (
     AgentRunRenderingManager,
     compute_timeout_seconds,
 )
+from glaip_sdk.client.shared import build_shared_config
 from glaip_sdk.client.tools import ToolClient
 from glaip_sdk.config.constants import (
+    AGENT_CONFIG_FIELDS,
     DEFAULT_AGENT_FRAMEWORK,
     DEFAULT_AGENT_RUN_TIMEOUT,
     DEFAULT_AGENT_TYPE,
     DEFAULT_AGENT_VERSION,
-    DEFAULT_MODEL,
 )
 from glaip_sdk.exceptions import NotFoundError, ValidationError
-from glaip_sdk.models import Agent
+from glaip_sdk.models import AgentResponse
+from glaip_sdk.models.constants import DEFAULT_MODEL
 from glaip_sdk.payload_schemas.agent import list_server_only_fields
 from glaip_sdk.utils.agent_config import normalize_agent_config_for_import
 from glaip_sdk.utils.client_utils import (
@@ -67,6 +78,21 @@ _MERGED_SEQUENCE_FIELDS = ("tools", "agents", "mcps")
 _DEFAULT_METADATA_TYPE = "custom"
 
 
+@asynccontextmanager
+async def _async_timeout_guard(
+    timeout_seconds: float | None,
+) -> AsyncGenerator[None, None]:
+    """Apply an asyncio timeout when a custom timeout is provided."""
+    if timeout_seconds is None:
+        yield
+        return
+    try:
+        async with asyncio.timeout(timeout_seconds):
+            yield
+    except asyncio.TimeoutError as exc:
+        raise httpx.TimeoutException(f"Request timed out after {timeout_seconds}s") from exc
+
+
 def _normalise_sequence(value: Any) -> list[Any] | None:
     """Normalise optional sequence inputs to plain lists."""
     if value is None:
@@ -193,19 +219,7 @@ def _extract_original_refs(raw_definition: dict) -> dict[str, list]:
 
 def _build_cli_args(overrides_dict: dict) -> dict[str, Any]:
     """Build CLI args from overrides, filtering out None values."""
-    cli_args = {
-        key: overrides_dict.get(key)
-        for key in (
-            "name",
-            "instruction",
-            "model",
-            "tools",
-            "agents",
-            "mcps",
-            "timeout",
-        )
-        if overrides_dict.get(key) is not None
-    }
+    cli_args = {key: overrides_dict.get(key) for key in AGENT_CONFIG_FIELDS if overrides_dict.get(key) is not None}
 
     # Normalize sequence fields
     for field in _MERGED_SEQUENCE_FIELDS:
@@ -242,18 +256,134 @@ class AgentClient(BaseClient):
         self,
         *,
         parent_client: BaseClient | None = None,
+        lm_cache_ttl: float = 3600.0,
         **kwargs: Any,
     ) -> None:
         """Initialize the agent client.
 
         Args:
-            parent_client: Parent client to adopt session/config from
-            **kwargs: Additional arguments for standalone initialization
+            parent_client: Parent client to adopt session/config from.
+            lm_cache_ttl: TTL for the language model list cache in seconds.
+                Defaults to 3600 (1 hour).
+            **kwargs: Additional arguments for standalone initialization.
         """
         super().__init__(parent_client=parent_client, **kwargs)
         self._renderer_manager = AgentRunRenderingManager(logger)
         self._tool_client: ToolClient | None = None
         self._mcp_client: MCPClient | None = None
+        self._runs_client: AgentRunsClient | None = None
+        self._schedule_client: ScheduleClient | None = None
+
+        self._lm_cache: list[dict[str, Any]] | None = None
+        self._lm_cache_time: float = 0.0
+        self._lm_cache_ttl: float = lm_cache_ttl
+
+    def clear_language_model_cache(self) -> None:
+        """Invalidate the language model list cache.
+
+        Forces the next call to list_language_models() to fetch a fresh list
+        from the server.
+        """
+        self._lm_cache = None
+        self._lm_cache_time = 0.0
+        logger.debug("Language model cache invalidated.")
+
+    def _resolve_language_model_id(self, model_str: str | None) -> str | None:
+        """Resolve a friendly model name to a server language model ID.
+
+        Handles provider name mapping (e.g., 'deepinfra/model' → 'openai-compatible/model')
+        by checking both the original provider name and its driver equivalent.
+
+        Args:
+            model_str: The model string to resolve (e.g., 'openai/gpt-4o', 'deepinfra/Qwen3-30B').
+
+        Returns:
+            The resolved server model ID (UUID), or None if not found.
+
+        Examples:
+            >>> _resolve_language_model_id("openai/gpt-4o")
+            "uuid-1234-..."
+            >>> _resolve_language_model_id("deepinfra/Qwen3-30B")  # Maps to openai-compatible
+            "uuid-5678-..."
+        """
+        if not model_str:
+            return None
+
+        # If resolution is explicitly disabled (e.g. in unit tests to avoid extra API calls), skip it
+        if getattr(self, "_skip_model_resolution", False):
+            return None
+
+        try:
+            models = self.list_language_models()
+
+            # Try exact match first
+            model_id = self._find_exact_model_match(model_str, models)
+            if model_id:
+                return model_id
+
+            # Try with provider-to-driver mapping
+            return self._try_resolve_with_driver_mapping(model_str, models)
+        except Exception:
+            pass
+
+        return None
+
+    def _find_exact_model_match(self, model_str: str, models: list[dict[str, Any]]) -> str | None:
+        """Find exact model match in models list.
+
+        Args:
+            model_str: Model string to match.
+            models: List of language model dictionaries from server.
+
+        Returns:
+            Model ID (UUID) if found, None otherwise.
+        """
+        for model_info in models:
+            provider = model_info.get("provider")
+            name = model_info.get("name")
+            if provider and name:
+                full_name = f"{provider}/{name}"
+                if full_name == model_str:
+                    return model_info.get("id")
+            if name == model_str:
+                return model_info.get("id")
+        return None
+
+    def _try_resolve_with_driver_mapping(self, model_str: str, models: list[dict[str, Any]]) -> str | None:
+        """Try to resolve model using provider-to-driver mapping.
+
+        Maps provider names to their driver implementations (e.g., deepinfra → openai-compatible)
+        and searches the models list with the driver name.
+
+        Args:
+            model_str: Model string in provider/model format (e.g., "deepinfra/Qwen3-30B").
+            models: List of language model dictionaries from server.
+
+        Returns:
+            Model ID (UUID) if found, None otherwise.
+        """
+        if "/" not in model_str:
+            return None
+
+        from glaip_sdk.models._provider_mappings import get_driver  # noqa: PLC0415
+
+        provider, model_name = model_str.split("/", 1)
+        driver = get_driver(provider)
+
+        # Only try with driver if it's different from provider
+        if driver == provider:
+            return None
+
+        driver_model_str = f"{driver}/{model_name}"
+        for model_info in models:
+            provider_field = model_info.get("provider")
+            name_field = model_info.get("name")
+            if provider_field and name_field:
+                full_name = f"{provider_field}/{name_field}"
+                if full_name == driver_model_str:
+                    return model_info.get("id")
+
+        return None
 
     def list_agents(
         self,
@@ -352,7 +482,8 @@ class AgentClient(BaseClient):
                 status_code=404,
             )
 
-        return Agent(**data)._set_client(self)
+        response = AgentResponse(**data)
+        return Agent.from_response(response, client=self)
 
     def find_agents(self, name: str | None = None) -> list[Agent]:
         """Find agents by name."""
@@ -366,6 +497,11 @@ class AgentClient(BaseClient):
     # Renderer delegation helpers
     # ------------------------------------------------------------------ #
     def _get_renderer_manager(self) -> AgentRunRenderingManager:
+        """Get or create the renderer manager instance.
+
+        Returns:
+            AgentRunRenderingManager instance.
+        """
         manager = getattr(self, "_renderer_manager", None)
         if manager is None:
             manager = AgentRunRenderingManager(logger)
@@ -373,6 +509,15 @@ class AgentClient(BaseClient):
         return manager
 
     def _create_renderer(self, renderer: RichStreamRenderer | str | None, **kwargs: Any) -> RichStreamRenderer:
+        """Create or return a renderer instance.
+
+        Args:
+            renderer: Renderer instance, string identifier, or None.
+            **kwargs: Additional keyword arguments (e.g., verbose).
+
+        Returns:
+            RichStreamRenderer instance.
+        """
         manager = self._get_renderer_manager()
         verbose = kwargs.get("verbose", False)
         if isinstance(renderer, RichStreamRenderer) or hasattr(renderer, "on_start"):
@@ -386,7 +531,21 @@ class AgentClient(BaseClient):
         timeout_seconds: float,
         agent_name: str | None,
         meta: dict[str, Any],
+        hitl_handler: "RemoteHITLHandler | None" = None,
     ) -> tuple[str, dict[str, Any], float | None, float | None]:
+        """Process stream events from an HTTP response.
+
+        Args:
+            stream_response: HTTP response stream.
+            renderer: Renderer to use for displaying events.
+            timeout_seconds: Timeout in seconds.
+            agent_name: Optional agent name.
+            meta: Metadata dictionary.
+            hitl_handler: Optional HITL handler for approval callbacks.
+
+        Returns:
+            Tuple of (final_text, stats_usage, started_monotonic, finished_monotonic).
+        """
         manager = self._get_renderer_manager()
         return manager.process_stream_events(
             stream_response,
@@ -394,6 +553,7 @@ class AgentClient(BaseClient):
             timeout_seconds,
             agent_name,
             meta,
+            hitl_handler=hitl_handler,
         )
 
     def _finalize_renderer(
@@ -404,8 +564,25 @@ class AgentClient(BaseClient):
         started_monotonic: float | None,
         finished_monotonic: float | None,
     ) -> str:
+        """Finalize the renderer and return the final response text.
+
+        Args:
+            renderer: Renderer to finalize.
+            final_text: Final text content.
+            stats_usage: Usage statistics dictionary.
+            started_monotonic: Start time (monotonic).
+            finished_monotonic: Finish time (monotonic).
+
+        Returns:
+            Final text string.
+        """
+        from glaip_sdk.client.run_rendering import (  # noqa: PLC0415
+            finalize_render_manager,
+        )
+
         manager = self._get_renderer_manager()
-        return manager.finalize_renderer(
+        return finalize_render_manager(
+            manager,
             renderer,
             final_text,
             stats_usage,
@@ -414,20 +591,53 @@ class AgentClient(BaseClient):
         )
 
     def _get_tool_client(self) -> ToolClient:
+        """Get or create the tool client instance.
+
+        Returns:
+            ToolClient instance.
+        """
         if self._tool_client is None:
             self._tool_client = ToolClient(parent_client=self)
         return self._tool_client
 
     def _get_mcp_client(self) -> MCPClient:
+        """Get or create the MCP client instance.
+
+        Returns:
+            MCPClient instance.
+        """
         if self._mcp_client is None:
             self._mcp_client = MCPClient(parent_client=self)
         return self._mcp_client
 
+    @property
+    def schedules(self) -> "ScheduleClient":
+        """Get or create the schedule client instance.
+
+        Returns:
+            ScheduleClient instance.
+        """
+        if self._schedule_client is None:
+            # Import here to avoid circular import
+            from glaip_sdk.client.schedules import ScheduleClient  # noqa: PLC0415
+
+            self._schedule_client = ScheduleClient(parent_client=self)
+        return self._schedule_client
+
     def _normalise_reference_entry(
         self,
         entry: Any,
         fallback_iter: Iterator[Any] | None,
     ) -> tuple[str | None, str | None]:
+        """Normalize a reference entry to extract ID and name.
+
+        Args:
+            entry: Reference entry (string, dict, or other).
+            fallback_iter: Optional iterator for fallback values.
+
+        Returns:
+            Tuple of (entry_id, entry_name).
+        """
         entry_id: str | None = None
         entry_name: str | None = None
 
@@ -464,6 +674,19 @@ class AgentClient(BaseClient):
         label: str,
         plural_label: str | None = None,
     ) -> list[str] | None:
+        """Resolve a list of resource references to IDs.
+
+        Args:
+            items: List of resource references to resolve.
+            references: Optional list of reference objects for fallback.
+            fetch_by_id: Function to fetch resource by ID.
+            find_by_name: Function to find resources by name.
+            label: Singular label for error messages.
+            plural_label: Plural label for error messages.
+
+        Returns:
+            List of resolved resource IDs, or None if items is empty.
+        """
         if not items:
             return None
 
@@ -495,6 +718,22 @@ class AgentClient(BaseClient):
         singular: str,
         plural: str,
     ) -> str:
+        """Resolve a single resource reference to an ID.
+
+        Args:
+            entry: Resource reference to resolve.
+            fallback_iter: Optional iterator for fallback values.
+            fetch_by_id: Function to fetch resource by ID.
+            find_by_name: Function to find resources by name.
+            singular: Singular label for error messages.
+            plural: Plural label for error messages.
+
+        Returns:
+            Resolved resource ID string.
+
+        Raises:
+            ValueError: If the resource cannot be resolved.
+        """
         entry_id, entry_name = self._normalise_reference_entry(entry, fallback_iter)
 
         validated_id = self._validate_resource_id(fetch_by_id, entry_id)
@@ -511,6 +750,14 @@ class AgentClient(BaseClient):
 
     @staticmethod
     def _coerce_reference_value(entry: Any) -> str:
+        """Coerce a reference entry to a string value.
+
+        Args:
+            entry: Reference entry (dict, string, or other).
+
+        Returns:
+            String representation of the reference.
+        """
         if isinstance(entry, dict):
             if entry.get("id"):
                 return str(entry["id"])
@@ -520,6 +767,15 @@ class AgentClient(BaseClient):
 
     @staticmethod
     def _validate_resource_id(fetch_by_id: Callable[[str], Any], candidate_id: str | None) -> str | None:
+        """Validate a resource ID by attempting to fetch it.
+
+        Args:
+            fetch_by_id: Function to fetch resource by ID.
+            candidate_id: Candidate ID to validate.
+
+        Returns:
+            Validated ID if found, None otherwise.
+        """
         if not candidate_id:
             return None
         try:
@@ -535,6 +791,20 @@ class AgentClient(BaseClient):
         singular: str,
         plural: str,
     ) -> tuple[str, bool]:
+        """Resolve a resource by name to an ID.
+
+        Args:
+            find_by_name: Function to find resources by name.
+            entry_name: Name of the resource to find.
+            singular: Singular label for error messages.
+            plural: Plural label for error messages.
+
+        Returns:
+            Tuple of (resolved_id, success).
+
+        Raises:
+            ValueError: If resource not found or multiple matches exist.
+        """
         try:
             matches = find_by_name(entry_name)
         except Exception:
@@ -555,6 +825,15 @@ class AgentClient(BaseClient):
         tools: list[Any] | None,
         references: list[Any] | None = None,
     ) -> list[str] | None:
+        """Resolve tool references to IDs.
+
+        Args:
+            tools: List of tool references to resolve.
+            references: Optional list of reference objects for fallback.
+
+        Returns:
+            List of resolved tool IDs, or None if tools is empty.
+        """
         tool_client = self._get_tool_client()
         return self._resolve_resource_ids(
             tools,
@@ -570,6 +849,15 @@ class AgentClient(BaseClient):
         agents: list[Any] | None,
         references: list[Any] | None = None,
     ) -> list[str] | None:
+        """Resolve agent references to IDs.
+
+        Args:
+            agents: List of agent references to resolve.
+            references: Optional list of reference objects for fallback.
+
+        Returns:
+            List of resolved agent IDs, or None if agents is empty.
+        """
         return self._resolve_resource_ids(
             agents,
             references,
@@ -584,6 +872,15 @@ class AgentClient(BaseClient):
         mcps: list[Any] | None,
         references: list[Any] | None = None,
     ) -> list[str] | None:
+        """Resolve MCP references to IDs.
+
+        Args:
+            mcps: List of MCP references to resolve.
+            references: Optional list of reference objects for fallback.
+
+        Returns:
+            List of resolved MCP IDs, or None if mcps is empty.
+        """
         mcp_client = self._get_mcp_client()
         return self._resolve_resource_ids(
             mcps,
@@ -594,10 +891,18 @@ class AgentClient(BaseClient):
             plural_label="MCPs",
         )
 
-    def _create_agent_from_payload(self, payload: Mapping[str, Any]) -> "Agent":
-        """Create an agent using a fully prepared payload mapping."""
-        known, extras = _split_known_and_extra(payload, AgentCreateRequest.__dataclass_fields__)
+    def _validate_agent_basics(self, known: dict[str, Any]) -> tuple[str, str]:
+        """Validate and extract basic agent fields.
 
+        Args:
+            known: Known fields dictionary.
+
+        Returns:
+            Tuple of (name, validated_instruction).
+
+        Raises:
+            ValueError: If name or instruction is empty/whitespace.
+        """
         name = known.pop("name", None)
         instruction = known.pop("instruction", None)
         if not name or not str(name).strip():
@@ -606,9 +911,20 @@ class AgentClient(BaseClient):
             raise ValueError("Agent instruction cannot be empty or whitespace")
 
         validated_instruction = validate_agent_instruction(str(instruction))
-        _normalise_sequence_fields(known)
+        return str(name).strip(), validated_instruction
 
-        resolved_model = known.pop("model", None) or DEFAULT_MODEL
+    def _resolve_all_resources(
+        self, known: dict[str, Any], extras: dict[str, Any]
+    ) -> tuple[list[str] | None, list[str] | None, list[str] | None]:
+        """Resolve all resource IDs (tools, agents, mcps).
+
+        Args:
+            known: Known fields dictionary.
+            extras: Extra fields dictionary.
+
+        Returns:
+            Tuple of (resolved_tools, resolved_agents, resolved_mcps).
+        """
         tool_refs = extras.pop("_tool_refs", None)
         agent_refs = extras.pop("_agent_refs", None)
         mcp_refs = extras.pop("_mcp_refs", None)
@@ -621,10 +937,56 @@ class AgentClient(BaseClient):
         resolved_agents = self._resolve_agent_ids(agents_raw, agent_refs)
         resolved_mcps = self._resolve_mcp_ids(mcps_raw, mcp_refs)
 
+        return resolved_tools, resolved_agents, resolved_mcps
+
+    def _process_model_fields(
+        self, resolved_model: Any, known: dict[str, Any]
+    ) -> tuple[str, str | None, str | None, str | None]:
+        """Process model fields and extract language model ID.
+
+        Args:
+            resolved_model: Resolved model (string or Model object).
+            known: Known fields dictionary.
+
+        Returns:
+            Tuple of (resolved_model_str, language_model_id, provider, model_name).
+        """
+        from glaip_sdk.models import Model  # noqa: PLC0415
+
+        if isinstance(resolved_model, Model):
+            if resolved_model.credentials or resolved_model.hyperparameters or resolved_model.base_url:
+                warnings.warn(
+                    "Model object contains local configuration (credentials, hyperparameters, or base_url) "
+                    "which is ignored for remote deployment. These fields are only used for local execution.",
+                    UserWarning,
+                    stacklevel=2,
+                )
+            resolved_model = resolved_model.id
+
+        # Validate and normalize string models (handles bare name deprecation)
+        if isinstance(resolved_model, str):
+            from glaip_sdk.models._validation import _validate_model  # noqa: PLC0415
+
+            resolved_model = _validate_model(resolved_model)
+
         language_model_id = known.pop("language_model_id", None)
+        if not language_model_id and isinstance(resolved_model, str):
+            language_model_id = self._resolve_language_model_id(resolved_model)
+
         provider = known.pop("provider", None)
         model_name = known.pop("model_name", None)
 
+        return resolved_model, language_model_id, provider, model_name
+
+    def _extract_agent_metadata(self, known: dict[str, Any]) -> tuple[str, str, str]:
+        """Extract agent type, framework, and version.
+
+        Args:
+            known: Known fields dictionary.
+
+        Returns:
+            Tuple of (agent_type, framework, version).
+        """
         agent_type_value = known.pop("agent_type", None)
         fallback_type_value = known.pop("type", None)
         if agent_type_value is None:
@@ -632,6 +994,26 @@ class AgentClient(BaseClient):
 
         framework_value = known.pop("framework", None) or DEFAULT_AGENT_FRAMEWORK
         version_value = known.pop("version", None) or DEFAULT_AGENT_VERSION
+
+        return agent_type_value, framework_value, version_value
+
+    def _create_agent_from_payload(self, payload: Mapping[str, Any]) -> "Agent":
+        """Create an agent using a fully prepared payload mapping."""
+        known, extras = _split_known_and_extra(payload, AgentCreateRequest.__dataclass_fields__)
+
+        # Validate and extract basic fields
+        name, validated_instruction = self._validate_agent_basics(known)
+        _normalise_sequence_fields(known)
+
+        # Resolve model and resources
+        resolved_model = known.pop("model", None) or DEFAULT_MODEL
+        resolved_tools, resolved_agents, resolved_mcps = self._resolve_all_resources(known, extras)
+
+        # Process model and language model ID
+        resolved_model, language_model_id, provider, model_name = self._process_model_fields(resolved_model, known)
+
+        # Extract agent type, framework, version
+        agent_type_value, framework_value, version_value = self._extract_agent_metadata(known)
         account_id = known.pop("account_id", None)
         description = known.pop("description", None)
         metadata = _prepare_agent_metadata(known.pop("metadata", None))
@@ -644,7 +1026,7 @@ class AgentClient(BaseClient):
         final_extras.setdefault("model", resolved_model)
 
         request = AgentCreateRequest(
-            name=str(name).strip(),
+            name=name,
             instruction=validated_instruction,
             model=resolved_model,
             language_model_id=language_model_id,
@@ -675,7 +1057,8 @@ class AgentClient(BaseClient):
             get_endpoint_fmt=f"{AGENTS_ENDPOINT}{{id}}",
             json=payload_dict,
         )
-        return Agent(**full_agent_data)._set_client(self)
+        response = AgentResponse(**full_agent_data)
+        return Agent.from_response(response, client=self)
 
     def create_agent(
         self,
@@ -721,6 +1104,29 @@ class AgentClient(BaseClient):
         """Backward-compatible helper to create an agent from a configuration file."""
         return self.create_agent(file=file_path, **overrides)
 
+    def _resolve_update_model_fields(self, known: dict[str, Any]) -> None:
+        """Resolve model fields in-place for update payload if present.
+
+        If 'model' or 'language_model_id' keys exist in the known fields dict,
+        this method resolves them into 'language_model_id', 'provider', and 'model_name'
+        using the standard resolution logic, ensuring consistency with create_agent.
+
+        Args:
+            known: The dictionary of known fields to check and update in-place.
+        """
+        if "model" in known or "language_model_id" in known:
+            model_val = known.pop("model", None)
+            r_model, r_id, r_prov, r_name = self._process_model_fields(model_val, known)
+
+            if r_model is not None:
+                known["model"] = r_model
+            if r_id is not None:
+                known["language_model_id"] = r_id
+            if r_prov is not None:
+                known["provider"] = r_prov
+            if r_name is not None:
+                known["model_name"] = r_name
+
     def _update_agent_from_payload(
         self,
         agent_id: str,
@@ -746,6 +1152,8 @@ class AgentClient(BaseClient):
         if mcps_value is not None:
             mcps_value = self._resolve_mcp_ids(mcps_value, mcp_refs)  # pragma: no cover
 
+        self._resolve_update_model_fields(known)
+
         request = AgentUpdateRequest(
             name=known.pop("name", None),
             instruction=known.pop("instruction", None),
@@ -770,8 +1178,9 @@ class AgentClient(BaseClient):
 
         payload_dict = request.to_payload(current_agent)
 
-        response = self._request("PUT", f"/agents/{agent_id}", json=payload_dict)
-        return Agent(**response)._set_client(self)
+        api_response = self._request("PUT", f"/agents/{agent_id}", json=payload_dict)
+        response = AgentResponse(**api_response)
+        return Agent.from_response(response, client=self)
 
     def update_agent(
         self,
@@ -818,6 +1227,62 @@ class AgentClient(BaseClient):
         """Delete an agent."""
         self._request("DELETE", f"/agents/{agent_id}")
 
+    def upsert_agent(self, identifier: str | Agent, **kwargs) -> Agent:
+        """Create or update an agent by instance, ID, or name.
+
+        Args:
+            identifier: Agent instance, ID (UUID string), or name
+            **kwargs: Agent configuration (instruction, description, tools, etc.)
+
+        Returns:
+            The created or updated agent.
+
+        Example:
+            >>> # By name (creates if not exists)
+            >>> agent = client.agents.upsert_agent(
+            ...     "hello_agent",
+            ...     instruction="You are a helpful assistant.",
+            ...     description="A friendly agent",
+            ... )
+            >>> # By instance
+            >>> agent = client.agents.upsert_agent(existing_agent, description="Updated")
+            >>> # By ID
+            >>> agent = client.agents.upsert_agent("uuid-here", description="Updated")
+        """
+        # Handle Agent instance
+        if isinstance(identifier, Agent):
+            if identifier.id:
+                logger.info("Updating agent by instance: %s", identifier.name)
+                return self.update_agent(identifier.id, name=identifier.name, **kwargs)
+            identifier = identifier.name
+
+        # Handle string (ID or name)
+        if isinstance(identifier, str):
+            # Check if it's a UUID
+            if is_uuid(identifier):
+                logger.info("Updating agent by ID: %s", identifier)
+                return self.update_agent(identifier, **kwargs)
+
+            # It's a name - find or create
+            return self._upsert_agent_by_name(identifier, **kwargs)
+
+        raise ValueError(f"Invalid identifier type: {type(identifier)}")
+
+    def _upsert_agent_by_name(self, name: str, **kwargs) -> Agent:
+        """Find agent by name and update, or create if not found."""
+        existing = self.find_agents(name)
+
+        if len(existing) == 1:
+            logger.info("Updating existing agent: %s", name)
+            return self.update_agent(existing[0].id, name=name, **kwargs)
+
+        if len(existing) > 1:
+            raise ValueError(f"Multiple agents found with name '{name}'")
+
+        # Create new agent
+        logger.info("Creating new agent: %s", name)
+        return self.create_agent(name=name, **kwargs)
+
     def _prepare_sync_request_data(
         self,
         message: str,
@@ -882,9 +1347,35 @@ class AgentClient(BaseClient):
         tty: bool = False,
         *,
         renderer: RichStreamRenderer | str | None = "auto",
+        runtime_config: dict[str, Any] | None = None,
+        hitl_handler: "RemoteHITLHandler | None" = None,
         **kwargs,
     ) -> str:
-        """Run an agent with a message, streaming via a renderer."""
+        """Run an agent with a message, streaming via a renderer.
+
+        Args:
+            agent_id: The ID of the agent to run.
+            message: The message to send to the agent.
+            files: Optional list of files to include with the request.
+            tty: Whether to enable TTY mode.
+            renderer: Renderer for streaming output.
+            runtime_config: Optional runtime configuration for tools, MCPs, and agents.
+                Keys should be platform IDs. Example:
+                {
+                    "tool_configs": {"tool-id": {"param": "value"}},
+                    "mcp_configs": {"mcp-id": {"setting": "on"}},
+                    "agent_config": {"planning": True},
+                }
+            hitl_handler: Optional RemoteHITLHandler for approval callbacks.
+                Set GLAIP_HITL_AUTO_APPROVE=true for auto-approval without handler.
+            **kwargs: Additional arguments to pass to the run API.
+
+        Returns:
+            The agent's response as a string.
+        """
+        # Include runtime_config in kwargs only when caller hasn't already provided it
+        if runtime_config is not None and "runtime_config" not in kwargs:
+            kwargs["runtime_config"] = runtime_config
         (
             payload,
             data_payload,
@@ -933,6 +1424,7 @@ class AgentClient(BaseClient):
                     timeout_seconds,
                     agent_name,
                     meta,
+                    hitl_handler=hitl_handler,
                 )
 
         except KeyboardInterrupt:
@@ -949,6 +1441,13 @@ class AgentClient(BaseClient):
             if multipart_data:
                 multipart_data.close()
 
+        # Wait for pending HITL decisions before returning
+        if hitl_handler and hasattr(hitl_handler, "wait_for_pending_decisions"):
+            try:
+                hitl_handler.wait_for_pending_decisions(timeout=30)
+            except Exception as e:
+                logger.warning(f"Error waiting for HITL decisions: {e}")
+
         return self._finalize_renderer(
             r,
             final_text,
@@ -1028,7 +1527,9 @@ class AgentClient(BaseClient):
         message: str,
         files: list[str | BinaryIO] | None = None,
         *,
-        timeout: float | None = None,
+        request_timeout: float | None = None,
+        runtime_config: dict[str, Any] | None = None,
+        hitl_handler: "RemoteHITLHandler | None" = None,
         **kwargs,
     ) -> AsyncGenerator[dict, None]:
         """Async run an agent with a message, yielding streaming JSON chunks.
@@ -1037,29 +1538,53 @@ class AgentClient(BaseClient):
             agent_id: ID of the agent to run
             message: Message to send to the agent
             files: Optional list of files to include
-            timeout: Request timeout in seconds
+            request_timeout: Optional request timeout in seconds (defaults to client timeout)
+            runtime_config: Optional runtime configuration for tools, MCPs, and agents.
+                Keys should be platform IDs. Example:
+                {
+                    "tool_configs": {"tool-id": {"param": "value"}},
+                    "mcp_configs": {"mcp-id": {"setting": "on"}},
+                    "agent_config": {"planning": True},
+                }
+            hitl_handler: Optional HITL handler for remote approval requests.
+                Note: Async HITL support is currently deferred. This parameter
+                is accepted for API consistency but will raise NotImplementedError
+                if provided.
             **kwargs: Additional arguments (chat_history, pii_mapping, etc.)
 
         Yields:
             Dictionary containing parsed JSON chunks from the streaming response
 
         Raises:
+            NotImplementedError: If hitl_handler is provided (async HITL not yet supported)
             AgentTimeoutError: When agent execution times out
             httpx.TimeoutException: When general timeout occurs
             Exception: For other unexpected errors
         """
+        if hitl_handler is not None:
+            raise NotImplementedError(
+                "Async HITL support is currently deferred. "
+                "Please use the synchronous run_agent() method with hitl_handler."
+            )
+        # Include runtime_config in kwargs only when caller hasn't already provided it
+        if runtime_config is not None and "runtime_config" not in kwargs:
+            kwargs["runtime_config"] = runtime_config
+        # Derive timeout values for request/control flow
+        legacy_timeout = kwargs.get("timeout")
+        http_timeout_override = request_timeout if request_timeout is not None else legacy_timeout
+        http_timeout = http_timeout_override or self.timeout
+
         # Prepare request data
         payload, data_payload, files_payload, headers = self._prepare_request_data(message, files, **kwargs)
 
         # Create async client configuration
-        async_client_config = self._create_async_client_config(timeout, headers)
+        async_client_config = self._create_async_client_config(http_timeout_override, headers)
 
         # Get execution timeout for streaming control
         timeout_seconds = kwargs.get("timeout", DEFAULT_AGENT_RUN_TIMEOUT)
         agent_name = kwargs.get("agent_name")
 
-        try:
-            # Create async client and stream response
+        async def _chunk_stream() -> AsyncGenerator[dict, None]:
             async with httpx.AsyncClient(**async_client_config) as async_client:
                 async for chunk in self._stream_agent_response(
                     async_client,
@@ -1073,7 +1598,14 @@ class AgentClient(BaseClient):
                 ):
                     yield chunk
 
-        finally:
-            # Ensure cleanup - this is handled by the calling context
-            # but we keep this for safety in case of future changes
-            pass
+        async with _async_timeout_guard(http_timeout):
+            async for chunk in _chunk_stream():
+                yield chunk
+
+    @property
+    def runs(self) -> "AgentRunsClient":
+        """Get the agent runs client."""
+        if self._runs_client is None:
+            shared_config = build_shared_config(self)
+            self._runs_client = AgentRunsClient(**shared_config)
+        return self._runs_client