@chatluna/v1-shared-adapter 1.0.29 → 1.0.31

package/lib/index.cjs

@@ -42,7 +42,7 @@ __export(index_exports, {
   normalizeOpenAIModelName: () => normalizeOpenAIModelName,
   openAIUsageToUsageMetadata: () => openAIUsageToUsageMetadata,
   parseOpenAIModelNameWithReasoningEffort: () => parseOpenAIModelNameWithReasoningEffort,
-  processDeepSeekThinkMessages: () => processDeepSeekThinkMessages,
+  processInterleavedThinkMessages: () => processInterleavedThinkMessages,
   processResponse: () => processResponse,
   processStreamResponse: () => processStreamResponse,
   reasoningEffortModelSuffixes: () => reasoningEffortModelSuffixes,
@@ -228,7 +228,6 @@ __name(openAIUsageToUsageMetadata, "openAIUsageToUsageMetadata");
 async function langchainMessageToOpenAIMessage(messages, plugin, model, supportImageInputType, removeSystemMessage) {
   const result = [];
   const normalizedModel = model ? normalizeOpenAIModelName(model) : model;
-  const isDeepseekThinkModel = normalizedModel?.includes("deepseek-reasoner");
   for (const rawMessage of messages) {
     const role = messageTypeToOpenAIRole(rawMessage.getType());
     const msg = {
@@ -343,13 +342,10 @@ async function langchainMessageToOpenAIMessage(messages, plugin, model, supportI
   if (removeSystemMessage) {
     return transformSystemMessages(result);
   }
-  if (isDeepseekThinkModel) {
-    return processDeepSeekThinkMessages(result, messages);
-  }
-  return result;
+  return processInterleavedThinkMessages(result, messages);
 }
 __name(langchainMessageToOpenAIMessage, "langchainMessageToOpenAIMessage");
-function processDeepSeekThinkMessages(convertedMessages, originalMessages) {
+function processInterleavedThinkMessages(convertedMessages, originalMessages) {
   if (originalMessages.length === 0) {
     return convertedMessages;
   }
@@ -378,7 +374,7 @@ function processDeepSeekThinkMessages(convertedMessages, originalMessages) {
     return message;
   });
 }
-__name(processDeepSeekThinkMessages, "processDeepSeekThinkMessages");
+__name(processInterleavedThinkMessages, "processInterleavedThinkMessages");
 function transformSystemMessages(messages) {
   const mappedMessage = [];
   for (let i = 0; i < messages.length; i++) {
@@ -721,9 +717,8 @@ async function* processStreamResponse(requestContext, iterator) {
   let errorCount = 0;
   const reasoningState = {
     content: "",
-    startedAt: 0,
-    duration: 0,
-    done: false
+    startedAt: Date.now(),
+    endedAt: void 0
   };
   for await (const event of iterator) {
     const chunk = event.data;
@@ -752,23 +747,48 @@ async function* processStreamResponse(requestContext, iterator) {
         });
       }
       if (!choice) continue;
-      const { delta } = choice;
-      const messageChunk = convertDeltaToMessageChunk(delta, defaultRole);
-      if (delta.reasoning_content) {
-        reasoningState.content += delta.reasoning_content;
-        if (reasoningState.startedAt === 0) {
-          reasoningState.startedAt = Date.now();
+      const delta = choice.delta;
+      if (delta == null) {
+        const messageChunk2 = convertMessageToMessageChunk(
+          reasoningState.content.length > 0 && (choice.message.reasoning_content?.length ?? 0) < 1 ? {
+            ...choice.message,
+            reasoning_content: reasoningState.content
+          } : choice.message
+        );
+        reasoningState.content = "";
+        if (reasoningState.endedAt == null) {
+          reasoningState.endedAt = Date.now();
         }
+        defaultRole = (choice.message.role?.length ?? 0) > 0 ? choice.message.role : defaultRole;
+        yield new import_outputs.ChatGenerationChunk({
+          message: messageChunk2,
+          text: (0, import_string2.getMessageContent)(messageChunk2.content)
+        });
+        continue;
+      }
+      const hasResult = (delta.content?.length ?? 0) > 0 || (delta.tool_calls?.length ?? 0) > 0 || delta.function_call != null;
+      if (reasoningState.endedAt == null && hasResult) {
+        reasoningState.endedAt = Date.now();
       }
-      if (!reasoningState.done && reasoningState.startedAt > 0 && ((delta.content?.length ?? 0) > 0 || (delta.tool_calls?.length ?? 0) > 0 || delta.function_call != null)) {
-        reasoningState.duration = Date.now() - reasoningState.startedAt;
-        reasoningState.done = true;
-        messageChunk.additional_kwargs.reasoning_time = reasoningState.duration;
+      if (reasoningState.endedAt == null && !hasResult && delta.reasoning_content) {
+        reasoningState.content += delta.reasoning_content;
+      }
+      const messageChunk = convertDeltaToMessageChunk(
+        {
+          ...delta,
+          reasoning_content: void 0
+        },
+        defaultRole
+      );
+      const hasMessageChunk = (typeof messageChunk.content === "string" ? messageChunk.content.length > 0 : Array.isArray(messageChunk.content) && messageChunk.content.length > 0) || messageChunk instanceof import_messages2.AIMessageChunk && (messageChunk.tool_call_chunks?.length ?? 0) > 0 || messageChunk.additional_kwargs.function_call != null;
+      if (!hasMessageChunk) {
+        defaultRole = (delta.role?.length ?? 0) > 0 ? delta.role : defaultRole;
+        continue;
       }
       defaultRole = (delta.role?.length ?? 0) > 0 ? delta.role : defaultRole;
       yield new import_outputs.ChatGenerationChunk({
         message: messageChunk,
-        text: messageChunk.content
+        text: (0, import_string2.getMessageContent)(messageChunk.content)
       });
     } catch (e) {
       if (chunk.includes("tool_calls") || chunk.includes("function_call") || chunk.includes("tool_call_id")) {
@@ -789,21 +809,19 @@ async function* processStreamResponse(requestContext, iterator) {
     }
   }
   if (reasoningState.content.length > 0) {
-    if (!reasoningState.done && reasoningState.startedAt > 0) {
-      reasoningState.duration = Date.now() - reasoningState.startedAt;
-      reasoningState.done = true;
-      yield new import_outputs.ChatGenerationChunk({
-        message: new import_messages2.AIMessageChunk({
-          content: "",
-          additional_kwargs: {
-            reasoning_time: reasoningState.duration
-          }
-        }),
-        text: ""
-      });
-    }
+    const reasoningTime = (reasoningState.endedAt ?? Date.now()) - reasoningState.startedAt;
+    yield new import_outputs.ChatGenerationChunk({
+      message: new import_messages2.AIMessageChunk({
+        content: "",
+        additional_kwargs: {
+          reasoning_content: reasoningState.content,
+          ...reasoningTime != null ? { reasoning_time: reasoningTime } : {}
+        }
+      }),
+      text: ""
+    });
     requestContext.modelRequester.logger.debug(
-      `reasoning content: ${reasoningState.content}. Use time: ${reasoningState.duration / 1e3}s`
+      `Reasoning Content: ${reasoningState.content}. Thought for: ${(reasoningTime ?? 0) / 1e3}s`
     );
   }
 }
@@ -1029,7 +1047,7 @@ __name(createRequestContext, "createRequestContext");
   normalizeOpenAIModelName,
   openAIUsageToUsageMetadata,
   parseOpenAIModelNameWithReasoningEffort,
-  processDeepSeekThinkMessages,
+  processInterleavedThinkMessages,
   processResponse,
   processStreamResponse,
   reasoningEffortModelSuffixes,

package/lib/index.mjs

@@ -191,7 +191,6 @@ __name(openAIUsageToUsageMetadata, "openAIUsageToUsageMetadata");
 async function langchainMessageToOpenAIMessage(messages, plugin, model, supportImageInputType, removeSystemMessage) {
   const result = [];
   const normalizedModel = model ? normalizeOpenAIModelName(model) : model;
-  const isDeepseekThinkModel = normalizedModel?.includes("deepseek-reasoner");
   for (const rawMessage of messages) {
     const role = messageTypeToOpenAIRole(rawMessage.getType());
     const msg = {
@@ -306,13 +305,10 @@ async function langchainMessageToOpenAIMessage(messages, plugin, model, supportI
   if (removeSystemMessage) {
     return transformSystemMessages(result);
   }
-  if (isDeepseekThinkModel) {
-    return processDeepSeekThinkMessages(result, messages);
-  }
-  return result;
+  return processInterleavedThinkMessages(result, messages);
 }
 __name(langchainMessageToOpenAIMessage, "langchainMessageToOpenAIMessage");
-function processDeepSeekThinkMessages(convertedMessages, originalMessages) {
+function processInterleavedThinkMessages(convertedMessages, originalMessages) {
   if (originalMessages.length === 0) {
     return convertedMessages;
   }
@@ -341,7 +337,7 @@ function processDeepSeekThinkMessages(convertedMessages, originalMessages) {
     return message;
   });
 }
-__name(processDeepSeekThinkMessages, "processDeepSeekThinkMessages");
+__name(processInterleavedThinkMessages, "processInterleavedThinkMessages");
 function transformSystemMessages(messages) {
   const mappedMessage = [];
   for (let i = 0; i < messages.length; i++) {
@@ -684,9 +680,8 @@ async function* processStreamResponse(requestContext, iterator) {
   let errorCount = 0;
   const reasoningState = {
     content: "",
-    startedAt: 0,
-    duration: 0,
-    done: false
+    startedAt: Date.now(),
+    endedAt: void 0
   };
   for await (const event of iterator) {
     const chunk = event.data;
@@ -715,23 +710,48 @@ async function* processStreamResponse(requestContext, iterator) {
         });
       }
       if (!choice) continue;
-      const { delta } = choice;
-      const messageChunk = convertDeltaToMessageChunk(delta, defaultRole);
-      if (delta.reasoning_content) {
-        reasoningState.content += delta.reasoning_content;
-        if (reasoningState.startedAt === 0) {
-          reasoningState.startedAt = Date.now();
+      const delta = choice.delta;
+      if (delta == null) {
+        const messageChunk2 = convertMessageToMessageChunk(
+          reasoningState.content.length > 0 && (choice.message.reasoning_content?.length ?? 0) < 1 ? {
+            ...choice.message,
+            reasoning_content: reasoningState.content
+          } : choice.message
+        );
+        reasoningState.content = "";
+        if (reasoningState.endedAt == null) {
+          reasoningState.endedAt = Date.now();
         }
+        defaultRole = (choice.message.role?.length ?? 0) > 0 ? choice.message.role : defaultRole;
+        yield new ChatGenerationChunk({
+          message: messageChunk2,
+          text: getMessageContent(messageChunk2.content)
+        });
+        continue;
+      }
+      const hasResult = (delta.content?.length ?? 0) > 0 || (delta.tool_calls?.length ?? 0) > 0 || delta.function_call != null;
+      if (reasoningState.endedAt == null && hasResult) {
+        reasoningState.endedAt = Date.now();
       }
-      if (!reasoningState.done && reasoningState.startedAt > 0 && ((delta.content?.length ?? 0) > 0 || (delta.tool_calls?.length ?? 0) > 0 || delta.function_call != null)) {
-        reasoningState.duration = Date.now() - reasoningState.startedAt;
-        reasoningState.done = true;
-        messageChunk.additional_kwargs.reasoning_time = reasoningState.duration;
+      if (reasoningState.endedAt == null && !hasResult && delta.reasoning_content) {
+        reasoningState.content += delta.reasoning_content;
+      }
+      const messageChunk = convertDeltaToMessageChunk(
+        {
+          ...delta,
+          reasoning_content: void 0
+        },
+        defaultRole
+      );
+      const hasMessageChunk = (typeof messageChunk.content === "string" ? messageChunk.content.length > 0 : Array.isArray(messageChunk.content) && messageChunk.content.length > 0) || messageChunk instanceof AIMessageChunk2 && (messageChunk.tool_call_chunks?.length ?? 0) > 0 || messageChunk.additional_kwargs.function_call != null;
+      if (!hasMessageChunk) {
+        defaultRole = (delta.role?.length ?? 0) > 0 ? delta.role : defaultRole;
+        continue;
       }
       defaultRole = (delta.role?.length ?? 0) > 0 ? delta.role : defaultRole;
       yield new ChatGenerationChunk({
         message: messageChunk,
-        text: messageChunk.content
+        text: getMessageContent(messageChunk.content)
       });
     } catch (e) {
       if (chunk.includes("tool_calls") || chunk.includes("function_call") || chunk.includes("tool_call_id")) {
@@ -752,21 +772,19 @@ async function* processStreamResponse(requestContext, iterator) {
     }
   }
   if (reasoningState.content.length > 0) {
-    if (!reasoningState.done && reasoningState.startedAt > 0) {
-      reasoningState.duration = Date.now() - reasoningState.startedAt;
-      reasoningState.done = true;
-      yield new ChatGenerationChunk({
-        message: new AIMessageChunk2({
-          content: "",
-          additional_kwargs: {
-            reasoning_time: reasoningState.duration
-          }
-        }),
-        text: ""
-      });
-    }
+    const reasoningTime = (reasoningState.endedAt ?? Date.now()) - reasoningState.startedAt;
+    yield new ChatGenerationChunk({
+      message: new AIMessageChunk2({
+        content: "",
+        additional_kwargs: {
+          reasoning_content: reasoningState.content,
+          ...reasoningTime != null ? { reasoning_time: reasoningTime } : {}
+        }
+      }),
+      text: ""
+    });
     requestContext.modelRequester.logger.debug(
-      `reasoning content: ${reasoningState.content}. Use time: ${reasoningState.duration / 1e3}s`
+      `Reasoning Content: ${reasoningState.content}. Thought for: ${(reasoningTime ?? 0) / 1e3}s`
     );
   }
 }
@@ -991,7 +1009,7 @@ export {
   normalizeOpenAIModelName,
   openAIUsageToUsageMetadata,
   parseOpenAIModelNameWithReasoningEffort,
-  processDeepSeekThinkMessages,
+  processInterleavedThinkMessages,
   processResponse,
   processStreamResponse,
   reasoningEffortModelSuffixes,

package/lib/utils.d.ts

@@ -1,7 +1,7 @@
-import { AIMessageChunk, BaseMessage, ChatMessageChunk, FunctionMessageChunk, HumanMessageChunk, MessageContentComplex, MessageContentImageUrl, MessageType, SystemMessageChunk, type UsageMetadata, ToolMessageChunk } from '@langchain/core/messages';
+import { AIMessageChunk, BaseMessage, ChatMessageChunk, FunctionMessageChunk, HumanMessageChunk, MessageContentComplex, MessageContentImageUrl, MessageType, SystemMessageChunk, ToolMessageChunk, type UsageMetadata } from '@langchain/core/messages';
 import { StructuredTool } from '@langchain/core/tools';
 import { JsonSchema7Type } from 'zod-to-json-schema';
-import { ChatCompletionUsage, ChatCompletionResponseMessage, ChatCompletionResponseMessageRoleEnum, ChatCompletionTool } from './types';
+import { ChatCompletionResponseMessage, ChatCompletionResponseMessageRoleEnum, ChatCompletionTool, ChatCompletionUsage } from './types';
 import { ChatLunaPlugin } from 'koishi-plugin-chatluna/services/chat';
 export declare function createUsageMetadata(data: {
     inputTokens: number;
@@ -15,7 +15,7 @@ export declare function createUsageMetadata(data: {
 }): UsageMetadata;
 export declare function openAIUsageToUsageMetadata(usage: ChatCompletionUsage): UsageMetadata;
 export declare function langchainMessageToOpenAIMessage(messages: BaseMessage[], plugin: ChatLunaPlugin, model?: string, supportImageInputType?: boolean, removeSystemMessage?: boolean): Promise<ChatCompletionResponseMessage[]>;
-export declare function processDeepSeekThinkMessages(convertedMessages: ChatCompletionResponseMessage[], originalMessages: BaseMessage[]): ChatCompletionResponseMessage[];
+export declare function processInterleavedThinkMessages(convertedMessages: ChatCompletionResponseMessage[], originalMessages: BaseMessage[]): ChatCompletionResponseMessage[];
 export declare function transformSystemMessages(messages: ChatCompletionResponseMessage[]): ChatCompletionResponseMessage[];
 export declare function fetchImageUrl(plugin: ChatLunaPlugin, content: MessageContentImageUrl): Promise<string>;
 type MessageContentFileLike = MessageContentComplex & ({

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@chatluna/v1-shared-adapter",
   "description": "chatluna shared adapter",
-  "version": "1.0.29",
+  "version": "1.0.31",
   "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.33"
+    "koishi-plugin-chatluna": "^1.3.34"
   }
 }