From 4d17c8362ee899b4c1cbc459517517fb4c811a16 Mon Sep 17 00:00:00 2001 From: Rock Chin <1010553892@qq.com> Date: Wed, 21 Dec 2022 14:17:57 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BD=BF=E7=94=A8WSAdapter=E4=BD=9C?= =?UTF-8?q?=E4=B8=BAyirimirai=E9=BB=98=E8=AE=A4=E9=80=82=E9=85=8D=E5=99=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config-template.py | 2 +- pkg/qqbot/manager.py | 43 +++++++++++++++++++++++++------------------ 2 files changed, 26 insertions(+), 19 deletions(-) diff --git a/config-template.py b/config-template.py index a5d4b62f..a238aa8f 100644 --- a/config-template.py +++ b/config-template.py @@ -9,7 +9,7 @@ import logging # verifyKey: mirai-api-http的verifyKey # qq: 机器人的QQ号 mirai_http_api_config = { - "adapter": "HTTPAdapter", + "adapter": "WebSocketAdapter", "host": "localhost", "port": 8080, "verifyKey": "yirimirai", diff --git a/pkg/qqbot/manager.py b/pkg/qqbot/manager.py index 517b8f57..1eb7f9dc 100644 --- a/pkg/qqbot/manager.py +++ b/pkg/qqbot/manager.py @@ -4,7 +4,8 @@ import os import threading import openai.error -from mirai import At, GroupMessage, MessageEvent, Mirai, Plain, StrangerMessage, WebSocketAdapter,HTTPAdapter, FriendMessage, Image +from mirai import At, GroupMessage, MessageEvent, Mirai, Plain, StrangerMessage, WebSocketAdapter, HTTPAdapter, \ + FriendMessage, Image import config import pkg.openai.session @@ -73,24 +74,24 @@ class QQBotManager: else: self.reply_filter = pkg.qqbot.filter.ReplyFilter([]) - if mirai_http_api_config['adapter'] == "WebSocketAdapter": + if 'adapter' not in mirai_http_api_config or mirai_http_api_config['adapter'] == "WebSocketAdapter": bot = Mirai( - qq=mirai_http_api_config['qq'], - adapter=WebSocketAdapter( - verify_key=mirai_http_api_config['verifyKey'], - host=mirai_http_api_config['host'], - port=mirai_http_api_config['port'] + qq=mirai_http_api_config['qq'], + adapter=WebSocketAdapter( + verify_key=mirai_http_api_config['verifyKey'], + host=mirai_http_api_config['host'], + port=mirai_http_api_config['port'] + ) ) - ) elif mirai_http_api_config['adapter'] == "HTTPAdapter": bot = Mirai( - qq=mirai_http_api_config['qq'], - adapter=HTTPAdapter( - verify_key=mirai_http_api_config['verifyKey'], - host=mirai_http_api_config['host'], - port=mirai_http_api_config['port'] + qq=mirai_http_api_config['qq'], + adapter=HTTPAdapter( + verify_key=mirai_http_api_config['verifyKey'], + host=mirai_http_api_config['host'], + port=mirai_http_api_config['port'] + ) ) - ) @bot.on(FriendMessage) async def on_friend_message(event: FriendMessage): @@ -201,13 +202,19 @@ class QQBotManager: reply += ",当前处于全新会话或不在此页" elif cmd == 'usage': api_keys = pkg.openai.manager.get_inst().key_mgr.api_key - reply = "[bot]api-key使用情况:(阈值:{})\n\n".format(pkg.openai.manager.get_inst().key_mgr.api_key_usage_threshold) + reply = "[bot]api-key使用情况:(阈值:{})\n\n".format( + pkg.openai.manager.get_inst().key_mgr.api_key_usage_threshold) using_key_name = "" for api_key in api_keys: reply += "{}:\n - {}字 {}%\n".format(api_key, - pkg.openai.manager.get_inst().key_mgr.get_usage(api_keys[api_key]), - round(pkg.openai.manager.get_inst().key_mgr.get_usage(api_keys[api_key]) / pkg.openai.manager.get_inst().key_mgr.api_key_usage_threshold * 100, 3)) + pkg.openai.manager.get_inst().key_mgr.get_usage( + api_keys[api_key]), + round( + pkg.openai.manager.get_inst().key_mgr.get_usage( + api_keys[ + api_key]) / pkg.openai.manager.get_inst().key_mgr.api_key_usage_threshold * 100, + 3)) if api_keys[api_key] == pkg.openai.manager.get_inst().key_mgr.using_key: using_key_name = api_key reply += "\n当前使用:{}".format(using_key_name) @@ -299,7 +306,7 @@ class QQBotManager: reply = '' - def process(text = None) -> str: + def process(text=None) -> str: replys = "" if At(self.bot.qq) in event.message_chain: event.message_chain.remove(At(self.bot.qq))