lint

Author: Liudmila Molkova

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

@@ -85,6 +85,6 @@ def _instrument(self, **kwargs):
         )
 
     def _uninstrument(self, **kwargs):
-        import openai
+        import openai  # pylint: disable=import-outside-toplevel
 
         unwrap(openai.resources.chat.completions.Completions, "create")

instrumentation/opentelemetry-instrumentation-openai-v2/src/opentelemetry/instrumentation/openai_v2/patch.py

@@ -66,13 +66,13 @@ def traced_method(wrapped, instance, args, kwargs):
                     return StreamWrapper(
                         result, span, event_logger, capture_content
                     )
-                else:
-                    if span.is_recording():
-                        _set_response_attributes(
-                            span, result, event_logger, capture_content
-                        )
-                    span.end()
-                    return result
+
+                if span.is_recording():
+                    _set_response_attributes(
+                        span, result, event_logger, capture_content
+                    )
+                span.end()
+                return result
 
             except Exception as error:
                 span.set_status(Status(StatusCode.ERROR, str(error)))
@@ -161,7 +161,7 @@ def append_text_content(self, content):
     def append_tool_call(self, tool_call):
         idx = tool_call.index
         # make sure we have enough tool call buffers
-        for i in range(len(self.tool_calls_buffers), idx + 1):
+        for _ in range(len(self.tool_calls_buffers), idx + 1):
             self.tool_calls_buffers.append(None)
 
         if not self.tool_calls_buffers[idx]:
@@ -241,9 +241,7 @@ def cleanup(self):
                 self.finish_reasons,
             )
 
-            for c in range(len(self.choice_buffers)):
-                choice = self.choice_buffers[c]
-
+            for idx, choice in enumerate(self.choice_buffers):
                 message = {"role": "assistant"}
                 if self.capture_content and choice.text_content:
                     message["content"] = "".join(choice.text_content)
@@ -264,7 +262,7 @@ def cleanup(self):
                     message["tool_calls"] = tool_calls
 
                 body = {
-                    "index": c,
+                    "index": idx,
                     "finish_reason": choice.finish_reason or "error",
                     "message": message,
                 }
@@ -356,8 +354,8 @@ def build_streaming_response(self, chunk):
                 continue
 
             # make sure we have enough choice buffers
-            for i in range(len(self.choice_buffers), choice.index + 1):
-                self.choice_buffers.append(ChoiceBuffer(i))
+            for idx in range(len(self.choice_buffers), choice.index + 1):
+                self.choice_buffers.append(ChoiceBuffer(idx))
 
             if choice.finish_reason:
                 self.choice_buffers[

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

@@ -51,7 +51,7 @@ def silently_fail(func):
     def wrapper(*args, **kwargs):
         try:
             return func(*args, **kwargs)
-        except Exception as exception:
+        except Exception as exception:  # pylint: disable=broad-exception-caught
             logger.warning(
                 "Failed to execute %s, error: %s",
                 func.__name__,
@@ -64,7 +64,7 @@ def wrapper(*args, **kwargs):
 def extract_tool_calls(item, capture_content):
     tool_calls = get_property_value(item, "tool_calls")
     if tool_calls is None:
-        return
+        return None
 
     calls = []
     for tool_call in tool_calls:
@@ -88,9 +88,7 @@ def extract_tool_calls(item, capture_content):
             arguments = get_property_value(func, "arguments")
             if capture_content and arguments:
                 if isinstance(arguments, str):
-                    arguments = arguments.replace(
-                        "\n", ""
-                    )
+                    arguments = arguments.replace("\n", "")
                 tool_call_dict["function"]["arguments"] = arguments
 
         calls.append(tool_call_dict)
@@ -108,12 +106,9 @@ def set_server_address_and_port(client_instance, attributes):
         attributes[ServerAttributes.SERVER_ADDRESS] = base_url.host
         port = base_url.port
     elif isinstance(base_url, str):
-        try:
-            url = urlparse(base_url)
-            attributes[ServerAttributes.SERVER_ADDRESS] = url.hostname
-            port = url.port
-        except Exception:
-            pass
+        url = urlparse(base_url)
+        attributes[ServerAttributes.SERVER_ADDRESS] = url.hostname
+        port = url.port
 
     if port and port != 443 and port > 0:
         attributes[ServerAttributes.SERVER_PORT] = port

instrumentation/opentelemetry-instrumentation-openai-v2/tests/conftest.py

@@ -22,27 +22,27 @@
 )
 
 
-@pytest.fixture(scope="function")
-def span_exporter():
+@pytest.fixture(scope="function", name="span_exporter")
+def fixture_span_exporter():
     exporter = InMemorySpanExporter()
     yield exporter
 
 
-@pytest.fixture(scope="function")
-def log_exporter():
+@pytest.fixture(scope="function", name="log_exporter")
+def fixture_log_exporter():
     exporter = InMemoryLogExporter()
     yield exporter
 
 
-@pytest.fixture(scope="function")
-def tracer_provider(span_exporter):
+@pytest.fixture(scope="function", name="tracer_provider")
+def fixture_tracer_provider(span_exporter):
     provider = TracerProvider()
     provider.add_span_processor(SimpleSpanProcessor(span_exporter))
     return provider
 
 
-@pytest.fixture(scope="function")
-def event_logger_provider(log_exporter):
+@pytest.fixture(scope="function", name="event_logger_provider")
+def fixture_event_logger_provider(log_exporter):
     provider = LoggerProvider()
     provider.add_log_record_processor(SimpleLogRecordProcessor(log_exporter))
     event_logger_provider = EventLoggerProvider(provider)
@@ -74,7 +74,8 @@ def vcr_config():
 def instrument_no_content(tracer_provider, event_logger_provider):
     instrumentor = OpenAIInstrumentor()
     instrumentor.instrument(
-        tracer_provider=tracer_provider, event_logger_provider=event_logger_provider
+        tracer_provider=tracer_provider,
+        event_logger_provider=event_logger_provider,
     )
 
     yield instrumentor
@@ -88,7 +89,8 @@ def instrument_with_content(tracer_provider, event_logger_provider):
     )
     instrumentor = OpenAIInstrumentor()
     instrumentor.instrument(
-        tracer_provider=tracer_provider, event_logger_provider=event_logger_provider
+        tracer_provider=tracer_provider,
+        event_logger_provider=event_logger_provider,
     )
 
     yield instrumentor

instrumentation/opentelemetry-instrumentation-openai-v2/tests/test_chat_completions.py

@@ -58,14 +58,15 @@ def test_chat_completion_bad_endpoint(span_exporter, instrument_no_content):
 
     client = OpenAI(base_url="http://localhost:4242")
 
+    exception = None
     try:
         client.chat.completions.create(
             messages=messages_value,
             model=llm_model_value,
             timeout=0.1,
         )
         assert False, "Expected an exception"
-    except Exception as ex:
+    except Exception as ex:  # pylint: disable=broad-exception-caught
         exception = ex
 
     spans = span_exporter.get_finished_spans()
@@ -86,14 +87,15 @@ def test_chat_completion_404(
     llm_model_value = "this-model-does-not-exist"
     messages_value = [{"role": "user", "content": "Say this is a test"}]
 
+    exception = None
     try:
         openai_client.chat.completions.create(
             messages=messages_value,
             model=llm_model_value,
             timeout=0.1,
         )
         assert False, "Expected an exception"
-    except Exception as ex:
+    except Exception as ex:  # pylint: disable=broad-exception-caught
         exception = ex
 
     spans = span_exporter.get_finished_spans()
@@ -436,10 +438,10 @@ def test_chat_completion_streaming_not_complete(
     response_stream_id = None
     response_stream_result = ""
     response = openai_client.chat.completions.create(**kwargs)
-    for i, chunk in enumerate(response):
+    for idx, chunk in enumerate(response):
         if chunk.choices:
             response_stream_result += chunk.choices[0].delta.content or ""
-        if i == 1:
+        if idx == 1:
             # fake a stop
             break
 
@@ -702,17 +704,17 @@ def assert_message_in_logs(log, event_name, expected_content, parent_span):
     assert_log_parent(log, parent_span)
 
 
-def remove_none_values(d):
+def remove_none_values(body):
     result = {}
-    for k, v in d.items():
-        if v is None:
+    for key, value in body.items():
+        if value is None:
             continue
-        elif isinstance(v, dict):
-            result[k] = remove_none_values(v)
-        elif isinstance(v, list):
-            result[k] = [remove_none_values(i) for i in v]
+        elif isinstance(value, dict):
+            result[key] = remove_none_values(value)
+        elif isinstance(value, list):
+            result[key] = [remove_none_values(i) for i in value]
         else:
-            result[k] = v
+            result[key] = value
     return result