chore: Enable gemini EAP models for gemini-builtin tools

PiperOrigin-RevId: 911554133

Author: google-genai-bot

src/google/adk/code_executors/built_in_code_executor.py

@@ -19,7 +19,7 @@
 
 from ..agents.invocation_context import InvocationContext
 from ..models import LlmRequest
-from ..utils.model_name_utils import is_gemini_2_or_above
+from ..utils.model_name_utils import is_gemini_eap_or_2_or_above
 from ..utils.model_name_utils import is_gemini_model_id_check_disabled
 from .base_code_executor import BaseCodeExecutor
 from .code_execution_utils import CodeExecutionInput
@@ -44,7 +44,7 @@ def execute_code(
   def process_llm_request(self, llm_request: LlmRequest) -> None:
     """Pre-process the LLM request for Gemini 2.0+ models to use the code execution tool."""
     model_check_disabled = is_gemini_model_id_check_disabled()
-    if is_gemini_2_or_above(llm_request.model) or model_check_disabled:
+    if is_gemini_eap_or_2_or_above(llm_request.model) or model_check_disabled:
       llm_request.config = llm_request.config or types.GenerateContentConfig()
       llm_request.config.tools = llm_request.config.tools or []
       llm_request.config.tools.append(

src/google/adk/tools/retrieval/vertex_ai_rag_retrieval.py

@@ -23,7 +23,7 @@
 from google.genai import types
 from typing_extensions import override
 
-from ...utils.model_name_utils import is_gemini_2_or_above
+from ...utils.model_name_utils import is_gemini_eap_or_2_or_above
 from ...utils.model_name_utils import is_gemini_model_id_check_disabled
 from ..tool_context import ToolContext
 from .base_retrieval_tool import BaseRetrievalTool
@@ -65,7 +65,7 @@ async def process_llm_request(
   ) -> None:
     # Use Gemini built-in Vertex AI RAG tool for Gemini 2 models.
     model_check_disabled = is_gemini_model_id_check_disabled()
-    if is_gemini_2_or_above(llm_request.model) or model_check_disabled:
+    if is_gemini_eap_or_2_or_above(llm_request.model) or model_check_disabled:
       llm_request.config = (
           types.GenerateContentConfig()
           if not llm_request.config

src/google/adk/tools/url_context_tool.py

@@ -20,8 +20,7 @@
 from typing_extensions import override
 
 from ..utils.model_name_utils import is_gemini_1_model
-from ..utils.model_name_utils import is_gemini_2_or_above
-from ..utils.model_name_utils import is_gemini_eap_model
+from ..utils.model_name_utils import is_gemini_eap_or_2_or_above
 from ..utils.model_name_utils import is_gemini_model_id_check_disabled
 from .base_tool import BaseTool
 from .tool_context import ToolContext
@@ -53,11 +52,7 @@ async def process_llm_request(
     llm_request.config.tools = llm_request.config.tools or []
     if is_gemini_1_model(llm_request.model):
       raise ValueError('Url context tool cannot be used in Gemini 1.x.')
-    elif (
-        is_gemini_2_or_above(llm_request.model)
-        or is_gemini_eap_model(llm_request.model)
-        or model_check_disabled
-    ):
+    elif is_gemini_eap_or_2_or_above(llm_request.model) or model_check_disabled:
       llm_request.config.tools.append(
           types.Tool(url_context=types.UrlContext())
       )

src/google/adk/utils/model_name_utils.py

@@ -99,18 +99,27 @@ def is_gemini_1_model(model_string: Optional[str]) -> bool:
   return re.match(r'^gemini-1\.\d+', model_name) is not None
 
 
-def is_gemini_2_or_above(model_string: Optional[str]) -> bool:
-  """Check if the model is a Gemini 2.0 or newer model using semantic versions.
+def is_gemini_eap_or_2_or_above(model_string: Optional[str]) -> bool:
+  """Check if the model is a Gemini EAP or a Gemini 2.0+ model.
+
+  EAP (Early Access Program) Gemini models follow a different naming
+  convention (see ``_is_gemini_eap_model``) and do not encode a numeric
+  version, so they are checked first. Otherwise the model name is parsed
+  as a semantic version and is considered a match when the major version
+  is ``>= 2``.
 
   Args:
     model_string: Either a simple model name or path-based model name
 
   Returns:
-    True if it's a Gemini 2.0+ model, False otherwise
+    True if it's a Gemini EAP model or a Gemini 2.0+ model, False otherwise
   """
   if not model_string:
     return False
 
+  if _is_gemini_eap_model(model_string):
+    return True
+
   model_name = extract_model_name(model_string)
   if not model_name.startswith('gemini-'):
     return False
@@ -127,7 +136,7 @@ def is_gemini_2_or_above(model_string: Optional[str]) -> bool:
   return parsed_version.major >= 2
 
 
-def is_gemini_eap_model(model_string: Optional[str]) -> bool:
+def _is_gemini_eap_model(model_string: Optional[str]) -> bool:
   """Check if the model is an Early Access Program (EAP) Gemini model.
 
   Matches names of the form ``gemini-<variant>-early-exp`` optionally

src/google/adk/utils/output_schema_utils.py

@@ -23,7 +23,7 @@
 from typing import Union
 
 from ..models.base_llm import BaseLlm
-from .model_name_utils import is_gemini_2_or_above
+from .model_name_utils import is_gemini_eap_or_2_or_above
 from .variant_utils import get_google_llm_variant
 from .variant_utils import GoogleLLMVariant
 
@@ -49,5 +49,5 @@ def can_use_output_schema_with_tools(model: Union[str, BaseLlm]) -> bool:
 
   return (
       get_google_llm_variant() == GoogleLLMVariant.VERTEX_AI
-      and is_gemini_2_or_above(model_string)
+      and is_gemini_eap_or_2_or_above(model_string)
   )

tests/unittests/utils/test_model_name_utils.py

@@ -16,7 +16,7 @@
 
 from google.adk.utils.model_name_utils import extract_model_name
 from google.adk.utils.model_name_utils import is_gemini_1_model
-from google.adk.utils.model_name_utils import is_gemini_2_or_above
+from google.adk.utils.model_name_utils import is_gemini_eap_or_2_or_above
 from google.adk.utils.model_name_utils import is_gemini_model
 from google.adk.utils.model_name_utils import is_gemini_model_id_check_disabled
 
@@ -189,50 +189,56 @@ def test_is_gemini_1_model_edge_cases(self):
 
 
 class TestIsGemini2Model:
-  """Test the is_gemini_2_or_above function."""
+  """Test the is_gemini_eap_or_2_or_above function."""
 
-  def test_is_gemini_2_or_above_simple_names(self):
+  def test_is_gemini_eap_or_2_or_above_simple_names(self):
     """Test Gemini 2.0+ model detection with simple model names."""
-    assert is_gemini_2_or_above('gemini-2.5-flash') is True
-    assert is_gemini_2_or_above('gemini-2.5-pro') is True
-    assert is_gemini_2_or_above('gemini-2.9-experimental') is True
-    assert is_gemini_2_or_above('gemini-2-pro') is True
-    assert is_gemini_2_or_above('gemini-2') is True
-    assert is_gemini_2_or_above('gemini-3.0-pro') is True
-    assert is_gemini_2_or_above('gemini-1.5-flash') is False
-    assert is_gemini_2_or_above('gemini-1.0-pro') is False
-    assert is_gemini_2_or_above('claude-3-sonnet') is False
-
-  def test_is_gemini_2_or_above_path_based_names(self):
+    assert is_gemini_eap_or_2_or_above('gemini-2.5-flash') is True
+    assert is_gemini_eap_or_2_or_above('gemini-2.5-pro') is True
+    assert is_gemini_eap_or_2_or_above('gemini-2.9-experimental') is True
+    assert is_gemini_eap_or_2_or_above('gemini-2-pro') is True
+    assert is_gemini_eap_or_2_or_above('gemini-2') is True
+    assert is_gemini_eap_or_2_or_above('gemini-3.0-pro') is True
+    assert is_gemini_eap_or_2_or_above('gemini-flash-early-exp') is True
+    assert is_gemini_eap_or_2_or_above('gemini-flash-early-exp3') is True
+    assert is_gemini_eap_or_2_or_above('gemini-flash-lite-early-exp') is True
+    assert is_gemini_eap_or_2_or_above('gemini-pro-early-exp') is True
+    assert is_gemini_eap_or_2_or_above('gemini-1.5-flash') is False
+    assert is_gemini_eap_or_2_or_above('gemini-1.0-pro') is False
+    assert is_gemini_eap_or_2_or_above('claude-3-sonnet') is False
+
+  def test_is_gemini_eap_or_2_or_above_path_based_names(self):
     """Test Gemini 2.0+ model detection with path-based model names."""
     gemini_2_path = 'projects/265104255505/locations/us-central1/publishers/google/models/gemini-2.5-flash'
-    assert is_gemini_2_or_above(gemini_2_path) is True
+    assert is_gemini_eap_or_2_or_above(gemini_2_path) is True
 
     gemini_2_path_2 = 'projects/12345/locations/us-east1/publishers/google/models/gemini-2.5-pro-preview'
-    assert is_gemini_2_or_above(gemini_2_path_2) is True
+    assert is_gemini_eap_or_2_or_above(gemini_2_path_2) is True
 
     gemini_1_path = 'projects/265104255505/locations/us-central1/publishers/google/models/gemini-1.5-flash'
-    assert is_gemini_2_or_above(gemini_1_path) is False
+    assert is_gemini_eap_or_2_or_above(gemini_1_path) is False
 
     gemini_3_path = 'projects/12345/locations/us-east1/publishers/google/models/gemini-3.0-pro'
-    assert is_gemini_2_or_above(gemini_3_path) is True
+    assert is_gemini_eap_or_2_or_above(gemini_3_path) is True
 
-  def test_is_gemini_2_or_above_edge_cases(self):
+  def test_is_gemini_eap_or_2_or_above_edge_cases(self):
     """Test edge cases for Gemini 2.0+ model detection."""
     # Test with None
-    assert is_gemini_2_or_above(None) is False
+    assert is_gemini_eap_or_2_or_above(None) is False
 
     # Test with empty string
-    assert is_gemini_2_or_above('') is False
+    assert is_gemini_eap_or_2_or_above('') is False
 
     # Test with model names containing gemini-2 but not starting with it
-    assert is_gemini_2_or_above('my-gemini-2.5-model') is False
-    assert is_gemini_2_or_above('custom-gemini-2.5-flash') is False
+    assert is_gemini_eap_or_2_or_above('my-gemini-2.5-model') is False
+    assert is_gemini_eap_or_2_or_above('custom-gemini-2.5-flash') is False
 
     # Test with invalid versions
-    assert is_gemini_2_or_above('gemini-2.') is False  # Missing version number
-    assert is_gemini_2_or_above('gemini-0.9-test') is False
-    assert is_gemini_2_or_above('gemini-one') is False
+    assert (
+        is_gemini_eap_or_2_or_above('gemini-2.') is False
+    )  # Missing version number
+    assert is_gemini_eap_or_2_or_above('gemini-0.9-test') is False
+    assert is_gemini_eap_or_2_or_above('gemini-one') is False
 
 
 class TestModelNameUtilsIntegration:
@@ -255,14 +261,14 @@ def test_model_classification_consistency(self):
     for model in test_models:
       # A model can only be either Gemini 1.x or Gemini 2.0+, not both
       if is_gemini_1_model(model):
-        assert not is_gemini_2_or_above(
+        assert not is_gemini_eap_or_2_or_above(
             model
         ), f'Model {model} classified as both Gemini 1.x and 2.0+'
         assert is_gemini_model(
             model
         ), f'Model {model} is Gemini 1.x but not classified as Gemini'
 
-      if is_gemini_2_or_above(model):
+      if is_gemini_eap_or_2_or_above(model):
         assert not is_gemini_1_model(
             model
         ), f'Model {model} classified as both Gemini 1.x and 2.0+'
@@ -271,7 +277,9 @@ def test_model_classification_consistency(self):
         ), f'Model {model} is Gemini 2.0+ but not classified as Gemini'
 
       # If it's neither Gemini 1.x nor 2.0+, it should not be classified as Gemini
-      if not is_gemini_1_model(model) and not is_gemini_2_or_above(model):
+      if not is_gemini_1_model(model) and not is_gemini_eap_or_2_or_above(
+          model
+      ):
         if model and 'gemini-' not in extract_model_name(model):
           assert not is_gemini_model(
               model
@@ -312,9 +320,9 @@ def test_path_vs_simple_model_consistency(self):
           f'Inconsistent Gemini 1.x classification for {simple_model} vs'
           f' {path_model}'
       )
-      assert is_gemini_2_or_above(simple_model) == is_gemini_2_or_above(
-          path_model
-      ), (
+      assert is_gemini_eap_or_2_or_above(
+          simple_model
+      ) == is_gemini_eap_or_2_or_above(path_model), (
           f'Inconsistent Gemini 2.0+ classification for {simple_model} vs'
           f' {path_model}'
       )