feature: update stream chat

lightislost · lightislost · commit 1a81bf60b308 · 2024-11-04T11:03:48.000+08:00
diff --git a/frontend/.umirc.ts b/frontend/.umirc.ts
@@ -13,15 +13,15 @@ export default defineConfig({
     default: 'zh-CN',
     antd: true,
   },
-  proxy: {
-    '/api': {
-      // target: 'https://nexa-api-pre.alipay.com',
-      // target: 'http://30.230.0.179:8080',
-      target: 'http://runtime:8080',
-      // target: 'http://30.98.121.212:8083',
-      changeOrigin: true,
-    },
-  },
+  // proxy: {
+  //   '/api': {
+  //     // target: 'https://nexa-api-pre.alipay.com',
+  //     // target: 'http://30.230.0.179:8080',
+  //     target: 'http://runtime:8080',
+  //     // target: 'http://30.98.121.212:8083',
+  //     changeOrigin: true,
+  //   },
+  // },
   routes: [
     {
       path: '/',
diff --git a/frontend/src/app.ts b/frontend/src/app.ts
@@ -1,6 +1,16 @@
 import { createGlobalStyle } from '@umijs/max';
-// 运行时配置
+import type { RequestConfig } from '@umijs/max';
 
+// ps: 推master要改成localhost
+const API_PREFIX = 'http://localhost:8080';
+// const API_PREFIX = 'http://30.183.176.221:8080';
+
+export const request: RequestConfig = {
+  requestInterceptors: [
+    (url, options) => ({ url: `${API_PREFIX}${url}`, options })
+  ]
+
+}
 // 全局初始化数据配置，用于 Layout 用户信息和权限初始化
 // 更多信息见文档：https://umijs.org/docs/api/runtime-config#getinitialstate
 // export async function getInitialState(): Promise<{ name: string }> {
diff --git a/frontend/src/pages/EKG/Common/Chat/ChatContent.tsx b/frontend/src/pages/EKG/Common/Chat/ChatContent.tsx
@@ -1,7 +1,7 @@
 import { dataToJson, jsonToData } from '../../utils/format';
 import { getMyEmpId } from '../../utils/userStore';
 import { Avatar, Button, Space } from 'antd';
-import React, { useContext, useState } from 'react';
+import React, { useContext, useState, useRef, useEffect } from 'react';
 import {
   CheckCircleFilled,
   CloseCircleFilled,
@@ -17,6 +17,7 @@ const ChatContent = () => {
   const { msgList, selectedAgent, setHeaderType } = useContext(
     CommonContext,
   ) as CommonContextType;
+  const contentRef = useRef(null);
 
   const formatMsgContent = (dataItem: NEX_MAIN_API.EKGChatJSONMsg) => {
     const { content, type } = dataItem;
@@ -58,8 +59,20 @@ const ChatContent = () => {
     }
   };
 
+  useEffect(() => {
+    const contentElement = contentRef.current;
+    const scrollToBottom = () => {
+      contentElement.scrollTop = contentElement.scrollHeight;
+    };
+    const observer = new MutationObserver(scrollToBottom);
+    observer.observe(contentElement, { childList: true, subtree: true });
+    scrollToBottom();
+    return () => observer.disconnect();
+  }, []);
+
+
   return (
-    <ContentWrapper>
+    <ContentWrapper className='contentClass' ref={contentRef}>
       {!dataToJson(msgList).flag && <AgentPrologue agent={selectedAgent} />}
       {msgList?.length > 0 && (
         <>
diff --git a/frontend/src/pages/EKG/Common/Chat/ChatFooter.tsx b/frontend/src/pages/EKG/Common/Chat/ChatFooter.tsx
@@ -154,8 +154,10 @@ const ChatFooter = () => {
         },
       ];
     });
+    // ps: 推master要改成localhost
     ssePost(
-      '/api/portal/conversation/chat',
+      'http://localhost:8080/api/portal/conversation/chat',
+      // 'http://30.183.176.221:8080/api/portal/conversation/chat',
       {
         sessionId: props_sessionId,
         agentId: selectedAgent?.agentId,
@@ -227,9 +229,6 @@ const ChatFooter = () => {
       >
         <Form form={form} style={{ width: '100%', height: '100%' }}>
           <div className="InputMainWrapper">
-            {/* <div style={{ width: '100%', height: '40px' }}>
-              {renderHeader()}
-            </div> */}
             <div
               className="InputWrapper"
               style={{
diff --git a/frontend/src/pages/EKG/Common/Chat/TemplateCode/index.tsx b/frontend/src/pages/EKG/Common/Chat/TemplateCode/index.tsx
@@ -49,7 +49,7 @@ const TemplateCode = ({ dataSource }: TemplateIprops) => {
           return dataSource;
         }
       });
-    }, 50); // 调整这个值以改变打字速度
+    }, 20); // 调整这个值以改变打字速度
 
     return () => {
       clearInterval(interval);
diff --git a/frontend/src/pages/EKG/Common/Chat/sseport.ts b/frontend/src/pages/EKG/Common/Chat/sseport.ts
@@ -38,6 +38,7 @@ export const ssePost = async (
   fetchEventSource(`${url}`, {
     method: 'POST',
     headers,
+    mode: 'cors',
     body: JSON.stringify(paramValues),
     openWhenHidden: true,
     signal: ctrl.signal,
@@ -104,10 +105,34 @@ export const ssePost = async (
       }
     },
     onmessage: async (msg) => {
-
       if (msg.data !== 'start' && msg.data !== 'end') {
         if (msg.data && jsonToData(msg.data).data[0].type === "role_response") {
-          currentMsg.push(jsonToData(msg.data).data[0]);
+          const data = jsonToData(msg.data).data[0];
+          propsObj?.setMsgList((previousList: any) => {
+            const lastMessage = previousList[previousList.length - 1];
+            if (lastMessage && lastMessage.content.output === '输出中') {
+              return [
+                ...previousList.slice(0, -1),
+                data,
+                {
+                  type: 'json',
+                  msgId: Date.now(),
+                  content: {
+                    output: '输出中',
+                    input: '',
+                    role: 'assistant',
+                    messageType: 'json',
+                    conversationId: Date.now(),
+                    status: 'EXECUTING',
+                  },
+                  traceId: Date.now(),
+                  chatResultTypeCode: 'cover',
+                  streamingDisplay: false,
+                },
+              ];
+            }
+            return previousList;
+          });
         } else {
           currentMsg.push(jsonToData(msg.data).data[0]);
         }
diff --git a/muagent/base_configs/env_config.py b/muagent/base_configs/env_config.py
@@ -90,4 +90,7 @@
 SEARCH_ENGINE_TOP_K = os.environ.get("SEARCH_ENGINE_TOP_K") or 5
 
 # 代码引擎匹配结题数量
-CODE_SEARCH_TOP_K = os.environ.get("CODE_SEARCH_TOP_K") or 1
+CODE_SEARCH_TOP_K = os.environ.get("CODE_SEARCH_TOP_K") or 1
+
+# （Jieba) 自定义词库文件路径
+EXTRA_KEYWORDS_PATH = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'extra_keywords.txt')
diff --git a/muagent/base_configs/extra_keywords.txt b/muagent/base_configs/extra_keywords.txt
@@ -0,0 +1,3 @@
+花呗
+借呗
+余额宝
diff --git a/muagent/base_configs/prompts/intention_template_prompt.py b/muagent/base_configs/prompts/intention_template_prompt.py
@@ -1,4 +1,5 @@
-from typing import Union, Optional
+from typing import Union, Optional, Sequence
+from dataclasses import dataclass
 
 
 RECOGNIZE_INTENTION_PROMPT = """你是一个任务决策助手，能够将理解用户意图并决策采取最合适的行动，尽可能地以有帮助和准确的方式回应人类，
@@ -64,87 +65,119 @@
 '''
 
 
+GENERAL_INTENTION_PROMPT = """## 背景
+作为智能助手，您需要根据用户询问判断其主要意图，以确定接下来的行动。
+
+## 任务
+找出最相关的意图，包括以下{num}种：
+{intention}
+
+## 输出格式
+最相关意图对应的数字（第一个意图对应数字1）{extra}。
+{example}
+## 用户询问
+"""
+
+
+@dataclass
+class IntentionInfo:
+    description: str
+    name: Optional[str] = None
+    tag: Optional[str] = None
+
+    def __post_init__(self):
+        marks = '.。,，;；:：?？\t\n '
+        self.description = self.description.replace('{', '{{').replace('}', '}}').strip(marks)
+        
+        if self.name:
+            self.name = self.name.replace('{', '{{').replace('}', '}}').strip(marks)
+
+    def __str__(self):
+        if self.name:
+            return f'{self.name}：{self.description}'
+        return self.description
+
+
 def get_intention_prompt(
-    background: str, intentions: Union[list, tuple], examples: Optional[dict]=None,
+    intentions: Sequence[IntentionInfo],
+    examples: Optional[dict[str, Union[IntentionInfo, Sequence[IntentionInfo]]]]=None,
     allow_multiple_choice=False
 ) -> str:
     nums_zh = ('一', '两', '三', '四', '五', '六', '七', '八', '九', '十')
-    marks = '.。,，;；:：?？\t\n'
 
     intention_num = len(intentions)
-    num_zh = nums_zh[intention_num - 1] if intention_num <= 10 else intention_num
-    prompt = f'##背景##\n{background}\n\n##任务##\n找出最相关的意图，包括以下{num_zh}种：\n'
-
-    for i, val in enumerate(intentions):
-        if isinstance(val, (list, tuple)):
-            k, v = val
-            cur_intention = '{}. {}：{}；\n'.format(i + 1, k, v.strip(marks))
-        else:
-            cur_intention = '{}. {}；\n'.format(i + 1, val.strip(marks))
-        prompt += cur_intention
+    intention_num_zh = nums_zh[intention_num - 1] if intention_num <= len(nums_zh) else intention_num
+
+    intentions_str, intention2idx = '', dict()
+    for i, intention_info in enumerate(intentions):
+        end_mark = '。' if i == intention_num - 1 else '；'
+        intentions_str += '{}. {}{}\n'.format(i + 1, intention_info, end_mark)
+        intention2idx[str(intention_info)] = i + 1
     
-    temp = '，若存在多个意图都是最相关的，请用","分开' if allow_multiple_choice else ''
-    prompt += f'\n##输出格式##\n最相关意图对应的数字（第一个意图对应数字1）{temp}。\n\n'
+    extra = '，若存在多个意图都是最相关的，请用","分开' if allow_multiple_choice else ''
 
+    example_str = ''
     if examples:
-        prompt += '##示例##\n'
-        intention_idx_map = {k[0]: idx + 1 for idx, k in enumerate(intentions)}
-        for query, ans in examples.items():
-            if not isinstance(ans, (list, tuple)):
-                ans = [ans]
-            ans = ','.join([str(intention_idx_map[x]) for x in ans])
-            prompt += f'问题：{query}\n回答：{ans}\n\n'
+        example_str += '\n## 示例\n'
+        for query, label in examples.items():
+            if isinstance(label, IntentionInfo):
+                label = [label]
+            label = ','.join([str(intention2idx[str(x)]) for x in label])
+            example_str += f'问题：{query}\n回答：{label}\n'
     
-    prompt += '##用户询问##\n问题：{query}\n回答：'
+    prompt = GENERAL_INTENTION_PROMPT.format(
+        num=intention_num_zh,
+        intention=intentions_str[:-1],
+        extra=extra,
+        example=example_str
+    )
+
+    prompt += '问题：{query}\n回答：'
     return prompt
 
 
-INTENTIONS_CONSULT_WHICH = [
-    ('整体计划查询', '用户想要获取某个问题的答案，或某个解决方案的完整流程（步骤）。'),
-    ('下一步任务查询', '用户询问某个问题或方案的特定步骤，通常会提及“下一步”、“具体操作”等'),
-    ('闲聊', '用户询问的内容与当前的技术问题或解决方案无关，更多是出于兴趣或社交性质的交流。')
-]
-INTENTIONS_CONSULT_WHICH_CODE = {
-    '整体计划查询': 'allPlan',
-    '下一步任务查询': 'nextStep',
-    '闲聊': 'justChat'
-}
-CONSULT_WHICH_PROMPT = get_intention_prompt(
-    '作为智能助手，您的职责是根据用户询问的内容，精准判断其背后的意图，以便提供最恰当的服务和支持。',
-    INTENTIONS_CONSULT_WHICH,
-    {
-        '如何组织一次活动？': '整体计划查询',
-        '系统升级的整个流程是怎样的？': '整体计划查询',
-        '为什么我没有收到红包？请告诉我方案': '整体计划查询',
-        '听说你们采用了新工具，能讲讲它的特点吗？': '闲聊'
-    }
+INTENTION_ALLPLAN = IntentionInfo(
+    description='用户想要获取某个问题的答案，或某个解决方案的完整流程（步骤）。',
+    name='整体计划查询', tag='allPlan'
+)
+INTENTION_NEXTSTEP = IntentionInfo(
+    description='用户询问某个问题或方案的特定步骤，通常会提及“下一步”、“具体操作”等。',
+    name='下一步任务查询', tag='nextStep'
+)
+INTENTION_CHAT = IntentionInfo(
+    description='用户询问的内容与当前的技术问题或解决方案无关，更多是出于兴趣或社交性质的交流。',
+    name='闲聊', tag='justChat'
+)
+INTENTION_EXECUTE = IntentionInfo(
+    description='用户在使用某平台、服务、产品或功能时遇到了问题，或者要求完成某一需要执行的任务，或者明确声明要执行某一流程或游戏',
+    name='执行'
+)
+INTENTION_QUERY = IntentionInfo(
+    description='用户的主要目的是获取信息而非执行任务（比如：怎么向银行申请贷款），或只是简单闲聊。',
+    name='询问'
+)
+INTENTION_NOMATCH = IntentionInfo(
+    description='与上述意图都不匹配，属于其他类型的询问意图。'
 )
 
-INTENTIONS_WHETHER_EXEC = [
-    ('执行', '用户在使用某平台、服务、产品或功能时遇到了问题，或者明确声明要执行某一流程或游戏。'),
-    ('询问', '用户的主要目的是获取信息，或只是简单闲聊。')
-]
+INTENTIONS_WHETHER_EXEC = (INTENTION_EXECUTE, INTENTION_QUERY)
 WHETHER_EXECUTE_PROMPT = get_intention_prompt(
-    '作为智能助手，您需要根据用户询问判断其主要意图，以便提供最恰当的服务和支持。',
-    INTENTIONS_WHETHER_EXEC,
-    {
-        '为什么我的优惠券使用失败？': '执行',
-        '公司团建怎么申请？': '询问',
-        '开始玩游戏。': '执行'
+    intentions=INTENTIONS_WHETHER_EXEC,
+    examples={
+        '为什么我的优惠券使用失败？': INTENTION_EXECUTE,
+        '如何向银行贷款？': INTENTION_QUERY,
+        '开始玩游戏。': INTENTION_EXECUTE,
+        '帮我看一下今天的天气怎么样': INTENTION_EXECUTE
     }
 )
 
-DIRECT_CHAT_PROMPT = """##背景##
-作为智能助手，您的职责是根据自身专业知识回答用户询问，以便提供最恰当的服务和支持。
-
-##任务##
-基于您所掌握的领域知识，对用户的提问进行回答。
-
-##注意事项##
-1. 请尽量从客观的角度来回答问题，内容符合事实、有理有据。
-2. 内容尽量简洁。
-
-##用户询问##
-询问：{query}
-回答：
-"""
+INTENTIONS_CONSULT_WHICH = (INTENTION_ALLPLAN, INTENTION_NEXTSTEP, INTENTION_CHAT)
+CONSULT_WHICH_PROMPT = get_intention_prompt(
+    intentions=INTENTIONS_CONSULT_WHICH,
+    examples={
+        '如何组织一次活动？': INTENTION_ALLPLAN,
+        '系统升级的整个流程是怎样的？': INTENTION_ALLPLAN,
+        '为什么我没有收到红包？请告诉我方案': INTENTION_ALLPLAN,
+        '听说你们采用了新工具，能讲讲它的特点吗？': INTENTION_CHAT
+    }
+)
diff --git a/muagent/service/ekg_construct/ekg_construct_base.py b/muagent/service/ekg_construct/ekg_construct_base.py
@@ -1,5 +1,6 @@
 from loguru import logger
 import re
+import os
 import json
 from typing import List, Dict, Optional, Tuple, Literal
 
@@ -15,12 +16,14 @@
 from jieba.analyse import extract_tags
 
 import time
+import jieba
 
 from muagent.schemas.ekg import *
 from muagent.schemas.db import *
 from muagent.schemas.common import *
 from muagent.db_handler import *
 from muagent.orm import table_init
+from muagent.base_configs.env_config import EXTRA_KEYWORDS_PATH
 
 from muagent.connector.configs.generate_prompt import *
 
@@ -81,6 +84,9 @@ def __init__(
         # init db handler
         self.initialize_space = initialize_space
         self.init_handler()
+        # load custom keywords
+        if os.path.exists(EXTRA_KEYWORDS_PATH):
+            jieba.load_userdict(EXTRA_KEYWORDS_PATH)
 
     def init_handler(self, ):
         """Initializes Database VectorBase GraphDB TbaseDB"""
diff --git a/muagent/service/ekg_inference/intention_router.py b/muagent/service/ekg_inference/intention_router.py
diff --git a/runtime/model/src/main/java/com/alipay/muagent/model/chat/content/RoleResponseContent.java b/runtime/model/src/main/java/com/alipay/muagent/model/chat/content/RoleResponseContent.java
diff --git a/runtime/web/src/main/java/com/alipay/muagent/web/interceptor/WebConfigure.java b/runtime/web/src/main/java/com/alipay/muagent/web/interceptor/WebConfigure.java
diff --git a/tests/service/EKG_test_construct_data_zq_03.py b/tests/service/EKG_test_construct_data_zq_03.py

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ const TemplateCode = ({ dataSource }: TemplateIprops) => {`
`49`	`49`	`return dataSource;`
`50`	`50`	`}`
`51`	`51`	`});`
`52`		`- }, 50); // 调整这个值以改变打字速度`
	`52`	`+ }, 20); // 调整这个值以改变打字速度`
`53`	`53`
`54`	`54`	`return () => {`
`55`	`55`	`clearInterval(interval);`