feat: Renaming.

PiperOrigin-RevId: 945668576

Author: vertex-sdk-bot

agentplatform/_genai/_evals_common.py

@@ -100,7 +100,7 @@ def _get_api_client_with_location(
 
 def _get_agent_engine_instance(
     agent_name: str, api_client: BaseApiClient
-) -> Union[types.AgentEngine, Any]:
+) -> Union[types.Runtime, Any]:
     """Gets or creates an agent engine instance for the current thread."""
     if not hasattr(_thread_local_data, "agent_engine_instances"):
         _thread_local_data.agent_engine_instances = {}
@@ -614,7 +614,7 @@ def _execute_inference_concurrently(
     model_or_fn: Optional[Union[str, Callable[[Any], Any]]] = None,
     gemini_config: Optional[genai_types.GenerateContentConfig] = None,
     inference_fn: Optional[Callable[..., Any]] = None,
-    agent_engine: Optional[Union[str, types.AgentEngine]] = None,
+    agent_engine: Optional[Union[str, types.Runtime]] = None,
     agent: Optional["LlmAgent"] = None,  # type: ignore # noqa: F821
     user_simulator_config: Optional[types.evals.UserSimulatorConfig] = None,
 ) -> list[
@@ -1404,7 +1404,7 @@ def _execute_inference(
     api_client: BaseApiClient,
     src: Union[str, pd.DataFrame],
     model: Optional[Union[Callable[[Any], Any], str]] = None,
-    agent_engine: Optional[Union[str, types.AgentEngine]] = None,
+    agent_engine: Optional[Union[str, types.Runtime]] = None,
     agent: Optional["LlmAgent"] = None,  # type: ignore # noqa: F821
     dest: Optional[str] = None,
     config: Optional[genai_types.GenerateContentConfig] = None,
@@ -1499,7 +1499,7 @@ def _execute_inference(
                 f"Unsupported agent_engine type: {type(agent_engine)}. Expecting a"
                 " string (agent engine resource name in"
                 " 'projects/{project_id}/locations/{location_id}/reasoningEngines/{reasoning_engine_id}'"
-                " format) or a types.AgentEngine instance."
+                " format) or a types.Runtime instance."
             )
         if (
             _evals_constant.INTERMEDIATE_EVENTS in prompt_dataset.columns
@@ -2102,7 +2102,7 @@ def _create_agent_results_dataframe(
 
 def _run_agent_internal(
     api_client: BaseApiClient,
-    agent_engine: Optional[Union[str, types.AgentEngine]],
+    agent_engine: Optional[Union[str, types.Runtime]],
     agent: Optional["LlmAgent"],  # type: ignore # noqa: F821
     prompt_dataset: pd.DataFrame,
     user_simulator_config: Optional[types.evals.UserSimulatorConfig] = None,
@@ -2153,7 +2153,7 @@ def _run_agent_internal(
 
 def _run_agent(
     api_client: BaseApiClient,
-    agent_engine: Optional[Union[str, types.AgentEngine]],
+    agent_engine: Optional[Union[str, types.Runtime]],
     agent: Optional["LlmAgent"],  # type: ignore # noqa: F821
     prompt_dataset: pd.DataFrame,
     user_simulator_config: Optional[types.evals.UserSimulatorConfig] = None,
@@ -2224,7 +2224,7 @@ def _run_agent(
 
 def _create_agent_engine_session(
     *,
-    agent_engine: types.AgentEngine,
+    agent_engine: types.Runtime,
     user_id: str,
     session_state: Optional[dict[str, Any]] = None,
 ) -> Any:
@@ -2271,7 +2271,7 @@ def _create_agent_engine_session(
         operation = agent_engine.api_client.sessions.create(
             name=agent_engine.api_resource.name,
             user_id=user_id,
-            config=types.CreateAgentEngineSessionConfig(
+            config=types.CreateRuntimeSessionConfig(
                 session_state=session_state,
             ),
         )
@@ -2293,7 +2293,7 @@ def _create_agent_engine_session(
 def _execute_agent_run_with_retry(
     row: pd.Series,
     contents: Union[genai_types.ContentListUnion, genai_types.ContentListUnionDict],
-    agent_engine: types.AgentEngine,
+    agent_engine: types.Runtime,
     max_retries: int = 3,
 ) -> Union[list[dict[str, Any]], dict[str, Any]]:
     """Executes agent run over agent engine for a single prompt."""
@@ -2340,7 +2340,7 @@ def _execute_agent_run_with_retry(
                 author=ag_event.author or "user",
                 invocation_id="history",
                 timestamp=base_ts + datetime.timedelta(seconds=i),
-                config=types.AppendAgentEngineSessionEventConfig(
+                config=types.AppendRuntimeSessionEventConfig(
                     content=ag_event.content,
                 ),
             )

…tplatform/_genai/_agent_engines_utils.py agentplatform/_genai/_runtimes_utils.pyagentplatform/_genai/_agent_engines_utils.py renamed to agentplatform/_genai/_runtimes_utils.py agentplatform/_genai/_agent_engines_utils.py renamed to agentplatform/_genai/_runtimes_utils.py

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-"""Utility functions for agent engines."""
+"""Utility functions for runtimes."""
 
 import abc
 import asyncio
@@ -53,7 +53,6 @@
 
 from google.api_core import exceptions
 from google.genai import types as google_genai_types
-from google.api import httpbody_pb2
 from google.protobuf import struct_pb2
 from google.protobuf import json_format
 
@@ -312,7 +311,7 @@ def register_operations(self, **kwargs: Any) -> dict[str, list[str]]:
     except (ImportError, AttributeError):
         ADKAgent = None  # type: ignore[no-redef]
 
-_AgentEngineInterface = Union[
+_RuntimeInterface = Union[
     ADKAgent,
     AsyncQueryable,
     AsyncStreamQueryable,
@@ -328,7 +327,7 @@ class _ModuleAgentAttributes(TypedDict, total=False):
     agent_name: str
     register_operations: Dict[str, list[str]]
     sys_paths: Optional[Sequence[str]]
-    agent: _AgentEngineInterface
+    agent: _RuntimeInterface
 
 
 class ModuleAgent(Cloneable, OperationRegistrable):
@@ -441,24 +440,24 @@ class _RequirementsValidationResult(TypedDict):
     actions: _RequirementsValidationActions
 
 
-AgentEngineOperationUnion = Union[
-    genai_types.AgentEngineOperation,
-    genai_types.AgentEngineMemoryOperation,
-    genai_types.AgentEngineGenerateMemoriesOperation,
+RuntimeOperationUnion = Union[
+    genai_types.RuntimeOperation,
+    genai_types.RuntimeMemoryOperation,
+    genai_types.RuntimeGenerateMemoriesOperation,
 ]
 
 
 class GetOperationFunction(Protocol):
     def __call__(
         self, *, operation_name: str, **kwargs: Any
-    ) -> AgentEngineOperationUnion:
+    ) -> RuntimeOperationUnion:
         pass
 
 
 class GetAsyncOperationFunction(Protocol):
     async def __call__(
         self, *, operation_name: str, **kwargs: Any
-    ) -> AgentEngineOperationUnion:
+    ) -> RuntimeOperationUnion:
         pass
 
 
@@ -611,7 +610,7 @@ def _compare_requirements(
 
 def _generate_class_methods_spec_or_raise(
     *,
-    agent: _AgentEngineInterface,
+    agent: _RuntimeInterface,
     operations: Dict[str, List[str]],
 ) -> List[proto.Message]:
     """Generates a ReasoningEngineSpec based on the registered operations.
@@ -811,7 +810,7 @@ def _generate_schema(
 def _get_agent_framework(
     *,
     agent_framework: Optional[str],
-    agent: _AgentEngineInterface,
+    agent: _RuntimeInterface,
 ) -> Union[str, Any]:
     """Gets the agent framework to use.
 
@@ -823,7 +822,7 @@ def _get_agent_framework(
     Args:
         agent_framework (str):
             The agent framework provided by the user.
-        agent (_AgentEngineInterface):
+        agent (_RuntimeInterface):
             The agent engine instance.
 
     Returns:
@@ -871,7 +870,7 @@ def _get_gcs_bucket(
 
 def _get_registered_operations(
     *,
-    agent: _AgentEngineInterface,
+    agent: _RuntimeInterface,
 ) -> dict[str, list[str]]:
     """Retrieves registered operations for a AgentEngine."""
     if isinstance(agent, OperationRegistrable):
@@ -985,7 +984,7 @@ def _parse_constraints(
 
 def _prepare(
     *,
-    agent: Optional[_AgentEngineInterface],
+    agent: Optional[_RuntimeInterface],
     requirements: Optional[Sequence[str]],
     extra_packages: Optional[Sequence[str]],
     project: str,
@@ -1042,7 +1041,7 @@ def _prepare(
 
 def _register_api_methods_or_raise(
     *,
-    agent_engine: genai_types.AgentEngine | genai_types.AgentEngineRuntimeRevision,
+    agent_engine: genai_types.Runtime | genai_types.RuntimeRevision,
     wrap_operation_fn: Optional[
         dict[str, Callable[[str, str], Callable[..., Any]]]
     ] = None,
@@ -1243,7 +1242,7 @@ def _to_proto(
 
 def _upload_agent_engine(
     *,
-    agent: _AgentEngineInterface,
+    agent: _RuntimeInterface,
     gcs_bucket: _StorageBucket,
     gcs_dir_name: str,
 ) -> None:
@@ -1412,7 +1411,7 @@ def _validate_staging_bucket_or_raise(*, staging_bucket: str) -> str:
     """Tries to validate the staging bucket."""
     if not staging_bucket:
         raise ValueError(
-            "Please provide a `staging_bucket` in `client.agent_engines.create(...)`."
+            "Please provide a `staging_bucket` in `client.runtimes.create(...)`."
         )
     if not staging_bucket.startswith("gs://"):
         raise ValueError(f"{staging_bucket=} must start with `gs://`")
@@ -1475,8 +1474,8 @@ def _validate_requirements_or_raise(
 
 def _validate_agent_or_raise(
     *,
-    agent: _AgentEngineInterface,
-) -> _AgentEngineInterface:
+    agent: _RuntimeInterface,
+) -> _RuntimeInterface:
     """Tries to validate the agent engine.
 
     The agent engine must have one of the following:
@@ -1503,9 +1502,9 @@ def _validate_agent_or_raise(
 
         if isinstance(agent, BaseAgent):
             logger.info("Deploying google.adk.agents.Agent as an application.")
-            from agentplatform import agent_engines
+            from agentplatform import frameworks
 
-            agent = agent_engines.AdkApp(agent=agent)
+            agent = frameworks.AdkApp(agent=agent)
     except Exception:
         pass
     is_queryable = isinstance(agent, Queryable) and callable(agent.query)
@@ -1640,7 +1639,7 @@ def _wrap_query_operation(*, method_name: str) -> Callable[..., Any]:
         the `query` API.
     """
 
-    def _method(self: genai_types.AgentEngine, **kwargs) -> Any:  # type: ignore[no-untyped-def]
+    def _method(self: genai_types.Runtime, **kwargs) -> Any:  # type: ignore[no-untyped-def]
         if not self.api_client:
             raise ValueError("api_client is not initialized.")
         if not self.api_resource:
@@ -1683,7 +1682,7 @@ def _wrap_async_query_operation(
     """
 
     async def _method(
-        self: genai_types.AgentEngine, **kwargs: Any
+        self: genai_types.Runtime, **kwargs: Any
     ) -> Union[Coroutine[Any, Any, Any], Any]:
         if not self.api_async_client:
             raise ValueError("api_async_client is not initialized.")
@@ -1724,7 +1723,7 @@ def _wrap_stream_query_operation(*, method_name: str) -> Callable[..., Iterator[
         the `stream_query` API.
     """
 
-    def _method(self: genai_types.AgentEngine, **kwargs) -> Iterator[Any]:  # type: ignore[no-untyped-def]
+    def _method(self: genai_types.Runtime, **kwargs) -> Iterator[Any]:  # type: ignore[no-untyped-def]
         if not self.api_client:
             raise ValueError("api_client is not initialized.")
         if not self.api_resource:
@@ -1768,7 +1767,7 @@ def _wrap_async_stream_query_operation(
         the `stream_query` API.
     """
 
-    async def _method(self: genai_types.AgentEngine, **kwargs) -> AsyncIterator[Any]:  # type: ignore[no-untyped-def]
+    async def _method(self: genai_types.Runtime, **kwargs) -> AsyncIterator[Any]:  # type: ignore[no-untyped-def]
         if not self.api_client:
             raise ValueError("api_client is not initialized.")
         if not self.api_resource:
@@ -1916,50 +1915,6 @@ def _yield_parsed_json(http_response: google_genai_types.HttpResponse) -> Iterat
             yield line
 
 
-def _yield_parsed_json_from_httpbody(body: httpbody_pb2.HttpBody) -> Iterator[Any]:
-    """Converts the contents of an `HttpBody` proto message to JSON format.
-
-    Unlike `_yield_parsed_json`, which parses a `google.genai.types.HttpResponse`
-    (with a `body` attribute), this helper parses the gRPC `httpbody_pb2.HttpBody`
-    protos yielded by `stream_query_reasoning_engine`, which expose
-    `content_type` and `data` instead.
-
-    Args:
-        body (httpbody_pb2.HttpBody):
-            Required. The httpbody proto to be converted to JSON object(s).
-
-    Yields:
-        Any: A JSON object, a line of the original body, or the original body if
-            it is not JSON, or None.
-    """
-    content_type = getattr(body, "content_type", None)
-    data = getattr(body, "data", None)
-
-    if content_type is None or data is None or "application/json" not in content_type:
-        yield body
-        return
-
-    try:
-        utf8_data = data.decode("utf-8")
-    except Exception as e:
-        logger.warning(f"Failed to decode data: {data!r}. Exception: {e}")
-        yield body
-        return
-
-    if not utf8_data:
-        yield None
-        return
-
-    # Handle the case of multiple dictionaries delimited by newlines.
-    for line in utf8_data.split("\n"):
-        if line:
-            try:
-                line = json.loads(line)
-            except Exception as e:
-                logger.warning(f"failed to parse json: {line}. Exception: {e}")
-            yield line
-
-
 def _validate_resource_limits_or_raise(resource_limits: dict[str, str]) -> None:
     """Validates the resource limits.
 
@@ -2031,7 +1986,7 @@ def _validate_resource_limits_or_raise(resource_limits: dict[str, str]) -> None:
         )
 
 
-def _is_adk_agent(agent_engine: _AgentEngineInterface) -> bool:
+def _is_adk_agent(agent_engine: _RuntimeInterface) -> bool:
     """Checks if the agent engine is an ADK agent.
 
     Args:
@@ -2041,9 +1996,9 @@ def _is_adk_agent(agent_engine: _AgentEngineInterface) -> bool:
         True if the agent engine is an ADK agent, False otherwise.
     """
 
-    from agentplatform.agent_engines.templates import adk
+    from agentplatform.frameworks import AdkApp
 
-    return isinstance(agent_engine, adk.AdkApp)
+    return isinstance(agent_engine, AdkApp)
 
 
 def _add_telemetry_enablement_env(