Merge branch '1.2.x'

Author: CodeCasterX

app-builder/plugins/aipp-plugin/src/main/java/modelengine/fit/jober/aipp/fitable/LlmComponent.java

@@ -7,6 +7,7 @@
 package modelengine.fit.jober.aipp.fitable;
 
 import static modelengine.fit.jade.aipp.prompt.constant.Constant.PROMPT_METADATA_KEY;
+import static modelengine.fit.jober.aipp.constants.AippConst.INST_STATUS_KEY;
 import static modelengine.fitframework.inspection.Validation.notNull;
 
 import modelengine.fel.core.chat.ChatMessage;
@@ -23,6 +24,7 @@
 import modelengine.fel.tool.mcp.client.McpClientFactory;
 import modelengine.fel.tool.mcp.entity.Tool;
 import modelengine.fel.tool.model.transfer.ToolData;
+import modelengine.fit.jober.aipp.enums.MetaInstStatusEnum;
 import modelengine.fit.jober.aipp.util.McpUtils;
 import modelengine.fitframework.inspection.Validation;
 import modelengine.jade.store.service.ToolService;
@@ -279,7 +281,9 @@ private void addAnswer(AippLlmMeta llmMeta, String answer, Map<String, Object> p
 
         // 如果节点配置为输出到聊天，模型回复内容需要持久化
         boolean enableLog = checkEnableLog(businessData);
-        if (enableLog) {
+        AppTaskInstance instance =
+                this.appTaskInstanceService.getInstance(llmMeta.getVersionId(), llmMeta.getInstId(), null).orElse(null);
+        if (enableLog && ! this.isTerminated(instance)) {
             Map<String, Object> llmOutput = new HashMap<>();
             llmOutput.put("output", output);
             Optional<ResponsibilityResult> formatOutput = this.formatterChain.handle(llmOutput);
@@ -299,6 +303,15 @@ private void addAnswer(AippLlmMeta llmMeta, String answer, Map<String, Object> p
         doOnAgentComplete(llmMeta);
     }
 
+    private boolean isTerminated(AppTaskInstance instance) {
+        if (instance == null) {
+            return false;
+        }
+        Map<String, Object> infos = instance.getEntity().getInfos();
+        return infos != null && StringUtils.equals(ObjectUtils.cast(infos.get(INST_STATUS_KEY)),
+                MetaInstStatusEnum.TERMINATED.name());
+    }
+
     /**
      * llm节点处理结束回调函数。
      * <ul>

frontend/src/pages/chatPreview/components/receive-box/message-detail.tsx

@@ -17,6 +17,8 @@ import ThinkBlock from './think-block';
 import StepBlock from './step-block';
 import 'highlight.js/styles/monokai-sublime.min.css';
 import './styles/message-detail.scss';
+import store from '@/store/store';
+import {setCurrentAnswer} from "@/store/chatStore/chatStore";
 
 /**
  * 消息详情
@@ -205,6 +207,10 @@ const MessageBox = (props: any) => {
       container && container.removeEventListener('click', recieveClick);
     }
   }, []);
+
+  useEffect(() => {
+    store.dispatch(setCurrentAnswer(replacedText));
+  }, [replacedText]);
 
   return (
     <>

frontend/src/pages/chatPreview/index.tsx

@@ -83,6 +83,7 @@ const ChatPreview = (props) => {
   const showMulti = useAppSelector((state) => state.commonStore.historySwitch);
   const useMemory = useAppSelector((state) => state.commonStore.useMemory);
   const isDebug = useAppSelector((state) => state.commonStore.isDebug);
+  const currentAnswer = useAppSelector((state) => state.chatCommonStore.currentAnswer);
   const { showElsa } = useContext(AippContext);
   const [checkedList, setCheckedList] = useState([]);
   const [loading, setLoading] = useState(false);
@@ -594,8 +595,8 @@ const ChatPreview = (props) => {
   // 终止进行中的对话
   async function chatRunningStop(params) {
     let terminateParams: any = {};
-    params.content ? terminateParams.content = params.content : terminateParams.content = t('conversationTerminated');
-    params.instanceId ? runningInstanceId.current = params.instanceId : '';
+    terminateParams.content = params.content ? params.content : currentAnswer ? currentAnswer :
+      t('conversationTerminated');
     if (params.logId) {
       terminateParams.logId = params.logId;
     }

frontend/src/store/chatStore/action-types.ts

@@ -12,4 +12,5 @@ export const SET_REFERENCE_LIST = 'SET_REFERENCE_LIST';
 export const SET_USER_ROLE = 'SET_USER_ROLE';
 export const SET_READ_ONLY = 'SET_READ_ONLY';
 export const SET_NO_AUTH = 'SET_NO_AUTH';
-export const SET_PLUGIN_LIST = 'SET_PLUGIN_LIST';
+export const SET_PLUGIN_LIST = 'SET_PLUGIN_LIST';
+export const SET_CURRENT_ANSWER = 'SET_CURRENT_ANSWER';

frontend/src/store/chatStore/chatStore.ts

@@ -13,7 +13,8 @@ import {
   SET_READ_ONLY,
   SET_NO_AUTH,
   SET_USER_ROLE,
-  SET_PLUGIN_LIST
+  SET_PLUGIN_LIST,
+  SET_CURRENT_ANSWER
 } from './action-types';
 
 export const setChatId = (item) => {
@@ -60,4 +61,7 @@ export const setNoAuth = (item) => {
 }
 export const setPluginList = (item) => {
   return { type: SET_PLUGIN_LIST, payload: item }
-}
+}
+export const setCurrentAnswer = (item) => {
+  return { type: SET_CURRENT_ANSWER, payload: item }
+}

frontend/src/store/chatStore/reducer.ts

@@ -13,7 +13,8 @@ import {
   SET_USER_ROLE,
   SET_READ_ONLY,
   SET_NO_AUTH,
-  SET_PLUGIN_LIST
+  SET_PLUGIN_LIST,
+  SET_CURRENT_ANSWER
 } from './action-types';
 
 const initialState = {
@@ -32,6 +33,7 @@ const initialState = {
   readOnly: false,
   noAuth: false,
   pluginList: [],
+  currentAnswer: ''
 }
 
 const chatReducers = (state = initialState, action) => {
@@ -66,6 +68,8 @@ const chatReducers = (state = initialState, action) => {
       return { ...state, noAuth: action.payload };
     case SET_PLUGIN_LIST:
       return { ...state, pluginList: action.payload };
+    case SET_CURRENT_ANSWER:
+      return { ...state, currentAnswer: action.payload };
     default:
       return state
   }