fix: 修复回复插件

lrhh123 · lrhh123 · commit 69da15f569ec · 2024-06-16T21:20:01.000+08:00
diff --git a/src/main/backend/backend.ts b/src/main/backend/backend.ts
@@ -394,6 +394,7 @@ class BKServer {
           success: false,
           error: error instanceof Error ? error.message : String(error),
           message: error instanceof Error ? error.message : String(error),
+          consoleOutput: [],
         });
       }
     });
diff --git a/src/main/backend/controllers/configController.ts b/src/main/backend/controllers/configController.ts
@@ -20,23 +20,23 @@ export class ConfigController {
     const appId = ctx.get(CTX_APP_ID);
     const instanceId = ctx.get(CTX_INSTANCE_ID);
 
-    const instanceConfig = await Config.findOne({
+    let config;
+
+    config = await Config.findOne({
       where: { instance_id: instanceId },
     });
-    if (instanceConfig) {
-      return instanceConfig;
-    }
 
-    const appConfig = await Config.findOne({
-      where: { platform_id: appId },
-    });
-    if (appConfig) {
-      return appConfig;
+    if (!config && appId) {
+      config = await Config.findOne({
+        where: { platform_id: appId },
+      });
     }
 
-    let config = await Config.findOne({
-      where: { global: true },
-    });
+    if (!config) {
+      config = await Config.findOne({
+        where: { global: true },
+      });
+    }
 
     if (!config) {
       config = await Config.create({
@@ -54,6 +54,20 @@ export class ConfigController {
         config.has_use_gpt = globalConfig.has_use_gpt;
         config.has_mouse_close = globalConfig.has_mouse_close;
       }
+
+      // 再检查 key 和 base_url 是否存在，不存在则使用全局配置
+      if (!config.key || !config.base_url) {
+        config.llm_type = globalConfig?.llm_type || 'chatgpt';
+        config.model = globalConfig?.model || 'gpt-3.5-turbo';
+      }
+
+      if (!config.key) {
+        config.key = globalConfig?.key || '';
+      }
+
+      if (!config.base_url) {
+        config.base_url = globalConfig?.base_url || '';
+      }
     }
 
     return config;
diff --git a/src/main/backend/services/messageService.ts b/src/main/backend/services/messageService.ts
@@ -152,10 +152,10 @@ export class MessageService {
    * 检查 LLM 是否可用
    */
   public async checkGptHealth(cfg: LLMConfig) {
-    const llmClient = this.createLLMClient(cfg, cfg.llmType);
-    // 尝试使用它回复 Hi 来检查是否可用
-    if ('chat' in llmClient) {
-      try {
+    try {
+      const llmClient = this.createLLMClient(cfg, cfg.llmType);
+      // 尝试使用它回复 Hi 来检查是否可用
+      if ('chat' in llmClient) {
         // @ts-ignore
         const response = await llmClient.chat.completions.create({
           model: cfg.model,
@@ -178,13 +178,13 @@ export class MessageService {
           status: true,
           message: chunks.join(''),
         };
-      } catch (error) {
-        console.error(`Error in getLLMResponse: ${error}`);
-        return {
-          status: false,
-          message: error instanceof Error ? error.message : String(error),
-        };
       }
+    } catch (error) {
+      console.error(`Error in getLLMResponse: ${error}`);
+      return {
+        status: false,
+        message: error instanceof Error ? error.message : String(error),
+      };
     }
 
     return {
@@ -212,8 +212,13 @@ export class MessageService {
 
     let llmClient = this.llmClientMap.get(llm_name);
     if (!llmClient) {
-      llmClient = this.createLLMClient(cfg, llm_name);
-      this.llmClientMap.set(llm_name, llmClient);
+      try {
+        llmClient = this.createLLMClient(cfg, llm_name);
+        this.llmClientMap.set(llm_name, llmClient);
+      } catch (error) {
+        console.error(`Error in getLLMResponse: ${error}`);
+        return null;
+      }
     }
 
     // 检查 llmClient 是否存在 completions 方法
@@ -255,6 +260,8 @@ export class MessageService {
     let key;
     let baseUrl;
 
+    console.log('Creating LLM client:', llmName, cfg);
+
     if ('baseUrl' in cfg) {
       key = cfg.key;
       baseUrl = cfg.baseUrl;
@@ -264,6 +271,9 @@ export class MessageService {
     }
 
     const options = { apiKey: key, baseURL: baseUrl };
+    if (!options.baseURL || !options.apiKey) {
+      throw new Error('Missing required API key or base URL');
+    }
 
     if (llmName === 'ernie') {
       return new ErnieAI(options);
diff --git a/src/renderer/components/Settings/PluginSettings.tsx b/src/renderer/components/Settings/PluginSettings.tsx
@@ -26,7 +26,7 @@ import {
   updateConfig,
   checkPluginAvailability,
 } from '../../services/platform/controller';
-import { PluginConfig } from '../../services/platform/platform.d';
+import { PluginConfig, LogBody } from '../../services/platform/platform.d';
 import MessageModal from '../MessageModal';
 import { useSystemStore } from '../../stores/useSystemStore';
 
@@ -40,6 +40,7 @@ const PluginSettings = ({
   // TODO: 后面需要把这个参数说明放到文档中
 
   const [code, setCode] = useState<string | undefined>(PluginExampleCode);
+  const [consoleLogs, setConsoleLogs] = useState<LogBody[]>([]);
   const { isOpen, onOpen, onClose } = useDisclosure();
   const [isOpenMessageModal, setIsOpenMessageModal] = useState(false);
   const cancelRef = React.useRef<any>();
@@ -152,10 +153,16 @@ const PluginSettings = ({
       provideCompletionItems: () => {
         const suggestions = [
           {
-            label: 'cc.get',
+            label: 'require',
             kind: monaco.languages.CompletionItemKind.Function,
-            insertText: 'cc.get(ctx)',
-            documentation: '从上下文中取得当前使用的配置',
+            insertText: 'require()',
+            documentation: '引入模块',
+          },
+          {
+            label: 'console',
+            kind: monaco.languages.CompletionItemKind.Function,
+            insertText: 'console.log()',
+            documentation: '打印日志',
           },
         ];
         return { suggestions };
@@ -187,6 +194,8 @@ const PluginSettings = ({
         messages,
       });
 
+      setConsoleLogs(resp.consoleOutput || []);
+
       if (resp.status) {
         toast({
           title: '插件测试通过',
@@ -264,56 +273,70 @@ const PluginSettings = ({
         >
           启用自定义代码
         </Switch>
-        <Button
-          onClick={handleCheckPlugin}
-          colorScheme="green"
-          size="sm"
-          ml={4}
-        >
-          测试插件
-        </Button>
       </HStack>
       {config.usePlugin && (
         <>
-          <Box width="100%" height="400px">
-            <Editor
-              height="100%"
-              defaultLanguage="javascript"
-              value={code}
-              onChange={setCode}
-              beforeMount={handleEditorWillMount}
-              theme="vs-dark"
-            />
-          </Box>
-
           <HStack>
             <Button
               onClick={() => {
                 handleSaveCode();
               }}
+              size="sm"
               colorScheme="orange"
             >
               保存代码
             </Button>
 
-            <Button onClick={handleDefaultCode} colorScheme="red">
+            <Button onClick={handleDefaultCode} colorScheme="red" size="sm">
               重置代码
             </Button>
 
             <Button
               onClick={() => {
                 setIsOpenMessageModal(true);
               }}
+              size="sm"
               colorScheme="teal"
             >
               配置测试用例
             </Button>
-
-            <Button onClick={handleExportCode} colorScheme="blue">
+            <Button onClick={handleCheckPlugin} colorScheme="green" size="sm">
+              测试插件
+            </Button>
+            <Button onClick={handleExportCode} colorScheme="blue" size="sm">
               导出代码
             </Button>
           </HStack>
 
+          <Box width="100%" height="400px">
+            <Editor
+              height="100%"
+              defaultLanguage="javascript"
+              value={code}
+              onChange={setCode}
+              beforeMount={handleEditorWillMount}
+              theme="vs-dark"
+            />
+          </Box>
+
+          <Divider />
+
+          {/* 展示日志 */}
+          {consoleLogs && consoleLogs.length > 0 && (
+            <>
+              <Text fontSize="1xl" fontWeight="bold">
+                插件执行日志：
+              </Text>
+              <Box height="200px" overflowY="auto">
+                {consoleLogs.map((log, index) => (
+                  <Text key={index}>
+                    {log.level} {log.time} {log.message}
+                  </Text>
+                ))}
+              </Box>
+            </>
+          )}
+
           <AlertDialog
             isOpen={isOpen}
             leastDestructiveRef={cancelRef}
diff --git a/src/renderer/hooks/useBroadcastContext.tsx b/src/renderer/hooks/useBroadcastContext.tsx
@@ -43,7 +43,6 @@ export const BroadcastProvider = ({ children }: { children: ReactNode }) => {
 
   window.electron.ipcRenderer.on('broadcast', (msg) => {
     const message = msg as BroadcastMessage;
-    console.log('Received broadcast', message);
     eventHandlers.forEach((handler) => handler(message));
   });
 
diff --git a/src/renderer/services/platform/controller.ts b/src/renderer/services/platform/controller.ts
@@ -2,6 +2,7 @@ import {
   App,
   Instance,
   Keyword,
+  LogBody,
   GenericConfig,
   LLMConfig,
   AccountConfig,
@@ -170,6 +171,7 @@ export async function checkPluginAvailability({
     status: boolean;
     message: string;
     error: string;
+    consoleOutput: LogBody[];
   }>('/api/v1/base/plugin/check', {
     code,
     ctx,
diff --git a/src/renderer/services/platform/platform.d.ts b/src/renderer/services/platform/platform.d.ts
@@ -38,6 +38,12 @@ export interface Message {
   type: MessageType;
 }
 
+export interface LogBody {
+  level: string;
+  time: string;
+  message: string;
+}
+
 export interface GenericConfig {
   appId: string;
   instanceId: string;
diff --git a/src/renderer/utils/constants/index.ts b/src/renderer/utils/constants/index.ts
@@ -42,53 +42,8 @@ const rp = require('reply_srv');
  * @returns {Reply} 插件执行结果
  */
 async function main(ctx, messages) {
-  const appId = ctx.get('app_id');
-  const instanceId = ctx.get('instance_id');
-
-  const cfg = cc.get(ctx);
-
-  console.log('插件开始执行....');
-  console.log('当前应用 ID:', appId);
-  console.log('当前客服实例 ID:', instanceId);
-  console.log('当前配置:', ctx, messages);
-
-  // 先检查是否存在用户的消息
-  const lastUserMsg = messages
-    .slice()
-    .reverse()
-    .find((msg) => msg.role === 'OTHER');
-
-  if (!lastUserMsg) {
-    return {
-      type: 'TEXT',
-      content: cfg.default_reply, // 默认回复
-    };
-  }
-
-  // 等待随机时间
-  await new Promise((resolve) => {
-    const min = cfg.reply_speed;
-    const max = cfg.reply_random_speed + cfg.reply_speed;
-    const randomTime = min + Math.random() * (max - min);
-    setTimeout(resolve, randomTime * 1000);
-  });
-
-  // 再检查是否使用关键词匹配
-  if (rp.isKeywordMatch) {
-    const data = await rp.matchKeyword(ctx, lastUserMsg);
-    if (data) return data;
-  }
-
-  // 最后检查是否使用 GPT 生成回复
-  if (rp.isUseGptReply) {
-    const data = await rp.getLLMResponse(cfg, ctx, messages);
-    if (data) return data;
-  }
-
-  return {
-    type: 'TEXT',
-    content: cfg.default_reply,
-  };
+  const cfg = await cc.get(ctx);
+  return await rp.getDefaultReply(cfg, ctx, messages);
 }`;
 
 export const LLMTypeList = [

Original file line number	Diff line number	Diff line change
`@@ -394,6 +394,7 @@ class BKServer {`
`394`	`394`	`success: false,`
`395`	`395`	`error: error instanceof Error ? error.message : String(error),`
`396`	`396`	`message: error instanceof Error ? error.message : String(error),`
	`397`	`+ consoleOutput: [],`
`397`	`398`	`});`
`398`	`399`	`}`
`399`	`400`	`});`