feat: Add support for app input in AdkApp template

PiperOrigin-RevId: 825039994

Author: yeesian

vertexai/agent_engines/templates/adk.py

@@ -37,6 +37,13 @@
     except (ImportError, AttributeError):
         Event = Any
 
+    try:
+        from google.adk.apps import App
+
+        App = App
+    except (ImportError, AttributeError):
+        App = Any
+
     try:
         from google.adk.agents import BaseAgent
 
@@ -449,7 +456,8 @@ class AdkApp:
     def __init__(
         self,
         *,
-        agent: "BaseAgent",
+        agent: "BaseAgent" = None,
+        app: "App" = None,
         app_name: Optional[str] = None,
         plugins: Optional[List["BasePlugin"]] = None,
         enable_tracing: Optional[bool] = None,
@@ -505,10 +513,28 @@ def __init__(
             )
             raise ValueError(msg)
 
+        if not agent and not app:
+            raise ValueError("One of `agent` or `app` must be provided.")
+        if app:
+            if app_name:
+                raise ValueError(
+                    "When app is provided, app_name should not be provided."
+                )
+            if agent:
+                raise ValueError(
+                    "When app is provided, agent should not be provided."
+                )
+            if plugins:
+                raise ValueError(
+                    "When app is provided, plugins should not be provided and"
+                    " should be provided in the app instead."
+                )
+
         self._tmpl_attrs: Dict[str, Any] = {
             "project": initializer.global_config.project,
             "location": initializer.global_config.location,
             "agent": agent,
+            "app": app,
             "app_name": app_name,
             "plugins": plugins,
             "enable_tracing": enable_tracing,
@@ -625,6 +651,7 @@ def clone(self):
 
         return self.__class__(
             agent=copy.deepcopy(self._tmpl_attrs.get("agent")),
+            app=copy.deepcopy(self._tmpl_attrs.get("app")),
             enable_tracing=self._tmpl_attrs.get("enable_tracing"),
             app_name=self._tmpl_attrs.get("app_name"),
             plugins=self._tmpl_attrs.get("plugins"),
@@ -775,18 +802,28 @@ def tracing_enabled() -> bool:
 
         self._tmpl_attrs["runner"] = Runner(
             agent=self._tmpl_attrs.get("agent"),
+            app=self._tmpl_attrs.get("app"),
             plugins=self._tmpl_attrs.get("plugins"),
             session_service=self._tmpl_attrs.get("session_service"),
             artifact_service=self._tmpl_attrs.get("artifact_service"),
             memory_service=self._tmpl_attrs.get("memory_service"),
-            app_name=self._tmpl_attrs.get("app_name"),
+            app_name=(
+                self._tmpl_attrs.get("app").name
+                if self._tmpl_attrs.get("app")
+                else self._tmpl_attrs.get("app_name")
+            ),
         )
         self._tmpl_attrs["in_memory_session_service"] = InMemorySessionService()
         self._tmpl_attrs["in_memory_artifact_service"] = InMemoryArtifactService()
         self._tmpl_attrs["in_memory_memory_service"] = InMemoryMemoryService()
         self._tmpl_attrs["in_memory_runner"] = Runner(
-            app_name=self._tmpl_attrs.get("app_name"),
+            app_name=(
+                self._tmpl_attrs.get("app").name
+                if self._tmpl_attrs.get("app")
+                else self._tmpl_attrs.get("app_name")
+            ),
             agent=self._tmpl_attrs.get("agent"),
+            app=self._tmpl_attrs.get("app"),
             plugins=self._tmpl_attrs.get("plugins"),
             session_service=self._tmpl_attrs.get("in_memory_session_service"),
             artifact_service=self._tmpl_attrs.get("in_memory_artifact_service"),