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
13 changes: 12 additions & 1 deletion packages/openai-adapters/src/apis/OpenAI.ts
Original file line number Diff line number Diff line change
Expand Up @@ -117,8 +117,19 @@ export class OpenAIApi implements BaseLlmApi {
signal,
},
);
let lastChunkWithUsage: ChatCompletionChunk | undefined;
for await (const result of response) {
yield result;
// Check if this chunk contains usage information
if (result.usage) {
// Store it to emit after all content chunks
lastChunkWithUsage = result;
} else {
yield result;
}
}
// Emit the usage chunk at the end if we have one
if (lastChunkWithUsage) {
yield lastChunkWithUsage;
}
}
async completionNonStream(
Expand Down
17 changes: 17 additions & 0 deletions packages/openai-adapters/src/test/util.ts
Original file line number Diff line number Diff line change
Expand Up @@ -207,6 +207,23 @@ export function testChat(
const completion = response.choices[0].message.content;
expect(typeof completion).toBe("string");
expect(completion?.length).toBeGreaterThan(0);

if (options?.expectUsage === true) {
expect(response.usage).toBeDefined();
expect(response.usage!.completion_tokens).toBeGreaterThan(0);
expect(response.usage!.prompt_tokens).toBeGreaterThan(0);
// Gemini 2.5 models have thinking tokens, so total_tokens >= prompt + completion
// Other models should have total_tokens = prompt + completion
if (model.includes("gemini-2.5") || model.includes("gemini-2.0")) {
expect(response.usage!.total_tokens).toBeGreaterThanOrEqual(
response.usage!.prompt_tokens + response.usage!.completion_tokens,
);
} else {
expect(response.usage!.total_tokens).toEqual(
response.usage!.prompt_tokens + response.usage!.completion_tokens,
);
}
}
});

test("should acknowledge system message in chat", async () => {
Expand Down
Loading