From 73bada7433af990a224f9698a2b1b782a9b5fa05 Mon Sep 17 00:00:00 2001 From: HuangHai <10402852@qq.com> Date: Fri, 27 Jun 2025 16:11:56 +0800 Subject: [PATCH] 'commit' --- .../__pycache__/MulvusConfig.cpython-310.pyc | Bin .../__pycache__/__init__.cpython-310.pyc | Bin .../Milvus/Utils/MilvusCollectionManager.py | 0 .../Milvus/Utils/MilvusConnectionPool.py | 0 dsRag/{ => Backup}/Milvus/Utils/__init__.py | 0 .../Milvus/X1_create_collection.py | 3 +-- dsRag/{ => Backup}/Milvus/X2_create_index.py | 3 +-- dsRag/{ => Backup}/Milvus/X3_SplitTxt.py | 2 +- dsRag/{ => Backup}/Milvus/X4_InsertData.py | 3 +-- .../{ => Backup}/Milvus/X5_select_all_data.py | 3 +-- .../Milvus/X6_search_near_data.py | 3 +-- dsRag/{ => Backup}/Milvus/__init__.py | 0 dsRag/{ => Backup}/StartMilvus.py | 4 ++-- dsRag/Backup/__init__.py | 0 .../Config/__pycache__/Config.cpython-310.pyc | Bin 997 -> 997 bytes .../__pycache__/__init__.cpython-310.pyc | Bin 137 -> 137 bytes ...lasticsearchConnectionPool.cpython-310.pyc | Bin 2754 -> 2754 bytes .../__pycache__/__init__.cpython-310.pyc | Bin 144 -> 144 bytes .../MilvusCollectionManager.cpython-310.pyc | Bin 4418 -> 0 bytes .../MilvusConnectionPool.cpython-310.pyc | Bin 2552 -> 0 bytes .../__pycache__/__init__.cpython-310.pyc | Bin 143 -> 0 bytes .../__pycache__/__init__.cpython-310.pyc | Bin 137 -> 0 bytes dsRag/{StartElasticSearch.py => Start.py} | 12 +++--------- .../__pycache__/ALiYunUtil.cpython-310.pyc | Bin 1283 -> 1283 bytes .../__pycache__/EsSearchUtil.cpython-310.pyc | Bin 4002 -> 4002 bytes .../Util/__pycache__/__init__.cpython-310.pyc | Bin 135 -> 135 bytes 26 files changed, 11 insertions(+), 22 deletions(-) rename dsRag/{ => Backup}/Milvus/Config/__pycache__/MulvusConfig.cpython-310.pyc (100%) rename dsRag/{ => Backup}/Milvus/Config/__pycache__/__init__.cpython-310.pyc (100%) rename dsRag/{ => Backup}/Milvus/Utils/MilvusCollectionManager.py (100%) rename dsRag/{ => Backup}/Milvus/Utils/MilvusConnectionPool.py (100%) rename dsRag/{ => Backup}/Milvus/Utils/__init__.py (100%) rename dsRag/{ => Backup}/Milvus/X1_create_collection.py (90%) rename dsRag/{ => Backup}/Milvus/X2_create_index.py (83%) rename dsRag/{ => Backup}/Milvus/X3_SplitTxt.py (93%) rename dsRag/{ => Backup}/Milvus/X4_InsertData.py (92%) rename dsRag/{ => Backup}/Milvus/X5_select_all_data.py (89%) rename dsRag/{ => Backup}/Milvus/X6_search_near_data.py (93%) rename dsRag/{ => Backup}/Milvus/__init__.py (100%) rename dsRag/{ => Backup}/StartMilvus.py (95%) create mode 100644 dsRag/Backup/__init__.py delete mode 100644 dsRag/Milvus/Utils/__pycache__/MilvusCollectionManager.cpython-310.pyc delete mode 100644 dsRag/Milvus/Utils/__pycache__/MilvusConnectionPool.cpython-310.pyc delete mode 100644 dsRag/Milvus/Utils/__pycache__/__init__.cpython-310.pyc delete mode 100644 dsRag/Milvus/__pycache__/__init__.cpython-310.pyc rename dsRag/{StartElasticSearch.py => Start.py} (92%) diff --git a/dsRag/Milvus/Config/__pycache__/MulvusConfig.cpython-310.pyc b/dsRag/Backup/Milvus/Config/__pycache__/MulvusConfig.cpython-310.pyc similarity index 100% rename from dsRag/Milvus/Config/__pycache__/MulvusConfig.cpython-310.pyc rename to dsRag/Backup/Milvus/Config/__pycache__/MulvusConfig.cpython-310.pyc diff --git a/dsRag/Milvus/Config/__pycache__/__init__.cpython-310.pyc b/dsRag/Backup/Milvus/Config/__pycache__/__init__.cpython-310.pyc similarity index 100% rename from dsRag/Milvus/Config/__pycache__/__init__.cpython-310.pyc rename to dsRag/Backup/Milvus/Config/__pycache__/__init__.cpython-310.pyc diff --git a/dsRag/Milvus/Utils/MilvusCollectionManager.py b/dsRag/Backup/Milvus/Utils/MilvusCollectionManager.py similarity index 100% rename from dsRag/Milvus/Utils/MilvusCollectionManager.py rename to dsRag/Backup/Milvus/Utils/MilvusCollectionManager.py diff --git a/dsRag/Milvus/Utils/MilvusConnectionPool.py b/dsRag/Backup/Milvus/Utils/MilvusConnectionPool.py similarity index 100% rename from dsRag/Milvus/Utils/MilvusConnectionPool.py rename to dsRag/Backup/Milvus/Utils/MilvusConnectionPool.py diff --git a/dsRag/Milvus/Utils/__init__.py b/dsRag/Backup/Milvus/Utils/__init__.py similarity index 100% rename from dsRag/Milvus/Utils/__init__.py rename to dsRag/Backup/Milvus/Utils/__init__.py diff --git a/dsRag/Milvus/X1_create_collection.py b/dsRag/Backup/Milvus/X1_create_collection.py similarity index 90% rename from dsRag/Milvus/X1_create_collection.py rename to dsRag/Backup/Milvus/X1_create_collection.py index c598c53b..9933704a 100644 --- a/dsRag/Milvus/X1_create_collection.py +++ b/dsRag/Backup/Milvus/X1_create_collection.py @@ -5,8 +5,7 @@ pip install pymilvus gensim from pymilvus import FieldSchema, DataType, utility from Config.Config import MS_HOST, MS_PORT, MS_MAX_CONNECTIONS, MS_COLLECTION_NAME, MS_DIMENSION -from Milvus.Utils.MilvusCollectionManager import MilvusCollectionManager -from Milvus.Utils.MilvusConnectionPool import * +from Backup.Milvus.Utils.MilvusCollectionManager import MilvusCollectionManager # 1. 使用连接池管理 Milvus 连接 milvus_pool = MilvusConnectionPool(host=MS_HOST, port=MS_PORT, max_connections=MS_MAX_CONNECTIONS) diff --git a/dsRag/Milvus/X2_create_index.py b/dsRag/Backup/Milvus/X2_create_index.py similarity index 83% rename from dsRag/Milvus/X2_create_index.py rename to dsRag/Backup/Milvus/X2_create_index.py index 21172216..fd598d6c 100644 --- a/dsRag/Milvus/X2_create_index.py +++ b/dsRag/Backup/Milvus/X2_create_index.py @@ -1,5 +1,4 @@ -from Milvus.Utils.MilvusCollectionManager import MilvusCollectionManager -from Milvus.Utils.MilvusConnectionPool import * +from Backup.Milvus.Utils.MilvusCollectionManager import MilvusCollectionManager from Config.Config import * # 1. 使用连接池管理 Milvus 连接 diff --git a/dsRag/Milvus/X3_SplitTxt.py b/dsRag/Backup/Milvus/X3_SplitTxt.py similarity index 93% rename from dsRag/Milvus/X3_SplitTxt.py rename to dsRag/Backup/Milvus/X3_SplitTxt.py index 14cc5e0f..d63de27e 100644 --- a/dsRag/Milvus/X3_SplitTxt.py +++ b/dsRag/Backup/Milvus/X3_SplitTxt.py @@ -64,7 +64,7 @@ def save_to_txt(content, file_path, mode='w'): return False if __name__ == "__main__": - input_file = '../static/Txt/小学数学教学中的若干问题_MATH_1.docx' + input_file = '../../static/Txt/小学数学教学中的若干问题_MATH_1.docx' #input_file = '../static/Txt/小学数学知识点_MATH_2.docx' #input_file = '../static/Txt/高中文言文_CHINESE_1.docx' output_dir = '../Txt/processed_chunks' diff --git a/dsRag/Milvus/X4_InsertData.py b/dsRag/Backup/Milvus/X4_InsertData.py similarity index 92% rename from dsRag/Milvus/X4_InsertData.py rename to dsRag/Backup/Milvus/X4_InsertData.py index 9aa469a0..38e8f5ee 100644 --- a/dsRag/Milvus/X4_InsertData.py +++ b/dsRag/Backup/Milvus/X4_InsertData.py @@ -1,6 +1,5 @@ from Config.Config import * -from Milvus.Utils.MilvusCollectionManager import MilvusCollectionManager -from Milvus.Utils.MilvusConnectionPool import * +from Backup.Milvus.Utils.MilvusCollectionManager import MilvusCollectionManager from gensim.models import KeyedVectors import jieba import os diff --git a/dsRag/Milvus/X5_select_all_data.py b/dsRag/Backup/Milvus/X5_select_all_data.py similarity index 89% rename from dsRag/Milvus/X5_select_all_data.py rename to dsRag/Backup/Milvus/X5_select_all_data.py index 80db43f7..8ad05ab5 100644 --- a/dsRag/Milvus/X5_select_all_data.py +++ b/dsRag/Backup/Milvus/X5_select_all_data.py @@ -1,5 +1,4 @@ -from Milvus.Utils.MilvusCollectionManager import MilvusCollectionManager -from Milvus.Utils.MilvusConnectionPool import * +from Backup.Milvus.Utils.MilvusCollectionManager import MilvusCollectionManager from Config.Config import * # 1. 使用连接池管理 Milvus 连接 diff --git a/dsRag/Milvus/X6_search_near_data.py b/dsRag/Backup/Milvus/X6_search_near_data.py similarity index 93% rename from dsRag/Milvus/X6_search_near_data.py rename to dsRag/Backup/Milvus/X6_search_near_data.py index fae5615c..d777445f 100644 --- a/dsRag/Milvus/X6_search_near_data.py +++ b/dsRag/Backup/Milvus/X6_search_near_data.py @@ -1,7 +1,6 @@ import time import jieba # 导入 jieba 分词库 -from Milvus.Utils.MilvusCollectionManager import MilvusCollectionManager -from Milvus.Utils.MilvusConnectionPool import * +from Backup.Milvus.Utils.MilvusCollectionManager import MilvusCollectionManager from Config.Config import * from gensim.models import KeyedVectors diff --git a/dsRag/Milvus/__init__.py b/dsRag/Backup/Milvus/__init__.py similarity index 100% rename from dsRag/Milvus/__init__.py rename to dsRag/Backup/Milvus/__init__.py diff --git a/dsRag/StartMilvus.py b/dsRag/Backup/StartMilvus.py similarity index 95% rename from dsRag/StartMilvus.py rename to dsRag/Backup/StartMilvus.py index 8731daf0..73bceb0e 100644 --- a/dsRag/StartMilvus.py +++ b/dsRag/Backup/StartMilvus.py @@ -26,7 +26,7 @@ from Util.ALiYunUtil import ALiYunUtil # 初始化日志 logger = logging.getLogger(__name__) logger.setLevel(logging.INFO) -handler = RotatingFileHandler('Logs/start.log', maxBytes=1024 * 1024, backupCount=5) +handler = RotatingFileHandler('../Logs/start.log', maxBytes=1024 * 1024, backupCount=5) handler.setFormatter(logging.Formatter('%(asctime)s - %(levelname)s - %(message)s')) logger.addHandler(handler) @@ -60,7 +60,7 @@ async def lifespan(app: FastAPI): app = FastAPI(lifespan=lifespan) # 挂载静态文件目录 -app.mount("/static", StaticFiles(directory="Static"), name="static") +app.mount("../static", StaticFiles(directory="Static"), name="static") # 将文本转换为嵌入向量 diff --git a/dsRag/Backup/__init__.py b/dsRag/Backup/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/dsRag/Config/__pycache__/Config.cpython-310.pyc b/dsRag/Config/__pycache__/Config.cpython-310.pyc index f6d97729d8e5ad07345cc1f19eef0ec1947c7c9e..b4aec3e6350bc4b595eb901f28a1eb82db1e18be 100644 GIT binary patch delta 146 zcmaFL{*;|7pO=@50SH#}Z{!kSWQ^J@&Dh775ykEs9Pi;D90Fzp_y>hV2?0f%{e65~ zokKkR{o?%`eOpt3fMbY96d#=HKx+f?-%dq=<5m=^L2~>iu?IN#Dj0~0@eBYySVzq2RMd!+~R|CeLQ_VL!x+qd>2n& ZSHEDODYqsIGRLq90Ie?)m|V}2H1=jG*M0D=QgCvw#T03*BvaR2}S delta 18 XcmeBV>}2H1=jG*M0D|>K6S?XEAe#fN diff --git a/dsRag/ElasticSearch/Utils/__pycache__/ElasticsearchConnectionPool.cpython-310.pyc b/dsRag/ElasticSearch/Utils/__pycache__/ElasticsearchConnectionPool.cpython-310.pyc index 6b0788000f2d14c31b78591e5124b342f7c593e7..2c77d6cb0573b0c90091426b9fc84ff0e3f8d74b 100644 GIT binary patch delta 19 ZcmX>kdPtNjpO=@50SKZDH*)RZ0st-T1XKV3 delta 19 ZcmX>kdPtNjpO=@50SI<@Z{*s+1pqLk1k3;c diff --git a/dsRag/ElasticSearch/__pycache__/__init__.cpython-310.pyc b/dsRag/ElasticSearch/__pycache__/__init__.cpython-310.pyc index f7c5e0e6a622fc3bc50e548acf6d6728aa53a406..94ae6ce2baf4d4f283db992edbc385bb28d4e8c7 100644 GIT binary patch delta 18 YcmbQhIDwHXpO=@50SKaaCUUg_03S~SM*si- delta 18 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 diff --git a/dsRag/Milvus/Utils/__pycache__/__init__.cpython-310.pyc b/dsRag/Milvus/Utils/__pycache__/__init__.cpython-310.pyc deleted file mode 100644 index 2c4b009929f9836f0beafba6c956d6cea771c69d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 143 zcmd1j<>g`kg5bk386f&Gh(HF6K#l_t7qb9~6oz01O-8?!3`HPe1o6wr#VRJHI6S{7 z8%PBdg`kg5bk386f&Gh(HF6K#l_t7qb9~6oz01O-8?!3`HPe1o2D9#VRJHI6S{7 z8%PBd@B2_Iv3SdVn^cy+V1)b zxvOrwt5~7@0Q|<4So0gqu`6&b`FMQJ%$Yl5UpKFtPU5;wiLamiA5I`du#{q99MqX1 z4{(n`dz0bWAWY&|hO;P%QxcF&2H&JYuG+B{B2d4q{=>CQ)K)6TU+4kSEry#CZ7v)3 zbFsY%UC;&|hBkJ(+WMBzh^ZD+1ew}uUS5P*rlHMrKGEh_#=b$1S=Ht!n)pIjzVe|G zN^eV0_k`gs->Jc{QSxnVpGNX{7+B+QKFfMilO=6lL{s0QmO8C8R`Wi2`wpwrUS3r` zi5@1oF|{4VBY8&qsI$`OLUQ3Q(jI{+r*cT)Nj9l(=O##{L$$ZERm;Y?o#}W*y@RK= zC&O8IqMdmvX%NLzKH35Eyi!=w5dfQGqJ=p3LsYO^_MBLBUx4i~-0cnaCEyjHSoOPh zDLw?{e0TJWW$yCNh58_PF(^aZpq9@!n4M209fB^n;q^#;cX!<`hx~nBgXyY2Zs+3` z!fa1>-ShGOn`BWN$u7fvzEk{I)lyYdJC5tDI+eOduKHZ>cu$eG4!}PZsH=KheuLMB Ra=rI!Fen@^cUG~t_ZK=$k*WXy delta 753 zcmZ8f%WB&|6!qv~J2H}*&;6XXkwWWKprg^b=bV{)rStlE-AjGnEAjQ?^>^>R5N0mL%z6|u zL)QSy3?>})PkM2xl#C}ysxlHN*$k0Q3tGMH%!JWDo&D9DdC@qT9Dbx*kUI<)C2Gvq z-HzC7pf2b(9+t7T+s65v(txQAh*74do|b2EuC$DuO-IHaN)=gjm#fAeB%?@}$|pWl zO4+3azIzNW`OYkcwNm67_c)Pn#sitV?!O3nFM z<%8&=lMCCpi5kcgdJLbFC8v^&48%~@4rqFW`JQ&#Wj%!7Ky~&rcq}~70@VckJ`49XKd=|X`)6u{E*1JtC z^Eq8jFWUQeqm57{aJ|CG^ZfhyyBQ(gPv Pn;Y;gG+QKV74G~2(>RrL diff --git a/dsRag/Util/__pycache__/__init__.cpython-310.pyc b/dsRag/Util/__pycache__/__init__.cpython-310.pyc index 2089b6b502a2908d4f89653139dba6f8d101300d..79767003c9ac32bf4142003b854ef98e2eacfc07 100644 GIT binary patch delta 18 XcmZo?Y-i-k=jG*M0D@rdiCnb+9qj`o delta 18 XcmZo?Y-i-k=jG*M0D=$N6S-;uA$|kl