@pydantic/genai-prices 0.0.6 → 0.0.8

package/README.md

@@ -13,6 +13,12 @@ Library and CLI for calculating LLM API prices, supporting browser, Node.js and
 
 ## API Usage
 
+The library provides separated input and output pricing, giving you detailed breakdown of costs:
+
+- `result.total_price` - Total cost for the request
+- `result.input_price` - Cost for input/prompt tokens
+- `result.output_price` - Cost for output/completion tokens
+
 ### Node.js & Browser (Library)
 
 ```js
@@ -23,7 +29,11 @@ const usage = { input_tokens: 1000, output_tokens: 100 }
 // Sync (works everywhere, including browser)
 const result = calcPriceSync(usage, 'gpt-3.5-turbo', { providerId: 'openai' })
 if (result) {
-  console.log(result.price, result.provider.name, result.model.name)
+  console.log(
+    `$${result.total_price} (input: $${result.input_price}, output: $${result.output_price})`,
+    result.provider.name,
+    result.model.name,
+  )
 } else {
   console.log('No price found for this model/provider combination')
 }
@@ -31,7 +41,11 @@ if (result) {
 // Async (works everywhere)
 const asyncResult = await calcPriceAsync(usage, 'gpt-3.5-turbo', { providerId: 'openai' })
 if (asyncResult) {
-  console.log(asyncResult.price, asyncResult.provider.name, asyncResult.model.name)
+  console.log(
+    `$${asyncResult.total_price} (input: $${asyncResult.input_price}, output: $${asyncResult.output_price})`,
+    asyncResult.provider.name,
+    asyncResult.model.name,
+  )
 } else {
   console.log('No price found for this model/provider combination')
 }
@@ -44,7 +58,11 @@ import { calcPriceSync, calcPriceAsync } from './dist/index.js'
 const usage = { input_tokens: 1000, output_tokens: 100 }
 const result = calcPriceSync(usage, 'gpt-3.5-turbo', { providerId: 'openai' })
 if (result) {
-  console.log(result.price, result.provider.name, result.model.name)
+  console.log(
+    `$${result.total_price} (input: $${result.input_price}, output: $${result.output_price})`,
+    result.provider.name,
+    result.model.name,
+  )
 }
 ```
 
@@ -110,7 +128,7 @@ const result = calcPriceSync(usage, 'non-existent-model')
 if (result === null) {
   console.log('No pricing information available for this model')
 } else {
-  console.log(`Price: $${result.price}`)
+  console.log(`Total Price: $${result.total_price} (input: $${result.input_price}, output: $${result.output_price})`)
 }
 
 // Async version also returns null
@@ -118,7 +136,9 @@ const asyncResult = await calcPriceAsync(usage, 'non-existent-model', { provider
 if (asyncResult === null) {
   console.log('No pricing information available for this model/provider combination')
 } else {
-  console.log(`Price: $${asyncResult.price}`)
+  console.log(
+    `Total Price: $${asyncResult.total_price} (input: $${asyncResult.input_price}, output: $${asyncResult.output_price})`,
+  )
 }
 ```
 
@@ -174,7 +194,7 @@ src/
 ### Common Issues
 
 - **No price found (returns null)**:
-  - Make sure you specify the correct `providerId` (e.g., `openai`)
+  - Make sure you specify the correct `providerId` (e.g., `openai`, `google`, `anthropic`)
   - Try using `provider:model` format in CLI
   - Use `--auto-update` flag to fetch latest data
   - Check that the model name is correct and supported by the provider

package/dist/__tests__/comprehensive.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/__tests__/matcher.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/async/calcPriceAsync.js

@@ -11,9 +11,11 @@ export async function calcPriceAsync(usage, modelRef, options = {}) {
         return null;
     const timestamp = options.timestamp || new Date();
     const model_price = getActiveModelPrice(model, timestamp);
-    const price = calcModelPrice(usage, model_price);
+    const priceResult = calcModelPrice(usage, model_price);
     return {
-        price,
+        input_price: priceResult.input_price,
+        output_price: priceResult.output_price,
+        total_price: priceResult.total_price,
         provider,
         model,
         model_price,

package/dist/cli.js

@@ -126,7 +126,9 @@ async function main() {
                     ['Model', result.model.name || result.model.id],
                     ['Model Prices', JSON.stringify(result.model_price)],
                     ['Context Window', w !== undefined ? w.toLocaleString() : undefined],
-                    ['Price', `$${result.price}`],
+                    ['Total Price', `$${result.total_price}`],
+                    ['Input Price', `$${result.input_price}`],
+                    ['Output Price', `$${result.output_price}`],
                 ];
                 for (const [key, value] of output) {
                     if (value !== undefined) {

package/dist/data.js

@@ -1292,6 +1292,16 @@ export const data = [
         model_match: {
             contains: 'gemini',
         },
+        provider_match: {
+            or: [
+                {
+                    contains: 'google',
+                },
+                {
+                    equals: 'gemini',
+                },
+            ],
+        },
         models: [
             {
                 id: 'claude-3-5-haiku',
@@ -1973,6 +1983,9 @@ export const data = [
         model_match: {
             regex: '(?:mi|code|dev|magi|mini)stral',
         },
+        provider_match: {
+            starts_with: 'mistral',
+        },
         models: [
             {
                 id: 'codestral',

package/dist/index.d.ts

@@ -2,4 +2,4 @@ export { calcPriceSync } from './sync/calcPriceSync.js';
 export { calcPriceAsync } from './async/calcPriceAsync.js';
 export { getProvidersSync, getProvidersAsync, enableAutoUpdate, isLocalDataOutdated, prefetchAsync, getEnvironmentInfo, } from './dataLoader.js';
 export { matchProvider, matchModel } from './matcher.js';
-export type { Usage, PriceCalculation, PriceCalculationResult, Provider, ModelInfo } from './types.js';
+export type { Usage, PriceCalculation, PriceCalculationResult, Provider, ModelInfo, CalcPrice } from './types.js';

package/dist/index.umd.cjs

@@ -1298,6 +1298,16 @@
       model_match: {
         contains: "gemini"
       },
+      provider_match: {
+        or: [
+          {
+            contains: "google"
+          },
+          {
+            equals: "gemini"
+          }
+        ]
+      },
       models: [
         {
           id: "claude-3-5-haiku",
@@ -1979,6 +1989,9 @@
       model_match: {
         regex: "(?:mi|code|dev|magi|mini)stral"
       },
+      provider_match: {
+        starts_with: "mistral"
+      },
       models: [
         {
           id: "codestral",
@@ -10573,9 +10586,15 @@
     }
     return false;
   }
+  function findProviderById(providers, providerId) {
+    const normalizedProviderId = providerId.toLowerCase().trim();
+    const exactMatch = providers.find((p) => p.id === normalizedProviderId);
+    if (exactMatch) return exactMatch;
+    return providers.find((p) => p.provider_match && matchLogic(p.provider_match, normalizedProviderId));
+  }
   function matchProvider(providers, modelRef, providerId, providerApiUrl) {
     if (providerId) {
-      return providers.find((p) => p.id === providerId);
+      return findProviderById(providers, providerId);
     }
     if (providerApiUrl) {
       return providers.find((p) => new RegExp(p.api_pattern).test(providerApiUrl));
@@ -10611,18 +10630,26 @@
     return calcTieredPrice(price, tokens);
   }
   function calcPrice(usage, modelPrice) {
-    let price = 0;
-    price += calcMtokPrice(modelPrice.input_mtok, usage.input_tokens);
-    price += calcMtokPrice(modelPrice.cache_write_mtok, usage.cache_write_tokens);
-    price += calcMtokPrice(modelPrice.cache_read_mtok, usage.cache_read_tokens);
-    price += calcMtokPrice(modelPrice.output_mtok, usage.output_tokens);
-    price += calcMtokPrice(modelPrice.input_audio_mtok, usage.input_audio_tokens);
-    price += calcMtokPrice(modelPrice.cache_audio_read_mtok, usage.cache_audio_read_tokens);
-    price += calcMtokPrice(modelPrice.output_audio_mtok, usage.output_audio_tokens);
+    let input_price = 0;
+    let output_price = 0;
+    input_price += calcMtokPrice(modelPrice.input_mtok, usage.input_tokens);
+    input_price += calcMtokPrice(modelPrice.cache_write_mtok, usage.cache_write_tokens);
+    input_price += calcMtokPrice(modelPrice.cache_read_mtok, usage.cache_read_tokens);
+    input_price += calcMtokPrice(modelPrice.input_audio_mtok, usage.input_audio_tokens);
+    input_price += calcMtokPrice(
+      modelPrice.cache_audio_read_mtok,
+      usage.cache_audio_read_tokens);
+    output_price += calcMtokPrice(modelPrice.output_mtok, usage.output_tokens);
+    output_price += calcMtokPrice(modelPrice.output_audio_mtok, usage.output_audio_tokens);
     if (modelPrice.requests_kcount !== void 0) {
-      price += modelPrice.requests_kcount * ((usage.requests ?? 1) / 1e3);
+      input_price += modelPrice.requests_kcount / 1e3;
     }
-    return price;
+    const total_price = input_price + output_price;
+    return {
+      input_price,
+      output_price,
+      total_price
+    };
   }
   function getActiveModelPrice(model, timestamp) {
     if (!Array.isArray(model.prices)) {
@@ -10636,9 +10663,17 @@
           return cond.prices;
         }
       } else if (cond.constraint.type === "time_of_date") {
-        const t = timestamp.toTimeString().slice(0, 8);
-        if (t >= cond.constraint.start_time && t < cond.constraint.end_time) {
-          return cond.prices;
+        const t = timestamp.toISOString().slice(11, 19);
+        const startTime = cond.constraint.start_time;
+        const endTime = cond.constraint.end_time;
+        if (endTime < startTime) {
+          if (t >= startTime || t < endTime) {
+            return cond.prices;
+          }
+        } else {
+          if (t >= startTime && t < endTime) {
+            return cond.prices;
+          }
         }
       }
     }
@@ -10653,9 +10688,11 @@
     if (!model) return null;
     const timestamp = options.timestamp || /* @__PURE__ */ new Date();
     const model_price = getActiveModelPrice(model, timestamp);
-    const price = calcPrice(usage, model_price);
+    const priceResult = calcPrice(usage, model_price);
     return {
-      price,
+      input_price: priceResult.input_price,
+      output_price: priceResult.output_price,
+      total_price: priceResult.total_price,
       provider,
       model,
       model_price,
@@ -10671,9 +10708,11 @@
     if (!model) return null;
     const timestamp = options.timestamp || /* @__PURE__ */ new Date();
     const model_price = getActiveModelPrice(model, timestamp);
-    const price = calcPrice(usage, model_price);
+    const priceResult = calcPrice(usage, model_price);
     return {
-      price,
+      input_price: priceResult.input_price,
+      output_price: priceResult.output_price,
+      total_price: priceResult.total_price,
       provider,
       model,
       model_price,

package/dist/matcher.js

@@ -22,14 +22,20 @@ function matchLogic(logic, text) {
     }
     return false;
 }
+function findProviderById(providers, providerId) {
+    const normalizedProviderId = providerId.toLowerCase().trim();
+    const exactMatch = providers.find((p) => p.id === normalizedProviderId);
+    if (exactMatch)
+        return exactMatch;
+    return providers.find((p) => p.provider_match && matchLogic(p.provider_match, normalizedProviderId));
+}
 export function matchProvider(providers, modelRef, providerId, providerApiUrl) {
     if (providerId) {
-        return providers.find((p) => p.id === providerId);
+        return findProviderById(providers, providerId);
     }
     if (providerApiUrl) {
         return providers.find((p) => new RegExp(p.api_pattern).test(providerApiUrl));
     }
-    // Try model_match logic
     return providers.find((p) => p.model_match && matchLogic(p.model_match, modelRef));
 }
 export function matchModel(models, modelRef) {

package/dist/priceCalc.d.ts

@@ -1,3 +1,3 @@
-import { Usage, ModelPrice, ModelInfo } from './types.js';
-export declare function calcPrice(usage: Usage, modelPrice: ModelPrice): number;
+import { Usage, ModelPrice, ModelInfo, CalcPrice } from './types.js';
+export declare function calcPrice(usage: Usage, modelPrice: ModelPrice): CalcPrice;
 export declare function getActiveModelPrice(model: ModelInfo, timestamp: Date): ModelPrice;

package/dist/priceCalc.js

@@ -29,18 +29,27 @@ function calcMtokPrice(price, tokens, _field) {
     return calcTieredPrice(price, tokens);
 }
 export function calcPrice(usage, modelPrice) {
-    let price = 0;
-    price += calcMtokPrice(modelPrice.input_mtok, usage.input_tokens, 'input_mtok');
-    price += calcMtokPrice(modelPrice.cache_write_mtok, usage.cache_write_tokens, 'cache_write_mtok');
-    price += calcMtokPrice(modelPrice.cache_read_mtok, usage.cache_read_tokens, 'cache_read_mtok');
-    price += calcMtokPrice(modelPrice.output_mtok, usage.output_tokens, 'output_mtok');
-    price += calcMtokPrice(modelPrice.input_audio_mtok, usage.input_audio_tokens, 'input_audio_mtok');
-    price += calcMtokPrice(modelPrice.cache_audio_read_mtok, usage.cache_audio_read_tokens, 'cache_audio_read_mtok');
-    price += calcMtokPrice(modelPrice.output_audio_mtok, usage.output_audio_tokens, 'output_audio_mtok');
+    let input_price = 0;
+    let output_price = 0;
+    // Input-related prices
+    input_price += calcMtokPrice(modelPrice.input_mtok, usage.input_tokens, 'input_mtok');
+    input_price += calcMtokPrice(modelPrice.cache_write_mtok, usage.cache_write_tokens, 'cache_write_mtok');
+    input_price += calcMtokPrice(modelPrice.cache_read_mtok, usage.cache_read_tokens, 'cache_read_mtok');
+    input_price += calcMtokPrice(modelPrice.input_audio_mtok, usage.input_audio_tokens, 'input_audio_mtok');
+    input_price += calcMtokPrice(modelPrice.cache_audio_read_mtok, usage.cache_audio_read_tokens, 'cache_audio_read_mtok');
+    // Output-related prices
+    output_price += calcMtokPrice(modelPrice.output_mtok, usage.output_tokens, 'output_mtok');
+    output_price += calcMtokPrice(modelPrice.output_audio_mtok, usage.output_audio_tokens, 'output_audio_mtok');
+    // Requests price (counted as input cost)
     if (modelPrice.requests_kcount !== undefined) {
-        price += modelPrice.requests_kcount * ((usage.requests ?? 1) / 1000);
+        input_price += modelPrice.requests_kcount / 1000;
     }
-    return price;
+    const total_price = input_price + output_price;
+    return {
+        input_price,
+        output_price,
+        total_price,
+    };
 }
 export function getActiveModelPrice(model, timestamp) {
     if (!Array.isArray(model.prices)) {
@@ -57,9 +66,22 @@ export function getActiveModelPrice(model, timestamp) {
             }
         }
         else if (cond.constraint.type === 'time_of_date') {
-            const t = timestamp.toTimeString().slice(0, 8);
-            if (t >= cond.constraint.start_time && t < cond.constraint.end_time) {
-                return cond.prices;
+            // Extract UTC time to match constraint times which are in UTC (with 'Z' suffix)
+            const t = timestamp.toISOString().slice(11, 19); // Get "HH:MM:SS" from ISO string
+            const startTime = cond.constraint.start_time;
+            const endTime = cond.constraint.end_time;
+            // Handle time ranges that span midnight (end time < start time)
+            if (endTime < startTime) {
+                // Time is in range if it's >= start OR < end
+                if (t >= startTime || t < endTime) {
+                    return cond.prices;
+                }
+            }
+            else {
+                // Normal time range (start <= time < end)
+                if (t >= startTime && t < endTime) {
+                    return cond.prices;
+                }
             }
         }
     }

package/dist/sync/calcPriceSync.js

@@ -11,9 +11,11 @@ export function calcPriceSync(usage, modelRef, options = {}) {
         return null;
     const timestamp = options.timestamp || new Date();
     const model_price = getActiveModelPrice(model, timestamp);
-    const price = calcModelPrice(usage, model_price);
+    const priceResult = calcModelPrice(usage, model_price);
     return {
-        price,
+        input_price: priceResult.input_price,
+        output_price: priceResult.output_price,
+        total_price: priceResult.total_price,
         provider,
         model,
         model_price,

package/dist/types.d.ts

@@ -6,7 +6,6 @@ export interface Usage {
     input_audio_tokens?: number;
     cache_audio_read_tokens?: number;
     output_audio_tokens?: number;
-    requests?: number;
 }
 export interface Tier {
     start: number;
@@ -71,10 +70,18 @@ export interface Provider {
     description?: string;
     price_comments?: string;
     model_match?: MatchLogic;
+    provider_match?: MatchLogic;
     models: ModelInfo[];
 }
+export interface CalcPrice {
+    input_price: number;
+    output_price: number;
+    total_price: number;
+}
 export interface PriceCalculation {
-    price: number;
+    input_price: number;
+    output_price: number;
+    total_price: number;
     provider: Provider;
     model: ModelInfo;
     model_price: ModelPrice;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pydantic/genai-prices",
-  "version": "0.0.6",
+  "version": "0.0.8",
   "description": "Calculate prices for calling LLM inference APIs (JS/TS version of genai-prices)",
   "main": "./dist/index.cjs",
   "module": "./dist/index.js",