mirror of
https://github.com/fastapiadmin/FastapiAdmin.git
synced 2026-09-29 23:44:41 +00:00
fix(mcp): 优化智能对话流式响应并增强异常处理
- 确保智能对话流式响应返回字节串,防止类型错误 - 在流式响应异常时返回友好错误信息,避免连接中断 - WebSocket聊天控制器中添加异常处理,保证异常信息反馈客户端 - WebSocket连接异常后使用finally确保连接正确关闭 refactor(resource): 统一资源接口返回HTTP URL路径 - 资源控制器新增Request参数,传递base_url实现URL转换 - 资源服务中所有路径替换为返回基于base_url的HTTP URL路径 - 文件信息、目录列表、文件上传下载接口均返回HTTP URL,提升前端友好度 - 移除递归参数及相关逻辑,简化目录统计实现 fix(database): 简化数据库依赖生成器,避免不必要的事务开启 - dependencies中db_getter取消多余事务管理,仅yield数据库会话 style(router_class): 优化操作日志路由异常处理,去除多余事务 - 简化操作日志写入流程,移除嵌套事务开启,提升代码可读性 refactor(initialize): 优化数据库初始化逻辑并增强日志与事务管理 - 初始化数据插入前打印日志,插入后标记是否需要提交事务 - PostgreSQL序列更新拆分成单独方法,针对有id字段的表执行 - 增加完整的异常捕获和回滚,保证初始化失败时事务回滚 - 读取初始化数据文件时增加日志及异常处理 fix(ai_client): 修正AI客户端HTTP连接管理及异常处理 - 使用自定义httpx AsyncClient替代默认客户端,确保连接配置 - 增加关闭客户端连接方法,避免资源泄露 - 流式响应时检查选择器内容有效性,提升稳定性 chore(cleanup): 移除MySQL快照SQL文件,保持仓库整洁 - 删除无用的SQL数据转储文件,减小仓库体积并维护清洁度
This commit is contained in:
@@ -26,19 +26,19 @@ from .service import ResourceService
|
||||
ResourceRouter = APIRouter(route_class=OperationLogRoute, prefix="/resource", tags=["资源管理"])
|
||||
|
||||
|
||||
@ResourceRouter.get("/list", summary="获取目录列表", description="获取指定目录的文件列表")
|
||||
@ResourceRouter.get("/list", summary="获取目录列表", description="获取指定目录下的文件和子目录列表")
|
||||
async def get_directory_list_controller(
|
||||
request: Request,
|
||||
path: Optional[str] = Query(None, description="目录路径"),
|
||||
recursive: bool = Query(False, description="递归获取"),
|
||||
include_hidden: bool = Query(False, description="包含隐藏文件"),
|
||||
include_hidden: bool = Query(False, description="是否包含隐藏文件"),
|
||||
auth: AuthSchema = Depends(AuthPermission(permissions=["resource:file:query"]))
|
||||
) -> JSONResponse:
|
||||
"""获取目录列表"""
|
||||
result_dict = await ResourceService.get_directory_list_service(
|
||||
auth=auth,
|
||||
path=path,
|
||||
recursive=recursive,
|
||||
include_hidden=include_hidden
|
||||
include_hidden=include_hidden,
|
||||
base_url=str(request.base_url)
|
||||
)
|
||||
logger.info(f"获取目录列表成功: {path or 'default'}")
|
||||
return SuccessResponse(data=result_dict, msg="获取目录列表成功")
|
||||
@@ -46,11 +46,16 @@ async def get_directory_list_controller(
|
||||
|
||||
@ResourceRouter.post("/search", summary="搜索资源", description="根据条件搜索资源")
|
||||
async def search_resources_controller(
|
||||
request: Request,
|
||||
search: ResourceSearchSchema,
|
||||
auth: AuthSchema = Depends(AuthPermission(permissions=["resource:file:search"]))
|
||||
) -> JSONResponse:
|
||||
"""搜索资源"""
|
||||
result_list = await ResourceService.search_resources_service(auth=auth, search=search)
|
||||
result_list = await ResourceService.search_resources_service(
|
||||
auth=auth,
|
||||
search=search,
|
||||
base_url=str(request.base_url)
|
||||
)
|
||||
logger.info(f"搜索资源成功,找到 {len(result_list)} 个结果")
|
||||
return SuccessResponse(data=result_list, msg=f"搜索成功,找到 {len(result_list)} 个结果")
|
||||
|
||||
@@ -58,6 +63,7 @@ async def search_resources_controller(
|
||||
@ResourceRouter.post("/upload", summary="上传文件", description="上传文件到指定目录")
|
||||
async def upload_file_controller(
|
||||
file: UploadFile,
|
||||
request: Request,
|
||||
target_path: Optional[str] = Form(None, description="目标目录路径"),
|
||||
auth: AuthSchema = Depends(AuthPermission(permissions=["resource:file:upload"]))
|
||||
) -> JSONResponse:
|
||||
@@ -65,7 +71,8 @@ async def upload_file_controller(
|
||||
result_dict = await ResourceService.upload_file_service(
|
||||
auth=auth,
|
||||
file=file,
|
||||
target_path=target_path
|
||||
target_path=target_path,
|
||||
base_url=str(request.base_url)
|
||||
)
|
||||
logger.info(f"上传文件成功: {result_dict['filename']}")
|
||||
return SuccessResponse(data=result_dict, msg="上传文件成功")
|
||||
@@ -73,11 +80,16 @@ async def upload_file_controller(
|
||||
|
||||
@ResourceRouter.get("/download", summary="下载文件", description="下载指定文件")
|
||||
async def download_file_controller(
|
||||
request: Request,
|
||||
path: str = Query(..., description="文件路径"),
|
||||
auth: AuthSchema = Depends(AuthPermission(permissions=["resource:file:download"]))
|
||||
) -> FileResponse:
|
||||
"""下载文件"""
|
||||
file_path = await ResourceService.download_file_service(auth=auth, file_path=path)
|
||||
file_path = await ResourceService.download_file_service(
|
||||
auth=auth,
|
||||
file_path=path,
|
||||
base_url=str(request.base_url)
|
||||
)
|
||||
|
||||
# 获取文件名
|
||||
import os
|
||||
@@ -148,22 +160,31 @@ async def create_directory_controller(
|
||||
|
||||
@ResourceRouter.get("/stats", summary="获取资源统计", description="获取资源统计信息")
|
||||
async def get_resource_stats_controller(
|
||||
request: Request,
|
||||
auth: AuthSchema = Depends(AuthPermission(permissions=["resource:file:query"]))
|
||||
) -> JSONResponse:
|
||||
"""获取资源统计"""
|
||||
result_dict = await ResourceService.get_stats_service(auth=auth)
|
||||
result_dict = await ResourceService.get_stats_service(
|
||||
auth=auth,
|
||||
base_url=str(request.base_url)
|
||||
)
|
||||
logger.info("获取资源统计成功")
|
||||
return SuccessResponse(data=result_dict, msg="获取资源统计成功")
|
||||
|
||||
|
||||
@ResourceRouter.post("/export", summary="导出资源列表", description="导出资源列表")
|
||||
async def export_resource_list_controller(
|
||||
request: Request,
|
||||
search: ResourceSearchSchema,
|
||||
auth: AuthSchema = Depends(AuthPermission(permissions=["resource:file:export"]))
|
||||
) -> StreamingResponse:
|
||||
"""导出资源列表"""
|
||||
# 获取搜索结果
|
||||
result_list = await ResourceService.search_resources_service(auth=auth, search=search)
|
||||
result_list = await ResourceService.search_resources_service(
|
||||
auth=auth,
|
||||
search=search,
|
||||
base_url=str(request.base_url)
|
||||
)
|
||||
export_result = await ResourceService.export_resource_service(data_list=result_list)
|
||||
|
||||
logger.info("导出资源列表成功")
|
||||
|
||||
Reference in New Issue
Block a user