Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
86 changes: 80 additions & 6 deletions tests/otel_integrations/test_openai.py
Original file line number Diff line number Diff line change
Expand Up @@ -277,6 +277,11 @@ def request_handler(request: httpx.Request) -> httpx.Response:
created=123,
model='gpt-3.5-turbo-instruct',
object='text_completion',
usage=completion_usage.CompletionUsage(
completion_tokens=1,
prompt_tokens=2,
total_tokens=3,
),
).model_dump(mode='json'),
)
elif request.url == 'https://api.openai.com/v1/embeddings':
Expand Down Expand Up @@ -1403,7 +1408,19 @@ def test_completions(instrumented_client: openai.Client, exporter: TestExporter)
'gen_ai.system': 'openai',
'gen_ai.request.model': 'gpt-3.5-turbo-instruct',
'gen_ai.response.model': 'gpt-3.5-turbo-instruct',
'response_data': {'finish_reason': 'stop', 'text': 'Nine', 'usage': None},
'gen_ai.usage.input_tokens': 2,
'gen_ai.usage.output_tokens': 1,
'response_data': {
'finish_reason': 'stop',
'text': 'Nine',
'usage': {
'completion_tokens': 1,
'prompt_tokens': 2,
'total_tokens': 3,
'completion_tokens_details': None,
'prompt_tokens_details': None,
},
},
'logfire.json_schema': {
'type': 'object',
'properties': {
Expand All @@ -1412,7 +1429,18 @@ def test_completions(instrumented_client: openai.Client, exporter: TestExporter)
'gen_ai.system': {},
'gen_ai.request.model': {},
'gen_ai.response.model': {},
'response_data': {'type': 'object'},
'gen_ai.usage.input_tokens': {},
'gen_ai.usage.output_tokens': {},
'response_data': {
'type': 'object',
'properties': {
'usage': {
'type': 'object',
'title': 'CompletionUsage',
'x-python-datatype': 'PydanticModel',
}
},
},
},
},
},
Expand Down Expand Up @@ -1903,7 +1931,19 @@ def test_dont_suppress_httpx(exporter: TestExporter) -> None:
'gen_ai.system': 'openai',
'gen_ai.request.model': 'gpt-3.5-turbo-instruct',
'gen_ai.response.model': 'gpt-3.5-turbo-instruct',
'response_data': {'finish_reason': 'stop', 'text': 'Nine', 'usage': None},
'gen_ai.usage.input_tokens': 2,
'gen_ai.usage.output_tokens': 1,
'response_data': {
'finish_reason': 'stop',
'text': 'Nine',
'usage': {
'completion_tokens': 1,
'prompt_tokens': 2,
'total_tokens': 3,
'completion_tokens_details': None,
'prompt_tokens_details': None,
},
},
'logfire.json_schema': {
'type': 'object',
'properties': {
Expand All @@ -1912,7 +1952,18 @@ def test_dont_suppress_httpx(exporter: TestExporter) -> None:
'gen_ai.system': {},
'gen_ai.request.model': {},
'gen_ai.response.model': {},
'response_data': {'type': 'object'},
'gen_ai.usage.input_tokens': {},
'gen_ai.usage.output_tokens': {},
'response_data': {
'type': 'object',
'properties': {
'usage': {
'type': 'object',
'title': 'CompletionUsage',
'x-python-datatype': 'PydanticModel',
}
},
},
},
},
'logfire.metrics': {
Expand Down Expand Up @@ -1985,7 +2036,19 @@ def test_suppress_httpx(exporter: TestExporter) -> None:
'gen_ai.system': 'openai',
'gen_ai.request.model': 'gpt-3.5-turbo-instruct',
'gen_ai.response.model': 'gpt-3.5-turbo-instruct',
'response_data': {'finish_reason': 'stop', 'text': 'Nine', 'usage': None},
'gen_ai.usage.input_tokens': 2,
'gen_ai.usage.output_tokens': 1,
'response_data': {
'finish_reason': 'stop',
'text': 'Nine',
'usage': {
'completion_tokens': 1,
'prompt_tokens': 2,
'total_tokens': 3,
'completion_tokens_details': None,
'prompt_tokens_details': None,
},
},
'logfire.json_schema': {
'type': 'object',
'properties': {
Expand All @@ -1994,7 +2057,18 @@ def test_suppress_httpx(exporter: TestExporter) -> None:
'gen_ai.system': {},
'gen_ai.request.model': {},
'gen_ai.response.model': {},
'response_data': {'type': 'object'},
'gen_ai.usage.input_tokens': {},
'gen_ai.usage.output_tokens': {},
'response_data': {
'type': 'object',
'properties': {
'usage': {
'type': 'object',
'title': 'CompletionUsage',
'x-python-datatype': 'PydanticModel',
}
},
},
},
},
},
Expand Down
Loading