satori-python 1.3.4__py3-none-any.whl → 1.3.6__py3-none-any.whl

satori/__init__.py

@@ -45,7 +45,7 @@ from .model import Role as Role
 from .model import Upload as Upload
 from .model import User as User
 
-__version__ = "1.3.4"
+__version__ = "1.3.6"
 
 
 MessageReceipt = MessageObject

satori/element.py

@@ -124,10 +124,12 @@ class Element:
         return self.dumps()
 
     def __repr__(self) -> str:
+        if not self._attrs:
+            self._attrs = {k: v for k, v in self.__dict__.items() if not k.startswith("_")}
         args = {**self._attrs}
         elem = f"{self.__class__.__name__}(" + ", ".join(f"{k}={v!r}" for k, v in args.items())
         if self._children:
-            elem += ", { " + ", ".join(repr(i) for i in self._children) + " }"
+            elem += ", [" + ", ".join(repr(i) for i in self._children) + "]"
         return elem + ")"
 
     def __call__(self, *content: "str | Element"):
@@ -255,7 +257,6 @@ class Link(Element):
 class Resource(Element):
     src: str
     title: str | None = None
-    extra: InitVar[dict[str, Any] | None] = None
     cache: bool | None = None
     timeout: int | None = None
 
@@ -269,14 +270,15 @@ class Resource(Element):
         raw: bytes | BytesIO | None = None,
         mime: str | None = None,
         name: str | None = None,
+        width: int | None = None,
+        height: int | None = None,
         duration: float | None = None,
         poster: str | None = None,
-        extra: dict[str, Any] | None = None,
         cache: bool | None = None,
         timeout: int | None = None,
         **kwargs,
     ) -> Self:
-        data: dict[str, Any] = {"extra": extra, **kwargs}
+        data: dict[str, Any] = {**kwargs}
         if url is not None:
             data |= {"src": url}
         elif path:
@@ -294,6 +296,10 @@ class Resource(Element):
             raise ValueError(f"{cls} need at least one of url, path and raw")
         if name is not None:
             data["title"] = name
+        if width is not None and cls in (Image, Video):
+            data["width"] = width
+        if height is not None and cls in (Image, Video):
+            data["height"] = height
         if duration is not None and cls is Audio:
             data["duration"] = duration
         if poster is not None and cls in (Video, Audio, File):
@@ -302,11 +308,7 @@ class Resource(Element):
             data["cache"] = cache
         if timeout is not None:
             data["timeout"] = timeout
-        return cls(**data)
-
-    def __post_init__(self, extra: dict[str, Any] | None = None):
-        if extra:
-            self._attrs.update(extra)
+        return cls.unpack(data)
 
 
 @dataclass(repr=False)
@@ -487,7 +489,7 @@ class Message(Element):
         self,
         id: str | None = None,
         forward: bool | None = None,
-        content: list[str | Element] | None = None,
+        content: Sequence[str | Element] | None = None,
     ):
         self.id = id
         self.forward = forward
@@ -580,7 +582,7 @@ class Custom(Element):
         attrs: dict[str, Any] | None = None,
         children: Sequence[str | Element] | None = None,
     ):
-        self.type = type
+        self._type = type
         if not hasattr(self, "_attrs"):
             self._attrs = attrs or {}
         else:
@@ -593,7 +595,21 @@ class Custom(Element):
     @property
     @override
     def tag(self) -> str:
-        return self.type
+        return self._type
+
+    def __repr__(self) -> str:
+        if not self._attrs:
+            self._attrs = {k: v for k, v in self.__dict__.items() if not k.startswith("_")}
+        args = {**self._attrs}
+        elem = (
+            f"{self.__class__.__name__}({self._type!r}"
+            + ", {"
+            + ", ".join(f"{k!r}: {v!r}" for k, v in args.items())
+            + "}"
+        )
+        if self._children:
+            elem += ", [" + ", ".join(repr(i) for i in self._children) + "]"
+        return elem + ")"
 
 
 @dataclass(repr=False)

{satori_python-1.3.4.dist-info → satori_python-1.3.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: satori-python
-Version: 1.3.4
+Version: 1.3.6
 Summary: Satori Protocol SDK for python
 Home-page: https://github.com/RF-Tar-Railt/satori-python
 Author-Email: RF-Tar-Railt <rf_tar_railt@qq.com>

{satori_python-1.3.4.dist-info → satori_python-1.3.6.dist-info}/RECORD

@@ -1,4 +1,4 @@
-satori/__init__.py,sha256=FQefy9qVHoveZvovXuXDhPFX775QW0B8IutY41otMe8,1888
+satori/__init__.py,sha256=iqFO7AcoOIYcQ6H2Hcd2CHDqgunj4qSpj5_awItfaCE,1888
 satori/_vendor/fleep.py,sha256=_zKP7iY3mMQr0rC5KbgkbkMorT3KVLeIsWPLIUa0Y34,16347
 satori/client/__init__.py,sha256=1HLiYmYZoScymOzTuOVZht99eREXMUT09F8PZzvAMPA,14484
 satori/client/account.py,sha256=HP7BJWkN69SB9ldNIjHxWlXcrmB-IPnTnYqm3lBMvl8,2742
@@ -11,7 +11,7 @@ satori/client/network/webhook.py,sha256=N1zcJGx-Ijwtc0dIsPWzdnJSLi0ydQTengHBxtbb
 satori/client/network/websocket.py,sha256=oZtiFLywP_Rw-_I-hl32nShCTTQ1XKlv0BhWJj53x9Y,8476
 satori/client/protocol.py,sha256=hXrtgh-ypiF1W-dTl5I4LBWg8P2VTNKYQWFq8aRCeeo,28577
 satori/const.py,sha256=6TQAIlgNq7fHLiadxGUU-mzkffOcpRrEvq5yrWYMuGc,2738
-satori/element.py,sha256=Ya0iDwMpgmfdluHWEYEhbaC9fdRZuYRJfjMwLM4vb_E,20707
+satori/element.py,sha256=7a1azqihsYBNe7BHGvN-MQH4jOsTj47Ei9h5qwDVu9M,21355
 satori/event.py,sha256=yC6rKaa7JbeOZ4Un1rX-Isvm3EcR7e782nxYf1j6JdM,1060
 satori/exception.py,sha256=edKeuLRZAQxyCdw1_XCgOtv5tIHkfHw0Die9B818_HM,545
 satori/model.py,sha256=L8Wlk4zGlnR5kM4rAsaXvPufxdwmUsshkFY9PLGj8tY,17614
@@ -25,7 +25,7 @@ satori/server/model.py,sha256=zzjNa3iBFkd8crZIVTrEisPaB0g8JsxV4fA2rRU0maw,1105
 satori/server/route.py,sha256=kpelAX0kYQbJncp5biWi8pWRcEIez9m9sJN8NF3sjn4,10654
 satori/server/utils.py,sha256=hMNqLzbzcwyLJO-sGncO5kuviiW5Y6k34fj4AS2iVWQ,910
 satori/utils.py,sha256=N8HEw-DOXxOBwFHmmXgqPdMh6AXjiGR0ZGa1zBPH6EI,822
-satori_python-1.3.4.dist-info/METADATA,sha256=06M-7vqckbF3Ib-6quslfGmB05p_7gg_mQ_N0IkBy-M,5511
-satori_python-1.3.4.dist-info/WHEEL,sha256=rSwsxJWe3vzyR5HCwjWXQruDgschpei4h_giTm0dJVE,90
-satori_python-1.3.4.dist-info/licenses/LICENSE,sha256=2EDswKd1M1648judap8BEEwp3Jz6IpfFP2wYVdU0Y2o,1069
-satori_python-1.3.4.dist-info/RECORD,,
+satori_python-1.3.6.dist-info/METADATA,sha256=ykbOROhEgZKgXqojHaiSPc4UOB8Rr13qBY7zXLBwCyg,5511
+satori_python-1.3.6.dist-info/WHEEL,sha256=rSwsxJWe3vzyR5HCwjWXQruDgschpei4h_giTm0dJVE,90
+satori_python-1.3.6.dist-info/licenses/LICENSE,sha256=2EDswKd1M1648judap8BEEwp3Jz6IpfFP2wYVdU0Y2o,1069
+satori_python-1.3.6.dist-info/RECORD,,