fix(vertexai): normalize content message roles

Author: shuwpan

instrumentation-genai/opentelemetry-instrumentation-vertexai/src/opentelemetry/instrumentation/vertexai/utils.py

@@ -221,7 +221,6 @@ def convert_content_to_message_parts(
     return parts
 
 
-<<<<<<< HEAD
 def convert_content_to_input_message(
     content: content.Content | content_v1beta1.Content,
 ) -> InputMessage:
@@ -269,8 +268,6 @@ def _normalize_content_role(
     return role or "user"
 
 
-=======
->>>>>>> e7af21e (HYBIM-623: Migrate Vertex AI instrumentation to TelemetryHandler/LLMInvocation)
 def _map_finish_reason(
     finish_reason: content.Candidate.FinishReason
     | content_v1beta1.Candidate.FinishReason

instrumentation-genai/opentelemetry-instrumentation-vertexai/tests/test_chat_completions.py

@@ -86,11 +86,7 @@ def test_generate_content(
     output_msgs = json.loads(attrs["gen_ai.output.messages"])
     assert output_msgs == [
         {
-<<<<<<< HEAD
             "role": "assistant",
-=======
-            "role": "model",
->>>>>>> e7af21e (HYBIM-623: Migrate Vertex AI instrumentation to TelemetryHandler/LLMInvocation)
             "parts": [{"type": "text", "content": "This is a test."}],
             "finish_reason": "stop",
         }
@@ -108,11 +104,7 @@ def test_generate_content(
     ]
     assert body["gen_ai.output.messages"] == [
         {
-<<<<<<< HEAD
             "role": "assistant",
-=======
-            "role": "model",
->>>>>>> e7af21e (HYBIM-623: Migrate Vertex AI instrumentation to TelemetryHandler/LLMInvocation)
             "parts": [{"type": "text", "content": "This is a test."}],
             "finish_reason": "stop",
         }
@@ -392,11 +384,7 @@ def generate_content_all_input_messages(
     assert input_msgs[0]["parts"] == [
         {"type": "text", "content": "My name is OpenTelemetry"}
     ]
-<<<<<<< HEAD
     assert input_msgs[1]["role"] == "assistant"
-=======
-    assert input_msgs[1]["role"] == "model"
->>>>>>> e7af21e (HYBIM-623: Migrate Vertex AI instrumentation to TelemetryHandler/LLMInvocation)
     assert input_msgs[1]["parts"] == [
         {"type": "text", "content": "Hello OpenTelemetry!"}
     ]
@@ -412,11 +400,7 @@ def generate_content_all_input_messages(
     assert "gen_ai.output.messages" in attrs
     output_msgs = json.loads(attrs["gen_ai.output.messages"])
     assert len(output_msgs) == 1
-<<<<<<< HEAD
     assert output_msgs[0]["role"] == "assistant"
-=======
-    assert output_msgs[0]["role"] == "model"
->>>>>>> e7af21e (HYBIM-623: Migrate Vertex AI instrumentation to TelemetryHandler/LLMInvocation)
     assert output_msgs[0]["parts"] == [
         {"type": "text", "content": "OpenTelemetry, this is a test."}
     ]

instrumentation-genai/opentelemetry-instrumentation-vertexai/tests/test_function_calling.py

@@ -163,7 +163,7 @@ def test_tool_events(
     )
     assert "gen_ai.request.function.0.parameters" in attrs
 
-    # Content on span: user text, model function_call, user tool responses, model text response
+    # Content on span: user text, assistant function_call, tool responses, assistant text response
     assert "gen_ai.input.messages" in attrs
     input_msgs = json.loads(attrs["gen_ai.input.messages"])
     assert len(input_msgs) == 3

instrumentation-genai/opentelemetry-instrumentation-vertexai/tests/test_utils.py

@@ -154,6 +154,33 @@ def test_convert_content_mixed_parts():
     assert parts[2].response == {"answer": "world"}
 
 
+def test_convert_content_to_input_message_normalizes_roles():
+    model_content = content.Content(
+        {
+            "role": "model",
+            "parts": [{"text": "hello"}],
+        }
+    )
+    model_message = convert_content_to_input_message(model_content)
+    assert model_message.role == "assistant"
+
+    tool_content = content.Content(
+        {
+            "role": "user",
+            "parts": [
+                {
+                    "function_response": {
+                        "name": "search",
+                        "response": {"answer": "world"},
+                    }
+                }
+            ],
+        }
+    )
+    tool_message = convert_content_to_input_message(tool_content)
+    assert tool_message.role == "tool"
+
+
 def test_extract_tool_definitions():
     """extract_tool_definitions converts Tool protos to dicts."""
     t = tool.Tool(