@gendive/chatllm 0.22.0 → 0.22.1

package/dist/react/index.mjs

@@ -2184,15 +2184,22 @@ var convertAttachmentsToBase64 = async (attachments) => Promise.all(
     size: att.size
   }))
 );
-var convertAttachmentsWithUploader = async (attachments, uploader) => Promise.all(
-  attachments.map(async (att) => ({
-    name: att.name,
-    mimeType: att.mimeType,
-    base64: "",
-    url: await uploader(att.file),
-    size: att.size,
-    source: "uploader"
-  }))
+var convertAttachmentsWithUploaderCached = async (attachments, uploader, cache) => Promise.all(
+  attachments.map(async (att) => {
+    let url = cache.get(att.id);
+    if (!url) {
+      url = await uploader(att.file);
+      cache.set(att.id, url);
+    }
+    return {
+      name: att.name,
+      mimeType: att.mimeType,
+      base64: "",
+      url,
+      size: att.size,
+      source: "uploader"
+    };
+  })
 );
 var findPreviousResultImage = (messages) => {
   for (let i = messages.length - 1; i >= 0; i--) {
@@ -3466,6 +3473,7 @@ ${finalContent}`;
     const actionPrompt = selectedAction?.systemPrompt;
     const isHidden = options2?.hiddenUserMessage ?? false;
     const currentAttachments = attachments;
+    const uploadedUrlMap = /* @__PURE__ */ new Map();
     let userContentParts;
     if (currentAttachments.length > 0) {
       userContentParts = [];
@@ -3474,8 +3482,19 @@ ${finalContent}`;
       }
       for (const att of currentAttachments) {
         if (att.type === "image" && att.file) {
-          const dataUri = await fileToDataUri(att.file);
-          const imageUrl = onUploadImageRef.current ? await onUploadImageRef.current(dataUri, att.name) : dataUri;
+          let imageUrl;
+          try {
+            if (fileUploaderRef.current) {
+              imageUrl = await fileUploaderRef.current(att.file);
+            } else {
+              const dataUri = await fileToDataUri(att.file);
+              imageUrl = onUploadImageRef.current ? await onUploadImageRef.current(dataUri, att.name) : dataUri;
+            }
+          } catch (err) {
+            console.error("[chatllm] image upload failed, falling back to data URI:", err);
+            imageUrl = await fileToDataUri(att.file);
+          }
+          uploadedUrlMap.set(att.id, imageUrl);
           userContentParts.push({ type: "image", url: imageUrl, alt: att.name, fileName: att.name });
         } else {
           userContentParts.push({ type: "file", name: att.name, url: att.previewUrl || "", mimeType: att.mimeType, size: att.size });
@@ -3574,7 +3593,7 @@ ${finalContent}`;
           })
         );
         try {
-          const filesToPass = fileUploaderRef.current ? await convertAttachmentsWithUploader(matchedFiles, fileUploaderRef.current) : skillConfig.autoConvertBase64 ? await convertAttachmentsToBase64(matchedFiles) : matchedFiles;
+          const filesToPass = fileUploaderRef.current ? await convertAttachmentsWithUploaderCached(matchedFiles, fileUploaderRef.current, uploadedUrlMap) : skillConfig.autoConvertBase64 ? await convertAttachmentsToBase64(matchedFiles) : matchedFiles;
           const result = await skillConfig.execute({ files: filesToPass, userMessage: finalContent });
           const attachResultType = result.metadata?.type || result.metadata?.resultType || "text";
           const toolResultPart = {
@@ -3633,7 +3652,7 @@ ${finalContent}`;
       if (hasImageAttachments && hasUserText) {
         const imageAttachments = currentAttachments.filter((a) => a.type === "image");
         try {
-          pendingAttachmentDataRef.current = fileUploaderRef.current ? await convertAttachmentsWithUploader(imageAttachments, fileUploaderRef.current) : await convertAttachmentsToBase64(imageAttachments);
+          pendingAttachmentDataRef.current = fileUploaderRef.current ? await convertAttachmentsWithUploaderCached(imageAttachments, fileUploaderRef.current, uploadedUrlMap) : await convertAttachmentsToBase64(imageAttachments);
         } catch (err) {
           console.error("[chatllm] pendingAttachment conversion failed:", err);
           pendingAttachmentDataRef.current = null;