Skip to content

ref(mistral): Drop send_default_pii support #7749

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
alexander-alderman-webb merged 2 commits into from
Sep 29, 2026
Merged

ref(mistral): Drop send_default_pii support #7749

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
084df10
ref(mistral): Drop send_default_pii support
alexander-alderman-webb Sep 29, 2026
437ef5b
add an early return
alexander-alderman-webb Sep 29, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
94 changes: 36 additions & 58 deletions sentry_sdk/integrations/mistral.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@
import sentry_sdk
from sentry_sdk.consts import OP, SPANDATA
from sentry_sdk.integrations import DidNotEnable, Integration
from sentry_sdk.scope import should_send_default_pii
from sentry_sdk.utils import has_data_collection_enabled

if TYPE_CHECKING:
from typing import Any, Callable, Iterable, Optional, TypeGuard, Union
Expand Down Expand Up @@ -245,15 +243,9 @@ def wrap_complete(self: "Chat", *args: "Any", **kwargs: "Any") -> "Any":
span.set_attribute(SPANDATA.GEN_AI_RESPONSE_STREAMING, False)

messages = kwargs.get("messages")
if isinstance(messages, Sequence) and (
(
has_data_collection_enabled(client.options)
and client.options["data_collection"]["gen_ai"]["inputs"]
)
or (
not has_data_collection_enabled(client.options)
and should_send_default_pii()
)
if (
isinstance(messages, Sequence)
and client.options["data_collection"]["gen_ai"]["inputs"]
):
system_instructions = [
message for message in messages if _is_system_instruction(message)
Expand Down Expand Up @@ -320,28 +312,24 @@ def wrap_complete(self: "Chat", *args: "Any", **kwargs: "Any") -> "Any":
SPANDATA.GEN_AI_USAGE_TOTAL_TOKENS, response.usage.total_tokens
)

if (
has_data_collection_enabled(client.options)
and client.options["data_collection"]["gen_ai"]["outputs"]
) or (
not has_data_collection_enabled(client.options)
and should_send_default_pii()
):
output_messages: "list[OutputMessage]" = []
for choice in response.choices:
if choice.message is None:
continue
if not client.options["data_collection"]["gen_ai"]["outputs"]:
return response

transformed_message = _transform_output_message(choice.message)
if transformed_message is None:
continue
output_messages: "list[OutputMessage]" = []
for choice in response.choices:
if choice.message is None:
continue

output_messages.append(transformed_message)
transformed_message = _transform_output_message(choice.message)
if transformed_message is None:
continue

span.set_attribute(
SPANDATA.GEN_AI_OUTPUT_MESSAGES,
json.dumps(output_messages),
)
output_messages.append(transformed_message)

span.set_attribute(
SPANDATA.GEN_AI_OUTPUT_MESSAGES,
json.dumps(output_messages),
)

return response

Expand Down Expand Up @@ -375,15 +363,9 @@ async def wrap_complete_async(self: "Chat", *args: "Any", **kwargs: "Any") -> "A
messages: "Optional[Union[Iterable[ChatCompletionRequestMessage], Iterable[ChatCompletionRequestMessageTypedDict]]]" = kwargs.get(
"messages"
)
if isinstance(messages, Sequence) and (
(
has_data_collection_enabled(client.options)
and client.options["data_collection"]["gen_ai"]["inputs"]
)
or (
not has_data_collection_enabled(client.options)
and should_send_default_pii()
)
if (
isinstance(messages, Sequence)
and client.options["data_collection"]["gen_ai"]["inputs"]
):
system_instructions = [
message for message in messages if _is_system_instruction(message)
Expand Down Expand Up @@ -450,28 +432,24 @@ async def wrap_complete_async(self: "Chat", *args: "Any", **kwargs: "Any") -> "A
SPANDATA.GEN_AI_USAGE_TOTAL_TOKENS, response.usage.total_tokens
)

if (
has_data_collection_enabled(client.options)
and client.options["data_collection"]["gen_ai"]["outputs"]
) or (
not has_data_collection_enabled(client.options)
and should_send_default_pii()
):
output_messages: "list[OutputMessage]" = []
for choice in response.choices:
if choice.message is None:
continue
if not client.options["data_collection"]["gen_ai"]["outputs"]:
return response

transformed_message = _transform_output_message(choice.message)
if transformed_message is None:
continue
output_messages: "list[OutputMessage]" = []
for choice in response.choices:
if choice.message is None:
continue

output_messages.append(transformed_message)
transformed_message = _transform_output_message(choice.message)
if transformed_message is None:
continue

span.set_attribute(
SPANDATA.GEN_AI_OUTPUT_MESSAGES,
json.dumps(output_messages),
)
output_messages.append(transformed_message)

span.set_attribute(
SPANDATA.GEN_AI_OUTPUT_MESSAGES,
json.dumps(output_messages),
)

return response

Expand Down
109 changes: 53 additions & 56 deletions tests/integrations/mistral/test_mistral.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,12 @@ def test_nonstreaming_chat(
sentry_init(
integrations=[MistralIntegration()],
traces_sample_rate=1.0,
data_collection={
"gen_ai": {
"inputs": False,
"outputs": False,
},
},
)

client = Mistral(api_key="z")
Expand Down Expand Up @@ -121,6 +127,12 @@ async def test_nonstreaming_chat_async(
sentry_init(
integrations=[MistralIntegration()],
traces_sample_rate=1.0,
data_collection={
"gen_ai": {
"inputs": False,
"outputs": False,
}
},
)

client = Mistral(api_key="z")
Expand Down Expand Up @@ -365,7 +377,6 @@ async def test_nonstreaming_chat_async(
),
),
)
@pytest.mark.parametrize("data_collection", [True, False])
def test_input_attributes_nonstreaming_chat(
sentry_init,
capture_items,
Expand All @@ -374,20 +385,17 @@ def test_input_attributes_nonstreaming_chat(
messages,
expected_system_instructions,
expected_input_messages,
data_collection,
):
if data_collection:
sentry_init(
integrations=[MistralIntegration()],
traces_sample_rate=1.0,
data_collection={},
)
else:
sentry_init(
integrations=[MistralIntegration()],
traces_sample_rate=1.0,
send_default_pii=True,
)
sentry_init(
integrations=[MistralIntegration()],
traces_sample_rate=1.0,
data_collection={
"gen_ai": {
"inputs": True,
"outputs": False,
}
},
)

client = Mistral(api_key="z")

Expand Down Expand Up @@ -618,7 +626,6 @@ def test_input_attributes_nonstreaming_chat(
),
)
@pytest.mark.asyncio
@pytest.mark.parametrize("data_collection", [True, False])
async def test_input_attributes_nonstreaming_chat_async(
sentry_init,
capture_items,
Expand All @@ -627,20 +634,18 @@ async def test_input_attributes_nonstreaming_chat_async(
messages,
expected_system_instructions,
expected_input_messages,
data_collection,
):
if data_collection:
sentry_init(
integrations=[MistralIntegration()],
traces_sample_rate=1.0,
data_collection={},
)
else:
sentry_init(
integrations=[MistralIntegration()],
traces_sample_rate=1.0,
send_default_pii=True,
)
sentry_init(
integrations=[MistralIntegration()],
traces_sample_rate=1.0,
data_collection={
"gen_ai": {
"inputs": True,
"outputs": False,
}
},
)

client = Mistral(api_key="z")

model_response = get_model_response(
Expand Down Expand Up @@ -677,26 +682,22 @@ async def test_input_attributes_nonstreaming_chat_async(
)


@pytest.mark.parametrize("data_collection", [True, False])
def test_output_attributes_nonstreaming_chat(
sentry_init,
capture_items,
get_model_response,
mistral_response,
data_collection,
):
if data_collection:
sentry_init(
integrations=[MistralIntegration()],
traces_sample_rate=1.0,
data_collection={},
)
else:
sentry_init(
integrations=[MistralIntegration()],
traces_sample_rate=1.0,
send_default_pii=True,
)
sentry_init(
integrations=[MistralIntegration()],
traces_sample_rate=1.0,
data_collection={
"gen_ai": {
"inputs": False,
"outputs": True,
}
},
)

client = Mistral(api_key="z")

Expand Down Expand Up @@ -742,26 +743,22 @@ def test_output_attributes_nonstreaming_chat(


@pytest.mark.asyncio
@pytest.mark.parametrize("data_collection", [True, False])
async def test_output_attributes_nonstreaming_chat_async(
sentry_init,
capture_items,
get_model_response,
mistral_response,
data_collection,
):
if data_collection:
sentry_init(
integrations=[MistralIntegration()],
traces_sample_rate=1.0,
data_collection={},
)
else:
sentry_init(
integrations=[MistralIntegration()],
traces_sample_rate=1.0,
send_default_pii=True,
)
sentry_init(
integrations=[MistralIntegration()],
traces_sample_rate=1.0,
data_collection={
"gen_ai": {
"inputs": False,
"outputs": True,
}
},
)

client = Mistral(api_key="z")

Expand Down
Loading