Skip to content

Commit 100f9da

Browse files
committed
style: 统一代码格式并修复格式问题
1 parent 2126f45 commit 100f9da

File tree

12 files changed

+32
-34
lines changed

12 files changed

+32
-34
lines changed

server/routers/chat_router.py

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ async def save_partial_message(conv_mgr, thread_id, full_msg=None, error_message
228228
extra_metadata = {
229229
"error_type": error_type,
230230
"is_error": True,
231-
"error_message": error_message or f"发生错误: {error_type}"
231+
"error_message": error_message or f"发生错误: {error_type}",
232232
}
233233
if full_msg:
234234
# 保存部分生成的AI消息
@@ -522,10 +522,7 @@ async def stream_messages():
522522
# Input guard
523523
if conf.enable_content_guard and await content_guard.check(query):
524524
yield make_chunk(
525-
status="error",
526-
error_type="content_guard_blocked",
527-
error_message="输入内容包含敏感词",
528-
meta=meta
525+
status="error", error_type="content_guard_blocked", error_message="输入内容包含敏感词", meta=meta
529526
)
530527
return
531528

@@ -537,7 +534,7 @@ async def stream_messages():
537534
status="error",
538535
error_type="agent_error",
539536
error_message=f"智能体 {agent_id} 获取失败: {str(e)}",
540-
meta=meta
537+
meta=meta,
541538
)
542539
return
543540

@@ -679,12 +676,7 @@ async def stream_messages():
679676
error_type=error_type,
680677
)
681678

682-
yield make_chunk(
683-
status="error",
684-
error_type=error_type,
685-
error_message=error_msg,
686-
meta=meta
687-
)
679+
yield make_chunk(status="error", error_type=error_type, error_message=error_msg, meta=meta)
688680

689681
return StreamingResponse(stream_messages(), media_type="application/json")
690682

@@ -1043,7 +1035,9 @@ async def create_thread(
10431035

10441036

10451037
@chat.get("/threads", response_model=list[ThreadResponse])
1046-
async def list_threads(agent_id: str, db: AsyncSession = Depends(get_db), current_user: User = Depends(get_required_user)):
1038+
async def list_threads(
1039+
agent_id: str, db: AsyncSession = Depends(get_db), current_user: User = Depends(get_required_user)
1040+
):
10471041
"""获取用户的所有对话线程 (使用新存储系统)"""
10481042
assert agent_id, "agent_id 不能为空"
10491043

@@ -1071,7 +1065,9 @@ async def list_threads(agent_id: str, db: AsyncSession = Depends(get_db), curren
10711065

10721066

10731067
@chat.delete("/thread/{thread_id}")
1074-
async def delete_thread(thread_id: str, db: AsyncSession = Depends(get_db), current_user: User = Depends(get_required_user)):
1068+
async def delete_thread(
1069+
thread_id: str, db: AsyncSession = Depends(get_db), current_user: User = Depends(get_required_user)
1070+
):
10751071
"""删除对话线程 (使用新存储系统)"""
10761072
# Use new storage system
10771073
conv_manager = ConversationManager(db)
@@ -1288,7 +1284,9 @@ async def get_message_feedback(
12881284
"""Get feedback status for a specific message (for current user)"""
12891285
try:
12901286
# Get user's feedback for this message
1291-
feedback_result = await db.execute(select(MessageFeedback).filter_by(message_id=message_id, user_id=str(current_user.id)))
1287+
feedback_result = await db.execute(
1288+
select(MessageFeedback).filter_by(message_id=message_id, user_id=str(current_user.id))
1289+
)
12921290
feedback = feedback_result.scalar_one_or_none()
12931291

12941292
if not feedback:

server/routers/knowledge_router.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ async def update_database_info(
173173
name: str = Body(...),
174174
description: str = Body(...),
175175
llm_info: dict = Body(None),
176-
additional_params: dict = Body({}), # Now accepts a dict
176+
additional_params: dict = Body({}), # Now accepts a dict
177177
current_user: User = Depends(get_admin_user),
178178
):
179179
"""更新知识库信息"""
@@ -187,7 +187,7 @@ async def update_database_info(
187187
name,
188188
description,
189189
llm_info,
190-
additional_params=additional_params, # Pass the dict to the manager
190+
additional_params=additional_params, # Pass the dict to the manager
191191
)
192192
return {"message": "更新成功", "database": database}
193193
except Exception as e:

server/utils/auth_middleware.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ async def get_current_user(token: str | None = Depends(oauth2_scheme), db: Async
6060

6161
# 查找用户(异步版本)
6262
from sqlalchemy import select
63+
6364
result = await db.execute(select(User).filter(User.id == user_id))
6465
user = result.scalar_one_or_none()
6566
if user is None:
@@ -78,6 +79,7 @@ async def get_required_user(user: User | None = Depends(get_current_user)):
7879
)
7980
return user
8081

82+
8183
# 获取管理员用户
8284
async def get_admin_user(current_user: User = Depends(get_required_user)):
8385
if current_user.role not in ["admin", "superadmin"]:
@@ -87,6 +89,7 @@ async def get_admin_user(current_user: User = Depends(get_required_user)):
8789
)
8890
return current_user
8991

92+
9093
# 获取超级管理员用户
9194
async def get_superadmin_user(current_user: User = Depends(get_required_user)):
9295
if current_user.role != "superadmin":

src/agents/common/mcp.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
"""MCP Client setup and management for LangGraph ReAct Agent."""
2-
import os
32

3+
4+
import traceback
45
from collections.abc import Callable
56
from typing import Any, cast
6-
import traceback
77

88
from langchain_mcp_adapters.client import MultiServerMCPClient
99

10-
1110
from src.utils import logger
1211

1312
# Global MCP tools cache
@@ -37,6 +36,7 @@
3736
# 更多用法参考:https://xerrors.github.io/Yuxi-Know/latest/advanced/agents-config.html#内置工具与-mcp-集成
3837
}
3938

39+
4040
async def get_mcp_client(
4141
server_configs: dict[str, Any] | None = None,
4242
) -> MultiServerMCPClient | None:

src/agents/deep_agent/context.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44

55
from src.agents.common.context import BaseContext
66

7-
87
DEEP_PROMPT = """你是一位专家级研究员。你的工作是进行彻底的研究,然后撰写一份精美的报告。
98
109
你应该做的第一件事是把原始的用户问题写入 `question.txt`,以便你有一个记录。
@@ -90,6 +89,7 @@
9089
你可以使用一些工具。
9190
"""
9291

92+
9393
@dataclass
9494
class DeepContext(BaseContext):
9595
"""

src/agents/deep_agent/graph.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
11
"""Deep Agent - 基于create_deep_agent的深度分析智能体"""
22

33
from deepagents import create_deep_agent
4-
from langchain.agents.middleware import dynamic_prompt, ModelRequest
4+
from langchain.agents.middleware import ModelRequest, dynamic_prompt
55

66
from src.agents.common import BaseAgent, load_chat_model
77
from src.agents.common.middlewares import context_based_model, inject_attachment_context
88
from src.agents.common.tools import search
99

1010
from .prompts import DEEP_PROMPT
1111

12-
1312
search_tools = [search]
1413

1514

@@ -54,6 +53,7 @@ def context_aware_prompt(request: ModelRequest) -> str:
5453
"""从 runtime context 动态生成系统提示词"""
5554
return DEEP_PROMPT + "\n\n\n" + request.runtime.context.system_prompt
5655

56+
5757
class DeepAgent(BaseAgent):
5858
name = "深度分析智能体"
5959
description = "具备规划、深度分析和子智能体协作能力的智能体,可以处理复杂的多步骤任务"

src/agents/deep_agent/prompts.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
DEEP_PROMPT = """你是一位专家级研究员。你的工作是进行彻底的研究,然后撰写一份精美的报告。
32
43
你应该做的第一件事是把原始的用户问题写入 `question.txt`,以便你有一个记录。
@@ -82,4 +81,4 @@
8281
</report_instructions>
8382
8483
你可以使用一些工具。
85-
"""
84+
"""

src/agents/reporter/graph.py

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,7 @@
66
from src.agents.common.toolkits.mysql import get_mysql_tools
77
from src.utils import logger
88

9-
_mcp_servers = {
10-
"mcp-server-chart": {
11-
"command": "npx",
12-
"args": ["-y", "@antv/mcp-server-chart"],
13-
"transport": "stdio"
14-
}
15-
}
9+
_mcp_servers = {"mcp-server-chart": {"command": "npx", "args": ["-y", "@antv/mcp-server-chart"], "transport": "stdio"}}
1610

1711

1812
class SqlReporterAgent(BaseAgent):

src/config/static/models.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ class EmbedModelInfo(BaseModel):
3131
api_key: str = Field(..., description="API Key 或环境变量名")
3232
model_id: str | None = Field(None, description="可选的模型 ID")
3333

34+
3435
class RerankerInfo(BaseModel):
3536
"""重排序模型配置"""
3637

src/knowledge/implementations/milvus.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -164,6 +164,7 @@ def _get_async_embedding(self, embed_info: dict):
164164
# 检查是否有 model_id 字段,优先使用 select_embedding_model
165165
if embed_info and "model_id" in embed_info:
166166
from src.models.embed import select_embedding_model
167+
167168
return select_embedding_model(embed_info["model_id"])
168169

169170
# 使用原有的逻辑(兼容模式))

0 commit comments

Comments
 (0)