Merge pull request #775 from NVIDIA/release/0.7

Forward-merge release/0.7 into main

Author: GPUtester

crates/core/src/observability/otel_genai.rs

@@ -355,7 +355,15 @@ fn input_message(message: &Message) -> Json {
         Message::Developer { content, name } => {
             ("developer", name.as_ref(), content_parts(content))
         }
-        Message::User { content, name } => ("user", name.as_ref(), content_parts(content)),
+        Message::User { content, name } => (
+            if is_tool_result_message(content) {
+                "tool"
+            } else {
+                "user"
+            },
+            name.as_ref(),
+            content_parts(content),
+        ),
         Message::Assistant {
             content,
             tool_calls,
@@ -441,6 +449,17 @@ fn input_message(message: &Message) -> Json {
     Json::Object(object)
 }
 
+fn is_tool_result_message(content: &MessageContent) -> bool {
+    matches!(
+        content,
+        MessageContent::Parts(parts)
+            if !parts.is_empty()
+                && parts
+                    .iter()
+                    .all(|part| matches!(part, ContentPart::ToolResult { .. }))
+    )
+}
+
 fn output_messages_json(response: &AnnotatedLlmResponse) -> Option<String> {
     let mut parts = response
         .message

crates/core/tests/unit/observability/otel_tests.rs

@@ -2253,6 +2253,32 @@ fn gen_ai_projection_covers_message_variants_and_empty_input() {
                 "content": "result",
                 "tool_call_id": "call-1"
             },
+            {
+                "role": "user",
+                "content": [{
+                    "type": "tool_result",
+                    "tool_use_id": "call-2",
+                    "content": "claude result"
+                }]
+            },
+            {
+                "role": "user",
+                "content": [
+                    {
+                        "type": "tool_result",
+                        "tool_use_id": "call-3",
+                        "content": "mixed result"
+                    },
+                    {
+                        "type": "text",
+                        "text": "continue"
+                    }
+                ]
+            },
+            {
+                "role": "user",
+                "content": []
+            },
             {
                 "role": "user",
                 "content": [
@@ -2309,6 +2335,32 @@ fn gen_ai_projection_covers_message_variants_and_empty_input() {
                     "response": "result"
                 }]
             },
+            {
+                "role": "tool",
+                "parts": [{
+                    "type": "tool_call_response",
+                    "id": "call-2",
+                    "response": "claude result"
+                }]
+            },
+            {
+                "role": "user",
+                "parts": [
+                    {
+                        "type": "tool_call_response",
+                        "id": "call-3",
+                        "response": "mixed result"
+                    },
+                    {
+                        "type": "text",
+                        "content": "continue"
+                    }
+                ]
+            },
+            {
+                "role": "user",
+                "parts": []
+            },
             {
                 "role": "user",
                 "parts": [