satori-python-core 0.17.7__tar.gz → 0.18.0__tar.gz

{satori_python_core-0.17.7 → satori_python_core-0.18.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: satori-python-core
-Version: 0.17.7
+Version: 0.18.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>
@@ -29,17 +29,18 @@ Description-Content-Type: text/markdown
 [![PyPI](https://img.shields.io/pypi/v/satori-python)](https://pypi.org/project/satori-python)
 [![PyPI - Python Version](https://img.shields.io/pypi/pyversions/satori-python)](https://www.python.org/)
 
-基于 [Satori](https://satori.js.org/zh-CN/) 协议的 Python 开发工具包
+基于 [Satori](https://satori.chat/zh-CN/) 协议的 Python 开发工具包
 
 ## 协议介绍
 
-[Satori Protocol](https://satori.js.org/zh-CN/)
+[Satori Protocol](https://satori.chat/zh-CN/)
 
 ### 协议端
 
 目前提供了 `satori` 协议实现的有：
 
 - [Chronocat](https://chronocat.vercel.app)
+- [LLBot](https://www.llonebot.com/guide/introduction)
 - [nekobox](https://github.com/wyapx/nekobox)
 - Koishi （搭配 `@koishijs/plugin-server`）
 
@@ -77,6 +78,7 @@ pip install satori-python-server
 | OneBot V11 | `pip install satori-python-adapter-onebot11` | satori.adapters.onebot11.forward, satori.adapters.onebot11.reverse |
 | Console    | `pip install satori-python-adapter-console`  | satori.adapters.console                                            |
 | Milky      | `pip install satori-python-adapter-milky`    | satori.adapters.milky.main, satori.adapters.milky.webhook          |
+| QQ         | `pip install satori-python-adapter-qq`       | satori.adapters.milky.main, satori.adapters.milky.websocket        |
 
 ### 社区适配器
 

{satori_python_core-0.17.7 → satori_python_core-0.18.0}/README.md

@@ -5,17 +5,18 @@
 [![PyPI](https://img.shields.io/pypi/v/satori-python)](https://pypi.org/project/satori-python)
 [![PyPI - Python Version](https://img.shields.io/pypi/pyversions/satori-python)](https://www.python.org/)
 
-基于 [Satori](https://satori.js.org/zh-CN/) 协议的 Python 开发工具包
+基于 [Satori](https://satori.chat/zh-CN/) 协议的 Python 开发工具包
 
 ## 协议介绍
 
-[Satori Protocol](https://satori.js.org/zh-CN/)
+[Satori Protocol](https://satori.chat/zh-CN/)
 
 ### 协议端
 
 目前提供了 `satori` 协议实现的有：
 
 - [Chronocat](https://chronocat.vercel.app)
+- [LLBot](https://www.llonebot.com/guide/introduction)
 - [nekobox](https://github.com/wyapx/nekobox)
 - Koishi （搭配 `@koishijs/plugin-server`）
 
@@ -53,6 +54,7 @@ pip install satori-python-server
 | OneBot V11 | `pip install satori-python-adapter-onebot11` | satori.adapters.onebot11.forward, satori.adapters.onebot11.reverse |
 | Console    | `pip install satori-python-adapter-console`  | satori.adapters.console                                            |
 | Milky      | `pip install satori-python-adapter-milky`    | satori.adapters.milky.main, satori.adapters.milky.webhook          |
+| QQ         | `pip install satori-python-adapter-qq`       | satori.adapters.milky.main, satori.adapters.milky.websocket        |
 
 ### 社区适配器
 

{satori_python_core-0.17.7 → satori_python_core-0.18.0}/pyproject.toml

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

{satori_python_core-0.17.7 → satori_python_core-0.18.0}/src/satori/__init__.py

@@ -42,4 +42,7 @@ from .model import Role as Role
 from .model import Upload as Upload
 from .model import User as User
 
-__version__ = "0.17.7"
+__version__ = "0.18.0"
+
+
+MessageReceipt = MessageObject

{satori_python_core-0.17.7 → satori_python_core-0.18.0}/src/satori/const.py

@@ -48,18 +48,23 @@ class Api(str, Enum):
 
 
 class EventType(str, Enum):
+    FRIEND_ADDED = "friend-added"
+    FRIEND_REMOVED = "friend-removed"
     FRIEND_REQUEST = "friend-request"
     GUILD_ADDED = "guild-added"
+    GUILD_UPDATED = "guild-updated"
+    GUILD_REMOVED = "guild-removed"
+    GUILD_REQUEST = "guild-request"
+    CHANNEL_ADDED = "channel-added"
+    CHANNEL_UPDATED = "channel-updated"
+    CHANNEL_REMOVED = "channel-removed"
     GUILD_MEMBER_ADDED = "guild-member-added"
     GUILD_MEMBER_REMOVED = "guild-member-removed"
     GUILD_MEMBER_REQUEST = "guild-member-request"
     GUILD_MEMBER_UPDATED = "guild-member-updated"
-    GUILD_REMOVED = "guild-removed"
-    GUILD_REQUEST = "guild-request"
     GUILD_ROLE_CREATED = "guild-role-created"
     GUILD_ROLE_DELETED = "guild-role-deleted"
     GUILD_ROLE_UPDATED = "guild-role-updated"
-    GUILD_UPDATED = "guild-updated"
     LOGIN_ADDED = "login-added"
     LOGIN_REMOVED = "login-removed"
     LOGIN_UPDATED = "login-updated"

{satori_python_core-0.17.7 → satori_python_core-0.18.0}/src/satori/element.py

@@ -213,7 +213,7 @@ class Resource(Element):
         timeout: int | None = None,
         **kwargs,
     ):
-        data: dict[str, Any] = {"extra": extra or kwargs}
+        data: dict[str, Any] = {"extra": extra, **kwargs}
         if url is not None:
             data |= {"src": url}
         elif path:

{satori_python_core-0.17.7 → satori_python_core-0.18.0}/src/satori/event.py

@@ -27,6 +27,10 @@ class GuildEvent(Event):
     guild: Guild
 
 
+class ChannelEvent(GuildEvent):
+    channel: Channel
+
+
 class GuildMemberEvent(GuildEvent):
     user: User
     member: Member

{satori_python_core-0.17.7 → satori_python_core-0.18.0}/src/satori/exception.py

@@ -1,28 +1,35 @@
 class ActionFailed(Exception):
+    CODE = 400
     pass
 
 
 class BadRequestException(ActionFailed):
+    CODE = 400
     pass
 
 
 class UnauthorizedException(ActionFailed):
+    CODE = 401
     pass
 
 
 class ForbiddenException(ActionFailed):
+    CODE = 403
     pass
 
 
 class NotFoundException(ActionFailed):
+    CODE = 404
     pass
 
 
 class MethodNotAllowedException(ActionFailed):
+    CODE = 405
     pass
 
 
 class ServerException(ActionFailed):
+    CODE = 500
     pass
 
 

{satori_python_core-0.17.7 → satori_python_core-0.18.0}/src/satori/model.py

@@ -205,9 +205,13 @@ class ArgvInteraction(ModelBase):
 @dataclass
 class ButtonInteraction(ModelBase):
     id: str
+    data: str | None = None
 
     def dump(self):
-        return {"id": self.id}
+        res = {"id": self.id}
+        if self.data:
+            res["data"] = self.data
+        return res
 
 
 class Opcode(IntEnum):
@@ -281,13 +285,14 @@ class Meta(ModelBase):
 @dataclass
 class MessageObject(ModelBase):
     id: str
-    content: str
+    content: str = ""
     channel: Channel | None = None
     guild: Guild | None = None
     member: Member | None = None
     user: User | None = None
     created_at: datetime | None = None
     updated_at: datetime | None = None
+    referrer: dict | None = None
 
     @classmethod
     def from_elements(
@@ -300,8 +305,9 @@ class MessageObject(ModelBase):
         user: User | None = None,
         created_at: datetime | None = None,
         updated_at: datetime | None = None,
+        referrer: dict | None = None,
     ):
-        obj = cls(id, "".join(str(i) for i in content), channel, guild, member, user, created_at, updated_at)
+        obj = cls(id, "".join(str(i) for i in content), channel, guild, member, user, created_at, updated_at, referrer)
         obj._parsed_message = content
         return obj
 
@@ -347,41 +353,8 @@ class MessageObject(ModelBase):
             res["created_at"] = int(self.created_at.timestamp() * 1000)
         if self.updated_at:
             res["updated_at"] = int(self.updated_at.timestamp() * 1000)
-        return res
-
-
-@dataclass
-class MessageReceipt(ModelBase):
-    id: str
-    content: str | None = None
-
-    @classmethod
-    def from_elements(
-        cls,
-        id: str,
-        content: list[Element] | None = None,
-    ):
-        return cls(id, "".join(str(i) for i in content) if content else None)
-
-    @property
-    def message(self) -> list[Element] | None:
-        return transform(parse(self.content)) if self.content else None
-
-    @message.setter
-    def message(self, value: list[Element] | None):
-        self.content = "".join(str(i) for i in value) if value else None
-
-    @classmethod
-    def parse(cls, raw: dict):
-        if "elements" in raw and "content" not in raw:
-            content = [RawElement(*item.values()) for item in raw["elements"]]
-            raw["content"] = "".join(str(i) for i in content)
-        return super().parse(raw)
-
-    def dump(self):
-        res = {"id": self.id}
-        if self.content:
-            res["content"] = self.content
+        if self.referrer:
+            res["referrer"] = self.referrer
         return res
 
 
@@ -399,6 +372,7 @@ class Event(ModelBase):
     operator: User | None = None
     role: Role | None = None
     user: User | None = None
+    referrer: dict | None = None
 
     _type: str | None = None
     _data: dict | None = None
@@ -430,6 +404,10 @@ class Event(ModelBase):
                 "user": {"id": raw["self_id"]},
                 "status": LoginStatus.ONLINE,
             }
+        if "self_id" in raw and not raw.get("login", {}).get("user"):
+            if "login" not in raw:
+                raw["login"] = {"sn": 0, "status": LoginStatus.ONLINE, "platform": raw.get("platform", "unknown")}
+            raw["login"]["user"] = {"id": raw["self_id"]}
         return super().parse(raw)
 
     @property
@@ -467,6 +445,8 @@ class Event(ModelBase):
             res["role"] = self.role.dump()
         if self.user:
             res["user"] = self.user.dump()
+        if self.referrer:
+            res["referrer"] = self.referrer
         if self._type:
             res["_type"] = self._type
         if self._data: