update logger

src/config/__init__.py

@@ -2,9 +2,7 @@ import os
 import json
 import yaml
 from pathlib import Path
-from src.utils.logging_config import setup_logger
+from src.utils.logging_config import logger
-
-logger = setup_logger("Config")
 
 with open(Path("src/static/models.yaml"), "r") as f:
     _models = yaml.safe_load(f)
@@ -53,7 +51,6 @@ class Config(SimpleConfig):
         self.add_item("enable_reranker", default=False, des="是否开启重排序")
         self.add_item("enable_knowledge_base", default=False, des="是否开启知识库")
         self.add_item("enable_knowledge_graph", default=False, des="是否开启知识图谱")
-        self.add_item("enable_search_engine", default=False, des="是否开启搜索引擎")
         self.add_item("enable_web_search", default=False, des="是否开启网页搜索（需配置 TAVILY_API_KEY）")
         # 模型配置
         ## 注意这里是模型名，而不是具体的模型路径，默认使用 HuggingFace 的路径

src/core/database.py

@@ -2,11 +2,9 @@ import os
 import json
 import time
 from src.plugins import pdf2txt
-from src.utils import hashstr, setup_logger, is_text_pdf
+from src.utils import hashstr, logger, is_text_pdf
 from src.models.embedding import get_embedding_model
 
-logger = setup_logger("DataBaseManager")
-
 
 class DataBaseManager:
 

src/core/knowledgebase.py

@@ -1,8 +1,7 @@
 import os
 
 from pymilvus import MilvusClient, MilvusException
-from src.utils import setup_logger, hashstr
+from src.utils import logger, hashstr
-logger = setup_logger("KnowledgeBase")
 
 
 class KnowledgeBase:

src/core/retriever.py

@@ -1,7 +1,5 @@
 from src.models.rerank_model import get_reranker
-from src.utils.logging_config import setup_logger
+from src.utils.logging_config import logger
-
-logger = setup_logger("server-common")
 
 
 class Retriever:

src/core/startup.py

@@ -3,9 +3,7 @@ from src.core import DataBaseManager
 from src.core.retriever import Retriever
 from src.models import select_model
 from src.config import Config
-from src.utils import setup_logger
+from src.utils import logger
-
-logger = setup_logger("Startup")
 
 
 class Startup:

src/main.py

@@ -3,7 +3,7 @@ from dotenv import load_dotenv
 from fastapi import FastAPI
 from fastapi.middleware.cors import CORSMiddleware
 from src.routers import router
-from src.utils.logging_config import setup_logger
+from src.utils.logging_config import logger
 
 load_dotenv()
 
@@ -20,9 +20,6 @@ app.add_middleware(
 )
 
 
-logger = setup_logger("server:main")
-
-
 if __name__ == "__main__":
     uvicorn.run(app, host="0.0.0.0", port=5000, threads=10, workers=10)
 

src/models/__init__.py

@@ -18,6 +18,7 @@ def select_model(config, model_provider=None, model_name=None):
         "siliconflow",
         "zhipu",
         "lingyiwanwu",
+        "together.ai",
     ]:
         return OpenAIBase(
             api_key=os.getenv(model_info["env"][0]),

src/models/chat_model.py

@@ -1,9 +1,6 @@
 import os
 from openai import OpenAI
-from src.utils.logging_config import setup_logger
+from src.utils import logger
-
-
-logger = setup_logger(__name__)
 
 class OpenAIBase():
     def __init__(self, api_key, base_url, model_name):

src/models/embedding.py

@@ -4,12 +4,9 @@ import requests
 from FlagEmbedding import FlagModel
 
 from src.config import EMBED_MODEL_INFO
-from src.utils.logging_config import setup_logger
+from src.utils import hashstr, logger
-from src.utils import hashstr
 
 
-logger = setup_logger("EmbeddingModel")
-
 class LocalEmbeddingModel(FlagModel):
     def __init__(self, config, **kwargs):
         info = EMBED_MODEL_INFO[config.embed_model]

src/models/ollama_embedding.py

@@ -4,9 +4,7 @@ import numpy as np
 from typing import List, Union, Dict
 
 from src.models.embedding import RemoteEmbeddingModel
-from src.utils.logging_config import setup_logger
+from src.utils.logging_config import logger
-
-logger = setup_logger("OllamaEmbedding")
 
 class OllamaEmbedding(RemoteEmbeddingModel):
     """

src/models/rerank_model.py

@@ -5,10 +5,7 @@ import numpy as np
 from FlagEmbedding import FlagReranker
 
 from src.config import RERANKER_LIST
-from src.utils.logging_config import setup_logger
+from src.utils.logging_config import logger
-
-
-logger = setup_logger("RerankModel")
 
 
 class LocalReranker(FlagReranker):

src/plugins/oneke.py

@@ -11,8 +11,7 @@ from transformers import (
     BitsAndBytesConfig
 )
 
-from src.utils import setup_logger
+from src.utils import logger
-logger = setup_logger("OneKE")
 
 dotenv.load_dotenv()
 

src/routers/base_router.py

@@ -5,11 +5,11 @@ base = APIRouter()
 from fastapi import FastAPI, HTTPException
 from fastapi.responses import JSONResponse
 from fastapi import Request, Body
-from src.core import HistoryManager
-from src.utils.logging_config import setup_logger
-from src.core.startup import startup
 
-logger = setup_logger("server-base")
+from src.core import HistoryManager
+from src.core.startup import startup
+from src.utils import logger
+
 
 @base.get("/")
 async def route_index():

src/routers/chat_router.py

@@ -5,10 +5,9 @@ from fastapi.responses import StreamingResponse, Response
 from concurrent.futures import ThreadPoolExecutor
 from src.core import HistoryManager
 from src.core.startup import startup
-from src.utils.logging_config import setup_logger
+from src.utils.logging_config import logger
 
 chat = APIRouter(prefix="/chat")
-logger = setup_logger("server-chat")
 # 创建线程池
 executor = ThreadPoolExecutor()
 

src/routers/data_router.py

@@ -2,12 +2,11 @@ import os
 from typing import List, Optional
 from fastapi import APIRouter, File, UploadFile, HTTPException, Depends, Body
 
-from src.utils import setup_logger, hashstr
+from src.utils import logger, hashstr
 from src.core.startup import startup
 
 data = APIRouter(prefix="/data")
 
-logger = setup_logger("server-database")
 
 @data.get("/")
 def get_databases():

src/routers/tool_router.py

@@ -3,11 +3,10 @@ from fastapi import APIRouter, Body
 from pydantic import BaseModel
 from typing import List, Dict, Any, Optional
 
-from src.utils import setup_logger
+from src.utils import logger
 
 tool = APIRouter(prefix="/tool")
 
-logger = setup_logger("server-tools")
 
 class Tool(BaseModel):
     name: str

src/utils/__init__.py

@@ -1,6 +1,6 @@
 import time
 import random
-from src.utils.logging_config import setup_logger, logger
+from src.utils.logging_config import logger
 
 def is_text_pdf(pdf_path):
     import fitz

src/utils/web_search.py

@@ -1,9 +1,7 @@
 import os
 from typing import List, Dict
 from tavily import TavilyClient
-from src.utils.logging_config import setup_logger
+from src.utils.logging_config import logger
-
-logger = setup_logger("web-search")
 
 class WebSearcher:
     def __init__(self):