Deprecate GoogleGLAProvider and GoogleVertexProvider (#2450)

Author: Kludex

pydantic_ai_slim/pydantic_ai/providers/__init__.py

@@ -71,13 +71,13 @@ def infer_provider_class(provider: str) -> type[Provider[Any]]:  # noqa: C901
 
         return AzureProvider
     elif provider == 'google-vertex':
-        from .google_vertex import GoogleVertexProvider
+        from .google_vertex import GoogleVertexProvider  # type: ignore[reportDeprecated]
 
-        return GoogleVertexProvider
+        return GoogleVertexProvider  # type: ignore[reportDeprecated]
     elif provider == 'google-gla':
-        from .google_gla import GoogleGLAProvider
+        from .google_gla import GoogleGLAProvider  # type: ignore[reportDeprecated]
 
-        return GoogleGLAProvider
+        return GoogleGLAProvider  # type: ignore[reportDeprecated]
     # NOTE: We don't test because there are many ways the `boto3.client` can retrieve the credentials.
     elif provider == 'bedrock':
         from .bedrock import BedrockProvider

pydantic_ai_slim/pydantic_ai/providers/google_gla.py

@@ -3,6 +3,7 @@
 import os
 
 import httpx
+from typing_extensions import deprecated
 
 from pydantic_ai.exceptions import UserError
 from pydantic_ai.models import cached_async_http_client
@@ -11,6 +12,7 @@
 from pydantic_ai.providers import Provider
 
 
+@deprecated('`GoogleGLAProvider` is deprecated, use `GoogleProvider` with `GoogleModel` instead.')
 class GoogleGLAProvider(Provider[httpx.AsyncClient]):
     """Provider for Google Generative Language AI API."""
 

pydantic_ai_slim/pydantic_ai/providers/google_vertex.py

@@ -7,6 +7,7 @@
 
 import anyio.to_thread
 import httpx
+from typing_extensions import deprecated
 
 from pydantic_ai.exceptions import UserError
 from pydantic_ai.models import cached_async_http_client
@@ -29,6 +30,7 @@
 __all__ = ('GoogleVertexProvider',)
 
 
+@deprecated('`GoogleVertexProvider` is deprecated, use `GoogleProvider` with `GoogleModel` instead.')
 class GoogleVertexProvider(Provider[httpx.AsyncClient]):
     """Provider for Vertex AI API."""
 

tests/conftest.py

@@ -479,7 +479,7 @@ def model(
             return CohereModel('command-r-plus', provider=CohereProvider(api_key=co_api_key))
         elif request.param == 'gemini':
             from pydantic_ai.models.gemini import GeminiModel  # type: ignore[reportDeprecated]
-            from pydantic_ai.providers.google_gla import GoogleGLAProvider
+            from pydantic_ai.providers.google_gla import GoogleGLAProvider  # type: ignore[reportDeprecated]
 
             return GeminiModel('gemini-1.5-flash', provider=GoogleGLAProvider(api_key=gemini_api_key))  # type: ignore[reportDeprecated]
         elif request.param == 'google':

tests/models/test_gemini.py

@@ -61,7 +61,11 @@
 
 from ..conftest import ClientWithHandler, IsDatetime, IsInstance, IsNow, IsStr, TestEnv, try_import
 
-pytestmark = [pytest.mark.anyio, pytest.mark.filterwarnings('ignore:Use `GoogleModel` instead.:DeprecationWarning')]
+pytestmark = [
+    pytest.mark.anyio,
+    pytest.mark.filterwarnings('ignore:Use `GoogleModel` instead.:DeprecationWarning'),
+    pytest.mark.filterwarnings('ignore:`GoogleGLAProvider` is deprecated.:DeprecationWarning'),
+]
 
 
 async def test_model_simple(allow_model_requests: None):

tests/models/test_gemini_vertex.py

@@ -34,6 +34,7 @@
     pytest.mark.skipif(not imports_successful(), reason='google-auth not installed'),
     pytest.mark.anyio,
     pytest.mark.filterwarnings('ignore:Use `GoogleModel` instead.:DeprecationWarning'),
+    pytest.mark.filterwarnings('ignore:`GoogleVertexProvider` is deprecated.:DeprecationWarning'),
 ]
 
 

tests/providers/test_google_gla.py

@@ -1,3 +1,4 @@
+# pyright: reportDeprecated=false
 import re
 
 import pytest
@@ -7,6 +8,10 @@
 
 from ..conftest import TestEnv
 
+pytestmark = [
+    pytest.mark.filterwarnings('ignore:`GoogleGLAProvider` is deprecated.:DeprecationWarning'),
+]
+
 
 def test_api_key_arg(env: TestEnv):
     env.set('GEMINI_API_KEY', 'via-env-var')

tests/providers/test_google_vertex.py

@@ -1,3 +1,4 @@
+# pyright: reportDeprecated=false
 from __future__ import annotations as _annotations
 
 import json
@@ -13,7 +14,7 @@
 from pytest_mock import MockerFixture
 
 from pydantic_ai.agent import Agent
-from pydantic_ai.models.gemini import GeminiModel  # type: ignore[reportDeprecated]
+from pydantic_ai.models.gemini import GeminiModel
 
 from ..conftest import try_import
 
@@ -26,6 +27,7 @@
     pytest.mark.skipif(not imports_successful(), reason='google-genai not installed'),
     pytest.mark.anyio(),
     pytest.mark.filterwarnings('ignore:Use `GoogleModel` instead.:DeprecationWarning'),
+    pytest.mark.filterwarnings('ignore:`GoogleVertexProvider` is deprecated.:DeprecationWarning'),
 ]
 
 
@@ -168,7 +170,7 @@ def refresh(self, request: Request): ...
 )
 @pytest.mark.vcr()
 async def test_vertexai_provider(allow_model_requests: None):  # pragma: lax no cover
-    m = GeminiModel('gemini-2.0-flash', provider='google-vertex')  # type: ignore[reportDeprecated]
+    m = GeminiModel('gemini-2.0-flash', provider='google-vertex')
     agent = Agent(m)
 
     result = await agent.run('What is the capital of France?')

tests/providers/test_provider_names.py

@@ -20,8 +20,8 @@
     from pydantic_ai.providers.deepseek import DeepSeekProvider
     from pydantic_ai.providers.fireworks import FireworksProvider
     from pydantic_ai.providers.github import GitHubProvider
-    from pydantic_ai.providers.google_gla import GoogleGLAProvider
-    from pydantic_ai.providers.google_vertex import GoogleVertexProvider
+    from pydantic_ai.providers.google_gla import GoogleGLAProvider  # type: ignore[reportDeprecated]
+    from pydantic_ai.providers.google_vertex import GoogleVertexProvider  # type: ignore[reportDeprecated]
     from pydantic_ai.providers.grok import GrokProvider
     from pydantic_ai.providers.groq import GroqProvider
     from pydantic_ai.providers.heroku import HerokuProvider
@@ -40,8 +40,8 @@
         ('vercel', VercelProvider, 'VERCEL_AI_GATEWAY_API_KEY'),
         ('openai', OpenAIProvider, 'OPENAI_API_KEY'),
         ('azure', AzureProvider, 'AZURE_OPENAI'),
-        ('google-vertex', GoogleVertexProvider, None),
-        ('google-gla', GoogleGLAProvider, 'GEMINI_API_KEY'),
+        ('google-vertex', GoogleVertexProvider, None),  # type: ignore[reportDeprecated]
+        ('google-gla', GoogleGLAProvider, 'GEMINI_API_KEY'),  # type: ignore[reportDeprecated]
         ('groq', GroqProvider, 'GROQ_API_KEY'),
         ('mistral', MistralProvider, 'MISTRAL_API_KEY'),
         ('grok', GrokProvider, 'GROK_API_KEY'),
@@ -55,7 +55,11 @@
 if not imports_successful():
     test_infer_provider_params = []  # pragma: lax no cover
 
-pytestmark = pytest.mark.skipif(not imports_successful(), reason='need to install all extra packages')
+pytestmark = [
+    pytest.mark.skipif(not imports_successful(), reason='need to install all extra packages'),
+    pytest.mark.filterwarnings('ignore:`GoogleGLAProvider` is deprecated:DeprecationWarning'),
+    pytest.mark.filterwarnings('ignore:`GoogleVertexProvider` is deprecated:DeprecationWarning'),
+]
 
 
 @pytest.fixture(autouse=True)

tests/test_examples.py

@@ -45,9 +45,7 @@
 
 try:
     from pydantic_ai.providers.google import GoogleProvider
-    from pydantic_ai.providers.google_vertex import GoogleVertexProvider
 except ImportError:  # pragma: lax no cover
-    GoogleVertexProvider = None
     GoogleProvider = None
 
 
@@ -63,10 +61,7 @@
 
 pytestmark = [
     pytest.mark.skipif(not imports_successful(), reason='extras not installed'),
-    pytest.mark.skipif(
-        GoogleVertexProvider is None or logfire is None or GoogleProvider is None,
-        reason='google-auth or logfire or google-provider not installed',
-    ),
+    pytest.mark.skipif(logfire is None or GoogleProvider is None, reason='logfire or google-provider not installed'),
 ]
 code_examples: dict[str, CodeExample] = {}