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 f6d97729..b4aec3e6 100644 Binary files a/dsRag/Config/__pycache__/Config.cpython-310.pyc and b/dsRag/Config/__pycache__/Config.cpython-310.pyc differ diff --git a/dsRag/Config/__pycache__/__init__.cpython-310.pyc b/dsRag/Config/__pycache__/__init__.cpython-310.pyc index 2278514c..b3f99ca7 100644 Binary files a/dsRag/Config/__pycache__/__init__.cpython-310.pyc and b/dsRag/Config/__pycache__/__init__.cpython-310.pyc differ diff --git a/dsRag/ElasticSearch/Utils/__pycache__/ElasticsearchConnectionPool.cpython-310.pyc b/dsRag/ElasticSearch/Utils/__pycache__/ElasticsearchConnectionPool.cpython-310.pyc index 6b078800..2c77d6cb 100644 Binary files a/dsRag/ElasticSearch/Utils/__pycache__/ElasticsearchConnectionPool.cpython-310.pyc and b/dsRag/ElasticSearch/Utils/__pycache__/ElasticsearchConnectionPool.cpython-310.pyc differ diff --git a/dsRag/ElasticSearch/__pycache__/__init__.cpython-310.pyc b/dsRag/ElasticSearch/__pycache__/__init__.cpython-310.pyc index f7c5e0e6..94ae6ce2 100644 Binary files a/dsRag/ElasticSearch/__pycache__/__init__.cpython-310.pyc and b/dsRag/ElasticSearch/__pycache__/__init__.cpython-310.pyc differ diff --git a/dsRag/Milvus/Utils/__pycache__/MilvusCollectionManager.cpython-310.pyc b/dsRag/Milvus/Utils/__pycache__/MilvusCollectionManager.cpython-310.pyc deleted file mode 100644 index 728f5b06..00000000 Binary files a/dsRag/Milvus/Utils/__pycache__/MilvusCollectionManager.cpython-310.pyc and /dev/null differ diff --git a/dsRag/Milvus/Utils/__pycache__/MilvusConnectionPool.cpython-310.pyc b/dsRag/Milvus/Utils/__pycache__/MilvusConnectionPool.cpython-310.pyc deleted file mode 100644 index 882bb3f3..00000000 Binary files a/dsRag/Milvus/Utils/__pycache__/MilvusConnectionPool.cpython-310.pyc and /dev/null differ 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 2c4b0099..00000000 Binary files a/dsRag/Milvus/Utils/__pycache__/__init__.cpython-310.pyc and /dev/null differ diff --git a/dsRag/Milvus/__pycache__/__init__.cpython-310.pyc b/dsRag/Milvus/__pycache__/__init__.cpython-310.pyc deleted file mode 100644 index c393183f..00000000 Binary files a/dsRag/Milvus/__pycache__/__init__.cpython-310.pyc and /dev/null differ diff --git a/dsRag/StartElasticSearch.py b/dsRag/Start.py similarity index 92% rename from dsRag/StartElasticSearch.py rename to dsRag/Start.py index d8edcc00..837de2a7 100644 --- a/dsRag/StartElasticSearch.py +++ b/dsRag/Start.py @@ -1,26 +1,20 @@ +import logging import os import subprocess import tempfile import urllib.parse import uuid -from contextlib import asynccontextmanager from io import BytesIO from logging.handlers import RotatingFileHandler from typing import List -import jieba # 导入 jieba 分词库 import uvicorn from fastapi import FastAPI, Request, HTTPException from fastapi.staticfiles import StaticFiles -from gensim.models import KeyedVectors -from pydantic import BaseModel, Field, ValidationError +from pydantic import BaseModel, Field from starlette.responses import StreamingResponse -from Config.Config import MS_MODEL_PATH, MS_MODEL_LIMIT, MS_HOST, MS_PORT, MS_MAX_CONNECTIONS, MS_NPROBE, \ - MS_COLLECTION_NAME, ES_CONFIG -from Milvus.Utils.MilvusCollectionManager import MilvusCollectionManager -from Milvus.Utils.MilvusConnectionPool import * -from Milvus.Utils.MilvusConnectionPool import MilvusConnectionPool +from Config.Config import ES_CONFIG from Util.ALiYunUtil import ALiYunUtil from Util.EsSearchUtil import EsSearchUtil diff --git a/dsRag/Util/__pycache__/ALiYunUtil.cpython-310.pyc b/dsRag/Util/__pycache__/ALiYunUtil.cpython-310.pyc index 2c0e2ba0..27b8ffee 100644 Binary files a/dsRag/Util/__pycache__/ALiYunUtil.cpython-310.pyc and b/dsRag/Util/__pycache__/ALiYunUtil.cpython-310.pyc differ diff --git a/dsRag/Util/__pycache__/EsSearchUtil.cpython-310.pyc b/dsRag/Util/__pycache__/EsSearchUtil.cpython-310.pyc index 5db976d5..06626bbc 100644 Binary files a/dsRag/Util/__pycache__/EsSearchUtil.cpython-310.pyc and b/dsRag/Util/__pycache__/EsSearchUtil.cpython-310.pyc differ diff --git a/dsRag/Util/__pycache__/__init__.cpython-310.pyc b/dsRag/Util/__pycache__/__init__.cpython-310.pyc index 2089b6b5..79767003 100644 Binary files a/dsRag/Util/__pycache__/__init__.cpython-310.pyc and b/dsRag/Util/__pycache__/__init__.cpython-310.pyc differ