ErisPulse 1.2.9__py3-none-any.whl → 2.1.0__py3-none-any.whl

{erispulse-1.2.9.dist-info → erispulse-2.1.0.dist-info}/METADATA

@@ -1,14 +1,13 @@
 Metadata-Version: 2.4
 Name: ErisPulse
-Version: 1.2.9
+Version: 2.1.0
 Summary: ErisPulse 是一个模块化、可扩展的异步 Python SDK 框架，主要用于构建高效、可维护的机器人应用程序。
 Author-email: "艾莉丝·格雷拉特(WSu2059)" <wsu2059@qq.com>, runoneall <runoobsteve@gmail.com>
 License: MIT License
         
         Copyright (c) 2025 ErisPulse
         
-        Portions of this software are based on https://github.com/FramerOrg/Framer 
-        (Copyright (c) 2025 runoneall).
+        Portions of this software are based on https://github.com/runoneall/sdkFrame.
         
         Permission is hereby granted, free of charge, to any person obtaining a copy
         of this software and associated documentation files (the "Software"), to deal
@@ -31,6 +30,8 @@ License: MIT License
         The documentation portion of this project references content from https://codeberg.org/ybr/yhwiki,
         licensed under the Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 
         International License (CC BY-NC-ND 4.0).
+        
+        Note: This license file has been updated to correct the upstream project reference.
 License-File: LICENSE
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Intended Audience :: Developers
@@ -46,7 +47,12 @@ Classifier: Programming Language :: Python :: 3.12
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Requires-Python: >=3.8
 Requires-Dist: aiohttp
+Requires-Dist: fastapi>=0.116.1
+Requires-Dist: hypercorn>=0.14.0
 Requires-Dist: pip
+Requires-Dist: pydantic>=2.10.6
+Requires-Dist: python-multipart>=0.0.20
+Requires-Dist: toml
 Requires-Dist: watchdog
 Description-Content-Type: text/markdown
 
@@ -78,50 +84,19 @@ Description-Content-Type: text/markdown
 
 ## 快速开始
 
-### 框架选型指南
-
-| 需求 | 推荐框架 | 理由 |
-|------|---------|------|
-| 轻量化/底层模块化 | [Framer](https://github.com/FramerOrg/Framer) | 高度解耦的模块化设计 |
-| 全功能机器人开发 | ErisPulse | 开箱即用的完整解决方案 |
-
----
-
-## 安装指南
-
-我们全面采用 [`uv`](https://github.com/astral-sh/uv) 作为 Python 工具链，提供更快速可靠的安装体验。
-
-> ℹ️ **uv** 是由 Astral 开发的新一代 Python 包管理工具，比传统 pip 快 10-100 倍，并具有更好的依赖解析能力。
-
-### 1. 安装 uv
-
-#### 通用方法 (pip):
-```bash
-pip install uv
-```
+### 一键安装脚本
 
-#### macOS/Linux:
-```bash
-curl -LsSf https://astral.sh/uv/install.sh | sh
-```
+我们提供了一键安装脚本，支持所有主流平台：
 
 #### Windows (PowerShell):
-```powershell
-powershell -ExecutionPolicy ByPass -c "irm https://astral.sh/uv/install.ps1 | iex"
-```
 
-验证安装:
-```bash
-uv --version
+```powershell
+irm https://get.erisdev.com/install.ps1 -OutFile install.ps1; powershell -ExecutionPolicy Bypass -File install.ps1
 ```
 
-### 2. 安装 ErisPulse
-
+#### macOS/Linux:
 ```bash
-uv python install 3.12          # 安装 Python 3.12
-uv venv                         # 创建虚拟环境
-source .venv/bin/activate       # 激活环境 (Windows: .venv\Scripts\activate)
-uv pip install ErisPulse --upgrade  # 安装框架
+curl -sSL https://get.erisdev.com/install.sh | tee install.sh >/dev/null && chmod +x install.sh && ./install.sh
 ```
 
 ---
@@ -131,7 +106,7 @@ uv pip install ErisPulse --upgrade  # 安装框架
 ### 克隆项目并进入目录
 
 ```bash
-git clone https://github.com/ErisPulse/ErisPulse.git
+git clone -b Develop/v2 https://github.com/ErisPulse/ErisPulse.git
 cd ErisPulse
 ```
 

erispulse-2.1.0.dist-info/RECORD

@@ -0,0 +1,16 @@
+ErisPulse/__init__.py,sha256=4jcAocMDQt4xdE9B3di8lGCtrU47Y4DY2ipW_9diYbU,26210
+ErisPulse/__main__.py,sha256=DeMBevz0KyLywnd5HccgZDwVfv-EKQOpo1fsVypKwiE,18525
+ErisPulse/Core/__init__.py,sha256=CIxWFdB6-0D8YJz7IdW052A4YllDsklEONCRj7mOpkQ,362
+ErisPulse/Core/adapter.py,sha256=gzryZjrOy0uowE5oU4MaVTtGPW7HP4StfvP5ECC4rUk,20510
+ErisPulse/Core/env.py,sha256=9WYNadD9h2jP_2wxOVBJEhH1uDzbctW7eB4Ba9RSjA4,20409
+ErisPulse/Core/logger.py,sha256=035II2YvRmcAvbbCEsmMxjvAJhdLvQlUqaDXAufWk_E,5782
+ErisPulse/Core/mods.py,sha256=5SPutuzbMrA-VZwiXeNxYWfrdbpLRdYfQ0RvEkFuQgg,7308
+ErisPulse/Core/raiserr.py,sha256=QLQ3r7p4iFP86XBLq9mtf1wv1xSlgny35i8t5-l4DXo,4620
+ErisPulse/Core/server.py,sha256=H8dUUj8mxBLEd3ick7btbWEE_m58Y6277Zo5FY7Ild4,9217
+ErisPulse/Core/shellprint.py,sha256=-BFoyFho_D3XEhxIoKt6x5gO4C62LKwmJWKDUGiPjNY,5908
+ErisPulse/Core/util.py,sha256=kyydBAJHHG9I7rMRzKWtLAQMZoJyBqHiBAweqcraFkU,4001
+erispulse-2.1.0.dist-info/METADATA,sha256=Ip9gteaaYMG0Qkzxq_DbFnmvCYNC8ULMPxCZ6jYimeA,6161
+erispulse-2.1.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+erispulse-2.1.0.dist-info/entry_points.txt,sha256=Jss71M6nEha0TA-DyVZugPYdcL14s9QpiOeIlgWxzOc,182
+erispulse-2.1.0.dist-info/licenses/LICENSE,sha256=lBYj7Nk4urLvByj4HvQFxu8j9hThhFF6OGfyxAZBP9Q,1451
+erispulse-2.1.0.dist-info/RECORD,,

{erispulse-1.2.9.dist-info → erispulse-2.1.0.dist-info}/entry_points.txt

@@ -3,3 +3,4 @@ ep = ErisPulse.__main__:main
 ep-cli = ErisPulse.__main__:main
 ep-init = ErisPulse.__init__:init
 epsdk = ErisPulse.__main__:main
+epsdk-cli = ErisPulse.__main__:main

{erispulse-1.2.9.dist-info → erispulse-2.1.0.dist-info}/licenses/LICENSE

@@ -2,8 +2,7 @@ MIT License
 
 Copyright (c) 2025 ErisPulse
 
-Portions of this software are based on https://github.com/FramerOrg/Framer 
-(Copyright (c) 2025 runoneall).
+Portions of this software are based on https://github.com/runoneall/sdkFrame.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -25,4 +24,6 @@ SOFTWARE.
 
 The documentation portion of this project references content from https://codeberg.org/ybr/yhwiki,
 licensed under the Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 
-International License (CC BY-NC-ND 4.0).
+International License (CC BY-NC-ND 4.0).
+
+Note: This license file has been updated to correct the upstream project reference.

ErisPulse/adapter.py

@@ -1,465 +0,0 @@
-"""
-# 适配器系统
-
-提供平台适配器基类、消息发送DSL和适配器管理功能。支持多平台消息处理、事件驱动和生命周期管理。
-
-## API 文档
-
-### 适配器基类 (BaseAdapter)
-适配器基类提供了与外部平台交互的标准接口。
-
-#### call_api(endpoint: str, **params: Any) -> Any
-调用平台API的抽象方法。
-- 参数:
-  - endpoint: API端点
-  - **params: API参数
-- 返回:
-  - Any: API调用结果
-- 说明:
-  - 必须由子类实现
-  - 处理与平台的实际通信
-- 示例:
-```python
-class MyPlatformAdapter(BaseAdapter):
-    async def call_api(self, endpoint: str, **params: Any) -> Any:
-        if endpoint == "/send":
-            return await self._send_message(params)
-        elif endpoint == "/upload":
-            return await self._upload_file(params)
-        raise NotImplementedError(f"未实现的端点: {endpoint}")
-```
-
-#### start() -> None
-启动适配器的抽象方法。
-- 参数: 无
-- 返回:
-  - None
-- 说明:
-  - 必须由子类实现
-  - 处理适配器的初始化和启动逻辑
-- 示例:
-```python
-class MyPlatformAdapter(BaseAdapter):
-    async def start(self) -> None:
-        self.client = await self._create_client()
-        self.ws = await self.client.create_websocket()
-        self._start_heartbeat()
-```
-
-#### shutdown() -> None
-关闭适配器的抽象方法。
-- 参数: 无
-- 返回:
-  - None
-- 说明:
-  - 必须由子类实现
-  - 处理资源清理和关闭逻辑
-- 示例:
-```python
-class MyPlatformAdapter(BaseAdapter):
-    async def shutdown(self) -> None:
-        if self.ws:
-            await self.ws.close()
-        if self.client:
-            await self.client.close()
-```
-
-#### on(event_type: str = "*") -> Callable[[Callable[..., Any]], Callable[..., Any]]
-事件监听装饰器。
-- 参数:
-  - event_type: 事件类型，默认"*"表示所有事件
-- 返回:
-  - Callable[[Callable[..., Any]], Callable[..., Any]]: 装饰器函数
-- 示例:
-```python
-adapter = MyPlatformAdapter()
-
-@adapter.on("message")
-async def handle_message(data: Any) -> None:
-    print(f"收到消息: {data}")
-
-@adapter.on("error")
-async def handle_error(error: Exception) -> None:
-    print(f"发生错误: {error}")
-
-# 处理所有事件
-@adapter.on()
-async def handle_all(event: Any) -> None:
-    print(f"事件: {event}")
-```
-
-#### emit(event_type: str, data: Any) -> None
-触发事件。
-- 参数:
-  - event_type: 事件类型
-  - data: 事件数据
-- 返回:
-  - None
-- 示例:
-```python
-class MyPlatformAdapter(BaseAdapter):
-    async def _handle_websocket_message(self, message: Any) -> None:
-        # 处理消息并触发相应事件
-        if message.type == "chat":
-            await self.emit("message", {
-                "type": "chat",
-                "content": message.content,
-                "sender": message.sender
-            })
-```
-
-#### middleware(func: Callable[..., Any]) -> Callable[..., Any]
-添加中间件处理器。
-- 参数:
-  - func: 中间件函数
-- 返回:
-  - Callable[..., Any]: 中间件函数
-- 示例:
-```python
-adapter = MyPlatformAdapter()
-
-@adapter.middleware
-async def log_middleware(data: Any) -> Any:
-    print(f"处理数据: {data}")
-    return data
-
-@adapter.middleware
-async def filter_middleware(data: Any) -> Optional[Any]:
-    if "spam" in data.get("content", ""):
-        return None
-    return data
-```
-
-### 消息发送DSL (SendDSL)
-提供链式调用风格的消息发送接口。
-
-#### To(target_type: Optional[str] = None, target_id: Optional[str] = None) -> 'SendDSL'
-设置消息目标。
-- 参数:
-  - target_type: 目标类型（可选）
-  - target_id: 目标ID
-- 返回:
-  - SendDSL: 发送器实例
-- 示例:
-```python
-# 发送到用户
-sdk.adapter.Platform.Send.To("user", "123").Text("Hello")
-
-# 发送到群组
-sdk.adapter.Platform.Send.To("group", "456").Text("Hello Group")
-
-# 简化形式（只有ID）
-sdk.adapter.Platform.Send.To("123").Text("Hello")
-```
-
-#### Text(text: str) -> asyncio.Task
-发送文本消息。
-- 参数:
-  - text: 文本内容
-- 返回:
-  - asyncio.Task: 异步任务
-- 示例:
-```python
-# 发送简单文本
-await sdk.adapter.Platform.Send.To("user", "123").Text("Hello")
-
-# 发送格式化文本
-name = "Alice"
-await sdk.adapter.Platform.Send.To("123").Text(f"Hello {name}")
-```
-
-### 适配器管理 (AdapterManager)
-管理多个平台适配器的注册、启动和关闭。
-
-#### register(platform: str, adapter_class: Type[BaseAdapter]) -> bool
-注册新的适配器类。
-- 参数:
-  - platform: 平台名称
-  - adapter_class: 适配器类
-- 返回:
-  - bool: 注册是否成功
-- 示例:
-```python
-# 注册适配器
-sdk.adapter.register("MyPlatform", MyPlatformAdapter)
-
-# 注册多个适配器
-adapters = {
-    "Platform1": Platform1Adapter,
-    "Platform2": Platform2Adapter
-}
-for name, adapter in adapters.items():
-    sdk.adapter.register(name, adapter)
-```
-
-#### startup(platforms: Optional[List[str]] = None) -> None
-启动指定的适配器。
-- 参数:
-  - platforms: 要启动的平台列表，None表示所有平台
-- 返回:
-  - None
-- 示例:
-```python
-# 启动所有适配器
-await sdk.adapter.startup()
-
-# 启动指定适配器
-await sdk.adapter.startup(["Platform1", "Platform2"])
-```
-
-#### shutdown() -> None
-关闭所有适配器。
-- 参数: 无
-- 返回:
-  - None
-- 示例:
-```python
-# 关闭所有适配器
-await sdk.adapter.shutdown()
-
-# 在程序退出时关闭
-import atexit
-atexit.register(lambda: asyncio.run(sdk.adapter.shutdown()))
-```
-
-"""
-
-import functools
-import asyncio
-from typing import (
-    Callable, Any, Dict, List, Type, Optional, Set, 
-    Union, Awaitable, TypeVar, Generic, Tuple, Coroutine, FrozenSet
-)
-from collections import defaultdict
-
-
-# DSL 基类，用于实现 Send.To(...).Func(...) 风格
-class SendDSLBase:
-    def __init__(self, adapter: 'BaseAdapter', target_type: Optional[str] = None, target_id: Optional[str] = None):
-        self._adapter = adapter
-        self._target_type = target_type
-        self._target_id = target_id
-        self._target_to = target_id
-
-    def To(self, target_type: str = None, target_id: str = None) -> 'SendDSL':
-        if target_id is None and target_type is not None:
-            target_id = target_type
-            target_type = None
-
-        return self.__class__(self._adapter, target_type, target_id)
-
-    def __getattr__(self, name: str):
-        def wrapper(*args, **kwargs):
-            return asyncio.create_task(
-                self._adapter._real_send(
-                    target_type=self._target_type,
-                    target_id=self._target_id,
-                    action=name,
-                    data={
-                        "args": args,
-                        "kwargs": kwargs
-                    }
-                )
-            )
-        return wrapper
-
-
-class BaseAdapter:
-    class Send(SendDSLBase):
-        def Text(self, text: str):
-            """基础文本消息发送方法，子类应该重写此方法"""
-            return asyncio.create_task(
-                self._adapter.call_api(
-                    endpoint="/send",
-                    content=text,
-                    recvId=self._target_id,
-                    recvType=self._target_type
-                )
-            )
-
-    def __init__(self):
-        self._handlers = defaultdict(list)
-        self._middlewares = []
-        # 绑定当前适配器的 Send 实例
-        self.Send = self.__class__.Send(self)
-
-    def on(self, event_type: str = "*"):
-        def decorator(func: Callable):
-            @functools.wraps(func)
-            async def wrapper(*args, **kwargs):
-                return await func(*args, **kwargs)
-            self._handlers[event_type].append(wrapper)
-            return wrapper
-        return decorator
-
-    def middleware(self, func: Callable):
-        self._middlewares.append(func)
-        return func
-
-    async def call_api(self, endpoint: str, **params):
-        raise NotImplementedError
-
-    async def start(self):
-        raise NotImplementedError
-
-    async def shutdown(self):
-        raise NotImplementedError
-
-    def add_handler(self, *args):
-        if len(args) == 1:
-            event_type = "*"
-            handler = args[0]
-        elif len(args) == 2:
-            event_type, handler = args
-        else:
-            raise TypeError("add_handler() 接受 1 个（监听所有事件）或 2 个参数（指定事件类型）")
-
-        @functools.wraps(handler)
-        async def wrapper(*handler_args, **handler_kwargs):
-            return await handler(*handler_args, **handler_kwargs)
-
-        self._handlers[event_type].append(wrapper)
-    async def emit(self, event_type: str, data: Any):
-        # 先执行中间件
-        for middleware in self._middlewares:
-            data = await middleware(data)
-
-        # 触发具体事件类型的处理器
-        if event_type in self._handlers:
-            for handler in self._handlers[event_type]:
-                await handler(data)
-
-        # 触发通配符 "*" 的处理器
-        for handler in self._handlers.get("*", []):
-            await handler(data)
-
-    async def send(self, target_type: str, target_id: str, message: Any, **kwargs):
-        method_name = kwargs.pop("method", "Text")
-        method = getattr(self.Send.To(target_type, target_id), method_name, None)
-        if not method:
-            raise AttributeError(f"未找到 {method_name} 方法，请确保已在 Send 类中定义")
-        return await method(text=message, **kwargs)
-
-
-class AdapterManager:
-    def __init__(self):
-        self._adapters: Dict[str, BaseAdapter] = {}
-        self._adapter_instances: Dict[Type[BaseAdapter], BaseAdapter] = {}
-        self._platform_to_instance: Dict[str, BaseAdapter] = {}
-        self._started_instances: Set[BaseAdapter] = set()
-
-    def register(self, platform: str, adapter_class: Type[BaseAdapter]) -> bool:
-        if not issubclass(adapter_class, BaseAdapter):
-            raise TypeError("适配器必须继承自BaseAdapter")
-        from . import sdk
-
-        # 如果该类已经创建过实例，复用
-        if adapter_class in self._adapter_instances:
-            instance = self._adapter_instances[adapter_class]
-        else:
-            instance = adapter_class(sdk)
-            self._adapter_instances[adapter_class] = instance
-
-        # 注册平台名，并统一映射到该实例
-        self._adapters[platform] = instance
-        self._platform_to_instance[platform] = instance
-
-        if len(platform) <= 10:
-            from itertools import product
-            combinations = [''.join(c) for c in product(*[(ch.lower(), ch.upper()) for ch in platform])]
-            for name in set(combinations):
-                setattr(self, name, instance)
-        else:
-            self.logger.warning(f"平台名 {platform} 过长，如果您是开发者，请考虑使用更短的名称")
-            setattr(self, platform.lower(), instance)
-            setattr(self, platform.upper(), instance)
-            setattr(self, platform.capitalize(), instance)
-
-        return True
-
-    async def startup(self, platforms: List[str] = None):
-        if platforms is None:
-            platforms = list(self._adapters.keys())
-
-        # 已经被调度过的 adapter 实例集合（防止重复调度）
-        scheduled_adapters = set()
-
-        for platform in platforms:
-            if platform not in self._adapters:
-                raise ValueError(f"平台 {platform} 未注册")
-            adapter = self._adapters[platform]
-
-            # 如果该实例已经被启动或已调度，跳过
-            if adapter in self._started_instances or adapter in scheduled_adapters:
-                continue
-
-            # 加入调度队列
-            scheduled_adapters.add(adapter)
-            asyncio.create_task(self._run_adapter(adapter, platform))
-
-    async def _run_adapter(self, adapter: BaseAdapter, platform: str):
-        from . import sdk
-
-        # 加锁防止并发启动
-        if not getattr(adapter, "_starting_lock", None):
-            adapter._starting_lock = asyncio.Lock()
-
-        async with adapter._starting_lock:
-            # 再次确认是否已经被启动
-            if adapter in self._started_instances:
-                sdk.logger.info(f"适配器 {platform}（实例ID: {id(adapter)}）已被其他协程启动，跳过")
-                return
-
-            retry_count = 0
-            fixed_delay = 3 * 60 * 60
-            backoff_intervals = [60, 10 * 60, 30 * 60, 60 * 60]
-
-            while True:
-                try:
-                    await adapter.start()
-                    self._started_instances.add(adapter)
-                    sdk.logger.info(f"适配器 {platform}（实例ID: {id(adapter)}）已启动")
-                    return
-                except Exception as e:
-                    retry_count += 1
-                    sdk.logger.error(f"平台 {platform} 启动失败（第{retry_count}次重试）: {e}")
-
-                    try:
-                        await adapter.shutdown()
-                    except Exception as stop_err:
-                        sdk.logger.warning(f"停止适配器失败: {stop_err}")
-
-                    # 计算等待时间
-                    if retry_count <= len(backoff_intervals):
-                        wait_time = backoff_intervals[retry_count - 1]
-                    else:
-                        wait_time = fixed_delay
-
-                    sdk.logger.info(f"将在 {wait_time // 60} 分钟后再次尝试重启 {platform}")
-                    await asyncio.sleep(wait_time)
-
-    async def shutdown(self):
-        for adapter in self._adapters.values():
-            await adapter.shutdown()
-
-    def get(self, platform: str) -> BaseAdapter:
-        platform_lower = platform.lower()
-        for registered, instance in self._adapters.items():
-            if registered.lower() == platform_lower:
-                return instance
-        return None
-
-    def __getattr__(self, platform: str) -> BaseAdapter:
-        platform_lower = platform.lower()
-        for registered, instance in self._adapters.items():
-            if registered.lower() == platform_lower:
-                return instance
-        raise AttributeError(f"平台 {platform} 的适配器未注册")
-
-    @property
-    def platforms(self) -> list:
-        return list(self._adapters.keys())
-
-AdapterFather = BaseAdapter
-adapter = AdapterManager()
-SendDSL = SendDSLBase