satori-python-core 0.15.2__tar.gz → 0.16.0__tar.gz

{satori_python_core-0.15.2 → satori_python_core-0.16.0}/.mina/core.toml

@@ -15,7 +15,7 @@ dependencies = [
 description = "Satori Protocol SDK for python, specify common part"
 license = {text = "MIT"}
 readme = "README.md"
-requires-python = ">=3.8"
+requires-python = ">=3.9"
 classifiers = [
     "Typing :: Typed",
     "Development Status :: 4 - Beta",

{satori_python_core-0.15.2 → satori_python_core-0.16.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: satori-python-core
-Version: 0.15.2
+Version: 0.16.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>
@@ -16,7 +16,7 @@ Classifier: Programming Language :: Python :: 3.12
 Classifier: Operating System :: OS Independent
 Project-URL: Homepage, https://github.com/RF-Tar-Railt/satori-python
 Project-URL: Repository, https://github.com/RF-Tar-Railt/satori-python
-Requires-Python: >=3.8
+Requires-Python: >=3.9
 Requires-Dist: loguru>=0.7.2
 Requires-Dist: yarl>=1.9.4
 Requires-Dist: typing-extensions>=4.7.0
@@ -74,9 +74,9 @@ pip install satori-python-server
 客户端：
 
 ```python
-from satori import EventType, WebsocketsInfo
+from satori import EventType
 from satori.event import MessageEvent
-from satori.client import Account, App
+from satori.client import Account, App, WebsocketsInfo
 
 app = App(WebsocketsInfo(port=5140))
 

{satori_python_core-0.15.2 → satori_python_core-0.16.0}/README.md

@@ -50,9 +50,9 @@ pip install satori-python-server
 客户端：
 
 ```python
-from satori import EventType, WebsocketsInfo
+from satori import EventType
 from satori.event import MessageEvent
-from satori.client import Account, App
+from satori.client import Account, App, WebsocketsInfo
 
 app = App(WebsocketsInfo(port=5140))
 

{satori_python_core-0.15.2 → satori_python_core-0.16.0}/pyproject.toml

@@ -11,7 +11,7 @@ dependencies = [
 ]
 description = "Satori Protocol SDK for python, specify common part"
 readme = "README.md"
-requires-python = ">=3.8"
+requires-python = ">=3.9"
 classifiers = [
     "Typing :: Typed",
     "Development Status :: 4 - Beta",
@@ -23,7 +23,7 @@ classifiers = [
     "Programming Language :: Python :: 3.12",
     "Operating System :: OS Independent",
 ]
-version = "0.15.2"
+version = "0.16.0"
 
 [project.license]
 text = "MIT"

{satori_python_core-0.15.2 → satori_python_core-0.16.0}/src/satori/__init__.py

@@ -1,5 +1,3 @@
-from .config import WebhookInfo as WebhookInfo
-from .config import WebsocketsInfo as WebsocketsInfo
 from .const import Api as Api
 from .const import EventType as EventType
 from .element import At as At
@@ -43,4 +41,4 @@ from .model import Role as Role
 from .model import Upload as Upload
 from .model import User as User
 
-__version__ = "0.15.2"
+__version__ = "0.16.0"

{satori_python_core-0.15.2 → satori_python_core-0.16.0}/src/satori/model.py

@@ -15,6 +15,7 @@ from .parser import parse
 @dataclass
 class ModelBase:
     __converter__: ClassVar[dict[str, Callable[[Any], Any]]] = {}
+    _raw_data: dict[str, Any] = field(init=False, default_factory=dict, repr=False, compare=False, hash=False)
 
     @classmethod
     def parse(cls, raw: dict):
@@ -26,7 +27,9 @@ class ModelBase:
                     data[fd.name] = cls.__converter__[fd.name](raw[fd.name])
                 else:
                     data[fd.name] = raw[fd.name]
-        return cls(**data)  # type: ignore
+        obj = cls(**data)  # type: ignore
+        obj._raw_data = raw
+        return obj
 
     def dump(self) -> dict:
         raise NotImplementedError
@@ -129,71 +132,57 @@ class Role(ModelBase):
 
 class LoginStatus(IntEnum):
     OFFLINE = 0
+    """离线"""
     ONLINE = 1
+    """在线"""
     CONNECT = 2
+    """正在连接"""
     DISCONNECT = 3
+    """正在断开连接"""
     RECONNECT = 4
+    """正在重新连接"""
 
 
 @dataclass
 class Login(ModelBase):
+    sn: str
     status: LoginStatus
-    user: Optional[User] = None
-    self_id: Optional[str] = None
+    adapter: str
     platform: Optional[str] = None
+    user: Optional[User] = None
     features: list[str] = field(default_factory=list)
-    proxy_urls: list[str] = field(default_factory=list)
 
     __converter__ = {"user": User.parse, "status": LoginStatus}
 
     def dump(self):
         res: dict[str, Any] = {
+            "sn": self.sn,
             "status": self.status.value,
-            "features": self.features,
-            "proxy_urls": self.proxy_urls,
+            "adapter": self.adapter,
         }
-        if self.user:
-            res["user"] = self.user.dump()
-        if self.self_id:
-            res["self_id"] = self.self_id
         if self.platform:
             res["platform"] = self.platform
+        if self.user:
+            res["user"] = self.user.dump()
+        if self.features:
+            res["features"] = self.features
         return res
 
-    @property
-    def id(self) -> Optional[str]:
-        return self.self_id or (self.user.id if self.user else None)
-
-
-@dataclass
-class LoginPreview(ModelBase):
-    user: User
-    platform: str
-    status: Optional[LoginStatus] = None
-    features: list[str] = field(default_factory=list)
-    proxy_urls: list[str] = field(default_factory=list)
-
-    __converter__ = {"user": User.parse, "status": LoginStatus}
-
-    def dump(self):
-        res: dict[str, Any] = {
-            "user": self.user.dump(),
-            "platform": self.platform,
-            "features": self.features,
-            "proxy_urls": self.proxy_urls,
-        }
-        if self.status:
-            res["status"] = self.status.value
-        return res
+    @classmethod
+    def parse(cls, raw: dict):
+        if "self_id" in raw and "user" not in raw:
+            raw["user"] = {"id": raw["self_id"]}
+        if "adapter" not in raw:
+            raw["adapter"] = "satori"
+        return super().parse(raw)
 
     @property
     def id(self) -> str:
+        if not self.user:
+            raise ValueError(f"Login {self.sn} has not complete yet")
         return self.user.id
 
 
-LoginType = Union[Login, LoginPreview]
-
-
 @dataclass
 class ArgvInteraction(ModelBase):
     name: str
@@ -214,21 +203,70 @@ class ButtonInteraction(ModelBase):
 
 class Opcode(IntEnum):
     EVENT = 0
+    """事件 (接收)"""
     PING = 1
+    """心跳 (发送)"""
     PONG = 2
+    """心跳回复 (接收)"""
     IDENTIFY = 3
+    """鉴权 (发送)"""
     READY = 4
+    """鉴权成功 (接收)"""
+    META = 5
+    """元信息更新 (接收)"""
 
 
 @dataclass
 class Identify(ModelBase):
     token: Optional[str] = None
-    sequence: Optional[int] = None
+    sn: Optional[int] = None
+
+    @classmethod
+    def parse(cls, raw: dict):
+        if "sequence" in raw and "sn" not in raw:
+            raw["sn"] = raw["sequence"]
+        return super().parse(raw)
+
+    @property
+    def sequence(self) -> Optional[int]:
+        return self.sn
+
+    def dump(self):
+        return asdict(self)
 
 
 @dataclass
 class Ready(ModelBase):
     logins: list[Login]
+    proxy_urls: list[str] = field(default_factory=list)
+
+    __converter__ = {"logins": lambda raw: [Login.parse(login) for login in raw]}
+
+    def dump(self):
+        return asdict(self)
+
+
+@dataclass
+class MetaPayload(ModelBase):
+    """Meta 信令"""
+
+    proxy_urls: list[str]
+
+    def dump(self):
+        return asdict(self)
+
+
+@dataclass
+class Meta(ModelBase):
+    """Meta 数据"""
+
+    logins: list[Login]
+    proxy_urls: list[str] = field(default_factory=list)
+
+    __converter__ = {"logins": lambda raw: [Login.parse(login) for login in raw]}
+
+    def dump(self):
+        return asdict(self)
 
 
 @dataclass
@@ -334,16 +372,13 @@ class MessageReceipt(ModelBase):
 
 @dataclass
 class Event(ModelBase):
-    id: int
     type: str
     timestamp: datetime
-    platform: Optional[str] = None
-    self_id: Optional[str] = None
+    login: Login
     argv: Optional[ArgvInteraction] = None
     button: Optional[ButtonInteraction] = None
     channel: Optional[Channel] = None
     guild: Optional[Guild] = None
-    login: Optional[LoginType] = None
     member: Optional[Member] = None
     message: Optional[MessageObject] = None
     operator: Optional[User] = None
@@ -353,19 +388,15 @@ class Event(ModelBase):
     _type: Optional[str] = None
     _data: Optional[dict] = None
 
+    sn: int = 0
+
     __converter__ = {
         "timestamp": lambda ts: datetime.fromtimestamp(int(ts) / 1000),
         "argv": ArgvInteraction.parse,
         "button": ButtonInteraction.parse,
         "channel": Channel.parse,
         "guild": Guild.parse,
-        "login": lambda raw: (
-            LoginPreview.parse(
-                raw if raw["user"] else {**raw, "user": {"id": raw["self_id"]}} if "self_id" in raw else raw
-            )
-            if "user" in raw
-            else Login.parse(raw)
-        ),
+        "login": Login.parse,
         "member": Member.parse,
         "message": MessageObject.parse,
         "operator": User.parse,
@@ -373,33 +404,33 @@ class Event(ModelBase):
         "user": User.parse,
     }
 
-    @property
-    def platform_(self):
-        if self.platform:
-            return self.platform
-        if self.login and self.login.platform:
-            return self.login.platform
-        raise ValueError("platform not found")
+    @classmethod
+    def parse(cls, raw: dict):
+        if "id" in raw and "sn" not in raw:
+            raw["sn"] = raw["id"]
+        if "platform" in raw and "self_id" in raw and "login" not in raw:
+            raw["login"] = {
+                "sn": raw["self_id"],
+                "platform": raw["platform"],
+                "user": {"id": raw["self_id"]},
+                "status": LoginStatus.ONLINE,
+            }
+        return super().parse(raw)
 
     @property
-    def self_id_(self):
-        if self.self_id:
-            return self.self_id
-        if self.login and self.login.id:
-            return self.login.id
-        raise ValueError("self_id not found")
+    def platform(self):
+        return self.login.platform
 
-    def __post_init__(self):
-        _ = self.platform_
-        _ = self.self_id_
+    @property
+    def self_id(self):
+        return self.login.id
 
     def dump(self):
         res = {
-            "id": self.id,
+            "sn": self.sn,
             "type": self.type,
-            "platform": self.platform_,
-            "self_id": self.self_id_,
             "timestamp": int(self.timestamp.timestamp() * 1000),
+            "login": self.login.dump(),
         }
         if self.argv:
             res["argv"] = self.argv.dump()

satori_python_core-0.15.2/src/satori/config.py

@@ -1,67 +0,0 @@
-from dataclasses import dataclass
-from typing import Optional
-
-from yarl import URL
-
-
-class Config:
-    @property
-    def identity(self) -> str:
-        raise NotImplementedError
-
-    @property
-    def token(self) -> Optional[str]:
-        raise NotImplementedError
-
-    @property
-    def api_base(self) -> URL:
-        raise NotImplementedError
-
-
-@dataclass
-class WebsocketsInfo(Config):
-    host: str = "localhost"
-    port: int = 5140
-    path: str = ""
-    token: Optional[str] = None
-
-    def __post_init__(self):
-        if self.path and not self.path.startswith("/"):
-            self.path = f"/{self.path}"
-
-    @property
-    def identity(self):
-        return f"{self.host}:{self.port}"
-
-    @property
-    def api_base(self):
-        return URL(f"http://{self.host}:{self.port}{self.path}") / "v1"
-
-    @property
-    def ws_base(self):
-        return URL(f"ws://{self.host}:{self.port}{self.path}") / "v1"
-
-
-@dataclass
-class WebhookInfo(Config):
-    host: str = "127.0.0.1"
-    port: int = 8080
-    path: str = "v1/events"
-    token: Optional[str] = None
-    server_host: str = "localhost"
-    server_port: int = 5140
-    server_path: str = ""
-
-    def __post_init__(self):
-        if self.path and not self.path.startswith("/"):
-            self.path = f"/{self.path}"
-        if self.server_path and not self.server_path.startswith("/"):
-            self.server_path = f"/{self.server_path}"
-
-    @property
-    def identity(self):
-        return f"{self.host}:{self.port}{self.path}"
-
-    @property
-    def api_base(self):
-        return URL(f"http://{self.server_host}:{self.server_port}{self.server_path}") / "v1"