diff --git a/apps/application/flow/step_node/document_extract_node/i_document_extract_node.py b/apps/application/flow/step_node/document_extract_node/i_document_extract_node.py index d030e0078..ceda39444 100644 --- a/apps/application/flow/step_node/document_extract_node/i_document_extract_node.py +++ b/apps/application/flow/step_node/document_extract_node/i_document_extract_node.py @@ -9,12 +9,7 @@ from common.util.field_message import ErrMessage class DocumentExtractNodeSerializer(serializers.Serializer): - # 需要查询的数据集id列表 - file_list = serializers.ListField(required=True, child=serializers.UUIDField(required=True), - error_messages=ErrMessage.list("数据集id列表")) - - def is_valid(self, *, raise_exception=False): - super().is_valid(raise_exception=True) + document_list = serializers.ListField(required=False, error_messages=ErrMessage.list("文档")) class IDocumentExtractNode(INode): @@ -24,7 +19,9 @@ class IDocumentExtractNode(INode): return DocumentExtractNodeSerializer def _run(self): - return self.execute(**self.flow_params_serializer.data) + res = self.workflow_manage.get_reference_field(self.node_params_serializer.data.get('document_list')[0], + self.node_params_serializer.data.get('document_list')[1:]) + return self.execute(document=res, **self.flow_params_serializer.data) - def execute(self, file_list, **kwargs) -> NodeResult: + def execute(self, document, **kwargs) -> NodeResult: pass diff --git a/apps/application/flow/step_node/document_extract_node/impl/base_document_extract_node.py b/apps/application/flow/step_node/document_extract_node/impl/base_document_extract_node.py index bf900ffe2..35fc6edff 100644 --- a/apps/application/flow/step_node/document_extract_node/impl/base_document_extract_node.py +++ b/apps/application/flow/step_node/document_extract_node/impl/base_document_extract_node.py @@ -1,11 +1,26 @@ # coding=utf-8 - +from application.flow.i_step_node import NodeResult from application.flow.step_node.document_extract_node.i_document_extract_node import IDocumentExtractNode class BaseDocumentExtractNode(IDocumentExtractNode): - def execute(self, file_list, **kwargs): - pass + def execute(self, document, **kwargs): + self.context['document_list'] = document + content = '' + if len(document) > 0: + for doc in document: + content += doc['name'] + content += '\n-----------------------------------\n' + return NodeResult({'content': content}, {}) def get_details(self, index: int, **kwargs): - pass + return { + 'name': self.node.properties.get('stepName'), + "index": index, + 'run_time': self.context.get('run_time'), + 'type': self.node.type, + 'content': self.context.get('content'), + 'status': self.status, + 'err_message': self.err_message, + 'document_list': self.context.get('document_list') + } diff --git a/apps/application/flow/step_node/image_understand_step_node/i_image_understand_node.py b/apps/application/flow/step_node/image_understand_step_node/i_image_understand_node.py index 4c15ad8cd..26fb431d0 100644 --- a/apps/application/flow/step_node/image_understand_step_node/i_image_understand_node.py +++ b/apps/application/flow/step_node/image_understand_step_node/i_image_understand_node.py @@ -18,7 +18,7 @@ class ImageUnderstandNodeSerializer(serializers.Serializer): is_result = serializers.BooleanField(required=False, error_messages=ErrMessage.boolean('是否返回内容')) - image_list = serializers.ListField(required=False, error_messages=ErrMessage.list("图片仅1张")) + image_list = serializers.ListField(required=False, error_messages=ErrMessage.list("图片")) class IImageUnderstandNode(INode): diff --git a/apps/application/flow/step_node/image_understand_step_node/impl/base_image_understand_node.py b/apps/application/flow/step_node/image_understand_step_node/impl/base_image_understand_node.py index e6a88a9f1..046d6f783 100644 --- a/apps/application/flow/step_node/image_understand_step_node/impl/base_image_understand_node.py +++ b/apps/application/flow/step_node/image_understand_step_node/impl/base_image_understand_node.py @@ -25,7 +25,7 @@ def _write_context(node_variable: Dict, workflow_variable: Dict, node: INode, wo node.context['question'] = node_variable['question'] node.context['run_time'] = time.time() - node.context['start_time'] if workflow.is_result(node, NodeResult(node_variable, workflow_variable)): - workflow.answer += answer + node.answer_text = answer def write_context_stream(node_variable: Dict, workflow_variable: Dict, node: INode, workflow): diff --git a/apps/application/flow/step_node/start_node/impl/base_start_node.py b/apps/application/flow/step_node/start_node/impl/base_start_node.py index 9ac7e2aef..6388e4dfd 100644 --- a/apps/application/flow/step_node/start_node/impl/base_start_node.py +++ b/apps/application/flow/step_node/start_node/impl/base_start_node.py @@ -52,8 +52,12 @@ class BaseStartStepNode(IStarNode): """ 开始节点 初始化全局变量 """ - return NodeResult({'question': question, 'image': self.workflow_manage.image_list}, - workflow_variable) + node_variable = { + 'question': question, + 'image': self.workflow_manage.image_list, + 'document': self.workflow_manage.document_list + } + return NodeResult(node_variable, workflow_variable) def get_details(self, index: int, **kwargs): global_fields = [] diff --git a/apps/application/flow/workflow_manage.py b/apps/application/flow/workflow_manage.py index 39c42aa24..edd21391d 100644 --- a/apps/application/flow/workflow_manage.py +++ b/apps/application/flow/workflow_manage.py @@ -240,16 +240,20 @@ class NodeChunk: class WorkflowManage: def __init__(self, flow: Flow, params, work_flow_post_handler: WorkFlowPostHandler, base_to_response: BaseToResponse = SystemToResponse(), form_data=None, image_list=None, + document_list=None, start_node_id=None, start_node_data=None, chat_record=None): if form_data is None: form_data = {} if image_list is None: image_list = [] + if document_list is None: + document_list = [] self.start_node = None self.start_node_result_future = None self.form_data = form_data self.image_list = image_list + self.document_list = document_list self.params = params self.flow = flow self.lock = threading.Lock() diff --git a/apps/application/serializers/chat_message_serializers.py b/apps/application/serializers/chat_message_serializers.py index 455ef6a67..919cb71cf 100644 --- a/apps/application/serializers/chat_message_serializers.py +++ b/apps/application/serializers/chat_message_serializers.py @@ -230,7 +230,8 @@ class ChatMessageSerializer(serializers.Serializer): client_id = serializers.CharField(required=True, error_messages=ErrMessage.char("客户端id")) client_type = serializers.CharField(required=True, error_messages=ErrMessage.char("客户端类型")) form_data = serializers.DictField(required=False, error_messages=ErrMessage.char("全局变量")) - image_list = serializers.ListField(required=False, error_messages=ErrMessage.list("图片仅1张")) + image_list = serializers.ListField(required=False, error_messages=ErrMessage.list("图片")) + document_list = serializers.ListField(required=False, error_messages=ErrMessage.list("文档")) def is_valid_application_workflow(self, *, raise_exception=False): self.is_valid_intraday_access_num() @@ -322,6 +323,7 @@ class ChatMessageSerializer(serializers.Serializer): client_type = self.data.get('client_type') form_data = self.data.get('form_data') image_list = self.data.get('image_list') + document_list = self.data.get('document_list') user_id = chat_info.application.user_id chat_record_id = self.data.get('chat_record_id') chat_record = None @@ -336,7 +338,7 @@ class ChatMessageSerializer(serializers.Serializer): 'client_id': client_id, 'client_type': client_type, 'user_id': user_id}, WorkFlowPostHandler(chat_info, client_id, client_type), - base_to_response, form_data, image_list, self.data.get('runtime_node_id'), + base_to_response, form_data, image_list, document_list, self.data.get('runtime_node_id'), self.data.get('node_data'), chat_record) r = work_flow_manage.run() return r diff --git a/apps/application/views/chat_views.py b/apps/application/views/chat_views.py index 586787b20..790277860 100644 --- a/apps/application/views/chat_views.py +++ b/apps/application/views/chat_views.py @@ -132,6 +132,8 @@ class ChatView(APIView): 'image_list': request.data.get( 'image_list') if 'image_list' in request.data else [], + 'document_list': request.data.get( + 'document_list') if 'document_list' in request.data else [], 'client_type': request.auth.client_type, 'runtime_node_id': request.data.get('runtime_node_id', None), 'node_data': request.data.get('node_data', {}), diff --git a/ui/src/api/type/application.ts b/ui/src/api/type/application.ts index 5d4971f7f..11b630f13 100644 --- a/ui/src/api/type/application.ts +++ b/ui/src/api/type/application.ts @@ -39,7 +39,8 @@ interface chatType { record_id: string chat_id: string vote_status: string - status?: number + status?: number, + execution_details: any[] } export class ChatRecordManage { diff --git a/ui/src/components/ai-chat/component/chat-input-operate/index.vue b/ui/src/components/ai-chat/component/chat-input-operate/index.vue index 8ae880d5c..b3bee751a 100644 --- a/ui/src/components/ai-chat/component/chat-input-operate/index.vue +++ b/ui/src/components/ai-chat/component/chat-input-operate/index.vue @@ -20,10 +20,12 @@
+ @@ -126,6 +128,13 @@ const localLoading = computed({ emit('update:loading', v) } }) + + +const imageExtensions = ['jpg', 'jpeg', 'png', 'gif', 'bmp'] +const documentExtensions = ['pdf', 'docx', 'txt', 'xls', 'xlsx', 'md', 'html'] +const videoExtensions = ['mp4', 'avi', 'mov', 'mkv', 'flv'] +const audioExtensions = ['mp3', 'wav', 'aac', 'flac'] + const uploadFile = async (file: any, fileList: any) => { const { maxFiles, fileLimit } = props.applicationDetails.file_upload_setting if (fileList.length > maxFiles) { @@ -141,7 +150,18 @@ const uploadFile = async (file: any, fileList: any) => { const formData = new FormData() for (const file of fileList) { formData.append('file', file.raw, file.name) - uploadFileList.value.push(file) + // + const extension = file.name.split('.').pop().toLowerCase() // 获取文件后缀名并转为小写 + + if (imageExtensions.includes(extension)) { + uploadImageList.value.push(file) + } else if (documentExtensions.includes(extension)) { + uploadDocumentList.value.push(file) + } else if (videoExtensions.includes(extension)) { + // videos.push(file) + } else if (audioExtensions.includes(extension)) { + // audios.push(file) + } } if (!chatId_context.value) { @@ -158,21 +178,22 @@ const uploadFile = async (file: any, fileList: any) => { ) .then((response) => { fileList.splice(0, fileList.length) - uploadFileList.value.forEach((file: any) => { + uploadImageList.value.forEach((file: any) => { const f = response.data.filter((f: any) => f.name === file.name) if (f.length > 0) { file.url = f[0].url file.file_id = f[0].file_id } }) - console.log(uploadFileList.value) + console.log(uploadDocumentList.value, uploadImageList.value) }) } const recorderTime = ref(0) const startRecorderTime = ref(false) const recorderLoading = ref(false) const inputValue = ref('') -const uploadFileList = ref>([]) +const uploadImageList = ref>([]) +const uploadDocumentList = ref>([]) const mediaRecorderStatus = ref(true) // 定义响应式引用 const mediaRecorder = ref(null) @@ -289,15 +310,20 @@ const handleTimeChange = () => { handleTimeChange() }, 1000) } + function sendChatHandle(event: any) { if (!event.ctrlKey) { // 如果没有按下组合键ctrl，则会阻止默认事件 event.preventDefault() if (!isDisabledChart.value && !props.loading && !event.isComposing) { if (inputValue.value.trim()) { - props.sendMessage(inputValue.value, { image_list: uploadFileList.value }) + props.sendMessage(inputValue.value, { + image_list: uploadImageList.value, + document_list: uploadDocumentList.value + }) inputValue.value = '' - uploadFileList.value = [] + uploadImageList.value = [] + uploadDocumentList.value = [] quickInputRef.value.textareaStyle.height = '45px' } } diff --git a/ui/src/components/ai-chat/component/question-content/index.vue b/ui/src/components/ai-chat/component/question-content/index.vue index fcbac8bc9..ef49c3788 100644 --- a/ui/src/components/ai-chat/component/question-content/index.vue +++ b/ui/src/components/ai-chat/component/question-content/index.vue @@ -22,10 +22,19 @@ diff --git a/ui/src/workflow/nodes/document-extract-node/index.vue b/ui/src/workflow/nodes/document-extract-node/index.vue index 890b9d129..b888f5052 100644 --- a/ui/src/workflow/nodes/document-extract-node/index.vue +++ b/ui/src/workflow/nodes/document-extract-node/index.vue @@ -10,7 +10,7 @@ label-width="auto" ref="DatasetNodeFormRef" > - @@ -39,7 +39,7 @@ import NodeCascader from '@/workflow/common/NodeCascader.vue' const props = defineProps<{ nodeModel: any }>() const form = { - file_list: [] + document_list: ["start-node", "document"] }