diff --git a/dsRagAnything/Start.py b/dsRagAnything/Start.py index 25e43415..daceacd6 100644 --- a/dsRagAnything/Start.py +++ b/dsRagAnything/Start.py @@ -14,27 +14,21 @@ from starlette.staticfiles import StaticFiles from Util.RagUtil import create_llm_model_func, create_vision_model_func, create_embedding_func -# 初始化日志 -logger = logging.getLogger(__name__) -logger.setLevel(logging.INFO) - -# 配置日志处理器 -log_file = os.path.join(os.path.dirname(__file__), 'Logs', 'app.log') -os.makedirs(os.path.dirname(log_file), exist_ok=True) -# 文件处理器 -file_handler = RotatingFileHandler( - log_file, maxBytes=1024 * 1024, backupCount=5, encoding='utf-8') -file_handler.setFormatter(logging.Formatter( - '%(asctime)s - %(name)s - %(levelname)s - %(message)s')) +import logging -# 控制台处理器 -console_handler = logging.StreamHandler() -console_handler.setFormatter(logging.Formatter( - '%(asctime)s - %(name)s - %(levelname)s - %(message)s')) +# 在程序开始时添加以下配置 +logging.basicConfig( + level=logging.INFO, # 设置日志级别为INFO + format='%(asctime)s - %(name)s - %(levelname)s - %(message)s' +) -logger.addHandler(file_handler) -logger.addHandler(console_handler) +# 或者如果你想更详细地控制日志输出 +logger = logging.getLogger('lightrag') +logger.setLevel(logging.INFO) +handler = logging.StreamHandler() +handler.setFormatter(logging.Formatter('%(asctime)s - %(name)s - %(levelname)s - %(message)s')) +logger.addHandler(handler) async def lifespan(app: FastAPI): @@ -62,11 +56,8 @@ async def rag(request: fastapi.Request): # 查询的问题 query = data.get("query") # 关闭参考资料 - query = query + "\n 1、不要输出参考资料 或者 References !" - query = query + "\n 2、如果问题与提供的知识库内容不符,则明确告诉未在知识库范围内提到!" - #query = query + "\n 3、严格按照知识库内容进行回答,不要进行推理!知识库中条目清晰体现的才算答案。" - - #system_prompt = "注意:如果用户提供了Latex 的行间公式或行内公式,一定要严格按原文输出,不能修改!" + user_prompt="\n 1、不要输出参考资料 或者 References !" + user_prompt = user_prompt + "\n 2、如果问题与提供的知识库内容不符,则明确告诉未在知识库范围内提到!" async def generate_response_stream(query: str): try: @@ -91,6 +82,7 @@ async def rag(request: fastapi.Request): ) # 直接使用app.state中已初始化的rag实例 resp = await app.state.rag.aquery( + user_prompt=user_prompt, query=query, mode="hybrid", stream=True diff --git a/dsRagAnything/T1_Train.py b/dsRagAnything/T1_Train.py index 6b62fe5f..2920cacb 100644 --- a/dsRagAnything/T1_Train.py +++ b/dsRagAnything/T1_Train.py @@ -15,7 +15,7 @@ logging.basicConfig( # 或者如果你想更详细地控制日志输出 logger = logging.getLogger('lightrag') -logger.setLevel(logging.DEBUG) +logger.setLevel(logging.INFO) handler = logging.StreamHandler() handler.setFormatter(logging.Formatter('%(asctime)s - %(name)s - %(levelname)s - %(message)s')) logger.addHandler(handler)