@ljoukov/llm 7.0.0 → 7.0.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/dist/index.cjs CHANGED
@@ -318,6 +318,14 @@ function getGeminiImagePricing(modelId) {
318
318
  }
319
319
 
320
320
  // src/openai/pricing.ts
321
+ var OPENAI_GPT_54_FAST_MODEL_IDS = ["gpt-5.4-fast", "chatgpt-gpt-5.4-fast"];
322
+ var OPENAI_GPT_54_MINI_MODEL_IDS = ["gpt-5.4-mini", "chatgpt-gpt-5.4-mini"];
323
+ var OPENAI_GPT_54_NANO_MODEL_IDS = ["gpt-5.4-nano"];
324
+ var OPENAI_GPT_53_CODEX_SPARK_MODEL_IDS = [
325
+ "gpt-5.3-codex-spark",
326
+ "chatgpt-gpt-5.3-codex-spark"
327
+ ];
328
+ var OPENAI_GPT_54_STANDARD_MODEL_IDS = ["gpt-5.4", "chatgpt-gpt-5.4"];
321
329
  var OPENAI_GPT_54_PRICING = {
322
330
  inputRate: 2.5 / 1e6,
323
331
  cachedRate: 0.25 / 1e6,
@@ -339,19 +347,19 @@ var OPENAI_GPT_54_NANO_PRICING = {
339
347
  outputRate: 0.4 / 1e6
340
348
  };
341
349
  function getOpenAiPricing(modelId) {
342
- if (modelId.includes("gpt-5.4-fast")) {
350
+ if (OPENAI_GPT_54_FAST_MODEL_IDS.includes(modelId)) {
343
351
  return OPENAI_GPT_54_PRIORITY_PRICING;
344
352
  }
345
- if (modelId.includes("gpt-5.4-mini")) {
353
+ if (OPENAI_GPT_54_MINI_MODEL_IDS.includes(modelId)) {
346
354
  return OPENAI_GPT_54_MINI_PRICING;
347
355
  }
348
- if (modelId.includes("gpt-5.4-nano")) {
356
+ if (OPENAI_GPT_54_NANO_MODEL_IDS.includes(modelId)) {
349
357
  return OPENAI_GPT_54_NANO_PRICING;
350
358
  }
351
- if (modelId.includes("gpt-5.3-codex-spark")) {
359
+ if (OPENAI_GPT_53_CODEX_SPARK_MODEL_IDS.includes(modelId)) {
352
360
  return OPENAI_GPT_54_MINI_PRICING;
353
361
  }
354
- if (modelId.includes("gpt-5.4")) {
362
+ if (OPENAI_GPT_54_STANDARD_MODEL_IDS.includes(modelId)) {
355
363
  return OPENAI_GPT_54_PRICING;
356
364
  }
357
365
  return void 0;
@@ -2354,6 +2362,9 @@ function normaliseConfigValue(value) {
2354
2362
  }
2355
2363
  function resolveGeminiApiKey() {
2356
2364
  loadLocalEnv();
2365
+ if (normaliseConfigValue(process.env.GOOGLE_SERVICE_ACCOUNT_JSON)) {
2366
+ return void 0;
2367
+ }
2357
2368
  const raw = process.env.GEMINI_API_KEY ?? process.env.GOOGLE_API_KEY;
2358
2369
  return normaliseConfigValue(raw);
2359
2370
  }