Skip to content
Merged
Show file tree
Hide file tree
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
5 changes: 5 additions & 0 deletions .changeset/shaky-bananas-check.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@openai/agents-openai': patch
---

Export usage data from Chat Completions response for trace
12 changes: 12 additions & 0 deletions packages/agents-openai/src/openaiChatCompletionsModel.ts
Original file line number Diff line number Diff line change
Expand Up @@ -214,6 +214,18 @@ export class OpenAIChatCompletionsModel implements Model {
response,
stream,
)) {
if (
event.type === 'response_done' &&
response.usage?.total_tokens === 0
) {
response.usage = {
prompt_tokens: event.response.usage.inputTokens,
completion_tokens: event.response.usage.outputTokens,
total_tokens: event.response.usage.totalTokens,
prompt_tokens_details: event.response.usage.inputTokensDetails,
completion_tokens_details: event.response.usage.outputTokensDetails,
};
}
yield event;
}

Expand Down
53 changes: 53 additions & 0 deletions packages/agents-openai/test/openaiChatCompletionsModel.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -482,4 +482,57 @@ describe('OpenAIChatCompletionsModel', () => {
expect(convertChatCompletionsStreamToResponses).toHaveBeenCalled();
expect(events).toEqual([{ type: 'first' }, { type: 'second' }]);
});

it('populates usage from response_done event when initial usage is zero', async () => {
// override the original implementation to add the response_done event.
vi.mocked(convertChatCompletionsStreamToResponses).mockImplementationOnce(
async function* () {
yield { type: 'first' } as any;
yield { type: 'second' } as any;
yield {
type: 'response_done',
response: {
usage: {
inputTokens: 10,
outputTokens: 5,
totalTokens: 15,
inputTokensDetails: { cached_tokens: 2 },
outputTokensDetails: { reasoning_tokens: 3 },
},
},
} as any;
},
);

const client = new FakeClient();
async function* fakeStream() {
yield { id: 'c' } as any;
}
client.chat.completions.create.mockResolvedValue(fakeStream());

const model = new OpenAIChatCompletionsModel(client as any, 'gpt');
const req: any = {
input: 'hi',
modelSettings: {},
tools: [],
outputType: 'text',
handoffs: [],
tracing: false,
};
const events: any[] = [];
await withTrace('t', async () => {
for await (const e of model.getStreamedResponse(req)) {
events.push(e);
}
});

expect(client.chat.completions.create).toHaveBeenCalledWith(
expect.objectContaining({ stream: true }),
{ headers: HEADERS, signal: undefined },
);
expect(convertChatCompletionsStreamToResponses).toHaveBeenCalled();
const responseDone = events.find((e) => e.type === 'response_done');
expect(responseDone).toBeDefined();
expect(responseDone.response.usage.totalTokens).toBe(15);
});
});