✨ $prefix.plugins support read from $files

Author: RF-Tar-Railt

arclet/entari/command/plugin.py

@@ -75,6 +75,7 @@ def execute_hook(sub: Subscriber):
                 SubscriberSlot(sub, exec_pub.id, sub.priority)
             )
             sub._recompile([exec_provider])
+            sub.propagate(_after_execute)
 
         self.plugin.collect(self.register_hooks.append(execute_hook))
         return self  # type: ignore[return-value]

arclet/entari/config/file.py

@@ -129,14 +129,9 @@ def plugin_names(self) -> list[str]:
         return list(chain.from_iterable(self._plugin_names.values()))
 
     def _reload_plugins(self):
-        self.plugin_extra_files: list[str] = self.plugin.get("$files", [])  # type: ignore
+        self.plugin_extra_files = self.plugin.get("$files", [])  # type: ignore
         self.prelude_plugin = self.plugin.get("$prelude", [])  # type: ignore
-        plugin_prefixes = {item["key"]: item["plugins"] for item in self.plugin.get("$prefix", [])}  # type: ignore
-        inverted = defaultdict(list)
-        for key, plugs in plugin_prefixes.items():
-            for plug in plugs:
-                inverted[plug].append(key)
-        self.plugin_prefixes = dict(inverted)
+
         for key in list(self.plugin.keys()):
             if key.startswith("$"):
                 continue
@@ -149,17 +144,36 @@ def _reload_plugins(self):
                 key = key[1:]
                 value["$optional"] = True
             self.plugin[key] = value
+        extra_plugins: dict[str, list[str]] = {}
         for file in self.plugin_extra_files:
             path = Path(file)
             if not path.exists():
                 raise FileNotFoundError(file)
+            _plugins = extra_plugins.setdefault(file, [])
             if path.is_dir():
                 for _path in path.iterdir():
                     if not _path.is_file() or _path.name.endswith(".schema.json"):
                         continue
                     self.plugin[_path.stem] = self.loader(_path)
+                    _plugins.append(_path.stem)
             elif path.name.endswith(".schema.json"):
                 self.plugin[path.stem] = self.loader(path)
+                _plugins.append(path.stem)
+
+        plugin_prefixes = {}
+        for item in self.plugin.get("$prefix", []):  # type: ignore
+            if "key" not in item or "plugins" not in item:
+                continue
+            _prefixes = plugin_prefixes.setdefault(item["key"], [])
+            if isinstance(item["plugins"], list):
+                _prefixes.extend(item["plugins"])
+            elif isinstance(item["plugins"], str) and item["plugins"] in extra_plugins:
+                _prefixes.extend(extra_plugins[item["plugins"]])
+        inverted = defaultdict(list)
+        for key, plugs in plugin_prefixes.items():
+            for plug in plugs:
+                inverted[plug].append(key)
+        self.plugin_prefixes = dict(inverted)
 
         slots = [
             (name, self.plugin[name].get("$priority", 16))
@@ -302,7 +316,7 @@ def generate_schema(self, plugins: list["Plugin"]):
             else:
                 plugins_properties[plug._config_key] = {"type": "object", "description": "No configuration required", "additionalProperties": True, "properties": plugin_meta_properties}  # noqa: E501
         schemas = {
-            "basic": config_model_schema(BasicConfig, ref_root="/properties/basic/"), "plugins": {"type": "object", "description": "Plugin configurations", "properties": {"$prefix": {"description": "List of prefix config", "items": {"properties": {"key": {"description": "Prefix key", "title": "Key", "type": "string"}, "plugins": {"description": "List of plugins under the prefix", "items": {"type": "string", "description": "Plugin name"}, "title": "Plugins", "type": "array", "uniqueItems": True}}, "required": ["key"], "title": "Prefix Config", "type": "object"}, "type": "array"}, "$prelude": {"type": "array", "items": {"type": "string", "description": "Plugin name"}, "description": "List of prelude plugins to load", "default": [], "uniqueItems": True}, "$files": {"type": "array", "items": {"type": "string", "description": "File path"}, "description": "List of configuration files to load", "default": [], "uniqueItems": True}, **plugins_properties}}, "adapters": {"type": "array", "description": "Adapter configurations", "items": {"type": "object", "description": "Adapter configuration", "properties": {"$path": {"type": "string", "description": "Adapter Module Path"}}, "required": ["$path"], "additionalProperties": True}}  # noqa: E501
+            "basic": config_model_schema(BasicConfig, ref_root="/properties/basic/"), "plugins": {"type": "object", "description": "Plugin configurations", "properties": {"$prefix": {"description": "List of prefix config", "items": {"properties": {"key": {"description": "Prefix key", "title": "Key", "type": "string"}, "plugins": {"anyOf": [{"type": "string"}, {"items": {"type": "string", "description": "Plugin name"}, "type": "array", "uniqueItems": True}], "description": "List of plugins under the prefix, or select an item of $files to apply plugins", "title": "Plugins"}}, "required": ["key"], "title": "Prefix Config", "type": "object"}, "type": "array"}, "$prelude": {"type": "array", "items": {"type": "string", "description": "Plugin name"}, "description": "List of prelude plugins to load", "default": [], "uniqueItems": True}, "$files": {"type": "array", "items": {"type": "string", "description": "File path"}, "description": "List of configuration files to load", "default": [], "uniqueItems": True}, **plugins_properties}}, "adapters": {"type": "array", "description": "Adapter configurations", "items": {"type": "object", "description": "Adapter configuration", "properties": {"$path": {"type": "string", "description": "Adapter Module Path"}}, "required": ["$path"], "additionalProperties": True}}  # noqa: E501
         }
         with open(f"{self.path.stem}.schema.json", "w", encoding="utf-8") as f:
             json.dump({"$schema": "https://json-schema.org/draft/2020-12/schema", "type": "object", "properties": schemas, "additionalProperties": False, "required": ["basic"]}, f, indent=2, ensure_ascii=False)  # noqa: E501

arclet/entari/config/util.py

@@ -9,10 +9,16 @@
 _DESC_CACHE = {}
 
 
-class GetattrDict:
+class GetattrDict(Mapping):
     def __init__(self, source: Mapping):
         self._source = source
 
+    def __iter__(self):
+        return iter(self._source)
+
+    def __len__(self):
+        return len(self._source)
+
     def __getitem__(self, item):
         ans = self._source[item]
         if isinstance(ans, Mapping):

arclet/entari/filter/parse.py

@@ -2,14 +2,17 @@
 import operator
 import os
 import re
+from functools import wraps
 
 import simpleeval
+from arclet.letoderea import STOP, Propagator
 from satori import Channel, ChannelType, EventType, Guild, Member, Role, User
 
 from ..config import EntariConfig
 from ..config.util import GetattrDict
 from ..session import Session
 
+# simpleeval._PRIMITIVE_TYPES = frozenset({int, float, str, bool, type(None), bytes, complex})
 NAMES = {
     "type": EventType.MESSAGE_CREATED,
     "channel": Channel(id="123", type=ChannelType.TEXT),
@@ -85,8 +88,8 @@ def parse_filter(expr: str):
     try:
         parsed = s.parse(expr)
         s._eval(parsed)
-    except (simpleeval.InvalidExpression, TypeError, ValueError, NameError, SyntaxError):
-        raise RuntimeError(f"Invalid filter expression: {expr}") from None
+    except (simpleeval.InvalidExpression, TypeError, ValueError, NameError, SyntaxError) as e:
+        raise RuntimeError(f"Invalid filter expression ({e}): {expr}") from None
 
     async def check(session: Session | None = None, is_reply_me: bool = False, is_notice_me: bool = False):
         if not session:
@@ -116,3 +119,17 @@ async def check(session: Session | None = None, is_reply_me: bool = False, is_no
         return bool(s._eval(parsed))
 
     return check
+
+
+class FilterPropagator(Propagator):
+    def __init__(self, expr: str):
+        self.callable = parse_filter(expr)
+
+    def compose(self):
+
+        @wraps(self.callable)
+        async def _(*args, **kwargs):
+            if not await self.callable(*args, **kwargs):
+                return STOP
+
+        yield _, True, 0

arclet/entari/plugin/__init__.py

@@ -421,17 +421,16 @@ async def disable_plugin(plugin: str):
 def component(name: str):
     _plugin = get_plugin(1)
 
-    def dispose():
-        COMPONENTS.pop(f"component:{name}", None)
-
-    _plugin.collect(dispose)
-
     def wrapper(func: Render[Session, Awaitable[Fragment]]):
         async def render(attrs: dict, children: list, session: Session):
             ans = await func(attrs, children, session)
             return await component_transform(session, MessageChain(ans))
 
-        COMPONENTS[f"component:{name}"] = render
+        def _():
+            COMPONENTS[f"component:{name}"] = render
+            return lambda: COMPONENTS.pop(f"component:{name}", None)
+
+        _plugin.effect(_, f"component:{name}")
         return func
 
     return wrapper

arclet/entari/plugin/model.py

@@ -40,7 +40,7 @@
 from ..event.config import ConfigReload
 from ..event.plugin import PluginLoadedFailed, PluginUnloaded
 from ..exceptions import RegisterNotInPluginError, ReusablePluginError, StaticPluginDispatchError
-from ..filter.parse import evaluate_disable, parse_filter
+from ..filter.parse import FilterPropagator, evaluate_disable
 from ..logger import log
 from .service import plugin_service
 
@@ -378,7 +378,7 @@ def __post_init__(self):
         plugin_service.plugins[self.id] = self  # type: ignore
         self._config_key = self.config.pop("$path", self.id)
         if filter_expr := self.config.get("$filter", ""):
-            self._scope.propagators.append(enter_if.priority(0) & parse_filter(filter_expr))
+            self._scope.propagators.append(FilterPropagator(filter_expr))
         # if self._metadata and self._metadata.depend_services:
         #     self._scope.propagators.append(inject(*self._metadata.depend_services, _is_global=True))  # type: ignore
         #     self._extra["injected_services"] = [