diff --git a/sentry_sdk/integrations/anthropic.py b/sentry_sdk/integrations/anthropic.py index 583033b967..0193f8497b 100644 --- a/sentry_sdk/integrations/anthropic.py +++ b/sentry_sdk/integrations/anthropic.py @@ -547,13 +547,12 @@ def _set_common_input_data( role_normalized_messages = normalize_message_roles(normalized_messages) - if role_normalized_messages is not None: - set_data_normalized( - span, - SPANDATA.GEN_AI_REQUEST_MESSAGES, - role_normalized_messages, - unpack=False, - ) + set_data_normalized( + span, + SPANDATA.GEN_AI_REQUEST_MESSAGES, + role_normalized_messages, + unpack=False, + ) def _set_create_input_data( diff --git a/sentry_sdk/integrations/google_genai/utils.py b/sentry_sdk/integrations/google_genai/utils.py index cd728836c2..5def5be34c 100644 --- a/sentry_sdk/integrations/google_genai/utils.py +++ b/sentry_sdk/integrations/google_genai/utils.py @@ -967,14 +967,12 @@ def set_span_data_for_request( if messages: normalized_messages = normalize_message_roles(messages) - client = sentry_sdk.get_client() - if normalized_messages is not None: - set_data_normalized( - span, - SPANDATA.GEN_AI_REQUEST_MESSAGES, - normalized_messages, - unpack=False, - ) + set_data_normalized( + span, + SPANDATA.GEN_AI_REQUEST_MESSAGES, + normalized_messages, + unpack=False, + ) # Extract parameters directly from config (not nested under generation_config) for param, span_key in [ diff --git a/sentry_sdk/integrations/langchain.py b/sentry_sdk/integrations/langchain.py index 53d933bbd9..36451b936a 100644 --- a/sentry_sdk/integrations/langchain.py +++ b/sentry_sdk/integrations/langchain.py @@ -422,14 +422,12 @@ def on_llm_start( } for prompt in prompts ] - - if normalized_messages is not None: - set_data_normalized( - span, - SPANDATA.GEN_AI_REQUEST_MESSAGES, - normalized_messages, - unpack=False, - ) + set_data_normalized( + span, + SPANDATA.GEN_AI_REQUEST_MESSAGES, + normalized_messages, + unpack=False, + ) def on_chat_model_start( self: "SentryLangchainCallback", @@ -528,14 +526,12 @@ def on_chat_model_start( self._normalize_langchain_message(message) ) normalized_messages = normalize_message_roles(normalized_messages) - - if normalized_messages is not None: - set_data_normalized( - span, - SPANDATA.GEN_AI_REQUEST_MESSAGES, - normalized_messages, - unpack=False, - ) + set_data_normalized( + span, + SPANDATA.GEN_AI_REQUEST_MESSAGES, + normalized_messages, + unpack=False, + ) def on_chat_model_end( self: "SentryLangchainCallback", @@ -1143,14 +1139,12 @@ def new_invoke(self: "Any", *args: "Any", **kwargs: "Any") -> "Any": input = result.get("input") if input is not None and record_inputs: normalized_messages = normalize_message_roles([input]) - - if normalized_messages is not None: - set_data_normalized( - span, - SPANDATA.GEN_AI_REQUEST_MESSAGES, - normalized_messages, - unpack=False, - ) + set_data_normalized( + span, + SPANDATA.GEN_AI_REQUEST_MESSAGES, + normalized_messages, + unpack=False, + ) output = result.get("output") if output is not None and record_outputs: @@ -1199,14 +1193,12 @@ def new_stream(self: "Any", *args: "Any", **kwargs: "Any") -> "Any": input = args[0].get("input") if len(args) >= 1 else None if input is not None and record_inputs: normalized_messages = normalize_message_roles([input]) - - if normalized_messages is not None: - set_data_normalized( - span, - SPANDATA.GEN_AI_REQUEST_MESSAGES, - normalized_messages, - unpack=False, - ) + set_data_normalized( + span, + SPANDATA.GEN_AI_REQUEST_MESSAGES, + normalized_messages, + unpack=False, + ) # Run the agent result = f(self, *args, **kwargs) diff --git a/sentry_sdk/integrations/langgraph.py b/sentry_sdk/integrations/langgraph.py index f8d2ffc9db..65db4d4f9c 100644 --- a/sentry_sdk/integrations/langgraph.py +++ b/sentry_sdk/integrations/langgraph.py @@ -159,14 +159,12 @@ def new_invoke(self: "Any", *args: "Any", **kwargs: "Any") -> "Any": input_messages = _parse_langgraph_messages(args[0]) if input_messages and _should_record_inputs(integration): normalized_input_messages = normalize_message_roles(input_messages) - - if normalized_input_messages is not None: - set_data_normalized( - span, - SPANDATA.GEN_AI_REQUEST_MESSAGES, - normalized_input_messages, - unpack=False, - ) + set_data_normalized( + span, + SPANDATA.GEN_AI_REQUEST_MESSAGES, + normalized_input_messages, + unpack=False, + ) result = f(self, *args, **kwargs) @@ -204,14 +202,12 @@ async def new_ainvoke(self: "Any", *args: "Any", **kwargs: "Any") -> "Any": input_messages = _parse_langgraph_messages(args[0]) if input_messages and _should_record_inputs(integration): normalized_input_messages = normalize_message_roles(input_messages) - - if normalized_input_messages is not None: - set_data_normalized( - span, - SPANDATA.GEN_AI_REQUEST_MESSAGES, - normalized_input_messages, - unpack=False, - ) + set_data_normalized( + span, + SPANDATA.GEN_AI_REQUEST_MESSAGES, + normalized_input_messages, + unpack=False, + ) result = await f(self, *args, **kwargs) diff --git a/sentry_sdk/integrations/litellm.py b/sentry_sdk/integrations/litellm.py index 1d70f63095..cd9d3dba69 100644 --- a/sentry_sdk/integrations/litellm.py +++ b/sentry_sdk/integrations/litellm.py @@ -143,13 +143,12 @@ def _input_callback(kwargs: "Dict[str, Any]") -> None: messages = kwargs.get("messages", []) if messages: messages = _convert_message_parts(messages) - if messages is not None: - set_data_normalized( - span, - SPANDATA.GEN_AI_REQUEST_MESSAGES, - messages, - unpack=False, - ) + set_data_normalized( + span, + SPANDATA.GEN_AI_REQUEST_MESSAGES, + messages, + unpack=False, + ) # Record other parameters params = { diff --git a/sentry_sdk/integrations/openai.py b/sentry_sdk/integrations/openai.py index 01f2c501f7..0dcd95aec5 100644 --- a/sentry_sdk/integrations/openai.py +++ b/sentry_sdk/integrations/openai.py @@ -442,13 +442,12 @@ def _set_responses_api_input_data( # Input was provided as a single string if isinstance(messages, str): normalized_messages = normalize_message_roles([messages]) # type: ignore - if normalized_messages is not None: - set_data_normalized( - span, - SPANDATA.GEN_AI_REQUEST_MESSAGES, - normalized_messages, - unpack=False, - ) + set_data_normalized( + span, + SPANDATA.GEN_AI_REQUEST_MESSAGES, + normalized_messages, + unpack=False, + ) return # Input was provided as a list (potentially a multi-turn conversation) @@ -457,13 +456,12 @@ def _set_responses_api_input_data( ] if len(non_system_messages) > 0: normalized_messages = normalize_message_roles(non_system_messages) # type: ignore - if normalized_messages is not None: - set_data_normalized( - span, - SPANDATA.GEN_AI_REQUEST_MESSAGES, - normalized_messages, - unpack=False, - ) + set_data_normalized( + span, + SPANDATA.GEN_AI_REQUEST_MESSAGES, + normalized_messages, + unpack=False, + ) def _set_completions_api_input_data( @@ -537,13 +535,12 @@ def _set_completions_api_input_data( if isinstance(messages, str): normalized_messages = normalize_message_roles([messages]) # type: ignore - if normalized_messages is not None: - set_data_normalized( - span, - SPANDATA.GEN_AI_REQUEST_MESSAGES, - normalized_messages, - unpack=False, - ) + set_data_normalized( + span, + SPANDATA.GEN_AI_REQUEST_MESSAGES, + normalized_messages, + unpack=False, + ) return # dict special case following https://github.com/openai/openai-python/blob/3e0c05b84a2056870abf3bd6a5e7849020209cc3/src/openai/_utils/_transform.py#L194-L197 @@ -568,13 +565,12 @@ def _set_completions_api_input_data( if len(non_system_messages) > 0: normalized_messages = normalize_message_roles(non_system_messages) # type: ignore client = sentry_sdk.get_client() - if normalized_messages is not None: - set_data_normalized( - span, - SPANDATA.GEN_AI_REQUEST_MESSAGES, - normalized_messages, - unpack=False, - ) + set_data_normalized( + span, + SPANDATA.GEN_AI_REQUEST_MESSAGES, + normalized_messages, + unpack=False, + ) def _set_embeddings_input_data( diff --git a/sentry_sdk/integrations/openai_agents/spans/invoke_agent.py b/sentry_sdk/integrations/openai_agents/spans/invoke_agent.py index 1383a864ff..4d71e0c245 100644 --- a/sentry_sdk/integrations/openai_agents/spans/invoke_agent.py +++ b/sentry_sdk/integrations/openai_agents/spans/invoke_agent.py @@ -71,13 +71,12 @@ def invoke_agent_span( if len(messages) > 0: normalized_messages = normalize_message_roles(messages) - if normalized_messages is not None: - set_data_normalized( - span, - SPANDATA.GEN_AI_REQUEST_MESSAGES, - normalized_messages, - unpack=False, - ) + set_data_normalized( + span, + SPANDATA.GEN_AI_REQUEST_MESSAGES, + normalized_messages, + unpack=False, + ) _set_agent_data(span, agent) diff --git a/sentry_sdk/integrations/openai_agents/utils.py b/sentry_sdk/integrations/openai_agents/utils.py index a01b6e28db..c27cea970e 100644 --- a/sentry_sdk/integrations/openai_agents/utils.py +++ b/sentry_sdk/integrations/openai_agents/utils.py @@ -174,13 +174,12 @@ def _set_input_data( ) normalized_messages = normalize_message_roles(request_messages) - if normalized_messages is not None: - set_data_normalized( - span, - SPANDATA.GEN_AI_REQUEST_MESSAGES, - normalized_messages, - unpack=False, - ) + set_data_normalized( + span, + SPANDATA.GEN_AI_REQUEST_MESSAGES, + normalized_messages, + unpack=False, + ) def _set_output_data(span: "StreamedSpan", result: "Any") -> None: