feat: Add support for API key in AdkApp

PiperOrigin-RevId: 825638989

Author: vertex-sdk-bot

vertexai/agent_engines/templates/adk.py

@@ -505,13 +505,13 @@ def __init__(
         """
         from google.cloud.aiplatform import initializer
 
-        adk_version = get_adk_version()
-        if not is_version_sufficient("1.5.0"):
-            msg = (
-                f"Unsupported google-adk version: {adk_version}, please use "
-                "google-adk>=1.5.0 for AdkApp deployment on Agent Engine."
-            )
-            raise ValueError(msg)
+        # adk_version = get_adk_version()
+        # if not is_version_sufficient("1.5.0"):
+        #     msg = (
+        #         f"Unsupported google-adk version: {adk_version}, please use "
+        #         "google-adk>=1.5.0 for AdkApp deployment on Agent Engine."
+        #     )
+        #     raise ValueError(msg)
 
         if not agent and not app:
             raise ValueError("One of `agent` or `app` must be provided.")
@@ -540,6 +540,7 @@ def __init__(
             "artifact_service_builder": artifact_service_builder,
             "memory_service_builder": memory_service_builder,
             "instrumentor_builder": instrumentor_builder,
+            "express_mode_api_key": initializer.global_config.api_key,
         }
 
     async def _init_session(
@@ -683,9 +684,16 @@ def set_up(self):
 
         os.environ["GOOGLE_GENAI_USE_VERTEXAI"] = "1"
         project = self._tmpl_attrs.get("project")
-        os.environ["GOOGLE_CLOUD_PROJECT"] = project
+        if project:
+            os.environ["GOOGLE_CLOUD_PROJECT"] = project
         location = self._tmpl_attrs.get("location")
-        os.environ["GOOGLE_CLOUD_LOCATION"] = location
+        if location:
+            os.environ["GOOGLE_CLOUD_LOCATION"] = location
+        express_mode_api_key = self._tmpl_attrs.get("express_mode_api_key")
+        if express_mode_api_key and not project and not location:
+            os.environ["GOOGLE_API_KEY"] = express_mode_api_key
+            if not project:
+                os.environ.pop("GOOGLE_CLOUD_LOCATION", None)
 
         # Disable content capture in custom ADK spans unless user enabled
         # tracing explicitly with the old flag
@@ -769,21 +777,37 @@ def tracing_enabled() -> bool:
                     VertexAiSessionService,
                 )
 
-                self._tmpl_attrs["session_service"] = VertexAiSessionService(
-                    project=project,
-                    location=location,
-                    agent_engine_id=os.environ.get("GOOGLE_CLOUD_AGENT_ENGINE_ID"),
-                )
+                if is_version_sufficient("1.18.0"):
+                    self._tmpl_attrs["session_service"] = VertexAiSessionService(
+                        project=project,
+                        location=location,
+                        agent_engine_id=os.environ.get("GOOGLE_CLOUD_AGENT_ENGINE_ID"),
+                        express_mode_api_key=express_mode_api_key,
+                    )
+                else:
+                    self._tmpl_attrs["session_service"] = VertexAiSessionService(
+                        project=project,
+                        location=location,
+                        agent_engine_id=os.environ.get("GOOGLE_CLOUD_AGENT_ENGINE_ID"),
+                    )
             except (ImportError, AttributeError):
                 from google.adk.sessions.vertex_ai_session_service_g3 import (
                     VertexAiSessionService,
                 )
 
-                self._tmpl_attrs["session_service"] = VertexAiSessionService(
-                    project=project,
-                    location=location,
-                    agent_engine_id=os.environ.get("GOOGLE_CLOUD_AGENT_ENGINE_ID"),
-                )
+                if is_version_sufficient("1.18.0"):
+                    self._tmpl_attrs["session_service"] = VertexAiSessionService(
+                        project=project,
+                        location=location,
+                        agent_engine_id=os.environ.get("GOOGLE_CLOUD_AGENT_ENGINE_ID"),
+                        express_mode_api_key=express_mode_api_key,
+                    )
+                else:
+                    self._tmpl_attrs["session_service"] = VertexAiSessionService(
+                        project=project,
+                        location=location,
+                        agent_engine_id=os.environ.get("GOOGLE_CLOUD_AGENT_ENGINE_ID"),
+                    )
 
         else:
             self._tmpl_attrs["session_service"] = InMemorySessionService()
@@ -799,11 +823,19 @@ def tracing_enabled() -> bool:
                     VertexAiMemoryBankService,
                 )
 
-                self._tmpl_attrs["memory_service"] = VertexAiMemoryBankService(
-                    project=project,
-                    location=location,
-                    agent_engine_id=os.environ.get("GOOGLE_CLOUD_AGENT_ENGINE_ID"),
-                )
+                if is_version_sufficient("1.18.0"):
+                    self._tmpl_attrs["memory_service"] = VertexAiMemoryBankService(
+                        project=project,
+                        location=location,
+                        agent_engine_id=os.environ.get("GOOGLE_CLOUD_AGENT_ENGINE_ID"),
+                        express_mode_api_key=express_mode_api_key,
+                    )
+                else:
+                    self._tmpl_attrs["memory_service"] = VertexAiMemoryBankService(
+                        project=project,
+                        location=location,
+                        agent_engine_id=os.environ.get("GOOGLE_CLOUD_AGENT_ENGINE_ID"),
+                    )
             except (ImportError, AttributeError):
                 # TODO(ysian): Handle this via _g3 import for google3.
                 pass