AstrBot 3.5.6__py3-none-any.whl → 4.7.0__py3-none-any.whl

astrbot/dashboard/routes/conversation.py

@@ -1,10 +1,13 @@
-import traceback
 import json
-from .route import Route, Response, RouteContext
-from astrbot.core import logger
+import traceback
+
 from quart import request
-from astrbot.core.db import BaseDatabase
+
+from astrbot.core import logger
 from astrbot.core.core_lifecycle import AstrBotCoreLifecycle
+from astrbot.core.db import BaseDatabase
+
+from .route import Response, Route, RouteContext
 
 
 class ConversationRoute(Route):
@@ -29,6 +32,8 @@ class ConversationRoute(Route):
             ),
         }
         self.db_helper = db_helper
+        self.conv_mgr = core_lifecycle.conversation_manager
+        self.core_lifecycle = core_lifecycle
         self.register_routes()
 
     async def list_conversations(self):
@@ -53,17 +58,16 @@ class ConversationRoute(Route):
                 exclude_platforms.split(",") if exclude_platforms else []
             )
 
-            # 限制页面大小，防止请求过大数据
-            if page < 1:
-                page = 1
+            page = max(page, 1)
             if page_size < 1:
                 page_size = 20
-            if page_size > 100:
-                page_size = 100
+            page_size = min(page_size, 100)
 
-            # 使用数据库的分页方法获取会话列表和总数，传入筛选条件
             try:
-                conversations, total_count = self.db_helper.get_filtered_conversations(
+                (
+                    conversations,
+                    total_count,
+                ) = await self.conv_mgr.get_filtered_conversations(
                     page=page,
                     page_size=page_size,
                     platforms=platform_list,
@@ -73,8 +77,8 @@ class ConversationRoute(Route):
                     exclude_platforms=exclude_platform_list,
                 )
             except Exception as e:
-                logger.error(f"数据库查询出错: {str(e)}\n{traceback.format_exc()}")
-                return Response().error(f"数据库查询出错: {str(e)}").__dict__
+                logger.error(f"数据库查询出错: {e!s}\n{traceback.format_exc()}")
+                return Response().error(f"数据库查询出错: {e!s}").__dict__
 
             # 计算总页数
             total_pages = (
@@ -93,9 +97,9 @@ class ConversationRoute(Route):
             return Response().ok(result).__dict__
 
         except Exception as e:
-            error_msg = f"获取对话列表失败: {str(e)}\n{traceback.format_exc()}"
+            error_msg = f"获取对话列表失败: {e!s}\n{traceback.format_exc()}"
             logger.error(error_msg)
-            return Response().error(f"获取对话列表失败: {str(e)}").__dict__
+            return Response().error(f"获取对话列表失败: {e!s}").__dict__
 
     async def get_conv_detail(self):
         """获取指定对话详情（通过POST请求）"""
@@ -107,7 +111,10 @@ class ConversationRoute(Route):
             if not user_id or not cid:
                 return Response().error("缺少必要参数: user_id 和 cid").__dict__
 
-            conversation = self.db_helper.get_conversation_by_user_id(user_id, cid)
+            conversation = await self.conv_mgr.get_conversation(
+                unified_msg_origin=user_id,
+                conversation_id=cid,
+            )
             if not conversation:
                 return Response().error("对话不存在").__dict__
 
@@ -122,14 +129,14 @@ class ConversationRoute(Route):
                         "history": conversation.history,
                         "created_at": conversation.created_at,
                         "updated_at": conversation.updated_at,
-                    }
+                    },
                 )
                 .__dict__
             )
 
         except Exception as e:
-            logger.error(f"获取对话详情失败: {str(e)}\n{traceback.format_exc()}")
-            return Response().error(f"获取对话详情失败: {str(e)}").__dict__
+            logger.error(f"获取对话详情失败: {e!s}\n{traceback.format_exc()}")
+            return Response().error(f"获取对话详情失败: {e!s}").__dict__
 
     async def upd_conv(self):
         """更新对话信息(标题和角色ID)"""
@@ -142,39 +149,93 @@ class ConversationRoute(Route):
 
             if not user_id or not cid:
                 return Response().error("缺少必要参数: user_id 和 cid").__dict__
-            conversation = self.db_helper.get_conversation_by_user_id(user_id, cid)
+            conversation = await self.conv_mgr.get_conversation(
+                unified_msg_origin=user_id,
+                conversation_id=cid,
+            )
             if not conversation:
                 return Response().error("对话不存在").__dict__
-            if title is not None:
-                self.db_helper.update_conversation_title(user_id, cid, title)
-            if persona_id is not None:
-                self.db_helper.update_conversation_persona_id(user_id, cid, persona_id)
-
+            if title is not None or persona_id is not None:
+                await self.conv_mgr.update_conversation(
+                    unified_msg_origin=user_id,
+                    conversation_id=cid,
+                    title=title,
+                    persona_id=persona_id,
+                )
             return Response().ok({"message": "对话信息更新成功"}).__dict__
 
         except Exception as e:
-            logger.error(f"更新对话信息失败: {str(e)}\n{traceback.format_exc()}")
-            return Response().error(f"更新对话信息失败: {str(e)}").__dict__
+            logger.error(f"更新对话信息失败: {e!s}\n{traceback.format_exc()}")
+            return Response().error(f"更新对话信息失败: {e!s}").__dict__
 
     async def del_conv(self):
         """删除对话"""
         try:
             data = await request.get_json()
+
+            # 检查是否是批量删除
+            if "conversations" in data:
+                # 批量删除
+                conversations = data.get("conversations", [])
+                if not conversations:
+                    return (
+                        Response().error("批量删除时conversations参数不能为空").__dict__
+                    )
+
+                deleted_count = 0
+                failed_items = []
+
+                for conv in conversations:
+                    user_id = conv.get("user_id")
+                    cid = conv.get("cid")
+
+                    if not user_id or not cid:
+                        failed_items.append(
+                            f"user_id:{user_id}, cid:{cid} - 缺少必要参数",
+                        )
+                        continue
+
+                    try:
+                        await self.core_lifecycle.conversation_manager.delete_conversation(
+                            unified_msg_origin=user_id,
+                            conversation_id=cid,
+                        )
+                        deleted_count += 1
+                    except Exception as e:
+                        failed_items.append(f"user_id:{user_id}, cid:{cid} - {e!s}")
+
+                message = f"成功删除 {deleted_count} 个对话"
+                if failed_items:
+                    message += f"，失败 {len(failed_items)} 个"
+
+                return (
+                    Response()
+                    .ok(
+                        {
+                            "message": message,
+                            "deleted_count": deleted_count,
+                            "failed_count": len(failed_items),
+                            "failed_items": failed_items,
+                        },
+                    )
+                    .__dict__
+                )
+            # 单个删除
             user_id = data.get("user_id")
             cid = data.get("cid")
 
             if not user_id or not cid:
                 return Response().error("缺少必要参数: user_id 和 cid").__dict__
-            conversation = self.db_helper.get_conversation_by_user_id(user_id, cid)
-            if not conversation:
-                return Response().error("对话不存在").__dict__
-            self.db_helper.delete_conversation(user_id, cid)
 
+            await self.core_lifecycle.conversation_manager.delete_conversation(
+                unified_msg_origin=user_id,
+                conversation_id=cid,
+            )
             return Response().ok({"message": "对话删除成功"}).__dict__
 
         except Exception as e:
-            logger.error(f"删除对话失败: {str(e)}\n{traceback.format_exc()}")
-            return Response().error(f"删除对话失败: {str(e)}").__dict__
+            logger.error(f"删除对话失败: {e!s}\n{traceback.format_exc()}")
+            return Response().error(f"删除对话失败: {e!s}").__dict__
 
     async def update_history(self):
         """更新对话历史内容"""
@@ -202,14 +263,23 @@ class ConversationRoute(Route):
                     Response().error("history 必须是有效的 JSON 字符串或数组").__dict__
                 )
 
-            conversation = self.db_helper.get_conversation_by_user_id(user_id, cid)
+            conversation = await self.conv_mgr.get_conversation(
+                unified_msg_origin=user_id,
+                conversation_id=cid,
+            )
             if not conversation:
                 return Response().error("对话不存在").__dict__
 
-            self.db_helper.update_conversation(user_id, cid, history)
+            history = json.loads(history) if isinstance(history, str) else history
+
+            await self.conv_mgr.update_conversation(
+                unified_msg_origin=user_id,
+                conversation_id=cid,
+                history=history,
+            )
 
             return Response().ok({"message": "对话历史更新成功"}).__dict__
 
         except Exception as e:
-            logger.error(f"更新对话历史失败: {str(e)}\n{traceback.format_exc()}")
-            return Response().error(f"更新对话历史失败: {str(e)}").__dict__
+            logger.error(f"更新对话历史失败: {e!s}\n{traceback.format_exc()}")
+            return Response().error(f"更新对话历史失败: {e!s}").__dict__

astrbot/dashboard/routes/file.py

@@ -0,0 +1,26 @@
+from quart import abort, send_file
+
+from astrbot import logger
+from astrbot.core import file_token_service
+
+from .route import Route, RouteContext
+
+
+class FileRoute(Route):
+    def __init__(
+        self,
+        context: RouteContext,
+    ) -> None:
+        super().__init__(context)
+        self.routes = {
+            "/file/<file_token>": ("GET", self.serve_file),
+        }
+        self.register_routes()
+
+    async def serve_file(self, file_token: str):
+        try:
+            file_path = await file_token_service.handle_file(file_token)
+            return await send_file(file_path)
+        except (FileNotFoundError, KeyError) as e:
+            logger.warning(str(e))
+            return abort(404)