satori-python-core 0.12.0__tar.gz → 0.13.0__tar.gz

{satori_python_core-0.12.0 → satori_python_core-0.13.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: satori-python-core
-Version: 0.12.0
+Version: 0.13.0
 Summary: Satori Protocol SDK for python, specify common part
 Home-page: https://github.com/RF-Tar-Railt/satori-python
 Author-Email: RF-Tar-Railt <rf_tar_railt@qq.com>
@@ -42,6 +42,10 @@ Description-Content-Type: text/markdown
 - [Chronocat](https://chronocat.vercel.app)
 - Koishi （搭配 `@koishijs/plugin-server`）
 
+### 使用该 SDK 的框架
+
+- [`Entari`](https://github.com/ArcletProject/Entari)
+
 ## 安装
 
 安装完整体：
@@ -69,14 +73,15 @@ pip install satori-python-server
 客户端：
 
 ```python
-from satori import Event, WebsocketsInfo
+from satori import EventType, WebsocketsInfo
+from satori.event import MessageEvent
 from satori.client import Account, App
 
 app = App(WebsocketsInfo(port=5140))
 
-@app.register
-async def on_message(account: Account, event: Event):
-    if event.user and event.user.id == "xxxxxxxxxxx":
+@app.register_on(EventType.MESSAGE_CREATED)
+async def on_message(account: Account, event: MessageEvent):
+    if event.user.id == "xxxxxxxxxxx":
         await account.send(event, "Hello, World!")
 
 app.run()

{satori_python_core-0.12.0 → satori_python_core-0.13.0}/README.md

@@ -18,6 +18,10 @@
 - [Chronocat](https://chronocat.vercel.app)
 - Koishi （搭配 `@koishijs/plugin-server`）
 
+### 使用该 SDK 的框架
+
+- [`Entari`](https://github.com/ArcletProject/Entari)
+
 ## 安装
 
 安装完整体：
@@ -45,14 +49,15 @@ pip install satori-python-server
 客户端：
 
 ```python
-from satori import Event, WebsocketsInfo
+from satori import EventType, WebsocketsInfo
+from satori.event import MessageEvent
 from satori.client import Account, App
 
 app = App(WebsocketsInfo(port=5140))
 
-@app.register
-async def on_message(account: Account, event: Event):
-    if event.user and event.user.id == "xxxxxxxxxxx":
+@app.register_on(EventType.MESSAGE_CREATED)
+async def on_message(account: Account, event: MessageEvent):
+    if event.user.id == "xxxxxxxxxxx":
         await account.send(event, "Hello, World!")
 
 app.run()

{satori_python_core-0.12.0 → satori_python_core-0.13.0}/pyproject.toml

@@ -23,7 +23,7 @@ classifiers = [
     "Programming Language :: Python :: 3.12",
     "Operating System :: OS Independent",
 ]
-version = "0.12.0"
+version = "0.13.0"
 
 [project.license]
 text = "MIT"

{satori_python_core-0.12.0 → satori_python_core-0.13.0}/src/satori/__init__.py

@@ -36,7 +36,10 @@ from .model import Login as Login
 from .model import LoginStatus as LoginStatus
 from .model import Member as Member
 from .model import MessageObject as MessageObject
+from .model import PageDequeResult as PageDequeResult
+from .model import PageResult as PageResult
 from .model import Role as Role
+from .model import Upload as Upload
 from .model import User as User
 
-__version__ = "0.12.0"
+__version__ = "0.13.0"

{satori_python_core-0.12.0 → satori_python_core-0.13.0}/src/satori/const.py

@@ -44,6 +44,8 @@ class Api(str, Enum):
     FRIEND_LIST = "friend.list"
     FRIEND_APPROVE = "friend.approve"
 
+    UPLOAD_CREATE = "upload.create"
+
 
 class EventType(str, Enum):
     FRIEND_REQUEST = "friend-request"

{satori_python_core-0.12.0 → satori_python_core-0.13.0}/src/satori/element.py

@@ -192,7 +192,7 @@ class Resource(Element):
             data = {"src": Path(path).as_uri()}
         elif raw and mime:
             bd = raw.getvalue() if isinstance(raw, BytesIO) else raw
-            data = {"src": f"data:{mime};base64,{b64encode(bd).decode()}"}
+            data = {"src": f"data:{mime};base64,{b64encode(bd).decode('utf-8')}"}
         else:
             raise ValueError(f"{cls} need at least one of url, path and raw")
         if name is not None:

{satori_python_core-0.12.0 → satori_python_core-0.13.0}/src/satori/model.py

@@ -1,7 +1,10 @@
+import mimetypes
 from dataclasses import asdict, dataclass, field, fields
 from datetime import datetime
 from enum import IntEnum
-from typing import Any, Callable, ClassVar, Dict, Generic, List, Literal, Optional, TypeVar
+from os import PathLike
+from pathlib import Path
+from typing import IO, Any, Callable, ClassVar, Dict, Generic, List, Literal, Optional, TypeVar, Union
 from typing_extensions import TypeAlias
 
 from .element import Element, transform
@@ -367,3 +370,23 @@ class PageDequeResult(PageResult[T]):
 
 Direction: TypeAlias = Literal["before", "after", "around"]
 Order: TypeAlias = Literal["asc", "desc"]
+
+
+@dataclass
+class Upload:
+    file: Union[bytes, IO[bytes], PathLike]
+    mimetype: str = "image/png"
+    name: Optional[str] = None
+
+    def __post_init__(self):
+        if isinstance(self.file, PathLike):
+            self.mimetype = mimetypes.guess_type(str(self.file))[0] or self.mimetype
+            self.name = Path(self.file).name
+
+    def dump(self):
+        file = self.file
+
+        if isinstance(file, PathLike):
+            file = open(file, "rb")
+
+        return {"value": file, "filename": self.name, "content_type": self.mimetype}