From f467499f454ebb40d9e1b72e32ee2dc914082105 Mon Sep 17 00:00:00 2001 From: yaojin Date: Fri, 12 Jan 2024 21:54:36 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E5=91=8A=E7=94=9F=E6=88=90bu=20gbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package-lock.json | 6 ++++++ src/backend/bisheng/api/v1/qa.py | 7 ++++++- src/backend/bisheng/graph/vertex/base.py | 2 +- .../bisheng/template/frontend_node/documentloaders.py | 2 +- 4 files changed, 14 insertions(+), 3 deletions(-) create mode 100644 package-lock.json diff --git a/package-lock.json b/package-lock.json new file mode 100644 index 000000000..02972f47a --- /dev/null +++ b/package-lock.json @@ -0,0 +1,6 @@ +{ + "name": "bisheng", + "lockfileVersion": 3, + "requires": true, + "packages": {} +} diff --git a/src/backend/bisheng/api/v1/qa.py b/src/backend/bisheng/api/v1/qa.py index 007be90ef..0bf816493 100644 --- a/src/backend/bisheng/api/v1/qa.py +++ b/src/backend/bisheng/api/v1/qa.py @@ -60,10 +60,15 @@ def get_original_file(*, message_id: int, keys: str, session: Session = Depends( chunk_res['source_url'] = minio_client.get_share_link(str(chunk.file_id)) chunk_res['original_url'] = minio_client.get_share_link( file.object_name if file.object_name else str(file.id)) + chunk_res['source'] = file.file_name + else: + chunk_res['source_url'] = '' + chunk_res['original_url'] = '' + chunk_res['source'] = '' + chunk_res['score'] = round(match_score(chunk.chunk, keywords), 2) if len(keywords) > 0 else 0 chunk_res['file_id'] = chunk.file_id - chunk_res['source'] = file.file_name result.append(chunk_res) diff --git a/src/backend/bisheng/graph/vertex/base.py b/src/backend/bisheng/graph/vertex/base.py index f836fa837..1346809b2 100644 --- a/src/backend/bisheng/graph/vertex/base.py +++ b/src/backend/bisheng/graph/vertex/base.py @@ -358,7 +358,7 @@ class Vertex: else: self.params[key][k] = (k1, v1) elif self._is_node(v[1]): - result = v[1].get_result(user_id) + result = await v[1].get_result(user_id) self.params[key][k] = (v[0], result) else: self.params[key][k] = (v[0], v[1]) diff --git a/src/backend/bisheng/template/frontend_node/documentloaders.py b/src/backend/bisheng/template/frontend_node/documentloaders.py index 0034c2a05..c376aa21a 100644 --- a/src/backend/bisheng/template/frontend_node/documentloaders.py +++ b/src/backend/bisheng/template/frontend_node/documentloaders.py @@ -249,7 +249,7 @@ class DocumentLoaderFrontNode(FrontendNode): show=True, name='request_timeout', advanced=True, - value=10)) + value=600)) self.template.add_field(self.file_path_templates[self.template.type_name]) elif self.template.type_name in self.file_path_templates: self.template.add_field(self.file_path_templates[self.template.type_name])