@chatluna/v1-shared-adapter 1.0.9 → 1.0.10

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (3) hide show
  1. package/lib/index.cjs +13 -16
  2. package/lib/index.mjs +13 -16
  3. package/package.json +2 -2
package/lib/index.cjs CHANGED
@@ -111,8 +111,9 @@ var imageModelMatchers = [
111
111
  "gemini",
112
112
  "qwen-vl",
113
113
  "omni",
114
- "qwen2.5-omni",
114
+ "qwen*-omni",
115
115
  "qwen-omni",
116
+ "qwen*-vl",
116
117
  "qvq",
117
118
  "o1",
118
119
  "o3",
@@ -148,7 +149,6 @@ async function langchainMessageToOpenAIMessage(messages, plugin, model, supportI
148
149
  name: role === "assistant" || role === "tool" ? rawMessage.name : void 0,
149
150
  role,
150
151
  // function_call: rawMessage.additional_kwargs.function_call,
151
- tool_calls: rawMessage.additional_kwargs.tool_calls,
152
152
  tool_call_id: rawMessage.tool_call_id
153
153
  };
154
154
  if (msg.tool_calls == null) {
@@ -157,13 +157,17 @@ async function langchainMessageToOpenAIMessage(messages, plugin, model, supportI
157
157
  if (msg.tool_call_id == null) {
158
158
  delete msg.tool_call_id;
159
159
  }
160
- if (msg.tool_calls) {
161
- for (const toolCall of msg.tool_calls) {
162
- const tool = toolCall.function;
163
- if (!tool.arguments) {
164
- continue;
165
- }
166
- tool.arguments = JSON.stringify(JSON.parse(tool.arguments));
160
+ if (rawMessage.getType() === "ai") {
161
+ const toolCalls = rawMessage.tool_calls;
162
+ if (Array.isArray(toolCalls) && toolCalls.length > 0) {
163
+ msg.tool_calls = toolCalls.map((toolCall) => ({
164
+ id: toolCall.id,
165
+ type: "function",
166
+ function: {
167
+ name: toolCall.name,
168
+ arguments: JSON.stringify(toolCall.args)
169
+ }
170
+ }));
167
171
  }
168
172
  }
169
173
  const images = rawMessage.additional_kwargs.images;
@@ -337,13 +341,6 @@ function convertMessageToMessageChunk(message) {
337
341
  const reasoningContent = message.reasoning_content ?? "";
338
342
  const role = ((message.role?.length ?? 0) > 0 ? message.role : "assistant").toLowerCase();
339
343
  let additionalKwargs;
340
- if (message.tool_calls) {
341
- additionalKwargs = {
342
- tool_calls: message.tool_calls
343
- };
344
- } else {
345
- additionalKwargs = {};
346
- }
347
344
  if (reasoningContent.length > 0) {
348
345
  additionalKwargs.reasoning_content = reasoningContent;
349
346
  }
package/lib/index.mjs CHANGED
@@ -68,8 +68,9 @@ var imageModelMatchers = [
68
68
  "gemini",
69
69
  "qwen-vl",
70
70
  "omni",
71
- "qwen2.5-omni",
71
+ "qwen*-omni",
72
72
  "qwen-omni",
73
+ "qwen*-vl",
73
74
  "qvq",
74
75
  "o1",
75
76
  "o3",
@@ -118,7 +119,6 @@ async function langchainMessageToOpenAIMessage(messages, plugin, model, supportI
118
119
  name: role === "assistant" || role === "tool" ? rawMessage.name : void 0,
119
120
  role,
120
121
  // function_call: rawMessage.additional_kwargs.function_call,
121
- tool_calls: rawMessage.additional_kwargs.tool_calls,
122
122
  tool_call_id: rawMessage.tool_call_id
123
123
  };
124
124
  if (msg.tool_calls == null) {
@@ -127,13 +127,17 @@ async function langchainMessageToOpenAIMessage(messages, plugin, model, supportI
127
127
  if (msg.tool_call_id == null) {
128
128
  delete msg.tool_call_id;
129
129
  }
130
- if (msg.tool_calls) {
131
- for (const toolCall of msg.tool_calls) {
132
- const tool = toolCall.function;
133
- if (!tool.arguments) {
134
- continue;
135
- }
136
- tool.arguments = JSON.stringify(JSON.parse(tool.arguments));
130
+ if (rawMessage.getType() === "ai") {
131
+ const toolCalls = rawMessage.tool_calls;
132
+ if (Array.isArray(toolCalls) && toolCalls.length > 0) {
133
+ msg.tool_calls = toolCalls.map((toolCall) => ({
134
+ id: toolCall.id,
135
+ type: "function",
136
+ function: {
137
+ name: toolCall.name,
138
+ arguments: JSON.stringify(toolCall.args)
139
+ }
140
+ }));
137
141
  }
138
142
  }
139
143
  const images = rawMessage.additional_kwargs.images;
@@ -307,13 +311,6 @@ function convertMessageToMessageChunk(message) {
307
311
  const reasoningContent = message.reasoning_content ?? "";
308
312
  const role = ((message.role?.length ?? 0) > 0 ? message.role : "assistant").toLowerCase();
309
313
  let additionalKwargs;
310
- if (message.tool_calls) {
311
- additionalKwargs = {
312
- tool_calls: message.tool_calls
313
- };
314
- } else {
315
- additionalKwargs = {};
316
- }
317
314
  if (reasoningContent.length > 0) {
318
315
  additionalKwargs.reasoning_content = reasoningContent;
319
316
  }
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "@chatluna/v1-shared-adapter",
3
3
  "description": "chatluna shared adapter",
4
- "version": "1.0.9",
4
+ "version": "1.0.10",
5
5
  "main": "lib/index.cjs",
6
6
  "module": "lib/index.mjs",
7
7
  "typings": "lib/index.d.ts",
@@ -70,6 +70,6 @@
70
70
  },
71
71
  "peerDependencies": {
72
72
  "koishi": "^4.18.7",
73
- "koishi-plugin-chatluna": "^1.3.0-alpha.42"
73
+ "koishi-plugin-chatluna": "^1.3.0-alpha.44"
74
74
  }
75
75
  }