koishi-plugin-chatluna 1.2.0-alpha.8 → 1.2.0

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

@@ -154,7 +154,6 @@ Your goal is to craft an insightful, engaging response that seamlessly integrate
         usedTokens += await this._countMessageTokens(agentScratchpad);
       }
     }
-    console.log(chatHistory.length);
     const formatResult = await this._formatWithMessagesPlaceholder(
       chatHistory,
       [longHistory, knowledge].concat(
@@ -236,10 +235,11 @@ Your goal is to craft an insightful, engaging response that seamlessly integrate
       usedToken += loreBookTokens;
     }
     for (const [position, array] of Object.entries(canUseLoreBooks)) {
-      const message = this.variableService.formatMessages(
+      const message = await this.variableService.formatMessages(
         [await loreBooksPrompt.format({ input: array.join("\n") })],
         variables
-      )[0];
+      ).then((value) => value[0]);
+      console.log(message);
       if (position === "default") {
         if (hasLongMemory) {
           const index = result.findIndex(
@@ -249,7 +249,7 @@ Your goal is to craft an insightful, engaging response that seamlessly integrate
         } else {
           result.push(message);
         }
-        return;
+        continue;
       }
       const insertPosition = this._findIndex(
         result,
@@ -309,7 +309,7 @@ Your goal is to craft an insightful, engaging response that seamlessly integrate
       return chatHistory.length - 1;
     }
     const findIndexByType = /* @__PURE__ */ __name((type) => chatHistory.findIndex(
-      (message) => message.additional_kwargs?.type === type
+      (message) => message?.additional_kwargs?.type === type
     ), "findIndexByType");
     const descriptionIndex = findIndexByType("description");
     const personalityIndex = findIndexByType("description");

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

@@ -141,7 +141,6 @@ Your goal is to craft an insightful, engaging response that seamlessly integrate
         usedTokens += await this._countMessageTokens(agentScratchpad);
       }
     }
-    console.log(chatHistory.length);
     const formatResult = await this._formatWithMessagesPlaceholder(
       chatHistory,
       [longHistory, knowledge].concat(
@@ -223,10 +222,11 @@ Your goal is to craft an insightful, engaging response that seamlessly integrate
       usedToken += loreBookTokens;
     }
     for (const [position, array] of Object.entries(canUseLoreBooks)) {
-      const message = this.variableService.formatMessages(
+      const message = await this.variableService.formatMessages(
         [await loreBooksPrompt.format({ input: array.join("\n") })],
         variables
-      )[0];
+      ).then((value) => value[0]);
+      console.log(message);
       if (position === "default") {
         if (hasLongMemory) {
           const index = result.findIndex(
@@ -236,7 +236,7 @@ Your goal is to craft an insightful, engaging response that seamlessly integrate
         } else {
           result.push(message);
         }
-        return;
+        continue;
       }
       const insertPosition = this._findIndex(
         result,
@@ -296,7 +296,7 @@ Your goal is to craft an insightful, engaging response that seamlessly integrate
       return chatHistory.length - 1;
     }
     const findIndexByType = /* @__PURE__ */ __name((type) => chatHistory.findIndex(
-      (message) => message.additional_kwargs?.type === type
+      (message) => message?.additional_kwargs?.type === type
     ), "findIndexByType");
     const descriptionIndex = findIndexByType("description");
     const personalityIndex = findIndexByType("description");

package/package.json

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