Merge branch 'master' into webb/populate-tox/transitive-dependencies

Author: alexander-alderman-webb

sentry_sdk/integrations/pydantic_ai/__init__.py

@@ -1,7 +1,7 @@
 import functools
 
 from sentry_sdk.integrations import DidNotEnable, Integration
-from sentry_sdk.utils import capture_internal_exceptions
+from sentry_sdk.utils import capture_internal_exceptions, parse_version
 
 try:
     import pydantic_ai  # type: ignore # noqa: F401
@@ -10,6 +10,7 @@
     raise DidNotEnable("pydantic-ai not installed")
 
 
+from importlib.metadata import PackageNotFoundError, version
 from typing import TYPE_CHECKING
 
 from .patches import (
@@ -128,7 +129,7 @@ class PydanticAIIntegration(Integration):
 
     identifier = "pydantic_ai"
     origin = f"auto.ai.{identifier}"
-    are_request_hooks_available = True
+    using_request_hooks = False
 
     def __init__(
         self, include_prompts: bool = True, handled_tool_call_exceptions: bool = True
@@ -158,15 +159,29 @@ def setup_once() -> None:
         _patch_agent_run()
         _patch_tool_execution()
 
+        PydanticAIIntegration.using_request_hooks = False
         try:
-            from pydantic_ai.capabilities import Hooks
-        except ImportError:
-            Hooks = None
-            PydanticAIIntegration.are_request_hooks_available = False
+            PYDANTIC_AI_VERSION = version("pydantic-ai-slim")
+        except PackageNotFoundError:
+            return
+
+        PYDANTIC_AI_VERSION = parse_version(PYDANTIC_AI_VERSION)
+        if PYDANTIC_AI_VERSION is None:
+            return
 
-        if Hooks is None:
+        # ModelRequestContext.model added in https://github.com/pydantic/pydantic-ai/commit/f1260dfe09907f17688eee1646daf898fc428d4c
+        if PYDANTIC_AI_VERSION < (
+            1,
+            73,
+        ):
             _patch_graph_nodes()
             return
 
+        try:
+            from pydantic_ai.capabilities import Hooks
+        except ImportError:
+            return
+
+        PydanticAIIntegration.using_request_hooks = True
         hooks = Hooks()
         register_hooks(hooks)

sentry_sdk/integrations/pydantic_ai/patches/agent_run.py

@@ -109,7 +109,7 @@ async def wrapper(self: "Any", *args: "Any", **kwargs: "Any") -> "Any":
             model = kwargs.get("model")
             model_settings = kwargs.get("model_settings")
 
-            if PydanticAIIntegration.are_request_hooks_available:
+            if PydanticAIIntegration.using_request_hooks:
                 metadata = kwargs.get("metadata")
                 if metadata is None:
                     kwargs["metadata"] = {"_sentry_span": None}
@@ -158,7 +158,7 @@ def wrapper(self: "Any", *args: "Any", **kwargs: "Any") -> "Any":
         model = kwargs.get("model")
         model_settings = kwargs.get("model_settings")
 
-        if PydanticAIIntegration.are_request_hooks_available:
+        if PydanticAIIntegration.using_request_hooks:
             metadata = kwargs.get("metadata")
             if metadata is None:
                 kwargs["metadata"] = {"_sentry_span": None}