Skip to content

Commit 41ec97d

Browse files
vertex-sdk-botcopybara-github
authored andcommitted
feat: Renaming.
PiperOrigin-RevId: 945668576
1 parent 62bc783 commit 41ec97d

131 files changed

Lines changed: 23533 additions & 23874 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
@@ -124,7 +124,7 @@ def _get_api_client_with_location(
124124

125125
def _get_agent_engine_instance(
126126
agent_name: str, api_client: BaseApiClient
127-
) -> Union[types.AgentEngine, Any]:
127+
) -> Union[types.Runtime, Any]:
128128
"""Gets or creates an agent engine instance for the current thread."""
129129
if not hasattr(_thread_local_data, "agent_engine_instances"):
130130
_thread_local_data.agent_engine_instances = {}
@@ -134,7 +134,7 @@ def _get_agent_engine_instance(
134134
location=api_client.location,
135135
)
136136
_thread_local_data.agent_engine_instances[agent_name] = (
137-
client.agent_engines.get(name=agent_name)
137+
client.runtimes.get(name=agent_name)
138138
)
139139
return _thread_local_data.agent_engine_instances[agent_name]
140140

@@ -1749,7 +1749,7 @@ def _execute_inference_concurrently(
17491749
model_or_fn: Optional[Union[str, Callable[[Any], Any]]] = None,
17501750
gemini_config: Optional[genai_types.GenerateContentConfig] = None,
17511751
inference_fn: Optional[Callable[..., Any]] = None,
1752-
agent_engine: Optional[Union[str, types.AgentEngine]] = None,
1752+
agent_engine: Optional[Union[str, types.Runtime]] = None,
17531753
agent: Optional["LlmAgent"] = None, # type: ignore # noqa: F821
17541754
user_simulator_config: Optional[types.evals.UserSimulatorConfig] = None,
17551755
) -> list[
@@ -2504,7 +2504,7 @@ def _execute_inference(
25042504
api_client: BaseApiClient,
25052505
src: Union[str, pd.DataFrame],
25062506
model: Optional[Union[Callable[[Any], Any], str]] = None,
2507-
agent_engine: Optional[Union[str, types.AgentEngine]] = None,
2507+
agent_engine: Optional[Union[str, types.Runtime]] = None,
25082508
agent: Optional["LlmAgent"] = None, # type: ignore # noqa: F821
25092509
gemini_agent: Optional[str] = None,
25102510
dest: Optional[str] = None,
@@ -2523,7 +2523,7 @@ def _execute_inference(
25232523
model: The model to use for inference. Can be a callable function or a
25242524
string representing a model.
25252525
agent_engine: The agent engine to use for inference. Can be a resource
2526-
name string or an `AgentEngine` instance.
2526+
name string or an `Runtime` instance.
25272527
agent: The local agent to use for inference. Can be an ADK agent instance.
25282528
gemini_agent: The Gemini Agents API agent resource name to run inference
25292529
against via the Interactions API.
@@ -2623,14 +2623,14 @@ def _execute_inference(
26232623
and not isinstance(agent_engine, str)
26242624
and not (
26252625
hasattr(agent_engine, "api_client")
2626-
and type(agent_engine).__name__ == "AgentEngine"
2626+
and type(agent_engine).__name__ == "Runtime"
26272627
)
26282628
):
26292629
raise TypeError(
26302630
f"Unsupported agent_engine type: {type(agent_engine)}. Expecting a"
26312631
" string (agent engine resource name in"
26322632
" 'projects/{project_id}/locations/{location_id}/reasoningEngines/{reasoning_engine_id}'"
2633-
" format) or a types.AgentEngine instance."
2633+
" format) or a types.Runtime instance."
26342634
)
26352635
if (
26362636
_evals_constant.INTERMEDIATE_EVENTS in prompt_dataset.columns
@@ -3258,7 +3258,7 @@ def _create_agent_results_dataframe(
32583258

32593259
def _run_agent_internal(
32603260
api_client: BaseApiClient,
3261-
agent_engine: Optional[Union[str, types.AgentEngine]],
3261+
agent_engine: Optional[Union[str, types.Runtime]],
32623262
agent: Optional["LlmAgent"], # type: ignore # noqa: F821
32633263
prompt_dataset: pd.DataFrame,
32643264
user_simulator_config: Optional[types.evals.UserSimulatorConfig] = None,
@@ -3309,7 +3309,7 @@ def _run_agent_internal(
33093309

33103310
def _run_agent(
33113311
api_client: BaseApiClient,
3312-
agent_engine: Optional[Union[str, types.AgentEngine]],
3312+
agent_engine: Optional[Union[str, types.Runtime]],
33133313
agent: Optional["LlmAgent"], # type: ignore # noqa: F821
33143314
prompt_dataset: pd.DataFrame,
33153315
user_simulator_config: Optional[types.evals.UserSimulatorConfig] = None,
@@ -3354,7 +3354,7 @@ def _run_agent(
33543354

33553355
def _create_agent_engine_session(
33563356
*,
3357-
agent_engine: types.AgentEngine,
3357+
agent_engine: types.Runtime,
33583358
user_id: str,
33593359
session_state: Optional[dict[str, Any]] = None,
33603360
) -> Any:
@@ -3366,7 +3366,7 @@ def _create_agent_engine_session(
33663366
Sessions API.
33673367
33683368
Args:
3369-
agent_engine: The AgentEngine instance.
3369+
agent_engine: The Runtime instance.
33703370
user_id: The user ID for the session.
33713371
session_state: Optional initial state for the session.
33723372
@@ -3401,7 +3401,7 @@ def _create_agent_engine_session(
34013401
operation = agent_engine.api_client.sessions.create(
34023402
name=agent_engine.api_resource.name,
34033403
user_id=user_id,
3404-
config=types.CreateAgentEngineSessionConfig(
3404+
config=types.CreateRuntimeSessionConfig(
34053405
session_state=session_state,
34063406
),
34073407
)
@@ -3423,7 +3423,7 @@ def _create_agent_engine_session(
34233423
def _execute_agent_run_with_retry(
34243424
row: pd.Series,
34253425
contents: Union[genai_types.ContentListUnion, genai_types.ContentListUnionDict],
3426-
agent_engine: types.AgentEngine,
3426+
agent_engine: types.Runtime,
34273427
max_retries: int = 3,
34283428
) -> Union[list[dict[str, Any]], dict[str, Any]]:
34293429
"""Executes agent run over agent engine for a single prompt."""
@@ -3470,7 +3470,7 @@ def _execute_agent_run_with_retry(
34703470
author=ag_event.author or "user",
34713471
invocation_id="history",
34723472
timestamp=base_ts + datetime.timedelta(seconds=i),
3473-
config=types.AppendAgentEngineSessionEventConfig(
3473+
config=types.AppendRuntimeSessionEventConfig(
34743474
content=ag_event.content,
34753475
),
34763476
)

0 commit comments

Comments
 (0)