mypy fixes

Author: vgrozdanic

sentry_sdk/integrations/google_genai/streaming.py

@@ -87,13 +87,10 @@ def accumulate_streaming_response(chunks):
             output_tokens_reasoning=total_reasoning_tokens,
             total_tokens=total_tokens,
         ),
+        id=response_id,
+        model=model,
     )
 
-    if response_id:
-        accumulated_response["id"] = response_id
-    if model:
-        accumulated_response["model"] = model
-
     return accumulated_response
 
 

sentry_sdk/integrations/google_genai/utils.py

@@ -171,7 +171,7 @@ def extract_contents_text(contents):
 
     # Content object with parts - recurse into parts
     if getattr(contents, "parts", None):
-        return extract_contents_text(contents.parts)
+        return extract_contents_text(contents.parts)  # type: ignore
 
     # Direct text attribute
     if hasattr(contents, "text"):
@@ -228,14 +228,14 @@ def extract_tool_calls(response):
     tool_calls = []
 
     # Extract from candidates, sometimes tool calls are nested under the content.parts object
-    if hasattr(response, "candidates"):
-        for candidate in response.candidates:
-            if not hasattr(candidate, "content") or not hasattr(
-                candidate.content, "parts"
+    if getattr(response, "candidates", []):
+        for candidate in response.candidates:  # type: ignore
+            if not hasattr(candidate, "content") or not getattr(
+                candidate.content, "parts", []
             ):
                 continue
 
-            for part in candidate.content.parts:
+            for part in candidate.content.parts:  # type: ignore
                 if getattr(part, "function_call", None):
                     function_call = part.function_call
                     tool_call = {
@@ -244,8 +244,8 @@ def extract_tool_calls(response):
                     }
 
                     # Extract arguments if available
-                    if hasattr(function_call, "args"):
-                        tool_call["arguments"] = safe_serialize(function_call.args)
+                    if getattr(function_call, "args", None):
+                        tool_call["arguments"] = safe_serialize(function_call.args)  # type: ignore
 
                     tool_calls.append(tool_call)