fix: 修复神秘none bug以及ruff

This commit is contained in:
tcmofashi
2025-06-04 12:56:31 +08:00
parent 5880fe707e
commit aa56c3e1a3
7 changed files with 83 additions and 103 deletions

View File

@@ -131,8 +131,12 @@ class ExpressionLearner:
else:
raise ValueError(f"Invalid type: {type}")
# logger.info(f"开始学习{type_str}...")
learnt_expressions,chat_id = await self.learn_expression(type, num)
res = await self.learn_expression(type, num)
if res is None:
return []
learnt_expressions, chat_id = res
chat_stream = chat_manager.get_stream(chat_id)
if chat_stream.group_info:
group_name = chat_stream.group_info.group_name
@@ -140,7 +144,6 @@ class ExpressionLearner:
group_name = f"{chat_stream.user_info.user_nickname}的私聊"
learnt_expressions_str = ""
for _chat_id, situation, style in learnt_expressions:
learnt_expressions_str += f"{situation}->{style}\n"
logger.info(f"{group_name} 学习到{type_str}:\n{learnt_expressions_str}")
# learnt_expressions: List[(chat_id, situation, style)]
@@ -244,7 +247,7 @@ class ExpressionLearner:
expressions: List[Tuple[str, str, str]] = self.parse_expression_response(response, chat_id)
return expressions,chat_id
return expressions, chat_id
def parse_expression_response(self, response: str, chat_id: str) -> List[Tuple[str, str, str]]:
"""

View File

@@ -5,13 +5,11 @@ from src.config.config import global_config
import time
import traceback
from src.common.logger_manager import get_logger
from src.individuality.individuality import individuality
from src.chat.utils.prompt_builder import Prompt, global_prompt_manager
from src.chat.message_receive.chat_stream import chat_manager
from src.person_info.relationship_manager import relationship_manager
from .base_processor import BaseProcessor
from typing import List, Optional
from src.chat.heart_flow.observation.hfcloop_observation import HFCloopObservation
from typing import Dict
from src.chat.focus_chat.info.info_base import InfoBase
from src.chat.focus_chat.info.relation_info import RelationInfo

View File

@@ -8,7 +8,6 @@ from src.common.logger_manager import get_logger
from src.chat.heart_flow.utils_chat import get_chat_type_and_target_info
from src.manager.mood_manager import mood_manager
from src.chat.message_receive.chat_stream import ChatStream, chat_manager
from src.person_info.relationship_manager import relationship_manager
from src.chat.utils.info_catcher import info_catcher_manager
from src.chat.utils.timer_calculator import Timer
from src.chat.utils.prompt_builder import global_prompt_manager