Update system instruction from 1 text part to a list of MessageParts

Author: DylanRussell

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

@@ -35,8 +35,8 @@
 )
 from opentelemetry.instrumentation.vertexai.utils import (
     GenerateContentParams,
-    convert_content_to_message,
-    convert_response_to_output_messages,
+    _map_finish_reason,
+    convert_content_to_message_parts,
     get_genai_request_attributes,
     get_genai_response_attributes,
     get_server_attributes,
@@ -51,7 +51,8 @@
 from opentelemetry.util.genai.completion_hook import CompletionHook
 from opentelemetry.util.genai.types import (
     ContentCapturingMode,
-    Text,
+    InputMessage,
+    OutputMessage,
 )
 from opentelemetry.util.genai.utils import Base64JsonEncoder
 
@@ -179,21 +180,30 @@ def handle_response(
                 )
                 system_instructions, inputs, outputs = [], [], []
                 if params.system_instruction:
-                    system_instructions = [
-                        Text(
-                            content="\n".join(
-                                part.text
-                                for part in params.system_instruction.parts
-                            )
-                        )
-                    ]
+                    system_instructions = convert_content_to_message_parts(
+                        params.system_instruction
+                    )
                 if params.contents:
                     inputs = [
-                        convert_content_to_message(content)
+                        InputMessage(
+                            role=content.role,
+                            parts=convert_content_to_message_parts(content),
+                        )
                         for content in params.contents
                     ]
                 if response:
-                    outputs = convert_response_to_output_messages(response)
+                    outputs = [
+                        OutputMessage(
+                            finish_reason=_map_finish_reason(
+                                candidate.finish_reason
+                            ),
+                            role=candidate.content.role,
+                            parts=convert_content_to_message_parts(
+                                candidate.content
+                            ),
+                        )
+                        for candidate in response.candidates
+                    ]
                 content_attributes = {
                     k: [asdict(x) for x in v]
                     for k, v in [

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

@@ -53,9 +53,7 @@
 from opentelemetry.util.genai.types import (
     ContentCapturingMode,
     FinishReason,
-    InputMessage,
     MessagePart,
-    OutputMessage,
     Text,
     ToolCall,
     ToolCallResponse,
@@ -310,26 +308,9 @@ def request_to_events(
         yield user_event(role=content.role, content=request_content)
 
 
-def convert_response_to_output_messages(
-    response: prediction_service.GenerateContentResponse
-    | prediction_service_v1beta1.GenerateContentResponse,
-) -> list[OutputMessage]:
-    output_messages: list[OutputMessage] = []
-    for candidate in response.candidates:
-        message = convert_content_to_message(candidate.content)
-        output_messages.append(
-            OutputMessage(
-                finish_reason=_map_finish_reason(candidate.finish_reason),
-                role=message.role,
-                parts=message.parts,
-            )
-        )
-    return output_messages
-
-
-def convert_content_to_message(
+def convert_content_to_message_parts(
     content: content.Content | content_v1beta1.Content,
-) -> InputMessage:
+) -> list[MessagePart]:
     parts: MessagePart = []
     for idx, part in enumerate(content.parts):
         if "function_response" in part:
@@ -359,7 +340,7 @@ def convert_content_to_message(
             )
             dict_part["type"] = type(part)
             parts.append(dict_part)
-    return InputMessage(role=content.role, parts=parts)
+    return parts
 
 
 def response_to_events(