From 7df4b5bae956ad8a43f2311c4ddafd504574d745 Mon Sep 17 00:00:00 2001
From: HuangHai <10402852@qq.com>
Date: Mon, 30 Jun 2025 08:02:20 +0800
Subject: [PATCH] 'commit'

---
 dsRag/ElasticSearch/T4_SelectAllData.py   |  2 +-
 dsRag/ElasticSearch/T6_XiangLiangQuery.py | 19 +++++++------------
 2 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/dsRag/ElasticSearch/T4_SelectAllData.py b/dsRag/ElasticSearch/T4_SelectAllData.py
index b389c5de..99418857 100644
--- a/dsRag/ElasticSearch/T4_SelectAllData.py
+++ b/dsRag/ElasticSearch/T4_SelectAllData.py
@@ -1,8 +1,8 @@
 import warnings
 
 from elasticsearch import Elasticsearch
+
 from Config import Config
-import urllib3
 
 # 抑制HTTPS相关警告
 warnings.filterwarnings('ignore', message='Connecting to .* using TLS with verify_certs=False is insecure')
diff --git a/dsRag/ElasticSearch/T6_XiangLiangQuery.py b/dsRag/ElasticSearch/T6_XiangLiangQuery.py
index 2c0a9a87..91a9b3d0 100644
--- a/dsRag/ElasticSearch/T6_XiangLiangQuery.py
+++ b/dsRag/ElasticSearch/T6_XiangLiangQuery.py
@@ -14,9 +14,7 @@ esClient = EsSearchUtil(ES_CONFIG)
 warnings.filterwarnings('ignore', message='Connecting to .* using TLS with verify_certs=False is insecure')
 warnings.filterwarnings('ignore', message='Unverified HTTPS request is being made to host')
 
-
-
-def main():
+if __name__ == "__main__":
     # 测试查询
     query = "小学数学中有哪些模型"
     query_tags = ["MATH_1"]  # 默认搜索标签，可修改
@@ -32,7 +30,7 @@ def main():
         query_embedding = esClient.text_to_embedding(query)
         print(f"2. 生成的查询向量维度: {len(query_embedding)}")
         print(f"3. 前3维向量值: {query_embedding[:3]}")
-        
+
         print("4. 正在执行Elasticsearch向量搜索...")
         vector_results = es_conn.search(
             index=ES_CONFIG['index_name'],
@@ -61,7 +59,7 @@ def main():
             }
         )
         print(f"5. 向量搜索结果数量: {len(vector_results['hits']['hits'])}")
-        
+
         # 文本精确搜索
         print("\n=== 文本精确搜索阶段 ===")
         print("1. 正在执行Elasticsearch文本精确搜索...")
@@ -88,7 +86,7 @@ def main():
             }
         )
         print(f"2. 文本搜索结果数量: {len(text_results['hits']['hits'])}")
-        
+
         # 打印详细结果
         print("\n=== 最终搜索结果 ===")
         print(f" 向量搜索结果: {len(vector_results['hits']['hits'])}条")
@@ -96,15 +94,12 @@ def main():
             print(f"   {i}. 文档ID: {hit['_id']}, 相似度分数: {hit['_score']:.2f}")
             print(f"      内容: {hit['_source']['user_input']}")
             # print(f"      详细: {hit['_source']['tags']['full_content']}")
-            
+
         print("\n文本精确搜索结果:")
         for i, hit in enumerate(text_results['hits']['hits']):
-            print(f"  {i+1}. 文档ID: {hit['_id']}, 匹配分数: {hit['_score']:.2f}")
+            print(f"  {i + 1}. 文档ID: {hit['_id']}, 匹配分数: {hit['_score']:.2f}")
             print(f"      内容: {hit['_source']['user_input']}")
             # print(f"      详细: {hit['_source']['tags']['full_content']}")
-        
+
     finally:
         esClient.es_pool.release_connection(es_conn)
-
-if __name__ == "__main__":
-    main()