pydantic-ai-slim 0.0.38__tar.gz → 0.0.39__tar.gz

{pydantic_ai_slim-0.0.38 → pydantic_ai_slim-0.0.39}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pydantic-ai-slim
-Version: 0.0.38
+Version: 0.0.39
 Summary: Agent Framework / shim to use Pydantic with LLMs, slim package
 Author-email: Samuel Colvin <samuel@pydantic.dev>
 License-Expression: MIT
@@ -29,7 +29,7 @@ Requires-Dist: exceptiongroup; python_version < '3.11'
 Requires-Dist: griffe>=1.3.2
 Requires-Dist: httpx>=0.27
 Requires-Dist: opentelemetry-api>=1.28.0
-Requires-Dist: pydantic-graph==0.0.38
+Requires-Dist: pydantic-graph==0.0.39
 Requires-Dist: pydantic>=2.10
 Requires-Dist: typing-inspection>=0.4.0
 Provides-Extra: anthropic

{pydantic_ai_slim-0.0.38 → pydantic_ai_slim-0.0.39}/pydantic_ai/models/bedrock.py

@@ -10,7 +10,6 @@ from typing import TYPE_CHECKING, Generic, Literal, Union, cast, overload
 
 import anyio
 import anyio.to_thread
-from mypy_boto3_bedrock_runtime.type_defs import ImageBlockTypeDef
 from typing_extensions import ParamSpec, assert_never
 
 from pydantic_ai import _utils, result
@@ -46,6 +45,7 @@ if TYPE_CHECKING:
         ConverseResponseTypeDef,
         ConverseStreamMetadataEventTypeDef,
         ConverseStreamOutputTypeDef,
+        ImageBlockTypeDef,
         InferenceConfigurationTypeDef,
         MessageUnionTypeDef,
         ToolChoiceTypeDef,

{pydantic_ai_slim-0.0.38 → pydantic_ai_slim-0.0.39}/pydantic_ai/models/groq.py

@@ -9,7 +9,7 @@ from itertools import chain
 from typing import Literal, Union, cast, overload
 
 from httpx import AsyncClient as AsyncHTTPClient
-from typing_extensions import assert_never
+from typing_extensions import assert_never, deprecated
 
 from .. import ModelHTTPError, UnexpectedModelBehavior, _utils, usage
 from .._utils import guard_tool_call_id as _guard_tool_call_id
@@ -29,15 +29,10 @@ from ..messages import (
     ToolReturnPart,
     UserPromptPart,
 )
+from ..providers import Provider, infer_provider
 from ..settings import ModelSettings
 from ..tools import ToolDefinition
-from . import (
-    Model,
-    ModelRequestParameters,
-    StreamedResponse,
-    cached_async_http_client,
-    check_allow_model_requests,
-)
+from . import Model, ModelRequestParameters, StreamedResponse, cached_async_http_client, check_allow_model_requests
 
 try:
     from groq import NOT_GIVEN, APIStatusError, AsyncGroq, AsyncStream
@@ -49,6 +44,7 @@ except ImportError as _import_error:
         "you can use the `groq` optional group — `pip install 'pydantic-ai-slim[groq]'`"
     ) from _import_error
 
+
 LatestGroqModelNames = Literal[
     'llama-3.3-70b-versatile',
     'llama-3.3-70b-specdec',
@@ -94,10 +90,31 @@ class GroqModel(Model):
     _model_name: GroqModelName = field(repr=False)
     _system: str | None = field(default='groq', repr=False)
 
+    @overload
+    def __init__(
+        self,
+        model_name: GroqModelName,
+        *,
+        provider: Literal['groq'] | Provider[AsyncGroq] = 'groq',
+    ) -> None: ...
+
+    @deprecated('Use the `provider` parameter instead of `api_key`, `groq_client`, and `http_client`.')
+    @overload
+    def __init__(
+        self,
+        model_name: GroqModelName,
+        *,
+        provider: None = None,
+        api_key: str | None = None,
+        groq_client: AsyncGroq | None = None,
+        http_client: AsyncHTTPClient | None = None,
+    ) -> None: ...
+
     def __init__(
         self,
         model_name: GroqModelName,
         *,
+        provider: Literal['groq'] | Provider[AsyncGroq] | None = None,
         api_key: str | None = None,
         groq_client: AsyncGroq | None = None,
         http_client: AsyncHTTPClient | None = None,
@@ -107,6 +124,9 @@ class GroqModel(Model):
         Args:
             model_name: The name of the Groq model to use. List of model names available
                 [here](https://console.groq.com/docs/models).
+            provider: The provider to use for authentication and API access. Can be either the string
+                'groq' or an instance of `Provider[AsyncGroq]`. If not provided, a new provider will be
+                created using the other parameters.
             api_key: The API key to use for authentication, if not provided, the `GROQ_API_KEY` environment variable
                 will be used if available.
             groq_client: An existing
@@ -115,7 +135,13 @@ class GroqModel(Model):
             http_client: An existing `httpx.AsyncClient` to use for making HTTP requests.
         """
         self._model_name = model_name
-        if groq_client is not None:
+
+        if provider is not None:
+            if isinstance(provider, str):
+                self.client = infer_provider(provider).client
+            else:
+                self.client = provider.client
+        elif groq_client is not None:
             assert http_client is None, 'Cannot provide both `groq_client` and `http_client`'
             assert api_key is None, 'Cannot provide both `groq_client` and `api_key`'
             self.client = groq_client

{pydantic_ai_slim-0.0.38 → pydantic_ai_slim-0.0.39}/pydantic_ai/providers/__init__.py

@@ -65,5 +65,9 @@ def infer_provider(provider: str) -> Provider[Any]:
         from .bedrock import BedrockProvider
 
         return BedrockProvider()
+    elif provider == 'groq':
+        from .groq import GroqProvider
+
+        return GroqProvider()
     else:  # pragma: no cover
         raise ValueError(f'Unknown provider: {provider}')

pydantic_ai_slim-0.0.39/pydantic_ai/providers/groq.py

@@ -0,0 +1,75 @@
+from __future__ import annotations as _annotations
+
+import os
+from typing import overload
+
+from httpx import AsyncClient as AsyncHTTPClient
+
+from pydantic_ai.models import cached_async_http_client
+
+try:
+    from groq import AsyncGroq
+except ImportError as _import_error:  # pragma: no cover
+    raise ImportError(
+        'Please install `groq` to use the Groq provider, '
+        "you can use the `groq` optional group — `pip install 'pydantic-ai-slim[groq]'`"
+    ) from _import_error
+
+
+from . import Provider
+
+
+class GroqProvider(Provider[AsyncGroq]):
+    """Provider for Groq API."""
+
+    @property
+    def name(self) -> str:
+        return 'groq'
+
+    @property
+    def base_url(self) -> str:
+        return os.environ.get('GROQ_BASE_URL', 'https://api.groq.com')
+
+    @property
+    def client(self) -> AsyncGroq:
+        return self._client
+
+    @overload
+    def __init__(self, *, groq_client: AsyncGroq | None = None) -> None: ...
+
+    @overload
+    def __init__(self, *, api_key: str | None = None, http_client: AsyncHTTPClient | None = None) -> None: ...
+
+    def __init__(
+        self,
+        *,
+        api_key: str | None = None,
+        groq_client: AsyncGroq | None = None,
+        http_client: AsyncHTTPClient | None = None,
+    ) -> None:
+        """Create a new Groq provider.
+
+        Args:
+            api_key: The API key to use for authentication, if not provided, the `GROQ_API_KEY` environment variable
+                will be used if available.
+            groq_client: An existing
+                [`AsyncGroq`](https://github.com/groq/groq-python?tab=readme-ov-file#async-usage)
+                client to use. If provided, `api_key` and `http_client` must be `None`.
+            http_client: An existing `AsyncHTTPClient` to use for making HTTP requests.
+        """
+        api_key = api_key or os.environ.get('GROQ_API_KEY')
+
+        if api_key is None and groq_client is None:
+            raise ValueError(
+                'Set the `GROQ_API_KEY` environment variable or pass it via `GroqProvider(api_key=...)`'
+                'to use the Groq provider.'
+            )
+
+        if groq_client is not None:
+            assert http_client is None, 'Cannot provide both `groq_client` and `http_client`'
+            assert api_key is None, 'Cannot provide both `groq_client` and `api_key`'
+            self._client = groq_client
+        elif http_client is not None:
+            self._client = AsyncGroq(base_url=self.base_url, api_key=api_key, http_client=http_client)
+        else:
+            self._client = AsyncGroq(base_url=self.base_url, api_key=api_key, http_client=cached_async_http_client())

{pydantic_ai_slim-0.0.38 → pydantic_ai_slim-0.0.39}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "pydantic-ai-slim"
-version = "0.0.38"
+version = "0.0.39"
 description = "Agent Framework / shim to use Pydantic with LLMs, slim package"
 authors = [{ name = "Samuel Colvin", email = "samuel@pydantic.dev" }]
 license = "MIT"
@@ -36,7 +36,7 @@ dependencies = [
     "griffe>=1.3.2",
     "httpx>=0.27",
     "pydantic>=2.10",
-    "pydantic-graph==0.0.38",
+    "pydantic-graph==0.0.39",
     "exceptiongroup; python_version < '3.11'",
     "opentelemetry-api>=1.28.0",
     "typing-inspection>=0.4.0",