🐛 version 0.17.1

fix several bugs

Author: RF-Tar-Railt

arclet/entari/__init__.py

@@ -90,4 +90,4 @@
 WS = WebsocketsInfo
 WH = WebhookInfo
 
-__version__ = "0.17.0"
+__version__ = "0.17.1"

arclet/entari/exceptions.py

@@ -1,7 +1,11 @@
+from .utils import escape_tag
+
+
 class RegisterNotInPluginError(Exception):
     def __init__(self, func, mod, pid):
         self.msg = f"""\
-Handler `{func.__qualname__}` from {func.__module__!r} should define in the same module as the plugin: {mod.__name__!r}.
+Handler `{escape_tag(func.__qualname__)}` from {func.__module__!r}\
+ should define in the same module as the plugin: {mod.__name__!r}.
 
 Please choose one of the following solutions before import it:
  * add {func.__module__!r} to your config file.
@@ -18,7 +22,7 @@ def __init__(self, func, mod, pid):
 
             panel = Panel(
                 f"""\
-[cyan]Handler [bright_yellow]`{func.__qualname__}`[/] from [blue]{func.__module__!r}\
+[cyan]Handler [bright_yellow]`{escape_tag(func.__qualname__)}`[/] from [blue]{func.__module__!r}\
 [/] should define [u bright_white]in the same module[/] as the plugin: [blue]{mod.__name__!r}[/].
 
 Please choose one of the following solutions:

arclet/entari/logger.py

@@ -4,7 +4,6 @@
 import inspect
 import logging
 from pathlib import Path
-import re
 import sys
 import traceback
 from types import TracebackType
@@ -14,6 +13,8 @@
 from loguru import logger
 from satori.parser import snake_case
 
+from .utils import escape_tag
+
 if TYPE_CHECKING:
     from loguru import Logger, Record
 
@@ -22,17 +23,6 @@
 DEBUG_NO = logger.level("DEBUG").no
 
 
-def escape_tag(s: str) -> str:
-    """用于记录带颜色日志时转义 `<tag>` 类型特殊标签
-
-    参考: [loguru color 标签](https://loguru.readthedocs.io/en/stable/api/logger.html#color)
-
-    参数:
-        s: 需要转义的字符串
-    """
-    return re.sub(r"</?((?:[fb]g\s)?[^<>\s]*)>", r"\\\g<0>", s)
-
-
 class LoggerManager:
     def __init__(self):
         self.loggers: dict[str, Logger] = {}

arclet/entari/plugin/__init__.py

@@ -17,7 +17,8 @@
 from ..event.lifespan import Ready
 from ..event.plugin import PluginLoadedFailed
 from ..exceptions import RegisterNotInPluginError, ReusablePluginError, StaticPluginDispatchError
-from ..logger import escape_tag, log
+from ..logger import log
+from ..utils import escape_tag
 from .model import PluginMetadata as PluginMetadata
 from .model import RootlessPlugin as RootlessPlugin
 from .model import TS, Plugin, PluginDispatcher

arclet/entari/plugin/model.py

@@ -526,6 +526,8 @@ def validate(self, func):
         if isinstance(func, Subscriber):
             func = func.callable_target
         if func.__module__ != self.module.__name__:
+            if func.__module__.startswith("arclet.entari"):
+                return
             if "__plugin__" in func.__globals__ and func.__globals__["__plugin__"] is self:
                 return
             raise RegisterNotInPluginError(func, self.module, self.id)

arclet/entari/plugin/module.py

@@ -250,15 +250,17 @@ def exec_module(self, module: ModuleType, config: dict[str, Any] | None = None)
             is_sub = True
             if config is None or not {k: v for k, v in config.items() if k not in ("$path", "$static")}:
                 config = plugin.config.copy()
+                config["$path"] = plugin._config_key
             for key in config:
                 if key.startswith(".") and self.plugin_id.endswith(key):
                     config = config[key]
+                    config["$path"] = plugin._config_key  # type: ignore
                     break
 
         if self.loaded:
             return
 
-        if config is None or not {k: v for k, v in config.items() if k not in ("$path", "$static")}:
+        if config is None or (not is_sub and not {k: v for k, v in config.items() if k not in ("$path", "$static")}):
             key = module.__name__
             if key.startswith("arclet.entari.builtins.") and f"::{key[23:]}" in EntariConfig.instance.plugin:
                 key = f"::{key[23:]}"
@@ -378,6 +380,9 @@ def find_spec(
             if module_spec.parent and module_spec.parent == plug.module.__name__:
                 module_spec.loader = PluginLoader(fullname, module_origin, origin_id_ or fullname, plug.id)
                 return module_spec
+            elif module_spec.parent == module_spec.name and module_spec.name.rpartition(".")[0] == plug.module.__name__:
+                module_spec.loader = PluginLoader(fullname, module_origin, origin_id_ or fullname, plug.id)
+                return module_spec
             elif module_spec.name in _SUBMODULE_WAITLIST.get(plug.module.__name__, ()):
                 module_spec.loader = PluginLoader(fullname, module_origin, origin_id_ or fullname, plug.id)
                 # plugin_service.referents.setdefault(module_spec.name, set()).add(plug.id)

arclet/entari/utils.py

@@ -0,0 +1,12 @@
+import re
+
+
+def escape_tag(s: str) -> str:
+    """用于记录带颜色日志时转义 `<tag>` 类型特殊标签
+
+    参考: [loguru color 标签](https://loguru.readthedocs.io/en/stable/api/logger.html#color)
+
+    参数:
+        s: 需要转义的字符串
+    """
+    return re.sub(r"</?((?:[fb]g\s)?[^<>\s]*)>", r"\\\g<0>", s)