三次修改

src/common/message_repository.py

@@ -25,7 +25,7 @@ def _model_to_dict(instance: Base) -> Dict[str, Any]:
     return {col.name: getattr(instance, col.name) for col in instance.__table__.columns}
 
 
-def find_messages(
+async def find_messages(
     message_filter: dict[str, Any],
     sort: Optional[List[tuple[str, int]]] = None,
     limit: int = 0,
@@ -46,7 +46,7 @@ def find_messages(
         消息字典列表，如果出错则返回空列表。
     """
     try:
-        with get_db_session() as session:
+        async with get_db_session() as session:
             query = select(Messages)
 
             # 应用过滤器
@@ -96,7 +96,7 @@ def find_messages(
                     # 获取时间最早的 limit 条记录，已经是正序
                     query = query.order_by(Messages.time.asc()).limit(limit)
                     try:
-                        results = session.execute(query).scalars().all()
+                        results = (await session.execute(query)).scalars().all()
                     except Exception as e:
                         logger.error(f"执行earliest查询失败: {e}")
                         results = []
@@ -104,7 +104,7 @@ def find_messages(
                     # 获取时间最晚的 limit 条记录
                     query = query.order_by(Messages.time.desc()).limit(limit)
                     try:
-                        latest_results = session.execute(query).scalars().all()
+                        latest_results = (await session.execute(query)).scalars().all()
                         # 将结果按时间正序排列
                         results = sorted(latest_results, key=lambda msg: msg.time)
                     except Exception as e:
@@ -128,12 +128,12 @@ def find_messages(
                     if sort_terms:
                         query = query.order_by(*sort_terms)
                 try:
-                    results = session.execute(query).scalars().all()
+                    results = (await session.execute(query)).scalars().all()
                 except Exception as e:
                     logger.error(f"执行无限制查询失败: {e}")
                     results = []
 
-        return [_model_to_dict(msg) for msg in results]
+            return [_model_to_dict(msg) for msg in results]
     except Exception as e:
         log_message = (
             f"使用 SQLAlchemy 查找消息失败 (filter={message_filter}, sort={sort}, limit={limit}, limit_mode={limit_mode}): {e}\n"
@@ -143,7 +143,7 @@ def find_messages(
         return []
 
 
-def count_messages(message_filter: dict[str, Any]) -> int:
+async def count_messages(message_filter: dict[str, Any]) -> int:
     """
     根据提供的过滤器计算消息数量。
 
@@ -154,7 +154,7 @@ def count_messages(message_filter: dict[str, Any]) -> int:
         符合条件的消息数量，如果出错则返回 0。
     """
     try:
-        with get_db_session() as session:
+        async with get_db_session() as session:
             query = select(func.count(Messages.id))
 
             # 应用过滤器
@@ -192,7 +192,7 @@ def count_messages(message_filter: dict[str, Any]) -> int:
                 if conditions:
                     query = query.where(*conditions)
 
-            count = session.execute(query).scalar()
+            count = (await session.execute(query)).scalar()
             return count or 0
     except Exception as e:
         log_message = f"使用 SQLAlchemy 计数消息失败 (message_filter={message_filter}): {e}\n{traceback.format_exc()}"