koishi-plugin-chatluna 1.0.0-beta.76 → 1.0.0-beta.78

package/lib/index.cjs

@@ -1078,8 +1078,15 @@ var ChatHubChatChain = class _ChatHubChatChain extends import_base.ChatHubLLMCha
     message,
     stream,
     events,
-    conversationId
+    conversationId,
+    systemPrompts
   }) {
+    if (systemPrompts != null) {
+      const prompt = this.chain.prompt;
+      if (prompt instanceof ChatHubChatPrompt) {
+        prompt.systemPrompts = systemPrompts;
+      }
+    }
     const requests = {
       input: message
     };
@@ -4406,7 +4413,22 @@ function apply39(ctx, config, chain) {
             logger9.debug(`current balance: ${balance}`);
           }, "llm-used-token-count")
         },
-        config.streamResponse
+        config.streamResponse,
+        (0, import_prompt2.formatPresetTemplate)(presetTemplate, {
+          name: config.botName,
+          date: (/* @__PURE__ */ new Date()).toLocaleString(),
+          bot_id: session.bot.selfId,
+          is_group: (!session.isDirect || session.guildId != null).toString(),
+          is_private: session.isDirect?.toString(),
+          user_id: session.author?.user?.id ?? session.event?.user?.id ?? "0",
+          user: (0, import_string.getNotEmptyString)(
+            session.author?.nick,
+            session.author?.name,
+            session.event.user?.name,
+            session.username
+          ),
+          weekday: (0, import_string.getCurrentWeekday)()
+        })
       );
     } catch (e) {
       if (e?.message?.includes("output values have 1 keys")) {

package/lib/index.mjs

@@ -1067,8 +1067,15 @@ var ChatHubChatChain = class _ChatHubChatChain extends ChatHubLLMChainWrapper {
     message,
     stream,
     events,
-    conversationId
+    conversationId,
+    systemPrompts
   }) {
+    if (systemPrompts != null) {
+      const prompt = this.chain.prompt;
+      if (prompt instanceof ChatHubChatPrompt) {
+        prompt.systemPrompts = systemPrompts;
+      }
+    }
     const requests = {
       input: message
     };
@@ -4249,7 +4256,10 @@ __name(renderMessage, "renderMessage");
 
 // src/middlewares/request_model.ts
 import { sleep as sleep2 } from "koishi";
-import { formatPresetTemplateString } from "koishi-plugin-chatluna/llm-core/prompt";
+import {
+  formatPresetTemplate,
+  formatPresetTemplateString
+} from "koishi-plugin-chatluna/llm-core/prompt";
 import { parseRawModelName as parseRawModelName3 } from "koishi-plugin-chatluna/llm-core/utils/count_tokens";
 import {
   ChatLunaError as ChatLunaError6,
@@ -4424,7 +4434,22 @@ function apply39(ctx, config, chain) {
             logger9.debug(`current balance: ${balance}`);
           }, "llm-used-token-count")
         },
-        config.streamResponse
+        config.streamResponse,
+        formatPresetTemplate(presetTemplate, {
+          name: config.botName,
+          date: (/* @__PURE__ */ new Date()).toLocaleString(),
+          bot_id: session.bot.selfId,
+          is_group: (!session.isDirect || session.guildId != null).toString(),
+          is_private: session.isDirect?.toString(),
+          user_id: session.author?.user?.id ?? session.event?.user?.id ?? "0",
+          user: getNotEmptyString(
+            session.author?.nick,
+            session.author?.name,
+            session.event.user?.name,
+            session.username
+          ),
+          weekday: getCurrentWeekday()
+        })
       );
     } catch (e) {
       if (e?.message?.includes("output values have 1 keys")) {

package/lib/llm-core/agent/openai/output_parser.d.ts

@@ -25,7 +25,7 @@ export declare class OpenAIFunctionsAgentOutputParser extends AgentActionOutputP
     lc_namespace: string[];
     static lc_name(): string;
     parse(text: string): Promise<AgentAction | AgentFinish>;
-    parseResult(generations: ChatGeneration[]): Promise<FunctionsAgentAction | AgentFinish>;
+    parseResult(generations: ChatGeneration[]): Promise<AgentFinish | FunctionsAgentAction>;
     /**
      * Parses the output message into a FunctionsAgentAction or AgentFinish
      * object.

package/lib/llm-core/chain/base.d.ts

@@ -21,6 +21,7 @@ export interface ChatHubLLMCallArg {
     stream: boolean;
     conversationId: string;
     session: Session;
+    systemPrompts?: SystemPrompts;
 }
 export interface ChatHubLLMChainInput extends ChainInputs {
     /** Prompt object to use */

package/lib/llm-core/chain/chat_chain.d.ts

@@ -19,6 +19,6 @@ export declare class ChatHubChatChain extends ChatHubLLMChainWrapper implements
         chain: ChatHubLLMChain;
     });
     static fromLLM(llm: ChatLunaChatModel, { botName, longMemory, historyMemory, systemPrompts, humanMessagePrompt }: ChatHubChatChainInput): ChatHubLLMChainWrapper;
-    call({ message, stream, events, conversationId }: ChatHubLLMCallArg): Promise<ChainValues>;
+    call({ message, stream, events, conversationId, systemPrompts }: ChatHubLLMCallArg): Promise<ChainValues>;
     get model(): ChatLunaChatModel;
 }

package/lib/llm-core/chat/app.cjs

@@ -346,7 +346,7 @@ var ChatInterface = class {
   _vectorStoreRetrieverMemory;
   _chatHistory;
   _chains = {};
-  _errorCount = {};
+  _errorCountsMap = {};
   _chatCount = 0;
   _random = new import_koishi.Random();
   async chat(arg) {
@@ -361,11 +361,16 @@ var ChatInterface = class {
       }
       return response;
     } catch (e) {
-      this._errorCount[configMD5] = this._errorCount[config.md5()] ?? 0;
-      this._errorCount[configMD5] += 1;
-      if (this._errorCount[configMD5] > config.value.maxRetries) {
+      this._errorCountsMap[configMD5] = this._errorCountsMap[configMD5] ?? [];
+      const errorCountsArray = this._errorCountsMap[configMD5];
+      errorCountsArray.push(Date.now());
+      if (errorCountsArray.length > config.value.maxRetries && // 20 mins
+      checkRange(
+        errorCountsArray.splice(-config.value.maxRetries),
+        1e3 * 60 * 20
+      )) {
         delete this._chains[configMD5];
-        delete this._errorCount[configMD5];
+        delete this._errorCountsMap[configMD5];
         const service = this.ctx.chatluna.platform;
         await service.makeConfigStatus(config.value, false);
       }
@@ -691,6 +696,12 @@ var ChatInterface = class {
     });
   }
 };
+function checkRange(times, delayTime) {
+  const first = times[0];
+  const last = times[times.length - 1];
+  return last - first < delayTime;
+}
+__name(checkRange, "checkRange");
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   ChatInterface

package/lib/llm-core/chat/app.d.ts

@@ -11,7 +11,7 @@ export declare class ChatInterface {
     private _vectorStoreRetrieverMemory;
     private _chatHistory;
     private _chains;
-    private _errorCount;
+    private _errorCountsMap;
     private _chatCount;
     private _random;
     constructor(ctx: Context, input: ChatInterfaceInput);

package/lib/llm-core/chat/app.mjs

@@ -349,7 +349,7 @@ var ChatInterface = class {
   _vectorStoreRetrieverMemory;
   _chatHistory;
   _chains = {};
-  _errorCount = {};
+  _errorCountsMap = {};
   _chatCount = 0;
   _random = new Random();
   async chat(arg) {
@@ -364,11 +364,16 @@ var ChatInterface = class {
       }
       return response;
     } catch (e) {
-      this._errorCount[configMD5] = this._errorCount[config.md5()] ?? 0;
-      this._errorCount[configMD5] += 1;
-      if (this._errorCount[configMD5] > config.value.maxRetries) {
+      this._errorCountsMap[configMD5] = this._errorCountsMap[configMD5] ?? [];
+      const errorCountsArray = this._errorCountsMap[configMD5];
+      errorCountsArray.push(Date.now());
+      if (errorCountsArray.length > config.value.maxRetries && // 20 mins
+      checkRange(
+        errorCountsArray.splice(-config.value.maxRetries),
+        1e3 * 60 * 20
+      )) {
         delete this._chains[configMD5];
-        delete this._errorCount[configMD5];
+        delete this._errorCountsMap[configMD5];
         const service = this.ctx.chatluna.platform;
         await service.makeConfigStatus(config.value, false);
       }
@@ -694,6 +699,12 @@ var ChatInterface = class {
     });
   }
 };
+function checkRange(times, delayTime) {
+  const first = times[0];
+  const last = times[times.length - 1];
+  return last - first < delayTime;
+}
+__name(checkRange, "checkRange");
 export {
   ChatInterface
 };

package/lib/services/chat.cjs

@@ -657,11 +657,18 @@ var ChatLunaService = class extends import_koishi2.Service {
   findPlugin(fun) {
     return this._plugins.find(fun);
   }
-  chat(session, room, message, event, stream = false) {
+  chat(session, room, message, event, stream = false, systemPrompts) {
     const { model: modelName } = room;
     const [platform] = (0, import_count_tokens.parseRawModelName)(modelName);
     const chatInterfaceWrapper = this._chatInterfaceWrapper[platform] ?? this._createChatInterfaceWrapper(platform);
-    return chatInterfaceWrapper.chat(session, room, message, event, stream);
+    return chatInterfaceWrapper.chat(
+      session,
+      room,
+      message,
+      event,
+      stream,
+      systemPrompts
+    );
   }
   queryInterfaceWrapper(room) {
     const { model: modelName } = room;
@@ -1071,7 +1078,7 @@ var ChatInterfaceWrapper = class {
   _modelQueue = new import_queue.RequestIdQueue();
   _conversationQueue = new import_queue.RequestIdQueue();
   _platformService;
-  async chat(session, room, message, event, stream) {
+  async chat(session, room, message, event, stream, systemPrompts) {
     const { conversationId, model: fullModelName } = room;
     const [platform] = (0, import_count_tokens.parseRawModelName)(fullModelName);
     const config = this._platformService.getConfigs(platform)[0];
@@ -1094,7 +1101,8 @@ var ChatInterfaceWrapper = class {
         events: event,
         stream,
         conversationId,
-        session
+        session,
+        systemPrompts
       });
       return {
         content: chainValues.message.content,

package/lib/services/chat.d.ts

@@ -2,7 +2,7 @@ import { Awaitable, Computed, Context, Schema, Service, Session } from 'koishi';
 import { ChatInterface } from 'koishi-plugin-chatluna/llm-core/chat/app';
 import { Cache } from '../cache';
 import { ChatChain } from '../chains/chain';
-import { ChatHubLLMChainWrapper } from 'koishi-plugin-chatluna/llm-core/chain/base';
+import { ChatHubLLMChainWrapper, SystemPrompts } from 'koishi-plugin-chatluna/llm-core/chain/base';
 import { BasePlatformClient } from 'koishi-plugin-chatluna/llm-core/platform/client';
 import { ClientConfig, ClientConfigPool } from 'koishi-plugin-chatluna/llm-core/platform/config';
 import { ChatHubBaseEmbeddings, ChatLunaChatModel } from 'koishi-plugin-chatluna/llm-core/platform/model';
@@ -34,7 +34,7 @@ export declare class ChatLunaService extends Service {
     awaitLoadPlatform(plugin: ChatLunaPlugin | string): Promise<unknown>;
     unregisterPlugin(plugin: ChatLunaPlugin | string): Promise<void>;
     findPlugin(fun: (plugin: ChatLunaPlugin) => boolean): ChatLunaPlugin;
-    chat(session: Session, room: ConversationRoom, message: Message, event: ChatEvents, stream?: boolean): Promise<Message>;
+    chat(session: Session, room: ConversationRoom, message: Message, event: ChatEvents, stream?: boolean, systemPrompts?: SystemPrompts): Promise<Message>;
     queryInterfaceWrapper(room: ConversationRoom): ChatInterfaceWrapper;
     clearChatHistory(room: ConversationRoom): Promise<void>;
     getCachedInterfaceWrappers(): ChatInterfaceWrapper[];
@@ -87,7 +87,7 @@ declare class ChatInterfaceWrapper {
     private _conversationQueue;
     private _platformService;
     constructor(_service: ChatLunaService);
-    chat(session: Session, room: ConversationRoom, message: Message, event: ChatEvents, stream: boolean): Promise<Message>;
+    chat(session: Session, room: ConversationRoom, message: Message, event: ChatEvents, stream: boolean, systemPrompts?: SystemPrompts): Promise<Message>;
     query(room: ConversationRoom): Promise<ChatInterface>;
     clearChatHistory(room: ConversationRoom): Promise<void>;
     clear(room: ConversationRoom | string): Promise<void>;

package/lib/services/chat.mjs

@@ -644,11 +644,18 @@ var ChatLunaService = class extends Service {
   findPlugin(fun) {
     return this._plugins.find(fun);
   }
-  chat(session, room, message, event, stream = false) {
+  chat(session, room, message, event, stream = false, systemPrompts) {
     const { model: modelName } = room;
     const [platform] = parseRawModelName(modelName);
     const chatInterfaceWrapper = this._chatInterfaceWrapper[platform] ?? this._createChatInterfaceWrapper(platform);
-    return chatInterfaceWrapper.chat(session, room, message, event, stream);
+    return chatInterfaceWrapper.chat(
+      session,
+      room,
+      message,
+      event,
+      stream,
+      systemPrompts
+    );
   }
   queryInterfaceWrapper(room) {
     const { model: modelName } = room;
@@ -1058,7 +1065,7 @@ var ChatInterfaceWrapper = class {
   _modelQueue = new RequestIdQueue();
   _conversationQueue = new RequestIdQueue();
   _platformService;
-  async chat(session, room, message, event, stream) {
+  async chat(session, room, message, event, stream, systemPrompts) {
     const { conversationId, model: fullModelName } = room;
     const [platform] = parseRawModelName(fullModelName);
     const config = this._platformService.getConfigs(platform)[0];
@@ -1081,7 +1088,8 @@ var ChatInterfaceWrapper = class {
         events: event,
         stream,
         conversationId,
-        session
+        session,
+        systemPrompts
       });
       return {
         content: chainValues.message.content,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-chatluna",
   "description": "chatluna for koishi",
-  "version": "1.0.0-beta.76",
+  "version": "1.0.0-beta.78",
   "main": "lib/index.cjs",
   "module": "lib/index.mjs",
   "typings": "lib/index.d.ts",
@@ -223,7 +223,7 @@
     "@types/md5": "^2.3.5",
     "@types/qrcode": "^1.5.5",
     "@types/useragent": "^2",
-    "@types/uuid": "^9.0.8",
+    "@types/uuid": "^10.0.0",
     "atsc": "^2.1.0",
     "koishi-plugin-puppeteer": "^3.9.0"
   },