Skip to content

Commit d64ae68

Browse files
vertex-sdk-botcopybara-github
authored andcommitted
feat: Renaming.
PiperOrigin-RevId: 945668576
1 parent 852c546 commit d64ae68

128 files changed

Lines changed: 28827 additions & 21100 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

agentplatform/_genai/_evals_common.py

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ def _get_api_client_with_location(
106106

107107
def _get_agent_engine_instance(
108108
agent_name: str, api_client: BaseApiClient
109-
) -> Union[types.AgentEngine, Any]:
109+
) -> Union[types.Runtime, Any]:
110110
"""Gets or creates an agent engine instance for the current thread."""
111111
if not hasattr(_thread_local_data, "agent_engine_instances"):
112112
_thread_local_data.agent_engine_instances = {}
@@ -116,7 +116,7 @@ def _get_agent_engine_instance(
116116
location=api_client.location,
117117
)
118118
_thread_local_data.agent_engine_instances[agent_name] = (
119-
client.agent_engines.get(name=agent_name)
119+
client.runtimes.get(name=agent_name)
120120
)
121121
return _thread_local_data.agent_engine_instances[agent_name]
122122

@@ -1377,7 +1377,7 @@ def _execute_inference_concurrently(
13771377
model_or_fn: Optional[Union[str, Callable[[Any], Any]]] = None,
13781378
gemini_config: Optional[genai_types.GenerateContentConfig] = None,
13791379
inference_fn: Optional[Callable[..., Any]] = None,
1380-
agent_engine: Optional[Union[str, types.AgentEngine]] = None,
1380+
agent_engine: Optional[Union[str, types.Runtime]] = None,
13811381
agent: Optional["LlmAgent"] = None, # type: ignore # noqa: F821
13821382
user_simulator_config: Optional[types.evals.UserSimulatorConfig] = None,
13831383
) -> list[
@@ -2167,7 +2167,7 @@ def _execute_inference(
21672167
api_client: BaseApiClient,
21682168
src: Union[str, pd.DataFrame],
21692169
model: Optional[Union[Callable[[Any], Any], str]] = None,
2170-
agent_engine: Optional[Union[str, types.AgentEngine]] = None,
2170+
agent_engine: Optional[Union[str, types.Runtime]] = None,
21712171
agent: Optional["LlmAgent"] = None, # type: ignore # noqa: F821
21722172
gemini_agent: Optional[str] = None,
21732173
dest: Optional[str] = None,
@@ -2186,7 +2186,7 @@ def _execute_inference(
21862186
model: The model to use for inference. Can be a callable function or a
21872187
string representing a model.
21882188
agent_engine: The agent engine to use for inference. Can be a resource
2189-
name string or an `AgentEngine` instance.
2189+
name string or an `Runtime` instance.
21902190
agent: The local agent to use for inference. Can be an ADK agent instance.
21912191
gemini_agent: The Gemini Agents API agent resource name to run inference
21922192
against via the Interactions API.
@@ -2276,14 +2276,14 @@ def _execute_inference(
22762276
and not isinstance(agent_engine, str)
22772277
and not (
22782278
hasattr(agent_engine, "api_client")
2279-
and type(agent_engine).__name__ == "AgentEngine"
2279+
and type(agent_engine).__name__ == "Runtime"
22802280
)
22812281
):
22822282
raise TypeError(
22832283
f"Unsupported agent_engine type: {type(agent_engine)}. Expecting a"
22842284
" string (agent engine resource name in"
22852285
" 'projects/{project_id}/locations/{location_id}/reasoningEngines/{reasoning_engine_id}'"
2286-
" format) or a types.AgentEngine instance."
2286+
" format) or a types.Runtime instance."
22872287
)
22882288
if (
22892289
_evals_constant.INTERMEDIATE_EVENTS in prompt_dataset.columns
@@ -2911,7 +2911,7 @@ def _create_agent_results_dataframe(
29112911

29122912
def _run_agent_internal(
29132913
api_client: BaseApiClient,
2914-
agent_engine: Optional[Union[str, types.AgentEngine]],
2914+
agent_engine: Optional[Union[str, types.Runtime]],
29152915
agent: Optional["LlmAgent"], # type: ignore # noqa: F821
29162916
prompt_dataset: pd.DataFrame,
29172917
user_simulator_config: Optional[types.evals.UserSimulatorConfig] = None,
@@ -2962,7 +2962,7 @@ def _run_agent_internal(
29622962

29632963
def _run_agent(
29642964
api_client: BaseApiClient,
2965-
agent_engine: Optional[Union[str, types.AgentEngine]],
2965+
agent_engine: Optional[Union[str, types.Runtime]],
29662966
agent: Optional["LlmAgent"], # type: ignore # noqa: F821
29672967
prompt_dataset: pd.DataFrame,
29682968
user_simulator_config: Optional[types.evals.UserSimulatorConfig] = None,
@@ -3033,7 +3033,7 @@ def _run_agent(
30333033

30343034
def _create_agent_engine_session(
30353035
*,
3036-
agent_engine: types.AgentEngine,
3036+
agent_engine: types.Runtime,
30373037
user_id: str,
30383038
session_state: Optional[dict[str, Any]] = None,
30393039
) -> Any:
@@ -3045,7 +3045,7 @@ def _create_agent_engine_session(
30453045
Sessions API.
30463046
30473047
Args:
3048-
agent_engine: The AgentEngine instance.
3048+
agent_engine: The Runtime instance.
30493049
user_id: The user ID for the session.
30503050
session_state: Optional initial state for the session.
30513051
@@ -3080,7 +3080,7 @@ def _create_agent_engine_session(
30803080
operation = agent_engine.api_client.sessions.create(
30813081
name=agent_engine.api_resource.name,
30823082
user_id=user_id,
3083-
config=types.CreateAgentEngineSessionConfig(
3083+
config=types.CreateRuntimeSessionConfig(
30843084
session_state=session_state,
30853085
),
30863086
)
@@ -3102,7 +3102,7 @@ def _create_agent_engine_session(
31023102
def _execute_agent_run_with_retry(
31033103
row: pd.Series,
31043104
contents: Union[genai_types.ContentListUnion, genai_types.ContentListUnionDict],
3105-
agent_engine: types.AgentEngine,
3105+
agent_engine: types.Runtime,
31063106
max_retries: int = 3,
31073107
) -> Union[list[dict[str, Any]], dict[str, Any]]:
31083108
"""Executes agent run over agent engine for a single prompt."""
@@ -3149,7 +3149,7 @@ def _execute_agent_run_with_retry(
31493149
author=ag_event.author or "user",
31503150
invocation_id="history",
31513151
timestamp=base_ts + datetime.timedelta(seconds=i),
3152-
config=types.AppendAgentEngineSessionEventConfig(
3152+
config=types.AppendRuntimeSessionEventConfig(
31533153
content=ag_event.content,
31543154
),
31553155
)

0 commit comments

Comments
 (0)