Skip to content

Commit 832fbcb

Browse files
sentrivanaalexander-alderman-webb
sentrivana
and
alexander-alderman-webb
authored
chore: Remove unnecessary None checks (#7449)
All of these should be lists, never `None`. --------- Co-authored-by: Alexander Alderman Webb <alexander.webb@sentry.io>
1 parent da4ae1c commit 832fbcb

8 files changed

Lines changed: 90 additions & 112 deletions

File tree

‎sentry_sdk/integrations/anthropic.py‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -547,13 +547,12 @@ def _set_common_input_data(
547547

548548
role_normalized_messages = normalize_message_roles(normalized_messages)
549549

550-
if role_normalized_messages is not None:
551-
set_data_normalized(
552-
span,
553-
SPANDATA.GEN_AI_REQUEST_MESSAGES,
554-
role_normalized_messages,
555-
unpack=False,
556-
)
550+
set_data_normalized(
551+
span,
552+
SPANDATA.GEN_AI_REQUEST_MESSAGES,
553+
role_normalized_messages,
554+
unpack=False,
555+
)
557556

558557

559558
def _set_create_input_data(

‎sentry_sdk/integrations/google_genai/utils.py‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -967,14 +967,12 @@ def set_span_data_for_request(
967967

968968
if messages:
969969
normalized_messages = normalize_message_roles(messages)
970-
client = sentry_sdk.get_client()
971-
if normalized_messages is not None:
972-
set_data_normalized(
973-
span,
974-
SPANDATA.GEN_AI_REQUEST_MESSAGES,
975-
normalized_messages,
976-
unpack=False,
977-
)
970+
set_data_normalized(
971+
span,
972+
SPANDATA.GEN_AI_REQUEST_MESSAGES,
973+
normalized_messages,
974+
unpack=False,
975+
)
978976

979977
# Extract parameters directly from config (not nested under generation_config)
980978
for param, span_key in [

‎sentry_sdk/integrations/langchain.py‎

Lines changed: 24 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -422,14 +422,12 @@ def on_llm_start(
422422
}
423423
for prompt in prompts
424424
]
425-
426-
if normalized_messages is not None:
427-
set_data_normalized(
428-
span,
429-
SPANDATA.GEN_AI_REQUEST_MESSAGES,
430-
normalized_messages,
431-
unpack=False,
432-
)
425+
set_data_normalized(
426+
span,
427+
SPANDATA.GEN_AI_REQUEST_MESSAGES,
428+
normalized_messages,
429+
unpack=False,
430+
)
433431

434432
def on_chat_model_start(
435433
self: "SentryLangchainCallback",
@@ -528,14 +526,12 @@ def on_chat_model_start(
528526
self._normalize_langchain_message(message)
529527
)
530528
normalized_messages = normalize_message_roles(normalized_messages)
531-
532-
if normalized_messages is not None:
533-
set_data_normalized(
534-
span,
535-
SPANDATA.GEN_AI_REQUEST_MESSAGES,
536-
normalized_messages,
537-
unpack=False,
538-
)
529+
set_data_normalized(
530+
span,
531+
SPANDATA.GEN_AI_REQUEST_MESSAGES,
532+
normalized_messages,
533+
unpack=False,
534+
)
539535

540536
def on_chat_model_end(
541537
self: "SentryLangchainCallback",
@@ -1143,14 +1139,12 @@ def new_invoke(self: "Any", *args: "Any", **kwargs: "Any") -> "Any":
11431139
input = result.get("input")
11441140
if input is not None and record_inputs:
11451141
normalized_messages = normalize_message_roles([input])
1146-
1147-
if normalized_messages is not None:
1148-
set_data_normalized(
1149-
span,
1150-
SPANDATA.GEN_AI_REQUEST_MESSAGES,
1151-
normalized_messages,
1152-
unpack=False,
1153-
)
1142+
set_data_normalized(
1143+
span,
1144+
SPANDATA.GEN_AI_REQUEST_MESSAGES,
1145+
normalized_messages,
1146+
unpack=False,
1147+
)
11541148

11551149
output = result.get("output")
11561150
if output is not None and record_outputs:
@@ -1199,14 +1193,12 @@ def new_stream(self: "Any", *args: "Any", **kwargs: "Any") -> "Any":
11991193
input = args[0].get("input") if len(args) >= 1 else None
12001194
if input is not None and record_inputs:
12011195
normalized_messages = normalize_message_roles([input])
1202-
1203-
if normalized_messages is not None:
1204-
set_data_normalized(
1205-
span,
1206-
SPANDATA.GEN_AI_REQUEST_MESSAGES,
1207-
normalized_messages,
1208-
unpack=False,
1209-
)
1196+
set_data_normalized(
1197+
span,
1198+
SPANDATA.GEN_AI_REQUEST_MESSAGES,
1199+
normalized_messages,
1200+
unpack=False,
1201+
)
12101202

12111203
# Run the agent
12121204
result = f(self, *args, **kwargs)

‎sentry_sdk/integrations/langgraph.py‎

Lines changed: 12 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -159,14 +159,12 @@ def new_invoke(self: "Any", *args: "Any", **kwargs: "Any") -> "Any":
159159
input_messages = _parse_langgraph_messages(args[0])
160160
if input_messages and _should_record_inputs(integration):
161161
normalized_input_messages = normalize_message_roles(input_messages)
162-
163-
if normalized_input_messages is not None:
164-
set_data_normalized(
165-
span,
166-
SPANDATA.GEN_AI_REQUEST_MESSAGES,
167-
normalized_input_messages,
168-
unpack=False,
169-
)
162+
set_data_normalized(
163+
span,
164+
SPANDATA.GEN_AI_REQUEST_MESSAGES,
165+
normalized_input_messages,
166+
unpack=False,
167+
)
170168

171169
result = f(self, *args, **kwargs)
172170

@@ -204,14 +202,12 @@ async def new_ainvoke(self: "Any", *args: "Any", **kwargs: "Any") -> "Any":
204202
input_messages = _parse_langgraph_messages(args[0])
205203
if input_messages and _should_record_inputs(integration):
206204
normalized_input_messages = normalize_message_roles(input_messages)
207-
208-
if normalized_input_messages is not None:
209-
set_data_normalized(
210-
span,
211-
SPANDATA.GEN_AI_REQUEST_MESSAGES,
212-
normalized_input_messages,
213-
unpack=False,
214-
)
205+
set_data_normalized(
206+
span,
207+
SPANDATA.GEN_AI_REQUEST_MESSAGES,
208+
normalized_input_messages,
209+
unpack=False,
210+
)
215211

216212
result = await f(self, *args, **kwargs)
217213

‎sentry_sdk/integrations/litellm.py‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -143,13 +143,12 @@ def _input_callback(kwargs: "Dict[str, Any]") -> None:
143143
messages = kwargs.get("messages", [])
144144
if messages:
145145
messages = _convert_message_parts(messages)
146-
if messages is not None:
147-
set_data_normalized(
148-
span,
149-
SPANDATA.GEN_AI_REQUEST_MESSAGES,
150-
messages,
151-
unpack=False,
152-
)
146+
set_data_normalized(
147+
span,
148+
SPANDATA.GEN_AI_REQUEST_MESSAGES,
149+
messages,
150+
unpack=False,
151+
)
153152

154153
# Record other parameters
155154
params = {

‎sentry_sdk/integrations/openai.py‎

Lines changed: 24 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -442,13 +442,12 @@ def _set_responses_api_input_data(
442442
# Input was provided as a single string
443443
if isinstance(messages, str):
444444
normalized_messages = normalize_message_roles([messages]) # type: ignore
445-
if normalized_messages is not None:
446-
set_data_normalized(
447-
span,
448-
SPANDATA.GEN_AI_REQUEST_MESSAGES,
449-
normalized_messages,
450-
unpack=False,
451-
)
445+
set_data_normalized(
446+
span,
447+
SPANDATA.GEN_AI_REQUEST_MESSAGES,
448+
normalized_messages,
449+
unpack=False,
450+
)
452451
return
453452

454453
# Input was provided as a list (potentially a multi-turn conversation)
@@ -457,13 +456,12 @@ def _set_responses_api_input_data(
457456
]
458457
if len(non_system_messages) > 0:
459458
normalized_messages = normalize_message_roles(non_system_messages) # type: ignore
460-
if normalized_messages is not None:
461-
set_data_normalized(
462-
span,
463-
SPANDATA.GEN_AI_REQUEST_MESSAGES,
464-
normalized_messages,
465-
unpack=False,
466-
)
459+
set_data_normalized(
460+
span,
461+
SPANDATA.GEN_AI_REQUEST_MESSAGES,
462+
normalized_messages,
463+
unpack=False,
464+
)
467465

468466

469467
def _set_completions_api_input_data(
@@ -537,13 +535,12 @@ def _set_completions_api_input_data(
537535

538536
if isinstance(messages, str):
539537
normalized_messages = normalize_message_roles([messages]) # type: ignore
540-
if normalized_messages is not None:
541-
set_data_normalized(
542-
span,
543-
SPANDATA.GEN_AI_REQUEST_MESSAGES,
544-
normalized_messages,
545-
unpack=False,
546-
)
538+
set_data_normalized(
539+
span,
540+
SPANDATA.GEN_AI_REQUEST_MESSAGES,
541+
normalized_messages,
542+
unpack=False,
543+
)
547544
return
548545

549546
# 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(
568565
if len(non_system_messages) > 0:
569566
normalized_messages = normalize_message_roles(non_system_messages) # type: ignore
570567
client = sentry_sdk.get_client()
571-
if normalized_messages is not None:
572-
set_data_normalized(
573-
span,
574-
SPANDATA.GEN_AI_REQUEST_MESSAGES,
575-
normalized_messages,
576-
unpack=False,
577-
)
568+
set_data_normalized(
569+
span,
570+
SPANDATA.GEN_AI_REQUEST_MESSAGES,
571+
normalized_messages,
572+
unpack=False,
573+
)
578574

579575

580576
def _set_embeddings_input_data(

‎sentry_sdk/integrations/openai_agents/spans/invoke_agent.py‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -71,13 +71,12 @@ def invoke_agent_span(
7171

7272
if len(messages) > 0:
7373
normalized_messages = normalize_message_roles(messages)
74-
if normalized_messages is not None:
75-
set_data_normalized(
76-
span,
77-
SPANDATA.GEN_AI_REQUEST_MESSAGES,
78-
normalized_messages,
79-
unpack=False,
80-
)
74+
set_data_normalized(
75+
span,
76+
SPANDATA.GEN_AI_REQUEST_MESSAGES,
77+
normalized_messages,
78+
unpack=False,
79+
)
8180

8281
_set_agent_data(span, agent)
8382

‎sentry_sdk/integrations/openai_agents/utils.py‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -174,13 +174,12 @@ def _set_input_data(
174174
)
175175

176176
normalized_messages = normalize_message_roles(request_messages)
177-
if normalized_messages is not None:
178-
set_data_normalized(
179-
span,
180-
SPANDATA.GEN_AI_REQUEST_MESSAGES,
181-
normalized_messages,
182-
unpack=False,
183-
)
177+
set_data_normalized(
178+
span,
179+
SPANDATA.GEN_AI_REQUEST_MESSAGES,
180+
normalized_messages,
181+
unpack=False,
182+
)
184183

185184

186185
def _set_output_data(span: "StreamedSpan", result: "Any") -> None:

0 commit comments

Comments
 (0)