Skip to content

Commit 26c92b5

Browse files
committed
lint
1 parent e36fe2a commit 26c92b5

File tree

6 files changed

+30
-25
lines changed

6 files changed

+30
-25
lines changed

docs/conf.py

+8-1
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,14 @@
6767
for f in listdir(resource)
6868
if isdir(join(resource, f))
6969
]
70-
sys.path[:0] = exp_dirs + instr_dirs + instr_genai_dirs + sdk_ext_dirs + prop_dirs + resource_dirs
70+
sys.path[:0] = (
71+
exp_dirs
72+
+ instr_dirs
73+
+ instr_genai_dirs
74+
+ sdk_ext_dirs
75+
+ prop_dirs
76+
+ resource_dirs
77+
)
7178

7279
# -- Project information -----------------------------------------------------
7380

docs/instrumentation-genai/openai.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
OpenTelemetry Python - OpenAI Instrumentation
2-
===========================================
2+
============================================
33

44
.. automodule:: opentelemetry.instrumentation.openai_v2
55
:members:

instrumentation-genai/opentelemetry-instrumentation-openai-v2/examples/manual/main.py

+15-11
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,20 @@
22

33
from openai import OpenAI
44

5-
from opentelemetry.instrumentation.openai_v2 import OpenAIInstrumentor
6-
75
# NOTE: OpenTelemetry Python Logs and Events APIs are in beta
8-
from opentelemetry import trace, _logs, _events
9-
from opentelemetry.sdk.trace import TracerProvider
10-
from opentelemetry.sdk._logs import LoggerProvider
6+
from opentelemetry import _events, _logs, trace
7+
from opentelemetry.exporter.otlp.proto.http._log_exporter import (
8+
OTLPLogExporter,
9+
)
10+
from opentelemetry.exporter.otlp.proto.http.trace_exporter import (
11+
OTLPSpanExporter,
12+
)
13+
from opentelemetry.instrumentation.openai_v2 import OpenAIInstrumentor
1114
from opentelemetry.sdk._events import EventLoggerProvider
12-
13-
from opentelemetry.sdk.trace.export import BatchSpanProcessor
15+
from opentelemetry.sdk._logs import LoggerProvider
1416
from opentelemetry.sdk._logs.export import BatchLogRecordProcessor
15-
from opentelemetry.exporter.otlp.proto.http.trace_exporter import OTLPSpanExporter
16-
from opentelemetry.exporter.otlp.proto.http._log_exporter import OTLPLogExporter
17+
from opentelemetry.sdk.trace import TracerProvider
18+
from opentelemetry.sdk.trace.export import BatchSpanProcessor
1719

1820
# configure tracing
1921
trace.set_tracer_provider(TracerProvider())
@@ -23,14 +25,16 @@
2325

2426
# configure logging and events
2527
_logs.set_logger_provider(LoggerProvider())
26-
_logs.get_logger_provider().add_log_record_processor(BatchLogRecordProcessor(OTLPLogExporter()))
28+
_logs.get_logger_provider().add_log_record_processor(
29+
BatchLogRecordProcessor(OTLPLogExporter())
30+
)
2731
_events.set_event_logger_provider(EventLoggerProvider())
2832

2933
# instrument OpenAI
3034
OpenAIInstrumentor().instrument()
3135

32-
def main():
3336

37+
def main():
3438
client = OpenAI()
3539
chat_completion = client.chat.completions.create(
3640
model=os.getenv("CHAT_MODEL", "gpt-4o-mini"),

instrumentation-genai/opentelemetry-instrumentation-openai-v2/test-requirements-0.txt

+1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ pytest==7.4.4
77
pytest-vcr==1.0.2
88
pytest-asyncio==0.21.0
99
wrapt==1.16.0
10+
opentelemetry-exporter-otlp-proto-http~=1.28
1011
opentelemetry-api==1.28 # when updating, also update in pyproject.toml
1112
opentelemetry-sdk==1.28 # when updating, also update in pyproject.toml
1213
opentelemetry-semantic-conventions==0.49b0 # when updating, also update in pyproject.toml

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

+3-6
Original file line numberDiff line numberDiff line change
@@ -86,19 +86,16 @@ async def test_async_chat_completion_no_content(
8686
logs = log_exporter.get_finished_logs()
8787
assert len(logs) == 2
8888

89-
assert_message_in_logs(
90-
logs[0], "gen_ai.user.message", None, spans[0]
91-
)
89+
assert_message_in_logs(logs[0], "gen_ai.user.message", None, spans[0])
9290

9391
choice_event = {
9492
"index": 0,
9593
"finish_reason": "stop",
96-
"message": {
97-
"role": "assistant"
98-
},
94+
"message": {"role": "assistant"},
9995
}
10096
assert_message_in_logs(logs[1], "gen_ai.choice", choice_event, spans[0])
10197

98+
10299
@pytest.mark.asyncio()
103100
async def test_async_chat_completion_bad_endpoint(
104101
span_exporter, instrument_no_content

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

+2-6
Original file line numberDiff line numberDiff line change
@@ -84,16 +84,12 @@ def test_chat_completion_no_content(
8484
logs = log_exporter.get_finished_logs()
8585
assert len(logs) == 2
8686

87-
assert_message_in_logs(
88-
logs[0], "gen_ai.user.message", None, spans[0]
89-
)
87+
assert_message_in_logs(logs[0], "gen_ai.user.message", None, spans[0])
9088

9189
choice_event = {
9290
"index": 0,
9391
"finish_reason": "stop",
94-
"message": {
95-
"role": "assistant"
96-
},
92+
"message": {"role": "assistant"},
9793
}
9894
assert_message_in_logs(logs[1], "gen_ai.choice", choice_event, spans[0])
9995

0 commit comments

Comments
 (0)