satori-python 0.11.0__tar.gz → 0.11.2__tar.gz

{satori_python-0.11.0 → satori_python-0.11.2}/PKG-INFO

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

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

{satori_python-0.11.0 → satori_python-0.11.2}/src/satori/__init__.py

@@ -39,4 +39,4 @@ from .model import MessageObject as MessageObject
 from .model import Role as Role
 from .model import User as User
 
-__version__ = "0.11.0"
+__version__ = "0.11.2"

{satori_python-0.11.0 → satori_python-0.11.2}/src/satori/client/__init__.py

@@ -1,7 +1,9 @@
 from __future__ import annotations
 
 import asyncio
+import functools
 import signal
+import threading
 from functools import wraps
 from typing import Any, Awaitable, Callable, Iterable, Literal, TypeVar, overload
 
@@ -211,8 +213,27 @@ class App(Service):
         manager.add_component(self)
         manager.launch_blocking(loop=loop, stop_signal=stop_signal)
 
-    async def run_async(self, manager: Launart | None = None):
+    async def run_async(
+        self,
+        manager: Launart | None = None,
+        stop_signal: Iterable[signal.Signals] = (signal.SIGINT,),
+    ):
         if manager is None:
             manager = it(Launart)
         manager.add_component(self)
-        await manager.launch()
+        handled_signals: dict[signal.Signals, Any] = {}
+        launch_task = asyncio.create_task(manager.launch(), name="amnesia-launch")
+        signal_handler = functools.partial(manager._on_sys_signal, main_task=launch_task)
+        if threading.current_thread() is threading.main_thread():  # pragma: worst case
+            try:
+                for sig in stop_signal:
+                    handled_signals[sig] = signal.getsignal(sig)
+                    signal.signal(sig, signal_handler)
+            except ValueError:  # pragma: no cover
+                # `signal.signal` may throw if `threading.main_thread` does
+                # not support signals
+                handled_signals.clear()
+        await launch_task
+        for sig, handler in handled_signals.items():
+            if signal.getsignal(sig) is signal_handler:
+                signal.signal(sig, handler)

{satori_python-0.11.0 → satori_python-0.11.2}/src/satori/element.py

@@ -2,7 +2,7 @@ from base64 import b64encode
 from dataclasses import InitVar, dataclass, field, fields
 from io import BytesIO
 from pathlib import Path
-from typing import Any, Dict, List, Optional, TypeVar, Union
+from typing import Any, Dict, List, Optional, TypeVar, Union, get_args
 from typing_extensions import override
 
 from .parser import Element as RawElement
@@ -24,13 +24,14 @@ class Element:
         for f in fields(self):
             if f.name in ("_attrs", "_children"):
                 continue
-            if f.type is not str and isinstance(attr := getattr(self, f.name), str):
-                if f.type is bool:
+            _type = get_args(f.type)[0] if hasattr(f.type, "__origin__") else f.type
+            if _type is not str and isinstance(attr := getattr(self, f.name), str):
+                if _type is bool:
                     if attr.lower() not in ("true", "false"):
                         raise TypeError(f.name, attr)
                     setattr(self, f.name, attr.lower() == "true")
                 else:
-                    setattr(self, f.name, f.type(attr))
+                    setattr(self, f.name, _type(attr))
             self._attrs[f.name] = getattr(self, f.name)
         self._attrs = {k: v for k, v in self._attrs.items() if v is not None}
 
@@ -332,7 +333,6 @@ class Message(Element):
         self.__call__(*content or [])
 
 
-@dataclass
 class Quote(Message):
     """<quote> 元素用于表示对消息引用。
 

{satori_python-0.11.0 → satori_python-0.11.2}/src/satori/server/__init__.py

@@ -1,10 +1,12 @@
 from __future__ import annotations
 
 import asyncio
+import functools
 import signal
+import threading
 from contextlib import suppress
 from traceback import print_exc
-from typing import Callable, Iterable, Literal, cast, overload
+from typing import Any, Callable, Iterable, Literal, cast, overload
 
 import aiohttp
 from creart import it
@@ -383,8 +385,27 @@ class Server(Service):
         manager.add_component(self)
         manager.launch_blocking(loop=loop, stop_signal=stop_signal)
 
-    async def run_async(self, manager: Launart | None = None):
+    async def run_async(
+        self,
+        manager: Launart | None = None,
+        stop_signal: Iterable[signal.Signals] = (signal.SIGINT,),
+    ):
         if manager is None:
             manager = it(Launart)
         manager.add_component(self)
-        await manager.launch()
+        handled_signals: dict[signal.Signals, Any] = {}
+        launch_task = asyncio.create_task(manager.launch(), name="amnesia-launch")
+        signal_handler = functools.partial(manager._on_sys_signal, main_task=launch_task)
+        if threading.current_thread() is threading.main_thread():  # pragma: worst case
+            try:
+                for sig in stop_signal:
+                    handled_signals[sig] = signal.getsignal(sig)
+                    signal.signal(sig, signal_handler)
+            except ValueError:  # pragma: no cover
+                # `signal.signal` may throw if `threading.main_thread` does
+                # not support signals
+                handled_signals.clear()
+        await launch_task
+        for sig, handler in handled_signals.items():
+            if signal.getsignal(sig) is signal_handler:
+                signal.signal(sig, handler)