重构日程管理模块，将原有的schedule_manager模块迁移至manager目录，并更新相关引用。同时优化了定时任务管理逻辑，确保基于日程的发送功能正常运作，改进了日志记录和活动处理机制(OK兄弟们全体目光向我看齐,看我看我,我是个sb)
This commit is contained in:
minecraft1024a
committed by
Windpicker-owo
Windpicker-owo
parent
1c7693cedf
commit
ebf6fc5c20
@@ -7,6 +7,7 @@ from typing import Dict, Any
|
||||
|
||||
from src.common.logger import get_logger
|
||||
from src.plugin_system.apis import llm_api, config_api
|
||||
from src.manager.schedule_manager import schedule_manager
|
||||
|
||||
# 导入工具模块
|
||||
import sys
|
||||
@@ -19,16 +20,16 @@ logger = get_logger('MaiZone-Scheduler')
|
||||
|
||||
|
||||
class ScheduleManager:
|
||||
"""定时任务管理器 - 负责定时发送说说"""
|
||||
"""定时任务管理器 - 根据日程表定时发送说说"""
|
||||
|
||||
def __init__(self, plugin):
|
||||
"""初始化定时任务管理器"""
|
||||
self.plugin = plugin
|
||||
self.is_running = False
|
||||
self.task = None
|
||||
self.last_send_times: Dict[str, float] = {} # 记录每个时间点的最后发送时间
|
||||
self.last_activity_hash = None # 记录上次处理的活动哈希，避免重复发送
|
||||
|
||||
logger.info("定时任务管理器初始化完成")
|
||||
logger.info("定时任务管理器初始化完成 - 将根据日程表发送说说")
|
||||
|
||||
async def start(self):
|
||||
"""启动定时任务"""
|
||||
@@ -38,7 +39,7 @@ class ScheduleManager:
|
||||
|
||||
self.is_running = True
|
||||
self.task = asyncio.create_task(self._schedule_loop())
|
||||
logger.info("定时发送说说任务已启动")
|
||||
logger.info("定时发送说说任务已启动 - 基于日程表")
|
||||
|
||||
async def stop(self):
|
||||
"""停止定时任务"""
|
||||
@@ -57,7 +58,7 @@ class ScheduleManager:
|
||||
logger.info("定时发送说说任务已停止")
|
||||
|
||||
async def _schedule_loop(self):
|
||||
"""定时任务主循环"""
|
||||
"""定时任务主循环 - 根据日程表检查活动"""
|
||||
while self.is_running:
|
||||
try:
|
||||
# 检查定时任务是否启用
|
||||
@@ -66,23 +67,25 @@ class ScheduleManager:
|
||||
await asyncio.sleep(60)
|
||||
continue
|
||||
|
||||
# 获取当前时间
|
||||
current_time = datetime.datetime.now().strftime("%H:%M")
|
||||
# 获取当前活动
|
||||
current_activity = schedule_manager.get_current_activity()
|
||||
|
||||
# 从插件配置中获取定时任务
|
||||
schedules = self.plugin.get_config("schedule.schedules", {})
|
||||
|
||||
if not schedules:
|
||||
logger.info("未找到有效的定时任务配置")
|
||||
await asyncio.sleep(60)
|
||||
continue
|
||||
if current_activity:
|
||||
# 生成当前活动的哈希以避免重复发送
|
||||
current_time = datetime.datetime.now().strftime("%Y-%m-%d %H:%M")
|
||||
activity_hash = f"{current_time}_{current_activity}"
|
||||
|
||||
# 检查是否已经为这个活动发送过说说
|
||||
if activity_hash != self.last_activity_hash:
|
||||
logger.info(f"检测到新的日程活动: {current_activity}")
|
||||
await self._execute_schedule_based_send(current_activity)
|
||||
self.last_activity_hash = activity_hash
|
||||
else:
|
||||
logger.debug(f"当前活动已处理过: {current_activity}")
|
||||
else:
|
||||
logger.debug("当前时间没有日程活动")
|
||||
|
||||
# 检查每个定时任务
|
||||
for time_str, topic in schedules.items():
|
||||
schedule = {"time": time_str, "topic": topic}
|
||||
await self._check_and_execute_schedule(schedule, current_time)
|
||||
|
||||
# 每分钟检查一次
|
||||
# 每5分钟检查一次，避免频繁检查
|
||||
await asyncio.sleep(60)
|
||||
|
||||
except asyncio.CancelledError:
|
||||
@@ -94,45 +97,18 @@ class ScheduleManager:
|
||||
# 出错后等待5分钟再重试
|
||||
await asyncio.sleep(300)
|
||||
|
||||
async def _check_and_execute_schedule(self, schedule: Dict[str, Any], current_time: str):
|
||||
"""检查并执行定时任务"""
|
||||
async def _execute_schedule_based_send(self, activity: str) -> bool:
|
||||
"""根据日程活动执行发送任务"""
|
||||
try:
|
||||
schedule_time = schedule.get("time", "")
|
||||
topic = schedule.get("topic", "")
|
||||
logger.info(f"根据日程活动生成说说: {activity}")
|
||||
|
||||
# 检查是否到达发送时间
|
||||
if current_time == schedule_time:
|
||||
# 避免同一分钟内重复发送
|
||||
last_send_time = self.last_send_times.get(schedule_time, 0)
|
||||
current_timestamp = time.time()
|
||||
|
||||
if current_timestamp - last_send_time > 60: # 超过1分钟才允许发送
|
||||
logger.info(f"定时任务触发: {schedule_time} - 主题: {topic}")
|
||||
self.last_send_times[schedule_time] = current_timestamp
|
||||
|
||||
# 执行发送任务
|
||||
success = await self._execute_scheduled_send(topic)
|
||||
|
||||
if success:
|
||||
logger.info(f"定时说说发送成功: {topic}")
|
||||
else:
|
||||
logger.error(f"定时说说发送失败: {topic}")
|
||||
else:
|
||||
logger.debug(f"跳过重复发送: {schedule_time}")
|
||||
|
||||
except Exception as e:
|
||||
logger.error(f"检查定时任务失败: {str(e)}")
|
||||
|
||||
async def _execute_scheduled_send(self, topic: str) -> bool:
|
||||
"""执行定时发送任务"""
|
||||
try:
|
||||
# 生成说说内容
|
||||
story = await self._generate_story_content(topic)
|
||||
# 生成基于活动的说说内容
|
||||
story = await self._generate_activity_story(activity)
|
||||
if not story:
|
||||
logger.error("生成定时说说内容失败")
|
||||
logger.error("生成活动相关说说内容失败")
|
||||
return False
|
||||
|
||||
logger.info(f"定时任务生成说说内容: '{story}'")
|
||||
logger.info(f"基于日程活动生成说说内容: '{story}'")
|
||||
|
||||
# 处理配图
|
||||
await self._handle_images(story)
|
||||
@@ -140,14 +116,19 @@ class ScheduleManager:
|
||||
# 发送说说
|
||||
success = await self._send_scheduled_feed(story)
|
||||
|
||||
if success:
|
||||
logger.info(f"基于日程活动的说说发送成功: {story}")
|
||||
else:
|
||||
logger.error(f"基于日程活动的说说发送失败: {activity}")
|
||||
|
||||
return success
|
||||
|
||||
except Exception as e:
|
||||
logger.error(f"执行定时发送任务失败: {str(e)}")
|
||||
logger.error(f"执行基于日程的发送任务失败: {str(e)}")
|
||||
return False
|
||||
|
||||
async def _generate_story_content(self, topic: str) -> str:
|
||||
"""生成定时说说内容"""
|
||||
async def _generate_activity_story(self, activity: str) -> str:
|
||||
"""根据日程活动生成说说内容"""
|
||||
try:
|
||||
# 获取模型配置
|
||||
models = llm_api.get_available_models()
|
||||
@@ -163,24 +144,24 @@ class ScheduleManager:
|
||||
bot_expression = config_api.get_global_config("expression.expression_style", "内容积极向上")
|
||||
qq_account = config_api.get_global_config("bot.qq_account", "")
|
||||
|
||||
# 构建提示词
|
||||
if topic:
|
||||
prompt = f"""
|
||||
你是'{bot_personality}'，你想写一条主题是'{topic}'的说说发表在qq空间上，
|
||||
{bot_expression}
|
||||
不要刻意突出自身学科背景，不要浮夸，不要夸张修辞，可以适当使用颜文字，
|
||||
只输出一条说说正文的内容，不要有其他的任何正文以外的冗余输出
|
||||
"""
|
||||
else:
|
||||
prompt = f"""
|
||||
你是'{bot_personality}'，你想写一条说说发表在qq空间上，主题不限
|
||||
{bot_expression}
|
||||
不要刻意突出自身学科背景，不要浮夸，不要夸张修辞，可以适当使用颜文字，
|
||||
只输出一条说说正文的内容，不要有其他的任何正文以外的冗余输出
|
||||
"""
|
||||
# 构建基于活动的提示词
|
||||
prompt = f"""
|
||||
你是'{bot_personality}'，根据你当前的日程安排，你正在'{activity}'。
|
||||
请基于这个活动写一条说说发表在qq空间上，
|
||||
{bot_expression}
|
||||
说说内容应该自然地反映你正在做的事情或你的想法，
|
||||
不要刻意突出自身学科背景，不要浮夸，不要夸张修辞，可以适当使用颜文字，
|
||||
只输出一条说说正文的内容，不要有其他的任何正文以外的冗余输出
|
||||
|
||||
注意：
|
||||
- 如果活动是学习相关的，可以分享学习心得或感受
|
||||
- 如果活动是休息相关的，可以分享放松的感受
|
||||
- 如果活动是日常生活相关的，可以分享生活感悟
|
||||
- 让说说内容贴近你当前正在做的事情，显得自然真实
|
||||
"""
|
||||
|
||||
# 添加历史记录避免重复
|
||||
prompt += "\n以下是你最近发过的说说，写新说说时注意不要在相隔不长的时间发送相似内容的说说\n"
|
||||
prompt += "\n\n以下是你最近发过的说说，写新说说时注意不要在相隔不长的时间发送相似内容的说说\n"
|
||||
history_block = await get_send_history(qq_account)
|
||||
if history_block:
|
||||
prompt += history_block
|
||||
@@ -190,18 +171,18 @@ class ScheduleManager:
|
||||
prompt=prompt,
|
||||
model_config=model_config,
|
||||
request_type="story.generate",
|
||||
temperature=0.3,
|
||||
temperature=0.7, # 稍微提高创造性
|
||||
max_tokens=1000
|
||||
)
|
||||
|
||||
if success:
|
||||
return story
|
||||
else:
|
||||
logger.error("生成定时说说内容失败")
|
||||
logger.error("生成基于活动的说说内容失败")
|
||||
return ""
|
||||
|
||||
except Exception as e:
|
||||
logger.error(f"生成定时说说内容异常: {str(e)}")
|
||||
logger.error(f"生成基于活动的说说内容异常: {str(e)}")
|
||||
return ""
|
||||
|
||||
async def _handle_images(self, story: str):
|
||||
@@ -220,15 +201,15 @@ class ScheduleManager:
|
||||
image_dir=image_dir,
|
||||
batch_size=image_num
|
||||
)
|
||||
logger.info("定时任务AI配图生成完成")
|
||||
logger.info("基于日程活动的AI配图生成完成")
|
||||
elif enable_ai_image and not apikey:
|
||||
logger.warning('启用了AI配图但未填写API密钥')
|
||||
|
||||
except Exception as e:
|
||||
logger.error(f"处理定时说说配图失败: {str(e)}")
|
||||
logger.error(f"处理基于日程的说说配图失败: {str(e)}")
|
||||
|
||||
async def _send_scheduled_feed(self, story: str) -> bool:
|
||||
"""发送定时说说"""
|
||||
"""发送基于日程的说说"""
|
||||
try:
|
||||
# 获取配置
|
||||
qq_account = config_api.get_global_config("bot.qq_account", "")
|
||||
@@ -240,47 +221,23 @@ class ScheduleManager:
|
||||
success = await qzone_manager.send_feed(story, image_dir, qq_account, enable_image)
|
||||
|
||||
if success:
|
||||
logger.info(f"定时说说发送成功: {story}")
|
||||
logger.info(f"基于日程的说说发送成功: {story}")
|
||||
else:
|
||||
logger.error("定时说说发送失败")
|
||||
logger.error("基于日程的说说发送失败")
|
||||
|
||||
return success
|
||||
|
||||
except Exception as e:
|
||||
logger.error(f"发送定时说说失败: {str(e)}")
|
||||
logger.error(f"发送基于日程的说说失败: {str(e)}")
|
||||
return False
|
||||
|
||||
def get_status(self) -> Dict[str, Any]:
|
||||
"""获取定时任务状态"""
|
||||
current_activity = schedule_manager.get_current_activity()
|
||||
return {
|
||||
"is_running": self.is_running,
|
||||
"enabled": self.plugin.get_config("schedule.enable_schedule", False),
|
||||
"schedules": self.plugin.get_config("schedule.schedules", {}),
|
||||
"last_send_times": self.last_send_times
|
||||
}
|
||||
|
||||
def add_schedule(self, time_str: str, topic: str) -> bool:
|
||||
"""添加定时任务"""
|
||||
schedules = self.plugin.get_config("schedule.schedules", {})
|
||||
|
||||
if time_str in schedules:
|
||||
logger.warning(f"时间 {time_str} 已存在定时任务")
|
||||
return False
|
||||
|
||||
schedules[time_str] = topic
|
||||
# 注意：这里需要插件系统支持动态更新配置
|
||||
logger.info(f"添加定时任务: {time_str} - {topic}")
|
||||
return True
|
||||
|
||||
def remove_schedule(self, time_str: str) -> bool:
|
||||
"""移除定时任务"""
|
||||
schedules = self.plugin.get_config("schedule.schedules", {})
|
||||
|
||||
if time_str in schedules:
|
||||
del schedules[time_str]
|
||||
# 注意：这里需要插件系统支持动态更新配置
|
||||
logger.info(f"移除定时任务: {time_str}")
|
||||
return True
|
||||
else:
|
||||
logger.warning(f"未找到时间为 {time_str} 的定时任务")
|
||||
return False
|
||||
"schedule_mode": "based_on_daily_schedule",
|
||||
"current_activity": current_activity,
|
||||
"last_activity_hash": self.last_activity_hash
|
||||
}
|
||||
Reference in New Issue
Block a user