Support api_type

Author: Kludex

pydantic_ai_slim/pydantic_ai/models/bedrock.py

@@ -226,7 +226,7 @@ def __init__(
         self._model_name = model_name
 
         if isinstance(provider, str):
-            provider = infer_provider('gateway/bedrock' if provider == 'gateway' else provider)
+            provider = infer_provider('gateway/converse' if provider == 'gateway' else provider)
         self._provider = provider
         self.client = cast('BedrockRuntimeClient', provider.client)
 

pydantic_ai_slim/pydantic_ai/models/google.py

@@ -204,7 +204,7 @@ def __init__(
         self._model_name = model_name
 
         if isinstance(provider, str):
-            provider = infer_provider('gateway/google-vertex' if provider == 'gateway' else provider)
+            provider = infer_provider('gateway/gemini' if provider == 'gateway' else provider)
         self._provider = provider
         self.client = provider.client
 

pydantic_ai_slim/pydantic_ai/models/openai.py

@@ -375,7 +375,7 @@ def __init__(
         self._model_name = model_name
 
         if isinstance(provider, str):
-            provider = infer_provider('gateway/openai' if provider == 'gateway' else provider)
+            provider = infer_provider('gateway/chat' if provider == 'gateway' else provider)
         self._provider = provider
         self.client = provider.client
 
@@ -944,7 +944,7 @@ def __init__(
         self._model_name = model_name
 
         if isinstance(provider, str):
-            provider = infer_provider('gateway/openai' if provider == 'gateway' else provider)
+            provider = infer_provider('gateway/responses' if provider == 'gateway' else provider)
         self._provider = provider
         self.client = provider.client
 

pydantic_ai_slim/pydantic_ai/providers/gateway.py

@@ -7,7 +7,6 @@
 from typing import TYPE_CHECKING, Any, Literal, overload
 
 import httpx
-from typing_extensions import deprecated
 
 from pydantic_ai.exceptions import UserError
 from pydantic_ai.models import cached_async_http_client
@@ -25,9 +24,8 @@
 
 
 @overload
-@deprecated('Use `chat` or `responses` API type instead of `openai` provider type.')
 def gateway_provider(
-    upstream_provider: Literal['openai', 'openai-chat', 'openai-responses'],
+    api_type: Literal['chat', 'responses'],
     /,
     *,
     api_key: str | None = None,
@@ -38,76 +36,61 @@ def gateway_provider(
 
 @overload
 def gateway_provider(
-    upstream_provider: Literal['groq'],
+    api_key: Literal['groq'],
     /,
     *,
-    api_key: str | None = None,
     base_url: str | None = None,
     http_client: httpx.AsyncClient | None = None,
 ) -> Provider[AsyncGroq]: ...
 
 
 @overload
-@deprecated('Use `gemini` or `anthropic` API type instead of `google-vertex` provider type.')
 def gateway_provider(
-    upstream_provider: Literal['google-vertex'],
+    api_type: Literal['anthropic'],
     /,
     *,
     api_key: str | None = None,
     base_url: str | None = None,
-) -> Provider[GoogleClient]: ...
+    http_client: httpx.AsyncClient | None = None,
+) -> Provider[AsyncAnthropicClient]: ...
 
 
 @overload
 def gateway_provider(
-    upstream_provider: Literal['anthropic'],
+    api_type: Literal['converse'],
     /,
     *,
     api_key: str | None = None,
     base_url: str | None = None,
-) -> Provider[AsyncAnthropicClient]: ...
+) -> Provider[BaseClient]: ...
 
 
 @overload
-@deprecated('Use `converse` or `anthropic` API type instead of `bedrock` provider type.')
 def gateway_provider(
-    upstream_provider: Literal['bedrock'],
+    api_type: Literal['gemini'],
     /,
     *,
     api_key: str | None = None,
     base_url: str | None = None,
-) -> Provider[BaseClient]: ...
+    http_client: httpx.AsyncClient | None = None,
+) -> Provider[GoogleClient]: ...
 
 
 @overload
 def gateway_provider(
-    upstream_provider: str,
+    api_type: str,
     /,
     *,
     api_key: str | None = None,
     base_url: str | None = None,
 ) -> Provider[Any]: ...
 
 
-UpstreamProvider = Literal[
-    'chat',
-    'responses',
-    'gemini',
-    'converse',
-    # Deprecated
-    'openai',
-    'openai-chat',
-    'openai-responses',
-    'google-vertex',
-    'bedrock',
-    # Those two are actually the same on both.
-    'anthropic',
-    'groq',
-]
+APIType = Literal['chat', 'responses', 'gemini', 'converse', 'anthropic', 'groq']
 
 
 def gateway_provider(
-    upstream_provider: UpstreamProvider | str,
+    api_type: APIType | str,
     /,
     *,
     # Every provider
@@ -119,7 +102,7 @@ def gateway_provider(
     """Create a new Gateway provider.
 
     Args:
-        upstream_provider: The upstream provider to use.
+        api_type: Determines the API type to use.
         api_key: The API key to use for authentication. If not provided, the `PYDANTIC_AI_GATEWAY_API_KEY`
             environment variable will be used if available.
         base_url: The base URL to use for the Gateway. If not provided, the `PYDANTIC_AI_GATEWAY_BASE_URL`
@@ -134,23 +117,18 @@ def gateway_provider(
         )
 
     base_url = base_url or os.getenv('PYDANTIC_AI_GATEWAY_BASE_URL', GATEWAY_BASE_URL)
-    http_client = http_client or cached_async_http_client(provider=f'gateway/{upstream_provider}')
+    http_client = http_client or cached_async_http_client(provider=f'gateway/{api_type}')
     http_client.event_hooks = {'request': [_request_hook(api_key)]}
 
-    if upstream_provider in ('openai', 'openai-chat', 'openai-responses'):
-        from .openai import OpenAIProvider
-
-        return OpenAIProvider(api_key=api_key, base_url=_merge_url_path(base_url, 'openai'), http_client=http_client)
-    elif upstream_provider in ('chat', 'responses'):
+    if api_type in ('chat', 'responses'):
         from .openai import OpenAIProvider
 
-        base_url = _merge_url_path(base_url, upstream_provider)
-        return OpenAIProvider(api_key=api_key, base_url=base_url, http_client=http_client)
-    elif upstream_provider == 'groq':
+        return OpenAIProvider(api_key=api_key, base_url=_merge_url_path(base_url, api_type), http_client=http_client)
+    elif api_type == 'groq':
         from .groq import GroqProvider
 
         return GroqProvider(api_key=api_key, base_url=_merge_url_path(base_url, 'groq'), http_client=http_client)
-    elif upstream_provider == 'anthropic':
+    elif api_type == 'anthropic':
         from anthropic import AsyncAnthropic
 
         from .anthropic import AnthropicProvider
@@ -162,25 +140,25 @@ def gateway_provider(
                 http_client=http_client,
             )
         )
-    elif upstream_provider in ('bedrock', 'converse'):
+    elif api_type in 'converse':
         from .bedrock import BedrockProvider
 
         return BedrockProvider(
             api_key=api_key,
-            base_url=_merge_url_path(base_url, upstream_provider),
+            base_url=_merge_url_path(base_url, api_type),
             region_name='pydantic-ai-gateway',  # Fake region name to avoid NoRegionError
         )
-    elif upstream_provider in ('google-vertex', 'gemini'):
+    elif api_type in 'gemini':
         from .google import GoogleProvider
 
         return GoogleProvider(
             vertexai=True,
             api_key=api_key,
-            base_url=_merge_url_path(base_url, 'google-vertex'),
+            base_url=_merge_url_path(base_url, 'gemini'),
             http_client=http_client,
         )
     else:
-        raise UserError(f'Unknown upstream provider: {upstream_provider}')
+        raise UserError(f'Unknown API type: {api_type}')
 
 
 def _request_hook(api_key: str) -> Callable[[httpx.Request], Awaitable[httpx.Request]]:

tests/models/cassettes/test_model_names/test_known_model_names.yaml

@@ -13,7 +13,7 @@ interactions:
   response:
     headers:
       content-length:
-      - '760'
+      - '1080'
       content-security-policy:
       - default-src 'none'; frame-ancestors 'none'
       content-type:
@@ -25,6 +25,12 @@ interactions:
       strict-transport-security:
       - max-age=63072000
     parsed_body:
+    - model_id: amazon-rerank-1-0
+      regions:
+      - eu
+      - us
+      type:
+      - text-to-text
     - model_id: claude-3-5-haiku
       regions:
       - us
@@ -46,6 +52,18 @@ interactions:
       - eu
       type:
       - text-to-text
+    - model_id: claude-4-5-haiku
+      regions:
+      - eu
+      - us
+      type:
+      - text-to-text
+    - model_id: claude-4-5-sonnet
+      regions:
+      - eu
+      - us
+      type:
+      - text-to-text
     - model_id: claude-4-sonnet
       regions:
       - eu
@@ -58,8 +76,15 @@ interactions:
       - us
       type:
       - text-to-embedding
+    - model_id: cohere-rerank-3-5
+      regions:
+      - eu
+      - us
+      type:
+      - text-to-text
     - model_id: gpt-oss-120b
       regions:
+      - eu
       - us
       type:
       - text-to-text
@@ -99,7 +124,7 @@ interactions:
       alt-svc:
       - h3=":443"; ma=86400
       content-length:
-      - '762'
+      - '570'
       content-type:
       - application/json
       referrer-policy:
@@ -109,41 +134,33 @@ interactions:
     parsed_body:
       data:
       - created: 0
-        id: llama-4-scout-17b-16e-instruct
+        id: zai-glm-4.6
         object: model
         owned_by: Cerebras
       - created: 0
-        id: qwen-3-32b
+        id: qwen-3-235b-a22b-instruct-2507
         object: model
         owned_by: Cerebras
       - created: 0
         id: llama-3.3-70b
         object: model
         owned_by: Cerebras
       - created: 0
-        id: qwen-3-235b-a22b-instruct-2507
-        object: model
-        owned_by: Cerebras
-      - created: 0
-        id: llama-4-maverick-17b-128e-instruct
+        id: gpt-oss-120b
         object: model
         owned_by: Cerebras
       - created: 0
-        id: qwen-3-coder-480b
+        id: qwen-3-32b
         object: model
         owned_by: Cerebras
       - created: 0
-        id: gpt-oss-120b
+        id: llama3.1-8b
         object: model
         owned_by: Cerebras
       - created: 0
         id: qwen-3-235b-a22b-thinking-2507
         object: model
         owned_by: Cerebras
-      - created: 0
-        id: llama3.1-8b
-        object: model
-        owned_by: Cerebras
       object: list
     status:
       code: 200

tests/providers/cassettes/test_gateway/test_gateway_provider_with_bedrock.yaml

@@ -5,7 +5,7 @@ interactions:
     headers:
       amz-sdk-invocation-id:
       - !!binary |
-        MWYwNDlkMTQtMjVmMC00YTRhLWJhYmMtNTQ0MDdhMmRlNjgw
+        MmEzMzkzMGUtNzI3YS00YzFhLWFmYWQtYzFhYWMyMTI3NDlj
       amz-sdk-request:
       - !!binary |
         YXR0ZW1wdD0x
@@ -15,7 +15,7 @@ interactions:
       - !!binary |
         YXBwbGljYXRpb24vanNvbg==
     method: POST
-    uri: http://localhost:8787/bedrock/model/amazon.nova-micro-v1%3A0/converse
+    uri: http://localhost:8787/converse/model/amazon.nova-micro-v1%3A0/converse
   response:
     headers:
       content-length:
@@ -26,7 +26,7 @@ interactions:
       - 0.0000USD
     parsed_body:
       metrics:
-        latencyMs: 668
+        latencyMs: 682
       output:
         message:
           content: