From 264a7309f774edfe6c7c39667841b2442a38cf76 Mon Sep 17 00:00:00 2001 From: shaohuzhang1 Date: Mon, 23 Sep 2024 15:28:47 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E3=80=90=E5=BA=94?= =?UTF-8?q?=E7=94=A8=E7=BC=96=E6=8E=92=E3=80=91=E5=A4=9A=E8=B7=AF=E5=8F=AC?= =?UTF-8?q?=E5=9B=9E=E8=AE=BE=E7=BD=AE=E4=BA=86=E5=BC=95=E7=94=A8=E5=88=86?= =?UTF-8?q?=E6=AE=B55=E4=B8=AA=EF=BC=8C=E4=BD=86=E6=98=AF=E5=AE=9E?= =?UTF-8?q?=E9=99=85=E8=BF=98=E6=98=AF=E5=BC=95=E7=94=A8=E4=BA=863?= =?UTF-8?q?=E4=B8=AA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../flow/step_node/reranker_node/impl/base_reranker_node.py | 5 +++-- .../impl/xinference_model_provider/model/reranker.py | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/apps/application/flow/step_node/reranker_node/impl/base_reranker_node.py b/apps/application/flow/step_node/reranker_node/impl/base_reranker_node.py index 8b7fa053e..d1eef33d4 100644 --- a/apps/application/flow/step_node/reranker_node/impl/base_reranker_node.py +++ b/apps/application/flow/step_node/reranker_node/impl/base_reranker_node.py @@ -47,14 +47,15 @@ class BaseRerankerNode(IRerankerNode): def execute(self, question, reranker_setting, reranker_list, reranker_model_id, **kwargs) -> NodeResult: documents = merge_reranker_list(reranker_list) + top_n = reranker_setting.get('top_n', 3) self.context['document_list'] = documents self.context['question'] = question reranker_model = get_model_instance_by_model_user_id(reranker_model_id, - self.flow_params_serializer.data.get('user_id')) + self.flow_params_serializer.data.get('user_id'), + top_n=top_n) result = reranker_model.compress_documents( [Document(page_content=document) for document in documents if document is not None and len(document) > 0], question) - top_n = reranker_setting.get('top_n', 3) similarity = reranker_setting.get('similarity', 0.6) max_paragraph_char_number = reranker_setting.get('max_paragraph_char_number', 5000) r = filter_result(result, max_paragraph_char_number, top_n, similarity) diff --git a/apps/setting/models_provider/impl/xinference_model_provider/model/reranker.py b/apps/setting/models_provider/impl/xinference_model_provider/model/reranker.py index f32e1ee94..ed2db0f91 100644 --- a/apps/setting/models_provider/impl/xinference_model_provider/model/reranker.py +++ b/apps/setting/models_provider/impl/xinference_model_provider/model/reranker.py @@ -26,7 +26,7 @@ class XInferenceReranker(MaxKBBaseModel, BaseDocumentCompressor): @staticmethod def new_instance(model_type, model_name, model_credential: Dict[str, object], **model_kwargs): return XInferenceReranker(server_url=model_credential.get('server_url'), model_uid=model_name, - api_key=model_credential.get('api_key')) + api_key=model_credential.get('api_key'), top_n=model_kwargs.get('top_n', 3)) top_n: Optional[int] = 3