Merge pull request #38 from expliyh/satori

对昨晚 PR 的一些修正

liteyuki/liteyuki_main/core.py

@@ -17,7 +17,7 @@ from liteyuki.utils.base.language import get_user_lang
 from liteyuki.utils.base.ly_typing import T_Bot, T_MessageEvent
 from liteyuki.utils.message.message import MarkdownMessage as md, broadcast_to_superusers
 from liteyuki.utils.base.reloader import Reloader
-from liteyuki.utils import satori_utils
+from liteyuki.utils import event as event_utils, satori_utils
 from .api import update_liteyuki
 
 require("nonebot_plugin_alconna")
@@ -83,7 +83,7 @@ async def _(matcher: Matcher, bot: T_Bot, event: T_MessageEvent):
             "reload": True,
             "reload_time": time.time(),
             "reload_bot_id": bot.self_id,
-            "reload_session_type": satori_utils.get_message_type(event),
+            "reload_session_type": event_utils.get_message_type(event),
             "reload_session_id": (event.group_id if event.message_type == "group" else event.user_id) if not isinstance(event,satori.event.Event) else event.channel.id,
             "delta_time": 0
         }
@@ -118,7 +118,7 @@ async def _(matcher: Matcher, bot: T_Bot, event: T_MessageEvent):
 ).handle()
 # Satori OK
 async def _(result: Arparma, event: T_MessageEvent, bot: T_Bot, matcher: Matcher):
-    ulang = get_user_lang(str(satori_utils.get_user_id(event)))
+    ulang = get_user_lang(str(event_utils.get_user_id(event)))
     stored_config: StoredConfig = common_db.where_one(StoredConfig(), default=StoredConfig())
     if result.subcommands.get("set"):
         key, value = result.subcommands.get("set").args.get("key"), result.subcommands.get("set").args.get("value")
@@ -168,7 +168,7 @@ async def _(result: Arparma, event: T_MessageEvent, bot: T_Bot, matcher: Matcher
 async def _(event: T_MessageEvent, matcher: Matcher):
     global markdown_image
     # 切换图片模式，False以图片形式发送，True以markdown形式发送
-    ulang = get_user_lang(str(satori_utils.get_user_id(event)))
+    ulang = get_user_lang(str(event_utils.get_user_id(event)))
     stored_config: StoredConfig = common_db.where_one(StoredConfig(), default=StoredConfig())
     stored_config.config["markdown_image"] = not stored_config.config.get("markdown_image", False)
     markdown_image = stored_config.config["markdown_image"]

liteyuki/plugins/liteyuki_pacman/common.py

@@ -5,7 +5,7 @@ import aiofiles
 import nonebot.plugin
 from nonebot.adapters import satori
 
-from liteyuki.utils import satori_utils
+from liteyuki.utils import event as event_utils
 from liteyuki.utils.base.data import LiteModel
 from liteyuki.utils.base.data_manager import GlobalPlugin, Group, User, group_db, plugin_db, user_db
 from liteyuki.utils.base.ly_typing import T_MessageEvent
@@ -140,12 +140,12 @@ def set_plugin_session_enable(event: T_MessageEvent, plugin_name: str, enable: b
     Returns:
 
     """
-    if satori_utils.get_message_type(event) == "group":
+    if event_utils.get_message_type(event) == "group":
-        session = group_db.where_one(Group(), "group_id = ?", str(satori_utils.get_group_id(event)),
+        session = group_db.where_one(Group(), "group_id = ?", str(event_utils.get_group_id(event)),
-                                     default=Group(group_id=str(satori_utils.get_group_id(event))))
+                                     default=Group(group_id=str(event_utils.get_group_id(event))))
     else:
-        session = user_db.where_one(User(), "user_id = ?", str(satori_utils.get_user_id(event)),
+        session = user_db.where_one(User(), "user_id = ?", str(event_utils.get_user_id(event)),
-                                    default=User(user_id=str(satori_utils.get_user_id(event))))
+                                    default=User(user_id=str(event_utils.get_user_id(event))))
     default_enable = get_plugin_default_enable(plugin_name)
     if default_enable:
         if enable:
@@ -158,12 +158,12 @@ def set_plugin_session_enable(event: T_MessageEvent, plugin_name: str, enable: b
         else:
             session.enabled_plugins.remove(plugin_name)
 
-    if satori_utils.get_message_type(event) == "group":
+    if event_utils.get_message_type(event) == "group":
-        __group_data[str(satori_utils.get_group_id(event))] = session
+        __group_data[str(event_utils.get_group_id(event))] = session
         print(session)
         group_db.save(session)
     else:
-        __user_data[str(satori_utils.get_user_id(event))] = session
+        __user_data[str(event_utils.get_user_id(event))] = session
         user_db.save(session)
 
 

liteyuki/plugins/liteyuki_satori_user_info/auto_update.py

@@ -1,4 +1,5 @@
-from liteyuki.utils import satori_utils
+import nonebot
+
 from nonebot.message import event_preprocessor
 # from nonebot_plugin_alconna.typings import Event
 from liteyuki.utils.base.ly_typing import T_MessageEvent
@@ -10,13 +11,11 @@ from liteyuki.plugins.liteyuki_status.counter_for_satori import satori_counter
 
 @event_preprocessor
 async def pre_handle(event: Event):
-    print("UPDATE_USER")
-    print(event.__dict__)
     if isinstance(event, satori.MessageEvent):
         if event.user.id == event.self_id:
             satori_counter.msg_sent += 1
         else:
             satori_counter.msg_received += 1
         if event.user.name is not None:
-            await satori_utils.user_infos.put(event.user)
+            if await satori_utils.user_infos.put(event.user):
-            print(event.user)
+                nonebot.logger.info(f"Satori user {event.user.name}<{event.user.id}> updated")

liteyuki/plugins/liteyuki_statistics/stat_matchers.py

@@ -1,9 +1,9 @@
 from nonebot import Bot, require
 from liteyuki.utils.message.npl import convert_duration, convert_time_to_seconds
 from .stat_api import *
-from ...utils import satori_utils
+from liteyuki.utils import event as event_utils
-from ...utils.base.language import Language
+from liteyuki.utils.base.language import Language
-from ...utils.base.ly_typing import T_MessageEvent
+from liteyuki.utils.base.ly_typing import T_MessageEvent
 
 require("nonebot_plugin_alconna")
 
@@ -45,7 +45,7 @@ stat_msg = on_alconna(
 
 @stat_msg.assign("message")
 async def _(result: Arparma, event: T_MessageEvent, bot: Bot):
-    ulang = Language(satori_utils.get_user_id(event))
+    ulang = Language(event_utils.get_user_id(event))
 
     try:
         duration = convert_time_to_seconds(result.other_args.get("duration", "2d"))  # 秒数
@@ -58,7 +58,7 @@ async def _(result: Arparma, event: T_MessageEvent, bot: Bot):
     bot_id = result.other_args.get("bot_id")
 
     if group_id in ["current", "c"]:
-        group_id = str(satori_utils.get_group_id(event))
+        group_id = str(event_utils.get_group_id(event))
 
     if group_id in ["all", "a"]:
         group_id = "all"

liteyuki/plugins/liteyuki_statistics/stat_monitors.py

@@ -4,24 +4,27 @@ from nonebot import require
 from nonebot.message import event_postprocessor
 
 from liteyuki.utils.base.data import Database, LiteModel
-from liteyuki.utils.base.ly_typing import v11, satori
+from liteyuki.utils.base.ly_typing import v11, v12, satori
 
 from liteyuki.utils.base.ly_typing import T_Bot, T_MessageEvent
 
 from .common import MessageEventModel, msg_db
-from liteyuki.utils import satori_utils
+from liteyuki.utils import event as event_utils
 
 require("nonebot_plugin_alconna")
 
 
-@event_postprocessor
 async def general_event_monitor(bot: T_Bot, event: T_MessageEvent):
-    if isinstance(bot, satori.Bot):
+    print("POST PROCESS")
-        return await satori_event_monitor(bot, event)
+    # if isinstance(bot, satori.Bot):
-    elif isinstance(bot, v11.Bot):
+    #     print("POST PROCESS SATORI EVENT")
-        return await onebot_v11_event_monitor(bot, event)
+    #     return await satori_event_monitor(bot, event)
+    # elif isinstance(bot, v11.Bot):
+    #     print("POST PROCESS V11 EVENT")
+    #     return await onebot_v11_event_monitor(bot, event)
 
 
+@event_postprocessor
 async def onebot_v11_event_monitor(bot: v11.Bot, event: v11.MessageEvent):
     if event.message_type == "group":
         event: v11.GroupMessageEvent
@@ -44,6 +47,30 @@ async def onebot_v11_event_monitor(bot: v11.Bot, event: v11.MessageEvent):
     msg_db.save(mem)
 
 
+@event_postprocessor
+async def onebot_v12_event_monitor(bot: v12.Bot, event: v12.MessageEvent):
+    if event.message_type == "group":
+        event: v12.GroupMessageEvent
+        group_id = str(event.group_id)
+    else:
+        group_id = ""
+    mem = MessageEventModel(
+        time=int(time.time()),
+        bot_id=bot.self_id,
+        adapter="onebot.v12",
+        group_id=group_id,
+        user_id=str(event.user_id),
+
+        message_id=str(event.message_id),
+
+        message=event.message,
+        message_text=event.raw_message,
+        message_type=event.message_type,
+    )
+    msg_db.save(mem)
+
+
+@event_postprocessor
 async def satori_event_monitor(bot: satori.Bot, event: satori.MessageEvent):
     if event.guild is not None:
         event: satori.MessageEvent
@@ -60,6 +87,6 @@ async def satori_event_monitor(bot: satori.Bot, event: satori.MessageEvent):
         message_id=str(event.message.id),
         message=event.message,
         message_text=event.message.content,
-        message_type=satori_utils.get_message_type(event),
+        message_type=event_utils.get_message_type(event),
     )
     msg_db.save(mem)

liteyuki/plugins/liteyuki_status/api.py

@@ -170,7 +170,7 @@ async def get_bots_data(self_id: str = "0") -> dict:
 
         statistics = status.get("stat", {})
         app_name = version_info.get("app_name", "UnknownImplementation")
-        if app_name in ["Lagrange.OneBot", "LLOneBot", "Shamrock"]:
+        if app_name in ["Lagrange.OneBot", "LLOneBot", "Shamrock", "NapCat.Onebot"]:
             icon = f"https://q.qlogo.cn/g?b=qq&nk={bot_id}&s=640"
         elif isinstance(bot, satori.Bot):
             app_name = "Satori"

liteyuki/plugins/liteyuki_status/status.py

@@ -4,8 +4,8 @@ from liteyuki.utils.base.resource import get_path
 from liteyuki.utils.message.html_tool import template2image
 from liteyuki.utils.base.language import get_user_lang
 from .api import *
-from ...utils import satori_utils
+from liteyuki.utils import event as event_utils
-from ...utils.base.ly_typing import T_Bot, T_MessageEvent
+from liteyuki.utils.base.ly_typing import T_Bot, T_MessageEvent
 
 require("nonebot_plugin_alconna")
 from nonebot_plugin_alconna import on_alconna, Alconna, Args, Subcommand, Arparma, UniMessage
@@ -28,7 +28,7 @@ status_alc = on_alconna(
 
 @status_alc.handle()
 async def _(event: T_MessageEvent, bot: T_Bot):
-    ulang = get_user_lang(satori_utils.get_user_id(event))
+    ulang = get_user_lang(event_utils.get_user_id(event))
     if ulang.lang_code in status_card_cache:
         image = status_card_cache[ulang.lang_code]
     else:

liteyuki/plugins/liteyuki_user/profile_manager.py

@@ -9,7 +9,7 @@ from liteyuki.utils.base.language import Language, change_user_lang, get_all_lan
 from liteyuki.utils.base.ly_typing import T_Bot, T_MessageEvent
 from liteyuki.utils.message.message import MarkdownMessage as md
 from .const import representative_timezones_list
-from ...utils import satori_utils
+from liteyuki.utils import event as event_utils
 
 require("nonebot_plugin_alconna")
 from nonebot_plugin_alconna import Alconna, Args, Arparma, Subcommand, on_alconna
@@ -42,13 +42,13 @@ class Profile(LiteModel):
 
 @profile_alc.handle()
 async def _(result: Arparma, event: T_MessageEvent, bot: T_Bot):
-    user: User = user_db.where_one(User(), "user_id = ?", satori_utils.get_user_id(event),
+    user: User = user_db.where_one(User(), "user_id = ?", event_utils.get_user_id(event),
-                                   default=User(user_id=str(satori_utils.get_user_id(event))))
+                                   default=User(user_id=str(event_utils.get_user_id(event))))
-    ulang = get_user_lang(str(satori_utils.get_user_id(event)))
+    ulang = get_user_lang(str(event_utils.get_user_id(event)))
     if result.subcommands.get("set"):
         if result.subcommands["set"].args.get("value"):
             # 对合法性进行校验后设置
-            r = set_profile(result.args["key"], result.args["value"], str(satori_utils.get_user_id(event)))
+            r = set_profile(result.args["key"], result.args["value"], str(event_utils.get_user_id(event)))
             if r:
                 user.profile[result.args["key"]] = result.args["value"]
                 user_db.save(user)  # 数据库保存

liteyuki/plugins/liteyuki_weather/qweather.py

@@ -11,7 +11,7 @@ from liteyuki.utils.base.data_manager import User, user_db
 from liteyuki.utils.base.language import Language, get_user_lang
 from liteyuki.utils.base.resource import get_path
 from liteyuki.utils.message.html_tool import template2image
-from ...utils import satori_utils
+from liteyuki.utils import event as event_utils
 
 require("nonebot_plugin_alconna")
 from nonebot_plugin_alconna import on_alconna, Alconna, Args, MultiVar, Arparma
@@ -43,11 +43,11 @@ async def _(event: T_MessageEvent, matcher: Matcher):
 
 
 async def get_weather_now_card(matcher: Matcher, event: T_MessageEvent, keyword: list[str], tip: bool = True):
-    ulang = get_user_lang(satori_utils.get_user_id(event))
+    ulang = get_user_lang(event_utils.get_user_id(event))
     qw_lang = get_qw_lang(ulang.lang_code)
     key = get_config("weather_key")
     is_dev = get_memory_data("weather.is_dev", True)
-    user: User = user_db.where_one(User(), "user_id = ?", satori_utils.get_user_id(event), default=User())
+    user: User = user_db.where_one(User(), "user_id = ?", event_utils.get_user_id(event), default=User())
     # params
     unit = user.profile.get("unit", "m")
     stored_location = user.profile.get("location", None)

liteyuki/utils/adapter_manager/__init__.py

@@ -0,0 +1,14 @@
+from . import (
+    satori,
+    onebot
+)
+
+
+def init(config: dict):
+    onebot.init()
+    satori.init(config)
+
+
+def register():
+    onebot.register()
+    satori.register()

liteyuki/utils/adapter_manager/onebot.py

@@ -0,0 +1,12 @@
+import nonebot
+from nonebot.adapters.onebot import v11, v12
+
+
+def init():
+    pass
+
+
+def register():
+    driver = nonebot.get_driver()
+    driver.register_adapter(v11.Adapter)
+    driver.register_adapter(v12.Adapter)

liteyuki/utils/adapter_manager/satori.py

@@ -0,0 +1,26 @@
+import json
+import os
+
+import nonebot
+from nonebot.adapters import satori
+
+
+def init(config: dict):
+    if config.get("satori", None) is None:
+        nonebot.logger.info("Satori config not found, skip Satori init.")
+        return None
+    satori_config = config.get("satori")
+    if not satori_config.get("enable", False):
+        nonebot.logger.info("Satori not enabled, skip Satori init.")
+        return None
+    if os.getenv("SATORI_CLIENTS", None) is not None:
+        nonebot.logger.info("Satori clients already set in environment variable, skip.")
+    os.environ["SATORI_CLIENTS"] = json.dumps(satori_config.get("hosts", []), ensure_ascii=False)
+    config['satori_clients'] = satori_config.get("hosts", [])
+    return
+
+
+def register():
+    if os.getenv("SATORI_CLIENTS", None) is not None:
+        driver = nonebot.get_driver()
+        driver.register_adapter(satori.Adapter)

liteyuki/utils/base/config.py

@@ -1,4 +1,5 @@
 import os
+from typing import List
 
 import nonebot
 import yaml
@@ -11,12 +12,26 @@ from ..message.tools import random_hex_string
 config = {}  # 全局配置，确保加载后读取
 
 
+class SatoriNodeConfig(BaseModel):
+    host: str = ""
+    port: str = "5500"
+    path: str = ""
+    token: str = ""
+
+
+class SatoriConfig(BaseModel):
+    comment: str = "These features are still in development. Do not enable in production environment."
+    enable: bool = False
+    hosts: List[SatoriNodeConfig] = [SatoriNodeConfig()]
+
+
 class BasicConfig(BaseModel):
     host: str = "127.0.0.1"
     port: int = 20216
     superusers: list[str] = []
     command_start: list[str] = ["/", ""]
     nickname: list[str] = [f"LiteyukiBot-{random_hex_string(6)}"]
+    satori: SatoriConfig = SatoriConfig()
 
 
 def load_from_yaml(file: str) -> dict:

liteyuki/utils/base/ly_typing.py

@@ -4,5 +4,5 @@ from nonebot.adapters import satori
 T_Bot = v11.Bot | v12.Bot | satori.Bot
 T_GroupMessageEvent = v11.GroupMessageEvent | v12.GroupMessageEvent
 T_PrivateMessageEvent = v11.PrivateMessageEvent | v12.PrivateMessageEvent
-T_MessageEvent = v11.MessageEvent | v12.MessageEvent # | satori.MessageEvent
+T_MessageEvent = v11.MessageEvent | v12.MessageEvent | satori.MessageEvent
 T_Message = v11.Message | v12.Message | satori.Message

liteyuki/utils/driver_manager/__init__.py

@@ -0,0 +1,6 @@
+from .auto_set_env import auto_set_env
+
+
+def init(config: dict):
+    auto_set_env(config)
+    return

liteyuki/utils/driver_manager/auto_set_env.py

@@ -0,0 +1,21 @@
+import os
+
+import dotenv
+import nonebot
+
+from .defines import *
+
+
+def auto_set_env(config: dict):
+    dotenv.load_dotenv(".env")
+    if os.getenv("DRIVER", None) is not None:
+        print(os.getenv("DRIVER"))
+        nonebot.logger.info("Driver already set in environment variable, skip auto configure.")
+        return
+    if config.get("satori", {'enable': False}).get("enable", False):
+        os.environ["DRIVER"] = get_driver_string(ASGI_DRIVER, HTTPX_DRIVER, WEBSOCKETS_DRIVER)
+        nonebot.logger.info("Enable Satori, set driver to ASGI+HTTPX+WEBSOCKETS")
+    else:
+        os.environ["DRIVER"] = get_driver_string(ASGI_DRIVER)
+        nonebot.logger.info("Disable Satori, set driver to ASGI")
+    return

liteyuki/utils/driver_manager/defines.py

@@ -0,0 +1,17 @@
+ASGI_DRIVER = "~fastapi"
+HTTPX_DRIVER = "~httpx"
+WEBSOCKETS_DRIVER = "~websockets"
+
+
+def get_driver_string(*argv):
+    output_string = ""
+    if ASGI_DRIVER in argv:
+        output_string += ASGI_DRIVER
+    for arg in argv:
+        if arg != ASGI_DRIVER:
+            output_string = f"{output_string}+{arg}"
+    return output_string
+
+
+def get_driver_full_string(*argv):
+    return f"DRIVER={get_driver_string(argv)}"

liteyuki/utils/event/__init__.py

@@ -0,0 +1 @@
+from .get_info import *

liteyuki/utils/event/get_info.py

@@ -15,3 +15,10 @@ def get_group_id(event: T_MessageEvent):
         return event.guild.id
     else:
         return event.group_id
+
+
+def get_message_type(event: T_MessageEvent) -> str:
+    if isinstance(event, satori.event.Event):
+        return "private" if event.guild is None else "group"
+    else:
+        return event.message_type

liteyuki/utils/satori_utils/__init__.py

@@ -1,5 +1,3 @@
 from .user_info import user_infos
-from .get_message_type import get_message_type
-from .event_tools import *
 from .count_friends import count_friends
 from .count_groups import count_groups

liteyuki/utils/satori_utils/get_message_type.py

@@ -1,10 +0,0 @@
-from nonebot.adapters import satori
-
-from liteyuki.utils.base.ly_typing import T_MessageEvent
-
-
-def get_message_type(event: T_MessageEvent) -> str:
-    if isinstance(event, satori.event.Event):
-        return "private" if event.guild is None else "group"
-    else:
-        return event.message_type

liteyuki/utils/satori_utils/user_info.py

@@ -28,8 +28,34 @@ class UserInfo:
         except KeyError:
             return None
 
-    async def put(self, user: User):
+    async def put(self, user: User) -> bool:
+        """
+        向用户信息数据库中添加/修改一项，返回值仅代表数据是否变更，不代表操作是否成功
+        Args:
+            user: 要加入数据库的用户
+
+        Returns: 当数据库中用户信息发生变化时返回 True, 否则返回 False
+
+        """
+        try:
+            old_user: User = self.user_infos[str(user.id)]
+            attr_edited = False
+            if user.name is not None:
+                if old_user.name != user.name:
+                    attr_edited = True
+                    self.user_infos[str(user.id)].name = user.name
+            if user.nick is not None:
+                if old_user.nick != user.nick:
+                    attr_edited = True
+                    self.user_infos[str(user.id)].nick = user.nick
+            if user.avatar is not None:
+                if old_user.avatar != user.avatar:
+                    attr_edited = True
+                    self.user_infos[str(user.id)].avatar = user.avatar
+            return attr_edited
+        except KeyError:
             self.user_infos[str(user.id)] = user
+            return True
 
     def __init__(self):
         pass

main.py

@@ -1,7 +1,7 @@
 import nonebot
 from nonebot.adapters.onebot import v11, v12
 from nonebot.adapters import satori
-from liteyuki.utils import init
+from liteyuki.utils import init, driver_manager, adapter_manager
 from liteyuki.utils.base.config import load_from_yaml
 from liteyuki.utils.base.data_manager import StoredConfig, common_db
 from liteyuki.utils.base.ly_api import liteyuki_api
@@ -11,16 +11,22 @@ if __name__ == "__mp_main__":
     store_config: dict = common_db.where_one(StoredConfig(), default=StoredConfig()).config
     static_config = load_from_yaml("config.yml")
     store_config.update(static_config)
+    driver_manager.init(config=store_config)
+    adapter_manager.init(store_config)
     nonebot.init(**store_config)
 
-    if not store_config.get("enable_satori", False):
+    adapter_manager.register()
-        adapters = [v11.Adapter, v12.Adapter]
-    else:
-        adapters = [v11.Adapter, v12.Adapter, satori.Adapter]
-    driver = nonebot.get_driver()
 
-    for adapter in adapters:
+    # print(nonebot.get_adapters()['Satori'].__dict__)
-        driver.register_adapter(adapter)
+
+    # if not store_config.get("enable_satori", False):
+    #     adapters = [v11.Adapter, v12.Adapter]
+    # else:
+    #     adapters = [v11.Adapter, v12.Adapter, satori.Adapter]
+    # driver = nonebot.get_driver()
+    # # print(driver.__dict__)
+    # for adapter in adapters:
+    #     driver.register_adapter(adapter)
 
     try:
         nonebot.load_plugin("liteyuki.liteyuki_main")

requirements.txt

@@ -23,3 +23,7 @@ importlib_metadata~=7.0.2
 requests~=2.31.0
 watchdog~=4.0.0
 pillow~=10.2.0
+
+pip~=23.2.1
+fastapi~=0.110.0
+python-dotenv~=1.0.1