Merge branch 'refactor/backend-restructuring'

Author: xerrors

.github/ISSUE_TEMPLATE/提交一个docker启动问题.md

@@ -35,7 +35,7 @@ assignees: ''
 # 例如
 docker compose up -d
 # 或
-make start
+make up
 ```
 
 

AGENTS.md

@@ -1,7 +1,7 @@
 
 # 项目目录结构 (Project Overview)
 
-Yuxi-Know 是一个基于大模型的智能知识库与知识图谱智能体开发平台，融合了 RAG 技术与知识图谱技术，基于 LangGraph v1 + Vue.js + FastAPI + LightRAG 架构构建。项目完全通过 Docker Compose 进行管理，支持热重载开发。
+Yuxi 是一个基于大模型的智能知识库与知识图谱智能体开发平台，融合了 RAG 技术与知识图谱技术，基于 LangGraph v1 + Vue.js + FastAPI + LightRAG 架构构建。项目完全通过 Docker Compose 进行管理，支持热重载开发。
 
 ## 开发准则
 

CLAUDE.md

@@ -1,7 +1,7 @@
 
 # 项目目录结构 (Project Overview)
 
-Yuxi-Know 是一个基于大模型的智能知识库与知识图谱智能体开发平台，融合了 RAG 技术与知识图谱技术，基于 LangGraph v1 + Vue.js + FastAPI + LightRAG 架构构建。项目完全通过 Docker Compose 进行管理，支持热重载开发。
+Yuxi 是一个基于大模型的智能知识库与知识图谱智能体开发平台，融合了 RAG 技术与知识图谱技术，基于 LangGraph v1 + Vue.js + FastAPI + LightRAG 架构构建。项目完全通过 Docker Compose 进行管理，支持热重载开发。
 
 ## 开发准则
 

Makefile

@@ -1,27 +1,16 @@
 
-.PHONY: start stop logs lint format format_diff router-tests
+.PHONY: up down logs lint format format_diff router-tests
 
 PYTEST_ARGS ?=
 
-pull:
-	bash docker/pull_image.sh python:3.12-slim
-	bash docker/pull_image.sh node:20-slim
-	bash docker/pull_image.sh node:20-alpine
-	bash docker/pull_image.sh milvusdb/milvus:v2.5.6
-	bash docker/pull_image.sh neo4j:5.26
-	bash docker/pull_image.sh minio/minio:RELEASE.2023-03-20T20-16-18Z
-	bash docker/pull_image.sh ghcr.io/astral-sh/uv:0.7.2
-	bash docker/pull_image.sh nginx:alpine
-	bash docker/pull_image.sh quay.io/coreos/etcd:v3.5.5
-
-start:
+up:
 	@if [ ! -f .env ]; then \
 		echo "Error: .env file not found. Please create it from .env.template"; \
 		exit 1; \
 	fi
 	docker compose up -d
 
-stop:
+down:
 	docker compose down
 
 logs:
@@ -35,15 +24,15 @@ logs:
 ######################
 
 lint:
-	uv run python -m ruff check .
-	uv run python -m ruff format --check src
-	uv run python -m ruff check --select I src
+	uv run python -m ruff check backend/package
+	uv run python -m ruff format --check backend/package
+	uv run python -m ruff check --select I backend/package
 
 format:
-	uv run python -m ruff format .
-	uv run python -m ruff check . --fix
-	uv run python -m ruff check --select I src --fix
-	cd web && npm run format
+	uv run python -m ruff format backend/package
+	uv run python -m ruff check backend/package --fix
+	uv run python -m ruff check --select I backend/package --fix
+	docker compose exec -T web pnpm run format
 
 router-tests:
 	docker compose exec -T api uv run --group test pytest test/api $(PYTEST_ARGS)

.python-version backend/.python-version.python-version renamed to backend/.python-version

@@ -5,17 +5,17 @@
 import os  # noqa: E402
 from concurrent.futures import ThreadPoolExecutor  # noqa: E402
 
-from src.config import config as config  # noqa: E402
+from yuxi.config import config as config  # noqa: E402
 
 __version__ = "0.5.3"
 
 if os.getenv("YUXI_SKIP_APP_INIT") != "1":
-    from src.knowledge import graph_base as graph_base  # noqa: E402
-    from src.knowledge import knowledge_base as knowledge_base  # noqa: E402
+    from yuxi.knowledge import graph_base as graph_base  # noqa: E402
+    from yuxi.knowledge import knowledge_base as knowledge_base  # noqa: E402
 
 executor = ThreadPoolExecutor()  # noqa: E402
 
 
 def get_version():
-    """Return the Yuxi-Know version."""
+    """Return the Yuxi version."""
     return __version__

src/__init__.py backend/package/yuxi/__init__.pysrc/__init__.py renamed to backend/package/yuxi/__init__.py

@@ -0,0 +1,4 @@
+# 从 buildin 模块导入 agent_manager
+from yuxi.agents.buildin import agent_manager
+
+__all__ = ["agent_manager"]

backend/package/yuxi/agents/__init__.py

@@ -4,8 +4,8 @@
 from pathlib import Path
 
 from server.utils.singleton import SingletonMeta
-from src.agents.common import BaseAgent
-from src.utils import logger
+from yuxi.agents.common import BaseAgent
+from yuxi.utils import logger
 
 
 class AgentManager(metaclass=SingletonMeta):
@@ -46,9 +46,9 @@ async def get_agents_info(self, include_configurable_items: bool = True):
         )
 
     def auto_discover_agents(self):
-        """自动发现并注册 src/agents/ 下的所有智能体。
+        """自动发现并注册 yuxi/agents/buildin/ 下的所有智能体。
 
-        遍历 src/agents/ 目录下的所有子文件夹，如果子文件夹包含 __init__.py，
+        遍历 yuxi/agents/buildin/ 目录下的所有子文件夹，如果子文件夹包含 __init__.py，
         则尝试从中导入 BaseAgent 的子类并注册。(使用自动导入的方式，支持私有agent)
         """
         # 获取 agents 目录的路径
@@ -58,7 +58,7 @@ def auto_discover_agents(self):
         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":
+            if not item.is_dir() or item.name.startswith("_"):
                 continue
 
             # 检查是否有 __init__.py 文件
@@ -69,7 +69,7 @@ def auto_discover_agents(self):
 
             # 尝试导入模块
             try:
-                module_name = f"src.agents.{item.name}"
+                module_name = f"yuxi.agents.buildin.{item.name}"
                 module = importlib.import_module(module_name)
 
                 # 查找模块中所有 BaseAgent 的子类

src/agents/__init__.py …/package/yuxi/agents/buildin/__init__.pysrc/agents/__init__.py renamed to backend/package/yuxi/agents/buildin/__init__.py src/agents/__init__.py renamed to backend/package/yuxi/agents/buildin/__init__.py

@@ -6,15 +6,15 @@
     TodoListMiddleware,
 )
 
-from src.agents.common import BaseAgent, load_chat_model
-from src.agents.common.backends import create_agent_composite_backend
-from src.agents.common.middlewares import (
+from yuxi.agents.common import BaseAgent, load_chat_model
+from yuxi.agents.common.backends import create_agent_composite_backend
+from yuxi.agents.common.middlewares import (
     RuntimeConfigMiddleware,
     save_attachments_to_fs,
 )
-from src.agents.common.middlewares.knowledge_base_middleware import KnowledgeBaseMiddleware
-from src.agents.common.middlewares.skills_middleware import SkillsMiddleware
-from src.services.mcp_service import get_tools_from_all_servers
+from yuxi.agents.common.middlewares.knowledge_base_middleware import KnowledgeBaseMiddleware
+from yuxi.agents.common.middlewares.skills_middleware import SkillsMiddleware
+from yuxi.services.mcp_service import get_tools_from_all_servers
 
 
 def _create_fs_backend(rt):