Skip to content

fix: strip models/ prefix from Google Gemini model names for correct cost calculation #5592

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ink-the-squid wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: strip models/ prefix from Google Gemini model names for correct cost calculation #5592

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 3 additions & 2 deletions valhalla/jawn/src/lib/handlers/ResponseBodyHandler.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,10 +201,11 @@ export class ResponseBodyHandler extends AbstractLogHandler {
} else if (parsedUsage.data) {
context.usage = parsedUsage.data ?? null;

const providerModelId =
const providerModelId = (
context.message.heliconeMeta.providerModelId ??
(!isAIGateway ? context.processedLog.model : "") ??
"";
""
).replace(/^models\//, "");

const breakdown = modelCostBreakdownFromRegistry({
modelUsage: parsedUsage.data,
Expand Down
11 changes: 7 additions & 4 deletions valhalla/jawn/src/utils/modelMapper.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,9 @@ export function getModelFromRequest(
// eslint-disable-next-line @typescript-eslint/no-explicit-any
if (requestBody && (requestBody as any).model) {
// eslint-disable-next-line @typescript-eslint/no-explicit-any
return (requestBody as any).model;
const model = (requestBody as any).model;
// Strip Google's "models/" prefix for consistent cost registry lookups
return typeof model === "string" ? model.replace(/^models\//, "") : model;
}

if (targetUrl && targetUrl.toLowerCase().includes("firecrawl")) {
Expand Down Expand Up @@ -53,13 +55,14 @@ function getModelFromPath(path: string) {
}

export function getModelFromResponse(responseBody: any) {
return (
const model =
responseBody?.model ??
responseBody?.body?.model ??
responseBody?.body?.modelVersion ??
responseBody?.providerMetadata?.gateway?.routing?.originalModelId ??
null
);
null;
// Strip Google's "models/" prefix for consistent cost registry lookups
return typeof model === "string" ? model.replace(/^models\//, "") : model;
}

export function calculateModel(
Expand Down
Loading