From cd49e66bccd5ed1aa1e052a116e8799dc0bbed5e Mon Sep 17 00:00:00 2001
From: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
Date: Wed, 19 Nov 2025 08:51:35 +0000
Subject: [PATCH] Fix: Allow new Gemini models (gemini-3-pro-preview) to route
 to native provider
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Relaxed Gemini model validation to allow any model starting with gemini-, gemma-, or learnlm- prefixes
- This prevents breakage when new Gemini models are released
- The Google SDK will surface a clear error if a model truly doesn't exist
- Added comprehensive tests for new preview models, case-insensitive validation, and fallback behavior
- Fixes issue #3949

Co-Authored-By: João <joao@crewai.com>
---
 lib/crewai/src/crewai/llm.py                |  8 ++-
 lib/crewai/tests/llms/google/test_google.py | 59 +++++++++++++++++++++
 2 files changed, 66 insertions(+), 1 deletion(-)

diff --git a/lib/crewai/src/crewai/llm.py b/lib/crewai/src/crewai/llm.py
index b0cf42091..64fe45d37 100644
--- a/lib/crewai/src/crewai/llm.py
+++ b/lib/crewai/src/crewai/llm.py
@@ -422,7 +422,13 @@ class LLM(BaseLLM):
             return model in ANTHROPIC_MODELS
 
         if provider == "gemini":
-            return model in GEMINI_MODELS
+            if model in GEMINI_MODELS:
+                return True
+            model_lower = model.lower()
+            return any(
+                model_lower.startswith(prefix)
+                for prefix in ("gemini-", "gemma-", "learnlm-")
+            )
 
         if provider == "bedrock":
             return model in BEDROCK_MODELS
diff --git a/lib/crewai/tests/llms/google/test_google.py b/lib/crewai/tests/llms/google/test_google.py
index c6f271b0a..59561ea5a 100644
--- a/lib/crewai/tests/llms/google/test_google.py
+++ b/lib/crewai/tests/llms/google/test_google.py
@@ -700,3 +700,62 @@ def test_gemini_stop_sequences_sent_to_api():
         assert hasattr(config, 'stop_sequences') or 'stop_sequences' in config.__dict__
         if hasattr(config, 'stop_sequences'):
             assert config.stop_sequences == ["\nObservation:", "\nThought:"]
+
+
+def test_gemini_allows_new_preview_models_without_constants():
+    """Test that new Gemini preview models route to native provider without being in constants."""
+    test_models = [
+        "google/gemini-3-pro-preview",
+        "google/gemini-3.0-pro-preview",
+        "gemini/gemini-3-flash-preview",
+        "google/gemma-3-27b-it",
+        "gemini/learnlm-3.0-experimental",
+    ]
+
+    for model_name in test_models:
+        llm = LLM(model=model_name)
+        from crewai.llms.providers.gemini.completion import GeminiCompletion
+        assert isinstance(llm, GeminiCompletion), f"Failed for model: {model_name}"
+        assert llm.provider == "gemini", f"Wrong provider for model: {model_name}"
+        
+        expected_model = model_name.split("/")[1]
+        assert llm.model == expected_model, f"Wrong model string for: {model_name}"
+
+
+def test_gemini_prefix_validation_case_insensitive():
+    """Test that Gemini prefix validation is case-insensitive."""
+    test_models = [
+        "google/Gemini-3-Pro-Preview",
+        "google/GEMINI-3-FLASH",
+        "google/Gemma-3-Test",
+        "google/LearnLM-Test",
+    ]
+
+    for model_name in test_models:
+        llm = LLM(model=model_name)
+        from crewai.llms.providers.gemini.completion import GeminiCompletion
+        assert isinstance(llm, GeminiCompletion), f"Failed for model: {model_name}"
+
+
+def test_gemini_non_matching_prefix_falls_back_to_litellm():
+    """Test that models not starting with gemini-/gemma-/learnlm- fall back to LiteLLM."""
+    llm = LLM(model="google/unknown-model-xyz")
+    
+    assert llm.is_litellm == True, "Should fall back to LiteLLM for unknown model"
+    assert llm.__class__.__name__ == "LLM", "Should be LiteLLM instance"
+
+
+def test_gemini_existing_models_still_work():
+    """Test that existing models in constants still route correctly."""
+    existing_models = [
+        "google/gemini-2.0-flash-001",
+        "google/gemini-1.5-pro",
+        "gemini/gemini-2.5-flash",
+        "google/gemma-3-27b-it",
+    ]
+
+    for model_name in existing_models:
+        llm = LLM(model=model_name)
+        from crewai.llms.providers.gemini.completion import GeminiCompletion
+        assert isinstance(llm, GeminiCompletion), f"Failed for existing model: {model_name}"
+        assert llm.provider == "gemini"