liuwei_x_x/abot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

重大版本调整：gewechat兼容。

Browse Source
This commit is contained in:
liuwei
2025-04-22 11:17:03 +08:00
parent 41def62467
commit a62bb61901
48 changed files with 2855 additions and 1420 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
plugins/global_news/main.py
View File

@@ -4,8 +4,7 @@ import threading
import time # 添加这一行
from typing import Dict, Any, List, Optional, Tuple
from wcferry import Wcf
from message_util import MessageUtil
from plugin_common.message_plugin_interface import MessagePluginInterface
from plugin_common.plugin_interface import PluginStatus
from utils.decorator.plugin_decorators import plugin_stats_decorator
@@ -55,12 +54,13 @@ class GlobalNewsPlugin(MessagePluginInterface):
self.LOG.info(f"正在初始化 {self.name} 插件...")
# 保存上下文对象
self.wcf = context.get("wcf")
self.event_system = context.get("event_system")
self.message_util = context.get("message_util")
self.message_util: MessageUtil = context.get("message_util")
self._commands = self._config.get("GlobalNews", {}).get("command", ["全球新闻", "国际新闻", "环球新闻", "政经新闻"])
self.command_format = self._config.get("GlobalNews", {}).get("command-format", "全球新闻 - 获取最新的全球政治经济新闻")
self._commands = self._config.get("GlobalNews", {}).get("command",
["全球新闻", "国际新闻", "环球新闻", "政经新闻"])
self.command_format = self._config.get("GlobalNews", {}).get("command-format",
"全球新闻 - 获取最新的全球政治经济新闻")
self.enable = self._config.get("GlobalNews", {}).get("enable", True)
self.LOG.info(f"[{self.name}] 插件初始化完成，指令：{self._commands}")
@@ -96,7 +96,6 @@ class GlobalNewsPlugin(MessagePluginInterface):
self.LOG.info(f"插件执行： {self.name}：{content}")
sender = message.get("sender")
roomid = message.get("roomid", "")
wcf: Wcf = message.get("wcf")
gbm: GroupBotManager = message.get("gbm")
# 检查权限
@@ -105,48 +104,48 @@ class GlobalNewsPlugin(MessagePluginInterface):
# 生成唯一任务ID
task_id = f"{sender}_{roomid}_{int(time.time())}"
# 发送等待消息
wcf.send_text("🌍正在获取全球新闻，请稍候...",
(roomid if roomid else sender), sender)
self.message_util.send_text("🌍正在获取全球新闻，请稍候...",
(roomid if roomid else sender), sender)
# 启动异步任务
self._start_news_task(task_id, sender, roomid, wcf)
self._start_news_task(task_id, sender, roomid)
return True, "新闻获取任务已启动"
def _start_news_task(self, task_id: str, sender: str, roomid: str, wcf: Wcf):
def _start_news_task(self, task_id: str, sender: str, roomid: str):
"""启动异步新闻获取任务"""
thread = threading.Thread(
target=self._fetch_news_thread,
args=(task_id, sender, roomid, wcf)
args=(task_id, sender, roomid)
)
thread.daemon = True
thread.start()
self._news_tasks[task_id] = thread
self.LOG.info(f"启动新闻获取任务: {task_id}")
def _fetch_news_thread(self, task_id: str, sender: str, roomid: str, wcf: Wcf):
def _fetch_news_thread(self, task_id: str, sender: str, roomid: str):
"""在单独的线程中运行异步新闻获取任务"""
try:
loop = asyncio.new_event_loop()
asyncio.set_event_loop(loop)
news_result = loop.run_until_complete(self._fetch_news_async())
loop.close()
# 处理结果
if news_result:
# 发送新闻图片
receiver = roomid if roomid else sender
wcf.send_image(news_result, receiver)
wcf.send_text("🌍全球新闻获取完成！", receiver, sender)
self.message_util.send_image(news_result, receiver)
self.message_util.send_text("🌍全球新闻获取完成！", receiver, sender)
else:
wcf.send_text("❌获取新闻失败，请稍后再试",
(roomid if roomid else sender), sender)
self.message_util.send_text("❌获取新闻失败，请稍后再试",
(roomid if roomid else sender), sender)
except Exception as e:
self.LOG.error(f"新闻获取任务出错: {e}")
wcf.send_text(f"❌获取新闻出错: {str(e)}",
(roomid if roomid else sender), sender)
self.message_util.send_text(f"❌获取新闻出错: {str(e)}",
(roomid if roomid else sender), sender)
finally:
# 清理任务
if task_id in self._news_tasks:
@@ -163,23 +162,23 @@ class GlobalNewsPlugin(MessagePluginInterface):
self._run_in_executor(fox),
self._run_in_executor(bbc)
]
# 并行执行所有任务
results = await asyncio.gather(*tasks)
# 合并结果
news_titles = "\n".join(results)
# 使用AI分析新闻
markdown_news = await self._run_in_executor(
dify_news_title_analyze, news_titles
)
# 转换为图片
image_path = await self._run_in_executor(
convert_md_str_to_image, markdown_news, "news_output.png"
)
return image_path
except Exception as e:
self.LOG.error(f"异步获取新闻失败: {e}")
@@ -188,4 +187,4 @@ class GlobalNewsPlugin(MessagePluginInterface):
async def _run_in_executor(self, func, *args):
"""在线程池中运行同步函数"""
loop = asyncio.get_event_loop()
return await loop.run_in_executor(None, func, *args)
return await loop.run_in_executor(None, func, *args)