.

Author: alexander-alderman-webb

sentry_sdk/integrations/pydantic_ai/spans/ai_client.py

@@ -51,29 +51,40 @@
 
 
 def _transform_system_instructions(
-    system_instructions: "list[SystemPromptPart]",
+    permanent_instructions: "list[SystemPromptPart]",
+    current_instructions: "list[str]",
 ) -> "list[SentryTextPart]":
     return [
         {
             "type": "text",
             "content": instruction.content,
         }
-        for instruction in system_instructions
+        for instruction in permanent_instructions
+    ] + [
+        {
+            "type": "text",
+            "content": instruction,
+        }
+        for instruction in current_instructions
     ]
 
 
 def _get_system_instructions(
     messages: "list[ModelMessage]",
-) -> "list[SystemPromptPart]":
-    system_instructions = []
+) -> "tuple[list[SystemPromptPart], list[str]]":
+    permanent_instructions = []
+    current_instructions = []
 
     for msg in messages:
         if hasattr(msg, "parts"):
             for part in msg.parts:
                 if SystemPromptPart and isinstance(part, SystemPromptPart):
-                    system_instructions.append(part)
+                    permanent_instructions.append(part)
+
+            if hasattr(msg, "instructions") and msg.instructions is not None:
+                current_instructions.append(msg.instructions)
 
-    return system_instructions
+    return permanent_instructions, current_instructions
 
 
 def _set_input_messages(span: "sentry_sdk.tracing.Span", messages: "Any") -> None:
@@ -84,12 +95,14 @@ def _set_input_messages(span: "sentry_sdk.tracing.Span", messages: "Any") -> Non
     if not messages:
         return
 
-    system_instructions = _get_system_instructions(messages)
-    if len(system_instructions) > 0:
+    permanent_instructions, current_instructions = _get_system_instructions(messages)
+    if len(permanent_instructions) > 0 or len(current_instructions) > 0:
         set_data_normalized(
             span,
             SPANDATA.GEN_AI_SYSTEM_INSTRUCTIONS,
-            _transform_system_instructions(system_instructions),
+            _transform_system_instructions(
+                permanent_instructions, current_instructions
+            ),
             unpack=False,
         )
 

tests/integrations/pydantic_ai/test_pydantic_ai.py

@@ -1249,7 +1249,8 @@ async def test_invoke_agent_with_instructions(
     if send_default_pii and include_prompts:
         system_instructions = chat_span["data"][SPANDATA.GEN_AI_SYSTEM_INSTRUCTIONS]
         assert json.loads(system_instructions) == [
-            {"type": "text", "content": "System prompt"}
+            {"type": "text", "content": "System prompt"},
+            {"type": "text", "content": "Instruction 1\nInstruction 2"},
         ]
     else:
         assert SPANDATA.GEN_AI_SYSTEM_INSTRUCTIONS not in chat_span["data"]