Merge branch 'main' of https://github.com/LiteyukiStudio/LiteyukiBot

liteyuki/__init__.py

@@ -33,7 +33,9 @@ __all__ = [
         "logger",
 ]
 
-__version__ = "6.3.8"  # 测试版本号
+__version__ = "6.3.9"  # 测试版本号
+# 6.3.9
+# 更改了on语法
 
 # 6.3.8
 # 1. 初步添加对聊天的支持

liteyuki/comm/channel.py

@@ -38,7 +38,7 @@ class Channel(Generic[T]):
     有两种接收工作方式，但是只能选择一种，主动接收和被动接收，主动接收使用 `receive` 方法，被动接收使用 `on_receive` 装饰器
     """
 
-    def __init__(self, _id: str, type_check: Optional[bool] = None):
+    def __init__(self, _id: str = "", type_check: Optional[bool] = None):
         """
         初始化通道
         Args:
@@ -217,16 +217,6 @@ class Channel(Generic[T]):
             data = self.conn_recv.recv()
             self._run_on_sub_receive_funcs(data)
 
-    def __iter__(self):
-        return self
-
-    def __next__(self) -> Any:
-        return self.receive()
-
-    def __del__(self):
-        self.close()
-        logger.debug(f"Channel {self.name} deleted.")
-
 
 """子进程可用的主动和被动通道"""
 active_channel: Optional["Channel"] = None

liteyuki/comm/storage.py

@@ -8,7 +8,7 @@ from typing import Any, Coroutine, Optional, TypeAlias, Callable
 
 from liteyuki.comm import channel
 from liteyuki.comm.channel import Channel, ON_RECEIVE_FUNC, ASYNC_ON_RECEIVE_FUNC
-from liteyuki.utils import IS_MAIN_PROCESS, is_coroutine_callable, run_coroutine
+from liteyuki.utils import IS_MAIN_PROCESS, is_coroutine_callable, run_coroutine, run_coroutine_in_thread
 
 if IS_MAIN_PROCESS:
     _locks = {}
@@ -220,10 +220,10 @@ class KeyValueStore:
         """
         if IS_MAIN_PROCESS:
             if channel_ in _on_main_subscriber_receive_funcs and _on_main_subscriber_receive_funcs[channel_]:
-                run_coroutine(*[func(data) for func in _on_main_subscriber_receive_funcs[channel_]])
+                run_coroutine_in_thread(*[func(data) for func in _on_main_subscriber_receive_funcs[channel_]])
         else:
             if channel_ in _on_sub_subscriber_receive_funcs and _on_sub_subscriber_receive_funcs[channel_]:
-                run_coroutine(*[func(data) for func in _on_sub_subscriber_receive_funcs[channel_]])
+                run_coroutine_in_thread(*[func(data) for func in _on_sub_subscriber_receive_funcs[channel_]])
 
     def _start_receive_loop(self):
         """

liteyuki/message/matcher.py

@@ -34,16 +34,17 @@ class Matcher:
     def __str__(self):
         return f"Matcher(rule={self.rule}, priority={self.priority}, block={self.block})"
 
-    def handle(self, handler: EventHandler) -> EventHandler:
+    def handle(self) -> Callable[[EventHandler], EventHandler]:
         """
         添加处理函数，装饰器
-        Args:
-            handler:
         Returns:
-            EventHandler
+            装饰器 handler
         """
-        self.handlers.append(handler)
-        return handler
+        def decorator(handler: EventHandler) -> EventHandler:
+            self.handlers.append(handler)
+            return handler
+
+        return decorator
 
     async def run(self, event: MessageEvent) -> None:
         """

liteyuki/message/on.py

@@ -15,7 +15,7 @@ from liteyuki.comm.storage import shared_memory
 from liteyuki.log import logger
 from liteyuki.message.event import MessageEvent
 from liteyuki.message.matcher import Matcher
-from liteyuki.message.rule import Rule
+from liteyuki.message.rule import Rule, empty_rule
 
 _matcher_list: list[Matcher] = []
 _queue: Queue = Queue()
@@ -36,7 +36,7 @@ async def _(event: MessageEvent):
                 break
 
 
-def on_message(rule: Rule = Rule(), priority: int = 0, block: bool = True) -> Matcher:
+def on_message(rule: Rule = empty_rule, priority: int = 0, block: bool = False) -> Matcher:
     matcher = Matcher(rule, priority, block)
     # 按照优先级插入
     for i, m in enumerate(_matcher_list):
@@ -46,3 +46,10 @@ def on_message(rule: Rule = Rule(), priority: int = 0, block: bool = True) -> Ma
     else:
         _matcher_list.append(matcher)
     return matcher
+
+
+def on_keywords(keywords: list[str], rule=empty_rule, priority: int = 0, block: bool = False) -> Matcher:
+    @Rule
+    async def on_keywords_rule(event: MessageEvent):
+        return any(keyword in event.raw_message for keyword in keywords)
+    return on_message(on_keywords_rule & rule, priority, block)

liteyuki/message/rule.py

@@ -8,26 +8,37 @@ Copyright (C) 2020-2024 LiteyukiStudio. All Rights Reserved
 @File    : rule.py
 @Software: PyCharm
 """
-
+import inspect
 from typing import Optional, TypeAlias, Callable, Coroutine
 
 from liteyuki.message.event import MessageEvent
 
-RuleHandler: TypeAlias = Callable[[MessageEvent], Coroutine[None, None, bool]]
+RuleHandlerFunc: TypeAlias = Callable[[MessageEvent], Coroutine[None, None, bool]]
 """规则函数签名"""
 
 
 class Rule:
-    def __init__(self, handler: Optional[RuleHandler] = None):
+    def __init__(self, handler: RuleHandlerFunc):
         self.handler = handler
 
     def __or__(self, other: "Rule") -> "Rule":
-        return Rule(lambda event: self.handler(event) or other.handler(event))
+        async def combined_handler(event: MessageEvent) -> bool:
+            return await self.handler(event) or await other.handler(event)
+
+        return Rule(combined_handler)
 
     def __and__(self, other: "Rule") -> "Rule":
-        return Rule(lambda event: self.handler(event) and other.handler(event))
+        async def combined_handler(event: MessageEvent) -> bool:
+            return await self.handler(event) and await other.handler(event)
+
+        return Rule(combined_handler)
 
     async def __call__(self, event: MessageEvent) -> bool:
         if self.handler is None:
             return True
         return await self.handler(event)
+
+
+@Rule
+async def empty_rule(event: MessageEvent) -> bool:
+    return True

liteyuki/mkdoc.py

@@ -209,13 +209,14 @@ def get_module_info_normal(file_path: str, ignore_private: bool = True) -> Modul
     return module_info
 
 
-def generate_markdown(module_info: ModuleInfo, front_matter=None) -> str:
+def generate_markdown(module_info: ModuleInfo, front_matter=None, lang: str = "zh-CN") -> str:
     """
     生成模块的Markdown
     你可在此自定义生成的Markdown格式
     Args:
         module_info: 模块信息
         front_matter: 自定义选项title, index, icon, category
+        lang: 语言
     Returns:
         Markdown 字符串
     """
@@ -261,7 +262,13 @@ def generate_markdown(module_info: ModuleInfo, front_matter=None) -> str:
             method.docstring = method.docstring.replace("\n", "\n\n")
             content += f" {method.docstring}\n\n"
             # 函数源代码可展开区域
-            content += f"<details>\n<summary>源代码</summary>\n\n```python\n{method.source_code}\n```\n</details>\n\n"
+
+            if lang == "zh-CN":
+                TEXT_SOURCE_CODE = "源代码"
+            else:
+                TEXT_SOURCE_CODE = "Source Code"
+
+            content += f"<details>\n<summary>{TEXT_SOURCE_CODE}</summary>\n\n```python\n{method.source_code}\n```\n</details>\n\n"
         for attr in cls.attributes:
             content += f"### &emsp; ***attr*** `{attr.name}: {attr.type}`\n\n"
 
@@ -278,7 +285,7 @@ def generate_markdown(module_info: ModuleInfo, front_matter=None) -> str:
     return content
 
 
-def generate_docs(module_folder: str, output_dir: str, with_top: bool = False, ignored_paths=None):
+def generate_docs(module_folder: str, output_dir: str, with_top: bool = False, lang: str = "zh-CN", ignored_paths=None):
     """
     生成文档
     Args:
@@ -286,6 +293,7 @@ def generate_docs(module_folder: str, output_dir: str, with_top: bool = False, i
         output_dir: 输出文件夹
         with_top: 是否包含顶层文件夹 False时例如docs/api/module_a, docs/api/module_b， True时例如docs/api/module/module_a.md， docs/api/module/module_b.md
         ignored_paths: 忽略的路径
+        lang: 语言
     """
     if ignored_paths is None:
         ignored_paths = []
@@ -345,5 +353,5 @@ def generate_docs(module_folder: str, output_dir: str, with_top: bool = False, i
 # 入口脚本
 if __name__ == '__main__':
     # 这里填入你的模块路径
-    generate_docs('liteyuki', 'docs/dev/api', with_top=False, ignored_paths=["liteyuki/plugins"])
-    generate_docs('liteyuki', 'docs/en/dev/api', with_top=False, ignored_paths=["liteyuki/plugins"])
+    generate_docs('liteyuki', 'docs/dev/api', with_top=False, ignored_paths=["liteyuki/plugins"], lang="zh-CN")
+    generate_docs('liteyuki', 'docs/en/dev/api', with_top=False, ignored_paths=["liteyuki/plugins"], lang="en")

liteyuki/utils.py

@@ -5,6 +5,7 @@
 import asyncio
 import inspect
 import multiprocessing
+import threading
 from pathlib import Path
 from typing import Any, Callable, Coroutine
 
@@ -61,6 +62,16 @@ def run_coroutine(*coro: Coroutine):
         # 捕获其他异常，防止协程被重复等待
         logger.error(f"Exception occurred: {e}")
 
+def run_coroutine_in_thread(*coro: Coroutine):
+    """
+    在新线程中运行协程
+    Args:
+        coro:
+
+    Returns:
+
+    """
+    threading.Thread(target=run_coroutine, args=coro, daemon=True).start()
 
 def path_to_module_name(path: Path) -> str:
     """