ErisPulse 2.3.8__tar.gz → 2.3.9.dev1__tar.gz

{erispulse-2.3.8 → erispulse-2.3.9.dev1}/PKG-INFO

@@ -1,8 +1,8 @@
 Metadata-Version: 2.4
 Name: ErisPulse
-Version: 2.3.8
+Version: 2.3.9.dev1
 Summary: ErisPulse 是一个模块化、可扩展的异步 Python SDK 框架，主要用于构建高效、可维护的机器人应用程序。
-Author-email: "艾莉丝·格雷拉特(WSu2059)" <wsu2059@qq.com>
+Author-email: ErisDev <erisdev@88.com>
 Maintainer-email: "艾莉丝·格雷拉特(WSu2059)" <wsu2059@qq.com>
 License: MIT License
         

{erispulse-2.3.8 → erispulse-2.3.9.dev1}/pyproject.toml

@@ -4,14 +4,14 @@ build-backend = "hatchling.build"
 
 [project]
 name = "ErisPulse"
-version = "2.3.8"
+version = "2.3.9-dev.1"
 description = "ErisPulse 是一个模块化、可扩展的异步 Python SDK 框架，主要用于构建高效、可维护的机器人应用程序。"
 readme = "README.md"
 requires-python = ">=3.10"
 license = { file = "LICENSE" }
 
 authors = [
-    { name = "艾莉丝·格雷拉特(WSu2059)", email = "wsu2059@qq.com" }
+    { name = "ErisDev", email = "erisdev@88.com" }
 ]
 
 maintainers = [

{erispulse-2.3.8 → erispulse-2.3.9.dev1}/src/ErisPulse/Core/Bases/adapter.py

@@ -117,18 +117,41 @@ class SendDSL:
         """
         设置消息目标
         
+        支持自动类型转换：
+        - 当 target_type 为 "private" 时，自动转换为 "user"
+        - 当只提供 target_id（字符串或数字）时，默认推断为 "user"
+        
         :param target_type: 目标类型(可选)
         :param target_id: 目标ID(可选)
         :return: SendDSL实例
         
         :example:
+        >>> # 标准用法
         >>> adapter.Send.To("user", "123").Text("Hello")
-        >>> adapter.Send.To("123").Text("Hello")  # 简化形式
+        >>> # 自动转换 private → user
+        >>> adapter.Send.To("private", "123").Text("Hello")
+        >>> # 简化形式（默认推断为 user）
+        >>> adapter.Send.To("123").Text("Hello")
         """
+        from ..Event.session_type import is_standard_type
+        
+        # 处理简化形式：只提供一个参数作为 target_id
         if target_id is None and target_type is not None:
             target_id = target_type
             target_type = None
-
+        
+        # 如果没有明确指定 target_type，尝试推断
+        if target_type is None:
+            # 将 target_id 作为字符串处理
+            if target_id is not None:
+                # 默认推断为 user（对应 private）
+                # 这里我们假设如果只提供 ID，通常是发送给用户
+                target_type = "user"
+        
+        # 自动转换 private → user
+        if target_type == "private":
+            target_type = "user"
+        
         return self.__class__(self._adapter, target_type, target_id, self._account_id)
 
     def Using(self, account_id: Union[str, int]) -> 'SendDSL':

{erispulse-2.3.8 → erispulse-2.3.9.dev1}/src/ErisPulse/Core/Bases/adapter.pyi

@@ -65,13 +65,21 @@ class SendDSL:
         """
         设置消息目标
         
+        支持自动类型转换：
+        - 当 target_type 为 "private" 时，自动转换为 "user"
+        - 当只提供 target_id（字符串或数字）时，默认推断为 "user"
+        
         :param target_type: 目标类型(可选)
         :param target_id: 目标ID(可选)
         :return: SendDSL实例
         
         :example:
+        >>> # 标准用法
         >>> adapter.Send.To("user", "123").Text("Hello")
-        >>> adapter.Send.To("123").Text("Hello")  # 简化形式
+        >>> # 自动转换 private → user
+        >>> adapter.Send.To("private", "123").Text("Hello")
+        >>> # 简化形式（默认推断为 user）
+        >>> adapter.Send.To("123").Text("Hello")
         """
         ...
     def Using(self: object, account_id: Union[(str, int)]) -> SendDSL:

erispulse-2.3.9.dev1/src/ErisPulse/Core/Event/__init__.py

@@ -0,0 +1,85 @@
+"""
+ErisPulse 事件处理模块
+
+提供统一的事件处理接口，支持命令、消息、通知、请求和元事件处理
+
+{!--< tips >!--}
+1. 所有事件处理都基于OneBot12标准事件格式
+2. 通过装饰器方式注册事件处理器
+3. 支持优先级和条件过滤
+{!--< /tips >!--}
+"""
+
+from .command import command
+from .message import message
+from .notice import notice
+from .request import request
+from .meta import meta
+from .wrapper import Event
+from .session_type import (
+    # 标准类型常量
+    RECEIVE_TYPES,
+    SEND_TYPES,
+    
+    # 自定义类型注册
+    register_custom_type,
+    unregister_custom_type,
+    
+    # 类型获取方法
+    get_id_field,
+    get_receive_type,
+    convert_to_send_type,
+    convert_to_receive_type,
+    
+    # 自动推断方法
+    infer_receive_type,
+    get_target_id,
+    get_send_type_and_target_id,
+    
+    # 工具方法
+    is_standard_type,
+    is_valid_send_type,
+    get_standard_types,
+    get_send_types,
+    clear_custom_types,
+)
+
+def _clear_all_handlers():
+    """
+    {!--< internal-use >!--}
+    清除所有已注册的事件处理器和命令
+    """
+    # 清除命令处理器
+    command._clear_commands()
+    
+    # 清除各类事件处理器
+    message._clear_message_handlers()
+    notice._clear_notice_handlers()
+    request._clear_request_handlers()
+    meta._clear_meta_handlers()
+
+__all__ = [
+    "command",
+    "message", 
+    "notice",
+    "request",
+    "meta",
+    "Event",
+    # 会话类型管理
+    "RECEIVE_TYPES",
+    "SEND_TYPES",
+    "register_custom_type",
+    "unregister_custom_type",
+    "get_id_field",
+    "get_receive_type",
+    "convert_to_send_type",
+    "convert_to_receive_type",
+    "infer_receive_type",
+    "get_target_id",
+    "get_send_type_and_target_id",
+    "is_standard_type",
+    "is_valid_send_type",
+    "get_standard_types",
+    "get_send_types",
+    "clear_custom_types",
+]

{erispulse-2.3.8 → erispulse-2.3.9.dev1}/src/ErisPulse/Core/Event/__init__.pyi

@@ -22,3 +22,4 @@ from .notice import notice
 from .request import request
 from .meta import meta
 from .wrapper import Event
+from .session_type import RECEIVE_TYPES, SEND_TYPES, register_custom_type, unregister_custom_type, get_id_field, get_receive_type, convert_to_send_type, convert_to_receive_type, infer_receive_type, get_target_id, get_send_type_and_target_id, is_standard_type, is_valid_send_type, get_standard_types, get_send_types, clear_custom_types

{erispulse-2.3.8 → erispulse-2.3.9.dev1}/src/ErisPulse/Core/Event/command.py

@@ -14,6 +14,7 @@ ErisPulse 命令处理模块
 from .base import BaseEventHandler
 from .. import adapter, logger
 from ...runtime import get_event_config
+from .session_type import get_send_type_and_target_id, infer_receive_type
 from typing import Callable, Union, List, Dict, Any, Optional, Awaitable
 import asyncio
 import inspect
@@ -180,15 +181,15 @@ class CommandHandler:
         """
         platform = event.get("platform")
         user_id = event.get("user_id")
-        group_id = event.get("group_id")
-        detail_type = "group" if group_id else "private"
-        target_id = group_id or user_id
+        
+        # 使用会话类型管理模块获取发送类型和目标ID
+        send_type, target_id = get_send_type_and_target_id(event, platform)
         
         # 发送提示消息（如果提供）
         if prompt and platform:
             try:
                 adapter_instance = getattr(adapter, platform)
-                await adapter_instance.Send.To(detail_type, target_id).Text(prompt)
+                await adapter_instance.Send.To(send_type, target_id).Text(prompt)
             except Exception as e:
                 logger.warning(f"发送提示消息失败: {e}")
         
@@ -273,9 +274,9 @@ class CommandHandler:
             
             # 检查是否必须@机器人
             if self.must_at_bot:
-                detail_type = event.get("detail_type")
+                detail_type = infer_receive_type(event)
                 # 一对一场景（private或user）不需要检查@
-                if detail_type not in ("private", "user", "bot"):
+                if detail_type not in ("private", "user"):
                     message_segments = event.get("message", [])
                     self_id = event.get("self", {}).get("user_id")
                     
@@ -404,8 +405,9 @@ class CommandHandler:
         """
         platform = event.get("platform")
         user_id = event.get("user_id")
-        group_id = event.get("group_id")
-        target_id = group_id or user_id
+        
+        # 使用会话类型管理模块获取发送类型和目标ID
+        send_type, target_id = get_send_type_and_target_id(event, platform)
         
         wait_key = f"{platform}:{user_id}:{target_id}"
         
@@ -441,14 +443,13 @@ class CommandHandler:
         """
         try:
             platform = event.get("platform")
-            user_id = event.get("user_id")
-            group_id = event.get("group_id")
-            detail_type = "group" if group_id else "private"
-            target_id = group_id or user_id
+            
+            # 使用会话类型管理模块获取发送类型和目标ID
+            send_type, target_id = get_send_type_and_target_id(event, platform)
             
             if platform and hasattr(adapter, platform):
                 adapter_instance = getattr(adapter, platform)
-                await adapter_instance.Send.To(detail_type, target_id).Text("权限不足，无法执行该命令")
+                await adapter_instance.Send.To(send_type, target_id).Text("权限不足，无法执行该命令")
         except Exception as e:
             logger.error(f"发送权限拒绝消息失败: {e}")
     
@@ -464,14 +465,13 @@ class CommandHandler:
         """
         try:
             platform = event.get("platform")
-            user_id = event.get("user_id")
-            group_id = event.get("group_id")
-            detail_type = "group" if group_id else "private"
-            target_id = group_id or user_id
+            
+            # 使用会话类型管理模块获取发送类型和目标ID
+            send_type, target_id = get_send_type_and_target_id(event, platform)
             
             if platform and hasattr(adapter, platform):
                 adapter_instance = getattr(adapter, platform)
-                await adapter_instance.Send.To(detail_type, target_id).Text(f"命令执行出错: {error}")
+                await adapter_instance.Send.To(send_type, target_id).Text(f"命令执行出错: {error}")
         except Exception as e:
             logger.error(f"发送命令错误消息失败: {e}")
 

{erispulse-2.3.8 → erispulse-2.3.9.dev1}/src/ErisPulse/Core/Event/command.pyi

@@ -20,6 +20,7 @@ ErisPulse 命令处理模块
 from .base import BaseEventHandler
 from .. import adapter, logger
 from ...runtime import get_event_config
+from .session_type import get_send_type_and_target_id, infer_receive_type
 from typing import Callable, Union, List, Dict, Any, Optional, Awaitable
 import asyncio
 import inspect