From fa2497e439b5a80cf6d80cb72582f25ad0b0e848 Mon Sep 17 00:00:00 2001 From: Wenjie Zhang Date: Sun, 17 May 2026 13:47:43 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E6=9B=B4=E6=96=B0=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E5=92=8C=E6=9D=83=E9=99=90=E9=80=BB=E8=BE=91=EF=BC=8C?= =?UTF-8?q?=E7=A7=BB=E9=99=A4=E8=BF=87=E6=97=B6=E5=8F=82=E6=95=B0=EF=BC=8C?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=94=A8=E6=88=B7=E4=BF=A1=E6=81=AF=E7=BB=84?= =?UTF-8?q?=E4=BB=B6=E7=9A=84=E4=B8=8B=E6=8B=89=E8=A7=A6=E5=8F=91=E6=96=B9?= =?UTF-8?q?=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- REFACTOR.md | 10 ++++++---- .../package/yuxi/agents/buildin/deep_agent/graph.py | 6 +++--- backend/package/yuxi/agents/toolkits/buildin/tools.py | 2 +- backend/package/yuxi/config/app.py | 7 ------- web/src/components/UserInfoComponent.vue | 2 +- 5 files changed, 11 insertions(+), 16 deletions(-) diff --git a/REFACTOR.md b/REFACTOR.md index e4fd1cc4..01a885ec 100644 --- a/REFACTOR.md +++ b/REFACTOR.md @@ -14,10 +14,12 @@ # 待办事项 - [x] 移除所有对于 v1 的模型的代码的支持、移除所有对于 legacy 参数的支持 -- [ ] 新建一个知识库类型 "enhanced" （名称待定）整体上使用类似于 当前 milvus 的逻辑，但是接口上仅使用新的字段 - 1. 文件上传这里就是 base 来管理 - 2。 然后支持配置 parser_config，chunk_config +- [x] 移除 lightrag +- [ ] 新增图谱构建，支持自定义 Schema、支持自定义并发数，知识库与向量检索解耦 +- [ ] 知识图谱抽取要求支持并发处理 -- [ ] Agent 的 user_id 使用的有歧义 +## 权限部分 +- [ ] Agent 的 user_id 使用的有歧义，从数据库表到代码中都修改为统一使用 yuxi_id 来代替 +- [ ] 权限新增一个 guest 的预设字段，暂无任何权限 - [ ] department 的 id 也不能使用那个索引的 id 来使用了，应该是一个独立的 dept_id，需要确认 \ No newline at end of file diff --git a/backend/package/yuxi/agents/buildin/deep_agent/graph.py b/backend/package/yuxi/agents/buildin/deep_agent/graph.py index 3050b9ec..ca3c6ed4 100644 --- a/backend/package/yuxi/agents/buildin/deep_agent/graph.py +++ b/backend/package/yuxi/agents/buildin/deep_agent/graph.py @@ -1,3 +1,5 @@ +import os + from deepagents.middleware.filesystem import FilesystemMiddleware from deepagents.middleware.patch_tool_calls import PatchToolCallsMiddleware from deepagents.middleware.subagents import SubAgentMiddleware @@ -37,10 +39,8 @@ class DeepAgent(BaseAgent): async def get_tools(self): """返回 Deep Agent 的专用工具""" - from yuxi import config - tools = [] - if config.enable_web_search: + if os.getenv("TAVILY_API_KEY"): tavily = _create_tavily_search() if tavily: tools.append(tavily) diff --git a/backend/package/yuxi/agents/toolkits/buildin/tools.py b/backend/package/yuxi/agents/toolkits/buildin/tools.py index 545766ab..12f6eed7 100644 --- a/backend/package/yuxi/agents/toolkits/buildin/tools.py +++ b/backend/package/yuxi/agents/toolkits/buildin/tools.py @@ -56,7 +56,7 @@ def _register_tavily_tool(): # 模块加载时注册 -if config.enable_web_search: +if os.getenv("TAVILY_API_KEY"): try: _register_tavily_tool() except Exception as e: diff --git a/backend/package/yuxi/config/app.py b/backend/package/yuxi/config/app.py index fb335852..5d7947dd 100644 --- a/backend/package/yuxi/config/app.py +++ b/backend/package/yuxi/config/app.py @@ -17,13 +17,9 @@ class Config(BaseModel): """应用配置类。""" save_dir: str = Field(default="saves", description="保存目录") - model_dir: str = Field(default="", description="本地模型目录") - enable_reranker: bool = Field(default=False, description="是否开启重排序") enable_content_guard: bool = Field(default=False, description="是否启用内容审查") enable_content_guard_llm: bool = Field(default=False, description="是否启用LLM内容审查") - enable_web_search: bool = Field(default=False, description="是否启用网络搜索") - default_model: str = Field( default="siliconflow-cn:Pro/MiniMaxAI/MiniMax-M2.5", description="默认对话模型", @@ -92,9 +88,6 @@ class Config(BaseModel): logger.error(f"Failed to load config from {self._config_file}: {e}") def _handle_environment(self) -> None: - if os.getenv("TAVILY_API_KEY"): - self.enable_web_search = True - self.sandbox_provider = (os.getenv("SANDBOX_PROVIDER") or self.sandbox_provider or "provisioner").strip() self.sandbox_provisioner_url = ( os.getenv("SANDBOX_PROVISIONER_URL") or self.sandbox_provisioner_url or "http://sandbox-provisioner:8002" diff --git a/web/src/components/UserInfoComponent.vue b/web/src/components/UserInfoComponent.vue index afd757a8..5fa54963 100644 --- a/web/src/components/UserInfoComponent.vue +++ b/web/src/components/UserInfoComponent.vue @@ -1,6 +1,6 @@