refactor: 修改引入风格

pkg/qqbot/cmds/aamgr.py

@@ -1,10 +1,7 @@
-import importlib
-import inspect
 import logging
 import copy
 import pkgutil
 import traceback
-import types
 import json
 
 

pkg/qqbot/cmds/funcs/draw.py

@@ -1,11 +1,12 @@
-from ..aamgr import AbstractCommandNode, Context
 import logging
 
-from mirai import Image
+import mirai
+
+from .. import aamgr
 import config
 
 
-@AbstractCommandNode.register(
+@aamgr.AbstractCommandNode.register(
     parent=None,
     name="draw",
     description="使用DALL·E生成图片",
@@ -13,9 +14,9 @@ import config
     aliases=[],
     privilege=1
 )
-class DrawCommand(AbstractCommandNode):
+class DrawCommand(aamgr.AbstractCommandNode):
     @classmethod
-    def process(cls, ctx: Context) -> tuple[bool, list]:
+    def process(cls, ctx: aamgr.Context) -> tuple[bool, list]:
         import pkg.openai.session
 
         reply = []
@@ -28,7 +29,7 @@ class DrawCommand(AbstractCommandNode):
             res = session.draw_image(" ".join(ctx.params))
 
             logging.debug("draw_image result:{}".format(res))
-            reply = [Image(url=res['data'][0]['url'])]
+            reply = [mirai.Image(url=res['data'][0]['url'])]
             if not (hasattr(config, 'include_image_description')
                     and not config.include_image_description):
                 reply.append(" ".join(ctx.params))

pkg/qqbot/cmds/funcs/func.py

@@ -1,10 +1,9 @@
-from ..aamgr import AbstractCommandNode, Context
 import logging
-
 import json
 
+from .. import aamgr
 
-@AbstractCommandNode.register(
+@aamgr.AbstractCommandNode.register(
     parent=None,
     name="func",
     description="管理内容函数",
@@ -12,9 +11,9 @@ import json
     aliases=[],
     privilege=1
 )
-class FuncCommand(AbstractCommandNode):
+class FuncCommand(aamgr.AbstractCommandNode):
     @classmethod
-    def process(cls, ctx: Context) -> tuple[bool, list]:
+    def process(cls, ctx: aamgr.Context) -> tuple[bool, list]:
         from pkg.plugin.models import host
 
         reply = []

pkg/qqbot/cmds/plugin/plugin.py

@@ -1,12 +1,9 @@
-from ..aamgr import AbstractCommandNode, Context
-
-import os
-
-import pkg.plugin.host as plugin_host
-import pkg.utils.updater as updater
+from ....plugin import host as plugin_host
+from ....utils import updater
+from .. import aamgr
 
 
-@AbstractCommandNode.register(
+@aamgr.AbstractCommandNode.register(
     parent=None,
     name="plugin",
     description="插件管理",
@@ -14,9 +11,9 @@ import pkg.utils.updater as updater
     aliases=[],
     privilege=1
 )
-class PluginCommand(AbstractCommandNode):
+class PluginCommand(aamgr.AbstractCommandNode):
     @classmethod
-    def process(cls, ctx: Context) -> tuple[bool, list]:
+    def process(cls, ctx: aamgr.Context) -> tuple[bool, list]:
         reply = []
         plugin_list = plugin_host.__plugins__
         if len(ctx.params) == 0:
@@ -48,7 +45,7 @@ class PluginCommand(AbstractCommandNode):
             return False, []
 
     
-@AbstractCommandNode.register(
+@aamgr.AbstractCommandNode.register(
     parent=PluginCommand,
     name="get",
     description="安装插件",
@@ -56,9 +53,9 @@ class PluginCommand(AbstractCommandNode):
     aliases=[],
     privilege=2
 )
-class PluginGetCommand(AbstractCommandNode):
+class PluginGetCommand(aamgr.AbstractCommandNode):
     @classmethod
-    def process(cls, ctx: Context) -> tuple[bool, list]:
+    def process(cls, ctx: aamgr.Context) -> tuple[bool, list]:
         import threading
         import logging
         import pkg.utils.context
@@ -81,7 +78,7 @@ class PluginGetCommand(AbstractCommandNode):
         return True, reply
 
 
-@AbstractCommandNode.register(
+@aamgr.AbstractCommandNode.register(
     parent=PluginCommand,
     name="update",
     description="更新指定插件或全部插件",
@@ -89,9 +86,9 @@ class PluginGetCommand(AbstractCommandNode):
     aliases=[],
     privilege=2
 )
-class PluginUpdateCommand(AbstractCommandNode):
+class PluginUpdateCommand(aamgr.AbstractCommandNode):
     @classmethod
-    def process(cls, ctx: Context) -> tuple[bool, list]:
+    def process(cls, ctx: aamgr.Context) -> tuple[bool, list]:
         import threading
         import logging
         plugin_list = plugin_host.__plugins__
@@ -130,7 +127,7 @@ class PluginUpdateCommand(AbstractCommandNode):
         return True, reply
 
 
-@AbstractCommandNode.register(
+@aamgr.AbstractCommandNode.register(
     parent=PluginCommand,
     name="del",
     description="删除插件",
@@ -138,9 +135,9 @@ class PluginUpdateCommand(AbstractCommandNode):
     aliases=[],
     privilege=2
 )
-class PluginDelCommand(AbstractCommandNode):
+class PluginDelCommand(aamgr.AbstractCommandNode):
     @classmethod
-    def process(cls, ctx: Context) -> tuple[bool, list]:
+    def process(cls, ctx: aamgr.Context) -> tuple[bool, list]:
         plugin_list = plugin_host.__plugins__
         reply = []
 
@@ -157,7 +154,7 @@ class PluginDelCommand(AbstractCommandNode):
         return True, reply
 
 
-@AbstractCommandNode.register(
+@aamgr.AbstractCommandNode.register(
     parent=PluginCommand,
     name="on",
     description="启用指定插件",
@@ -165,7 +162,7 @@ class PluginDelCommand(AbstractCommandNode):
     aliases=[],
     privilege=2
 )
-@AbstractCommandNode.register(
+@aamgr.AbstractCommandNode.register(
     parent=PluginCommand,
     name="off",
     description="禁用指定插件",
@@ -173,9 +170,9 @@ class PluginDelCommand(AbstractCommandNode):
     aliases=[],
     privilege=2
 )
-class PluginOnOffCommand(AbstractCommandNode):
+class PluginOnOffCommand(aamgr.AbstractCommandNode):
     @classmethod
-    def process(cls, ctx: Context) -> tuple[bool, list]:
+    def process(cls, ctx: aamgr.Context) -> tuple[bool, list]:
         import pkg.plugin.switch as plugin_switch
 
         plugin_list = plugin_host.__plugins__

pkg/qqbot/cmds/session/default.py

@@ -1,7 +1,6 @@
-from ..aamgr import AbstractCommandNode, Context
+from .. import aamgr
 
-
-@AbstractCommandNode.register(
+@aamgr.AbstractCommandNode.register(
     parent=None,
     name="default",
     description="操作情景预设",
@@ -9,9 +8,9 @@ from ..aamgr import AbstractCommandNode, Context
     aliases=[],
     privilege=1
 )
-class DefaultCommand(AbstractCommandNode):
+class DefaultCommand(aamgr.AbstractCommandNode):
     @classmethod
-    def process(cls, ctx: Context) -> tuple[bool, list]:
+    def process(cls, ctx: aamgr.Context) -> tuple[bool, list]:
         import pkg.openai.session
         session_name = ctx.session_name
         params = ctx.params
@@ -45,7 +44,7 @@ class DefaultCommand(AbstractCommandNode):
         return True, reply
 
 
-@AbstractCommandNode.register(
+@aamgr.AbstractCommandNode.register(
     parent=DefaultCommand,
     name="set",
     description="设置默认情景预设",
@@ -53,9 +52,9 @@ class DefaultCommand(AbstractCommandNode):
     aliases=[],
     privilege=2
 )
-class DefaultSetCommand(AbstractCommandNode):
+class DefaultSetCommand(aamgr.AbstractCommandNode):
     @classmethod
-    def process(cls, ctx: Context) -> tuple[bool, list]:
+    def process(cls, ctx: aamgr.Context) -> tuple[bool, list]:
         reply = []
 
         if len(ctx.crt_params) == 0:

pkg/qqbot/cmds/session/del.py

@@ -1,8 +1,7 @@
-from ..aamgr import AbstractCommandNode, Context
-import datetime
+from .. import aamgr
 
 
-@AbstractCommandNode.register(
+@aamgr.AbstractCommandNode.register(
     parent=None,
     name="del",
     description="删除当前会话的历史记录",
@@ -10,9 +9,9 @@ import datetime
     aliases=[],
     privilege=1
 )
-class DelCommand(AbstractCommandNode):
+class DelCommand(aamgr.AbstractCommandNode):
     @classmethod
-    def process(cls, ctx: Context) -> tuple[bool, list]:
+    def process(cls, ctx: aamgr.Context) -> tuple[bool, list]:
         import pkg.openai.session
         session_name = ctx.session_name
         params = ctx.params
@@ -33,7 +32,7 @@ class DelCommand(AbstractCommandNode):
         return True, reply
 
 
-@AbstractCommandNode.register(
+@aamgr.AbstractCommandNode.register(
     parent=DelCommand,
     name="all",
     description="删除当前会话的全部历史记录",
@@ -41,9 +40,9 @@ class DelCommand(AbstractCommandNode):
     aliases=[],
     privilege=1
 )
-class DelAllCommand(AbstractCommandNode):
+class DelAllCommand(aamgr.AbstractCommandNode):
     @classmethod
-    def process(cls, ctx: Context) -> tuple[bool, list]:
+    def process(cls, ctx: aamgr.Context) -> tuple[bool, list]:
         import pkg.openai.session
         session_name = ctx.session_name
         reply = []

pkg/qqbot/cmds/session/delhst.py

@@ -1,7 +1,7 @@
-from ..aamgr import AbstractCommandNode, Context
+from .. import aamgr
 
 
-@AbstractCommandNode.register(
+@aamgr.AbstractCommandNode.register(
     parent=None,
     name="delhst",
     description="删除指定会话的所有历史记录",
@@ -9,9 +9,9 @@ from ..aamgr import AbstractCommandNode, Context
     aliases=[],
     privilege=2
 )
-class DelHistoryCommand(AbstractCommandNode):
+class DelHistoryCommand(aamgr.AbstractCommandNode):
     @classmethod
-    def process(cls, ctx: Context) -> tuple[bool, list]:
+    def process(cls, ctx: aamgr.Context) -> tuple[bool, list]:
         import pkg.openai.session
         import pkg.utils.context
         params = ctx.params
@@ -31,7 +31,7 @@ class DelHistoryCommand(AbstractCommandNode):
         return True, reply
     
 
-@AbstractCommandNode.register(
+@aamgr.AbstractCommandNode.register(
     parent=DelHistoryCommand,
     name="all",
     description="删除所有会话的全部历史记录",
@@ -39,9 +39,9 @@ class DelHistoryCommand(AbstractCommandNode):
     aliases=[],
     privilege=2
 )
-class DelAllHistoryCommand(AbstractCommandNode):
+class DelAllHistoryCommand(aamgr.AbstractCommandNode):
     @classmethod
-    def process(cls, ctx: Context) -> tuple[bool, list]:
+    def process(cls, ctx: aamgr.Context) -> tuple[bool, list]:
         import pkg.utils.context
         reply = []
         pkg.utils.context.get_database_manager().delete_all_session_history()

pkg/qqbot/cmds/session/last.py

@@ -1,8 +1,9 @@
-from ..aamgr import AbstractCommandNode, Context
 import datetime
 
+from .. import aamgr
 
-@AbstractCommandNode.register(
+
+@aamgr.AbstractCommandNode.register(
     parent=None,
     name="last",
     description="切换前一次对话",
@@ -10,9 +11,9 @@ import datetime
     aliases=[],
     privilege=1
 )
-class LastCommand(AbstractCommandNode):
+class LastCommand(aamgr.AbstractCommandNode):
     @classmethod
-    def process(cls, ctx: Context) -> tuple[bool, list]:
+    def process(cls, ctx: aamgr.Context) -> tuple[bool, list]:
         import pkg.openai.session
         session_name = ctx.session_name
 

pkg/qqbot/cmds/session/list.py

@@ -1,9 +1,10 @@
-from ..aamgr import AbstractCommandNode, Context
 import datetime
 import json
 
+from .. import aamgr
 
-@AbstractCommandNode.register(
+
+@aamgr.AbstractCommandNode.register(
     parent=None,
     name='list',
     description='列出当前会话的所有历史记录',
@@ -11,9 +12,9 @@ import json
     aliases=[],
     privilege=1
 )
-class ListCommand(AbstractCommandNode):
+class ListCommand(aamgr.AbstractCommandNode):
     @classmethod
-    def process(cls, ctx: Context) -> tuple[bool, list]:
+    def process(cls, ctx: aamgr.Context) -> tuple[bool, list]:
         import pkg.openai.session
         session_name = ctx.session_name
         params = ctx.params

pkg/qqbot/cmds/session/next.py

@@ -1,8 +1,9 @@
-from ..aamgr import AbstractCommandNode, Context
 import datetime
 
+from .. import aamgr
 
-@AbstractCommandNode.register(
+
+@aamgr.AbstractCommandNode.register(
     parent=None,
     name="next",
     description="切换后一次对话",
@@ -10,9 +11,9 @@ import datetime
     aliases=[],
     privilege=1
 )
-class NextCommand(AbstractCommandNode):
+class NextCommand(aamgr.AbstractCommandNode):
     @classmethod
-    def process(cls, ctx: Context) -> tuple[bool, list]:
+    def process(cls, ctx: aamgr.Context) -> tuple[bool, list]:
         import pkg.openai.session
         session_name = ctx.session_name
         reply = []

pkg/qqbot/cmds/session/prompt.py

@@ -1,8 +1,7 @@
-from ..aamgr import AbstractCommandNode, Context
-import datetime
+from .. import aamgr
 
 
-@AbstractCommandNode.register(
+@aamgr.AbstractCommandNode.register(
     parent=None,
     name="prompt",
     description="获取当前会话的前文",
@@ -10,9 +9,9 @@ import datetime
     aliases=[],
     privilege=1
 )
-class PromptCommand(AbstractCommandNode):
+class PromptCommand(aamgr.AbstractCommandNode):
     @classmethod
-    def process(cls, ctx: Context) -> tuple[bool, list]:
+    def process(cls, ctx: aamgr.Context) -> tuple[bool, list]:
         import pkg.openai.session
         session_name = ctx.session_name
         params = ctx.params

pkg/qqbot/cmds/session/resend.py

@@ -1,8 +1,7 @@
-from ..aamgr import AbstractCommandNode, Context
-import datetime
+from .. import aamgr
 
 
-@AbstractCommandNode.register(
+@aamgr.AbstractCommandNode.register(
     parent=None,
     name="resend",
     description="重新获取上一次问题的回复",
@@ -10,20 +9,22 @@ import datetime
     aliases=[],
     privilege=1
 )
-class ResendCommand(AbstractCommandNode):
+class ResendCommand(aamgr.AbstractCommandNode):
     @classmethod
-    def process(cls, ctx: Context) -> tuple[bool, list]:
-        import pkg.openai.session
+    def process(cls, ctx: aamgr.Context) -> tuple[bool, list]:
+        from ....openai import session as openai_session
+        from ....utils import context
+        from ....qqbot import message
         import config
         session_name = ctx.session_name
         reply = []
 
-        session = pkg.openai.session.get_session(session_name)
+        session = openai_session.get_session(session_name)
         to_send = session.undo()
 
-        mgr = pkg.utils.context.get_qqbot_manager()
+        mgr = context.get_qqbot_manager()
 
-        reply = pkg.qqbot.message.process_normal_message(to_send, mgr, config,
+        reply = message.process_normal_message(to_send, mgr, config,
                                                         ctx.launcher_type, ctx.launcher_id,
                                                         ctx.sender_id)
 

pkg/qqbot/cmds/session/reset.py

@@ -1,11 +1,11 @@
-from ..aamgr import AbstractCommandNode, Context
 import tips as tips_custom
 
-import pkg.openai.session
-import pkg.utils.context
+from .. import aamgr
+from ....openai import session
+from ....utils import context
 
 
-@AbstractCommandNode.register(
+@aamgr.AbstractCommandNode.register(
     parent=None,
     name='reset',
     description='重置当前会话',
@@ -13,21 +13,21 @@ import pkg.utils.context
     aliases=[],
     privilege=1
 )
-class ResetCommand(AbstractCommandNode):
+class ResetCommand(aamgr.AbstractCommandNode):
     @classmethod
-    def process(cls, ctx: Context) -> tuple[bool, list]:
+    def process(cls, ctx: aamgr.Context) -> tuple[bool, list]:
         params = ctx.params
         session_name = ctx.session_name
         
         reply = ""
 
         if len(params) == 0:
-            pkg.openai.session.get_session(session_name).reset(explicit=True)
+            session.get_session(session_name).reset(explicit=True)
             reply = [tips_custom.command_reset_message]
         else:
             try:
                 import pkg.openai.dprompt as dprompt
-                pkg.openai.session.get_session(session_name).reset(explicit=True, use_prompt=params[0])
+                session.get_session(session_name).reset(explicit=True, use_prompt=params[0])
                 reply = [tips_custom.command_reset_name_message+"{}".format(dprompt.mode_inst().get_full_name(params[0]))]
             except Exception as e:
                 reply = ["[bot]会话重置失败：{}".format(e)]

pkg/qqbot/cmds/system/cconfig.py

@@ -1,6 +1,7 @@
-from ..aamgr import AbstractCommandNode, Context
 import json
 
+from .. import aamgr
+
 
 def config_operation(cmd, params):
     reply = []
@@ -85,7 +86,7 @@ def config_operation(cmd, params):
     return reply
 
 
-@AbstractCommandNode.register(
+@aamgr.AbstractCommandNode.register(
     parent=None,
     name="cfg",
     description="配置项管理",
@@ -93,8 +94,8 @@ def config_operation(cmd, params):
     aliases=[],
     privilege=2
 )
-class CfgCommand(AbstractCommandNode):
+class CfgCommand(aamgr.AbstractCommandNode):
     @classmethod
-    def process(cls, ctx: Context) -> tuple[bool, list]:
+    def process(cls, ctx: aamgr.Context) -> tuple[bool, list]:
         return True, config_operation(ctx.command, ctx.params)
     

pkg/qqbot/cmds/system/cmd.py

@@ -1,7 +1,7 @@
-from ..aamgr import AbstractCommandNode, Context, __command_list__
+from .. import aamgr
 
 
-@AbstractCommandNode.register(
+@aamgr.AbstractCommandNode.register(
     parent=None,
     name="cmd",
     description="显示指令列表",
@@ -9,10 +9,10 @@ from ..aamgr import AbstractCommandNode, Context, __command_list__
     aliases=[],
     privilege=1
 )
-class CmdCommand(AbstractCommandNode):
+class CmdCommand(aamgr.AbstractCommandNode):
     @classmethod
-    def process(cls, ctx: Context) -> tuple[bool, list]:
-        command_list = __command_list__
+    def process(cls, ctx: aamgr.Context) -> tuple[bool, list]:
+        command_list = aamgr.__command_list__
 
         reply = []
 

pkg/qqbot/cmds/system/help.py

@@ -1,7 +1,7 @@
-from ..aamgr import AbstractCommandNode, Context
+from .. import aamgr
 
 
-@AbstractCommandNode.register(
+@aamgr.AbstractCommandNode.register(
     parent=None,
     name="help",
     description="显示自定义的帮助信息",
@@ -9,9 +9,9 @@ from ..aamgr import AbstractCommandNode, Context
     aliases=[],
     privilege=1
 )
-class HelpCommand(AbstractCommandNode):
+class HelpCommand(aamgr.AbstractCommandNode):
     @classmethod
-    def process(cls, ctx: Context) -> tuple[bool, list]:
+    def process(cls, ctx: aamgr.Context) -> tuple[bool, list]:
         import tips
         reply = ["[bot] "+tips.help_message + "\n请输入 !cmd 查看指令列表"]
 

pkg/qqbot/cmds/system/reload.py

@@ -1,7 +1,9 @@
-from ..aamgr import AbstractCommandNode, Context
 import threading
 
-@AbstractCommandNode.register(
+from .. import aamgr
+
+
+@aamgr.AbstractCommandNode.register(
     parent=None,
     name="reload",
     description="执行热重载",
@@ -9,9 +11,9 @@ import threading
     aliases=[],
     privilege=2
 )
-class ReloadCommand(AbstractCommandNode):
+class ReloadCommand(aamgr.AbstractCommandNode):
     @classmethod
-    def process(cls, ctx: Context) -> tuple[bool, list]:
+    def process(cls, ctx: aamgr.Context) -> tuple[bool, list]:
         reply = []
 
         import pkg.utils.reloader

pkg/qqbot/cmds/system/update.py

@@ -1,9 +1,10 @@
-from ..aamgr import AbstractCommandNode, Context
 import threading
 import traceback
 
+from .. import aamgr
 
-@AbstractCommandNode.register(
+
+@aamgr.AbstractCommandNode.register(
     parent=None,
     name="update",
     description="更新程序",
@@ -11,9 +12,9 @@ import traceback
     aliases=[],
     privilege=2
 )
-class UpdateCommand(AbstractCommandNode):
+class UpdateCommand(aamgr.AbstractCommandNode):
     @classmethod
-    def process(cls, ctx: Context) -> tuple[bool, list]:
+    def process(cls, ctx: aamgr.Context) -> tuple[bool, list]:
         reply = []
         import pkg.utils.updater
         import pkg.utils.reloader

pkg/qqbot/cmds/system/usage.py

@@ -1,8 +1,7 @@
-from ..aamgr import AbstractCommandNode, Context
-import logging
+from .. import aamgr
 
 
-@AbstractCommandNode.register(
+@aamgr.AbstractCommandNode.register(
     parent=None,
     name="usage",
     description="获取使用情况",
@@ -10,9 +9,9 @@ import logging
     aliases=[],
     privilege=1
 )
-class UsageCommand(AbstractCommandNode):
+class UsageCommand(aamgr.AbstractCommandNode):
     @classmethod
-    def process(cls, ctx: Context) -> tuple[bool, list]:
+    def process(cls, ctx: aamgr.Context) -> tuple[bool, list]:
         import config
         import pkg.utils.credit as credit
         import pkg.utils.context

pkg/qqbot/cmds/system/version.py

@@ -1,7 +1,7 @@
-from ..aamgr import AbstractCommandNode, Context
+from .. import aamgr
 
 
-@AbstractCommandNode.register(
+@aamgr.AbstractCommandNode.register(
     parent=None,
     name="version",
     description="查看版本信息",
@@ -9,9 +9,9 @@ from ..aamgr import AbstractCommandNode, Context
     aliases=[],
     privilege=1
 )
-class VersionCommand(AbstractCommandNode):
+class VersionCommand(aamgr.AbstractCommandNode):
     @classmethod
-    def process(cls, ctx: Context) -> tuple[bool, list]:
+    def process(cls, ctx: aamgr.Context) -> tuple[bool, list]:
         reply = []
         import pkg.utils.updater