Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions packages/azure-openai-adapter/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "koishi-plugin-chatluna-azure-openai-adapter",
"description": "azure openai adapter for chatluna",
"version": "1.3.0-alpha.4",
"version": "1.3.0-alpha.5",
"main": "lib/index.cjs",
"module": "lib/index.mjs",
"typings": "lib/index.d.ts",
Expand Down Expand Up @@ -57,7 +57,7 @@
},
"peerDependencies": {
"koishi": "^4.18.7",
"koishi-plugin-chatluna": "^1.3.0-alpha.42"
"koishi-plugin-chatluna": "^1.3.0-alpha.43"
},
"resolutions": {
"@langchain/core": "0.3.62",
Expand Down
4 changes: 2 additions & 2 deletions packages/claude-adapter/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "koishi-plugin-chatluna-claude-adapter",
"description": "claude adapter for chatluna",
"version": "1.3.0-alpha.4",
"version": "1.3.0-alpha.5",
"main": "lib/index.cjs",
"module": "lib/index.mjs",
"typings": "lib/index.d.ts",
Expand Down Expand Up @@ -59,7 +59,7 @@
},
"peerDependencies": {
"koishi": "^4.18.7",
"koishi-plugin-chatluna": "^1.3.0-alpha.42"
"koishi-plugin-chatluna": "^1.3.0-alpha.43"
},
"resolutions": {
"@langchain/core": "0.3.62",
Expand Down
2 changes: 1 addition & 1 deletion packages/core/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "koishi-plugin-chatluna",
"description": "chatluna for koishi",
"version": "1.3.0-alpha.42",
"version": "1.3.0-alpha.43",
"main": "lib/index.cjs",
"module": "lib/index.mjs",
"typings": "lib/index.d.ts",
Expand Down
4 changes: 2 additions & 2 deletions packages/deepseek-adapter/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "koishi-plugin-chatluna-deepseek-adapter",
"description": "deepseek adapter for chatluna",
"version": "1.3.0-alpha.4",
"version": "1.3.0-alpha.5",
"main": "lib/index.cjs",
"module": "lib/index.mjs",
"typings": "lib/index.d.ts",
Expand Down Expand Up @@ -71,7 +71,7 @@
},
"peerDependencies": {
"koishi": "^4.18.7",
"koishi-plugin-chatluna": "^1.3.0-alpha.42"
"koishi-plugin-chatluna": "^1.3.0-alpha.43"
},
"koishi": {
"description": {
Expand Down
4 changes: 2 additions & 2 deletions packages/dify-adapter/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "koishi-plugin-chatluna-dify-adapter",
"description": "dify adapter for chatluna",
"version": "1.3.0-alpha.4",
"version": "1.3.0-alpha.5",
"main": "lib/index.cjs",
"module": "lib/index.mjs",
"typings": "lib/index.d.ts",
Expand Down Expand Up @@ -70,7 +70,7 @@
},
"peerDependencies": {
"koishi": "^4.18.7",
"koishi-plugin-chatluna": "^1.3.0-alpha.42"
"koishi-plugin-chatluna": "^1.3.0-alpha.43"
},
"koishi": {
"description": {
Expand Down
4 changes: 2 additions & 2 deletions packages/doubao-adapter/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "koishi-plugin-chatluna-doubao-adapter",
"description": "doubao adapter for chatluna",
"version": "1.3.0-alpha.4",
"version": "1.3.0-alpha.5",
"main": "lib/index.cjs",
"module": "lib/index.mjs",
"typings": "lib/index.d.ts",
Expand Down Expand Up @@ -71,7 +71,7 @@
},
"peerDependencies": {
"koishi": "^4.18.7",
"koishi-plugin-chatluna": "^1.3.0-alpha.42"
"koishi-plugin-chatluna": "^1.3.0-alpha.43"
},
"koishi": {
"description": {
Expand Down
2 changes: 1 addition & 1 deletion packages/embeddings-service/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
},
"peerDependencies": {
"koishi": "^4.18.7",
"koishi-plugin-chatluna": "^1.3.0-alpha.42"
"koishi-plugin-chatluna": "^1.3.0-alpha.43"
},
"koishi": {
"description": {
Expand Down
4 changes: 2 additions & 2 deletions packages/gemini-adapter/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "koishi-plugin-chatluna-google-gemini-adapter",
"description": "google-gemini adapter for chatluna",
"version": "1.3.0-alpha.9",
"version": "1.3.0-alpha.10",
"main": "lib/index.cjs",
"module": "lib/index.mjs",
"typings": "lib/index.d.ts",
Expand Down Expand Up @@ -73,7 +73,7 @@
},
"peerDependencies": {
"koishi": "^4.18.7",
"koishi-plugin-chatluna": "^1.3.0-alpha.42",
"koishi-plugin-chatluna": "^1.3.0-alpha.43",
"koishi-plugin-chatluna-storage-service": "^0.0.9"
},
"peerDependenciesMeta": {
Expand Down
4 changes: 2 additions & 2 deletions packages/hunyuan-adapter/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "koishi-plugin-chatluna-hunyuan-adapter",
"description": "hunyuan adapter for chatluna",
"version": "1.3.0-alpha.4",
"version": "1.3.0-alpha.5",
"main": "lib/index.cjs",
"module": "lib/index.mjs",
"typings": "lib/index.d.ts",
Expand Down Expand Up @@ -71,7 +71,7 @@
},
"peerDependencies": {
"koishi": "^4.18.7",
"koishi-plugin-chatluna": "^1.3.0-alpha.42"
"koishi-plugin-chatluna": "^1.3.0-alpha.43"
},
"koishi": {
"description": {
Expand Down
2 changes: 1 addition & 1 deletion packages/image-renderer/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
},
"peerDependencies": {
"koishi": "^4.18.7",
"koishi-plugin-chatluna": "^1.3.0-alpha.42"
"koishi-plugin-chatluna": "^1.3.0-alpha.43"
},
"koishi": {
"description": {
Expand Down
2 changes: 1 addition & 1 deletion packages/image-service/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
},
"peerDependencies": {
"koishi": "^4.18.7",
"koishi-plugin-chatluna": "^1.3.0-alpha.42"
"koishi-plugin-chatluna": "^1.3.0-alpha.43"
},
"resolutions": {
"@langchain/core": "0.3.62",
Expand Down
2 changes: 1 addition & 1 deletion packages/long-memory/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
},
"peerDependencies": {
"koishi": "^4.18.7",
"koishi-plugin-chatluna": "^1.3.0-alpha.42"
"koishi-plugin-chatluna": "^1.3.0-alpha.43"
},
"resolutions": {
"@langchain/core": "0.3.62",
Expand Down
2 changes: 1 addition & 1 deletion packages/mcp-client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
},
"peerDependencies": {
"koishi": "^4.18.7",
"koishi-plugin-chatluna": "^1.3.0-alpha.42",
"koishi-plugin-chatluna": "^1.3.0-alpha.43",
"koishi-plugin-chatluna-storage-service": "^0.0.9"
},
"peerDependenciesMeta": {
Expand Down
4 changes: 2 additions & 2 deletions packages/ollama-adapter/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "koishi-plugin-chatluna-ollama-adapter",
"description": "ollama adapter for chatluna",
"version": "1.3.0-alpha.4",
"version": "1.3.0-alpha.5",
"main": "lib/index.cjs",
"module": "lib/index.mjs",
"typings": "lib/index.d.ts",
Expand Down Expand Up @@ -55,7 +55,7 @@
},
"peerDependencies": {
"koishi": "^4.18.7",
"koishi-plugin-chatluna": "^1.3.0-alpha.42"
"koishi-plugin-chatluna": "^1.3.0-alpha.43"
},
"resolutions": {
"@langchain/core": "0.3.62",
Expand Down
4 changes: 2 additions & 2 deletions packages/openai-adapter/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "koishi-plugin-chatluna-openai-adapter",
"description": "openai adapter for chatluna",
"version": "1.3.0-alpha.4",
"version": "1.3.0-alpha.5",
"main": "lib/index.cjs",
"module": "lib/index.mjs",
"typings": "lib/index.d.ts",
Expand Down Expand Up @@ -71,7 +71,7 @@
},
"peerDependencies": {
"koishi": "^4.18.7",
"koishi-plugin-chatluna": "^1.3.0-alpha.42"
"koishi-plugin-chatluna": "^1.3.0-alpha.43"
},
"koishi": {
"description": {
Expand Down
4 changes: 2 additions & 2 deletions packages/openai-like-adapter/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "koishi-plugin-chatluna-openai-like-adapter",
"description": "openai style api adapter for chatluna",
"version": "1.3.0-alpha.4",
"version": "1.3.0-alpha.5",
"main": "lib/index.cjs",
"module": "lib/index.mjs",
"typings": "lib/index.d.ts",
Expand Down Expand Up @@ -71,7 +71,7 @@
},
"peerDependencies": {
"koishi": "^4.18.7",
"koishi-plugin-chatluna": "^1.3.0-alpha.42"
"koishi-plugin-chatluna": "^1.3.0-alpha.43"
},
"koishi": {
"description": {
Expand Down
2 changes: 1 addition & 1 deletion packages/plugin-common/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@
},
"peerDependencies": {
"koishi": "^4.18.7",
"koishi-plugin-chatluna": "^1.3.0-alpha.42",
"koishi-plugin-chatluna": "^1.3.0-alpha.43",
"koishi-plugin-chatluna-knowledge-chat": "^1.0.23",
"koishi-plugin-chatluna-storage-service": "^0.0.9"
},
Expand Down
4 changes: 2 additions & 2 deletions packages/qwen-adapter/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "koishi-plugin-chatluna-qwen-adapter",
"description": "qwen adapter for chatluna",
"version": "1.3.0-alpha.4",
"version": "1.3.0-alpha.5",
"main": "lib/index.cjs",
"module": "lib/index.mjs",
"typings": "lib/index.d.ts",
Expand Down Expand Up @@ -71,7 +71,7 @@
},
"peerDependencies": {
"koishi": "^4.18.7",
"koishi-plugin-chatluna": "^1.3.0-alpha.42"
"koishi-plugin-chatluna": "^1.3.0-alpha.43"
},
"koishi": {
"description": {
Expand Down
34 changes: 19 additions & 15 deletions packages/qwen-adapter/src/utils.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import {
AIMessage,
AIMessageChunk,
BaseMessage,
ChatMessageChunk,
Expand Down Expand Up @@ -54,28 +55,42 @@
}
}

export async function langchainMessageToQWenMessage(
messages: BaseMessage[],
plugin: ChatLunaPlugin,
model: string
): Promise<ChatCompletionResponseMessage[]> {
const result: ChatCompletionResponseMessage[] = []

for (const rawMessage of messages) {
const role = messageTypeToQWenRole(rawMessage.getType())

const msg = {
content: (rawMessage.content as string) || null,
name:
role === 'assistant' || role === 'tool'
? rawMessage.name
: undefined,
role,
// function_call: rawMessage.additional_kwargs.function_call,
tool_calls: rawMessage.additional_kwargs.tool_calls,

tool_call_id: (rawMessage as ToolMessage).tool_call_id
} as ChatCompletionResponseMessage

if (rawMessage.getType() === 'ai') {
const toolCalls = (rawMessage as AIMessage).tool_calls

if (Array.isArray(toolCalls) && toolCalls.length > 0) {

Check notice on line 82 in packages/qwen-adapter/src/utils.ts

View check run for this annotation

codefactor.io / CodeFactor

packages/qwen-adapter/src/utils.ts#L58-L82

Complex Method
msg.tool_calls = toolCalls.map((toolCall) => ({
id: toolCall.id,
type: 'function',
function: {
name: toolCall.name,
arguments: JSON.stringify(toolCall.args)
}
}))
}
}

if (msg.tool_calls == null) {
delete msg.tool_calls
}
Expand Down Expand Up @@ -181,24 +196,13 @@
const content = delta.content ?? ''
const reasoningContent = delta.reasoning_content ?? ''

let additionalKwargs: {
const additionalKwargs: {
// eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/naming-convention
function_call?: any
// eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/naming-convention
tool_calls?: any
reasoning_content?: string
}
if (delta.function_call) {
additionalKwargs = {
function_call: delta.function_call
}
} else if (delta.tool_calls) {
additionalKwargs = {
tool_calls: delta.tool_calls
}
} else {
additionalKwargs = {}
}
} = {}

if (reasoningContent.length > 0) {
additionalKwargs.reasoning_content = reasoningContent
Expand Down
4 changes: 2 additions & 2 deletions packages/rwkv-adapter/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "koishi-plugin-chatluna-rmkv-adapter",
"description": "rwkv adapter for chatluna",
"version": "1.3.0-alpha.4",
"version": "1.3.0-alpha.5",
"main": "lib/index.cjs",
"module": "lib/index.mjs",
"typings": "lib/index.d.ts",
Expand Down Expand Up @@ -70,7 +70,7 @@
},
"peerDependencies": {
"koishi": "^4.18.7",
"koishi-plugin-chatluna": "^1.3.0-alpha.42"
"koishi-plugin-chatluna": "^1.3.0-alpha.43"
},
"koishi": {
"description": {
Expand Down
4 changes: 2 additions & 2 deletions packages/search-service/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "koishi-plugin-chatluna-search-service",
"description": "search support for chatluna",
"version": "1.2.8",
"version": "1.2.9",
"main": "lib/index.cjs",
"module": "lib/index.mjs",
"typings": "lib/index.d.ts",
Expand Down Expand Up @@ -76,7 +76,7 @@
},
"peerDependencies": {
"koishi": "^4.18.7",
"koishi-plugin-chatluna": "^1.3.0-alpha.42"
"koishi-plugin-chatluna": "^1.3.0-alpha.43"
},
"koishi": {
"description": {
Expand Down
2 changes: 1 addition & 1 deletion packages/shared/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,6 @@
},
"peerDependencies": {
"koishi": "^4.18.7",
"koishi-plugin-chatluna": "^1.3.0-alpha.42"
"koishi-plugin-chatluna": "^1.3.0-alpha.43"
}
}
Loading
Loading