Merge branch 'major/3.0' into ivana/major/chained-exceptions

Author: sentrivana

.github/workflows/test-integrations-ai.yml

@@ -17,7 +17,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.8","3.9","3.10","3.11","3.12","3.13","3.14","3.14t"]
+        python-version: ["3.8","3.9","3.10","3.11","3.12","3.13","3.14","3.14t","3.15","3.15t"]
         os: [ubuntu-22.04]
     env:
       # 3.7 runs in the python:X.Y container; tell uv to use that system Python.
@@ -57,6 +57,10 @@ jobs:
         run: |
           set -x # print commands that are executed
           ./scripts/runtox.sh "py${{ matrix.python-version }}-litellm"
+      - name: Test mistral
+        run: |
+          set -x # print commands that are executed
+          ./scripts/runtox.sh "py${{ matrix.python-version }}-mistral"
       - name: Test openai-base
         run: |
           set -x # print commands that are executed

CHANGELOG.md

@@ -1,5 +1,80 @@
 # Changelog
 
+## 2.70.0
+
+### New Features ✨
+
+- **New integration:** Mistral AI (#4733) by @alexander-alderman-webb
+
+  Add the Mistral integration to your `sentry_sdk.init` call:
+
+```python
+import sentry_sdk
+from sentry_sdk.integrations.mistral import MistralIntegration
+
+sentry_sdk.init(
+    dsn="...",
+    traces_sample_rate=1.0,
+    integrations=[
+        MistralIntegration(),
+    ]
+)
+```
+
+- **New option:** A fine-grained way to configure what data should be sent from the SDK.
+
+  Offers much more flexibility than `send_default_pii`, allowing you to specify what
+  data should be collected. If `data_collection` is defined, it takes precedence over
+  `send_default_pii`.
+  
+  See https://docs.sentry.io/platforms/python/configuration/options/#data_collection
+  for the available configuration options.
+
+```python
+import sentry_sdk
+
+sentry_sdk.init(
+    data_collection={
+        "user_info": False,
+        "gen_ai": {"inputs": False, "outputs": False},
+        "graphql": {"document": False, "variables": False},
+        "database_query_data": False,
+        "queues": False,
+        "http_bodies": [],
+        "cookies": {
+            "mode": "denylist",
+            "terms": ["forwarded", "-ip", "remote-", "via", "-user"],
+        },
+        "http_headers": {
+            "request": {
+                "mode": "denylist",
+                "terms": ["forwarded", "-ip", "remote-", "via", "-user"],
+            },
+        },
+        "url_query_params": {
+            "mode": "denylist",
+            "terms": ["forwarded", "-ip", "remote-", "via", "-user"],
+        },
+    }
+)
+```
+
+#### Mistral
+
+- Record `gen_ai.output.messages` by @alexander-alderman-webb in [#7549](https://github.com/getsentry/sentry-python/pull/7549)
+- Record `gen_ai.input.messages` by @alexander-alderman-webb in [#7548](https://github.com/getsentry/sentry-python/pull/7548)
+- Record `gen_ai.system_instructions` by @alexander-alderman-webb in [#7547](https://github.com/getsentry/sentry-python/pull/7547)
+- Record request parameters by @alexander-alderman-webb in [#7531](https://github.com/getsentry/sentry-python/pull/7531)
+- Record token usage by @alexander-alderman-webb in [#7529](https://github.com/getsentry/sentry-python/pull/7529)
+- Add integration with `Chat.complete` and `Chat.complete_async` patches by @alexander-alderman-webb in [#7528](https://github.com/getsentry/sentry-python/pull/7528)
+
+### Internal Changes 🔧
+
+- (data-collection) Promote `data_collection` from `_experiments` o top-level by @ericapisani in [#7560](https://github.com/getsentry/sentry-python/pull/7560)
+- Close client on teardown by @alexander-alderman-webb in [#7562](https://github.com/getsentry/sentry-python/pull/7562)
+- 🤖 Update test matrix with new releases (09/21) by @github-actions in [#7546](https://github.com/getsentry/sentry-python/pull/7546)
+- Remove `getsentry/testing-ai-sdk-integrations` by @alexander-alderman-webb in [#7526](https://github.com/getsentry/sentry-python/pull/7526)
+
 ## 2.69.2
 
 ### Bug Fixes 🐛

docs/conf.py

@@ -31,7 +31,7 @@
 copyright = "2019-{}, Sentry Team and Contributors".format(datetime.now().year)
 author = "Sentry Team and Contributors"
 
-release = "2.69.2"
+release = "2.70.0"
 version = ".".join(release.split(".")[:2])  # The short X.Y version.
 
 

pyproject.toml

@@ -80,6 +80,7 @@ typing = [
     "tiktoken>=0.14.0",
     "aiohttp>=3.14.3",
     "openai-agents>=0.22.0",
+    "mistralai>=2.10.1",
 ]
 test = [
     "dataclasses ; python_full_version < '3.7'",

scripts/populate_tox/config.py

@@ -303,6 +303,12 @@
             "*": ["pytest-asyncio", "httpx"],
         },
     },
+    "mistral": {
+        "package": "mistralai",
+        "deps": {
+            "*": ["pytest-asyncio", "httpx"],
+        },
+    },
     "fastmcp": {
         "package": "fastmcp",
         "deps": {

scripts/populate_tox/package_dependencies.jsonl

@@ -200,6 +200,8 @@ setenv =
     # which targets the workspace `.venv` instead of the tox env and hangs.
     ray: RAY_ENABLE_UV_RUN_RUNTIME_ENV=0
 
+    litellm: LITELLM_LOCAL_MODEL_COST_MAP=true
+
     # Avoid polluting test suite with imports
     common: PYTEST_ADDOPTS="--ignore=tests/test_shadowed_module.py"
     gevent: PYTEST_ADDOPTS="--ignore=tests/test_shadowed_module.py"

scripts/populate_tox/releases.jsonl

@@ -92,6 +92,7 @@
         "google_genai",
         "huggingface_hub",
         "litellm",
+        "mistral",
         "openai-base",
         "openai-notiktoken",
     ],

scripts/populate_tox/tox.jinja

@@ -458,6 +458,14 @@ class ToolCallPart(TypedDict):
         name: NotRequired[str]
         arguments: NotRequired[Any]
 
+    class InputMessage(TypedDict):
+        role: Literal["user", "assistant", "tool"]
+        parts: list[Union[TextPart, ReasoningPart, ToolCallPart]]
+
+    class OutputMessage(TypedDict):
+        role: Literal["assistant"]
+        parts: list[Union[TextPart, ReasoningPart]]
+
     class ToolDefinition(TypedDict):
         type: str
         name: NotRequired[str]