@ljoukov/llm 4.1.0 → 4.1.1

package/dist/index.js

@@ -2533,7 +2533,7 @@ async function runGeminiCall(fn, modelId, runOptions) {
 
 // src/openai/client.ts
 import OpenAI2 from "openai";
-import { Agent as Agent2, fetch as undiciFetch2 } from "undici";
+import { Agent as Agent2 } from "undici";
 var openAiClientState = getRuntimeSingleton(/* @__PURE__ */ Symbol.for("@ljoukov/llm.openAiClientState"), () => ({
   cachedApiKey: null,
   cachedClient: null,
@@ -2562,7 +2562,7 @@ function getOpenAiFetch() {
     headersTimeout: timeoutMs
   });
   openAiClientState.cachedFetch = ((input, init) => {
-    return undiciFetch2(input, {
+    return fetch(input, {
       ...init ?? {},
       dispatcher
     });
@@ -3259,7 +3259,7 @@ import { AsyncLocalStorage as AsyncLocalStorage2 } from "async_hooks";
 import { Buffer as Buffer4, File as NodeFile } from "buffer";
 import { createHash } from "crypto";
 import { createReadStream, createWriteStream, openAsBlob } from "fs";
-import { mkdir as mkdir2, mkdtemp, stat, unlink, writeFile as writeFile2 } from "fs/promises";
+import { copyFile, mkdir as mkdir2, mkdtemp, readFile, stat, unlink, writeFile as writeFile2 } from "fs/promises";
 import os3 from "os";
 import path4 from "path";
 import { Readable } from "stream";
@@ -3272,6 +3272,9 @@ var OPENAI_UPLOAD_PART_MAX_BYTES = 64 * 1024 * 1024;
 var GEMINI_FILE_POLL_INTERVAL_MS = 1e3;
 var GEMINI_FILE_POLL_TIMEOUT_MS = 6e4;
 var FILES_TEMP_ROOT = path4.join(os3.tmpdir(), "ljoukov-llm-files");
+var FILES_CACHE_ROOT = path4.join(FILES_TEMP_ROOT, "cache");
+var FILES_CACHE_CONTENT_ROOT = path4.join(FILES_CACHE_ROOT, "content");
+var FILES_CACHE_METADATA_ROOT = path4.join(FILES_CACHE_ROOT, "metadata");
 var filesState = getRuntimeSingleton(/* @__PURE__ */ Symbol.for("@ljoukov/llm.filesState"), () => ({
   metadataById: /* @__PURE__ */ new Map(),
   openAiUploadCacheByKey: /* @__PURE__ */ new Map(),
@@ -3417,6 +3420,12 @@ function toStoredFile(file) {
 function buildCacheKey(filename, mimeType, sha256Hex) {
   return `${sha256Hex}\0${filename}\0${mimeType}`;
 }
+function buildCachedContentPath(sha256Hex) {
+  return path4.join(FILES_CACHE_CONTENT_ROOT, sha256Hex);
+}
+function buildCachedMetadataPath(fileId) {
+  return path4.join(FILES_CACHE_METADATA_ROOT, `${fileId}.json`);
+}
 function isFresh(file) {
   if (!file.expires_at) {
     return true;
@@ -3437,6 +3446,82 @@ function recordMetadata(metadata) {
   }
   return metadata;
 }
+async function ensureFilesCacheReady() {
+  await mkdir2(FILES_CACHE_CONTENT_ROOT, { recursive: true });
+  await mkdir2(FILES_CACHE_METADATA_ROOT, { recursive: true });
+}
+async function cacheBufferLocally(bytes, sha256Hex) {
+  await ensureFilesCacheReady();
+  const localPath = buildCachedContentPath(sha256Hex);
+  try {
+    await writeFile2(localPath, bytes, { flag: "wx" });
+  } catch (error) {
+    const code = error.code;
+    if (code !== "EEXIST") {
+      throw error;
+    }
+  }
+  return localPath;
+}
+async function cacheFileLocally(filePath, sha256Hex) {
+  await ensureFilesCacheReady();
+  const localPath = buildCachedContentPath(sha256Hex);
+  try {
+    await copyFile(filePath, localPath);
+  } catch (error) {
+    const code = error.code;
+    if (code !== "EEXIST") {
+      throw error;
+    }
+  }
+  return localPath;
+}
+async function persistMetadataToDisk(metadata) {
+  await ensureFilesCacheReady();
+  const payload = {
+    file: metadata.file,
+    filename: metadata.filename,
+    bytes: metadata.bytes,
+    mimeType: metadata.mimeType,
+    sha256Hex: metadata.sha256Hex,
+    localPath: metadata.localPath
+  };
+  await writeFile2(
+    buildCachedMetadataPath(metadata.file.id),
+    `${JSON.stringify(payload, null, 2)}
+`
+  );
+}
+async function loadPersistedMetadata(fileId) {
+  try {
+    const payload = JSON.parse(
+      await readFile(buildCachedMetadataPath(fileId), "utf8")
+    );
+    if (!payload || typeof payload !== "object" || !payload.file) {
+      return void 0;
+    }
+    if (payload.localPath) {
+      try {
+        const localStats = await stat(payload.localPath);
+        if (!localStats.isFile()) {
+          return void 0;
+        }
+      } catch {
+        return void 0;
+      }
+    }
+    return recordMetadata({
+      file: payload.file,
+      filename: payload.filename,
+      bytes: payload.bytes,
+      mimeType: payload.mimeType,
+      sha256Hex: payload.sha256Hex,
+      localPath: payload.localPath
+    });
+  } catch {
+    return void 0;
+  }
+}
 async function uploadOpenAiFileFromBytes(params) {
   const cacheKey = buildCacheKey(params.filename, params.mimeType, params.sha256Hex);
   const cached = filesState.openAiUploadCacheByKey.get(cacheKey);
@@ -3585,17 +3670,23 @@ async function retrieveOpenAiFile(fileId) {
   if (cached && isFresh(cached.file)) {
     return cached;
   }
+  const persisted = await loadPersistedMetadata(fileId);
+  if (persisted && isFresh(persisted.file)) {
+    return persisted;
+  }
   const client = getOpenAiClient();
   const retrieved = await client.files.retrieve(fileId);
   const file = toStoredFile(retrieved);
-  return recordMetadata({
+  const metadata = recordMetadata({
     file,
     filename: file.filename,
     bytes: file.bytes,
-    mimeType: cached?.mimeType ?? resolveMimeType(file.filename, void 0),
-    sha256Hex: cached?.sha256Hex,
-    localPath: cached?.localPath
+    mimeType: cached?.mimeType ?? persisted?.mimeType ?? resolveMimeType(file.filename, void 0),
+    sha256Hex: cached?.sha256Hex ?? persisted?.sha256Hex,
+    localPath: cached?.localPath ?? persisted?.localPath
   });
+  await persistMetadataToDisk(metadata);
+  return metadata;
 }
 function buildGeminiMirrorName(sha256Hex) {
   return `files/${sha256Hex.slice(0, 40)}`;
@@ -3707,6 +3798,7 @@ async function materializeOpenAiFile(fileId) {
       sha256Hex,
       localPath
     });
+    await persistMetadataToDisk(updated);
     return {
       file: updated.file,
       filename: updated.filename,
@@ -3870,7 +3962,13 @@ async function filesCreate(params) {
       sha256Hex: sha256Hex2,
       bytes: info.size
     });
-    return uploaded2.file;
+    const localPath2 = await cacheFileLocally(filePath, sha256Hex2);
+    const cached2 = recordMetadata({
+      ...uploaded2,
+      localPath: localPath2
+    });
+    await persistMetadataToDisk(cached2);
+    return cached2.file;
   }
   const filename = normaliseFilename(params.filename);
   const bytes = toBuffer(params.data);
@@ -3884,7 +3982,13 @@ async function filesCreate(params) {
     expiresAfterSeconds,
     sha256Hex
   });
-  return uploaded.file;
+  const localPath = await cacheBufferLocally(bytes, sha256Hex);
+  const cached = recordMetadata({
+    ...uploaded,
+    localPath
+  });
+  await persistMetadataToDisk(cached);
+  return cached.file;
 }
 async function filesRetrieve(fileId) {
   return (await retrieveOpenAiFile(fileId)).file;
@@ -3917,6 +4021,10 @@ async function filesDelete(fileId) {
   const response = await getOpenAiClient().files.delete(fileId);
   filesState.metadataById.delete(fileId);
   filesState.materializedById.delete(fileId);
+  try {
+    await unlink(buildCachedMetadataPath(fileId));
+  } catch {
+  }
   return {
     id: response.id,
     deleted: response.deleted,
@@ -4396,8 +4504,7 @@ function toGeminiPart(part) {
         return {
           fileData: {
             fileUri: buildCanonicalGeminiFileUri(part.file_id),
-            mimeType: inferToolOutputMimeTypeFromFilename(part.filename) ?? "application/octet-stream",
-            displayName: part.filename ?? void 0
+            mimeType: inferToolOutputMimeTypeFromFilename(part.filename) ?? "application/octet-stream"
           }
         };
       }
@@ -4415,8 +4522,7 @@ function toGeminiPart(part) {
       return {
         fileData: {
           fileUri: part.image_url,
-          mimeType: inferToolOutputMimeTypeFromFilename(part.filename) ?? "application/octet-stream",
-          displayName: part.filename ?? void 0
+          mimeType: inferToolOutputMimeTypeFromFilename(part.filename) ?? "application/octet-stream"
         }
       };
     }
@@ -4425,8 +4531,7 @@ function toGeminiPart(part) {
         return {
           fileData: {
             fileUri: buildCanonicalGeminiFileUri(part.file_id),
-            mimeType: inferToolOutputMimeTypeFromFilename(part.filename) ?? "application/octet-stream",
-            displayName: part.filename ?? void 0
+            mimeType: inferToolOutputMimeTypeFromFilename(part.filename) ?? "application/octet-stream"
           }
         };
       }
@@ -4452,8 +4557,7 @@ function toGeminiPart(part) {
         return {
           fileData: {
             fileUri: part.file_url,
-            mimeType: inferToolOutputMimeTypeFromFilename(part.filename) ?? "application/octet-stream",
-            displayName: part.filename ?? void 0
+            mimeType: inferToolOutputMimeTypeFromFilename(part.filename) ?? "application/octet-stream"
           }
         };
       }
@@ -4685,7 +4789,7 @@ async function prepareOpenAiPromptContentItem(item) {
       mimeType,
       filename
     });
-    return { type: "input_file", file_id: uploaded.fileId, filename: uploaded.filename };
+    return { type: "input_file", file_id: uploaded.fileId };
   }
   if (typeof item.file_url === "string" && item.file_url.trim().toLowerCase().startsWith("data:")) {
     const parsed = parseDataUrlPayload(item.file_url);
@@ -4700,7 +4804,7 @@ async function prepareOpenAiPromptContentItem(item) {
         guessInlineDataFilename(parsed.mimeType)
       )
     });
-    return { type: "input_file", file_id: uploaded.fileId, filename: uploaded.filename };
+    return { type: "input_file", file_id: uploaded.fileId };
   }
   return item;
 }
@@ -4765,21 +4869,16 @@ async function prepareGeminiPromptContents(contents) {
     for (const part of content.parts ?? []) {
       const canonicalFileId = parseCanonicalGeminiFileId(part.fileData?.fileUri);
       if (canonicalFileId) {
-        const metadata = await getCanonicalFileMetadata(canonicalFileId);
+        await getCanonicalFileMetadata(canonicalFileId);
         if (backend === "api") {
           const mirrored = await ensureGeminiFileMirror(canonicalFileId);
-          const mirroredPart = createPartFromUri(mirrored.uri, mirrored.mimeType);
-          if (metadata.filename && mirroredPart.fileData) {
-            mirroredPart.fileData.displayName = metadata.filename;
-          }
-          parts.push(mirroredPart);
+          parts.push(createPartFromUri(mirrored.uri, mirrored.mimeType));
         } else {
           const mirrored = await ensureVertexFileMirror(canonicalFileId);
           parts.push({
             fileData: {
               fileUri: mirrored.fileUri,
-              mimeType: mirrored.mimeType,
-              displayName: metadata.filename
+              mimeType: mirrored.mimeType
             }
           });
         }
@@ -4798,18 +4897,13 @@ async function prepareGeminiPromptContents(contents) {
         });
         if (backend === "api") {
           const mirrored = await ensureGeminiFileMirror(stored.fileId);
-          const mirroredPart = createPartFromUri(mirrored.uri, mirrored.mimeType);
-          if (filename && mirroredPart.fileData) {
-            mirroredPart.fileData.displayName = filename;
-          }
-          parts.push(mirroredPart);
+          parts.push(createPartFromUri(mirrored.uri, mirrored.mimeType));
         } else {
           const mirrored = await ensureVertexFileMirror(stored.fileId);
           parts.push({
             fileData: {
               fileUri: mirrored.fileUri,
-              mimeType: mirrored.mimeType,
-              displayName: filename
+              mimeType: mirrored.mimeType
             }
           });
         }
@@ -5330,7 +5424,7 @@ function toOpenAiInput(contents) {
             ...part.file_id ? { file_id: part.file_id } : {},
             ...part.file_data ? { file_data: part.file_data } : {},
             ...part.file_url ? { file_url: part.file_url } : {},
-            ...part.filename ? { filename: part.filename } : {}
+            ...!part.file_id && part.filename ? { filename: part.filename } : {}
           });
           break;
         default:
@@ -5415,7 +5509,7 @@ function toChatGptInput(contents) {
             ...part.file_id ? { file_id: part.file_id } : {},
             ...part.file_data ? { file_data: part.file_data } : {},
             ...part.file_url ? { file_url: part.file_url } : {},
-            ...part.filename ? { filename: part.filename } : {}
+            ...!part.file_id && part.filename ? { filename: part.filename } : {}
           });
           break;
         default:
@@ -6022,8 +6116,7 @@ function buildGeminiToolOutputMediaPart(item) {
       return {
         fileData: {
           fileUri: buildCanonicalGeminiFileUri(item.file_id),
-          mimeType: inferToolOutputMimeTypeFromFilename(item.filename) ?? "application/octet-stream",
-          displayName: item.filename ?? void 0
+          mimeType: inferToolOutputMimeTypeFromFilename(item.filename) ?? "application/octet-stream"
         }
       };
     }
@@ -6042,8 +6135,7 @@ function buildGeminiToolOutputMediaPart(item) {
     return {
       fileData: {
         fileUri: item.image_url,
-        mimeType: inferToolOutputMimeTypeFromFilename(item.filename) ?? "application/octet-stream",
-        displayName: item.filename ?? void 0
+        mimeType: inferToolOutputMimeTypeFromFilename(item.filename) ?? "application/octet-stream"
       }
     };
   }
@@ -6052,8 +6144,7 @@ function buildGeminiToolOutputMediaPart(item) {
       return {
         fileData: {
           fileUri: buildCanonicalGeminiFileUri(item.file_id),
-          mimeType: inferToolOutputMimeTypeFromFilename(item.filename) ?? "application/octet-stream",
-          displayName: item.filename ?? void 0
+          mimeType: inferToolOutputMimeTypeFromFilename(item.filename) ?? "application/octet-stream"
         }
       };
     }
@@ -6076,12 +6167,7 @@ function buildGeminiToolOutputMediaPart(item) {
       return part;
     }
     if (typeof item.file_url === "string" && item.file_url.trim().length > 0 && inferredMimeType) {
-      const part = createPartFromUri(item.file_url, inferredMimeType);
-      const displayName = item.filename?.trim();
-      if (displayName && part.fileData) {
-        part.fileData.displayName = displayName;
-      }
-      return part;
+      return createPartFromUri(item.file_url, inferredMimeType);
     }
   }
   return null;