diff --git a/src/apis/paths/llm.ts b/src/apis/paths/llm.ts index 393541838023af0151f3743f1b2a905da2d123ab..4c8c213647160080ed74fd075a5bc5867044102a 100644 --- a/src/apis/paths/llm.ts +++ b/src/apis/paths/llm.ts @@ -1,5 +1,5 @@ import { get, post, del, put } from '../server'; -import { addedModalList } from './type'; +import { AddedModalList } from './type'; /** * 获取用户的模型列表 * @returns @@ -22,16 +22,14 @@ const getLLMList = () => { * @returns */ const updateLLMList = ({ conversationId, llmId }) => { - return put('/api/llm/conv', { conversationId, llmId:[llmId.llmId] }); + return put('/api/llm/conv', { conversationId, llmId: [llmId.llmId] }); }; /** * 获取已添加模型列表 */ const getAddedModels = () => { - return get<{ - models: addedModalList[]; - }>('/api/model'); + return get('/api/llm'); }; export const llmApi = { diff --git a/src/apis/paths/model.ts b/src/apis/paths/model.ts index 9e3d7c33a4424fbb7ae83169cfd80fbf06218124..7f9f16c2df2a5578b3d1202f52bf49609a378658 100644 --- a/src/apis/paths/model.ts +++ b/src/apis/paths/model.ts @@ -23,6 +23,7 @@ const getUserModelList = () => { openaiApiKey: string; modelName: string; maxTokens: number; + isEditable?: boolean; }[] >('/api/llm'); }; diff --git a/src/store/historySession.ts b/src/store/historySession.ts index 162c3779d33e318e14b4fa458136ebab6a95d2a5..3b14e00d2c3d2f6d688b85643f56a47421d7cced 100644 --- a/src/store/historySession.ts +++ b/src/store/historySession.ts @@ -30,7 +30,7 @@ export const useHistorySessionStore = defineStore( const historySession = ref([]); const params = ref(); const user_selected_app = ref(); - const selectLLM= ref(); + const selectLLM = ref(); const currentSelectedSession = ref(''); /** * 选择历史会话 @@ -80,14 +80,13 @@ export const useHistorySessionStore = defineStore( /** * 获取当前 llm 模型的数值 */ - const currentLLM = async() => { - console.log(currentSelectedSession.value); + const currentLLM = async () => { await getHistorySession(); historySession.value.forEach((item) => { if (item.conversationId === currentSelectedSession.value) { selectLLM.value = item.llm; } - }) + }); }; /** * 选中某个会话 @@ -140,7 +139,7 @@ export const useHistorySessionStore = defineStore( if (!currentSelectedSession.value) { currentSelectedSession.value = res.result.conversations[0]?.conversationId; - //----- + //----- } if (currentSelectedSession.value) { const { getConversation, isAnswerGenerating } = useSessionStore(); @@ -175,39 +174,39 @@ export const useHistorySessionStore = defineStore( return true; }; - /** - * 创建新会话 - */ - const createNewSession = async (): Promise => { - const sId = - historySession.value.length === 0 - ? null - : historySession.value[0]?.conversationId; - if (sId) { - const [, cov] = await api.getHistoryConversation(sId); - if (cov && cov.result.records.length === 0) { - if (currentSelectedSession.value !== sId) { - currentSelectedSession.value = sId; + /** + * 创建新会话 + */ + const createNewSession = async (): Promise => { + const sId = + historySession.value.length === 0 + ? null + : historySession.value[0]?.conversationId; + if (sId) { + const [, cov] = await api.getHistoryConversation(sId); + if (cov && cov.result.records.length === 0) { + if (currentSelectedSession.value !== sId) { + currentSelectedSession.value = sId; + } + successMsg(i18n.global.t('history.latestConversation')); + await getHistorySession(); + } else { + await generateSession(); } - successMsg(i18n.global.t('history.latestConversation')); - await getHistorySession(); } else { await generateSession(); } - } else { - await generateSession(); - } - }; - /** - * 创建一个新的会话 - */ - const generateSession = async (): Promise => { - const [_, res] = await api.createSession(user_selected_app.value); - if (!_ && res) { - currentSelectedSession.value = res.result.conversationId; - await getHistorySession(); - } - }; + }; + /** + * 创建一个新的会话 + */ + const generateSession = async (): Promise => { + const [_, res] = await api.createSession(user_selected_app.value); + if (!_ && res) { + currentSelectedSession.value = res.result.conversationId; + await getHistorySession(); + } + }; /** * 创建一个新的会话-debug工作流会话-需要一个传参 @@ -245,7 +244,7 @@ export const useHistorySessionStore = defineStore( { persist: { key: 'session', - pick: ['currentSelectedSession'], + pick: [], }, }, ); diff --git a/src/views/app/index.vue b/src/views/app/index.vue index f9af6202ae23c8439d71af3b025370f8f11e7492..1e6be3c9578bd9d19638d56da8692abf521faa64 100644 --- a/src/views/app/index.vue +++ b/src/views/app/index.vue @@ -161,7 +161,7 @@ import { import './style.scss'; import { ref, watch, markRaw } from 'vue'; import { storeToRefs } from 'pinia'; -import { useRouter } from 'vue-router'; +import { useRouter, useRoute } from 'vue-router'; import { ElMessage, ElMessageBox } from 'element-plus'; import { IconAlarm } from '@computing/opendesign-icons'; import { api } from '@/apis'; @@ -170,9 +170,6 @@ import DefaultAppIcon from '../../assets/svgs/defaultIcon.webp'; import CustomLoading from '../customLoading/index.vue'; import SelectAppTypeDialog from './components/SelectAppTypeDialog.vue'; import TextMoreTootip from '@/components/textMoreTootip/index.vue'; -import DebugApp from '../createapp/components/DebugApp.vue'; - -const isDebugDialogVisible = ref(false); interface App { appId: string; @@ -184,10 +181,11 @@ interface App { name: string; published: boolean; } +const route = useRoute(); +const router = useRouter(); const { currentSelectedSession } = storeToRefs(useHistorySessionStore()); const publishStatus = ref('未发布'); -const router = useRouter(); const appType = ref('my'); const appSearchValue = ref(); const appList = ref([]); @@ -208,7 +206,7 @@ const handleChangePage = (pageNum: number, pageSize: number) => { type AppFilter = 'my' | 'createdByMe' | 'favorited'; type AppType = 'flow' | 'agent' | 'all'; -const pluginType = ref('my'); +const pluginType = ref((route.query.to as AppFilter) || 'my'); const appSearchType = ref('all'); const isSelectAppTypeDialogVisible = ref(false); diff --git a/src/views/createapp/components/AgentAppConfig.vue b/src/views/createapp/components/AgentAppConfig.vue index e5ed89889d67fcc2cff612b20af089d157e798c2..9ae5694dedca077702a34dfa6720c3b3c8894a98 100644 --- a/src/views/createapp/components/AgentAppConfig.vue +++ b/src/views/createapp/components/AgentAppConfig.vue @@ -354,25 +354,6 @@ onMounted(async () => { - - - - 插入模板 - - - @@ -449,41 +430,6 @@ onMounted(async () => { - -
-
- - 添加知识库 - - - {{ createAppForm.knowledge.length }}/5 - -
-
- -
-
-
@@ -692,6 +638,7 @@ onMounted(async () => { img { width: 24px; height: 24px; + border-radius: 50%; } } img { diff --git a/src/views/createapp/components/DebugApp.vue b/src/views/createapp/components/DebugApp.vue index 94319b7f573f838396e2ff65aeae557cea665077..7ca39203b1c52a9e8c10ae565028078318138d94 100644 --- a/src/views/createapp/components/DebugApp.vue +++ b/src/views/createapp/components/DebugApp.vue @@ -413,7 +413,7 @@ watch( " :loading=" role === 'assistant' && - isStreaming && + answer[answerIndex].content.length === 0 && idx === conversations.length - 1 " class="bubble-item" @@ -606,7 +606,8 @@ watch( .chat-container { width: 100%; - height: 340px; + height: 57%; + min-height: 340px; overflow: auto; .bubble-item { diff --git a/src/views/createapp/components/PromptDrawer.vue b/src/views/createapp/components/PromptDrawer.vue index 2d7376df2d153c6586e10ff5bdc15ee384b57971..0f1b0faf8b9aab6e577721dfaf3644891c1acfde 100644 --- a/src/views/createapp/components/PromptDrawer.vue +++ b/src/views/createapp/components/PromptDrawer.vue @@ -4,7 +4,8 @@ import { onMounted, ref, watch } from 'vue'; import { api } from '@/apis'; import NewOrEditPrompt from './NewOrEditPrompt.vue'; import type { Prompt } from '@/apis/appCenter'; -import { ElMessage } from 'element-plus'; +import { ElMessage, ElEmpty } from 'element-plus'; +import lightNull from '@/assets/svgs/light_null.svg'; defineProps<{ visible: boolean; @@ -87,7 +88,7 @@ onMounted(() => {
-
+
+

系统配置区:

-
+
{{ selectedPrompt.prompt }}
diff --git a/src/views/settings/Model.vue b/src/views/settings/Model.vue index 0fe44677f81788748e1d8d2b0363caa916056241..be90ffe391c0b2e727b6b539c6c1ccebbc337bc1 100644 --- a/src/views/settings/Model.vue +++ b/src/views/settings/Model.vue @@ -1,9 +1,10 @@