Merge pull request #310 from ELK-milu/main

fix:修复base中创建知识库时直接将basemodel转为json时的报错问题

Author: xerrors

.gitignore

@@ -35,10 +35,17 @@ cache
 .cursor
 .trae
 .pytest_cache
-*.nogit*
-*.private*
-*.local*
+
+###  (企业私有代码 - 仅忽略敏感配置，不忽略代码文件)
+# 移除了 *.private* 和 *_private 规则，允许 Git 本地管理
+# 通过 .git/info/exclude 或本地分支管理私有代码
 *.secret*
+*.nogit*
+# *.local* 保留用于本地配置文件
+*.local.py
+*.local.js
+*.local.yaml
+
 
 *.pdf
 src/data

docker-compose.yml

@@ -15,7 +15,7 @@ services:
       - ./saves:/app/saves
       - ./test:/app/test
       - ./scripts:/app/scripts
-      - ./.env :/app/.env
+      - ./.env:/app/.env
       - ${MODEL_DIR:-./models}:/models  # 使用默认值处理未定义的环境变量
     ports:
       - "5050:5050"
@@ -38,8 +38,8 @@ services:
       - MINIO_URI=${MINIO_URI:-http://milvus-minio:9000}
       - MODEL_DIR_IN_DOCKER=/models
       - RUNNING_IN_DOCKER=true
-      - NO_PROXY=localhost,127.0.0.1,milvus,graph,milvus-minio,milvus-etcd-dev,etcd,minio,mineru,paddlex
-      - no_proxy=localhost,127.0.0.1,milvus,graph,milvus-minio,milvus-etcd-dev,etcd,minio,mineru,paddlex
+      - NO_PROXY=localhost,127.0.0.1,milvus,graph,milvus-minio,milvus-etcd-dev,etcd,minio,mineru,paddlex,api.siliconflow.cn
+      - no_proxy=localhost,127.0.0.1,milvus,graph,milvus-minio,milvus-etcd-dev,etcd,minio,mineru,paddlex,api.siliconflow.cn
     # endregion api_envs
     command: uv run --no-dev uvicorn server.main:app --host 0.0.0.0 --port 5050 --reload
     restart: unless-stopped
@@ -145,7 +145,7 @@ services:
       - ETCD_SNAPSHOT_COUNT=50000
     volumes:
       - ./docker/volumes/milvus/etcd:/etcd
-    command: etcd -advertise-client-urls=http://127.0.0.1:2379 -listen-client-urls http://0.0.0.0:2379 --data-dir /etcd
+    command: etcd -advertise-client-urls=http://etcd:2379 -listen-client-urls http://0.0.0.0:2379 --data-dir /etcd
     healthcheck:
       test: ["CMD", "etcdctl", "endpoint", "health"]
       interval: 60s

server/main.py

@@ -9,7 +9,7 @@
 from starlette.middleware.base import BaseHTTPMiddleware
 
 from server.routers import router
-from server.services.tasker import tasker
+from server.utils.lifespan import lifespan
 from server.utils.auth_middleware import is_public_path
 from server.utils.common_utils import setup_logging
 
@@ -24,7 +24,7 @@
 _login_attempts: defaultdict[str, deque[float]] = defaultdict(deque)
 _attempt_lock = asyncio.Lock()
 
-app = FastAPI()
+app = FastAPI(lifespan=lifespan)
 app.include_router(router, prefix="/api")
 
 # CORS 设置
@@ -119,16 +119,5 @@ async def dispatch(self, request: Request, call_next):
 app.add_middleware(LoginRateLimitMiddleware)
 app.add_middleware(AuthMiddleware)
 
-
-@app.on_event("startup")
-async def start_tasker() -> None:
-    await tasker.start()
-
-
-@app.on_event("shutdown")
-async def stop_tasker() -> None:
-    await tasker.shutdown()
-
-
 if __name__ == "__main__":
     uvicorn.run(app, host="0.0.0.0", port=5050, threads=10, workers=10, reload=True)

server/routers/chat_router.py

@@ -112,7 +112,7 @@ async def get_agent(current_user: User = Depends(get_required_user)):
             metadata = yaml.safe_load(f)
     return {"agents": agents, "metadata": metadata}
 
-
+#TODO:[未完成]这个thread_id在前端是直接生成的1234，最好传入thread_id时做校验只允许uuid4
 @chat.post("/agent/{agent_id}")
 async def chat_agent(
     agent_id: str,
@@ -254,6 +254,7 @@ async def save_messages_from_langgraph_state(
             logger.error(f"Error saving messages from LangGraph state: {e}")
             logger.error(traceback.format_exc())
 
+    #TODO:[功能建议]针对需要人工审批后再执行的工具，可以使用langgraph的interrupt方法中断对话，等待用户输入后再使用command跳转回去
     async def stream_messages():
         # 代表服务端已经收到了请求
         yield make_chunk(status="init", meta=meta, msg=HumanMessage(content=query).model_dump())

server/utils/lifespan.py

@@ -0,0 +1,15 @@
+import asyncio
+from contextlib import asynccontextmanager
+
+from fastapi import FastAPI
+
+from server.services import tasker
+
+#TODO:[已完成]使用lifespan进行统一生命周期管理
+
+@asynccontextmanager
+async def lifespan(app: FastAPI):
+    await tasker.start()
+    """FastAPI lifespan事件管理器"""
+    yield
+    await tasker.shutdown()

server/utils/singleton.py

@@ -0,0 +1,15 @@
+from threading import Lock
+
+class SingletonMeta(type):
+    """
+    This is a thread-safe implementation of Singleton.
+    """
+    _instances = {}
+    _lock: Lock = Lock()
+
+    def __call__(cls, *args, **kwargs):
+        with cls._lock:
+            if cls not in cls._instances:
+                instance = super().__call__(*args, **kwargs)
+                cls._instances[cls] = instance
+        return cls._instances[cls]

src/agents/__init__.py

@@ -1,7 +1,10 @@
 import asyncio
+import importlib
+import inspect
+from pathlib import Path
 
-from .chatbot.graph import ChatbotAgent
-from .react.graph import ReActAgent
+from src.agents.common.base import BaseAgent
+from src.utils import logger
 
 
 class AgentManager:
@@ -35,10 +38,51 @@ async def get_agents_info(self):
         agents = self.get_agents()
         return await asyncio.gather(*[a.get_info() for a in agents])
 
+    def auto_discover_agents(self):
+        """自动发现并注册 src/agents/ 下的所有智能体。
+
+        遍历 src/agents/ 目录下的所有子文件夹，如果子文件夹包含 __init__.py，
+        则尝试从中导入 BaseAgent 的子类并注册。(使用自动导入的方式，支持私有agent)
+        """
+        # 获取 agents 目录的路径
+        agents_dir = Path(__file__).parent
+
+        # 遍历所有子目录
+        for item in agents_dir.iterdir():
+            logger.info(f"尝试导入模块：{item}")
+            # 跳过非目录、common 目录、__pycache__ 等
+            if not item.is_dir() or item.name.startswith("_") or item.name == "common":
+                continue
+
+            # 检查是否有 __init__.py 文件
+            init_file = item / "__init__.py"
+            if not init_file.exists():
+                logger.warning(f"{item} 不是一个有效的模块")
+                continue
+
+            # 尝试导入模块
+            try:
+                module_name = f"src.agents.{item.name}"
+                module = importlib.import_module(module_name)
+
+                # 查找模块中所有 BaseAgent 的子类
+                for name, obj in inspect.getmembers(module):
+                    if (
+                        inspect.isclass(obj)
+                        and issubclass(obj, BaseAgent)
+                        and obj is not BaseAgent
+                        and obj.__module__.startswith(module_name)
+                    ):
+                        logger.info(f"自动发现智能体: {obj.__name__} 来自 {item.name}")
+                        self.register_agent(obj)
+
+            except Exception as e:
+                logger.warning(f"无法从 {item.name} 加载智能体: {e}")
+
 
 agent_manager = AgentManager()
-agent_manager.register_agent(ChatbotAgent)
-agent_manager.register_agent(ReActAgent)
+# 自动发现并注册所有智能体
+agent_manager.auto_discover_agents()
 agent_manager.init_all_agents()
 
 __all__ = ["agent_manager"]

src/agents/chatbot/tools.py

@@ -9,10 +9,20 @@
 from src.storage.minio import upload_image_to_minio
 from src.utils import logger
 
-
-@tool
+#TODO:[已完成]修改了tool定义的示例，使用更符合langgraph调用的方式
+@tool(name_or_callable="全能计算器",description="可以对给定的2个数字选择进行加减乘除四种计算")
 def calculator(a: float, b: float, operation: str) -> float:
-    """Calculate two numbers. operation: add, subtract, multiply, divide"""
+    """
+    可以对给定的2个数字选择进行加减乘除四种计算
+
+    Args:
+      a: 第一个数字
+      b: 第二个数字
+      operation: 计算操作符号，可以是add，subtract，multiply，divide
+
+    Returns:
+        float: 最终的计算结果
+    """
     try:
         if operation == "add":
             return a + b

src/agents/react/__init__.py

@@ -0,0 +1,3 @@
+from .graph import ReActAgent
+
+__all__ = ["ReActAgent"]

src/config/static/models.py

@@ -142,6 +142,12 @@ class RerankerInfo(BaseModel):
         base_url="https://api.siliconflow.cn/v1/embeddings",
         api_key="SILICONFLOW_API_KEY",
     ),
+    "siliconflow/Pro/BAAI/bge-m3": EmbedModelInfo(
+        name="Pro/BAAI/bge-m3",
+        dimension=1024,
+        base_url="https://api.siliconflow.cn/v1/embeddings",
+        api_key="SILICONFLOW_API_KEY",
+    ),
     "siliconflow/Qwen/Qwen3-Embedding-0.6B": EmbedModelInfo(
         name="Qwen/Qwen3-Embedding-0.6B",
         dimension=1024,
@@ -179,6 +185,11 @@ class RerankerInfo(BaseModel):
         base_url="https://api.siliconflow.cn/v1/rerank",
         api_key="SILICONFLOW_API_KEY",
     ),
+    "siliconflow/Pro/BAAI/bge-reranker-v2-m3": RerankerInfo(
+        name="Pro/BAAI/bge-reranker-v2-m3",
+        base_url="https://api.siliconflow.cn/v1/rerank",
+        api_key="SILICONFLOW_API_KEY",
+    ),
     "vllm/BAAI/bge-reranker-v2-m3": RerankerInfo(
         name="BAAI/bge-reranker-v2-m3",
         base_url="http://localhost:8000/v1/rerank",