feat(core): migrate core and CLI to enterprise parameters

Co-authored-by: Haran Rajkumar <haranrk@google.com>
PiperOrigin-RevId: 930100568

Author: haranrk

src/google/adk/cli/cli_create.py

@@ -92,9 +92,9 @@ def _generate_files(
   with open(dotenv_file_path, "w", encoding="utf-8") as f:
     lines = []
     if google_cloud_project and google_cloud_region:
-      lines.append("GOOGLE_GENAI_USE_VERTEXAI=1")
+      lines.append("GOOGLE_GENAI_USE_ENTERPRISE=1")
     elif google_api_key:
-      lines.append("GOOGLE_GENAI_USE_VERTEXAI=0")
+      lines.append("GOOGLE_GENAI_USE_ENTERPRISE=0")
     if google_api_key:
       lines.append(f"GOOGLE_API_KEY={google_api_key}")
     if google_cloud_project:

src/google/adk/cli/cli_deploy.py

@@ -77,7 +77,7 @@ def _ensure_agent_engine_dependency(requirements_txt_path: str) -> None:
 # Set up environment variables - Start
 ENV PATH="/home/myuser/.local/bin:$PATH"
 
-ENV GOOGLE_GENAI_USE_VERTEXAI=1
+ENV GOOGLE_GENAI_USE_ENTERPRISE=1
 ENV GOOGLE_CLOUD_PROJECT={gcp_project_id}
 ENV GOOGLE_CLOUD_LOCATION={gcp_region}
 
@@ -854,7 +854,7 @@ def to_agent_engine(
       Google Cloud.
     api_key (str): Optional. The API key to use for Express Mode. If not
       provided, the API key from the GOOGLE_API_KEY environment variable will be
-      used. It will only be used if GOOGLE_GENAI_USE_VERTEXAI is true.
+      used. It will only be used if GOOGLE_GENAI_USE_ENTERPRISE is true.
     adk_app_object (str): Deprecated. This argument is no longer required or
       used.
     agent_engine_id (str): Optional. The ID of the Agent Runtime instance to
@@ -1060,7 +1060,7 @@ def to_agent_engine(
             fg='yellow',
         )
       else:
-        env_vars['GOOGLE_GENAI_USE_VERTEXAI'] = '1'
+        env_vars['GOOGLE_GENAI_USE_ENTERPRISE'] = '1'
         env_vars['GOOGLE_API_KEY'] = api_key
     elif not project:
       if 'GOOGLE_API_KEY' in env_vars:

src/google/adk/cli/cli_tools_click.py

@@ -2289,7 +2289,7 @@ def cli_migrate_session(
     help=(
         "Optional. The API key to use for Express Mode. If not"
         " provided, the API key from the GOOGLE_API_KEY environment variable"
-        " will be used. It will only be used if GOOGLE_GENAI_USE_VERTEXAI is"
+        " will be used. It will only be used if GOOGLE_GENAI_USE_ENTERPRISE is"
         " true. (It will override GOOGLE_API_KEY in the .env file if it"
         " exists.)"
     ),

src/google/adk/memory/vertex_ai_memory_bank_service.py

@@ -194,7 +194,7 @@ def __init__(
         ``agent_engine.api_resource.name.split('/')[-1]``
       express_mode_api_key: The API key to use for Express Mode. If not
         provided, the API key from the GOOGLE_API_KEY environment variable will
-        be used. It will only be used if GOOGLE_GENAI_USE_VERTEXAI is true. Do
+        be used. It will only be used if GOOGLE_GENAI_USE_ENTERPRISE is true. Do
         not use Google AI Studio API key for this field. For more details, visit
         https://cloud.google.com/vertex-ai/generative-ai/docs/start/express-mode/overview
     """

src/google/adk/models/apigee_llm.py

@@ -35,7 +35,7 @@
 import tenacity
 from typing_extensions import override
 
-from ..utils.env_utils import is_env_enabled
+from ..utils.env_utils import is_enterprise_mode_enabled
 from .google_llm import Gemini
 from .llm_response import LlmResponse
 
@@ -49,7 +49,6 @@
 logger = logging.getLogger('google_adk.' + __name__)
 
 _APIGEE_PROXY_URL_ENV_VARIABLE_NAME = 'APIGEE_PROXY_URL'
-_GOOGLE_GENAI_USE_VERTEXAI_ENV_VARIABLE_NAME = 'GOOGLE_GENAI_USE_VERTEXAI'
 _PROJECT_ENV_VARIABLE_NAME = 'GOOGLE_CLOUD_PROJECT'
 _LOCATION_ENV_VARIABLE_NAME = 'GOOGLE_CLOUD_LOCATION'
 
@@ -104,9 +103,9 @@ def __init__(
 
         Components
           `provider` (optional): `vertex_ai` or `gemini`. If omitted, behavior
-            depends on the `GOOGLE_GENAI_USE_VERTEXAI` environment variable. If
+            depends on the `GOOGLE_GENAI_USE_ENTERPRISE` environment variable. If
             that is not set to TRUE or 1, it defaults to `gemini`. `provider`
-            takes precedence over `GOOGLE_GENAI_USE_VERTEXAI`.
+            takes precedence over `GOOGLE_GENAI_USE_ENTERPRISE`.
           `version` (optional): The API version (e.g., `v1`, `v1beta`). If
             omitted, the default version for the provider is used.
           `model_id` (required): The model identifier (e.g.,
@@ -243,7 +242,7 @@ def api_client(self) -> Client:
     )
 
     kwargs_for_client = {}
-    kwargs_for_client['vertexai'] = self._isvertexai
+    kwargs_for_client['enterprise'] = self._isvertexai
     if self._isvertexai:
       kwargs_for_client['project'] = self._project
       kwargs_for_client['location'] = self._location
@@ -265,8 +264,8 @@ def _identify_vertexai(model: str, api_type: ApigeeLlm.ApiType) -> bool:
   """Returns if a model is Vertex AI.
 
   1. The api_type is GENAI or UNKNOWN.
-  2. The model is provider is Vertex AI model or the
-    GOOGLE_GENAI_USE_VERTEXAI environment variable is set to TRUE or 1.
+  2. The model provider is a Vertex AI model or the
+    enterprise mode is enabled.
 
   Args:
     model: The model string.
@@ -278,9 +277,7 @@ def _identify_vertexai(model: str, api_type: ApigeeLlm.ApiType) -> bool:
     return False
   if model.startswith('apigee/openai/'):
     return False
-  return model.startswith('apigee/vertex_ai/') or is_env_enabled(
-      _GOOGLE_GENAI_USE_VERTEXAI_ENV_VARIABLE_NAME
-  )
+  return model.startswith('apigee/vertex_ai/') or is_enterprise_mode_enabled()
 
 
 def _identify_api_version(model: str) -> str:

src/google/adk/models/google_llm.py

@@ -104,7 +104,7 @@ class Gemini(BaseLlm):
         class GlobalGemini(Gemini):
           @cached_property
           def api_client(self) -> Client:
-            return Client(vertexai=True, location="global")
+            return Client(enterprise=True, location="global")
 
         agent = Agent(model=GlobalGemini(model="gemini-3-pro-preview"))
 
@@ -345,7 +345,7 @@ def api_client(self) -> Client:
         'http_options': types.HttpOptions(**kwargs_for_http_options),
     }
     if self.model.startswith('projects/'):
-      kwargs['vertexai'] = True
+      kwargs['enterprise'] = True
 
     return Client(**kwargs)
 
@@ -390,7 +390,7 @@ def _live_api_client(self) -> Client:
         )
     }
     if self.model.startswith('projects/'):
-      kwargs['vertexai'] = True
+      kwargs['enterprise'] = True
 
     return Client(**kwargs)
 

src/google/adk/sessions/vertex_ai_session_service.py

@@ -100,9 +100,8 @@ def __init__(
       agent_engine_id: The resource ID of the agent engine to use.
       express_mode_api_key: The API key to use for Express Mode. If not
         provided, the API key from the GOOGLE_API_KEY environment variable will
-        be used. It will only be used if GOOGLE_GENAI_USE_VERTEXAI is true.
-        Do not use Google AI Studio API key for this field. For more details,
-        visit
+        be used. It will only be used if GOOGLE_GENAI_USE_ENTERPRISE is true. Do
+        not use Google AI Studio API key for this field. For more details, visit
         https://cloud.google.com/vertex-ai/generative-ai/docs/start/express-mode/overview
     """
     try:

src/google/adk/telemetry/tracing.py

@@ -65,6 +65,7 @@
 from typing_extensions import deprecated
 
 from .. import version
+from ..utils.env_utils import is_enterprise_mode_enabled
 from ..utils.model_name_utils import is_gemini_model
 from ._experimental_semconv import is_experimental_semconv
 from ._experimental_semconv import maybe_log_completion_details
@@ -986,6 +987,6 @@ def trace_inference_result(
 def _guess_gemini_system_name() -> str:
   return (
       GenAiSystemValues.VERTEX_AI.name.lower()
-      if os.getenv('GOOGLE_GENAI_USE_VERTEXAI', '').lower() in ('true', '1')
+      if is_enterprise_mode_enabled()
       else GenAiSystemValues.GEMINI.name.lower()
   )

src/google/adk/tools/google_maps_grounding_tool.py

@@ -36,7 +36,7 @@ class GoogleMapsGroundingTool(BaseTool):
   local code execution.
 
   Only available for use with the VertexAI Gemini API (e.g.
-  GOOGLE_GENAI_USE_VERTEXAI=TRUE)
+  GOOGLE_GENAI_USE_ENTERPRISE=TRUE)
   """
 
   def __init__(self):

tests/unittests/cli/utils/test_cli_create.py

@@ -68,7 +68,7 @@ def test_generate_files_with_api_key(agent_folder: Path) -> None:
 
   env_content = (agent_folder / ".env").read_text()
   assert "GOOGLE_API_KEY=dummy-key" in env_content
-  assert "GOOGLE_GENAI_USE_VERTEXAI=0" in env_content
+  assert "GOOGLE_GENAI_USE_ENTERPRISE=0" in env_content
   assert (agent_folder / "agent.py").exists()
   assert (agent_folder / "__init__.py").exists()
 
@@ -86,7 +86,7 @@ def test_generate_files_with_gcp(agent_folder: Path) -> None:
   env_content = (agent_folder / ".env").read_text()
   assert "GOOGLE_CLOUD_PROJECT=proj" in env_content
   assert "GOOGLE_CLOUD_LOCATION=us-central1" in env_content
-  assert "GOOGLE_GENAI_USE_VERTEXAI=1" in env_content
+  assert "GOOGLE_GENAI_USE_ENTERPRISE=1" in env_content
 
 
 def test_generate_files_with_express_mode(agent_folder: Path) -> None:
@@ -101,7 +101,7 @@ def test_generate_files_with_express_mode(agent_folder: Path) -> None:
   )
 
   env_content = (agent_folder / ".env").read_text()
-  assert "GOOGLE_GENAI_USE_VERTEXAI=1" in env_content
+  assert "GOOGLE_GENAI_USE_ENTERPRISE=1" in env_content
   assert "GOOGLE_API_KEY=express-api-key" in env_content
   assert "GOOGLE_CLOUD_PROJECT=express-project-id" in env_content
 
@@ -145,7 +145,7 @@ def test_generate_files_no_params(agent_folder: Path) -> None:
       "GOOGLE_API_KEY",
       "GOOGLE_CLOUD_PROJECT",
       "GOOGLE_CLOUD_LOCATION",
-      "GOOGLE_GENAI_USE_VERTEXAI",
+      "GOOGLE_GENAI_USE_ENTERPRISE",
   ):
     assert key not in env_content