From 05972ea017a78b634b5f6e550020c8a7f6d3b29c Mon Sep 17 00:00:00 2001 From: shaohuzhang1 Date: Mon, 15 Apr 2024 13:44:52 +0800 Subject: [PATCH 1/2] fix: type --- .../chat_pipeline/step/chat_step/impl/base_chat_step.py | 6 +++--- apps/application/serializers/chat_message_serializers.py | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/apps/application/chat_pipeline/step/chat_step/impl/base_chat_step.py b/apps/application/chat_pipeline/step/chat_step/impl/base_chat_step.py index 4c8e27c912f..8beeab16e42 100644 --- a/apps/application/chat_pipeline/step/chat_step/impl/base_chat_step.py +++ b/apps/application/chat_pipeline/step/chat_step/impl/base_chat_step.py @@ -84,7 +84,7 @@ def execute(self, message_list: List[BaseMessage], post_response_handler: PostResponseHandler, chat_model: BaseChatModel = None, paragraph_list=None, - manage: = None, + manage: PipelineManage = None, padding_problem_text: str = None, stream: bool = True, client_id=None, client_type=None, @@ -125,7 +125,7 @@ def execute_stream(self, message_list: List[BaseMessage], post_response_handler: PostResponseHandler, chat_model: BaseChatModel = None, paragraph_list=None, - manage: = None, + manage: PipelineManage = None, padding_problem_text: str = None, client_id=None, client_type=None): # 调用模型 @@ -151,7 +151,7 @@ def execute_block(self, message_list: List[BaseMessage], post_response_handler: PostResponseHandler, chat_model: BaseChatModel = None, paragraph_list=None, - manage: = None, + manage: PipelineManage = None, padding_problem_text: str = None, client_id=None, client_type=None): # 调用模型 diff --git a/apps/application/serializers/chat_message_serializers.py b/apps/application/serializers/chat_message_serializers.py index cb40dad8608..3f0cf01cf1e 100644 --- a/apps/application/serializers/chat_message_serializers.py +++ b/apps/application/serializers/chat_message_serializers.py @@ -15,7 +15,7 @@ from langchain.chat_models.base import BaseChatModel from rest_framework import serializers -from application.chat_pipeline.pipeline_manage import PiplineManage +from application.chat_pipeline.pipeline_manage import PipelineManage from application.chat_pipeline.step.chat_step.i_chat_step import PostResponseHandler from application.chat_pipeline.step.chat_step.impl.base_chat_step import BaseChatStep from application.chat_pipeline.step.generate_human_message_step.impl.base_generate_human_message_step import \ @@ -108,7 +108,7 @@ def handler(self, paragraph_list: List[Paragraph], problem_text: str, answer_text, - manage: PiplineManage, + manage: PipelineManage, step: BaseChatStep, padding_problem_text: str = None, client_id=None, @@ -178,7 +178,7 @@ def chat(self): client_id = self.data.get('client_id') client_type = self.data.get('client_type') chat_info = self.is_valid(raise_exception=True) - pipline_manage_builder = PiplineManage.builder() + pipline_manage_builder = PipelineManage.builder() # 如果开启了问题优化,则添加上问题优化步骤 if chat_info.application.problem_optimization: pipline_manage_builder.append_step(BaseResetProblemStep) From ec6ce7bf5edf41e33501a70fab680dca4ace8ebb Mon Sep 17 00:00:00 2001 From: shaohuzhang1 Date: Mon, 15 Apr 2024 14:16:44 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E5=BA=94=E7=94=A8=E5=91=BD=E4=B8=AD?= =?UTF-8?q?=E6=B5=8B=E8=AF=95=E6=8A=A5=E6=B2=A1=E6=9C=89=E6=9D=83=E9=99=90?= =?UTF-8?q?=E8=AE=BF=E9=97=AE=20#65?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ui/src/views/paragraph/component/ProblemComponent.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/src/views/paragraph/component/ProblemComponent.vue b/ui/src/views/paragraph/component/ProblemComponent.vue index cef42b4e1ee..6284f3285ef 100644 --- a/ui/src/views/paragraph/component/ProblemComponent.vue +++ b/ui/src/views/paragraph/component/ProblemComponent.vue @@ -168,7 +168,7 @@ const remoteMethod = (query: string) => { function getProblemOption(filterText?: string) { return problem .asyncGetProblem( - id as string, + props.datasetId || (id as string), { current_page: 1, page_size: 100 }, filterText && { content: filterText }, optionLoading