@chatluna/v1-shared-adapter 1.0.21 → 1.0.22

package/lib/index.cjs

@@ -215,17 +215,30 @@ async function langchainMessageToOpenAIMessage(messages, plugin, model, supportI
           text: rawMessage.content
         }
       ];
-      for (const image of images) {
-        msg.content.push({
-          type: "image_url",
-          image_url: {
-            url: image,
-            detail: "low"
+      const imageContents = await Promise.all(
+        images.map(async (image) => {
+          try {
+            const url = await fetchImageUrl(plugin, {
+              type: "image_url",
+              image_url: { url: image }
+            });
+            return {
+              type: "image_url",
+              image_url: {
+                url,
+                detail: "low"
+              }
+            };
+          } catch {
+            return null;
           }
-        });
-      }
+        })
+      );
+      msg.content.push(
+        ...imageContents.filter((content) => content != null)
+      );
     } else if (Array.isArray(msg.content) && msg.content.length > 0) {
-      msg.content = await Promise.all(
+      const mappedContent = await Promise.all(
         msg.content.map(async (content) => {
           if (!(0, import_string.isMessageContentImageUrl)(content)) return content;
           try {
@@ -238,10 +251,11 @@ async function langchainMessageToOpenAIMessage(messages, plugin, model, supportI
               }
             };
           } catch {
-            return content;
+            return null;
           }
         })
       );
+      msg.content = mappedContent.filter((content) => content != null);
     }
     result.push(msg);
   }
@@ -695,7 +709,7 @@ async function* completionStream(requestContext, params, completionUrl = "chat/c
     const iterator = (0, import_sse.sseIterable)(response);
     yield* processStreamResponse(requestContext, iterator);
   } catch (e) {
-    if (requestContext.ctx.chatluna.config.isLog) {
+    if (requestContext.ctx.chatluna.currentConfig.isLog) {
       await (0, import_logger.trackLogToLocal)(
         "Request",
         JSON.stringify(chatCompletionParams),
@@ -729,7 +743,7 @@ async function completion(requestContext, params, completionUrl = "chat/completi
     );
     return await processResponse(requestContext, response);
   } catch (e) {
-    if (requestContext.ctx.chatluna.config.isLog) {
+    if (requestContext.ctx.chatluna.currentConfig.isLog) {
       await (0, import_logger.trackLogToLocal)(
         "Request",
         JSON.stringify(chatCompletionParams),

package/lib/index.mjs

@@ -181,17 +181,30 @@ async function langchainMessageToOpenAIMessage(messages, plugin, model, supportI
           text: rawMessage.content
         }
       ];
-      for (const image of images) {
-        msg.content.push({
-          type: "image_url",
-          image_url: {
-            url: image,
-            detail: "low"
+      const imageContents = await Promise.all(
+        images.map(async (image) => {
+          try {
+            const url = await fetchImageUrl(plugin, {
+              type: "image_url",
+              image_url: { url: image }
+            });
+            return {
+              type: "image_url",
+              image_url: {
+                url,
+                detail: "low"
+              }
+            };
+          } catch {
+            return null;
           }
-        });
-      }
+        })
+      );
+      msg.content.push(
+        ...imageContents.filter((content) => content != null)
+      );
     } else if (Array.isArray(msg.content) && msg.content.length > 0) {
-      msg.content = await Promise.all(
+      const mappedContent = await Promise.all(
         msg.content.map(async (content) => {
           if (!isMessageContentImageUrl(content)) return content;
           try {
@@ -204,10 +217,11 @@ async function langchainMessageToOpenAIMessage(messages, plugin, model, supportI
               }
             };
           } catch {
-            return content;
+            return null;
           }
         })
       );
+      msg.content = mappedContent.filter((content) => content != null);
     }
     result.push(msg);
   }
@@ -661,7 +675,7 @@ async function* completionStream(requestContext, params, completionUrl = "chat/c
     const iterator = sseIterable(response);
     yield* processStreamResponse(requestContext, iterator);
   } catch (e) {
-    if (requestContext.ctx.chatluna.config.isLog) {
+    if (requestContext.ctx.chatluna.currentConfig.isLog) {
       await trackLogToLocal(
         "Request",
         JSON.stringify(chatCompletionParams),
@@ -695,7 +709,7 @@ async function completion(requestContext, params, completionUrl = "chat/completi
     );
     return await processResponse(requestContext, response);
   } catch (e) {
-    if (requestContext.ctx.chatluna.config.isLog) {
+    if (requestContext.ctx.chatluna.currentConfig.isLog) {
       await trackLogToLocal(
         "Request",
         JSON.stringify(chatCompletionParams),

package/lib/utils.d.ts

@@ -11,5 +11,5 @@ export declare function messageTypeToOpenAIRole(type: MessageType): ChatCompleti
 export declare function formatToolsToOpenAITools(tools: StructuredTool[], includeGoogleSearch: boolean): ChatCompletionTool[];
 export declare function formatToolToOpenAITool(tool: StructuredTool): ChatCompletionTool;
 export declare function removeAdditionalProperties(schema: JsonSchema7Type): JsonSchema7Type;
-export declare function convertMessageToMessageChunk(message: ChatCompletionResponseMessage): AIMessageChunk | HumanMessageChunk | SystemMessageChunk | FunctionMessageChunk | ToolMessageChunk | ChatMessageChunk;
-export declare function convertDeltaToMessageChunk(delta: Record<string, any>, defaultRole?: ChatCompletionResponseMessageRoleEnum): AIMessageChunk | HumanMessageChunk | SystemMessageChunk | FunctionMessageChunk | ToolMessageChunk | ChatMessageChunk;
+export declare function convertMessageToMessageChunk(message: ChatCompletionResponseMessage): HumanMessageChunk | AIMessageChunk | SystemMessageChunk | FunctionMessageChunk | ToolMessageChunk | ChatMessageChunk;
+export declare function convertDeltaToMessageChunk(delta: Record<string, any>, defaultRole?: ChatCompletionResponseMessageRoleEnum): HumanMessageChunk | AIMessageChunk | SystemMessageChunk | FunctionMessageChunk | ToolMessageChunk | ChatMessageChunk;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@chatluna/v1-shared-adapter",
   "description": "chatluna shared adapter",
-  "version": "1.0.21",
+  "version": "1.0.22",
   "main": "lib/index.cjs",
   "module": "lib/index.mjs",
   "typings": "lib/index.d.ts",
@@ -70,6 +70,6 @@
   },
   "peerDependencies": {
     "koishi": "^4.18.9",
-    "koishi-plugin-chatluna": "^1.3.8"
+    "koishi-plugin-chatluna": "^1.3.14"
   }
 }