koishi-plugin-chatluna 1.4.4 → 1.4.5

package/lib/index.cjs

@@ -1193,32 +1193,32 @@ var ChatLunaPluginChain = class _ChatLunaPluginChain extends import_base4.ChatLu
     let error;
     const request2 = /* @__PURE__ */ __name(() => {
       const manager = import_manager.CallbackManager.configure(arg.callbacks) ?? new import_manager.CallbackManager();
-      manager.addHandler(
-        import_manager.CallbackManager.fromHandlers({
-          async handleLLMEnd(out) {
-            usedToken += out.llmOutput?.usage_metadata?.total_tokens ?? 0;
-          },
-          async handleAgentAction(action) {
-            await arg.events?.["llm-call-tool"]?.(
-              action.tool,
-              action.toolInput,
-              action.content,
-              action.log
-            );
-          },
-          async handleToolEnd(out) {
-            import_koishi_plugin_chatluna5.logger.debug("Tool end:", (0, import_string5.sanitizeToolLogValue)(out));
-          },
-          async handleLLMNewToken(token) {
-            await arg.events?.["llm-new-token"]?.(token);
-          },
-          async handleCustomEvent(name2, data) {
-            if (name2 === "LLMNewChunk") {
-              await arg.events?.["llm-new-chunk"]?.(data);
-            }
+      const handler = import_manager.CallbackManager.fromHandlers({
+        async handleLLMEnd(out) {
+          usedToken += out.llmOutput?.usage_metadata?.total_tokens ?? 0;
+        },
+        async handleAgentAction(action) {
+          await arg.events?.["llm-call-tool"]?.(
+            action.tool,
+            action.toolInput,
+            action.content,
+            action.log
+          );
+        },
+        async handleToolEnd(out) {
+          import_koishi_plugin_chatluna5.logger.debug("Tool end:", (0, import_string5.sanitizeToolLogValue)(out));
+        },
+        async handleLLMNewToken(token) {
+          await arg.events?.["llm-new-token"]?.(token);
+        },
+        async handleCustomEvent(name2, data) {
+          if (name2 === "LLMNewChunk") {
+            await arg.events?.["llm-new-chunk"]?.(data);
           }
-        }).handlers[0]
-      );
+        }
+      }).handlers[0];
+      handler.awaitHandlers = true;
+      manager.addHandler(handler);
       return runner.invoke(
         {
           ...requests,

package/lib/index.mjs

@@ -1190,32 +1190,32 @@ var ChatLunaPluginChain = class _ChatLunaPluginChain extends ChatLunaLLMChainWra
     let error;
     const request2 = /* @__PURE__ */ __name(() => {
       const manager = CallbackManager.configure(arg.callbacks) ?? new CallbackManager();
-      manager.addHandler(
-        CallbackManager.fromHandlers({
-          async handleLLMEnd(out) {
-            usedToken += out.llmOutput?.usage_metadata?.total_tokens ?? 0;
-          },
-          async handleAgentAction(action) {
-            await arg.events?.["llm-call-tool"]?.(
-              action.tool,
-              action.toolInput,
-              action.content,
-              action.log
-            );
-          },
-          async handleToolEnd(out) {
-            logger5.debug("Tool end:", sanitizeToolLogValue(out));
-          },
-          async handleLLMNewToken(token) {
-            await arg.events?.["llm-new-token"]?.(token);
-          },
-          async handleCustomEvent(name2, data) {
-            if (name2 === "LLMNewChunk") {
-              await arg.events?.["llm-new-chunk"]?.(data);
-            }
+      const handler = CallbackManager.fromHandlers({
+        async handleLLMEnd(out) {
+          usedToken += out.llmOutput?.usage_metadata?.total_tokens ?? 0;
+        },
+        async handleAgentAction(action) {
+          await arg.events?.["llm-call-tool"]?.(
+            action.tool,
+            action.toolInput,
+            action.content,
+            action.log
+          );
+        },
+        async handleToolEnd(out) {
+          logger5.debug("Tool end:", sanitizeToolLogValue(out));
+        },
+        async handleLLMNewToken(token) {
+          await arg.events?.["llm-new-token"]?.(token);
+        },
+        async handleCustomEvent(name2, data) {
+          if (name2 === "LLMNewChunk") {
+            await arg.events?.["llm-new-chunk"]?.(data);
           }
-        }).handlers[0]
-      );
+        }
+      }).handlers[0];
+      handler.awaitHandlers = true;
+      manager.addHandler(handler);
       return runner.invoke(
         {
           ...requests,

package/lib/llm-core/agent/index.cjs

@@ -1697,6 +1697,17 @@ function createAgent(options) {
           agentContext: ctx
         }
       });
+      const streamCallbacks = import_manager.CallbackManager.fromHandlers({
+        async handleLLMNewToken(token) {
+          await input.onToken?.(token);
+        },
+        async handleCustomEvent(name2, data) {
+          if (name2 === "LLMNewChunk") {
+            await input.onChunk?.(data);
+          }
+        }
+      });
+      streamCallbacks.handlers[0].awaitHandlers = true;
       return await bound.invoke(
         {
           input: message,
@@ -1714,18 +1725,7 @@ function createAgent(options) {
           signal: input.signal,
           callbacks: import_manager.CallbackManager.configure(
             input.callbacks,
-            import_manager.CallbackManager.fromHandlers({
-              async handleLLMNewToken(token) {
-                await input.onToken?.(token);
-              },
-              async handleCustomEvent(name2, data) {
-                if (name2 === "LLMNewChunk") {
-                  await input.onChunk?.(
-                    data
-                  );
-                }
-              }
-            })
+            streamCallbacks
           ),
           metadata: { chatlunaAgent: ctx },
           configurable: {

package/lib/llm-core/agent/index.mjs

@@ -1687,6 +1687,17 @@ function createAgent(options) {
           agentContext: ctx
         }
       });
+      const streamCallbacks = CallbackManager.fromHandlers({
+        async handleLLMNewToken(token) {
+          await input.onToken?.(token);
+        },
+        async handleCustomEvent(name2, data) {
+          if (name2 === "LLMNewChunk") {
+            await input.onChunk?.(data);
+          }
+        }
+      });
+      streamCallbacks.handlers[0].awaitHandlers = true;
       return await bound.invoke(
         {
           input: message,
@@ -1704,18 +1715,7 @@ function createAgent(options) {
           signal: input.signal,
           callbacks: CallbackManager.configure(
             input.callbacks,
-            CallbackManager.fromHandlers({
-              async handleLLMNewToken(token) {
-                await input.onToken?.(token);
-              },
-              async handleCustomEvent(name2, data) {
-                if (name2 === "LLMNewChunk") {
-                  await input.onChunk?.(
-                    data
-                  );
-                }
-              }
-            })
+            streamCallbacks
           ),
           metadata: { chatlunaAgent: ctx },
           configurable: {

package/lib/llm-core/chain/base.cjs

@@ -242,21 +242,21 @@ var ChatLunaLLMChain = class extends BaseChain {
 async function callChatLunaChain(chain, values, events, callbacks) {
   let usedToken = 0;
   const manager = import_manager.CallbackManager.configure(callbacks) ?? new import_manager.CallbackManager();
-  manager.addHandler(
-    import_manager.CallbackManager.fromHandlers({
-      async handleLLMNewToken(token) {
-        await events?.["llm-new-token"]?.(token);
-      },
-      async handleLLMEnd(output) {
-        usedToken += output.llmOutput?.usage_metadata?.total_tokens ?? 0;
-      },
-      async handleCustomEvent(eventName, data) {
-        if (eventName === "LLMNewChunk") {
-          await events?.["llm-new-chunk"]?.(data);
-        }
+  const handler = import_manager.CallbackManager.fromHandlers({
+    async handleLLMNewToken(token) {
+      await events?.["llm-new-token"]?.(token);
+    },
+    async handleLLMEnd(output) {
+      usedToken += output.llmOutput?.usage_metadata?.total_tokens ?? 0;
+    },
+    async handleCustomEvent(eventName, data) {
+      if (eventName === "LLMNewChunk") {
+        await events?.["llm-new-chunk"]?.(data);
       }
-    }).handlers[0]
-  );
+    }
+  }).handlers[0];
+  handler.awaitHandlers = true;
+  manager.addHandler(handler);
   const response = await chain.invoke(values, {
     callbacks: manager
   });

package/lib/llm-core/chain/base.mjs

@@ -225,21 +225,21 @@ var ChatLunaLLMChain = class extends BaseChain {
 async function callChatLunaChain(chain, values, events, callbacks) {
   let usedToken = 0;
   const manager = CallbackManager.configure(callbacks) ?? new CallbackManager();
-  manager.addHandler(
-    CallbackManager.fromHandlers({
-      async handleLLMNewToken(token) {
-        await events?.["llm-new-token"]?.(token);
-      },
-      async handleLLMEnd(output) {
-        usedToken += output.llmOutput?.usage_metadata?.total_tokens ?? 0;
-      },
-      async handleCustomEvent(eventName, data) {
-        if (eventName === "LLMNewChunk") {
-          await events?.["llm-new-chunk"]?.(data);
-        }
+  const handler = CallbackManager.fromHandlers({
+    async handleLLMNewToken(token) {
+      await events?.["llm-new-token"]?.(token);
+    },
+    async handleLLMEnd(output) {
+      usedToken += output.llmOutput?.usage_metadata?.total_tokens ?? 0;
+    },
+    async handleCustomEvent(eventName, data) {
+      if (eventName === "LLMNewChunk") {
+        await events?.["llm-new-chunk"]?.(data);
       }
-    }).handlers[0]
-  );
+    }
+  }).handlers[0];
+  handler.awaitHandlers = true;
+  manager.addHandler(handler);
   const response = await chain.invoke(values, {
     callbacks: manager
   });

package/lib/llm-core/platform/model.cjs

@@ -299,7 +299,7 @@ var ChatLunaChatModel = class extends import_chat_models.BaseChatModel {
       try {
         stream = this._createStream(streamParams);
         for await (const chunk of stream) {
-          const hasTool = this._handleStreamChunk(
+          const hasTool = await this._handleStreamChunk(
             chunk,
             runManager,
             latestTokenUsage
@@ -326,7 +326,7 @@ var ChatLunaChatModel = class extends import_chat_models.BaseChatModel {
             )
           );
         }
-        this._finalizeStream(
+        await this._finalizeStream(
           hasToolCallChunk,
           latestTokenUsage,
           runManager
@@ -385,15 +385,15 @@ var ChatLunaChatModel = class extends import_chat_models.BaseChatModel {
       total_tokens: 0
     };
   }
-  _handleStreamChunk(chunk, runManager, latestTokenUsage) {
+  async _handleStreamChunk(chunk, runManager, latestTokenUsage) {
     const chunkText = chunk.text ?? "";
     if (chunkText) {
-      void runManager?.handleLLMNewToken(chunkText);
+      await runManager?.handleLLMNewToken(chunkText);
     }
     const message = chunk.message;
     const hasToolCallChunk = this._hasToolCallChunk(message);
     if (!hasToolCallChunk) {
-      void runManager?.handleCustomEvent("LLMNewChunk", message);
+      await runManager?.handleCustomEvent("LLMNewChunk", message);
     }
     this._updateTokenUsageFromChunk(chunk, latestTokenUsage);
     return hasToolCallChunk;
@@ -418,9 +418,9 @@ var ChatLunaChatModel = class extends import_chat_models.BaseChatModel {
     latestTokenUsage.input_token_details = usage.input_token_details;
     latestTokenUsage.output_token_details = usage.output_token_details;
   }
-  _finalizeStream(hasToolCallChunk, latestTokenUsage, runManager) {
+  async _finalizeStream(hasToolCallChunk, latestTokenUsage, runManager) {
     if (!hasToolCallChunk) {
-      void runManager?.handleCustomEvent("LLMNewChunk", void 0);
+      await runManager?.handleCustomEvent("LLMNewChunk", void 0);
     }
     if (latestTokenUsage.total_tokens <= 0) {
       return;

package/lib/llm-core/platform/model.mjs

@@ -286,7 +286,7 @@ var ChatLunaChatModel = class extends BaseChatModel {
       try {
         stream = this._createStream(streamParams);
         for await (const chunk of stream) {
-          const hasTool = this._handleStreamChunk(
+          const hasTool = await this._handleStreamChunk(
             chunk,
             runManager,
             latestTokenUsage
@@ -313,7 +313,7 @@ var ChatLunaChatModel = class extends BaseChatModel {
             )
           );
         }
-        this._finalizeStream(
+        await this._finalizeStream(
           hasToolCallChunk,
           latestTokenUsage,
           runManager
@@ -372,15 +372,15 @@ var ChatLunaChatModel = class extends BaseChatModel {
       total_tokens: 0
     };
   }
-  _handleStreamChunk(chunk, runManager, latestTokenUsage) {
+  async _handleStreamChunk(chunk, runManager, latestTokenUsage) {
     const chunkText = chunk.text ?? "";
     if (chunkText) {
-      void runManager?.handleLLMNewToken(chunkText);
+      await runManager?.handleLLMNewToken(chunkText);
     }
     const message = chunk.message;
     const hasToolCallChunk = this._hasToolCallChunk(message);
     if (!hasToolCallChunk) {
-      void runManager?.handleCustomEvent("LLMNewChunk", message);
+      await runManager?.handleCustomEvent("LLMNewChunk", message);
     }
     this._updateTokenUsageFromChunk(chunk, latestTokenUsage);
     return hasToolCallChunk;
@@ -405,9 +405,9 @@ var ChatLunaChatModel = class extends BaseChatModel {
     latestTokenUsage.input_token_details = usage.input_token_details;
     latestTokenUsage.output_token_details = usage.output_token_details;
   }
-  _finalizeStream(hasToolCallChunk, latestTokenUsage, runManager) {
+  async _finalizeStream(hasToolCallChunk, latestTokenUsage, runManager) {
     if (!hasToolCallChunk) {
-      void runManager?.handleCustomEvent("LLMNewChunk", void 0);
+      await runManager?.handleCustomEvent("LLMNewChunk", void 0);
     }
     if (latestTokenUsage.total_tokens <= 0) {
       return;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-chatluna",
   "description": "chatluna for koishi",
-  "version": "1.4.4",
+  "version": "1.4.5",
   "main": "lib/index.cjs",
   "module": "lib/index.mjs",
   "typings": "lib/index.d.ts",