google-cloud-agentplatform 2.4.0__tar.gz → 2.5.0__tar.gz

{google_cloud_agentplatform-2.4.0/google_cloud_agentplatform.egg-info → google_cloud_agentplatform-2.5.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: google-cloud-agentplatform
-Version: 2.4.0
+Version: 2.5.0
 Summary: Google Cloud Agent Platform Client Library
 Author-email: Google LLC <googleapis-packages@google.com>
 License: Apache-2.0
@@ -31,7 +31,7 @@ Requires-Dist: google-cloud-storage<4.0.0,>=1.32.0; extra == "agent-engines"
 Requires-Dist: opentelemetry-sdk<2; extra == "agent-engines"
 Requires-Dist: opentelemetry-exporter-gcp-logging<2.0.0,>=1.11.0a0; extra == "agent-engines"
 Requires-Dist: opentelemetry-exporter-otlp-proto-http<2; extra == "agent-engines"
-Requires-Dist: opentelemetry-instrumentation-google-genai<1.0.0,>=0.3b0; extra == "agent-engines"
+Requires-Dist: opentelemetry-instrumentation-google-genai<2.0.0,>=0.3b0; extra == "agent-engines"
 Requires-Dist: pydantic<3,>=2.11.1; extra == "agent-engines"
 Provides-Extra: a2a
 Requires-Dist: google-cloud-agentplatform[agent_engines]; extra == "a2a"

{google_cloud_agentplatform-2.4.0 → google_cloud_agentplatform-2.5.0}/agentplatform/_genai/_evals_common.py

@@ -22,6 +22,7 @@ import datetime
 import json
 import logging
 import os
+import random
 import threading
 import time
 from typing import Any, Callable, Literal, Optional, Union, cast
@@ -122,6 +123,11 @@ def _temp_logger_level(logger_name: str, level: int) -> None:  # type: ignore[mi
         logger_instance.setLevel(original_level)
 
 
+def _is_missing(value: Any) -> bool:
+    """Returns True for None or a scalar NaN, such as a missing DataFrame cell."""
+    return bool(pd.api.types.is_scalar(value) and pd.isna(value))
+
+
 def _get_api_client_with_location(
     api_client: BaseApiClient, location: Optional[str]
 ) -> BaseApiClient:
@@ -153,6 +159,8 @@ def _get_runtime_instance(
         client = agentplatform.Client(
             project=api_client.project,
             location=api_client.location,
+            credentials=api_client._credentials,
+            http_options=api_client._http_options,
         )
         _thread_local_data.runtime_instances[agent_name] = client.runtimes.get(
             name=agent_name
@@ -160,6 +168,45 @@ def _get_runtime_instance(
     return _thread_local_data.runtime_instances[agent_name]
 
 
+def _is_retryable_error(e: Exception) -> bool:
+    """Returns True for transient errors that are safe to retry with backoff."""
+    if isinstance(e, genai_errors.APIError):
+        return e.code in _evals_constant.RETRYABLE_STATUS_CODES
+    return isinstance(
+        e, (api_exceptions.ResourceExhausted, api_exceptions.ServiceUnavailable)
+    )
+
+
+def _get_retry_backoff(
+    e: Exception, attempt: int, max_retries: int, operation: str
+) -> Optional[float]:
+    """Returns the seconds to wait before the next attempt, or None to stop.
+
+    Retryable errors back off exponentially with jitter. Other errors fail
+    fast, and the last attempt never waits.
+    """
+    if not _is_retryable_error(e) or attempt == max_retries - 1:
+        logger.error(
+            "Error during %s on attempt %d/%d: %s",
+            operation,
+            attempt + 1,
+            max_retries,
+            e,
+        )
+        return None
+    backoff = 2**attempt + random.uniform(0, 1)
+    logger.warning(
+        "Retryable error during %s on attempt %d/%d: %s. Retrying in %.1f"
+        " seconds...",
+        operation,
+        attempt + 1,
+        max_retries,
+        e,
+        backoff,
+    )
+    return backoff
+
+
 def _generate_content_with_retry(
     api_client: BaseApiClient,
     model: str,
@@ -222,29 +269,11 @@ def _generate_content_with_retry(
                         }
                 else:
                     return response
-        except api_exceptions.ResourceExhausted as e:
-            logger.warning(
-                "Resource Exhausted error on attempt %d/%d: %s. Retrying in %s"
-                " seconds...",
-                attempt + 1,
-                max_retries,
-                e,
-                2**attempt,
-            )
-            if attempt == max_retries - 1:
-                return {"error": f"Resource exhausted after retries: {e}"}
-            time.sleep(2**attempt)
         except Exception as e:  # pylint: disable=broad-exception-caught
-            logger.error(
-                "Unexpected error during generate_content on attempt %d/%d: %s",
-                attempt + 1,
-                max_retries,
-                e,
-            )
-
-            if attempt == max_retries - 1:
-                return {"error": f"Failed after retries: {e}"}
-            time.sleep(1)
+            backoff = _get_retry_backoff(e, attempt, max_retries, "generate_content")
+            if backoff is None:
+                return {"error": f"Failed on attempt {attempt + 1}/{max_retries}: {e}"}
+            time.sleep(backoff)
     return {"error": f"Failed to generate content after {max_retries} retries"}
 
 
@@ -1561,7 +1590,7 @@ def _build_interaction_id_dataset(
     eval_cases = []
     for i, row in enumerate(loaded_data):
         interaction = row.get(_evals_constant.INTERACTION_ID)
-        if not interaction:
+        if _is_missing(interaction) or not interaction:
             raise ValueError(f"Missing `interaction_id` value for row {i}.")
         eval_cases.append(
             types.EvalCase(
@@ -1871,12 +1900,12 @@ def _execute_inference_concurrently(
     max_workers = AGENT_MAX_WORKERS if runtime or agent else MAX_WORKERS
     with tqdm(total=len(prompt_dataset), desc=progress_desc) as pbar:
         with concurrent.futures.ThreadPoolExecutor(max_workers=max_workers) as executor:
-            for index, row in prompt_dataset.iterrows():
+            for index, (_, row) in enumerate(prompt_dataset.iterrows()):
                 try:
                     if (
                         has_agent_data
                         and AGENT_DATA in row.index
-                        and row.get(AGENT_DATA) is not None
+                        and not _is_missing(row.get(AGENT_DATA))
                     ):
                         agent_data_obj = row[AGENT_DATA]
                         if isinstance(agent_data_obj, dict):
@@ -2101,7 +2130,7 @@ def _run_litellm_inference(
 
     with tqdm(total=len(prompt_dataset), desc=f"LiteLLM Inference ({model})") as pbar:
         with concurrent.futures.ThreadPoolExecutor(max_workers=MAX_WORKERS) as executor:
-            for index, row in prompt_dataset.iterrows():
+            for index, (_, row) in enumerate(prompt_dataset.iterrows()):
                 messages = _convert_prompt_row_to_litellm_messages(row)
                 future = executor.submit(
                     _call_litellm_completion, model=model, messages=messages
@@ -3481,7 +3510,9 @@ def _create_runtime_session(
             raise RuntimeError(
                 "Failed to create session: runtime.api_client is None."
             ) from exc
-        operation = runtime.api_client.sessions.create(
+        from . import sessions
+
+        operation = sessions.Sessions(runtime.api_client._api_client).create(
             name=runtime.api_resource.name,
             user_id=user_id,
             config=types.CreateRuntimeSessionConfig(
@@ -3545,10 +3576,12 @@ def _execute_agent_run_with_retry(
             return {"error": "runtime.api_resource is None."}
         if runtime.api_client is None:
             return {"error": "runtime.api_client is None."}
+        from . import sessions
+
         session_name = f"{runtime.api_resource.name}/sessions/{session_id}"
         base_ts = datetime.datetime(2000, 1, 1, tzinfo=datetime.timezone.utc)
         for i, ag_event in enumerate(history_events):
-            runtime.api_client.sessions.events.append(
+            sessions.Sessions(runtime.api_client._api_client).events.append(
                 name=session_name,
                 author=ag_event.author or "user",
                 invocation_id="history",
@@ -3570,28 +3603,11 @@ def _execute_agent_run_with_retry(
                 if event and CONTENT in event and PARTS in event[CONTENT]:
                     responses.append(event)
             return responses
-        except api_exceptions.ResourceExhausted as e:
-            logger.warning(
-                "Resource Exhausted error on attempt %d/%d: %s. Retrying in %s"
-                " seconds...",
-                attempt + 1,
-                max_retries,
-                e,
-                2**attempt,
-            )
-            if attempt == max_retries - 1:
-                return {"error": f"Resource exhausted after retries: {e}"}
-            time.sleep(2**attempt)
         except Exception as e:  # pylint: disable=broad-exception-caught
-            logger.error(
-                "Unexpected error during agent engine run on attempt %d/%d: %s",
-                attempt + 1,
-                max_retries,
-                e,
-            )
-            if attempt == max_retries - 1:
-                return {"error": f"Failed after retries: {e}"}
-            time.sleep(1)
+            backoff = _get_retry_backoff(e, attempt, max_retries, "agent engine run")
+            if backoff is None:
+                return {"error": f"Failed on attempt {attempt + 1}/{max_retries}: {e}"}
+            time.sleep(backoff)
     return {"error": f"Failed to get agent run results after {max_retries} retries"}
 
 
@@ -3623,7 +3639,7 @@ async def _execute_local_agent_run_with_retry_async(
     # Lazy-import ADK dependencies to avoid top-level import failures when
     # google-adk is not installed.
     from google.adk.runners import Runner
-    from google.adk.sessions import InMemorySessionService
+    from google.adk.sessions.in_memory_session_service import InMemorySessionService
 
     # Multi-turn agent scraping with user simulation.
     if user_simulator_config or "conversation_plan" in row:
@@ -3697,28 +3713,13 @@ async def _execute_local_agent_run_with_retry_async(
                     if event and CONTENT in event and PARTS in event[CONTENT]:
                         events.append(event)
                 return events
-            except api_exceptions.ResourceExhausted as e:
-                logger.warning(
-                    "Resource Exhausted error on attempt %d/%d: %s. Retrying"
-                    " in %s seconds...",
-                    attempt + 1,
-                    max_retries,
-                    e,
-                    2**attempt,
-                )
-                if attempt == max_retries - 1:
-                    return {"error": f"Resource exhausted after retries: {e}"}
-                await asyncio.sleep(2**attempt)
             except Exception as e:  # pylint: disable=broad-exception-caught
-                logger.error(
-                    "Unexpected error during agent run on attempt %d/%d: %s",
-                    attempt + 1,
-                    max_retries,
-                    e,
-                )
-                if attempt == max_retries - 1:
-                    return {"error": f"Failed after retries: {e}"}
-                await asyncio.sleep(1)
+                backoff = _get_retry_backoff(e, attempt, max_retries, "agent run")
+                if backoff is None:
+                    return {
+                        "error": f"Failed on attempt {attempt + 1}/{max_retries}: {e}"
+                    }
+                await asyncio.sleep(backoff)
         return {"error": f"Failed to get agent run results after {max_retries} retries"}
 
 
@@ -3874,7 +3875,7 @@ def _drop_empty_columns(df: "pd.DataFrame") -> "pd.DataFrame":
     def is_empty(x: Any) -> bool:
         if isinstance(x, (list, dict)):
             return not x
-        return pd.isna(x)  # type: ignore[no-any-return]
+        return _is_missing(x)
 
     cols_to_drop = [col for col in df.columns if df[col].apply(is_empty).all()]
     return df.drop(columns=cols_to_drop)
@@ -4173,6 +4174,8 @@ def _create_evaluation_set_from_dataframe(
         if _evals_constant.RESPONSE in row or agent_data_obj or intermediate_events:
             # Resolve the oneof conflict: prioritize agent_data over flat text
             response_text = row.get(_evals_constant.RESPONSE) or None
+            if _is_missing(response_text):
+                response_text = None
 
             if agent_data_obj and response_text:
                 logger.info(
@@ -4227,7 +4230,7 @@ def _create_evaluation_set_from_dataframe(
             prompt = types.EvaluationPrompt(
                 prompt_template_data=types.PromptTemplateData(values=values)
             )
-        elif _evals_constant.PROMPT in row:
+        elif not _is_missing(row.get(_evals_constant.PROMPT)):
             prompt = types.EvaluationPrompt(text=row[_evals_constant.PROMPT])
 
         eval_item_requests.append(
@@ -4235,7 +4238,7 @@ def _create_evaluation_set_from_dataframe(
                 prompt=prompt or None,
                 golden_response=(
                     types.CandidateResponse(text=row[_evals_constant.REFERENCE])
-                    if _evals_constant.REFERENCE in row
+                    if not _is_missing(row.get(_evals_constant.REFERENCE))
                     else None
                 ),
                 candidate_responses=(

{google_cloud_agentplatform-2.4.0 → google_cloud_agentplatform-2.5.0}/agentplatform/_genai/_evals_constant.py

@@ -120,3 +120,17 @@ COMMON_DATASET_COLUMNS = frozenset(
         INTERACTION_ID,
     }
 )
+
+# HTTP status codes that are safe to retry with backoff.
+RETRYABLE_STATUS_CODES = frozenset(
+    {
+        408,  # RequestTimeout (DEADLINE_EXCEEDED)
+        409,  # Conflict / Aborted (ABORTED)
+        429,  # TooManyRequests / ResourceExhausted (RESOURCE_EXHAUSTED)
+        499,  # Client Closed Request (CANCELLED)
+        500,  # InternalServerError (INTERNAL)
+        502,  # BadGateway
+        503,  # ServiceUnavailable (UNAVAILABLE)
+        504,  # GatewayTimeout (DEADLINE_EXCEEDED)
+    }
+)

{google_cloud_agentplatform-2.4.0 → google_cloud_agentplatform-2.5.0}/agentplatform/_genai/_evals_metric_handlers.py

@@ -39,19 +39,6 @@ from . import types
 
 logger = logging.getLogger(__name__)
 _MAX_RETRIES = 5
-# HTTP status codes that are safe to retry with backoff.
-_RETRYABLE_STATUS_CODES = frozenset(
-    {
-        408,  # RequestTimeout (DEADLINE_EXCEEDED)
-        409,  # Conflict / Aborted (ABORTED)
-        429,  # TooManyRequests / ResourceExhausted (RESOURCE_EXHAUSTED)
-        499,  # Client Closed Request (CANCELLED)
-        500,  # InternalServerError (INTERNAL)
-        502,  # BadGateway
-        503,  # ServiceUnavailable (UNAVAILABLE)
-        504,  # GatewayTimeout (DEADLINE_EXCEEDED)
-    }
-)
 
 R = TypeVar("R")
 T = TypeVar("T", types.Metric, types.MetricSource, types.LLMMetric)
@@ -64,7 +51,7 @@ def _call_with_retry(
     """Calls ``fn()`` with exponential backoff + jitter on retryable errors.
 
     Retries up to ``_MAX_RETRIES`` times on errors whose HTTP status code is
-    in ``_RETRYABLE_STATUS_CODES`` (Aborted, DeadlineExceeded,
+    in ``_evals_constant.RETRYABLE_STATUS_CODES`` (Aborted, DeadlineExceeded,
     ResourceExhausted, ServiceUnavailable, Cancelled). Non-retryable errors
     are re-raised immediately. If all retries are exhausted the last
     exception is re-raised so the caller can decide how to handle it.
@@ -84,7 +71,7 @@ def _call_with_retry(
         try:
             return fn()
         except genai_errors.APIError as e:
-            if e.code in _RETRYABLE_STATUS_CODES:
+            if e.code in _evals_constant.RETRYABLE_STATUS_CODES:
                 backoff = 2**attempt + random.uniform(0, 1)
                 logger.warning(
                     "Retryable error (code=%s) on attempt %d/%d for metric"
@@ -686,6 +673,12 @@ def _build_evaluation_instance(
             other_data_map["context"] = types.evals.InstanceData(text=eval_case.context)
         elif isinstance(eval_case.context, genai_types.Content):
             other_data_map["context"] = _content_to_instance_data(eval_case.context)
+        else:
+            other_data_map["context"] = types.evals.InstanceData(
+                contents=types.evals.InstanceDataContents(
+                    contents=_value_to_content_list(eval_case.context)
+                )
+            )
 
     # 3. Extract custom variables from LLMMetric templates
     if prompt_template:

{google_cloud_agentplatform-2.4.0 → google_cloud_agentplatform-2.5.0}/agentplatform/_genai/_evals_visualization.py

@@ -229,6 +229,20 @@ def _extract_dataset_rows(dataset: types.EvaluationDataset) -> list[dict[str, An
             }
             processed_rows.append(processed_row)
 
+    for row in processed_rows:
+        if isinstance(row["agent_data"], str) or not isinstance(
+            row["intermediate_events"], str
+        ):
+            continue
+        try:
+            events = json.loads(row["intermediate_events"])
+        except json.JSONDecodeError:
+            continue
+        if isinstance(events, list) and events:
+            row["agent_data"] = json.dumps(
+                {"turns": [{"turn_index": 0, "events": events}]}, ensure_ascii=False
+            )
+
     return processed_rows
 
 
@@ -1155,7 +1169,7 @@ def get_comparison_html(eval_result_json: str) -> str:
                     winRateText = m.win_rates.map((rate, i) => `<b>${{candidateNames ? candidateNames[i] : `Candidate #${{i+1}}`}}</b> wins: <b>${{(rate * 100).toFixed(1)}}%</b>`).join('<br>');
                     if (m.tie_rate !== undefined) {{ winRateText += `<br>Ties: <b>${{(m.tie_rate * 100).toFixed(1)}}%</b>`; }}
                 }}
-                table += `<tr><td>${{m.metric_name}}</td><td>${{m.mean_score.toFixed(4)}}</td><td>${{m.stdev_score.toFixed(4)}}</td><td>${{winRateText}}</td></tr>`;
+                table += `<tr><td>${{m.metric_name}}</td><td>${{m.mean_score != null ? m.mean_score.toFixed(4) : 'N/A'}}</td><td>${{m.stdev_score != null ? m.stdev_score.toFixed(4) : 'N/A'}}</td><td>${{winRateText}}</td></tr>`;
             }});
             container.innerHTML = table + '</tbody></table>';
         }}

{google_cloud_agentplatform-2.4.0 → google_cloud_agentplatform-2.5.0}/agentplatform/_genai/_runtimes_utils.py

@@ -52,6 +52,7 @@ import httpx
 import proto
 
 from google.api_core import exceptions
+from google.genai import errors as google_genai_errors
 from google.genai import types as google_genai_types
 from google.api import httpbody_pb2
 from google.protobuf import struct_pb2
@@ -564,6 +565,23 @@ def _await_operation(
     return operation
 
 
+def _raise_for_operation_error(
+    *,
+    operation: Any,
+    message: str,
+) -> None:
+    """Raises an APIError for a failed operation with a context note."""
+    try:
+        google_genai_errors.APIError.raise_error(
+            operation.error.get("code"), operation.error, None
+        )
+    except google_genai_errors.APIError as e:
+        # TODO(yifany): Drop guard once Python 3.10 support is removed.
+        if sys.version_info >= (3, 11):
+            e.add_note(message)
+        raise
+
+
 def _compare_requirements(
     *,
     requirements: Mapping[str, str],

{google_cloud_agentplatform-2.4.0 → google_cloud_agentplatform-2.5.0}/agentplatform/_genai/evals.py

@@ -3070,7 +3070,7 @@ class Evals(_api_module.BaseModule):
                 events are replayed as session history for local ADK agents.
           model: Optional type is experimental and may change in future versions.
                 The model to use for inference, optional for agent evaluations.
-              - For Google Gemini models, provide the model name string (e.g., "gemini-2.5-flash").
+              - For Google Gemini models, provide the model name string (e.g., "gemini-flash-latest").
               - For third-party models via LiteLLM, use the format "provider/model_name"
                 (e.g., "openai/gpt-4o"). Ensure the necessary API key (e.g., OPENAI_API_KEY)
                 is set as an environment variable.
@@ -3342,7 +3342,7 @@ class Evals(_api_module.BaseModule):
               with the content.
             generator_model_config: Optional. Configuration for the model used
               in custom rubric generation. Only used if `prompt_template` is provided.
-              e.g., {"autorater_model": "gemini-2.5-flash"}.
+              e.g., {"autorater_model": "gemini-flash-latest"}.
             rubric_content_type: Optional. The type of rubric content to be
               generated. Only used if `prompt_template` is provided.
             rubric_type_ontology: Optional. A pre-defined list of allowed types
@@ -3619,12 +3619,12 @@ class Evals(_api_module.BaseModule):
                If provided, `agent_info` must be None. If omitted and `agent_info` is provided,
                this will be automatically constructed using `agent_info` and `user_simulator_config`.
                The `model` field of an inference config accepts a short Gemini model
-               name (e.g. `gemini-2.5-flash`), which is automatically expanded to a
+               name (e.g. `gemini-flash-latest`), which is automatically expanded to a
                fully-qualified resource name using the client's project and location,
                or an already fully-qualified publisher-model or endpoint resource
                name.
                Example:
-               {"candidate-1": types.EvaluationRunInferenceConfig(model="gemini-2.5-flash")}
+               {"candidate-1": types.EvaluationRunInferenceConfig(model="gemini-flash-latest")}
            labels: The labels to apply to the evaluation run.
            loss_analysis_metrics: This field is experimental and may change in future
                versions. Optional list of metrics to run loss analysis on. The
@@ -6261,12 +6261,12 @@ class AsyncEvals(_api_module.BaseModule):
               If provided, `agent_info` must be None. If omitted and `agent_info` is provided,
               this will be automatically constructed using `agent_info` and `user_simulator_config`.
               The `model` field of an inference config accepts a short Gemini model
-              name (e.g. `gemini-2.5-flash`), which is automatically expanded to a
+              name (e.g. `gemini-flash-latest`), which is automatically expanded to a
               fully-qualified resource name using the client's project and location,
               or an already fully-qualified publisher-model or endpoint resource
               name.
               Example:
-              {"candidate-1": types.EvaluationRunInferenceConfig(model="gemini-2.5-flash")}
+              {"candidate-1": types.EvaluationRunInferenceConfig(model="gemini-flash-latest")}
           red_teaming_config: This field is experimental and may change in future
               versions. Optional configuration for automated Agent Red Teaming
               analysis. Specifies attack categories and vulnerable tools to

{google_cloud_agentplatform-2.4.0 → google_cloud_agentplatform-2.5.0}/agentplatform/_genai/runtimes.py

@@ -1911,6 +1911,7 @@ class Runtimes(_api_module.BaseModule):
             container_spec=config.container_spec,
             keep_alive_probe=keep_alive_probe,
             build_config=config.build_config,
+            agent_card=config.agent_card,
         )
         operation = self._create(config=api_config)
         logger.info(f"Create Agent Runtime backing LRO: {operation.name}")
@@ -1944,8 +1945,12 @@ class Runtimes(_api_module.BaseModule):
                 f"runtime=client.runtimes.get(name='{runtime.api_resource.name}')"
             )
         elif operation.error:
-            raise RuntimeError(
-                f"Operation {operation.name} failed to create Agent Runtime: {operation.error}"
+            _runtimes_utils._raise_for_operation_error(
+                operation=operation,
+                message=(
+                    f"Operation {operation.name} failed to create Agent Runtime:"
+                    f" {operation.error}"
+                ),
             )
         else:
             logger.warning("The operation returned an empty response.")
@@ -2226,6 +2231,7 @@ class Runtimes(_api_module.BaseModule):
         keep_alive_probe: Optional[dict[str, Any]] = None,
         traffic_config: Optional[types.ReasoningEngineTrafficConfigDict] = None,
         build_config: Optional[types.ReasoningEngineSpecBuildSpecDict] = None,
+        agent_card: Optional[dict[str, Any]] = None,
     ) -> types.UpdateRuntimeConfigDict:
         import sys
 
@@ -2400,14 +2406,15 @@ class Runtimes(_api_module.BaseModule):
                 agent=agent,
             )
 
-            if hasattr(agent, "agent_card"):
-                agent_card = getattr(agent, "agent_card")
-                if agent_card:
+            # An agent_card given in the config takes precedence; it is added below.
+            if agent_card is None and hasattr(agent, "agent_card"):
+                agent_object_card = getattr(agent, "agent_card")
+                if agent_object_card:
                     try:
                         from google.protobuf import json_format
 
                         runtime_spec["agent_card"] = json_format.MessageToDict(
-                            agent_card
+                            agent_object_card
                         )
                     except Exception as e:
                         raise ValueError(
@@ -2448,6 +2455,12 @@ class Runtimes(_api_module.BaseModule):
             if build_spec:
                 runtime_spec["build_spec"] = build_spec
 
+        if agent_card is not None:
+            if runtime_spec is None:
+                runtime_spec = {}
+            runtime_spec["agent_card"] = agent_card
+            update_masks.append("spec.agent_card")
+
         if runtime_spec is not None:
             config["spec"] = runtime_spec
 
@@ -2720,6 +2733,7 @@ class Runtimes(_api_module.BaseModule):
             keep_alive_probe=keep_alive_probe,
             traffic_config=traffic_config,
             build_config=config.build_config,
+            agent_card=config.agent_card,
         )
         operation = self._update(name=name, config=api_config)
         logger.info(f"Update Agent Runtime backing LRO: {operation.name}")
@@ -2747,8 +2761,12 @@ class Runtimes(_api_module.BaseModule):
                 f"runtime=client.runtimes.get(name='{runtime.api_resource.name}')"
             )
         elif operation.error:
-            raise RuntimeError(
-                f"Operation {operation.name} failed to update Agent Runtime: {operation.error}"
+            _runtimes_utils._raise_for_operation_error(
+                operation=operation,
+                message=(
+                    f"Operation {operation.name} failed to update Agent Runtime:"
+                    f" {operation.error}"
+                ),
             )
         if runtime.api_resource.spec:
             self._register_api_methods(runtime=runtime)

{google_cloud_agentplatform-2.4.0 → google_cloud_agentplatform-2.5.0}/agentplatform/_genai/types/common.py

@@ -2238,7 +2238,7 @@ class EvaluationRunInferenceConfig(_common.BaseModel):
     )
     model: Optional[str] = Field(
         default=None,
-        description="""The model to use for inference. Accepts a short Gemini model name (e.g. `gemini-2.5-flash`), which is automatically expanded to a fully-qualified resource name using the client's project and location, or an already fully-qualified publisher-model or endpoint resource name (e.g. `projects/{project}/locations/{location}/publishers/google/models/gemini-2.5-flash`).""",
+        description="""The model to use for inference. Accepts a short Gemini model name (e.g. `gemini-flash-latest`), which is automatically expanded to a fully-qualified resource name using the client's project and location, or an already fully-qualified publisher-model or endpoint resource name (e.g. `projects/{project}/locations/{location}/publishers/google/models/gemini-flash-latest`).""",
     )
     prompt_template: Optional[EvaluationRunPromptTemplate] = Field(
         default=None, description="""The prompt template used for inference."""
@@ -2260,7 +2260,7 @@ class EvaluationRunInferenceConfigDict(TypedDict, total=False):
     """The agent config."""
 
     model: Optional[str]
-    """The model to use for inference. Accepts a short Gemini model name (e.g. `gemini-2.5-flash`), which is automatically expanded to a fully-qualified resource name using the client's project and location, or an already fully-qualified publisher-model or endpoint resource name (e.g. `projects/{project}/locations/{location}/publishers/google/models/gemini-2.5-flash`)."""
+    """The model to use for inference. Accepts a short Gemini model name (e.g. `gemini-flash-latest`), which is automatically expanded to a fully-qualified resource name using the client's project and location, or an already fully-qualified publisher-model or endpoint resource name (e.g. `projects/{project}/locations/{location}/publishers/google/models/gemini-flash-latest`)."""
 
     prompt_template: Optional[EvaluationRunPromptTemplateDict]
     """The prompt template used for inference."""
@@ -31000,7 +31000,7 @@ class Prompt(_common.BaseModel):
 
         my_prompt = types.Prompt(
             prompt_data=types.PromptData(
-                model="gemini-2.0-flash-001",
+                model="gemini-flash-latest",
                 contents=[
                     genai_types.Content(
                         parts=[
@@ -32104,6 +32104,16 @@ class AgentRuntimeConfig(_common.BaseModel):
         default=None,
         description="""The build config for the Agent Runtime. Allows bringing your own Cloud Build private worker pool (BYOBP) and, optionally, a build-time service account for the container build. Supported keys: `worker_pool` (the resource name of the Cloud Build WorkerPool to use for the build) and `service_account` (the service account that Cloud Build uses to run the build; only applicable when `worker_pool` is specified).""",
     )
+    agent_card: Optional[dict[str, Any]] = Field(
+        default=None,
+        description="""The A2A agent card for the Agent Runtime, as a dictionary with
+      the A2A JSON field names (camelCase, such as `preferredTransport`).
+      Use it when there is no `agent` object to read the card from, for
+      example with `container_spec` or `source_packages`. If the `agent` also
+      has an `agent_card`, this value is used instead. On `update()`, it
+      replaces the deployed card; pass `{}` to remove it. The service sets
+      the card's `url` to the runtime's A2A endpoint.""",
+    )
 
 
 class AgentRuntimeConfigDict(TypedDict, total=False):
@@ -32294,6 +32304,15 @@ class AgentRuntimeConfigDict(TypedDict, total=False):
     build_config: Optional[ReasoningEngineSpecBuildSpecDict]
     """The build config for the Agent Runtime. Allows bringing your own Cloud Build private worker pool (BYOBP) and, optionally, a build-time service account for the container build. Supported keys: `worker_pool` (the resource name of the Cloud Build WorkerPool to use for the build) and `service_account` (the service account that Cloud Build uses to run the build; only applicable when `worker_pool` is specified)."""
 
+    agent_card: Optional[dict[str, Any]]
+    """The A2A agent card for the Agent Runtime, as a dictionary with
+      the A2A JSON field names (camelCase, such as `preferredTransport`).
+      Use it when there is no `agent` object to read the card from, for
+      example with `container_spec` or `source_packages`. If the `agent` also
+      has an `agent_card`, this value is used instead. On `update()`, it
+      replaces the deployed card; pass `{}` to remove it. The service sets
+      the card's `url` to the runtime's A2A endpoint."""
+
 
 AgentRuntimeConfigOrDict = Union[AgentRuntimeConfig, AgentRuntimeConfigDict]
 

{google_cloud_agentplatform-2.4.0 → google_cloud_agentplatform-2.5.0}/agentplatform/version.py

@@ -14,4 +14,4 @@
 #
 """Version file for agentplatform."""
 
-__version__ = "2.4.0"
+__version__ = "2.5.0"

{google_cloud_agentplatform-2.4.0 → google_cloud_agentplatform-2.5.0/google_cloud_agentplatform.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: google-cloud-agentplatform
-Version: 2.4.0
+Version: 2.5.0
 Summary: Google Cloud Agent Platform Client Library
 Author-email: Google LLC <googleapis-packages@google.com>
 License: Apache-2.0
@@ -31,7 +31,7 @@ Requires-Dist: google-cloud-storage<4.0.0,>=1.32.0; extra == "agent-engines"
 Requires-Dist: opentelemetry-sdk<2; extra == "agent-engines"
 Requires-Dist: opentelemetry-exporter-gcp-logging<2.0.0,>=1.11.0a0; extra == "agent-engines"
 Requires-Dist: opentelemetry-exporter-otlp-proto-http<2; extra == "agent-engines"
-Requires-Dist: opentelemetry-instrumentation-google-genai<1.0.0,>=0.3b0; extra == "agent-engines"
+Requires-Dist: opentelemetry-instrumentation-google-genai<2.0.0,>=0.3b0; extra == "agent-engines"
 Requires-Dist: pydantic<3,>=2.11.1; extra == "agent-engines"
 Provides-Extra: a2a
 Requires-Dist: google-cloud-agentplatform[agent_engines]; extra == "a2a"

{google_cloud_agentplatform-2.4.0 → google_cloud_agentplatform-2.5.0}/google_cloud_agentplatform.egg-info/requires.txt

@@ -28,7 +28,7 @@ google-cloud-storage<4.0.0,>=1.32.0
 opentelemetry-sdk<2
 opentelemetry-exporter-gcp-logging<2.0.0,>=1.11.0a0
 opentelemetry-exporter-otlp-proto-http<2
-opentelemetry-instrumentation-google-genai<1.0.0,>=0.3b0
+opentelemetry-instrumentation-google-genai<2.0.0,>=0.3b0
 pydantic<3,>=2.11.1
 
 [all]

{google_cloud_agentplatform-2.4.0 → google_cloud_agentplatform-2.5.0}/pyproject.toml

@@ -42,7 +42,7 @@ agent_engines = [
     "opentelemetry-sdk < 2",
     "opentelemetry-exporter-gcp-logging >= 1.11.0a0, < 2.0.0",
     "opentelemetry-exporter-otlp-proto-http < 2",
-    "opentelemetry-instrumentation-google-genai >= 0.3b0, < 1.0.0",
+    "opentelemetry-instrumentation-google-genai >= 0.3b0, < 2.0.0",
     "pydantic >= 2.11.1, < 3",
 ]
 a2a = [