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 src/integration/chat.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,11 @@ describe('Requesty Integration - Chat', () => {
inputTokens: 10,
outputTokens: 9,
totalTokens: 19,
raw: {
prompt_tokens: 10,
completion_tokens: 9,
total_tokens: 19,
},
})
})

Expand Down
34 changes: 21 additions & 13 deletions src/requesty-chat-language-model.ts
Original file line number Diff line number Diff line change
Expand Up @@ -205,20 +205,27 @@ export class RequestyChatLanguageModel implements LanguageModelV2 {
throw new Error('No choice in response')
}

const providerMetadata = response.usage?.prompt_tokens_details
? ({
requesty: {
usage: {
cachingTokens:
response.usage.prompt_tokens_details
.caching_tokens ?? 0,
cachedTokens:
response.usage.prompt_tokens_details
.cached_tokens ?? 0,
const hasPromptTokensDetails = response.usage?.prompt_tokens_details
const hasCost = response.usage?.cost != null

const providerMetadata =
hasPromptTokensDetails || hasCost
? ({
requesty: {
usage: {
cachingTokens:
response.usage?.prompt_tokens_details
?.caching_tokens ?? 0,
cachedTokens:
response.usage?.prompt_tokens_details
?.cached_tokens ?? 0,
...(hasCost
? { cost: response.usage!.cost }
: {}),
},
},
},
} satisfies SharedV2ProviderMetadata)
: undefined
} satisfies SharedV2ProviderMetadata)
: undefined

// Convert to content format
const content: Array<LanguageModelV2Content> = []
Expand Down Expand Up @@ -428,6 +435,7 @@ export const RequestyStreamChatCompletionChunkSchema = z.object({
cached_tokens: z.number().optional(),
})
.optional(),
cost: z.number().optional(),
})
.optional(),
error: z.any().optional(),
Expand Down
10 changes: 7 additions & 3 deletions src/stream/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ function handleUsageChunk(

const requestyUsage: Partial<RequestyUsage> = {
cachingTokens: usage.prompt_tokens_details?.caching_tokens ?? 0,
...(usage.cost != null ? { cost: usage.cost } : {}),
}

return [modelUsage, requestyUsage]
Expand Down Expand Up @@ -307,14 +308,17 @@ export const createFlush = ({
const providerMetadata: SharedV2ProviderMetadata = {
requesty: {
usage:
currentRequestyUsage.cachedTokens &&
currentRequestyUsage.cachingTokens
currentRequestyUsage.cachedTokens ||
currentRequestyUsage.cachingTokens ||
currentRequestyUsage.cost != null
? currentRequestyUsage
: {},
},
}

const hasProviderMetadata = providerMetadata.requesty?.usage
const hasProviderMetadata =
providerMetadata.requesty?.usage &&
Object.keys(providerMetadata.requesty.usage).length > 0

const currentFinishReason = finishReason.get()
const currentUsage = usage.get()
Expand Down
1 change: 1 addition & 0 deletions src/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ export type RequestySharedSettings = RequestyProviderOptions & {
export type RequestyUsage = {
cachingTokens?: number
cachedTokens?: number
cost?: number
}

export type RequestyProviderMetadata = {
Expand Down
Loading