pydantic-ai-slim 0.0.36__tar.gz → 0.0.37__tar.gz

{pydantic_ai_slim-0.0.36 → pydantic_ai_slim-0.0.37}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pydantic-ai-slim
-Version: 0.0.36
+Version: 0.0.37
 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.36
+Requires-Dist: pydantic-graph==0.0.37
 Requires-Dist: pydantic>=2.10
 Requires-Dist: typing-inspection>=0.4.0
 Provides-Extra: anthropic

{pydantic_ai_slim-0.0.36 → pydantic_ai_slim-0.0.37}/pydantic_ai/agent.py

@@ -922,6 +922,7 @@ class Agent(Generic[AgentDepsT, ResultDataT]):
         self,
         /,
         *,
+        name: str | None = None,
         retries: int | None = None,
         prepare: ToolPrepareFunc[AgentDepsT] | None = None,
         docstring_format: DocstringFormat = 'auto',
@@ -933,6 +934,7 @@ class Agent(Generic[AgentDepsT, ResultDataT]):
         func: ToolFuncContext[AgentDepsT, ToolParams] | None = None,
         /,
         *,
+        name: str | None = None,
         retries: int | None = None,
         prepare: ToolPrepareFunc[AgentDepsT] | None = None,
         docstring_format: DocstringFormat = 'auto',
@@ -969,6 +971,7 @@ class Agent(Generic[AgentDepsT, ResultDataT]):
 
         Args:
             func: The tool function to register.
+            name: The name of the tool, defaults to the function name.
             retries: The number of retries to allow for this tool, defaults to the agent's default retries,
                 which defaults to 1.
             prepare: custom method to prepare the tool definition for each step, return `None` to omit this
@@ -984,13 +987,17 @@ class Agent(Generic[AgentDepsT, ResultDataT]):
                 func_: ToolFuncContext[AgentDepsT, ToolParams],
             ) -> ToolFuncContext[AgentDepsT, ToolParams]:
                 # noinspection PyTypeChecker
-                self._register_function(func_, True, retries, prepare, docstring_format, require_parameter_descriptions)
+                self._register_function(
+                    func_, True, name, retries, prepare, docstring_format, require_parameter_descriptions
+                )
                 return func_
 
             return tool_decorator
         else:
             # noinspection PyTypeChecker
-            self._register_function(func, True, retries, prepare, docstring_format, require_parameter_descriptions)
+            self._register_function(
+                func, True, name, retries, prepare, docstring_format, require_parameter_descriptions
+            )
             return func
 
     @overload
@@ -1001,6 +1008,7 @@ class Agent(Generic[AgentDepsT, ResultDataT]):
         self,
         /,
         *,
+        name: str | None = None,
         retries: int | None = None,
         prepare: ToolPrepareFunc[AgentDepsT] | None = None,
         docstring_format: DocstringFormat = 'auto',
@@ -1012,6 +1020,7 @@ class Agent(Generic[AgentDepsT, ResultDataT]):
         func: ToolFuncPlain[ToolParams] | None = None,
         /,
         *,
+        name: str | None = None,
         retries: int | None = None,
         prepare: ToolPrepareFunc[AgentDepsT] | None = None,
         docstring_format: DocstringFormat = 'auto',
@@ -1048,6 +1057,7 @@ class Agent(Generic[AgentDepsT, ResultDataT]):
 
         Args:
             func: The tool function to register.
+            name: The name of the tool, defaults to the function name.
             retries: The number of retries to allow for this tool, defaults to the agent's default retries,
                 which defaults to 1.
             prepare: custom method to prepare the tool definition for each step, return `None` to omit this
@@ -1062,19 +1072,22 @@ class Agent(Generic[AgentDepsT, ResultDataT]):
             def tool_decorator(func_: ToolFuncPlain[ToolParams]) -> ToolFuncPlain[ToolParams]:
                 # noinspection PyTypeChecker
                 self._register_function(
-                    func_, False, retries, prepare, docstring_format, require_parameter_descriptions
+                    func_, False, name, retries, prepare, docstring_format, require_parameter_descriptions
                 )
                 return func_
 
             return tool_decorator
         else:
-            self._register_function(func, False, retries, prepare, docstring_format, require_parameter_descriptions)
+            self._register_function(
+                func, False, name, retries, prepare, docstring_format, require_parameter_descriptions
+            )
             return func
 
     def _register_function(
         self,
         func: ToolFuncEither[AgentDepsT, ToolParams],
         takes_ctx: bool,
+        name: str | None,
         retries: int | None,
         prepare: ToolPrepareFunc[AgentDepsT] | None,
         docstring_format: DocstringFormat,
@@ -1085,6 +1098,7 @@ class Agent(Generic[AgentDepsT, ResultDataT]):
         tool = Tool[AgentDepsT](
             func,
             takes_ctx=takes_ctx,
+            name=name,
             max_retries=retries_,
             prepare=prepare,
             docstring_format=docstring_format,

{pydantic_ai_slim-0.0.36 → pydantic_ai_slim-0.0.37}/pydantic_ai/messages.py

@@ -395,7 +395,9 @@ class ModelResponse:
 ModelMessage = Annotated[Union[ModelRequest, ModelResponse], pydantic.Discriminator('kind')]
 """Any message sent to or returned by a model."""
 
-ModelMessagesTypeAdapter = pydantic.TypeAdapter(list[ModelMessage], config=pydantic.ConfigDict(defer_build=True))
+ModelMessagesTypeAdapter = pydantic.TypeAdapter(
+    list[ModelMessage], config=pydantic.ConfigDict(defer_build=True, ser_json_bytes='base64')
+)
 """Pydantic [`TypeAdapter`][pydantic.type_adapter.TypeAdapter] for (de)serializing messages."""
 
 

{pydantic_ai_slim-0.0.36 → pydantic_ai_slim-0.0.37}/pydantic_ai/models/__init__.py

@@ -266,6 +266,11 @@ class Model(ABC):
         """The system / model provider, ex: openai."""
         raise NotImplementedError()
 
+    @property
+    def base_url(self) -> str | None:
+        """The base URL for the provider API, if available."""
+        return None
+
 
 @dataclass
 class StreamedResponse(ABC):

{pydantic_ai_slim-0.0.36 → pydantic_ai_slim-0.0.37}/pydantic_ai/models/anthropic.py

@@ -143,6 +143,10 @@ class AnthropicModel(Model):
         else:
             self.client = AsyncAnthropic(api_key=api_key, http_client=cached_async_http_client())
 
+    @property
+    def base_url(self) -> str:
+        return str(self.client.base_url)
+
     async def request(
         self,
         messages: list[ModelMessage],

{pydantic_ai_slim-0.0.36 → pydantic_ai_slim-0.0.37}/pydantic_ai/models/bedrock.py

@@ -162,6 +162,10 @@ class BedrockConverseModel(Model):
             }
         }
 
+    @property
+    def base_url(self) -> str:
+        return str(self.client.meta.endpoint_url)
+
     async def request(
         self,
         messages: list[ModelMessage],

{pydantic_ai_slim-0.0.36 → pydantic_ai_slim-0.0.37}/pydantic_ai/models/cohere.py

@@ -127,6 +127,11 @@ class CohereModel(Model):
         else:
             self.client = AsyncClientV2(api_key=api_key, httpx_client=http_client)
 
+    @property
+    def base_url(self) -> str:
+        client_wrapper = self.client._client_wrapper  # type: ignore
+        return str(client_wrapper.get_base_url())
+
     async def request(
         self,
         messages: list[ModelMessage],

{pydantic_ai_slim-0.0.36 → pydantic_ai_slim-0.0.37}/pydantic_ai/models/fallback.py

@@ -106,6 +106,10 @@ class FallbackModel(Model):
         """The system / model provider, n/a for fallback models."""
         return None
 
+    @property
+    def base_url(self) -> str | None:
+        return self.models[0].base_url
+
 
 def _default_fallback_condition_factory(exceptions: tuple[type[Exception], ...]) -> Callable[[Exception], bool]:
     """Create a default fallback condition for the given exceptions."""

{pydantic_ai_slim-0.0.36 → pydantic_ai_slim-0.0.37}/pydantic_ai/models/gemini.py

@@ -143,6 +143,7 @@ class GeminiModel(Model):
             else:
                 self._system = provider.name
                 self.client = provider.client
+            self._url = str(self.client.base_url)
         else:
             if api_key is None:
                 if env_api_key := os.getenv('GEMINI_API_KEY'):
@@ -159,7 +160,7 @@ class GeminiModel(Model):
         return self._auth
 
     @property
-    def url(self) -> str:
+    def base_url(self) -> str:
         assert self._url is not None, 'URL not initialized'
         return self._url
 
@@ -257,7 +258,7 @@ class GeminiModel(Model):
             'User-Agent': get_user_agent(),
         }
         if self._provider is None:  # pragma: no cover
-            url = self.url + ('streamGenerateContent' if streamed else 'generateContent')
+            url = self.base_url + ('streamGenerateContent' if streamed else 'generateContent')
             headers.update(await self.auth.headers())
         else:
             url = f'/{self._model_name}:{"streamGenerateContent" if streamed else "generateContent"}'

{pydantic_ai_slim-0.0.36 → pydantic_ai_slim-0.0.37}/pydantic_ai/models/groq.py

@@ -123,6 +123,10 @@ class GroqModel(Model):
         else:
             self.client = AsyncGroq(api_key=api_key, http_client=cached_async_http_client())
 
+    @property
+    def base_url(self) -> str:
+        return str(self.client.base_url)
+
     async def request(
         self,
         messages: list[ModelMessage],

{pydantic_ai_slim-0.0.36 → pydantic_ai_slim-0.0.37}/pydantic_ai/models/instrumented.py

@@ -5,6 +5,7 @@ from collections.abc import AsyncIterator, Iterator, Mapping
 from contextlib import asynccontextmanager, contextmanager
 from dataclasses import dataclass, field
 from typing import Any, Callable, Literal
+from urllib.parse import urlparse
 
 from opentelemetry._events import Event, EventLogger, EventLoggerProvider, get_event_logger_provider
 from opentelemetry.trace import Span, Tracer, TracerProvider, get_tracer_provider
@@ -142,8 +143,6 @@ class InstrumentedModel(WrapperModel):
         system = getattr(self.wrapped, 'system', '') or self.wrapped.__class__.__name__.removesuffix('Model').lower()
         system = {'google-gla': 'gemini', 'google-vertex': 'vertex_ai', 'mistral': 'mistral_ai'}.get(system, system)
         # TODO Missing attributes:
-        #  - server.address: requires a Model.base_url abstract method or similar
-        #  - server.port: to parse from the base_url
         #  - error.type: unclear if we should do something here or just always rely on span exceptions
         #  - gen_ai.request.stop_sequences/top_k: model_settings doesn't include these
         attributes: dict[str, AttributeValue] = {
@@ -151,6 +150,15 @@ class InstrumentedModel(WrapperModel):
             'gen_ai.system': system,
             'gen_ai.request.model': model_name,
         }
+        if base_url := self.wrapped.base_url:
+            try:
+                parsed = urlparse(base_url)
+                if parsed.hostname:
+                    attributes['server.address'] = parsed.hostname
+                if parsed.port:
+                    attributes['server.port'] = parsed.port
+            except Exception:  # pragma: no cover
+                pass
 
         if model_settings:
             for key in MODEL_SETTING_ATTRIBUTES:

{pydantic_ai_slim-0.0.36 → pydantic_ai_slim-0.0.37}/pydantic_ai/models/mistral.py

@@ -140,6 +140,10 @@ class MistralModel(Model):
             api_key = os.getenv('MISTRAL_API_KEY') if api_key is None else api_key
             self.client = Mistral(api_key=api_key, async_client=http_client or cached_async_http_client())
 
+    @property
+    def base_url(self) -> str:
+        return str(self.client.sdk_configuration.get_server_details()[0])
+
     async def request(
         self,
         messages: list[ModelMessage],

{pydantic_ai_slim-0.0.36 → pydantic_ai_slim-0.0.37}/pydantic_ai/models/openai.py

@@ -187,6 +187,10 @@ class OpenAIModel(Model):
         self.system_prompt_role = system_prompt_role
         self._system = system
 
+    @property
+    def base_url(self) -> str:
+        return str(self.client.base_url)
+
     async def request(
         self,
         messages: list[ModelMessage],

{pydantic_ai_slim-0.0.36 → pydantic_ai_slim-0.0.37}/pydantic_ai/providers/google_vertex.py

@@ -1,10 +1,10 @@
 from __future__ import annotations as _annotations
 
 import functools
-from collections.abc import AsyncGenerator
+from collections.abc import AsyncGenerator, Mapping
 from datetime import datetime, timedelta
 from pathlib import Path
-from typing import Literal
+from typing import Literal, overload
 
 import anyio.to_thread
 import httpx
@@ -52,19 +52,45 @@ class GoogleVertexProvider(Provider[httpx.AsyncClient]):
     def client(self) -> httpx.AsyncClient:
         return self._client
 
+    @overload
     def __init__(
         self,
+        *,
         service_account_file: Path | str | None = None,
         project_id: str | None = None,
         region: VertexAiRegion = 'us-central1',
         model_publisher: str = 'google',
         http_client: httpx.AsyncClient | None = None,
+    ) -> None: ...
+
+    @overload
+    def __init__(
+        self,
+        *,
+        service_account_info: Mapping[str, str] | None = None,
+        project_id: str | None = None,
+        region: VertexAiRegion = 'us-central1',
+        model_publisher: str = 'google',
+        http_client: httpx.AsyncClient | None = None,
+    ) -> None: ...
+
+    def __init__(
+        self,
+        *,
+        service_account_file: Path | str | None = None,
+        service_account_info: Mapping[str, str] | None = None,
+        project_id: str | None = None,
+        region: VertexAiRegion = 'us-central1',
+        model_publisher: str = 'google',
+        http_client: httpx.AsyncClient | None = None,
     ) -> None:
         """Create a new Vertex AI provider.
 
         Args:
             service_account_file: Path to a service account file.
-                If not provided, the default environment credentials will be used.
+                If not provided, the service_account_info or default environment credentials will be used.
+            service_account_info: The loaded service_account_file contents.
+                If not provided, the service_account_file or default environment credentials will be used.
             project_id: The project ID to use, if not provided it will be taken from the credentials.
             region: The region to make requests to.
             model_publisher: The model publisher to use, I couldn't find a good list of available publishers,
@@ -73,13 +99,17 @@ class GoogleVertexProvider(Provider[httpx.AsyncClient]):
                 Please create an issue or PR if you know how to use other publishers.
             http_client: An existing `httpx.AsyncClient` to use for making HTTP requests.
         """
+        if service_account_file and service_account_info:
+            raise ValueError('Only one of `service_account_file` or `service_account_info` can be provided.')
+
         self._client = http_client or cached_async_http_client()
         self.service_account_file = service_account_file
+        self.service_account_info = service_account_info
         self.project_id = project_id
         self.region = region
         self.model_publisher = model_publisher
 
-        self._client.auth = _VertexAIAuth(service_account_file, project_id, region)
+        self._client.auth = _VertexAIAuth(service_account_file, service_account_info, project_id, region)
         self._client.base_url = self.base_url
 
 
@@ -91,10 +121,12 @@ class _VertexAIAuth(httpx.Auth):
     def __init__(
         self,
         service_account_file: Path | str | None = None,
+        service_account_info: Mapping[str, str] | None = None,
         project_id: str | None = None,
         region: VertexAiRegion = 'us-central1',
     ) -> None:
         self.service_account_file = service_account_file
+        self.service_account_info = service_account_info
         self.project_id = project_id
         self.region = region
 
@@ -119,6 +151,11 @@ class _VertexAIAuth(httpx.Auth):
             assert creds.project_id is None or isinstance(creds.project_id, str)  # type: ignore[reportUnknownMemberType]
             creds_project_id: str | None = creds.project_id
             creds_source = 'service account file'
+        elif self.service_account_info is not None:
+            creds = await _creds_from_info(self.service_account_info)
+            assert creds.project_id is None or isinstance(creds.project_id, str)  # type: ignore[reportUnknownMemberType]
+            creds_project_id: str | None = creds.project_id
+            creds_source = 'service account info'
         else:
             creds, creds_project_id = await _async_google_auth()
             creds_source = '`google.auth.default()`'
@@ -154,6 +191,14 @@ async def _creds_from_file(service_account_file: str | Path) -> ServiceAccountCr
     return await anyio.to_thread.run_sync(service_account_credentials_from_file, str(service_account_file))
 
 
+async def _creds_from_info(service_account_info: Mapping[str, str]) -> ServiceAccountCredentials:
+    service_account_credentials_from_string = functools.partial(
+        ServiceAccountCredentials.from_service_account_info,  # type: ignore[reportUnknownMemberType]
+        scopes=['https://www.googleapis.com/auth/cloud-platform'],
+    )
+    return await anyio.to_thread.run_sync(service_account_credentials_from_string, service_account_info)
+
+
 VertexAiRegion = Literal[
     'asia-east1',
     'asia-east2',

{pydantic_ai_slim-0.0.36 → pydantic_ai_slim-0.0.37}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "pydantic-ai-slim"
-version = "0.0.36"
+version = "0.0.37"
 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.36",
+    "pydantic-graph==0.0.37",
     "exceptiongroup; python_version < '3.11'",
     "opentelemetry-api>=1.28.0",
     "typing-inspection>=0.4.0",