refactor: merge cost info into modelConfigs (#315)

*Issue #, if available:*

*Description of changes:*




By submitting this pull request, I confirm that you can use, modify,
copy, and redistribute this contribution, under the terms of your
choice.

Author: tmokmss

packages/agent-core/src/lib/cost.test.ts

@@ -0,0 +1,64 @@
+import { expect, test } from 'vitest';
+import { calculateCost } from './cost';
+
+test('calculateCost for sonnet3.7 model', () => {
+  // GIVEN
+  const modelId = 'us.anthropic.claude-3-7-sonnet-20250219-v1:0';
+  const inputTokens = 1000;
+  const outputTokens = 500;
+  const cacheReadTokens = 200;
+  const cacheWriteTokens = 100;
+
+  // WHEN
+  const cost = calculateCost(modelId, inputTokens, outputTokens, cacheReadTokens, cacheWriteTokens);
+
+  // THEN
+  const expectedCost = (1000 * 0.003 + 500 * 0.015 + 200 * 0.0003 + 100 * 0.00375) / 1000;
+  expect(cost).toBe(expectedCost);
+});
+
+test('calculateCost for haiku3.5 model', () => {
+  // GIVEN
+  const modelId = 'apac.anthropic.claude-3-5-haiku-20241022-v1:0';
+  const inputTokens = 2000;
+  const outputTokens = 1000;
+  const cacheReadTokens = 500;
+  const cacheWriteTokens = 250;
+
+  // WHEN
+  const cost = calculateCost(modelId, inputTokens, outputTokens, cacheReadTokens, cacheWriteTokens);
+
+  // THEN
+  const expectedCost = (2000 * 0.0008 + 1000 * 0.004 + 500 * 0.00008 + 250 * 0.001) / 1000;
+  expect(cost).toBe(expectedCost);
+});
+
+test('calculateCost returns 0 for unknown model', () => {
+  // GIVEN
+  const modelId = 'unknown-model-id';
+  const inputTokens = 1000;
+  const outputTokens = 500;
+  const cacheReadTokens = 200;
+  const cacheWriteTokens = 100;
+
+  // WHEN
+  const cost = calculateCost(modelId, inputTokens, outputTokens, cacheReadTokens, cacheWriteTokens);
+
+  // THEN
+  expect(cost).toBe(0);
+});
+
+test('calculateCost with zero tokens', () => {
+  // GIVEN
+  const modelId = 'anthropic.claude-sonnet-4-20250514-v1:0';
+  const inputTokens = 0;
+  const outputTokens = 0;
+  const cacheReadTokens = 0;
+  const cacheWriteTokens = 0;
+
+  // WHEN
+  const cost = calculateCost(modelId, inputTokens, outputTokens, cacheReadTokens, cacheWriteTokens);
+
+  // THEN
+  expect(cost).toBe(0);
+});

packages/agent-core/src/lib/cost.ts

@@ -1,13 +1,6 @@
 import { QueryCommand, UpdateCommand } from '@aws-sdk/lib-dynamodb';
 import { ddb, TableName } from './aws/ddb';
-
-const modelPricing = {
-  '3-7-sonnet': { input: 0.003, output: 0.015, cacheRead: 0.0003, cacheWrite: 0.00375 },
-  '3-5-sonnet': { input: 0.003, output: 0.015, cacheRead: 0.0003, cacheWrite: 0.00375 },
-  '3-5-haiku': { input: 0.0008, output: 0.004, cacheRead: 0.00008, cacheWrite: 0.001 },
-  'sonnet-4': { input: 0.003, output: 0.015, cacheRead: 0.0003, cacheWrite: 0.00375 },
-  'opus-4': { input: 0.015, output: 0.075, cacheRead: 0.0015, cacheWrite: 0.01875 },
-};
+import { modelConfigs } from '../schema/model';
 
 // Calculate cost in USD based on token usage
 export const calculateCost = (
@@ -17,8 +10,10 @@ export const calculateCost = (
   cacheReadTokens: number,
   cacheWriteTokens: number
 ) => {
-  const pricing = Object.entries(modelPricing).find(([key]) => modelId.includes(key))?.[1];
-  if (pricing == null) return 0;
+  const config = Object.values(modelConfigs).find((config) => modelId.includes(config.modelId));
+  if (!config) return 0;
+
+  const pricing = config.pricing;
   return (
     (inputTokens * pricing.input +
       outputTokens * pricing.output +

packages/agent-core/src/schema/model.ts

@@ -22,6 +22,12 @@ const modelConfigSchema = z.object({
   reasoningSupport: z.boolean(),
   toolChoiceSupport: z.array(z.enum(['any', 'auto', 'tool'])),
   isHidden: z.boolean().optional(),
+  pricing: z.object({
+    input: z.number(),
+    output: z.number(),
+    cacheRead: z.number(),
+    cacheWrite: z.number(),
+  }),
 });
 
 export const modelConfigs: Record<ModelType, z.infer<typeof modelConfigSchema>> = {
@@ -34,6 +40,7 @@ export const modelConfigs: Record<ModelType, z.infer<typeof modelConfigSchema>>
     reasoningSupport: false,
     toolChoiceSupport: ['any', 'auto', 'tool'],
     isHidden: true,
+    pricing: { input: 0.003, output: 0.015, cacheRead: 0.0003, cacheWrite: 0.00375 },
   },
   'sonnet3.5': {
     name: 'Claude 3.5 Sonnet v2',
@@ -43,6 +50,7 @@ export const modelConfigs: Record<ModelType, z.infer<typeof modelConfigSchema>>
     cacheSupport: [],
     reasoningSupport: false,
     toolChoiceSupport: ['any', 'auto', 'tool'],
+    pricing: { input: 0.003, output: 0.015, cacheRead: 0.0003, cacheWrite: 0.00375 },
   },
   'sonnet3.7': {
     name: 'Claude 3.7 Sonnet',
@@ -52,6 +60,7 @@ export const modelConfigs: Record<ModelType, z.infer<typeof modelConfigSchema>>
     cacheSupport: ['system', 'message', 'tool'],
     reasoningSupport: true,
     toolChoiceSupport: ['any', 'auto', 'tool'],
+    pricing: { input: 0.003, output: 0.015, cacheRead: 0.0003, cacheWrite: 0.00375 },
   },
   'haiku3.5': {
     name: 'Claude 3.5 Haiku',
@@ -62,6 +71,7 @@ export const modelConfigs: Record<ModelType, z.infer<typeof modelConfigSchema>>
     reasoningSupport: false,
     toolChoiceSupport: ['any', 'auto', 'tool'],
     isHidden: true,
+    pricing: { input: 0.0008, output: 0.004, cacheRead: 0.00008, cacheWrite: 0.001 },
   },
   'nova-pro': {
     name: 'Amazon Nova Pro',
@@ -71,6 +81,7 @@ export const modelConfigs: Record<ModelType, z.infer<typeof modelConfigSchema>>
     reasoningSupport: false,
     cacheSupport: ['system'],
     toolChoiceSupport: ['auto'],
+    pricing: { input: 0.0008, output: 0.0032, cacheRead: 0.0002, cacheWrite: 0.0008 },
   },
   opus4: {
     name: 'Claude 4 Opus',
@@ -81,6 +92,7 @@ export const modelConfigs: Record<ModelType, z.infer<typeof modelConfigSchema>>
     reasoningSupport: true,
     toolChoiceSupport: ['any', 'auto', 'tool'],
     isHidden: true,
+    pricing: { input: 0.015, output: 0.075, cacheRead: 0.0015, cacheWrite: 0.01875 },
   },
   'opus4.1': {
     name: 'Claude 4.1 Opus',
@@ -90,6 +102,7 @@ export const modelConfigs: Record<ModelType, z.infer<typeof modelConfigSchema>>
     cacheSupport: ['system', 'message', 'tool'],
     reasoningSupport: true,
     toolChoiceSupport: ['any', 'auto', 'tool'],
+    pricing: { input: 0.015, output: 0.075, cacheRead: 0.0015, cacheWrite: 0.01875 },
   },
   sonnet4: {
     name: 'Claude 4 Sonnet',
@@ -99,5 +112,6 @@ export const modelConfigs: Record<ModelType, z.infer<typeof modelConfigSchema>>
     cacheSupport: ['system', 'message', 'tool'],
     reasoningSupport: true,
     toolChoiceSupport: ['any', 'auto', 'tool'],
+    pricing: { input: 0.003, output: 0.015, cacheRead: 0.0003, cacheWrite: 0.00375 },
   },
 };