@chatluna/v1-shared-adapter 1.0.18 → 1.0.19

package/lib/index.cjs

@@ -36,11 +36,13 @@ __export(index_exports, {
   isNonLLMModel: () => isNonLLMModel,
   langchainMessageToOpenAIMessage: () => langchainMessageToOpenAIMessage,
   messageTypeToOpenAIRole: () => messageTypeToOpenAIRole,
+  processDeepSeekThinkMessages: () => processDeepSeekThinkMessages,
   processReasoningContent: () => processReasoningContent,
   processResponse: () => processResponse,
   processStreamResponse: () => processStreamResponse,
   removeAdditionalProperties: () => removeAdditionalProperties,
-  supportImageInput: () => supportImageInput
+  supportImageInput: () => supportImageInput,
+  transformSystemMessages: () => transformSystemMessages
 });
 module.exports = __toCommonJS(index_exports);
 
@@ -143,6 +145,7 @@ var import_string = require("koishi-plugin-chatluna/utils/string");
 var import_types = require("@langchain/core/utils/types");
 async function langchainMessageToOpenAIMessage(messages, plugin, model, supportImageInput2, removeSystemMessage) {
   const result = [];
+  const isDeepseekThinkModel = model?.includes("deepseek-reasoner");
   for (const rawMessage of messages) {
     const role = messageTypeToOpenAIRole(rawMessage.getType());
     const msg = {
@@ -211,48 +214,72 @@ async function langchainMessageToOpenAIMessage(messages, plugin, model, supportI
     result.push(msg);
   }
   if (removeSystemMessage) {
-    const mappedMessage = [];
-    for (let i = 0; i < mappedMessage.length; i++) {
-      const message = mappedMessage[i];
-      if (message.role !== "system") {
-        mappedMessage.push(message);
-        continue;
-      }
-      if (removeSystemMessage) {
-        continue;
-      }
-      mappedMessage.push({
-        role: "user",
-        content: message.content
-      });
-      mappedMessage.push({
-        role: "assistant",
-        content: "Okay, what do I need to do?"
-      });
-      if (mappedMessage?.[i + 1]?.role === "assistant") {
-        mappedMessage.push({
-          role: "user",
-          content: "Continue what I said to you last message. Follow these instructions."
-        });
+    return transformSystemMessages(result);
+  }
+  if (isDeepseekThinkModel) {
+    return processDeepSeekThinkMessages(result, messages);
+  }
+  return result;
+}
+__name(langchainMessageToOpenAIMessage, "langchainMessageToOpenAIMessage");
+function processDeepSeekThinkMessages(convertedMessages, originalMessages) {
+  if (originalMessages.length === 0) {
+    return convertedMessages;
+  }
+  let lastTurnStartIndex = -1;
+  for (let i = originalMessages.length - 1; i >= 0; i--) {
+    const message = originalMessages[i];
+    if (message.getType() === "ai") {
+      const aiMessage = message;
+      if (!aiMessage.tool_calls || aiMessage.tool_calls.length === 0) {
+        lastTurnStartIndex = i;
+        break;
       }
     }
-    if (mappedMessage[mappedMessage.length - 1].role === "assistant") {
-      mappedMessage.push({
-        role: "user",
-        content: "Continue what I said to you last message. Follow these instructions."
-      });
+  }
+  if (lastTurnStartIndex === -1) {
+    return convertedMessages;
+  }
+  return convertedMessages.map((message, index) => {
+    if (index >= lastTurnStartIndex) {
+      const originalMessage = originalMessages[index];
+      const reasoningContent = originalMessage?.additional_kwargs?.reasoning_content;
+      if (reasoningContent) {
+        return {
+          ...message,
+          reasoning_content: reasoningContent
+        };
+      }
     }
-    if (mappedMessage[0].role === "assistant") {
-      mappedMessage.unshift({
-        role: "user",
-        content: "Continue what I said to you last time. Follow these instructions."
-      });
+    return message;
+  });
+}
+__name(processDeepSeekThinkMessages, "processDeepSeekThinkMessages");
+function transformSystemMessages(messages) {
+  const mappedMessage = [];
+  for (let i = 0; i < messages.length; i++) {
+    const message = messages[i];
+    if (message.role !== "system") {
+      mappedMessage.push(message);
+      continue;
     }
-    return mappedMessage;
+    continue;
   }
-  return result;
+  if (mappedMessage[mappedMessage.length - 1]?.role === "assistant") {
+    mappedMessage.push({
+      role: "user",
+      content: "Continue what I said to you last message. Follow these instructions."
+    });
+  }
+  if (mappedMessage[0]?.role === "assistant") {
+    mappedMessage.unshift({
+      role: "user",
+      content: "Continue what I said to you last time. Follow these instructions."
+    });
+  }
+  return mappedMessage;
 }
-__name(langchainMessageToOpenAIMessage, "langchainMessageToOpenAIMessage");
+__name(transformSystemMessages, "transformSystemMessages");
 async function fetchImageUrl(plugin, content) {
   const url = typeof content.image_url === "string" ? content.image_url : content.image_url.url;
   if (url.includes("data:image") && url.includes("base64")) {
@@ -744,9 +771,11 @@ __name(createRequestContext, "createRequestContext");
   isNonLLMModel,
   langchainMessageToOpenAIMessage,
   messageTypeToOpenAIRole,
+  processDeepSeekThinkMessages,
   processReasoningContent,
   processResponse,
   processStreamResponse,
   removeAdditionalProperties,
-  supportImageInput
+  supportImageInput,
+  transformSystemMessages
 });

package/lib/index.mjs

@@ -113,6 +113,7 @@ import {
 import { isZodSchemaV3 } from "@langchain/core/utils/types";
 async function langchainMessageToOpenAIMessage(messages, plugin, model, supportImageInput2, removeSystemMessage) {
   const result = [];
+  const isDeepseekThinkModel = model?.includes("deepseek-reasoner");
   for (const rawMessage of messages) {
     const role = messageTypeToOpenAIRole(rawMessage.getType());
     const msg = {
@@ -181,48 +182,72 @@ async function langchainMessageToOpenAIMessage(messages, plugin, model, supportI
     result.push(msg);
   }
   if (removeSystemMessage) {
-    const mappedMessage = [];
-    for (let i = 0; i < mappedMessage.length; i++) {
-      const message = mappedMessage[i];
-      if (message.role !== "system") {
-        mappedMessage.push(message);
-        continue;
-      }
-      if (removeSystemMessage) {
-        continue;
-      }
-      mappedMessage.push({
-        role: "user",
-        content: message.content
-      });
-      mappedMessage.push({
-        role: "assistant",
-        content: "Okay, what do I need to do?"
-      });
-      if (mappedMessage?.[i + 1]?.role === "assistant") {
-        mappedMessage.push({
-          role: "user",
-          content: "Continue what I said to you last message. Follow these instructions."
-        });
+    return transformSystemMessages(result);
+  }
+  if (isDeepseekThinkModel) {
+    return processDeepSeekThinkMessages(result, messages);
+  }
+  return result;
+}
+__name(langchainMessageToOpenAIMessage, "langchainMessageToOpenAIMessage");
+function processDeepSeekThinkMessages(convertedMessages, originalMessages) {
+  if (originalMessages.length === 0) {
+    return convertedMessages;
+  }
+  let lastTurnStartIndex = -1;
+  for (let i = originalMessages.length - 1; i >= 0; i--) {
+    const message = originalMessages[i];
+    if (message.getType() === "ai") {
+      const aiMessage = message;
+      if (!aiMessage.tool_calls || aiMessage.tool_calls.length === 0) {
+        lastTurnStartIndex = i;
+        break;
       }
     }
-    if (mappedMessage[mappedMessage.length - 1].role === "assistant") {
-      mappedMessage.push({
-        role: "user",
-        content: "Continue what I said to you last message. Follow these instructions."
-      });
+  }
+  if (lastTurnStartIndex === -1) {
+    return convertedMessages;
+  }
+  return convertedMessages.map((message, index) => {
+    if (index >= lastTurnStartIndex) {
+      const originalMessage = originalMessages[index];
+      const reasoningContent = originalMessage?.additional_kwargs?.reasoning_content;
+      if (reasoningContent) {
+        return {
+          ...message,
+          reasoning_content: reasoningContent
+        };
+      }
     }
-    if (mappedMessage[0].role === "assistant") {
-      mappedMessage.unshift({
-        role: "user",
-        content: "Continue what I said to you last time. Follow these instructions."
-      });
+    return message;
+  });
+}
+__name(processDeepSeekThinkMessages, "processDeepSeekThinkMessages");
+function transformSystemMessages(messages) {
+  const mappedMessage = [];
+  for (let i = 0; i < messages.length; i++) {
+    const message = messages[i];
+    if (message.role !== "system") {
+      mappedMessage.push(message);
+      continue;
     }
-    return mappedMessage;
+    continue;
   }
-  return result;
+  if (mappedMessage[mappedMessage.length - 1]?.role === "assistant") {
+    mappedMessage.push({
+      role: "user",
+      content: "Continue what I said to you last message. Follow these instructions."
+    });
+  }
+  if (mappedMessage[0]?.role === "assistant") {
+    mappedMessage.unshift({
+      role: "user",
+      content: "Continue what I said to you last time. Follow these instructions."
+    });
+  }
+  return mappedMessage;
 }
-__name(langchainMessageToOpenAIMessage, "langchainMessageToOpenAIMessage");
+__name(transformSystemMessages, "transformSystemMessages");
 async function fetchImageUrl(plugin, content) {
   const url = typeof content.image_url === "string" ? content.image_url : content.image_url.url;
   if (url.includes("data:image") && url.includes("base64")) {
@@ -713,9 +738,11 @@ export {
   isNonLLMModel,
   langchainMessageToOpenAIMessage,
   messageTypeToOpenAIRole,
+  processDeepSeekThinkMessages,
   processReasoningContent,
   processResponse,
   processStreamResponse,
   removeAdditionalProperties,
-  supportImageInput
+  supportImageInput,
+  transformSystemMessages
 };

package/lib/utils.d.ts

@@ -4,6 +4,8 @@ import { JsonSchema7Type } from 'zod-to-json-schema';
 import { ChatCompletionResponseMessage, ChatCompletionResponseMessageRoleEnum, ChatCompletionTool } from './types';
 import { ChatLunaPlugin } from 'koishi-plugin-chatluna/services/chat';
 export declare function langchainMessageToOpenAIMessage(messages: BaseMessage[], plugin: ChatLunaPlugin, model?: string, supportImageInput?: boolean, removeSystemMessage?: boolean): Promise<ChatCompletionResponseMessage[]>;
+export declare function processDeepSeekThinkMessages(convertedMessages: ChatCompletionResponseMessage[], originalMessages: BaseMessage[]): ChatCompletionResponseMessage[];
+export declare function transformSystemMessages(messages: ChatCompletionResponseMessage[]): ChatCompletionResponseMessage[];
 export declare function fetchImageUrl(plugin: ChatLunaPlugin, content: MessageContentImageUrl): Promise<string>;
 export declare function messageTypeToOpenAIRole(type: MessageType): ChatCompletionResponseMessageRoleEnum;
 export declare function formatToolsToOpenAITools(tools: StructuredTool[], includeGoogleSearch: boolean): ChatCompletionTool[];

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@chatluna/v1-shared-adapter",
   "description": "chatluna shared adapter",
-  "version": "1.0.18",
+  "version": "1.0.19",
   "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.2"
+    "koishi-plugin-chatluna": "^1.3.3"
   }
 }