more tests

Author: alexander-alderman-webb

sentry_sdk/integrations/google_genai/utils.py

@@ -735,7 +735,7 @@ def _transform_system_instruction_one_level(
         return [{"type": "text", "content": system_instructions.text}]
 
     if isinstance(system_instructions, Content):
-        for part in system_instructions.parts:
+        for part in system_instructions.parts or []:
             if part.text:
                 text_parts.append({"type": "text", "content": part.text})
         return text_parts
@@ -747,9 +747,9 @@ def _transform_system_instruction_one_level(
         parts = system_instructions.get("parts", [])
         for part in parts:
             if part.get("text"):
-                part.append({"type": "text", "content": part["text"]})
+                text_parts.append({"type": "text", "content": part["text"]})
             elif isinstance(part, Part) and part.text:
-                part.append({"type": "text", "content": part.text})
+                text_parts.append({"type": "text", "content": part.text})
         return text_parts
 
     return text_parts

tests/integrations/google_genai/test_google_genai.py

@@ -204,25 +204,45 @@ def test_nonstreaming_generate_content(
     assert invoke_span["data"][SPANDATA.GEN_AI_REQUEST_MAX_TOKENS] == 100
 
 
-# Vibed test cases
+# Threatened bot to generate as many cases as possible
 @pytest.mark.parametrize(
     "system_instructions,expected_texts",
     [
-        ("You are a helpful assistant", "You are a helpful assistant"),
+        ("You are a helpful assistant", ["You are a helpful assistant"]),
         (
             ["You are a translator", "Translate to French"],
             ["You are a translator", "Translate to French"],
         ),
         (
             Content(role="user", parts=[Part(text="You are a helpful assistant")]),
-            "You are a helpful assistant",
+            ["You are a helpful assistant"],
+        ),
+        (
+            Content(
+                role="user",
+                parts=[
+                    Part(text="You are a translator"),
+                    Part(text="Translate to French"),
+                ],
+            ),
+            ["You are a translator", "Translate to French"],
         ),
         (
             {"parts": [{"text": "You are a helpful assistant"}], "role": "user"},
-            "You are a helpful assistant",
+            ["You are a helpful assistant"],
         ),
-        (Part(text="You are a helpful assistant"), "You are a helpful assistant"),
-        ({"text": "You are a helpful assistant"}, "You are a helpful assistant"),
+        (
+            {
+                "parts": [
+                    {"text": "You are a translator"},
+                    {"text": "Translate to French"},
+                ],
+                "role": "user",
+            },
+            ["You are a translator", "Translate to French"],
+        ),
+        (Part(text="You are a helpful assistant"), ["You are a helpful assistant"]),
+        ({"text": "You are a helpful assistant"}, ["You are a helpful assistant"]),
         (
             [Part(text="You are a translator"), Part(text="Translate to French")],
             ["You are a translator", "Translate to French"],
@@ -232,14 +252,44 @@ def test_nonstreaming_generate_content(
             ["You are a translator", "Translate to French"],
         ),
         (
-            Content(
-                role="user",
-                parts=[
-                    Part(text="You are a translator"),
-                    Part(text="Translate to French"),
+            [Part(text="First instruction"), {"text": "Second instruction"}],
+            ["First instruction", "Second instruction"],
+        ),
+        (
+            {
+                "parts": [
+                    Part(text="First instruction"),
+                    {"text": "Second instruction"},
                 ],
-            ),
-            ["You are a translator", "Translate to French"],
+                "role": "user",
+            },
+            ["First instruction", "Second instruction"],
+        ),
+        (None, None),
+        ("", []),
+        ({}, []),
+        ({"parts": []}, []),
+        (Content(role="user", parts=[]), []),
+        (
+            {
+                "parts": [
+                    {"text": "Text part"},
+                    {"file_data": {"file_uri": "gs://bucket/file.pdf"}},
+                ],
+                "role": "user",
+            },
+            ["Text part"],
+        ),
+        (
+            {
+                "parts": [
+                    {"text": "First"},
+                    Part(text="Second"),
+                    {"text": "Third"},
+                ],
+                "role": "user",
+            },
+            ["First", "Second", "Third"],
         ),
     ],
 )
@@ -270,6 +320,10 @@ def test_generate_content_with_system_instruction(
     (event,) = events
     invoke_span = event["spans"][0]
 
+    if expected_texts is None:
+        assert SPANDATA.GEN_AI_SYSTEM_INSTRUCTIONS not in invoke_span["data"]
+        return
+
     # (PII is enabled and include_prompts is True in this test)
     system_instructions = json.loads(
         invoke_span["data"][SPANDATA.GEN_AI_SYSTEM_INSTRUCTIONS]