diff --git a/src/config/official_configs.py b/src/config/official_configs.py index d0d866fe7..11b9353c7 100644 --- a/src/config/official_configs.py +++ b/src/config/official_configs.py @@ -923,6 +923,20 @@ class KokoroFlowChatterProactiveConfig(ValidatedConfigBase): enable_night_greeting: bool = Field( default=True, description="是否启用晚安问候 (例如: 22:00 - 23:00)" ) + + # 5. 勿扰时段：在这段时间内不会主动发起对话 + quiet_hours_start: str = Field( + default="23:00", description="勿扰时段开始时间，格式: HH:MM" + ) + quiet_hours_end: str = Field( + default="07:00", description="勿扰时段结束时间，格式: HH:MM" + ) + + # 6. 触发概率：每次检查时主动发起的概率 + trigger_probability: float = Field( + default=0.3, ge=0.0, le=1.0, + description="主动思考触发概率（0.0~1.0），用于避免过于频繁打扰" + ) class KokoroFlowChatterConfig(ValidatedConfigBase): diff --git a/src/plugins/built_in/kokoro_flow_chatter/config.py b/src/plugins/built_in/kokoro_flow_chatter/config.py index f567a0a2a..d5f836ec6 100644 --- a/src/plugins/built_in/kokoro_flow_chatter/config.py +++ b/src/plugins/built_in/kokoro_flow_chatter/config.py @@ -43,6 +43,15 @@ class ProactiveConfig: # 主动发起概率（0.0 ~ 1.0） trigger_probability: float = 0.3 + + # 关系门槛：最低好感度，达到此值才会主动关心 + min_affinity_for_proactive: float = 0.3 + + # 是否启用早安问候 + enable_morning_greeting: bool = True + + # 是否启用晚安问候 + enable_night_greeting: bool = True @dataclass @@ -178,6 +187,9 @@ def load_config() -> KokoroFlowChatterConfig: quiet_hours_start=getattr(pro_cfg, 'quiet_hours_start', "23:00"), quiet_hours_end=getattr(pro_cfg, 'quiet_hours_end', "07:00"), trigger_probability=getattr(pro_cfg, 'trigger_probability', 0.3), + min_affinity_for_proactive=getattr(pro_cfg, 'min_affinity_for_proactive', 0.3), + enable_morning_greeting=getattr(pro_cfg, 'enable_morning_greeting', True), + enable_night_greeting=getattr(pro_cfg, 'enable_night_greeting', True), ) # 提示词配置 diff --git a/src/plugins/built_in/kokoro_flow_chatter/proactive_thinker.py b/src/plugins/built_in/kokoro_flow_chatter/proactive_thinker.py index fbd95e13b..fffc1719b 100644 --- a/src/plugins/built_in/kokoro_flow_chatter/proactive_thinker.py +++ b/src/plugins/built_in/kokoro_flow_chatter/proactive_thinker.py @@ -73,22 +73,27 @@ class ProactiveThinker: } def _load_config(self) -> None: - """加载配置""" - # 默认配置 - self.waiting_check_interval = 15.0 # 等待检查间隔（秒） - self.proactive_check_interval = 300.0 # 主动思考检查间隔（秒） - self.silence_threshold = 7200 # 沉默阈值（秒） - self.min_proactive_interval = 1800 # 两次主动思考最小间隔（秒） - self.quiet_hours_start = "23:00" - self.quiet_hours_end = "07:00" + """加载配置 - 使用统一的配置系统""" + from .config import get_config - # 从全局配置读取 - if global_config and hasattr(global_config, 'kokoro_flow_chatter'): - kfc_config = global_config.kokoro_flow_chatter - if hasattr(kfc_config, 'proactive_thinking'): - proactive_cfg = kfc_config.proactive_thinking - self.silence_threshold = getattr(proactive_cfg, 'silence_threshold_seconds', 7200) - self.min_proactive_interval = getattr(proactive_cfg, 'min_interval_between_proactive', 1800) + config = get_config() + proactive_cfg = config.proactive + + # 等待检查间隔（秒） + self.waiting_check_interval = 15.0 + # 主动思考检查间隔（秒） + self.proactive_check_interval = 300.0 + + # 从配置读取主动思考相关设置 + self.proactive_enabled = proactive_cfg.enabled + self.silence_threshold = proactive_cfg.silence_threshold_seconds + self.min_proactive_interval = proactive_cfg.min_interval_between_proactive + self.quiet_hours_start = proactive_cfg.quiet_hours_start + self.quiet_hours_end = proactive_cfg.quiet_hours_end + self.trigger_probability = proactive_cfg.trigger_probability + self.min_affinity_for_proactive = proactive_cfg.min_affinity_for_proactive + self.enable_morning_greeting = proactive_cfg.enable_morning_greeting + self.enable_night_greeting = proactive_cfg.enable_night_greeting async def start(self) -> None: """启动主动思考器""" @@ -98,7 +103,7 @@ class ProactiveThinker: self._running = True - # 注册等待检查任务 + # 注册等待检查任务（始终启用，用于处理等待中的 Session） self._waiting_schedule_id = await unified_scheduler.create_schedule( callback=self._check_waiting_sessions, trigger_type=TriggerType.TIME, @@ -109,18 +114,20 @@ class ProactiveThinker: timeout=60.0, ) - # 注册主动思考检查任务 - self._proactive_schedule_id = await unified_scheduler.create_schedule( - callback=self._check_proactive_sessions, - trigger_type=TriggerType.TIME, - trigger_config={"delay_seconds": self.proactive_check_interval}, - is_recurring=True, - task_name=self.TASK_PROACTIVE_CHECK, - force_overwrite=True, - timeout=120.0, - ) - - logger.info("[ProactiveThinker] 已启动") + # 注册主动思考检查任务（仅在启用时注册） + if self.proactive_enabled: + self._proactive_schedule_id = await unified_scheduler.create_schedule( + callback=self._check_proactive_sessions, + trigger_type=TriggerType.TIME, + trigger_config={"delay_seconds": self.proactive_check_interval}, + is_recurring=True, + task_name=self.TASK_PROACTIVE_CHECK, + force_overwrite=True, + timeout=120.0, + ) + logger.info("[ProactiveThinker] 已启动（主动思考已启用）") + else: + logger.info("[ProactiveThinker] 已启动（主动思考已禁用）") async def stop(self) -> None: """停止主动思考器""" @@ -531,7 +538,7 @@ class ProactiveThinker: return None # 概率触发（避免每次检查都触发） - if random.random() > 0.3: # 30% 概率 + if random.random() > self.trigger_probability: return None silence_hours = silence_duration / 3600 diff --git a/template/bot_config_template.toml b/template/bot_config_template.toml index 88115087d..f8e1e3cb6 100644 --- a/template/bot_config_template.toml +++ b/template/bot_config_template.toml @@ -1,5 +1,5 @@ [inner] -version = "7.9.3" +version = "7.9.4" #----以下是给开发人员阅读的，如果你只是部署了MoFox-Bot，不需要阅读---- #如果你想要修改配置文件，请递增version的值 @@ -673,3 +673,10 @@ min_interval_between_proactive = 1800 # 两次主动思考之间的最小间隔 # 格式为 "HH:MM"，使用24小时制。如果 start > end，表示跨越午夜（如 23:00 到 07:00）。 quiet_hours_start = "23:00" # 勿扰开始时间 quiet_hours_end = "07:00" # 勿扰结束时间 + +# 5. 触发概率：每次检查时主动发起的概率，用于避免过于频繁打扰。 +trigger_probability = 0.3 # 0.0~1.0，默认30%概率 + +# 6. 自然问候：在特定的时间，她会像朋友一样送上问候。 +enable_morning_greeting = true # 是否启用早安问候 (例如: 8:00 - 9:00) +enable_night_greeting = true # 是否启用晚安问候 (例如: 22:00 - 23:00)