Merge branch 'pydantic:main' into qian/dbos-agent

Author: qianl15

docs/graph.md

@@ -352,7 +352,7 @@ stateDiagram-v2
   Feedback --> [*]
 ```
 
-```python {title="genai_email_feedback.py" py="3.10" test="ci_only"}
+```python {title="genai_email_feedback.py" py="3.10"}
 from __future__ import annotations as _annotations
 
 from dataclasses import dataclass, field
@@ -384,7 +384,7 @@ class State:
 
 
 email_writer_agent = Agent(
-    'google-vertex:gemini-1.5-pro',
+    'google-gla:gemini-1.5-pro',
     output_type=Email,
     system_prompt='Write a welcome email to our tech blog.',
 )

pydantic_ai_slim/pydantic_ai/models/mistral.py

@@ -79,7 +79,7 @@
     from mistralai.models.usermessage import UserMessage as MistralUserMessage
     from mistralai.types.basemodel import Unset as MistralUnset
     from mistralai.utils.eventstreaming import EventStreamAsync as MistralEventStreamAsync
-except ImportError as e:  # pragma: no cover
+except ImportError as e:
     raise ImportError(
         'Please install `mistral` to use the Mistral model, '
         'you can use the `mistral` optional group — `pip install "pydantic-ai-slim[mistral]"`'

pydantic_evals/pydantic_evals/dataset.py

@@ -50,16 +50,6 @@
 else:
     ExceptionGroup = ExceptionGroup  # pragma: lax no cover
 
-# while waiting for https://github.com/pydantic/logfire/issues/745
-try:
-    import logfire._internal.stack_info
-except ImportError:
-    pass
-else:
-    from pathlib import Path
-
-    logfire._internal.stack_info.NON_USER_CODE_PREFIXES += (str(Path(__file__).parent.absolute()),)  # pyright: ignore[reportPrivateImportUsage]
-
 __all__ = (
     'Case',
     'Dataset',

pydantic_graph/pydantic_graph/graph.py

@@ -6,6 +6,7 @@
 from contextlib import AbstractContextManager, ExitStack, asynccontextmanager
 from dataclasses import dataclass, field
 from functools import cached_property
+from pathlib import Path
 from typing import Any, Generic, cast, overload
 
 import logfire_api
@@ -18,17 +19,6 @@
 from .persistence import BaseStatePersistence
 from .persistence.in_mem import SimpleStatePersistence
 
-# while waiting for https://github.com/pydantic/logfire/issues/745
-try:
-    import logfire._internal.stack_info
-except ImportError:
-    pass
-else:
-    from pathlib import Path
-
-    logfire._internal.stack_info.NON_USER_CODE_PREFIXES += (str(Path(__file__).parent.absolute()),)  # pyright: ignore[reportPrivateImportUsage]
-
-
 __all__ = 'Graph', 'GraphRun', 'GraphRunResult'
 
 _logfire = logfire_api.Logfire(otel_scope='pydantic-graph')

tests/conftest.py

@@ -414,7 +414,7 @@ def bedrock_provider():
         pytest.skip('boto3 is not installed')
 
 
-@pytest.fixture(autouse=True)
+@pytest.fixture()
 def vertex_provider_auth(mocker: MockerFixture) -> None:  # pragma: lax no cover
     # Locally, we authenticate via `gcloud` CLI, so we don't need to patch anything.
     if not os.getenv('CI', False):
@@ -423,7 +423,7 @@ def vertex_provider_auth(mocker: MockerFixture) -> None:  # pragma: lax no cover
     try:
         from google.genai import _api_client
     except ImportError:
-        pytest.skip('google is not installed')
+        return  # do nothing if this isn't installed
 
     @dataclass
     class NoOpCredentials:
@@ -440,7 +440,7 @@ def expired(self) -> bool:
 
 
 @pytest.fixture()
-async def vertex_provider():  # pragma: lax no cover
+async def vertex_provider(vertex_provider_auth: None):  # pragma: lax no cover
     # NOTE: You need to comment out this line to rewrite the cassettes locally.
     if not os.getenv('CI', False):
         pytest.skip('Requires properly configured local google vertex config to pass')

tests/models/test_google.py

@@ -1113,9 +1113,10 @@ async def test_google_url_input(
     not os.getenv('CI', False), reason='Requires properly configured local google vertex config to pass'
 )
 @pytest.mark.vcr()
-async def test_google_url_input_force_download(allow_model_requests: None) -> None:  # pragma: lax no cover
-    provider = GoogleProvider(project='pydantic-ai', location='us-central1')
-    m = GoogleModel('gemini-2.0-flash', provider=provider)
+async def test_google_url_input_force_download(
+    allow_model_requests: None, vertex_provider: GoogleProvider
+) -> None:  # pragma: lax no cover
+    m = GoogleModel('gemini-2.0-flash', provider=vertex_provider)
     agent = Agent(m)
 
     video_url = VideoUrl(url='https://data.grepit.app/assets/tiny_video.mp4', force_download=True)

tests/test_examples.py

@@ -113,6 +113,7 @@ def test_docs_examples(  # noqa: C901
     allow_model_requests: None,
     env: TestEnv,
     tmp_path_cwd: Path,
+    vertex_provider_auth: None,
 ):
     mocker.patch('pydantic_ai.agent.models.infer_model', side_effect=mock_infer_model)
     mocker.patch('pydantic_ai._utils.group_by_temporal', side_effect=mock_group_by_temporal)