ai-error-assistant-pro 0.0.6 → 0.0.8

package/components/demo/api/index.js

@@ -1,9 +1,12 @@
 import request from '../utils/request'
 import { fetchEventSource } from '@microsoft/fetch-event-source';
 import constants from '../utils/constants';
-const baseURL = sessionStorage.getItem('AI-INTELLIGENT-TOOLS_BASE_URL') || constants.publicPath;
-const prefix = sessionStorage.getItem('AI-INTELLIGENT-TOOLS_PRE_FIX') || constants.publicPrefix;
 import cache from '../plugins/cache';
+const baseURL = sessionStorage.getItem('AI-INTELLIGENT-TOOLS_BASE_URL') || constants.publicPath;
+let prefix = sessionStorage.getItem('AI-INTELLIGENT-TOOLS_PRE_FIX') || constants.publicPrefix;
+
+// 0.0.7 版本接口升级
+prefix += '/plugin/v2';
 export const ssoAuth = (token) => {
     return request({
         url: prefix + '/sso/assistant',
@@ -70,14 +73,34 @@ export const chartClear = (chatId) => {
     });
 }
 
+export const checkCourseIdIsExist = (resId) => {
+    return request({
+        url: prefix + `/ia/hasPermission?courseId=${resId}`,
+        method: 'get',
+    });
+}
+
+/**
+ * 自动追问
+ * @param iaId 请求参数id
+ * @param message 对话对
+ * @returns 返回节点详情数据
+ */
+export async function getAutoQuestioning(iaId, message) {
+    return request.post(`${prefix}/ia/autoFollowUp`, {
+        iaId,
+        messages: message,
+    });
+}
+
 export async function sendMessageEventSource(params, signal, onmessage) {
-    return fetchEventSource(`${baseURL}${prefix}/assistant/conversation`, {
+    return fetchEventSource(`${baseURL}${prefix}/assistant/conversation?token=${cache.session.getJSON('SRKJ_TOKEN_CACHE')}`, {
         method: 'POST',
         signal: signal,
         openWhenHidden: true,
         headers: {
             'Content-Type': 'application/json',
-            'X-Id-Token': cache.session.getJSON('SRKJ_TOKEN_CACHE'),
+            // 'X-Id-Token': cache.session.getJSON('SRKJ_TOKEN_CACHE'),
         },
         body: JSON.stringify(params),
         onmessage,

package/components/demo/src/chat-tools.vue

@@ -2,7 +2,7 @@
     <div class="robot-tools" v-if="listData">
         <div class="robot-reanswer"
              style="margin-bottom: 8px"
-             v-if="listData.stop || listData.finish || type === 'error' && !sending"
+             v-if="(listData.stop || listData.finish || type === 'error' && !sending) && isLast"
              @click="reAnswer(listData)">
             <i class="el-icon-refresh-right"></i>
             重新回答
@@ -83,6 +83,10 @@ export default {
         sending: {
             type: Boolean,
             default: false
+        },
+        isLast: {
+            type: Boolean,
+            default: false
         }
     },
     data() {

package/components/demo/src/chat.vue

@@ -12,22 +12,48 @@
             <div :class="{'user-info': list.type === 'user'}" class="robot-message">
                 <div v-html="list.message"></div>
                 <div v-if="list.type === 'robot' && list.links.length > 0" class="link">
+                    <div v-if="!list.allIdWithStart">
+                        <div class="link-title">参考文件</div>
+                        <div class="link-content">
+                            <template v-for="item in list.links">
+                                <div class="links" v-if="!item.title.startsWith(chatMajorId)">
+                                    <a :href="'https://ai-yuliao.hep.com.cn'+item.documentUrl" target="_blank">
+                                        <span>{{ item.title }}</span>
+                                    </a>
+                                </div>
+                            </template>
+                        </div>
+                    </div>
+                </div>
+                <div v-if="list.type === 'robot' && list.connectUrl.length > 0" class="link">
                     <div class="link-title">相关链接</div>
                     <div class="link-content">
-                        <template v-for="item in list.links">
-                            <div class="links" v-if="!item.title.startsWith(chatMajorId)">
-                                <a :href="'https://ai-yuliao.hep.com.cn'+item.documentUrl" target="_blank">
-                                    <span>{{ item.title }}</span>
+                        <template v-for="item in list.connectUrl">
+                            <div class="links">
+                                <a :href="item.iaUrl" target="_blank">
+                                    <span>{{ item.iaUrlName }}</span>
                                 </a>
                             </div>
                         </template>
-
+                    </div>
+                </div>
+                <div v-if="list.type === 'robot' && finish && list.followUps && list.followUps.length > 0">
+                    <div class="link-title">智能追问</div>
+                    <div class="link-content">
+                        <div class="hot-list"
+                             v-for="(list, index) in list.followUps"
+                             :key="index"
+                             @click="selectModule(list)">
+                            {{ list }}
+                            <i class="el-icon-arrow-right go-icon"></i>
+                        </div>
                     </div>
                 </div>
                 <chat-tools v-if="list.type === 'robot'"
                             :chatId="chatId"
                             :detail-data="list"
                             :sending="list.sending"
+                            :is-last="index === messageData.length - 1"
                             @on-reanswer="(list) => reanswer(list, index)"
                             @on-stop-chat="onStopChat"/>
             </div>
@@ -38,7 +64,8 @@
 import { errorList } from '../utils/config';
 import ChatTools from './chat-tools.vue';
 import ErrorChat from './error-chat.vue';
-import { chartClear, sendMessageEventSource } from "../api";
+import { marked } from 'marked';
+import { chartClear, sendMessageEventSource, getAutoQuestioning } from "../api";
 const controller = new AbortController();
 const signal = controller.signal;
 
@@ -73,6 +100,7 @@ export default {
             messageData: [],
             chatId: '', // 对话id
             chatMajorId: '',
+            finish: false,
         }
     },
     computed: {
@@ -103,6 +131,7 @@ export default {
         },
         async postMessage(list, commonKey, parentMsgId) {
             let reanswerParams = {};
+            this.finish = false;
             if (list) {
                 list.sending = true;
                 reanswerParams = {
@@ -112,6 +141,8 @@ export default {
                     content: this.messageData[list.index - 1].message,
                 }
                 this.messageData[list.index].message = '';
+                this.messageData[list.index].cacheMessage = '';
+                this.makeAutoMessage();
             }
             const params = {
                 messageList: [
@@ -121,35 +152,54 @@ export default {
                         chatId: this.chatId || undefined,
                         commonKey: commonKey || false,
                         parentMsgId: parentMsgId || undefined,
+                        xtId: this.analyExercise.busId,
                         ...reanswerParams,
                     }
                 ]
             };
             // list 存在说明是重新生成
             if (!list && !commonKey) {
-                this.messageData.push({ type: 'user', message: this.keyWord.replace(/\n/g, '<br>') });
-                setTimeout(() => this.messageData.push(
-                    {
-                        type: 'robot',
-                        message: '',
-                        zan: false,
-                        cai: false,
-                        stop: false,
-                        finish: false,
-                        sending: true,
-                        links: [],
-                        reAnswerCount: 0
-                    }
-                ));
+                const userWord = this.keyWord || this.cacheKeyWord;
+                this.messageData.push({ type: 'user', message: userWord.replace(/\n/g, '<br>') });
+                setTimeout(() => {
+                    this.messageData.push(
+                        {
+                            type: 'robot',
+                            message: '',
+                            cacheMessage: '',
+                            zan: false,
+                            cai: false,
+                            stop: false,
+                            finish: false,
+                            sending: true,
+                            links: [],
+                            connectUrl: [],
+                            reAnswerCount: 0
+                        }
+                    )
+                    this.makeAutoMessage();
+                });
             }
             await sendMessageEventSource(params, signal, res => {
                 this.makeMessageLine(res, list);
             });
         },
+        makeAutoMessage() {
+            const cacheMessage = [];
+            for (let i = 0; i < this.messageData.length; i++) {
+                const current = this.messageData[i];
+                cacheMessage.push({
+                    role: current.type === 'robot' ? 'assistant' : 'user',
+                    content: current.message || '正在思考中。',
+                });
+            }
+            this.makeAutoQuestioning(cacheMessage);
+        },
         makeMessageLine(res, list) {
-            const { content, status, chatId, msgId, parentMsgId, reference, commonKey } = JSON.parse(res.data);
+            const { content, status, chatId, msgId, parentMsgId, reference, commonKey, connectUrl } = JSON.parse(res.data);
             let index = list ? list.index : this.messageData.length - 1;
             const currentList = this.messageData[index];
+            let allIdWithStart = true;
             // 结束标识
             if (status === 2 || status === 1) {
                 if (commonKey) {
@@ -160,12 +210,23 @@ export default {
                 currentList.finish = true;
                 if (reference) {
                     currentList.links = JSON.parse(reference);
+                    currentList.links.map((item) => {
+                        if (!item.title.startsWith(this.chatMajorId)) {
+                            allIdWithStart = false;
+                        }
+                    });
                 }
+                if (connectUrl) {
+                    currentList.connectUrl = JSON.parse(connectUrl);
+                }
+                currentList.allIdWithStart = allIdWithStart;
                 this.cacheKeyWord = '';
+                this.finish = true;
                 this.$emit('on-message-finish', chatId);
                 return;
             }
-            currentList.message += content.replace(/\n/g, '<br>');
+            currentList.cacheMessage += content;
+            currentList.message = marked.parse(currentList.cacheMessage);
             currentList.msgId = msgId;
             currentList.parentMsgId = parentMsgId;
             currentList.chatId = chatId;
@@ -176,9 +237,25 @@ export default {
             // 防止出现调用基础模型前导致停止回答id错误
             setTimeout(() =>  currentList.sending = false,500);
         },
+        async makeAutoQuestioning (messages) {
+            // 首次不触发
+            if (messages.length <= 2) return;
+            const autoRes = await getAutoQuestioning(this.chatMajorId, messages);
+            const {
+                message: {
+                    content: { followUps },
+                },
+            } = autoRes;
+            this.messageData[this.messageData.length - 1].followUps =
+                followUps.length > 3 ? followUps.splice(0, 3) : followUps;
+        },
         onStopChat(list){
             this.$emit('on-message-finish', list.chatId)
         },
+        selectModule(message) {
+            this.cacheKeyWord = message;
+            this.postMessage();
+        },
         async clearChat() {
             if (this.messageData.length < 1) {
                 this.$message.warning('当前对话为最新对话');
@@ -193,26 +270,37 @@ export default {
             list.stop = false;
             list.finish = false;
             list.links = [];
+            list.connectUrl = [];
             this.postMessage(list);
             this.$emit('on-reanser');
         },
         errorChatInit(list, chatId) {
-            const { chatMajorId } = list[0];
-            this.chatMajorId = chatMajorId.toString();
             if (list && list[0].contents) {
+                const { chatMajorId } = list[0];
+                this.chatMajorId = chatMajorId && chatMajorId.toString();
                 const cacheArray = [];
                 list[0].contents.reverse().map((list) => {
+                    let allIdWithStart = true;
+                    if (this.chatMajorId && list.references) {
+                        list.references.map((item) => {
+                            if (!item.title.startsWith(this.chatMajorId)) {
+                                allIdWithStart = false;
+                            }
+                        });
+                    }
                     const obj = {
                         type: list.role === 'assistant' ? 'robot' : 'user',
-                        message: list.content.replace(/\n/g, '<br>'),
+                        message: list.role === 'assistant' ? marked.parse(list.content) : list.content.replace(/\n/g, '<br>'),
                         zan: list.type === 1,
                         cai: list.type === 2,
                         stop: list.status === 1,
                         finish: true,
                         links: list.references || [],
+                        connectUrl: list.connectUrls || [],
                         reAnswerCount: 0,
                         msgId: list.contentId,
-                        parentMsgId: list.parentMsgId
+                        parentMsgId: list.parentMsgId,
+                        allIdWithStart
                     };
                     cacheArray.push(obj);
                 })
@@ -311,13 +399,6 @@ export default {
     width: 100%;
     margin-bottom: 16px;
 
-    .link-title {
-        color: #878aab;
-        font-size: 14px;
-        margin: 8px 0;
-        text-align: left;
-    }
-
     .link-content {
         background: #fafafd;
         border-radius: 8px;
@@ -347,10 +428,27 @@ export default {
         }
     }
 }
+.link-title {
+    color: #878aab;
+    font-size: 14px;
+    margin: 8px 0;
+    text-align: left;
+}
 .robot-image-div {
     width: 48px;
     height: 48px;
     background: url("../static/robot.png");
     background-size: 100%;
 }
+.hot-list {
+    background-color: rgba(241, 243, 245, 1);
+    border-radius: 8px;
+    font-size: 16px;
+    padding: 10px 24px 10px 16px;
+    margin-top: 8px;
+    cursor: pointer;
+    &:hover {
+        background-color: rgba(96, 96, 224, 0.24);
+    }
+}
 </style>

package/components/demo/src/error-chat.vue

@@ -67,10 +67,15 @@
             <div class="answer-content" v-html="analysisData.analysis"></div>
             <div class="title-label">错因分析</div>
             <div class="answer-content" v-html="analysisData.reason"></div>
-            <div class="title-label" v-if="analysisData.recommend && analysisData.recommend.length > 0">推荐资料</div>
+            <div class="title-label" v-if="analysisData.recommend && analysisData.recommend.length > 0 && !allIdWithStart">
+                推荐资料
+            </div>
             <div class="answer-content">
                 <div v-for="(list,index) in analysisData.recommend" :key="index" style="margin-bottom: 8px">
-                    <a :href="'https://ai-yuliao.hep.com.cn' + list.url" target="_blank">{{ list.title }}</a>
+                    <a :href="'https://ai-yuliao.hep.com.cn' + list.url"
+                       target="_blank"
+                       v-if="!list.title.startsWith(chatMajorId)">{{ list.title }}
+                    </a>
                 </div>
             </div>
             <chat-tools type="error"
@@ -95,7 +100,9 @@ export default {
         return {
             detailData: {}, // 记录页面点赞 踩情况
             analysisData: {}, // 记录页面点赞 踩情况
-            chatId: '' // 对话id
+            chatId: '', // 对话id
+            chatMajorId: '', // 智能体id
+            allIdWithStart: true // 智能体id
         }
     },
     watch: {
@@ -123,6 +130,7 @@ export default {
                     eaAnalysisDtoList: [{ content, errId, chatId, contentId, type }],
                     xhModelDetailVoList
                 } = analysisRes;
+                if (xhModelDetailVoList) this.chatMajorId = xhModelDetailVoList[0].chatMajorId;
                 // 传入工具中的值
                 this.chatId = chatId;
                 this.detailData = {
@@ -134,13 +142,19 @@ export default {
                 try {
                     this.analysisData = JSON.parse(content);
                     this.detailData.errId = errId;
+
+                    for (let item of this.analysisData.recommend) {
+                        if (!item.title.startsWith(this.chatMajorId)) {
+                            this.allIdWithStart = false;
+                        }
+                    }
                 } catch (e) {
                     this.$message.warning('解析失败' + e);
                     this.analysisData = { key: true };
                     console.log(e);
                 }
             } catch (e) {
-                return new Error(e);
+                throw new Error(e);
             }
         },
         async reanswer(list) {

package/components/demo/src/main.vue

@@ -10,37 +10,42 @@
                 <i class="el-icon-close"></i>
             </div>
         </div>
-        <div class="ai-main-content">
-            <chat ref="chatRef"
-                  :resId="resId"
-                  :xtId="xtId"
-                  :key-word="aiMessageKeyWord"
-                  :analy-exercise="analyExercise"
-                  @on-reanser="reanserMethod"
-                  @on-message-finish="messageFinish" />
+        <div v-if="!courseFlag" class="message-wrap">
+            <div class="message-line">{{message}}</div>
         </div>
-        <div class="tools-wrap">
-            <span @click="clearChat">清空对话</span>
-        </div>
-        <div class="ai-message-send" @keyup.enter="goChat">
-            <el-input v-model="aiMessage"
-                      placeholder="可以提出问题..."
-                      type="textarea"
-                      :rows="2"></el-input>
-            <div class="ai-send-icon" @click="goChat">
-                <img src="../static/send-icon.png" alt="" style="width: 24px; height: 24px">
+        <template v-else>
+            <div class="ai-main-content">
+                <chat ref="chatRef"
+                      :resId="resId"
+                      :xtId="xtId"
+                      :key-word="aiMessageKeyWord"
+                      :analy-exercise="analyExercise"
+                      @on-reanser="reanserMethod"
+                      @on-message-finish="messageFinish" />
             </div>
-        </div>
-        <p class="disclaimer">
-            此功能公测期间对正式版用户开放
-        </p>
+            <div class="tools-wrap">
+                <span @click="clearChat">清空对话</span>
+            </div>
+            <div class="ai-message-send" @keyup.enter="goChat">
+                <el-input v-model="aiMessage"
+                          placeholder="可以提出问题..."
+                          type="textarea"
+                          :rows="2"></el-input>
+                <div class="ai-send-icon" @click="goChat">
+                    <img src="../static/send-icon.png" alt="" style="width: 24px; height: 24px">
+                </div>
+            </div>
+<!--            <p class="disclaimer">-->
+<!--                此功能公测期间对正式版用户开放-->
+<!--            </p>-->
+        </template>
     </div>
 </template>
 <script>
 import Chat from './chat.vue';
 import Cookies from "js-cookie";
 import { getUserInfo } from '../utils/config';
-import { chartClear } from '../api/index';
+import { checkCourseIdIsExist } from '../api/index';
 export default {
     name: 'AiErrorAssistant',
     components: {
@@ -58,11 +63,27 @@ export default {
             return this.analyExercise.busId;
         }
     },
+    watch: {
+        visible() {
+            if (this.visible){
+                checkCourseIdIsExist(this.resId).then(res=>{
+                    if (res.flag === true){
+                        this.courseFlag = true;
+                    }else{
+                        this.courseFlag = false;
+                        this.message = res.message;
+                    }
+                });
+            }
+        },
+    },
     data() {
         return {
             aiMessage: '', // 页面显示值
             aiMessageKeyWord: '', // 传入组件值
-            stop: false
+            stop: false,
+            courseFlag: false,
+            message:'',
         }
     },
     mounted() {
@@ -209,7 +230,7 @@ export default {
 .ai-main-content {
     position: relative;
     z-index: 1;
-    height: calc(100% - 53px - 86px - 32px - 17px);
+    height: calc(100% - 53px - 86px - 32px);
     padding: 16px 0 16px 8px;
 }
 .disclaimer {
@@ -219,6 +240,18 @@ export default {
     text-align: center;
     margin-top: 6px;
 }
+.message-wrap {
+    height: calc(100%  - 53px );
+    align-items: center;
+    justify-content: center;
+    display: flex;
+    flex-direction: column;
+}
+.message-line {
+    color: red;
+    font-size: 25px;
+    margin: 8px 0; /* 上下各 8px 的间距 */
+}
 :deep {
     .ai-message-send {
         .el-textarea__inner {

package/components/demo/utils/config.js

@@ -1,5 +1,5 @@
 import { ssoAuth, authUser } from '../api/index';
-import constants from '../utils/constants';
+// import constants from '../utils/constants';
 import cache from '../plugins/cache';
 
 export const errorList = [
@@ -74,15 +74,19 @@ export const cacheMessageList = [
 //     studentAnswer: '错误的简答题简答题错误错误的简答题简答题错误错误的简答题简答题错误错误的简答题简答题错误',
 // }
 
+// export const getUserInfo = async (token) => {
+//     const ssoRes = await ssoAuth(token);
+//     const userRes = await authUser({
+//         'X-Auth-User': encodeURIComponent(ssoRes.name),
+//         'X-Auth-Token': ssoRes.password,
+//         'X-Enterprise-Id': `${constants['X-Enterprise-Id']}`,
+//         'X-App-Id': `${constants['X-App-Id']}`,
+//         'X-App-Secret': `${constants['X-App-Secret']}`,
+//         'X-Auth-User-Type': '1',
+//     });
+//     cache.session.setJSON('SRKJ_TOKEN_CACHE', userRes);
+// }
 export const getUserInfo = async (token) => {
-    const ssoRes = await ssoAuth(token);
-    const userRes = await authUser({
-        'X-Auth-User': encodeURIComponent(ssoRes.name),
-        'X-Auth-Token': ssoRes.password,
-        'X-Enterprise-Id': `${constants['X-Enterprise-Id']}`,
-        'X-App-Id': `${constants['X-App-Id']}`,
-        'X-App-Secret': `${constants['X-App-Secret']}`,
-        'X-Auth-User-Type': '1',
-    });
-    cache.session.setJSON('SRKJ_TOKEN_CACHE', userRes);
+    await ssoAuth(token);
+    cache.session.setJSON('SRKJ_TOKEN_CACHE', token);
 }

package/components/demo/utils/request.js

@@ -16,7 +16,9 @@ const service = axios.create({
 
 service.interceptors.request.use(config => {
   if (cache.session.getJSON('SRKJ_TOKEN_CACHE')) {
-    config.headers["X-Id-Token"] = cache.session.getJSON('SRKJ_TOKEN_CACHE');
+    // config.headers["X-Id-Token"] = cache.session.getJSON('SRKJ_TOKEN_CACHE');
+    if (!config.params) config.params = {};
+    config.params.token = cache.session.getJSON('SRKJ_TOKEN_CACHE');
   }
   // 是否需要防止数据重复提交
   const isRepeatSubmit = (config.headers || {}).repeatSubmit === false;
@@ -51,12 +53,12 @@ service.interceptors.response.use(res => {
     return res.data
   }
   let srkjData = res.data;
-  if (srkjData) {
-    const respData = decrypt(srkjData);
-    try {
-      srkjData = JSON.parse(respData);
-    } catch (e) {}
-  }
+  // if (srkjData) {
+  //   const respData = decrypt(srkjData);
+  //   try {
+  //     srkjData = JSON.parse(respData);
+  //   } catch (e) {}
+  // }
   if (res.status === 401) {
     Message.warning(srkjData.message.description);
     return;