satori-python-adapter-milky 0.3.1__tar.gz → 0.4.0__tar.gz

{satori_python_adapter_milky-0.3.1 → satori_python_adapter_milky-0.4.0}/.mina/adapter_milky.toml

@@ -1,9 +1,9 @@
 includes = ["src/satori/adapters/milky"]
-raw-dependencies = ["satori-python-server<1.4.0,>= 1.3.0"]
+raw-dependencies = ["satori-python-server<1.4.0,>= 1.3.3"]
 
 [project]
 name = "satori-python-adapter-milky"
-version = "0.3.1"
+version = "0.4.0"
 authors = [
   {name = "RF-Tar-Railt", email = "rf_tar_railt@qq.com"}
 ]
@@ -16,11 +16,11 @@ classifiers = [
     "Typing :: Typed",
     "Development Status :: 4 - Beta",
     "License :: OSI Approved :: MIT License",
-    "Programming Language :: Python :: 3.8",
-    "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13",
+    "Programming Language :: Python :: 3.14",
     "Operating System :: OS Independent",
 ]
 

{satori_python_adapter_milky-0.3.1 → satori_python_adapter_milky-0.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: satori-python-adapter-milky
-Version: 0.3.1
+Version: 0.4.0
 Summary: Satori Protocol SDK for python, adapter for Milky
 Home-page: https://github.com/RF-Tar-Railt/satori-python
 Author-Email: RF-Tar-Railt <rf_tar_railt@qq.com>
@@ -8,16 +8,16 @@ License: MIT
 Classifier: Typing :: Typed
 Classifier: Development Status :: 4 - Beta
 Classifier: License :: OSI Approved :: MIT License
-Classifier: Programming Language :: Python :: 3.8
-Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 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: <4.0,>=3.10
-Requires-Dist: satori-python-server<1.4.0,>=1.3.0
+Requires-Dist: satori-python-server<1.4.0,>=1.3.3
 Description-Content-Type: text/markdown
 
 # satori-python
@@ -27,11 +27,11 @@ 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.chat/zh-CN/) 协议的 Python 开发工具包
+基于 [Satori](https://satori.chat/zh-CN/protocol) 协议的 Python 开发工具包
 
 ## 协议介绍
 
-[Satori Protocol](https://satori.chat/zh-CN/)
+[Satori Protocol](https://satori.chat/zh-CN/protocol)
 
 ### 协议端
 

{satori_python_adapter_milky-0.3.1 → satori_python_adapter_milky-0.4.0}/README.md

@@ -5,11 +5,11 @@
 [![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.chat/zh-CN/) 协议的 Python 开发工具包
+基于 [Satori](https://satori.chat/zh-CN/protocol) 协议的 Python 开发工具包
 
 ## 协议介绍
 
-[Satori Protocol](https://satori.chat/zh-CN/)
+[Satori Protocol](https://satori.chat/zh-CN/protocol)
 
 ### 协议端
 

{satori_python_adapter_milky-0.3.1 → satori_python_adapter_milky-0.4.0}/pyproject.toml

@@ -1,11 +1,11 @@
 [project]
 name = "satori-python-adapter-milky"
-version = "0.3.1"
+version = "0.4.0"
 authors = [
     { name = "RF-Tar-Railt", email = "rf_tar_railt@qq.com" },
 ]
 dependencies = [
-    "satori-python-server<1.4.0,>= 1.3.0",
+    "satori-python-server<1.4.0,>= 1.3.3",
 ]
 description = "Satori Protocol SDK for python, adapter for Milky"
 readme = "README.md"
@@ -14,11 +14,11 @@ classifiers = [
     "Typing :: Typed",
     "Development Status :: 4 - Beta",
     "License :: OSI Approved :: MIT License",
-    "Programming Language :: Python :: 3.8",
-    "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13",
+    "Programming Language :: Python :: 3.14",
     "Operating System :: OS Independent",
 ]
 
@@ -38,15 +38,14 @@ build-backend = "mina.backend"
 
 [dependency-groups]
 dev = [
-    "isort>=5.13.2",
-    "black>=24.4.0",
-    "ruff>=0.4.1",
+    "black>=26.3.0",
+    "ruff>=0.15.1",
     "pre-commit>=3.7.0",
-    "fix-future-annotations>=0.5.0",
     "mina-build<0.6,>=0.5.1",
     "pdm-mina>=0.3.2",
     "nonechat<0.7.0,>=0.6.0",
     "uvicorn[standard]>=0.37.0",
+    "pydantic>=2.13.1",
 ]
 
 [tool.pdm.build]
@@ -60,7 +59,7 @@ excludes = [
 
 [tool.pdm.scripts.format]
 composite = [
-    "isort ./src/ ./example/",
+    "ruff check --select I --fix ./src/ ./example/",
     "black ./src/ ./example/",
     "ruff check",
 ]
@@ -74,14 +73,6 @@ line-length = 120
 include = "\\.pyi?$"
 extend-exclude = ""
 
-[tool.isort]
-profile = "black"
-line_length = 120
-skip_gitignore = true
-extra_standard_library = [
-    "typing_extensions",
-]
-
 [tool.ruff]
 line-length = 120
 target-version = "py310"
@@ -91,6 +82,7 @@ exclude = [
     "exam2.py",
     "src/satori/_vendor/*",
 ]
+respect-gitignore = true
 
 [tool.ruff.lint]
 select = [
@@ -110,6 +102,12 @@ ignore = [
     "T201",
 ]
 
+[tool.ruff.lint.isort]
+extra-standard-library = [
+    "typing_extensions",
+]
+force-sort-within-sections = false
+
 [tool.pyright]
 pythonPlatform = "All"
 pythonVersion = "3.10"

{satori_python_adapter_milky-0.3.1 → satori_python_adapter_milky-0.4.0}/src/satori/adapters/milky/base.py

@@ -132,7 +132,9 @@ class MilkyBaseAdapter(BaseAdapter, ABC):
         if not data:
             return
         user = decode_login_user(data)
-        login = Login(0, LoginStatus.ONLINE, "milky", platform="milky", user=user, features=self.features.copy())
+        login = Login(
+            sn=0, status=LoginStatus.ONLINE, adapter="milky", platform="milky", user=user, features=self.features.copy()
+        )
         self_id = login.id
         previous = self.logins.get(self_id)
         self.logins[self_id] = login

{satori_python_adapter_milky-0.3.1 → satori_python_adapter_milky-0.4.0}/src/satori/adapters/milky/message.py

@@ -167,6 +167,9 @@ class MilkyMessageEncoder:
             case "file":
                 await self.flush()
                 await self._send_file(attrs)
+            case "milky:light_app":
+                await self.flush()
+                self.segments.append({"type": "light_app", "data": {"json_payload": attrs["json_payload"]}})
             case "author":
                 self.stack[0].author.update(attrs)
             case "quote":
@@ -364,7 +367,7 @@ async def _decode_segments(net: MilkyNetwork, payload: dict, segments: Sequence[
             case "text":
                 result.append(E.text(data.get("text", "")))
             case "mention":
-                result.append(E.at(str(data.get("user_id"))))
+                result.append(E.at(str(data.get("user_id")), name=data.get("name")))
             case "mention_all":
                 result.append(E.at_all())
             case "face":
@@ -380,15 +383,60 @@ async def _decode_segments(net: MilkyNetwork, payload: dict, segments: Sequence[
             case "reply":
                 seq = data.get("message_seq")
                 if seq is not None:
-                    quote = await _decode_reply(net, payload, int(seq))
+                    quote = await _decode_reply(net, payload, data, int(seq))
                     if quote:
                         result.append(quote)
+            case "forward":
+                forward_id = data.get("forward_id")
+                if forward_id is not None:
+                    messages = (await net.call_api("get_forwarded_messages", {"forward_id": forward_id}))["messages"]
+                    forward_elements = []
+                    for msg in messages:
+                        sender_name = msg.get("sender_name")
+                        avatar = msg.get("avatar_url")
+                        response = {}
+                        if "message_seq" in msg:
+                            try:
+                                response = await net.call_api(
+                                    "get_message",
+                                    {
+                                        "message_scene": payload["message_scene"],
+                                        "peer_id": payload["peer_id"],
+                                        "message_seq": msg["message_seq"],
+                                    },
+                                )
+                            except Exception:
+                                pass
+                        if response:
+                            origin = await decode_message(net, response["message"])
+                            content = []
+                            if origin.user:
+                                content.append(
+                                    E.author(
+                                        origin.user.id, origin.user.name or sender_name, origin.user.avatar or avatar
+                                    )
+                                )
+                            content.extend(origin.message)
+
+                        else:
+                            content = await _decode_segments(net, payload, msg.get("segments", []))
+                            content.insert(0, E.author(str(msg.get("sender_id")), sender_name, avatar))
+                        forward_elements.append(E.message(str(msg.get("message_seq")), content=content))
+                    result.append(E.message(forward_id, content=forward_elements, forward=True))
             case _:
                 result.append(Custom(f"milky:{seg_type}", data))
     return result
 
 
-async def _decode_reply(net: MilkyNetwork, payload: dict, message_seq: int) -> Element | None:
+async def _decode_reply(net: MilkyNetwork, payload: dict, data: dict, message_seq: int) -> Element | None:
+    if all(k in data for k in ("sender_id", "time", "segments")):
+        user = User(str(data["sender_id"]), data.get("sender_name"), avatar=user_avatar(data["sender_id"]))
+        elements = await _decode_segments(net, payload, data["segments"])
+        content = []
+        if user:
+            content.append(E.author(user.id, user.name, user.avatar))
+        content.extend(elements)
+        return E.quote(str(message_seq), content=content)
     try:
         response = await net.call_api(
             "get_message",