satori-python-client 0.14.0__tar.gz → 0.14.2__tar.gz

{satori_python_client-0.14.0 → satori_python_client-0.14.2}/PKG-INFO

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

{satori_python_client-0.14.0 → satori_python_client-0.14.2}/pyproject.toml

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

{satori_python_client-0.14.0 → satori_python_client-0.14.2}/src/satori/client/account.py

@@ -61,6 +61,20 @@ class Account(Generic[TP]):
     def identity(self):
         return f"{self.platform}/{self.self_id}"
 
+    def ensure_url(self, url: str) -> URL:
+        """确定链接形式。
+
+        若链接符合以下条件之一，则返回链接的代理形式 ({host}/{path}/{version}/proxy/{url})：
+            - 链接以 "upload://" 开头
+            - 链接开头出现在 self_info.proxy_urls 中的某一项
+        """
+        if url.startswith("upload"):
+            return self.config.api_base / "proxy" / url.lstrip("/")
+        for proxy_url in self.self_info.proxy_urls:
+            if url.startswith(proxy_url):
+                return self.config.api_base / "proxy" / url.lstrip("/")
+        return URL(url)
+
     def __repr__(self):
         return f"<Account {self.self_id} ({self.platform})>"
 

{satori_python_client-0.14.0 → satori_python_client-0.14.2}/src/satori/client/account.pyi

@@ -63,6 +63,14 @@ class Account(Generic[TP]):
     def custom(
         self, *, protocol_cls: type[TP1] = ApiProtocol, host: str, port: int, token: str | None = None
     ) -> Account[TP1]: ...
+    def ensure_url(self, url: str) -> URL:
+        """确定链接形式。
+
+        若链接符合以下条件之一，则返回链接的代理形式 ({host}/{path}/{version}/proxy/{url})：
+            - 链接以 "upload://" 开头
+            - 链接开头出现在 self_info.proxy_urls 中的某一项
+        """
+
     async def send(self, event: Event, message: str | Iterable[str | Element]) -> list[MessageObject]:
         """发送消息。返回一个 `MessageObject` 对象构成的数组。
 

{satori_python_client-0.14.0 → satori_python_client-0.14.2}/src/satori/client/protocol.py

@@ -37,7 +37,7 @@ class ApiProtocol:
 
     async def download(self, url: str):
         """访问内部链接。"""
-        endpoint = self.account.config.api_base / "proxy" / url.lstrip("/")
+        endpoint = self.account.ensure_url(url)
         aio = Launart.current().get_component(AiohttpClientService)
         async with aio.session.get(endpoint) as resp:
             await validate_response(resp, noreturn=True)