@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.js CHANGED
@@ -206,6 +206,14 @@ function getGeminiImagePricing(modelId) {
206
206
  }
207
207
 
208
208
  // src/openai/pricing.ts
209
+ var OPENAI_GPT_54_FAST_MODEL_IDS = ["gpt-5.4-fast", "chatgpt-gpt-5.4-fast"];
210
+ var OPENAI_GPT_54_MINI_MODEL_IDS = ["gpt-5.4-mini", "chatgpt-gpt-5.4-mini"];
211
+ var OPENAI_GPT_54_NANO_MODEL_IDS = ["gpt-5.4-nano"];
212
+ var OPENAI_GPT_53_CODEX_SPARK_MODEL_IDS = [
213
+ "gpt-5.3-codex-spark",
214
+ "chatgpt-gpt-5.3-codex-spark"
215
+ ];
216
+ var OPENAI_GPT_54_STANDARD_MODEL_IDS = ["gpt-5.4", "chatgpt-gpt-5.4"];
209
217
  var OPENAI_GPT_54_PRICING = {
210
218
  inputRate: 2.5 / 1e6,
211
219
  cachedRate: 0.25 / 1e6,
@@ -227,19 +235,19 @@ var OPENAI_GPT_54_NANO_PRICING = {
227
235
  outputRate: 0.4 / 1e6
228
236
  };
229
237
  function getOpenAiPricing(modelId) {
230
- if (modelId.includes("gpt-5.4-fast")) {
238
+ if (OPENAI_GPT_54_FAST_MODEL_IDS.includes(modelId)) {
231
239
  return OPENAI_GPT_54_PRIORITY_PRICING;
232
240
  }
233
- if (modelId.includes("gpt-5.4-mini")) {
241
+ if (OPENAI_GPT_54_MINI_MODEL_IDS.includes(modelId)) {
234
242
  return OPENAI_GPT_54_MINI_PRICING;
235
243
  }
236
- if (modelId.includes("gpt-5.4-nano")) {
244
+ if (OPENAI_GPT_54_NANO_MODEL_IDS.includes(modelId)) {
237
245
  return OPENAI_GPT_54_NANO_PRICING;
238
246
  }
239
- if (modelId.includes("gpt-5.3-codex-spark")) {
247
+ if (OPENAI_GPT_53_CODEX_SPARK_MODEL_IDS.includes(modelId)) {
240
248
  return OPENAI_GPT_54_MINI_PRICING;
241
249
  }
242
- if (modelId.includes("gpt-5.4")) {
250
+ if (OPENAI_GPT_54_STANDARD_MODEL_IDS.includes(modelId)) {
243
251
  return OPENAI_GPT_54_PRICING;
244
252
  }
245
253
  return void 0;
@@ -2242,6 +2250,9 @@ function normaliseConfigValue(value) {
2242
2250
  }
2243
2251
  function resolveGeminiApiKey() {
2244
2252
  loadLocalEnv();
2253
+ if (normaliseConfigValue(process.env.GOOGLE_SERVICE_ACCOUNT_JSON)) {
2254
+ return void 0;
2255
+ }
2245
2256
  const raw = process.env.GEMINI_API_KEY ?? process.env.GOOGLE_API_KEY;
2246
2257
  return normaliseConfigValue(raw);
2247
2258
  }