koishi-plugin-openai-compatible 1.1.0 → 1.1.2

package/lib/index.d.ts

@@ -1,4 +1,4 @@
-import { Context, Logger } from 'koishi';
+import { Context, Schema, Logger } from 'koishi';
 import { Config, EmotionType, EmojiConfig } from './types';
 declare module 'koishi' {
     interface Context {
@@ -36,7 +36,7 @@ declare class OpenAICompatible {
     private cooldownManager;
     private logger;
     constructor(ctx: Context, config: Config);
-    private ensureConfigDefaults;
+    private normalizeConfig;
     private registerService;
     private registerCommand;
     chat(message: string, options?: {
@@ -68,5 +68,8 @@ declare class OpenAICompatible {
 }
 export { OpenAICompatible, Config, EmotionAnalyzer };
 export * from './types';
-declare const _default: (ctx: Context, config: Config) => OpenAICompatible;
-export default _default;
+declare const plugin: {
+    (ctx: Context, config: Config): OpenAICompatible;
+    Config: Schema<Config>;
+};
+export default plugin;

package/lib/index.js

@@ -47,10 +47,11 @@ class CooldownManager {
 // OpenAI兼容客户端
 class OpenAICompatibleClient {
     constructor(config, logger, isEmotion = false) {
+        var _a;
         this.config = config;
         this.logger = logger.extend(isEmotion ? 'emotion-client' : 'client');
         // 如果是情绪分析客户端，使用情绪分析配置（如果提供）
-        if (isEmotion && config.emotionAnalysis.enabled) {
+        if (isEmotion && ((_a = config.emotionAnalysis) === null || _a === void 0 ? void 0 : _a.enabled)) {
             // 使用情绪分析配置，如果为空则使用主配置
             const emotionEndpoint = config.emotionAnalysis.endpoint || config.endpoint;
             this.endpoint = (emotionEndpoint || 'https://api.openai.com/v1').replace(/\/$/, '');
@@ -83,8 +84,12 @@ class OpenAICompatibleClient {
         // 根据是否为情绪分析设置不同的参数
         let requestConfig;
         if (isEmotion) {
+            const emotionConfig = this.config.emotionAnalysis || {
+                model: 'gpt-3.5-turbo',
+                prompt: ''
+            };
             requestConfig = {
-                model: ((_a = config === null || config === void 0 ? void 0 : config.emotionAnalysis) === null || _a === void 0 ? void 0 : _a.model) || this.config.emotionAnalysis.model,
+                model: ((_a = config === null || config === void 0 ? void 0 : config.emotionAnalysis) === null || _a === void 0 ? void 0 : _a.model) || emotionConfig.model,
                 messages,
                 max_tokens: (config === null || config === void 0 ? void 0 : config.emotionMaxTokens) || this.config.emotionMaxTokens,
                 temperature: (config === null || config === void 0 ? void 0 : config.emotionTemperature) || this.config.emotionTemperature,
@@ -180,7 +185,8 @@ class EmotionAnalyzer {
         this.imageAsMarkdown = config.imageAsMarkdown;
     }
     async analyze(text) {
-        if (!this.config.emotionAnalysis.enabled || !text.trim()) {
+        var _a;
+        if (!((_a = this.config.emotionAnalysis) === null || _a === void 0 ? void 0 : _a.enabled) || !text.trim()) {
             const neutralConfig = this.emotionEmojis['neutral'] || { text: '😐', image: '' };
             return {
                 emotion: 'neutral',
@@ -329,40 +335,40 @@ class OpenAICompatible {
         this.config = config;
         this.logger = ctx.logger('openai-compatible');
         // 确保配置有默认值
-        this.ensureConfigDefaults();
+        this.config = this.normalizeConfig(config);
         this.client = new OpenAICompatibleClient(this.config, this.logger);
         this.emotionAnalyzer = new EmotionAnalyzer(this.config, this.logger);
         this.cooldownManager = new CooldownManager(this.config.cooldown);
         this.registerCommand();
         this.registerService();
     }
-    ensureConfigDefaults() {
+    normalizeConfig(config) {
+        // 创建一个深拷贝，确保所有配置都有默认值
+        const normalized = { ...config };
         // 确保所有必要的配置都有默认值
-        if (!this.config.endpoint) {
-            this.config.endpoint = 'https://api.openai.com/v1';
+        if (!normalized.endpoint) {
+            normalized.endpoint = 'https://api.openai.com/v1';
         }
-        if (!this.config.model) {
-            this.config.model = 'gpt-3.5-turbo';
+        if (!normalized.model) {
+            normalized.model = 'gpt-3.5-turbo';
         }
-        if (!this.config.apiKey) {
-            this.config.apiKey = '';
+        if (!normalized.apiKey) {
+            normalized.apiKey = '';
             this.logger.warn('API密钥未配置，插件将无法正常工作');
         }
         // 确保情绪分析配置有默认值
-        if (this.config.emotionAnalysis) {
-            if (!this.config.emotionAnalysis.endpoint) {
-                this.config.emotionAnalysis.endpoint = '';
-            }
-            if (!this.config.emotionAnalysis.apiKey) {
-                this.config.emotionAnalysis.apiKey = '';
-            }
-            if (!this.config.emotionAnalysis.model) {
-                this.config.emotionAnalysis.model = 'gpt-3.5-turbo';
-            }
+        if (!normalized.emotionAnalysis) {
+            normalized.emotionAnalysis = {
+                enabled: true,
+                endpoint: '',
+                apiKey: '',
+                model: 'gpt-3.5-turbo',
+                prompt: '请分析以下文本的情绪类型，只能返回以下情绪类型之一：happy（开心）、sad（悲伤）、angry（愤怒）、neutral（中性）、surprised（惊讶）、fearful（害怕）、disgusted（厌恶）、excited（兴奋）、calm（平静）、confused（困惑）。不要返回其他内容，只返回情绪类型单词。',
+            };
         }
         // 确保情绪表情配置有默认值
-        if (!this.config.emotionEmojis) {
-            this.config.emotionEmojis = {
+        if (!normalized.emotionEmojis) {
+            normalized.emotionEmojis = {
                 'happy': { text: '😊', image: '' },
                 'sad': { text: '😢', image: '' },
                 'angry': { text: '😠', image: '' },
@@ -375,6 +381,23 @@ class OpenAICompatible {
                 'confused': { text: '😕', image: '' },
             };
         }
+        // 确保其他配置有默认值
+        if (normalized.blacklist === undefined) {
+            normalized.blacklist = [];
+        }
+        if (normalized.cooldown === undefined) {
+            normalized.cooldown = 0;
+        }
+        if (normalized.showError === undefined) {
+            normalized.showError = true;
+        }
+        if (normalized.showEmotionImage === undefined) {
+            normalized.showEmotionImage = true;
+        }
+        if (normalized.imageAsMarkdown === undefined) {
+            normalized.imageAsMarkdown = false;
+        }
+        return normalized;
     }
     registerService() {
         this.ctx.openai = this;
@@ -733,6 +756,10 @@ class OpenAICompatible {
 }
 exports.OpenAICompatible = OpenAICompatible;
 __exportStar(require("./types"), exports);
-exports.default = (ctx, config) => {
+// Koishi 插件导出格式
+const plugin = (ctx, config) => {
     return new OpenAICompatible(ctx, config);
 };
+// 为插件添加 Config 属性
+plugin.Config = types_1.Config;
+exports.default = plugin;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "koishi-plugin-openai-compatible",
-  "version": "1.1.0",
+  "version": "1.1.2",
   "description": "这是一个适用于Koishi的OpenAI兼容聊天插件，支持与所有兼容OpenAI API的大模型进行聊天交互。",
   "main": "lib/index.js",
   "scripts": {

package/src/index.ts

@@ -56,7 +56,7 @@ class OpenAICompatibleClient {
     this.logger = logger.extend(isEmotion ? 'emotion-client' : 'client')
     
     // 如果是情绪分析客户端，使用情绪分析配置（如果提供）
-    if (isEmotion && config.emotionAnalysis.enabled) {
+    if (isEmotion && config.emotionAnalysis?.enabled) {
       // 使用情绪分析配置，如果为空则使用主配置
       const emotionEndpoint = config.emotionAnalysis.endpoint || config.endpoint
       this.endpoint = (emotionEndpoint || 'https://api.openai.com/v1').replace(/\/$/, '')
@@ -97,8 +97,12 @@ class OpenAICompatibleClient {
     let requestConfig: any
     
     if (isEmotion) {
+      const emotionConfig = this.config.emotionAnalysis || {
+        model: 'gpt-3.5-turbo',
+        prompt: ''
+      }
       requestConfig = {
-        model: config?.emotionAnalysis?.model || this.config.emotionAnalysis.model,
+        model: config?.emotionAnalysis?.model || emotionConfig.model,
         messages,
         max_tokens: config?.emotionMaxTokens || this.config.emotionMaxTokens,
         temperature: config?.emotionTemperature || this.config.emotionTemperature,
@@ -220,7 +224,7 @@ class EmotionAnalyzer {
     success: boolean
     error?: string
   }> {
-    if (!this.config.emotionAnalysis.enabled || !text.trim()) {
+    if (!this.config.emotionAnalysis?.enabled || !text.trim()) {
       const neutralConfig = this.emotionEmojis['neutral'] || { text: '😐', image: '' }
       return {
         emotion: 'neutral',
@@ -403,7 +407,7 @@ class OpenAICompatible {
     this.logger = ctx.logger('openai-compatible')
     
     // 确保配置有默认值
-    this.ensureConfigDefaults()
+    this.config = this.normalizeConfig(config)
     
     this.client = new OpenAICompatibleClient(this.config, this.logger)
     this.emotionAnalyzer = new EmotionAnalyzer(this.config, this.logger)
@@ -413,37 +417,38 @@ class OpenAICompatible {
     this.registerService()
   }
   
-  private ensureConfigDefaults() {
+  private normalizeConfig(config: Config): Config {
+    // 创建一个深拷贝，确保所有配置都有默认值
+    const normalized = { ...config }
+    
     // 确保所有必要的配置都有默认值
-    if (!this.config.endpoint) {
-      this.config.endpoint = 'https://api.openai.com/v1'
+    if (!normalized.endpoint) {
+      normalized.endpoint = 'https://api.openai.com/v1'
     }
     
-    if (!this.config.model) {
-      this.config.model = 'gpt-3.5-turbo'
+    if (!normalized.model) {
+      normalized.model = 'gpt-3.5-turbo'
     }
     
-    if (!this.config.apiKey) {
-      this.config.apiKey = ''
+    if (!normalized.apiKey) {
+      normalized.apiKey = ''
       this.logger.warn('API密钥未配置，插件将无法正常工作')
     }
     
     // 确保情绪分析配置有默认值
-    if (this.config.emotionAnalysis) {
-      if (!this.config.emotionAnalysis.endpoint) {
-        this.config.emotionAnalysis.endpoint = ''
-      }
-      if (!this.config.emotionAnalysis.apiKey) {
-        this.config.emotionAnalysis.apiKey = ''
-      }
-      if (!this.config.emotionAnalysis.model) {
-        this.config.emotionAnalysis.model = 'gpt-3.5-turbo'
+    if (!normalized.emotionAnalysis) {
+      normalized.emotionAnalysis = {
+        enabled: true,
+        endpoint: '',
+        apiKey: '',
+        model: 'gpt-3.5-turbo',
+        prompt: '请分析以下文本的情绪类型，只能返回以下情绪类型之一：happy（开心）、sad（悲伤）、angry（愤怒）、neutral（中性）、surprised（惊讶）、fearful（害怕）、disgusted（厌恶）、excited（兴奋）、calm（平静）、confused（困惑）。不要返回其他内容，只返回情绪类型单词。',
       }
     }
     
     // 确保情绪表情配置有默认值
-    if (!this.config.emotionEmojis) {
-      this.config.emotionEmojis = {
+    if (!normalized.emotionEmojis) {
+      normalized.emotionEmojis = {
         'happy': { text: '😊', image: '' },
         'sad': { text: '😢', image: '' },
         'angry': { text: '😠', image: '' },
@@ -456,6 +461,29 @@ class OpenAICompatible {
         'confused': { text: '😕', image: '' },
       }
     }
+    
+    // 确保其他配置有默认值
+    if (normalized.blacklist === undefined) {
+      normalized.blacklist = []
+    }
+    
+    if (normalized.cooldown === undefined) {
+      normalized.cooldown = 0
+    }
+    
+    if (normalized.showError === undefined) {
+      normalized.showError = true
+    }
+    
+    if (normalized.showEmotionImage === undefined) {
+      normalized.showEmotionImage = true
+    }
+    
+    if (normalized.imageAsMarkdown === undefined) {
+      normalized.imageAsMarkdown = false
+    }
+    
+    return normalized
   }
   
   private registerService() {
@@ -894,9 +922,16 @@ class OpenAICompatible {
   }
 }
 
+// 导出插件
 export { OpenAICompatible, Config, EmotionAnalyzer }
 export * from './types'
 
-export default (ctx: Context, config: Config) => {
+// Koishi 插件导出格式
+const plugin = (ctx: Context, config: Config) => {
   return new OpenAICompatible(ctx, config)
-}
+}
+
+// 为插件添加 Config 属性
+plugin.Config = Config
+
+export default plugin