From 176b49983a1a6478226ba6189411d749d1e26d6e Mon Sep 17 00:00:00 2001
From: paituo <330435863@qq.com>
Date: Mon, 19 Aug 2024 08:59:45 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=B5=8B=E8=AF=95=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/tests/query.py | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/backend/tests/query.py b/backend/tests/query.py
index 48ca304..8c82d28 100644
--- a/backend/tests/query.py
+++ b/backend/tests/query.py
@@ -24,7 +24,8 @@ def main():
     top_k = 5
     filters = generate_filters([])
     #question = "从工程属性表中查找工程名称"
-    question = "总算表中名称等于架空输电线路本体工程的金额?"
+    #question = "总算表中名称等于架空输电线路本体工程的金额?"
+    question = "工程监理费的金额是多少？"
     # 创建向量检索查询工具
     query_engine = index.as_query_engine(
         similarity_top_k=top_k, filters=filters
@@ -35,18 +36,20 @@ def main():
     engine = create_engine(os.getenv("SQL_DATABASE_URL", ""))
     sql_database = SQLDatabase(engine)
 
-    loader = CustomDatabaseReader(sql_database)
-    documents = loader.load_data(query="select * from ProjectProperties")
-
     table_schema_objs = makeDescriptionByEngine(sql_database)
     table_node_mapping = SQLTableNodeMapping(sql_database)
 
     vectorIndex = VectorStoreIndex()
     # 创建SQL查询工具
-    sql_obj_index = ObjectIndex.from_objects(
+    # sql_obj_index = ObjectIndex.from_objects(
+    #     table_schema_objs,
+    #     table_node_mapping,
+    #     index_cls=VectorStoreIndex,
+    # )
+    sql_obj_index = ObjectIndex.from_objects_and_index(
         table_schema_objs,
+        vectorIndex,
         table_node_mapping,
-        index_cls=VectorStoreIndex,
     )
 
     query_result =vectorIndex.as_query_engine(