satori-python 0.14.1__tar.gz → 0.14.2__tar.gz

{satori_python-0.14.1 → satori_python-0.14.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: satori-python
-Version: 0.14.1
+Version: 0.14.2
 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-0.14.1 → satori_python-0.14.2}/pyproject.toml

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

{satori_python-0.14.1 → satori_python-0.14.2}/src/satori/__init__.py

@@ -43,4 +43,4 @@ from .model import Role as Role
 from .model import Upload as Upload
 from .model import User as User
 
-__version__ = "0.14.1"
+__version__ = "0.14.2"

{satori_python-0.14.1 → satori_python-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-0.14.1 → satori_python-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-0.14.1 → satori_python-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)

{satori_python-0.14.1 → satori_python-0.14.2}/src/satori/server/__init__.py

@@ -20,7 +20,7 @@ from graia.amnesia.builtins.asgi import UvicornASGIService
 from launart import Launart, Service, any_completed
 from loguru import logger
 from starlette.applications import Starlette
-from starlette.datastructures import FormData
+from starlette.datastructures import FormData as FormData
 from starlette.requests import Request as StarletteRequest
 from starlette.responses import JSONResponse, Response
 from starlette.routing import Route, WebSocketRoute
@@ -34,7 +34,7 @@ from satori.model import Event, ModelBase, Opcode
 from .adapter import Adapter as Adapter
 from .conection import WebsocketConnection
 from .deque import Deque
-from .formdata import parse_content_disposition
+from .formdata import parse_content_disposition as parse_content_disposition
 from .model import Provider as Provider
 from .model import Request as Request
 from .model import Router as Router
@@ -94,6 +94,7 @@ class Server(Service, RouterMixin):
         self.path = path
         if self.path and not self.path.startswith("/"):
             self.path = f"/{self.path}"
+        self._url = f"http://{host}:{port}{self.path}/{version}"
         self._adapters = []
         self.providers = []
         self.routers = []
@@ -107,14 +108,13 @@ class Server(Service, RouterMixin):
 
     def apply(self, item: Provider | Router | Adapter):
         if isinstance(item, Adapter):
+            item.ensure_net(self._url)
             self._adapters.append(item)
             self.providers.append(item)
-            for proxy_url_pf in item.proxy_urls():
-                self.proxy_url_mapping[proxy_url_pf] = item
+            self.proxy_url_mapping[item.id] = item.proxy_urls()
         elif isinstance(item, Provider):
             self.providers.append(item)
-            for proxy_url_pf in item.proxy_urls():
-                self.proxy_url_mapping[proxy_url_pf] = item
+            self.proxy_url_mapping[item.id] = item.proxy_urls()
         elif isinstance(item, Router):
             self.routers.append(item)
         else:
@@ -232,10 +232,11 @@ class Server(Service, RouterMixin):
             for provider in self.providers:
                 if provider.ensure(platform, self_id):
                     return await provider.download_uploaded(platform, self_id, path)
-        for proxy_url_pf, provider in self.proxy_url_mapping.items():
-            if url.startswith(proxy_url_pf):
-                async with self.session.get(url) as resp:
-                    return await resp.read()
+        for provider in self.providers:
+            for proxy_url_pf in self.proxy_url_mapping[provider.id]:
+                if url.startswith(proxy_url_pf):
+                    async with self.session.get(url) as resp:
+                        return await resp.read()
         raise ValueError(f"Unknown proxy url: {url}")
 
     def get_local_file(self, url: str):

{satori_python-0.14.1 → satori_python-0.14.2}/src/satori/server/adapter.py

@@ -9,6 +9,8 @@ from .route import RouterMixin
 
 
 class Adapter(Service, RouterMixin):
+    server_url: str
+
     @abstractmethod
     def get_platform(self) -> str: ...
 
@@ -38,3 +40,6 @@ class Adapter(Service, RouterMixin):
     @property
     def id(self):
         return f"satori-python.adapter.{self.get_platform()}#{id(self)}"
+
+    def ensure_net(self, url: str):
+        self.server_url = url

{satori_python-0.14.1 → satori_python-0.14.2}/src/satori/server/model.py

@@ -22,6 +22,9 @@ class Request(Generic[TP]):
 
 @runtime_checkable
 class Provider(Protocol):
+    @property
+    def id(self) -> str: ...
+
     def publisher(self) -> AsyncIterator[Event]: ...
 
     def authenticate(self, token: Optional[str]) -> bool: ...

satori_python-0.14.2/src/satori/utils.py

@@ -0,0 +1,17 @@
+import socket
+
+
+def get_public_ip():
+    st = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
+    try:
+        st.connect(("10.255.255.255", 1))
+        IP = st.getsockname()[0]
+    except Exception:
+        IP = "localhost"
+    finally:
+        st.close()
+    return IP
+
+
+if __name__ == "__main__":
+    print(get_public_ip())  # noqa: T201