diff --git a/src/chat/affinity_flow/interest_scoring.py b/src/chat/affinity_flow/interest_scoring.py index 037806a34..bc404c70b 100644 --- a/src/chat/affinity_flow/interest_scoring.py +++ b/src/chat/affinity_flow/interest_scoring.py @@ -35,8 +35,8 @@ class InterestScoringSystem: # 连续不回复概率提升 self.no_reply_count = 0 - self.max_no_reply_count = 5 - self.probability_boost_per_no_reply = 0.15 # 每次不回复增加15%概率 + self.max_no_reply_count = 15 + self.probability_boost_per_no_reply = 0.01 # 每次不回复增加15%概率 # 用户关系数据 self.user_relationships: Dict[str, float] = {} # user_id -> relationship_score @@ -148,7 +148,7 @@ class InterestScoringSystem: logger.debug(f" 🔢 匹配详情: {match_result.match_scores}") # 返回匹配分数，考虑置信度 - final_score = match_result.overall_score * match_result.confidence + final_score = match_result.overall_score * 1.15 * match_result.confidence logger.debug(f"⚖️ 最终分数(总分×置信度): {final_score:.3f}") return final_score else: @@ -226,7 +226,7 @@ class InterestScoringSystem: return 0.0 if msg.is_mentioned or (bot_nickname and bot_nickname in msg.processed_plain_text): - return 1.0 + return 3.0 return 0.0 @@ -258,6 +258,7 @@ class InterestScoringSystem: logger.debug(f" 🎯 有效阈值: {effective_threshold:.3f}") # 做出决策 + score.total_score = score.total_score * 1 should_reply = score.total_score >= effective_threshold decision = "✅ 应该回复" if should_reply else "❌ 不回复" diff --git a/src/chat/interest_system/bot_interest_manager.py b/src/chat/interest_system/bot_interest_manager.py index 520bf9033..2c98c8bd2 100644 --- a/src/chat/interest_system/bot_interest_manager.py +++ b/src/chat/interest_system/bot_interest_manager.py @@ -611,6 +611,19 @@ class BotInterestManager: logger.info("✅ 兴趣标签已成功保存到数据库") + # 验证保存是否成功 + with get_db_session() as session: + saved_record = session.query(DBBotPersonalityInterests).filter( + DBBotPersonalityInterests.personality_id == interests.personality_id + ).first() + session.commit() + if saved_record: + logger.info(f"✅ 验证成功：数据库中存在personality_id为 {interests.personality_id} 的记录") + logger.info(f" 版本: {saved_record.version}") + logger.info(f" 最后更新: {saved_record.last_updated}") + else: + logger.error(f"❌ 验证失败：数据库中未找到personality_id为 {interests.personality_id} 的记录") + except Exception as e: logger.error(f"❌ 保存兴趣标签到数据库失败: {e}") logger.error("🔍 错误详情:") diff --git a/src/chat/message_receive/bot.py b/src/chat/message_receive/bot.py index 025139d8a..421dc3113 100644 --- a/src/chat/message_receive/bot.py +++ b/src/chat/message_receive/bot.py @@ -478,7 +478,17 @@ class ChatBot: template_group_name = None async def preprocess(): - # 使用消息管理器处理消息 + # 存储消息到数据库 + from .storage import MessageStorage + + try: + await MessageStorage.store_message(message, message.chat_stream) + logger.debug(f"消息已存储到数据库: {message.message_info.message_id}") + except Exception as e: + logger.error(f"存储消息到数据库失败: {e}") + traceback.print_exc() + + # 使用消息管理器处理消息（保持原有功能） from src.common.data_models.database_data_model import DatabaseMessages # 创建数据库消息对象 diff --git a/src/chat/message_receive/storage.py b/src/chat/message_receive/storage.py index 025171510..57938cd43 100644 --- a/src/chat/message_receive/storage.py +++ b/src/chat/message_receive/storage.py @@ -174,8 +174,6 @@ class MessageStorage: await session.execute( update(Messages).where(Messages.id == matched_message.id).values(message_id=qq_message_id) ) - await session.commit() - # 会在上下文管理器中自动调用 logger.debug(f"更新消息ID成功: {matched_message.message_id} -> {qq_message_id}") else: logger.warning(f"未找到匹配的消息记录: {mmc_message_id}") @@ -211,10 +209,7 @@ class MessageStorage: select(Images).where(Images.description == description).order_by(desc(Images.timestamp)) ) ).scalar() - if image_record: - new_text += f"[picid:{image_record.image_id}]" - else: - new_text += match.group(0) + return f"[picid:{image_record.image_id}]" if image_record else match.group(0) except Exception: new_text += match.group(0) last_end = match.end() diff --git a/src/chat/planner_actions/plan_filter.py b/src/chat/planner_actions/plan_filter.py index 6aaefba18..4981ecfc0 100644 --- a/src/chat/planner_actions/plan_filter.py +++ b/src/chat/planner_actions/plan_filter.py @@ -51,8 +51,11 @@ class PlanFilter: llm_content, _ = await self.planner_llm.generate_response_async(prompt=prompt) if llm_content: - logger.info(f"规划器原始返回: {llm_content}") - parsed_json = orjson.loads(repair_json(llm_content)) + logger.debug(f"墨墨在这里加了日志 -> LLM a原始返回: {llm_content}") + try: + parsed_json = orjson.loads(repair_json(llm_content)) + except orjson.JSONDecodeError: + prased_json = {"action": "no_action", "reason": "返回内容无法解析为JSON"} logger.debug(f"墨墨在这里加了日志 -> 解析后的 JSON: {parsed_json}") if isinstance(parsed_json, dict): diff --git a/src/chat/planner_actions/planner_prompts.py b/src/chat/planner_actions/planner_prompts.py index 43aa60d1f..e4b87bd28 100644 --- a/src/chat/planner_actions/planner_prompts.py +++ b/src/chat/planner_actions/planner_prompts.py @@ -41,6 +41,7 @@ def init_prompts(): 4. 如果用户明确要求了某个动作，请务必优先满足。 **如果可选动作中没有reply，请不要使用** +**反之如果可选动作中有reply，应尽量考虑使用，不过也要考虑当前情景** **可用动作:** {actions_before_now_block} diff --git a/src/common/database/sqlalchemy_models.py b/src/common/database/sqlalchemy_models.py index 38f9f4c25..cf6241c21 100644 --- a/src/common/database/sqlalchemy_models.py +++ b/src/common/database/sqlalchemy_models.py @@ -691,6 +691,7 @@ async def get_db_session() -> AsyncGenerator[AsyncSession, None]: raise RuntimeError("Database session not initialized") session = SessionLocal() yield session + #session.commit() except Exception: if session: await session.rollback() diff --git a/src/common/message_repository.py b/src/common/message_repository.py index 96714db1f..dc7b14d77 100644 --- a/src/common/message_repository.py +++ b/src/common/message_repository.py @@ -22,7 +22,12 @@ def _model_to_dict(instance: Base) -> Dict[str, Any]: """ 将 SQLAlchemy 模型实例转换为字典。 """ - return {col.name: getattr(instance, col.name) for col in instance.__table__.columns} + try: + return {col.name: getattr(instance, col.name) for col in instance.__table__.columns} + except Exception as e: + # 如果对象已经脱离会话，尝试从instance.__dict__中获取数据 + logger.warning(f"从数据库对象获取属性失败，尝试使用__dict__: {e}") + return {col.name: instance.__dict__.get(col.name) for col in instance.__table__.columns} async def find_messages( @@ -133,6 +138,7 @@ async def find_messages( logger.error(f"执行无限制查询失败: {e}") results = [] + # 在会话内将结果转换为字典，避免会话分离错误 return [_model_to_dict(msg) for msg in results] except Exception as e: log_message = (