Merge branch 'master' into ivana/migrate-asgi-event-processor

Author: sentrivana

sentry_sdk/integrations/pydantic_ai/patches/tools.py

@@ -14,7 +14,11 @@
     from typing import Any
 
 try:
-    from pydantic_ai._tool_manager import ToolManager  # type: ignore
+    try:
+        from pydantic_ai.tool_manager import ToolManager  # type: ignore
+    except ImportError:
+        from pydantic_ai._tool_manager import ToolManager  # type: ignore
+
     from pydantic_ai.exceptions import ToolRetryError  # type: ignore
 except ImportError:
     raise DidNotEnable("pydantic-ai not installed")