From 87ce36b62ba3aaa44187c28264372017006295bf Mon Sep 17 00:00:00 2001
From: minecraft1024a <wwwww95915@qq.com>
Date: Sat, 4 Oct 2025 12:07:39 +0800
Subject: [PATCH] =?UTF-8?q?fix(express):=20=E4=BF=AE=E5=A4=8D=E5=BC=82?=
 =?UTF-8?q?=E6=AD=A5=E4=BC=9A=E8=AF=9D=E4=B8=AD=E9=94=99=E8=AF=AF=E7=9A=84?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=93=8D=E4=BD=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

在 `ExpressionLearner` 的 `decay` 方法中，`session.delete(expr)` 操作是同步的，但在异步会话（`AsyncSession`）上下文中应该使用 `await`。此更改修复了该问题，确保表达式能被正确地异步删除。
---
 src/chat/express/expression_learner.py | 33 ++++++++++++++++++--------
 1 file changed, 23 insertions(+), 10 deletions(-)

diff --git a/src/chat/express/expression_learner.py b/src/chat/express/expression_learner.py
index ed485175f..7c197a7d4 100644
--- a/src/chat/express/expression_learner.py
+++ b/src/chat/express/expression_learner.py
@@ -240,7 +240,7 @@ class ExpressionLearner:
 
                 if new_count <= 0.01:
                     # 如果count太小，删除这个表达方式
-                    session.delete(expr)
+                    await session.delete(expr)
                     await session.commit()
                     deleted_count += 1
                 else:
@@ -502,16 +502,29 @@ class ExpressionLearnerManager:
             return
 
         if os.path.exists(done_flag):
-            logger.info("表达方式JSON已迁移，无需重复迁移。")
-        else:
-            logger.info("开始迁移表达方式JSON到数据库...")
-            migrated_count = 0
+            logger.debug("表达方式JSON已迁移，无需重复迁移。")
+            return
 
-            for type in ["learnt_style", "learnt_grammar"]:
-                type_str = "style" if type == "learnt_style" else "grammar"
-                type_dir = os.path.join(base_dir, type)
-                if not os.path.exists(type_dir):
-                    logger.debug(f"目录不存在，跳过: {type_dir}")
+        logger.info("开始迁移表达方式JSON到数据库...")
+        migrated_count = 0
+
+        for type in ["learnt_style", "learnt_grammar"]:
+            type_str = "style" if type == "learnt_style" else "grammar"
+            type_dir = os.path.join(base_dir, type)
+            if not os.path.exists(type_dir):
+                logger.debug(f"目录不存在，跳过: {type_dir}")
+                continue
+
+            try:
+                chat_ids = os.listdir(type_dir)
+                logger.debug(f"在 {type_dir} 中找到 {len(chat_ids)} 个聊天ID目录")
+            except Exception as e:
+                logger.error(f"读取目录失败 {type_dir}: {e}")
+                continue
+
+            for chat_id in chat_ids:
+                expr_file = os.path.join(type_dir, chat_id, "expressions.json")
+                if not os.path.exists(expr_file):
                     continue
 
                 try: