align parse() wrapping with positional args after open-telemetry#4445 rebase

Author: Nik-Reddy

instrumentation-genai/opentelemetry-instrumentation-openai-v2/src/opentelemetry/instrumentation/openai_v2/__init__.py

@@ -200,10 +200,10 @@ def _instrument(self, **kwargs):
         self._parse_supported = _is_parse_supported()
         if self._parse_supported:
             wrap_function_wrapper(
-                module="openai.resources.chat.completions",
-                name="Completions.parse",
-                wrapper=(
-                    chat_completions_create_v_new(handler, content_mode)
+                "openai.resources.chat.completions",
+                "Completions.parse",
+                (
+                    chat_completions_create_v_new(handler)
                     if latest_experimental_enabled
                     else chat_completions_create_v_old(
                         tracer, logger, instruments, is_content_enabled()
@@ -212,10 +212,10 @@ def _instrument(self, **kwargs):
             )
 
             wrap_function_wrapper(
-                module="openai.resources.chat.completions",
-                name="AsyncCompletions.parse",
-                wrapper=(
-                    async_chat_completions_create_v_new(handler, content_mode)
+                "openai.resources.chat.completions",
+                "AsyncCompletions.parse",
+                (
+                    async_chat_completions_create_v_new(handler)
                     if latest_experimental_enabled
                     else async_chat_completions_create_v_old(
                         tracer, logger, instruments, is_content_enabled()

instrumentation-genai/opentelemetry-instrumentation-openai-v2/src/opentelemetry/instrumentation/openai_v2/utils.py

@@ -155,7 +155,9 @@ def choice_to_event(choice, capture_content):
     if choice.message:
         message = {
             "role": (
-                choice.message.role if choice.message and choice.message.role else None
+                choice.message.role
+                if choice.message and choice.message.role
+                else None
             )
         }
         tool_calls = extract_tool_calls(choice.message, capture_content)
@@ -240,10 +242,14 @@ def get_llm_request_attributes(
     if operation_name == GenAIAttributes.GenAiOperationNameValues.CHAT.value:
         attributes.update(
             {
-                GenAIAttributes.GEN_AI_REQUEST_TEMPERATURE: kwargs.get("temperature"),
+                GenAIAttributes.GEN_AI_REQUEST_TEMPERATURE: kwargs.get(
+                    "temperature"
+                ),
                 GenAIAttributes.GEN_AI_REQUEST_TOP_P: kwargs.get("p")
                 or kwargs.get("top_p"),
-                GenAIAttributes.GEN_AI_REQUEST_MAX_TOKENS: kwargs.get("max_tokens"),
+                GenAIAttributes.GEN_AI_REQUEST_MAX_TOKENS: kwargs.get(
+                    "max_tokens"
+                ),
                 GenAIAttributes.GEN_AI_REQUEST_PRESENCE_PENALTY: kwargs.get(
                     "presence_penalty"
                 ),
@@ -257,12 +263,16 @@ def get_llm_request_attributes(
         if (choice_count := kwargs.get("n")) is not None:
             # Only add non default, meaningful values
             if isinstance(choice_count, int) and choice_count != 1:
-                attributes[GenAIAttributes.GEN_AI_REQUEST_CHOICE_COUNT] = choice_count
+                attributes[GenAIAttributes.GEN_AI_REQUEST_CHOICE_COUNT] = (
+                    choice_count
+                )
 
         if (stop_sequences := kwargs.get("stop")) is not None:
             if isinstance(stop_sequences, str):
                 stop_sequences = [stop_sequences]
-            attributes[GenAIAttributes.GEN_AI_REQUEST_STOP_SEQUENCES] = stop_sequences
+            attributes[GenAIAttributes.GEN_AI_REQUEST_STOP_SEQUENCES] = (
+                stop_sequences
+            )
 
         request_response_format_attr_key = (
             GenAIAttributes.GEN_AI_OUTPUT_TYPE
@@ -308,7 +318,10 @@ def get_llm_request_attributes(
         )
 
     # Add embeddings-specific attributes
-    elif operation_name == GenAIAttributes.GenAiOperationNameValues.EMBEDDINGS.value:
+    elif (
+        operation_name
+        == GenAIAttributes.GenAiOperationNameValues.EMBEDDINGS.value
+    ):
         # Add embedding dimensions if specified
         if (dimensions := kwargs.get("dimensions")) is not None:
             # TODO: move to GEN_AI_EMBEDDINGS_DIMENSION_COUNT when 1.39.0 is baseline
@@ -363,7 +376,9 @@ def create_chat_invocation(
                 GenAIAttributes.GEN_AI_REQUEST_CHOICE_COUNT
             ] = choice_count
 
-    if (response_format := get_value(kwargs.get("response_format"))) is not None:
+    if (
+        response_format := get_value(kwargs.get("response_format"))
+    ) is not None:
         # response_format may be string, object with a string in the `type` key,
         # or a type (e.g. Pydantic model class used with parse())
         if isinstance(response_format, type):
@@ -414,13 +429,16 @@ def get_value(v: Any):
 def handle_span_exception(span, error: BaseException):
     span.set_status(Status(StatusCode.ERROR, str(error)))
     if span.is_recording():
-        span.set_attribute(ErrorAttributes.ERROR_TYPE, type(error).__qualname__)
+        span.set_attribute(
+            ErrorAttributes.ERROR_TYPE, type(error).__qualname__
+        )
     span.end()
 
 
 def _is_text_part(content: Any) -> bool:
     return isinstance(content, str) or (
-        isinstance(content, Iterable) and all(isinstance(part, str) for part in content)
+        isinstance(content, Iterable)
+        and all(isinstance(part, str) for part in content)
     )
 
 
@@ -471,7 +489,9 @@ def extract_tool_calls_new(tool_calls) -> list[ToolCallRequest]:
                     arguments = arguments_str
 
         # TODO: support custom
-        parts.append(ToolCallRequest(id=call_id, name=func_name, arguments=arguments))
+        parts.append(
+            ToolCallRequest(id=call_id, name=func_name, arguments=arguments)
+        )
     return parts
 
 

instrumentation-genai/opentelemetry-instrumentation-openai-v2/tests/test_async_structured_outputs.py

@@ -82,14 +82,18 @@ async def test_async_structured_output_with_content(
         )
         assert_messages_attribute(
             spans[0].attributes["gen_ai.output.messages"],
-            format_simple_expected_output_message(response.choices[0].message.content),
+            format_simple_expected_output_message(
+                response.choices[0].message.content
+            ),
         )
     else:
         logs = log_exporter.get_finished_logs()
         assert len(logs) == 2
 
         user_message = {"content": STRUCTURED_OUTPUT_PROMPT[0]["content"]}
-        assert_message_in_logs(logs[0], "gen_ai.user.message", user_message, spans[0])
+        assert_message_in_logs(
+            logs[0], "gen_ai.user.message", user_message, spans[0]
+        )
 
         choice_event = {
             "index": 0,
@@ -99,7 +103,9 @@ async def test_async_structured_output_with_content(
                 "content": response.choices[0].message.content,
             },
         }
-        assert_message_in_logs(logs[1], "gen_ai.choice", choice_event, spans[0])
+        assert_message_in_logs(
+            logs[1], "gen_ai.choice", choice_event, spans[0]
+        )
 
 
 @pytest.mark.asyncio()
@@ -157,4 +163,6 @@ async def test_async_structured_output_no_content(
             "finish_reason": "stop",
             "message": {"role": "assistant"},
         }
-        assert_message_in_logs(logs[1], "gen_ai.choice", choice_event, spans[0])
+        assert_message_in_logs(
+            logs[1], "gen_ai.choice", choice_event, spans[0]
+        )

instrumentation-genai/opentelemetry-instrumentation-openai-v2/tests/test_structured_outputs.py

@@ -75,14 +75,18 @@ def test_structured_output_with_content(
         )
         assert_messages_attribute(
             spans[0].attributes["gen_ai.output.messages"],
-            format_simple_expected_output_message(response.choices[0].message.content),
+            format_simple_expected_output_message(
+                response.choices[0].message.content
+            ),
         )
     else:
         logs = log_exporter.get_finished_logs()
         assert len(logs) == 2
 
         user_message = {"content": STRUCTURED_OUTPUT_PROMPT[0]["content"]}
-        assert_message_in_logs(logs[0], "gen_ai.user.message", user_message, spans[0])
+        assert_message_in_logs(
+            logs[0], "gen_ai.user.message", user_message, spans[0]
+        )
 
         choice_event = {
             "index": 0,
@@ -92,7 +96,9 @@ def test_structured_output_with_content(
                 "content": response.choices[0].message.content,
             },
         }
-        assert_message_in_logs(logs[1], "gen_ai.choice", choice_event, spans[0])
+        assert_message_in_logs(
+            logs[1], "gen_ai.choice", choice_event, spans[0]
+        )
 
 
 def test_structured_output_no_content(
@@ -145,4 +151,6 @@ def test_structured_output_no_content(
             "finish_reason": "stop",
             "message": {"role": "assistant"},
         }
-        assert_message_in_logs(logs[1], "gen_ai.choice", choice_event, spans[0])
+        assert_message_in_logs(
+            logs[1], "gen_ai.choice", choice_event, spans[0]
+        )