@chatluna/v1-shared-adapter 1.0.15 → 1.0.17

package/lib/index.cjs

@@ -75,7 +75,8 @@ function getModelMaxContextSize(info) {
     "gemini-1.0-pro": 30720,
     "gemini-2.0-flash": 1048576,
     "gemini-2.0-pro": 2097152,
-    "gemini-2.5-pro": 2097152,
+    "gemini-2.5": 2097152,
+    "gemini-3.0-pro": 1097152,
     "gemini-2.0": 2097152,
     deepseek: 128e3,
     "llama3.1": 128e3,
@@ -443,6 +444,7 @@ __name(convertDeltaToMessageChunk, "convertDeltaToMessageChunk");
 var import_messages2 = require("@langchain/core/messages");
 var import_string2 = require("koishi-plugin-chatluna/utils/string");
 var import_logger = require("koishi-plugin-chatluna/utils/logger");
+var import_object = require("koishi-plugin-chatluna/utils/object");
 async function buildChatCompletionParams(params, plugin, enableGoogleSearch, supportImageInput2) {
   const base = {
     model: params.model,
@@ -477,7 +479,7 @@ async function buildChatCompletionParams(params, plugin, enableGoogleSearch, sup
     delete base.n;
     delete base.top_p;
   }
-  return base;
+  return (0, import_object.deepAssign)({}, base, params.overrideRequestParams ?? {});
 }
 __name(buildChatCompletionParams, "buildChatCompletionParams");
 function processReasoningContent(delta, reasoningState) {
@@ -514,15 +516,17 @@ async function* processStreamResponse(requestContext, iterator) {
       const choice = data.choices?.[0];
       if (data.usage) {
         yield new import_outputs.ChatGenerationChunk({
-          message: new import_messages2.AIMessageChunk(""),
-          text: "",
-          generationInfo: {
-            tokenUsage: {
-              promptTokens: data.usage.prompt_tokens,
-              completionTokens: data.usage.completion_tokens,
-              totalTokens: data.usage.total_tokens
+          message: new import_messages2.AIMessageChunk({
+            content: "",
+            response_metadata: {
+              tokenUsage: {
+                promptTokens: data.usage.prompt_tokens,
+                completionTokens: data.usage.completion_tokens,
+                totalTokens: data.usage.total_tokens
+              }
             }
-          }
+          }),
+          text: ""
         });
       }
       if (!choice) continue;

package/lib/index.mjs

@@ -32,7 +32,8 @@ function getModelMaxContextSize(info) {
     "gemini-1.0-pro": 30720,
     "gemini-2.0-flash": 1048576,
     "gemini-2.0-pro": 2097152,
-    "gemini-2.5-pro": 2097152,
+    "gemini-2.5": 2097152,
+    "gemini-3.0-pro": 1097152,
     "gemini-2.0": 2097152,
     deepseek: 128e3,
     "llama3.1": 128e3,
@@ -413,6 +414,7 @@ __name(convertDeltaToMessageChunk, "convertDeltaToMessageChunk");
 import { AIMessageChunk as AIMessageChunk2 } from "@langchain/core/messages";
 import { getMessageContent } from "koishi-plugin-chatluna/utils/string";
 import { trackLogToLocal } from "koishi-plugin-chatluna/utils/logger";
+import { deepAssign } from "koishi-plugin-chatluna/utils/object";
 async function buildChatCompletionParams(params, plugin, enableGoogleSearch, supportImageInput2) {
   const base = {
     model: params.model,
@@ -447,7 +449,7 @@ async function buildChatCompletionParams(params, plugin, enableGoogleSearch, sup
     delete base.n;
     delete base.top_p;
   }
-  return base;
+  return deepAssign({}, base, params.overrideRequestParams ?? {});
 }
 __name(buildChatCompletionParams, "buildChatCompletionParams");
 function processReasoningContent(delta, reasoningState) {
@@ -484,15 +486,17 @@ async function* processStreamResponse(requestContext, iterator) {
       const choice = data.choices?.[0];
       if (data.usage) {
         yield new ChatGenerationChunk({
-          message: new AIMessageChunk2(""),
-          text: "",
-          generationInfo: {
-            tokenUsage: {
-              promptTokens: data.usage.prompt_tokens,
-              completionTokens: data.usage.completion_tokens,
-              totalTokens: data.usage.total_tokens
+          message: new AIMessageChunk2({
+            content: "",
+            response_metadata: {
+              tokenUsage: {
+                promptTokens: data.usage.prompt_tokens,
+                completionTokens: data.usage.completion_tokens,
+                totalTokens: data.usage.total_tokens
+              }
             }
-          }
+          }),
+          text: ""
         });
       }
       if (!choice) continue;

package/lib/requester.d.ts

@@ -30,7 +30,7 @@ export declare function buildChatCompletionParams(params: ModelRequestParams, pl
     stream_options: {
         include_usage: boolean;
     };
-}>;
+} & Record<string, any>>;
 export declare function processReasoningContent(delta: {
     reasoning_content?: string;
     content?: string;

package/lib/utils.d.ts

@@ -9,5 +9,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): HumanMessageChunk | AIMessageChunk | SystemMessageChunk | FunctionMessageChunk | ToolMessageChunk | ChatMessageChunk;
-export declare function convertDeltaToMessageChunk(delta: Record<string, any>, defaultRole?: ChatCompletionResponseMessageRoleEnum): HumanMessageChunk | AIMessageChunk | SystemMessageChunk | FunctionMessageChunk | ToolMessageChunk | ChatMessageChunk;
+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;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@chatluna/v1-shared-adapter",
   "description": "chatluna shared adapter",
-  "version": "1.0.15",
+  "version": "1.0.17",
   "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.0-alpha.76"
+    "koishi-plugin-chatluna": "^1.3.1"
   }
 }