From 9cbe414a0c7cef5b3490b03636041e16c45ee6b3 Mon Sep 17 00:00:00 2001 From: paituo <330435863@qq.com> Date: Thu, 22 Aug 2024 17:10:32 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E9=A1=BA=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/.env.xinference | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/backend/.env.xinference b/backend/.env.xinference index 48c95de..6dd566f 100644 --- a/backend/.env.xinference +++ b/backend/.env.xinference @@ -6,12 +6,13 @@ SQL_DATABASE_URL=mysql+pymysql://zjinfo1:Dy2Bcr53Hm5xRkba@110.42.234.166:3306/zj # The number of similar embeddings to return when retrieving documents. TOP_K=10 #-------------------------- -# 是否启用检索重排功能 -RERANK_ENABLED=true # 是否启用混合检索 HYBRID_ENABLED = true # 混合检索阈值 HYBRID_ALPHA = 0.6 +#-------------------------- +# 是否启用检索重排功能 +RERANK_ENABLED=true # Rerank model RERANK_MODEL=bge-reranker-v2-m3 RERANK_BASE_URL=http://10.1.16.39:9995 From 8050551a536f45eb16de8e1b5eec748984d07da1 Mon Sep 17 00:00:00 2001 From: paituo <330435863@qq.com> Date: Thu, 22 Aug 2024 21:21:37 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=88=9B=E5=BB=BASQL?= =?UTF-8?q?=E5=BC=95=E6=93=8E=E5=87=BD=E6=95=B0=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/app/engine/__init__.py | 12 ++++++------ backend/app/engine/engine.py | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/backend/app/engine/__init__.py b/backend/app/engine/__init__.py index b79913a..0d0304d 100644 --- a/backend/app/engine/__init__.py +++ b/backend/app/engine/__init__.py @@ -4,7 +4,7 @@ from llama_index.core.agent import AgentRunner, ReActChatFormatter from llama_index.core.settings import Settings from llama_index.core.tools.query_engine import QueryEngineTool -from app.engine.engine import create_query_engine, create_summary_query_engine +from app.engine.engine import create_query_engine, create_summary_query_engine, create_sql_query_engine from app.engine.index import get_index #from app.engine.loaders.db import makeDescriptionByEngine from app.engine.tools import ToolFactory @@ -17,11 +17,11 @@ def get_chat_engine(filters=None, params=None): tools = [] # 创建SQL查询工具 -# sql_query_engine = create_summary_query_engine(index) - # sql_query_tool = QueryEngineTool.from_defaults(query_engine=sql_query_engine, - # name="zjdata_query_tool", - # description="来源于一个由博微公司电力造价软件编制的造价工程文件。该文件以多张表格的形式存储存储了整个工程的全部数据内容。适用于以详细的自然语言查询表格数据方式查询造价工程各项具体属性、费用的数值。请先使用“zj_query_tool”无法解决才使用本工具" - # ) + sql_query_engine = create_sql_query_engine() + sql_query_tool = QueryEngineTool.from_defaults(query_engine=sql_query_engine, + name="zjdata_query_tool", + description="来源于一个由博微公司电力造价软件编制的造价工程文件。该文件以多张表格的形式存储存储了整个工程的全部数据内容。适用于以详细的自然语言查询表格数据方式查询造价工程各项具体属性、费用的数值。请先使用“zj_query_tool”无法解决才使用本工具" + ) #tools.append(sql_query_tool) # Add query tool if index exists diff --git a/backend/app/engine/engine.py b/backend/app/engine/engine.py index 379275e..6cb552f 100644 --- a/backend/app/engine/engine.py +++ b/backend/app/engine/engine.py @@ -52,8 +52,8 @@ def get_Retriever(index,**kwargs): sql_database = None sql_obj_index = None -# Create a summary query engine -def create_summary_query_engine(top_k=3, use_reranker=False, filters=None): +# Create a sql query engine +def create_sql_query_engine(top_k=3, use_reranker=False, filters=None): global sql_obj_index global sql_database if sql_obj_index is None or sql_database is None: