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
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ import {
modelRetainsPrompts,
modelTrains,
} from '@/lib/ai-gateway/providers/openrouter/model-data-policy';
import { getModelDisplayPricing } from '@/lib/ai-gateway/providers/openrouter/display-pricing';
import { canManageOrganization } from '@kilocode/app-shared/organizations';

type Props = {
Expand Down Expand Up @@ -273,15 +274,16 @@ export function OrganizationProvidersAndModelsPage({ organizationId, role }: Pro
m => m.endpoint && normalizeModelId(m.slug) === infoModel.modelId
);
if (!model || !model.endpoint) continue;
const pricing = getModelDisplayPricing(model.endpoint.pricing) ?? model.endpoint.pricing;

offerings.push({
providerSlug: provider.slug,
providerDisplayName: provider.displayName,
providerIconUrl: provider.icon?.url ? normalizeProviderIconUrl(provider.icon.url) : null,
trains: modelTrains(model, provider.dataPolicy.training),
retainsPrompts: modelRetainsPrompts(model, provider.dataPolicy.retainsPrompts),
promptPrice: model.endpoint.pricing.prompt,
completionPrice: model.endpoint.pricing.completion,
promptPrice: pricing.prompt,
completionPrice: pricing.completion,
});
}

Expand Down Expand Up @@ -417,13 +419,14 @@ export function OrganizationProvidersAndModelsPage({ organizationId, role }: Pro
if (!model.endpoint) continue;
const normalizedModelId = normalizeModelId(model.slug);
const sourceIndex = rows.length;
const pricing = getModelDisplayPricing(model.endpoint.pricing) ?? model.endpoint.pricing;
rows.push({
modelId: normalizedModelId,
modelName: model.name,
preferredIndex: preferredIndexByModelId.get(normalizedModelId),
sourceIndex,
promptPrice: model.endpoint.pricing.prompt,
completionPrice: model.endpoint.pricing.completion,
promptPrice: pricing.prompt,
completionPrice: pricing.completion,
trains: modelTrains(model, provider.dataPolicy.training),
retainsPrompts: modelRetainsPrompts(model, provider.dataPolicy.retainsPrompts),
});
Expand Down
13 changes: 13 additions & 0 deletions packages/db/src/schema-types.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import { describe, expect, it } from '@jest/globals';
import {
CodeReviewCouncilConfigSchema,
ModelsSchema,
OpenRouterPricing,
OrganizationSettingsSchema,
StoredModelSchema,
} from './schema-types';
Expand Down Expand Up @@ -128,6 +129,18 @@ describe('ModelsSchema', () => {
});
});

describe('OpenRouterPricing', () => {
it('preserves discounts used to calculate display pricing', () => {
const pricing = OpenRouterPricing.parse({
prompt: '0.000000435',
completion: '0.00000087',
discount: 0.5,
});

expect(pricing.discount).toBe(0.5);
});
});

describe('StoredModelSchema', () => {
it('includes model reasoning metadata', () => {
const storedModel: StoredModel = {
Expand Down
1 change: 1 addition & 0 deletions packages/db/src/schema-types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1851,6 +1851,7 @@ export type OpenRouterPricing = z.infer<typeof OpenRouterPricing>;
export const OpenRouterPricing = z.object({
prompt: z.string(),
completion: z.string(),
discount: z.number().optional(),
});

export type OpenRouterBaseModel = z.infer<typeof OpenRouterBaseModel>;
Expand Down