zhuchaowe/maxkb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 修复应用复制报错

Browse Source
This commit is contained in:
shaohuzhang1 2024-08-26 11:21:40 +08:00 committed by shaohuzhang1
parent 069e1c539f
commit 9257677e4b
3 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
apps/application/chat_pipeline/step/chat_step/i_chat_step.py
View File

@ -74,7 +74,8 @@ class IChatStep(IBaseChatPipelineStep):
user_id = serializers.UUIDField(required=True, error_messages=ErrMessage.uuid("用户id")) user_id = serializers.UUIDField(required=True, error_messages=ErrMessage.uuid("用户id"))
model_params_setting = serializers.DictField(required=True, error_messages=ErrMessage.dict("模型参数设置")) model_params_setting = serializers.DictField(required=False, allow_null=True,
error_messages=ErrMessage.dict("模型参数设置"))
def is_valid(self, *, raise_exception=False): def is_valid(self, *, raise_exception=False):
super().is_valid(raise_exception=True) super().is_valid(raise_exception=True)

8
apps/application/serializers/chat_serializers.py
View File

@ -271,7 +271,7 @@ class ChatSerializers(serializers.Serializer):
application_id=application_id)] application_id=application_id)]
chat_id = str(uuid.uuid1()) chat_id = str(uuid.uuid1())
chat_cache.set(chat_id, chat_cache.set(chat_id,
ChatInfo(chat_id, dataset_id_list, ChatInfo(chat_id, dataset_id_list,
[str(document.id) for document in [str(document.id) for document in
QuerySet(Document).filter( QuerySet(Document).filter(
dataset_id__in=dataset_id_list, dataset_id__in=dataset_id_list,
@ -297,7 +297,7 @@ class ChatSerializers(serializers.Serializer):
) )
work_flow_version = WorkFlowVersion(work_flow=work_flow) work_flow_version = WorkFlowVersion(work_flow=work_flow)
chat_cache.set(chat_id, chat_cache.set(chat_id,
ChatInfo(chat_id, [], ChatInfo(chat_id, [],
[], [],
application, work_flow_version), timeout=60 * 30) application, work_flow_version), timeout=60 * 30)
return chat_id return chat_id
@ -322,7 +322,7 @@ class ChatSerializers(serializers.Serializer):
# 问题补全 # 问题补全
problem_optimization = serializers.BooleanField(required=True, error_messages=ErrMessage.boolean("问题补全")) problem_optimization = serializers.BooleanField(required=True, error_messages=ErrMessage.boolean("问题补全"))
# 模型相关设置 # 模型相关设置
model_params_setting = serializers.JSONField(required=True) model_params_setting = serializers.JSONField(required=False, error_messages=ErrMessage.dict("模型参数相关设置"))
def is_valid(self, *, raise_exception=False): def is_valid(self, *, raise_exception=False):
super().is_valid(raise_exception=True) super().is_valid(raise_exception=True)
@ -354,7 +354,7 @@ class ChatSerializers(serializers.Serializer):
model_params_setting=self.data.get('model_params_setting'), model_params_setting=self.data.get('model_params_setting'),
user_id=user_id) user_id=user_id)
chat_cache.set(chat_id, chat_cache.set(chat_id,
ChatInfo(chat_id, dataset_id_list, ChatInfo(chat_id, dataset_id_list,
[str(document.id) for document in [str(document.id) for document in
QuerySet(Document).filter( QuerySet(Document).filter(
dataset_id__in=dataset_id_list, dataset_id__in=dataset_id_list,

13
ui/src/views/application/index.vue
View File

@ -96,7 +96,10 @@
</el-button> </el-button>
<template #dropdown> <template #dropdown>
<el-dropdown-menu> <el-dropdown-menu>
<el-dropdown-item @click="copyApplication(item)"> <el-dropdown-item
v-if="is_show_copy_button(item)"
@click="copyApplication(item)"
>
<AppIcon iconName="app-copy"></AppIcon> <AppIcon iconName="app-copy"></AppIcon>
复制</el-dropdown-item 复制</el-dropdown-item
> >
@ -130,7 +133,7 @@ import { useRouter } from 'vue-router'
import { isWorkFlow } from '@/utils/application' import { isWorkFlow } from '@/utils/application'
import useStore from '@/stores' import useStore from '@/stores'
import { t } from '@/locales' import { t } from '@/locales'
const { application } = useStore() const { application, user } = useStore()
const router = useRouter() const router = useRouter()
const CopyApplicationDialogRef = ref() const CopyApplicationDialogRef = ref()
@ -149,11 +152,13 @@ const searchValue = ref('')
function copyApplication(row: any) { function copyApplication(row: any) {
application.asyncGetApplicationDetail(row.id, loading).then((res: any) => { application.asyncGetApplicationDetail(row.id, loading).then((res: any) => {
row['dataset_id_list'] = res.data.dataset_id_list CopyApplicationDialogRef.value.open(res.data)
}) })
CopyApplicationDialogRef.value.open(row)
} }
const is_show_copy_button = (row: any) => {
return user.userInfo ? user.userInfo.id == row.user_id : false
}
function settingApplication(row: any) { function settingApplication(row: any) {
if (isWorkFlow(row.type)) { if (isWorkFlow(row.type)) {
router.push({ path: `/application/${row.id}/workflow` }) router.push({ path: `/application/${row.id}/workflow` })