From d6c86d96ee3ae45b4b368037ffc91ae6b85058ce Mon Sep 17 00:00:00 2001 From: shaohuzhang1 Date: Wed, 6 Nov 2024 11:29:55 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=B7=A5=E4=BD=9C?= =?UTF-8?q?=E6=B5=81=E7=9F=A5=E8=AF=86=E5=BA=93=E6=A3=80=E7=B4=A2=E7=BB=93?= =?UTF-8?q?=E6=9E=9C=E6=A0=87=E9=A2=98=E4=B8=8D=E5=AD=98=E5=9C=A8=E7=9A=84?= =?UTF-8?q?=E6=97=B6=E5=80=99=E6=98=BE=E7=A4=BA=E9=94=99=E8=AF=AF=20#1535?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit 6a226c9539d9bf3886d7ecb246513ec5d75868e0) --- .../impl/base_search_dataset_node.py | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/apps/application/flow/step_node/search_dataset_node/impl/base_search_dataset_node.py b/apps/application/flow/step_node/search_dataset_node/impl/base_search_dataset_node.py index fcd1dbdff..f86a8305e 100644 --- a/apps/application/flow/step_node/search_dataset_node/impl/base_search_dataset_node.py +++ b/apps/application/flow/step_node/search_dataset_node/impl/base_search_dataset_node.py @@ -37,6 +37,13 @@ def get_none_result(question): 'directly_return': ''}, {}) +def reset_title(title): + if title is None or len(title.strip()) == 0: + return "" + else: + return f"#### {title}\n" + + class BaseSearchDatasetNode(ISearchDatasetStepNode): def execute(self, dataset_id_list, dataset_setting, question, exclude_paragraph_id_list=None, @@ -63,10 +70,11 @@ class BaseSearchDatasetNode(ISearchDatasetStepNode): return NodeResult({'paragraph_list': result, 'is_hit_handling_method_list': [row for row in result if row.get('is_hit_handling_method')], 'data': '\n'.join( - [f"{paragraph.get('title', '')}:{paragraph.get('content')}" for paragraph in + [f"{reset_title(paragraph.get('title', ''))}{paragraph.get('content')}" for paragraph in paragraph_list])[0:dataset_setting.get('max_paragraph_char_number', 5000)], 'directly_return': '\n'.join( - [f"{paragraph.get('title', '')}:{paragraph.get('content')}" for paragraph in result if + [f"{reset_title(paragraph.get('title', ''))}{paragraph.get('content')}" for paragraph in + result if paragraph.get('is_hit_handling_method')]), 'question': question},