@ljoukov/llm 7.0.0 → 7.0.2

package/dist/index.cjs

@@ -35,6 +35,7 @@ __export(index_exports, {
   CODEX_APPLY_PATCH_JSON_TOOL_DESCRIPTION: () => CODEX_APPLY_PATCH_JSON_TOOL_DESCRIPTION,
   CODEX_APPLY_PATCH_LARK_GRAMMAR: () => CODEX_APPLY_PATCH_LARK_GRAMMAR,
   DEFAULT_FILE_TTL_SECONDS: () => DEFAULT_FILE_TTL_SECONDS,
+  DEFAULT_SIGNED_URL_TTL_SECONDS: () => DEFAULT_SIGNED_URL_TTL_SECONDS,
   FIREWORKS_DEFAULT_GLM_MODEL: () => FIREWORKS_DEFAULT_GLM_MODEL,
   FIREWORKS_DEFAULT_GPT_OSS_120B_MODEL: () => FIREWORKS_DEFAULT_GPT_OSS_120B_MODEL,
   FIREWORKS_DEFAULT_KIMI_MODEL: () => FIREWORKS_DEFAULT_KIMI_MODEL,
@@ -318,6 +319,14 @@ function getGeminiImagePricing(modelId) {
 }
 
 // src/openai/pricing.ts
+var OPENAI_GPT_54_FAST_MODEL_IDS = ["gpt-5.4-fast", "chatgpt-gpt-5.4-fast"];
+var OPENAI_GPT_54_MINI_MODEL_IDS = ["gpt-5.4-mini", "chatgpt-gpt-5.4-mini"];
+var OPENAI_GPT_54_NANO_MODEL_IDS = ["gpt-5.4-nano"];
+var OPENAI_GPT_53_CODEX_SPARK_MODEL_IDS = [
+  "gpt-5.3-codex-spark",
+  "chatgpt-gpt-5.3-codex-spark"
+];
+var OPENAI_GPT_54_STANDARD_MODEL_IDS = ["gpt-5.4", "chatgpt-gpt-5.4"];
 var OPENAI_GPT_54_PRICING = {
   inputRate: 2.5 / 1e6,
   cachedRate: 0.25 / 1e6,
@@ -339,19 +348,19 @@ var OPENAI_GPT_54_NANO_PRICING = {
   outputRate: 0.4 / 1e6
 };
 function getOpenAiPricing(modelId) {
-  if (modelId.includes("gpt-5.4-fast")) {
+  if (OPENAI_GPT_54_FAST_MODEL_IDS.includes(modelId)) {
     return OPENAI_GPT_54_PRIORITY_PRICING;
   }
-  if (modelId.includes("gpt-5.4-mini")) {
+  if (OPENAI_GPT_54_MINI_MODEL_IDS.includes(modelId)) {
     return OPENAI_GPT_54_MINI_PRICING;
   }
-  if (modelId.includes("gpt-5.4-nano")) {
+  if (OPENAI_GPT_54_NANO_MODEL_IDS.includes(modelId)) {
     return OPENAI_GPT_54_NANO_PRICING;
   }
-  if (modelId.includes("gpt-5.3-codex-spark")) {
+  if (OPENAI_GPT_53_CODEX_SPARK_MODEL_IDS.includes(modelId)) {
     return OPENAI_GPT_54_MINI_PRICING;
   }
-  if (modelId.includes("gpt-5.4")) {
+  if (OPENAI_GPT_54_STANDARD_MODEL_IDS.includes(modelId)) {
     return OPENAI_GPT_54_PRICING;
   }
   return void 0;
@@ -2354,6 +2363,9 @@ function normaliseConfigValue(value) {
 }
 function resolveGeminiApiKey() {
   loadLocalEnv();
+  if (normaliseConfigValue(process.env.GOOGLE_SERVICE_ACCOUNT_JSON)) {
+    return void 0;
+  }
   const raw = process.env.GEMINI_API_KEY ?? process.env.GOOGLE_API_KEY;
   return normaliseConfigValue(raw);
 }
@@ -3362,6 +3374,7 @@ var import_promises3 = require("stream/promises");
 var import_storage = require("@google-cloud/storage");
 var import_mime = __toESM(require("mime"), 1);
 var DEFAULT_FILE_TTL_SECONDS = 48 * 60 * 60;
+var DEFAULT_SIGNED_URL_TTL_SECONDS = 6 * 60 * 60;
 var GEMINI_FILE_POLL_INTERVAL_MS = 1e3;
 var GEMINI_FILE_POLL_TIMEOUT_MS = 6e4;
 var FILES_TEMP_ROOT = import_node_path4.default.join(import_node_os3.default.tmpdir(), "ljoukov-llm-files");
@@ -4342,7 +4355,7 @@ async function getCanonicalFileSignedUrl(options) {
   const [signedUrl] = await getStorageClient().bucket(metadata.bucketName).file(metadata.objectName).getSignedUrl({
     version: "v4",
     action: "read",
-    expires: Date.now() + (options.expiresAfterSeconds ?? 15 * 60) * 1e3,
+    expires: Date.now() + (options.expiresAfterSeconds ?? DEFAULT_SIGNED_URL_TTL_SECONDS) * 1e3,
     responseType: resolveCanonicalStorageContentType(metadata.filename, metadata.mimeType)
   });
   return signedUrl;
@@ -5088,7 +5101,7 @@ function isRetryableChatGptTransportError(error) {
     return false;
   }
   const message = error.message.toLowerCase();
-  return message === "terminated" || message.includes("socket hang up") || message.includes("fetch failed") || message.includes("network") || message.includes("responses websocket");
+  return message === "terminated" || message.includes("socket hang up") || message.includes("fetch failed") || message.includes("failed to download file from") || message.includes("network") || message.includes("responses websocket");
 }
 async function collectChatGptCodexResponseWithRetry(options, maxAttempts = 3) {
   let attempt = 1;
@@ -14087,6 +14100,7 @@ async function runCandidateEvolution(options) {
   CODEX_APPLY_PATCH_JSON_TOOL_DESCRIPTION,
   CODEX_APPLY_PATCH_LARK_GRAMMAR,
   DEFAULT_FILE_TTL_SECONDS,
+  DEFAULT_SIGNED_URL_TTL_SECONDS,
   FIREWORKS_DEFAULT_GLM_MODEL,
   FIREWORKS_DEFAULT_GPT_OSS_120B_MODEL,
   FIREWORKS_DEFAULT_KIMI_MODEL,