Austin/QChatGPT
1
0
Fork 0
mirror of https://github.com/RockChinQ/QChatGPT.git synced 2024-11-15 19:22:24 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

refactor: yirimirai 适配器实现异步

Browse Source
This commit is contained in:
RockChinQ 2024-01-23 22:28:30 +08:00
parent 8d35ecd711
commit ad5ef95e65
8 changed files with 88 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/boot/app.py
View File

@ -7,6 +7,7 @@ from ..openai import manager as openai_mgr
from ..config import manager as config_mgr
from ..database import manager as database_mgr
from ..utils.center import v2 as center_mgr
from ..plugin import host as plugin_host
class Application:
@ -28,4 +29,7 @@ class Application:
pass
async def run(self):
pass
# TODO make it async
plugin_host.initialize_plugins()
await self.im_mgr.run()

7
pkg/boot/log.py
View File

@ -44,4 +44,11 @@ async def init_logging() -> logging.Logger:
)
qcg_logger.addHandler(handler)
logging.basicConfig(level=level, # 设置日志输出格式
format="[DEPR][%(asctime)s.%(msecs)03d] %(pathname)s (%(lineno)d) - [%(levelname)s] :\n%(message)s",
# 日志输出的格式
# -8表示占位符，让输出左对齐，输出长度都为8位
datefmt="%Y-%m-%d %H:%M:%S" # 时间输出的格式
)
return qcg_logger

13
pkg/qqbot/adapter.py
View File

@ -1,15 +1,16 @@
# MessageSource的适配器
import typing
import abc
import mirai
class MessageSourceAdapter:
class MessageSourceAdapter(metaclass=abc.ABCMeta):
bot_account_id: int
def __init__(self, config: dict):
pass
def send_message(
async def send_message(
self,
target_type: str,
target_id: str,
@ -24,7 +25,7 @@ class MessageSourceAdapter:
"""
raise NotImplementedError
def reply_message(
async def reply_message(
self,
message_source: mirai.MessageEvent,
message: mirai.MessageChain,
@ -39,7 +40,7 @@ class MessageSourceAdapter:
"""
raise NotImplementedError
def is_muted(self, group_id: int) -> bool:
async def is_muted(self, group_id: int) -> bool:
"""获取账号是否在指定群被禁言"""
raise NotImplementedError
@ -69,8 +70,8 @@ class MessageSourceAdapter:
"""
raise NotImplementedError
def run_sync(self):
"""以阻塞的方式运行适配器"""
async def run_async(self):
"""异步运行"""
raise NotImplementedError
def kill(self) -> bool:

88
pkg/qqbot/manager.py
View File

@ -3,6 +3,7 @@ from __future__ import annotations
import json
import os
import logging
import asyncio
from mirai import At, GroupMessage, MessageEvent, StrangerMessage, \
FriendMessage, Image, MessageChain, Plain
@ -138,9 +139,9 @@ class QQBotManager:
# 注册诸事件
# Caution: 注册新的事件处理器之后，请务必在unsubscribe_all中编写相应的取消订阅代码
def on_friend_message(event: FriendMessage):
async def on_friend_message(event: FriendMessage):
def friend_message_handler():
async def friend_message_handler():
# 触发事件
args = {
"launcher_type": "person",
@ -153,19 +154,21 @@ class QQBotManager:
if plugin_event.is_prevented_default():
return
self.on_person_message(event)
await self.on_person_message(event)
context.get_thread_ctl().submit_user_task(
friend_message_handler,
)
asyncio.create_task(friend_message_handler())
# TODO delete this
# context.get_thread_ctl().submit_user_task(
# friend_message_handler,
# )
self.adapter.register_listener(
FriendMessage,
on_friend_message
)
def on_stranger_message(event: StrangerMessage):
async def on_stranger_message(event: StrangerMessage):
def stranger_message_handler():
async def stranger_message_handler():
# 触发事件
args = {
"launcher_type": "person",
@ -178,11 +181,13 @@ class QQBotManager:
if plugin_event.is_prevented_default():
return
self.on_person_message(event)
await self.on_person_message(event)
context.get_thread_ctl().submit_user_task(
stranger_message_handler,
)
asyncio.create_task(stranger_message_handler())
# TODO delete this
# context.get_thread_ctl().submit_user_task(
# stranger_message_handler,
# )
# nakuru不区分好友和陌生人，故仅为yirimirai注册陌生人事件
if config['msg_source_adapter'] == 'yirimirai':
self.adapter.register_listener(
@ -190,9 +195,9 @@ class QQBotManager:
on_stranger_message
)
def on_group_message(event: GroupMessage):
async def on_group_message(event: GroupMessage):
def group_message_handler(event: GroupMessage):
async def group_message_handler(event: GroupMessage):
# 触发事件
args = {
"launcher_type": "group",
@ -205,12 +210,14 @@ class QQBotManager:
if plugin_event.is_prevented_default():
return
self.on_group_message(event)
await self.on_group_message(event)
context.get_thread_ctl().submit_user_task(
group_message_handler,
event
)
asyncio.create_task(group_message_handler(event))
# TODO delete this
# context.get_thread_ctl().submit_user_task(
# group_message_handler,
# event
# )
self.adapter.register_listener(
GroupMessage,
on_group_message
@ -264,7 +271,7 @@ class QQBotManager:
else:
self.reply_filter = qqbot_filter.ReplyFilter([])
def send(self, event, msg, check_quote=True, check_at_sender=True):
async def send(self, event, msg, check_quote=True, check_at_sender=True):
config = context.get_config_manager().data
if check_at_sender and config['at_sender']:
@ -282,14 +289,14 @@ class QQBotManager:
)
)
self.adapter.reply_message(
await self.adapter.reply_message(
event,
msg,
quote_origin=True if config['quote_origin'] and check_quote else False
)
# 私聊消息处理
def on_person_message(self, event: MessageEvent):
async def on_person_message(self, event: MessageEvent):
reply = ''
config = context.get_config_manager().data
@ -307,14 +314,14 @@ class QQBotManager:
for i in range(self.retry):
try:
@func_timeout.func_set_timeout(config['process_message_timeout'])
def time_ctrl_wrapper():
reply = processor.process_message('person', event.sender.id, str(event.message_chain),
# @func_timeout.func_set_timeout(config['process_message_timeout'])
async def time_ctrl_wrapper():
reply = await processor.process_message('person', event.sender.id, str(event.message_chain),
event.message_chain,
event.sender.id)
return reply
reply = time_ctrl_wrapper()
reply = await time_ctrl_wrapper()
break
except func_timeout.FunctionTimedOut:
logging.warning("person_{}: 超时，重试中({})".format(event.sender.id, i))
@ -330,15 +337,15 @@ class QQBotManager:
reply = [tips_custom.reply_message]
if reply:
return self.send(event, reply, check_quote=False, check_at_sender=False)
await self.send(event, reply, check_quote=False, check_at_sender=False)
# 群消息处理
def on_group_message(self, event: GroupMessage):
async def on_group_message(self, event: GroupMessage):
reply = ''
config = context.get_config_manager().data
def process(text=None) -> str:
async def process(text=None) -> str:
replys = ""
if At(self.bot_account_id) in event.message_chain:
event.message_chain.remove(At(self.bot_account_id))
@ -347,15 +354,15 @@ class QQBotManager:
failed = 0
for i in range(self.retry):
try:
@func_timeout.func_set_timeout(config['process_message_timeout'])
def time_ctrl_wrapper():
replys = processor.process_message('group', event.group.id,
# @func_timeout.func_set_timeout(config['process_message_timeout'])
async def time_ctrl_wrapper():
replys = await processor.process_message('group', event.group.id,
str(event.message_chain).strip() if text is None else text,
event.message_chain,
event.sender.id)
return replys
replys = time_ctrl_wrapper()
replys = await time_ctrl_wrapper()
break
except func_timeout.FunctionTimedOut:
logging.warning("group_{}: 超时，重试中({})".format(event.group.id, i))
@ -379,22 +386,22 @@ class QQBotManager:
else:
if At(self.bot_account_id) in event.message_chain and response_at(event.group.id):
# 直接调用
reply = process()
reply = await process()
else:
check, result = check_response_rule(event.group.id, str(event.message_chain).strip())
if check:
reply = process(result.strip())
reply = await process(result.strip())
# 检查是否随机响应
elif random_responding(event.group.id):
logging.info("随机响应group_{}消息".format(event.group.id))
reply = process()
reply = await process()
if reply:
return self.send(event, reply)
await self.send(event, reply)
# 通知系统管理员
def notify_admin(self, message: str):
async def notify_admin(self, message: str):
config = context.get_config_manager().data
if config['admin_qq'] != 0 and config['admin_qq'] != []:
logging.info("通知管理员:{}".format(message))
@ -412,7 +419,7 @@ class QQBotManager:
MessageChain([Plain("[bot]{}".format(message))])
)
def notify_admin_message_chain(self, message):
async def notify_admin_message_chain(self, message):
config = context.get_config_manager().data
if config['admin_qq'] != 0 and config['admin_qq'] != []:
logging.info("通知管理员:{}".format(message))
@ -429,3 +436,6 @@ class QQBotManager:
adm,
message
)
async def run(self):
await self.adapter.run_async()

4
pkg/qqbot/process.py
View File

@ -36,7 +36,7 @@ def is_admin(qq: int) -> bool:
return qq == config['admin_qq']
def process_message(launcher_type: str, launcher_id: int, text_message: str, message_chain: mirai.MessageChain,
async def process_message(launcher_type: str, launcher_id: int, text_message: str, message_chain: mirai.MessageChain,
sender_id: int) -> mirai.MessageChain:
global processing
@ -61,7 +61,7 @@ def process_message(launcher_type: str, launcher_id: int, text_message: str, mes
# 检查是否被禁言
if launcher_type == 'group':
is_muted = mgr.adapter.is_muted(launcher_id)
is_muted = await mgr.adapter.is_muted(launcher_id)
if is_muted:
logging.info("机器人被禁言,跳过消息处理(group_{})".format(launcher_id))
return reply

3
pkg/qqbot/sources/nakuru.py
View File

@ -324,5 +324,8 @@ class NakuruProjectAdapter(adapter_model.MessageSourceAdapter):
asyncio.set_event_loop(loop)
self.bot.run()
async def run_async(self):
return await self.bot._run()
def kill(self) -> bool:
return False

22
pkg/qqbot/sources/yirimirai.py
View File

@ -36,7 +36,7 @@ class YiriMiraiAdapter(adapter_model.MessageSourceAdapter):
else:
raise Exception('Unknown adapter for YiriMirai: ' + config['adapter'])
def send_message(
async def send_message(
self,
target_type: str,
target_id: str,
@ -57,9 +57,9 @@ class YiriMiraiAdapter(adapter_model.MessageSourceAdapter):
else:
raise Exception('Unknown target type: ' + target_type)
asyncio.run(task)
await task
def reply_message(
async def reply_message(
self,
message_source: mirai.MessageEvent,
message: mirai.MessageChain,
@ -72,11 +72,10 @@ class YiriMiraiAdapter(adapter_model.MessageSourceAdapter):
message (mirai.MessageChain): YiriMirai库的消息链
quote_origin (bool, optional): 是否引用原消息. Defaults to False.
"""
asyncio.run(self.bot.send(message_source, message, quote_origin))
await self.bot.send(message_source, message, quote_origin)
def is_muted(self, group_id: int) -> bool:
result = self.bot.member_info(target=group_id, member_id=self.bot.qq).get()
result = asyncio.run(result)
async def is_muted(self, group_id: int) -> bool:
result = await self.bot.member_info(target=group_id, member_id=self.bot.qq).get()
if result.mute_time_remaining > 0:
return True
return False
@ -111,13 +110,8 @@ class YiriMiraiAdapter(adapter_model.MessageSourceAdapter):
bus.unsubscribe(event_type, callback)
def run_sync(self):
"""运行YiriMirai"""
# 创建新的
loop = asyncio.new_event_loop()
loop.run_until_complete(MiraiRunner(self.bot)._run())
async def run_async(self):
return await MiraiRunner(self.bot)._run()
def kill(self) -> bool:
return False

7
start.py Normal file
View File

@ -0,0 +1,7 @@
import asyncio
from pkg.boot import boot
if __name__ == '__main__':
asyncio.run(boot.main())