satori-python-adapter-qq 0.3.0__tar.gz → 0.3.2__tar.gz

{satori_python_adapter_qq-0.3.0 → satori_python_adapter_qq-0.3.2}/.mina/adapter_qq.toml

@@ -1,12 +1,12 @@
 includes = ["src/satori/adapters/qq"]
 raw-dependencies = [
-    "satori-python<1.4.0,>= 1.3.0",
+    "satori-python<1.4.0,>= 1.3.3",
     "cryptography>=46.0.4",
 ]
 
 [project]
 name = "satori-python-adapter-qq"
-version = "0.3.0"
+version = "0.3.2"
 authors = [
   {name = "RF-Tar-Railt", email = "rf_tar_railt@qq.com"}
 ]

{satori_python_adapter_qq-0.3.0 → satori_python_adapter_qq-0.3.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: satori-python-adapter-qq
-Version: 0.3.0
+Version: 0.3.2
 Summary: Satori Protocol SDK for python, adapter for QQ
 Home-page: https://github.com/RF-Tar-Railt/satori-python
 Author-Email: RF-Tar-Railt <rf_tar_railt@qq.com>
@@ -17,7 +17,7 @@ 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<1.4.0,>=1.3.0
+Requires-Dist: satori-python<1.4.0,>=1.3.3
 Requires-Dist: cryptography>=46.0.4
 Description-Content-Type: text/markdown
 

{satori_python_adapter_qq-0.3.0 → satori_python_adapter_qq-0.3.2}/pyproject.toml

@@ -1,11 +1,11 @@
 [project]
 name = "satori-python-adapter-qq"
-version = "0.3.0"
+version = "0.3.2"
 authors = [
     { name = "RF-Tar-Railt", email = "rf_tar_railt@qq.com" },
 ]
 dependencies = [
-    "satori-python<1.4.0,>= 1.3.0",
+    "satori-python<1.4.0,>= 1.3.3",
     "cryptography>=46.0.4",
 ]
 description = "Satori Protocol SDK for python, adapter for QQ"
@@ -39,15 +39,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]
@@ -61,7 +60,7 @@ excludes = [
 
 [tool.pdm.scripts.format]
 composite = [
-    "isort ./src/ ./example/",
+    "ruff check --select I --fix ./src/ ./example/",
     "black ./src/ ./example/",
     "ruff check",
 ]
@@ -75,14 +74,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"
@@ -92,6 +83,7 @@ exclude = [
     "exam2.py",
     "src/satori/_vendor/*",
 ]
+respect-gitignore = true
 
 [tool.ruff.lint]
 select = [
@@ -111,6 +103,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_qq-0.3.0 → satori_python_adapter_qq-0.3.2}/src/satori/adapters/qq/main.py

@@ -318,7 +318,9 @@ class QQBotWebhookAdapter(BaseAdapter):
         bot_info = await network.call_api("get", "users/@me")
         user = decode_user(bot_info)
         user.is_bot = True
-        login = Login(0, LoginStatus.ONLINE, "qqbot", platform="qq", user=user, features=QQ_FEATURES.copy())
+        login = Login(
+            sn=0, status=LoginStatus.ONLINE, adapter="qqbot", platform="qq", user=user, features=QQ_FEATURES.copy()
+        )
         previous = next((lg for lg in self.logins if lg.id == login.id and lg.platform == "qq"), None)
         if previous:
             previous.user = login.user
@@ -331,7 +333,12 @@ class QQBotWebhookAdapter(BaseAdapter):
             event_type = EventType.LOGIN_ADDED
         await self.server.post(Event(event_type, datetime.now(), login))
         guild_login = Login(
-            0, LoginStatus.ONLINE, "qqbot", platform="qqguild", user=user, features=QQ_GUILD_FEATURES.copy()
+            sn=0,
+            status=LoginStatus.ONLINE,
+            adapter="qqbot",
+            platform="qqguild",
+            user=user,
+            features=QQ_GUILD_FEATURES.copy(),
         )
         previous = next((lg for lg in self.logins if lg.id == guild_login.id and lg.platform == "qqguild"), None)
         if previous:

{satori_python_adapter_qq-0.3.0 → satori_python_adapter_qq-0.3.2}/src/satori/adapters/qq/message.py

@@ -1,24 +1,26 @@
 from __future__ import annotations
 
+import asyncio
 import base64
 import json
 import random
 import re
 from datetime import datetime, timezone
-from pathlib import Path
+from hashlib import md5, sha1
 
 from loguru import logger
 
-from satori.element import Button, Custom, E, Element, Raw, select, transform
+from satori.element import Custom, E, Element, Raw
 from satori.model import Login, MessageObject
 from satori.parser import Element as RawElement
-from satori.parser import parse
+from satori.parser import parse, select
 
 from ...exception import ActionFailed
 from .exception import AuditException
-from .utils import QQBotNetwork
+from .utils import QQBotNetwork, parse_file_uri
 
 _BASE64_RE = re.compile(r"^data:([\w/.+-]+);base64,")
+MAX_FILESIZE_ONCE = 10 * 1024 * 1024  # 10MB
 
 
 def escape(s: str) -> str:
@@ -88,12 +90,12 @@ class QQBotMessageEncoder:
 
     async def send(self, content: str):
         self._raw_content = content
-        msg = transform(parse(content))
-        btns = select(msg, Button)
-        btns = [btn for btn in btns if btn.type != "link" and not btn.id]
+        msg = parse(content)
+        btns = select(msg, "button")
+        btns = [btn for btn in btns if btn.tag() != "link" and not btn.attrs.get("id")]
         for btn in btns:
-            btn.id = random.randbytes(8).hex()
-        await self.render(parse("".join(map(str, msg))))
+            btn.attrs["id"] = random.randbytes(8).hex()
+        await self.render(msg)
         await self.flush()
         return self.results
 
@@ -230,7 +232,7 @@ class QQGuildMessageEncoder(QQBotMessageEncoder):
                 content_type = b64_match.group(1)
                 filename = f"file.{content_type.split('/')[-1]}"
             else:
-                path = Path(url[7:])
+                path = parse_file_uri(url)
                 data = path.read_bytes()
                 filename = path.name
                 content_type = None
@@ -301,6 +303,7 @@ class QQGroupMessageEncoder(QQBotMessageEncoder):
                 "event_id": event_id,
                 "msg_id": msg_id,
                 "msg_seq": data["msg_seq"],
+                "ref_idx": resp["ext_info"].get("ref_idx"),
             }
             self.results.append(MessageObject(resp["id"], self._raw_content, referrer=referrer))
         except Exception as e:
@@ -315,6 +318,7 @@ class QQGroupMessageEncoder(QQBotMessageEncoder):
 
     async def send_file(self, type_: str, attrs: dict) -> dict | None:
         url = attrs.get("url") or attrs["src"]
+        filename = attrs.get("name") or attrs.get("title")
         is_uri = url.startswith("file://")
         b64_match = _BASE64_RE.match(url)
         file_type = 0
@@ -331,13 +335,27 @@ class QQGroupMessageEncoder(QQBotMessageEncoder):
             "file_type": file_type,
             "srv_send_msg": False,
         }
+        file_data = None
+        raw_data = None
         if b64_match:
-            req["file_data"] = url[len(b64_match.group(0)) :]
+            file_data = url[len(b64_match.group(0)) :]
+            raw_data = base64.b64decode(file_data)
         elif is_uri:
-            path = Path(url[7:])
-            req["file_data"] = base64.b64encode(path.read_bytes()).decode("utf-8")
-        else:
+            path = parse_file_uri(url)
+            filename = filename or path.name
+            raw_data = path.read_bytes()
+            file_data = base64.b64encode(raw_data).decode("utf-8")
+        if not file_data:
             req["url"] = url
+        else:
+            req["file_data"] = file_data
+        if filename:
+            req["file_name"] = filename
+
+        if raw_data and len(raw_data) > MAX_FILESIZE_ONCE:
+            # 走分片上传
+            return await self._send_file_chunked(raw_data, file_type, filename)
+
         if self.channel_id.startswith("private:") or (self.referrer and self.referrer.get("direct", False)):
             endpoint = f"v2/users/{self.channel_id.split(':',1)[-1]}/files"
         else:
@@ -349,11 +367,83 @@ class QQGroupMessageEncoder(QQBotMessageEncoder):
             logger.error(f"Failed to upload file to {self.channel_id}: {url}\nError: {e}")
             return None
 
+    async def _send_file_chunked(self, raw: bytes, file_type: int, filename: str | None = None):
+        req: dict = {
+            "file_type": file_type,
+            "file_name": filename or "file",
+            "file_size": len(raw),
+            "md5": md5(raw).hexdigest(),
+            "sha1": sha1(raw).hexdigest(),
+        }
+        buffer = memoryview(raw)
+        first_part = buffer[:MAX_FILESIZE_ONCE]
+        req["md5_10m"] = md5(first_part).hexdigest()
+        if self.channel_id.startswith("private:") or (self.referrer and self.referrer.get("direct", False)):
+            endpoint = f"v2/users/{self.channel_id.split(':', 1)[-1]}/files"
+            prepare_endpoint = f"v2/users/{self.channel_id.split(':', 1)[-1]}/upload_prepare"
+            finish_endpoint = f"v2/users/{self.channel_id.split(':', 1)[-1]}/upload_part_finish"
+        else:
+            endpoint = f"v2/groups/{self.channel_id}/files"
+            prepare_endpoint = f"v2/groups/{self.channel_id}/upload_prepare"
+            finish_endpoint = f"v2/groups/{self.channel_id}/upload_part_finish"
+        try:
+            prepare_resp = await self.net.call_api("post", prepare_endpoint, req)
+        except Exception as e:
+            logger.error(f"Failed to prepare file upload to {self.channel_id}: {filename}\nError: {e}")
+            return None
+
+        async def _put(url, data):
+            async with self.net.session.put(url, data=data) as rp:
+                rp.raise_for_status()
+                return
+
+        upload_id = prepare_resp["upload_id"]
+        base_block_size = int(prepare_resp["block_size"])
+        chunks = bytearray(raw)
+        parts = prepare_resp["parts"]
+        concurrency = prepare_resp["upload_config"]["concurrency"]
+        sent = 0
+        while parts:
+            batch = parts[:concurrency]
+            parts = parts[concurrency:]
+            tasks = []
+            finish = []
+            for part in batch:
+                index = part["index"]
+                block_size = int(part.get("block_size") or base_block_size)
+                chunk = chunks[sent : sent + block_size]
+                sent += block_size
+                tasks.append(_put(part["presigned_url"], chunk))
+                req = {
+                    "upload_id": upload_id,
+                    "part_index": index,
+                    "block_size": block_size,
+                    "md5": md5(chunk).hexdigest(),
+                }
+                finish.append(self.net.call_api("post", finish_endpoint, req))
+            if concurrency > 1:
+                await asyncio.gather(*tasks)
+                await asyncio.gather(*finish)
+            else:
+                await tasks[0]
+                await finish[0]
+        try:
+            resp = await self.net.call_api("post", endpoint, {"upload_id": upload_id})
+            return resp
+        except Exception as e:
+            logger.error(f"Failed to finalize file upload to {self.channel_id}: {filename}\nError: {e}")
+            return None
+
     async def visit(self, element: RawElement):
         type_, attrs, children = element.type, element.attrs, element.children
         match type_:
             case "text":
                 self.content += attrs["text"]
+            case "at":
+                if attrs.get("id"):
+                    self.content += f"<qqbot-at-user id=\"{attrs['id']}\" />"
+                else:
+                    await self.render(children)
             case "img" | "image":
                 if attrs.get("src") or attrs.get("url"):
                     # await self.flush()
@@ -388,9 +478,13 @@ class QQGroupMessageEncoder(QQBotMessageEncoder):
                 last = self.last_row()
                 last.append(self.decode_button(attrs, "".join(map(str, children))))
             case "markdown":
+                if self.content:
+                    self.content += "\n"
                 self.use_markdown = True
                 await self.render(children)
             case "qq:markdown":
+                if self.content:
+                    self.content += "\n"
                 self.use_markdown = True
                 if attrs.get("template_id"):
                     self.md_templates = {
@@ -398,6 +492,12 @@ class QQGroupMessageEncoder(QQBotMessageEncoder):
                         "params": [{"key": k, "value": v} for k, v in attrs.items() if k != "template_id"],
                     }
                 await self.render(children)
+            case "qq:cmd-enter":
+                self.use_markdown = True
+                self.content += RawElement("qqbot-cmd-enter", attrs, []).dumps()
+            case "qq:cmd-input":
+                self.use_markdown = True
+                self.content += RawElement("qqbot-cmd-input", attrs, []).dumps()
             case "message":
                 await self.flush()
                 await self.render(children)

{satori_python_adapter_qq-0.3.0 → satori_python_adapter_qq-0.3.2}/src/satori/adapters/qq/utils.py

@@ -1,17 +1,23 @@
 from dataclasses import dataclass
 from datetime import datetime
 from enum import Enum
+from pathlib import Path
 from typing import Literal, Protocol
+from urllib.parse import urlparse
+from urllib.request import url2pathname
 
-from aiohttp import ClientResponse
+from aiohttp import ClientResponse, ClientSession
+
+from satori.model import Channel, ChannelType, Guild, Member, Role, User
 
-from ... import Channel, ChannelType, Guild, Member, Role, User
 from .exception import ActionFailed, ApiNotAvailable, AuditException, RateLimitException, UnauthorizedException
 
 CallMethod = Literal["get", "post", "fetch", "update", "multipart", "put", "delete", "patch"]
 
 
 class QQBotNetwork(Protocol):
+    session: ClientSession
+
     async def call_api(self, method: CallMethod, action: str, params: dict | None = None) -> dict: ...
 
 
@@ -135,3 +141,17 @@ ROLE_MAPPING = {
     "2": Role("admin", "管理员"),
     "4": Role("owner", "创建者"),
 }
+
+
+def parse_file_uri(uri):
+    """解析 file URI 为 Path 对象"""
+    parsed = urlparse(uri)
+    if parsed.scheme != "file":
+        raise ValueError(f"不是 file URI: {uri}")
+
+    path = url2pathname(parsed.path)
+
+    if parsed.netloc and parsed.netloc != "localhost":
+        path = f"//{parsed.netloc}{path}"
+
+    return Path(path)

{satori_python_adapter_qq-0.3.0 → satori_python_adapter_qq-0.3.2}/src/satori/adapters/qq/websocket.py

@@ -112,7 +112,7 @@ class Intents:
 class QQBotWebsocketAdapter(BaseAdapter):
 
     connections: dict[tuple[int, int], aiohttp.ClientWebSocketResponse]
-    session: aiohttp.ClientSession | None
+    session: aiohttp.ClientSession
     sequence: int | None
     session_id: str | None
     _access_token: str | None
@@ -139,7 +139,7 @@ class QQBotWebsocketAdapter(BaseAdapter):
         self.intent = intent
         self.api_base = URL(str(api_base if not is_sandbox else sandbox_api_base))
         self.auth_base = URL(str(auth_base))
-        self.session = None
+        self.session = None  # type: ignore
         self.logins: list[Login] = []
         self.bot_id_mapping: dict[str, str] = {}  # login.id -> bot app_id
         self.close_signal = asyncio.Event()
@@ -330,7 +330,9 @@ class QQBotWebsocketAdapter(BaseAdapter):
     async def refresh_login(self, profile: dict):
         user = decode_user(profile)
         user.is_bot = True
-        login = Login(0, LoginStatus.ONLINE, "qqbot", platform="qq", user=user, features=QQ_FEATURES.copy())
+        login = Login(
+            sn=0, status=LoginStatus.ONLINE, adapter="qqbot", platform="qq", user=user, features=QQ_FEATURES.copy()
+        )
         previous = next((lg for lg in self.logins if lg.id == login.id and lg.platform == "qq"), None)
         if previous:
             previous.user = login.user
@@ -343,7 +345,12 @@ class QQBotWebsocketAdapter(BaseAdapter):
             event_type = EventType.LOGIN_ADDED
         await self.server.post(Event(event_type, datetime.now(), login))
         guild_login = Login(
-            0, LoginStatus.ONLINE, "qqbot", platform="qqguild", user=user, features=QQ_GUILD_FEATURES.copy()
+            sn=0,
+            status=LoginStatus.ONLINE,
+            adapter="qqbot",
+            platform="qqguild",
+            user=user,
+            features=QQ_GUILD_FEATURES.copy(),
         )
         previous = next((lg for lg in self.logins if lg.id == guild_login.id and lg.platform == "qqguild"), None)
         if previous:
@@ -498,7 +505,7 @@ class QQBotWebsocketAdapter(BaseAdapter):
         async with self.stage("cleanup"):
             if self.session:
                 await self.session.close()
-            self.session = None
+            self.session = None  # type: ignore
             for task in tasks:
                 task.cancel()
             await asyncio.wait(tasks, return_when=asyncio.ALL_COMPLETED)