chore: bump versions

ChatLunaLab · Jun 3, 2024 · da3585e · da3585e
1 parent 550b24a
commit da3585e
Show file tree

Hide file tree

Showing 23 changed files with 240 additions and 27 deletions.
diff --git a/packages/bard-adapter/package.json b/packages/bard-adapter/package.json
@@ -46,7 +46,7 @@
     },
     "peerDependencies": {
         "koishi": "^4.17.0",
-        "koishi-plugin-chatluna": "^1.0.0-beta.51"
+        "koishi-plugin-chatluna": "^1.0.0-beta.52"
     },
     "koishi": {
         "description": {

diff --git a/packages/chatglm-adapter/package.json b/packages/chatglm-adapter/package.json
@@ -41,7 +41,7 @@
     },
     "peerDependencies": {
         "koishi": "^4.17.0",
-        "koishi-plugin-chatluna": "^1.0.0-beta.51"
+        "koishi-plugin-chatluna": "^1.0.0-beta.52"
     },
     "engines": {
         "node": ">=18.0.0"

diff --git a/packages/claude-adapter/package.json b/packages/claude-adapter/package.json
@@ -46,7 +46,7 @@
     },
     "peerDependencies": {
         "koishi": "^4.17.0",
-        "koishi-plugin-chatluna": "^1.0.0-beta.51"
+        "koishi-plugin-chatluna": "^1.0.0-beta.52"
     },
     "koishi": {
         "description": {

diff --git a/packages/claude2-adapter/package.json b/packages/claude2-adapter/package.json
@@ -49,7 +49,7 @@
     },
     "peerDependencies": {
         "koishi": "^4.17.0",
-        "koishi-plugin-chatluna": "^1.0.0-beta.51"
+        "koishi-plugin-chatluna": "^1.0.0-beta.52"
     },
     "koishi": {
         "description": {

diff --git a/packages/core/package.json b/packages/core/package.json
@@ -1,7 +1,7 @@
 {
     "name": "koishi-plugin-chatluna",
     "description": "chatluna for koishi",
-    "version": "1.0.0-beta.51",
+    "version": "1.0.0-beta.52",
     "main": "lib/index.js",
     "typings": "lib/index.d.ts",
     "files": [

diff --git a/packages/embeddings-service/package.json b/packages/embeddings-service/package.json
@@ -40,7 +40,7 @@
     },
     "peerDependencies": {
         "koishi": "^4.17.0",
-        "koishi-plugin-chatluna": "^1.0.0-beta.51"
+        "koishi-plugin-chatluna": "^1.0.0-beta.52"
     },
     "koishi": {
         "description": {

diff --git a/packages/gemini-adapter/package.json b/packages/gemini-adapter/package.json
@@ -49,7 +49,7 @@
     },
     "peerDependencies": {
         "koishi": "^4.17.0",
-        "koishi-plugin-chatluna": "^1.0.0-beta.51"
+        "koishi-plugin-chatluna": "^1.0.0-beta.52"
     },
     "koishi": {
         "description": {

diff --git a/packages/gptfree-adapter/package.json b/packages/gptfree-adapter/package.json
@@ -44,7 +44,7 @@
     },
     "peerDependencies": {
         "koishi": "^4.17.0",
-        "koishi-plugin-chatluna": "^1.0.0-beta.51"
+        "koishi-plugin-chatluna": "^1.0.0-beta.52"
     },
     "koishi": {
         "description": {

diff --git a/packages/newbing-adapter/package.json b/packages/newbing-adapter/package.json
@@ -51,7 +51,7 @@
     },
     "peerDependencies": {
         "koishi": "^4.17.0",
-        "koishi-plugin-chatluna": "^1.0.0-beta.51"
+        "koishi-plugin-chatluna": "^1.0.0-beta.52"
     },
     "koishi": {
         "description": {

diff --git a/packages/ollama-adapter/package.json b/packages/ollama-adapter/package.json
@@ -44,7 +44,7 @@
     },
     "peerDependencies": {
         "koishi": "^4.17.0",
-        "koishi-plugin-chatluna": "^1.0.0-beta.51"
+        "koishi-plugin-chatluna": "^1.0.0-beta.52"
     },
     "koishi": {
         "description": {

diff --git a/packages/openai-adapter/package.json b/packages/openai-adapter/package.json
@@ -46,7 +46,7 @@
     },
     "peerDependencies": {
         "koishi": "^4.17.0",
-        "koishi-plugin-chatluna": "^1.0.0-beta.51"
+        "koishi-plugin-chatluna": "^1.0.0-beta.52"
     },
     "koishi": {
         "description": {

diff --git a/packages/openai-like-adapter/package.json b/packages/openai-like-adapter/package.json
@@ -46,7 +46,7 @@
     },
     "peerDependencies": {
         "koishi": "^4.17.0",
-        "koishi-plugin-chatluna": "^1.0.0-beta.51"
+        "koishi-plugin-chatluna": "^1.0.0-beta.52"
     },
     "koishi": {
         "description": {

diff --git a/packages/plugin-common/package.json b/packages/plugin-common/package.json
@@ -40,7 +40,7 @@
     },
     "peerDependencies": {
         "koishi": "^4.17.0",
-        "koishi-plugin-chatluna": "^1.0.0-beta.51"
+        "koishi-plugin-chatluna": "^1.0.0-beta.52"
     },
     "koishi": {
         "description": {

diff --git a/packages/qwen-adapter/package.json b/packages/qwen-adapter/package.json
@@ -1,7 +1,7 @@
 {
     "name": "koishi-plugin-chatluna-qwen-adapter",
     "description": "qwen adapter for chatluna",
-    "version": "1.0.0-beta.16",
+    "version": "1.0.0-beta.17",
     "main": "lib/index.js",
     "typings": "lib/index.d.ts",
     "files": [
@@ -36,15 +36,17 @@
         "adapter"
     ],
     "dependencies": {
-        "@langchain/core": "^0.2.5"
+        "@langchain/core": "^0.2.5",
+        "zod": "^3.24.0-canary.20240523T174819",
+        "zod-to-json-schema": "^3.23.0"
     },
     "devDependencies": {
         "atsc": "^2.0.1",
         "koishi": "^4.17.7"
     },
     "peerDependencies": {
         "koishi": "^4.17.0",
-        "koishi-plugin-chatluna": "^1.0.0-beta.51"
+        "koishi-plugin-chatluna": "^1.0.0-beta.52"
     },
     "koishi": {
         "description": {

diff --git a/packages/qwen-adapter/src/requester.ts b/packages/qwen-adapter/src/requester.ts
@@ -1,3 +1,13 @@
+import { ToolCallChunk } from '@langchain/core/dist/messages/tool'
+import {
+    AIMessageChunk,
+    BaseMessageChunk,
+    ChatMessageChunk,
+    FunctionMessageChunk,
+    HumanMessageChunk,
+    SystemMessageChunk,
+    ToolMessageChunk
+} from '@langchain/core/messages'
 import { ChatGenerationChunk } from '@langchain/core/outputs'
 import {
     EmbeddingsRequester,
@@ -21,6 +31,7 @@ import {
 } from './types'
 import {
     convertDeltaToMessageChunk,
+    formatToolsToQWenTools,
     langchainMessageToQWenMessage
 } from './utils'
 
@@ -47,6 +58,10 @@ export class QWenRequester
                         messages: langchainMessageToQWenMessage(params.input)
                     },
                     parameters: {
+                        tools:
+                            params.tools != null
+                                ? formatToolsToQWenTools(params.tools)
+                                : undefined,
                         result_format: 'message',
                         top_p: params.topP,
                         temperature: params.temperature,
@@ -58,12 +73,17 @@ export class QWenRequester
                 }
             )
 
+            const findTools = params.tools != null
+
             const iterator = sseIterable(response)
 
             const defaultRole: ChatCompletionResponseMessageRoleEnum =
                 'assistant'
-            // TODO: function calling with incremental response
-            // let lastMessageChunk: BaseMessageChunk
+
+            let lastMessageChunk: BaseMessageChunk = new ChatMessageChunk({
+                content: '',
+                role: defaultRole
+            })
 
             for await (const event of iterator) {
                 const chunk = event.data
@@ -101,18 +121,32 @@ export class QWenRequester
                     continue
                 }
 
-                const messageChunk = convertDeltaToMessageChunk(
+                let messageChunk = convertDeltaToMessageChunk(
                     choice,
                     defaultRole
                 )
 
-                const generationChunk = new ChatGenerationChunk({
+                let generationChunk = new ChatGenerationChunk({
                     message: messageChunk,
                     text: messageChunk.content as string
                 })
 
+                if (findTools) {
+                    messageChunk = this._diffChunk(
+                        messageChunk,
+                        lastMessageChunk
+                    )
+
+                    generationChunk = new ChatGenerationChunk({
+                        message: messageChunk,
+                        text: messageChunk.content as string
+                    })
+                }
+
                 yield generationChunk
 
+                lastMessageChunk = messageChunk
+
                 if (data.output.choices[0]?.finish_reason === 'stop') {
                     break
                 }
@@ -219,4 +253,135 @@ export class QWenRequester
     async init(): Promise<void> {}
 
     async dispose(): Promise<void> {}
+
+    private _diffChunk(
+        messageChunk: BaseMessageChunk,
+        baseMessageChunk: BaseMessageChunk
+    ) {
+        // diff content
+
+        // maybe the function is not incremental
+        // just change the content
+        const cloned = cloneMessageChunk(messageChunk)
+
+        if (messageChunk.content !== baseMessageChunk.content) {
+            const diffContent = messageChunk.content.slice(
+                baseMessageChunk.content.length
+            )
+
+            cloned.content = diffContent
+        }
+
+        if (cloned instanceof AIMessageChunk) {
+            cloned.tool_call_chunks = this._diffToolCallChunks(
+                (baseMessageChunk as AIMessageChunk).tool_call_chunks,
+                (messageChunk as AIMessageChunk).tool_call_chunks
+            )
+            //  cloned.tool_calls = []
+            return new AIMessageChunk({
+                ...cloned
+            })
+        }
+
+        cloned.additional_kwargs.tool_calls = []
+
+        return cloned
+    }
+
+    private _diffToolCallChunks(
+        baseToolCallChunks: ToolCallChunk[],
+        additionalToolCallChunks: ToolCallChunk[]
+    ) {
+        const cloned: ToolCallChunk[] = []
+        for (let i = 0; i < additionalToolCallChunks.length; i++) {
+            const baseToolCall = baseToolCallChunks?.[i]
+            const additionalToolCall = additionalToolCallChunks[i]
+
+            if (baseToolCall == null) {
+                cloned.push(additionalToolCall)
+            } else {
+                cloned.push(
+                    this._diffToolCallChunk(baseToolCall, additionalToolCall)
+                )
+            }
+        }
+
+        return cloned
+    }
+
+    private _diffToolCallChunk(
+        baseToolCall: ToolCallChunk,
+        additionalToolCall: ToolCallChunk
+    ) {
+        const cloned: ToolCallChunk = {
+            ...baseToolCall
+        }
+
+        if (additionalToolCall.name !== baseToolCall.name) {
+            cloned.name = additionalToolCall.name.slice(
+                baseToolCall.name?.length ?? 0
+            )
+        }
+
+        if (additionalToolCall.id !== baseToolCall.id) {
+            cloned.id = additionalToolCall.id.slice(
+                baseToolCall.id?.length ?? 0
+            )
+        }
+
+        if (additionalToolCall.args !== baseToolCall.args) {
+            cloned.args = additionalToolCall.args.slice(
+                baseToolCall.args?.length ?? 0
+            )
+        }
+
+        return cloned
+    }
+}
+
+function cloneMessageChunk(messageChunk: BaseMessageChunk) {
+    const content = messageChunk.content
+    const additional_kwargs = messageChunk.additional_kwargs
+    const name = messageChunk.name
+
+    if (messageChunk instanceof AIMessageChunk) {
+        return new AIMessageChunk({
+            content,
+            additional_kwargs,
+            name,
+            tool_call_chunks: messageChunk.tool_call_chunks
+        })
+    } else if (messageChunk instanceof HumanMessageChunk) {
+        return new HumanMessageChunk({
+            content,
+            additional_kwargs,
+            name
+        })
+    } else if (messageChunk instanceof SystemMessageChunk) {
+        return new SystemMessageChunk({
+            content,
+            additional_kwargs,
+            name
+        })
+    } else if (messageChunk instanceof FunctionMessageChunk) {
+        return new FunctionMessageChunk({
+            content,
+            additional_kwargs,
+            name
+        })
+    } else if (messageChunk instanceof ToolMessageChunk) {
+        return new ToolMessageChunk({
+            content,
+            additional_kwargs,
+            name,
+            tool_call_id: messageChunk.tool_call_id
+        })
+    } else {
+        return new ChatMessageChunk({
+            content,
+            additional_kwargs,
+            name,
+            role: messageChunk._getType()
+        })
+    }
 }
diff --git a/packages/qwen-adapter/src/types.ts b/packages/qwen-adapter/src/types.ts
@@ -25,6 +25,27 @@ export type ChatCompletionResponseMessageRoleEnum =
     | 'function'
     | 'tool'
 
+export interface ChatCompletionFunction {
+    name: string
+    description?: string
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    parameters?: { [key: string]: any }
+}
+
+export interface ChatCompletionTool {
+    type: string
+    function: ChatCompletionFunction
+}
+
+export interface ChatCompletionRequestMessageToolCall {
+    id: string
+    type: 'function'
+    function: {
+        name: string
+        arguments: string
+    }
+}
+
 /**
  *
  * @export