fix: Standardize on the app_name in AdkApp

PiperOrigin-RevId: 890604835

Author: yeesian

vertexai/agent_engines/templates/adk.py

@@ -629,7 +629,8 @@ def __init__(
         if app:
             if app_name:
                 raise ValueError(
-                    "When app is provided, app_name should not be provided."
+                    "When app is provided, app_name should not be provided, "
+                    "since it will be derived from app.name."
                 )
             if agent:
                 raise ValueError("When app is provided, agent should not be provided.")
@@ -656,6 +657,11 @@ def __init__(
             ),
         }
 
+    def _app_name(self) -> str:
+        """Returns the app name."""
+        app = self._tmpl_attrs.get("app")
+        return app.name if app else self._tmpl_attrs.get("app_name")
+
     async def _init_session(
         self,
         session_service: "BaseSessionService",
@@ -672,9 +678,8 @@ async def _init_session(
                 auth = _Authorization(**auth)
                 session_state[auth_id] = auth.access_token
 
-        app = self._tmpl_attrs.get("app")
         session = await session_service.create_session(
-            app_name=app.name if app else self._tmpl_attrs.get("app_name"),
+            app_name=self._app_name(),
             user_id=request.user_id,
             state=session_state,
         )
@@ -694,7 +699,6 @@ async def _save_artifacts(
         request: _StreamRunRequest,
     ):
         """Saves the artifacts."""
-        app = self._tmpl_attrs.get("app")
         if request.artifacts:
             for artifact in request.artifacts:
                 artifact = _Artifact(**artifact)
@@ -703,7 +707,7 @@ async def _save_artifacts(
                 ):
                     version_data = _ArtifactVersion(**version_data)
                     saved_version = await artifact_service.save_artifact(
-                        app_name=app.name if app else self._tmpl_attrs.get("app_name"),
+                        app_name=self._app_name(),
                         user_id=request.user_id,
                         session_id=session_id,
                         filename=artifact.file_name,
@@ -749,7 +753,7 @@ async def _convert_response_events(
                         _ArtifactVersion(
                             version=version,
                             data=await artifact_service.load_artifact(
-                                app_name=self._tmpl_attrs.get("app_name"),
+                                app_name=self._app_name(),
                                 user_id=user_id,
                                 session_id=session_id,
                                 filename=key,
@@ -1206,7 +1210,6 @@ async def streaming_agent_run_with_events(self, request_json: str):
             )
         ):
             self.set_up()
-        app = self._tmpl_attrs.get("app")
 
         # Try to get the session, if it doesn't exist, create a new one.
         if request.session_id:
@@ -1216,7 +1219,7 @@ async def streaming_agent_run_with_events(self, request_json: str):
             session = None
             try:
                 session = await session_service.get_session(
-                    app_name=app.name if app else self._tmpl_attrs.get("app_name"),
+                    app_name=self._app_name(),
                     user_id=request.user_id,
                     session_id=request.session_id,
                 )
@@ -1267,9 +1270,8 @@ async def streaming_agent_run_with_events(self, request_json: str):
                 yield converted_event
         finally:
             if session and not request.session_id:
-                app = self._tmpl_attrs.get("app")
                 await session_service.delete_session(
-                    app_name=app.name if app else self._tmpl_attrs.get("app_name"),
+                    app_name=self._app_name(),
                     user_id=request.user_id,
                     session_id=session.id,
                 )
@@ -1306,9 +1308,8 @@ async def async_get_session(
         """
         if not self._tmpl_attrs.get("session_service"):
             self.set_up()
-        app = self._tmpl_attrs.get("app")
         session = await self._tmpl_attrs.get("session_service").get_session(
-            app_name=app.name if app else self._tmpl_attrs.get("app_name"),
+            app_name=self._app_name(),
             user_id=user_id,
             session_id=session_id,
             **kwargs,
@@ -1384,9 +1385,8 @@ async def async_list_sessions(self, *, user_id: str, **kwargs):
         """
         if not self._tmpl_attrs.get("session_service"):
             self.set_up()
-        app = self._tmpl_attrs.get("app")
         return await self._tmpl_attrs.get("session_service").list_sessions(
-            app_name=app.name if app else self._tmpl_attrs.get("app_name"),
+            app_name=self._app_name(),
             user_id=user_id,
             **kwargs,
         )
@@ -1457,9 +1457,8 @@ async def async_create_session(
         """
         if not self._tmpl_attrs.get("session_service"):
             self.set_up()
-        app = self._tmpl_attrs.get("app")
         session = await self._tmpl_attrs.get("session_service").create_session(
-            app_name=app.name if app else self._tmpl_attrs.get("app_name"),
+            app_name=self._app_name(),
             user_id=user_id,
             session_id=session_id,
             state=state,
@@ -1539,9 +1538,8 @@ async def async_delete_session(
         """
         if not self._tmpl_attrs.get("session_service"):
             self.set_up()
-        app = self._tmpl_attrs.get("app")
         await self._tmpl_attrs.get("session_service").delete_session(
-            app_name=app.name if app else self._tmpl_attrs.get("app_name"),
+            app_name=self._app_name(),
             user_id=user_id,
             session_id=session_id,
             **kwargs,
@@ -1630,9 +1628,8 @@ async def async_search_memory(self, *, user_id: str, query: str):
         """
         if not self._tmpl_attrs.get("memory_service"):
             self.set_up()
-        app = self._tmpl_attrs.get("app")
         return await self._tmpl_attrs.get("memory_service").search_memory(
-            app_name=app.name if app else self._tmpl_attrs.get("app_name"),
+            app_name=self._app_name(),
             user_id=user_id,
             query=query,
         )