xoscar 0.4.3__cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl → 0.4.5__cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl

xoscar/backends/communication/dummy.py

@@ -249,12 +249,5 @@ class DummyClient(Client):
     async def close(self):
         await super().close()
         if self._task is not None:
-            task_loop = self._task.get_loop()
-            if task_loop is not None:
-                if not task_loop.is_running():
-                    logger.warning(
-                        "Dummy channel cancel task on a stopped loop, dest address: %s.",
-                        self.dest_address,
-                    )
             self._task.cancel()
             self._task = None

xoscar/backends/communication/socket.py

@@ -34,6 +34,7 @@ from ...serialization import AioDeserializer, AioSerializer, deserialize
 from ...utils import classproperty, implements, is_py_312, is_v6_ip
 from .base import Channel, ChannelType, Client, Server
 from .core import register_client, register_server
+from .errors import ChannelClosed
 from .utils import read_buffers, write_buffers
 
 _is_windows: bool = sys.platform.startswith("win")
@@ -80,12 +81,19 @@ class SocketChannel(Channel):
         serializer = AioSerializer(message, compress=compress)
         buffers = await serializer.run()
 
-        # write buffers
-        write_buffers(self.writer, buffers)
-        async with self._send_lock:
-            # add lock, or when parallel send,
-            # assertion error may be raised
-            await self.writer.drain()
+        try:
+            # write buffers
+            write_buffers(self.writer, buffers)
+            async with self._send_lock:
+                # add lock, or when parallel send,
+                # assertion error may be raised
+                await self.writer.drain()
+        except RuntimeError as e:
+            if self.writer.is_closing():
+                raise ChannelClosed(
+                    "Channel already closed, cannot write message"
+                ) from e
+            raise e
 
     @implements(Channel.recv)
     async def recv(self):

xoscar/backends/core.py

@@ -196,18 +196,51 @@ class ActorCallerThreadLocal:
         return await self.call_with_client(client, message, wait)
 
     async def stop(self):
-        logger.debug("Actor caller stop.")
         try:
             await asyncio.gather(*[client.close() for client in self._clients])
         except (ConnectionError, ServerClosed):
             pass
-        self.cancel_tasks()
+        try:
+            self.cancel_tasks()
+        except:
+            pass
 
     def cancel_tasks(self):
         # cancel listening for all clients
         _ = [task.cancel() for task in self._clients.values()]
 
 
+def _cancel_all_tasks(loop):
+    to_cancel = asyncio.all_tasks(loop)
+    if not to_cancel:
+        return
+
+    for task in to_cancel:
+        task.cancel()
+
+    loop.run_until_complete(asyncio.gather(*to_cancel, return_exceptions=True))
+
+    for task in to_cancel:
+        if task.cancelled():
+            continue
+        if task.exception() is not None:
+            loop.call_exception_handler(
+                {
+                    "message": "unhandled exception during asyncio.run() shutdown",
+                    "exception": task.exception(),
+                    "task": task,
+                }
+            )
+
+
+def _safe_run_forever(loop):
+    try:
+        loop.run_forever()
+    finally:
+        _cancel_all_tasks(loop)
+        loop.stop()
+
+
 class ActorCaller:
     __slots__ = "_thread_local"
 
@@ -215,7 +248,9 @@ class ActorCaller:
         pass
 
     _close_loop = asyncio.new_event_loop()
-    _close_thread = threading.Thread(target=_close_loop.run_forever, daemon=True)
+    _close_thread = threading.Thread(
+        target=_safe_run_forever, args=(_close_loop,), daemon=True
+    )
     _close_thread.start()
     atexit.register(_close_loop.call_soon_threadsafe, _close_loop.stop)
 

{xoscar-0.4.3.dist-info → xoscar-0.4.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: xoscar
-Version: 0.4.3
+Version: 0.4.5
 Summary: Python actor framework for heterogeneous computing.
 Home-page: http://github.com/xorbitsai/xoscar
 Author: Qin Xuye

{xoscar-0.4.3.dist-info → xoscar-0.4.5.dist-info}/RECORD

@@ -1,7 +1,7 @@
-xoscar-0.4.3.dist-info/top_level.txt,sha256=vYlqqY4Nys8Thm1hePIuUv8eQePdULVWMmt7lXtX_ZA,21
-xoscar-0.4.3.dist-info/RECORD,,
-xoscar-0.4.3.dist-info/METADATA,sha256=yjX43U8k5yWIL-iE4YJTgASXov3hTrVzs09TiBakmk4,9042
-xoscar-0.4.3.dist-info/WHEEL,sha256=Zqf17R98VQuI9JZEwsfDDfsqkexN9tbZpiCgdvPM64U,154
+xoscar-0.4.5.dist-info/top_level.txt,sha256=vYlqqY4Nys8Thm1hePIuUv8eQePdULVWMmt7lXtX_ZA,21
+xoscar-0.4.5.dist-info/RECORD,,
+xoscar-0.4.5.dist-info/METADATA,sha256=R6Zr_mb9l4xkf5mOtPo6XBDzFlR_XjHbq-oOrmdc3uM,9042
+xoscar-0.4.5.dist-info/WHEEL,sha256=Zqf17R98VQuI9JZEwsfDDfsqkexN9tbZpiCgdvPM64U,154
 xoscar/errors.py,sha256=wBlQOKsXf0Fc4skN39tDie0YZT-VIAuLNRgoDl2pZcA,1241
 xoscar/nvutils.py,sha256=qmW4mKLU0WB2yCs198ccQOgLL02zB7Fsa-AotO3NOmg,20412
 xoscar/utils.py,sha256=jUw6OICZUPBbmS1b3GE4vLctJf6fCKXrYtLtBuK-Oqc,16483
@@ -41,7 +41,7 @@ xoscar/metrics/backends/console/__init__.py,sha256=h_JgzSqV5lP6vQ6XX_17kE4IY4BRn
 xoscar/backends/context.py,sha256=Vr_PibRxYCDQ_gYK7r-BOlw9TXw8VQbFsVTH7K7mHPk,15470
 xoscar/backends/message.cpython-310-aarch64-linux-gnu.so,sha256=ptMQ5SmlZ5oy_Tl-9ZrtN6EItqzoR_TFY3-iYN6gmRE,3069392
 xoscar/backends/__init__.py,sha256=VHEBQcUWM5bj027W8EUf9PiJUAP7JoMrRw3Tsvy5ySw,643
-xoscar/backends/core.py,sha256=YpFOwjD45Hrdv7zk_SELCC-Ni38aYsWTLigowenwjig,9380
+xoscar/backends/core.py,sha256=rXJ73IC5lgERXCWvVrDEEyGAILlwVJs7XIWBCFUEVCc,10166
 xoscar/backends/allocate_strategy.py,sha256=tC1Nbq2tJohahUwd-zoRYHEDX65wyuX8tmeY45uWj_w,4845
 xoscar/backends/pool.py,sha256=Z7Wdab9dBF3SdQpmzgZhY0d09oTvg5gpFgzYH7vuc4w,59841
 xoscar/backends/router.py,sha256=mhSvM5KVfV882jricVcpyxAqHEvhS4zL6ivczC6fOTE,7746
@@ -50,13 +50,13 @@ xoscar/backends/config.py,sha256=EG26f0GwX_f4dAhwTW77RBjiK9h8R_3JrD-rBF1bAq8,498
 xoscar/backends/test/__init__.py,sha256=j2ZfD6prD9WjUxRUDC7Eq5Z7N7TkL6fFr59oNyc_vY4,682
 xoscar/backends/test/pool.py,sha256=TW4X6J-92Pti66103poQBNDBznX6CBD3RLOc_zixjTo,7257
 xoscar/backends/test/backend.py,sha256=nv9WFhH5Bbq4Q1HB9yfpciZBaeHT4IQAtzugBWESrUY,1263
-xoscar/backends/communication/dummy.py,sha256=sKBqoFkftm6ynV3p5UNGI4VYFGlrOHJgJlqj35PGAgk,8479
+xoscar/backends/communication/dummy.py,sha256=6kLkxjNk4xTQ-IlNZD6cftNCx5UsGOur2jk7ikrNUCg,8157
 xoscar/backends/communication/errors.py,sha256=V3CdBe2xX9Rwv32f2dH2Msc84yaUhlyerZ42-739o1Q,723
 xoscar/backends/communication/utils.py,sha256=AmovE-hmWLXNCPwHafYuaRjOk8m42BUyT3XBqfXQRVI,3664
 xoscar/backends/communication/__init__.py,sha256=tB05BlK63iWQnfJgRzKt4mFKRtmWUki5hUGSZQwAotc,1050
 xoscar/backends/communication/core.py,sha256=sJeE3foRIqVPXldzYpFKHDSsabfAIFBU4JuXY4OyklY,2130
 xoscar/backends/communication/base.py,sha256=0P4Tr35GSWpRp394e9jVWUUoKKa-gIk177eYPw1BnSU,7421
-xoscar/backends/communication/socket.py,sha256=R9jF_Iy3HTSPXkBGrws5ckK-EjYnaPBSTdMqMZYqxqc,13972
+xoscar/backends/communication/socket.py,sha256=_1tuBZrSmdEC6c6QIj_7JQh23ruIIQPwySDMcrndzwA,14267
 xoscar/backends/communication/ucx.py,sha256=_Dp9Ld2MWIa1txSGMnmfYwJDT0esxS-GOd2FQ4BdHiM,19960
 xoscar/backends/indigen/driver.py,sha256=VGzkacYKykegW5qhCuhx01gdgBZEKJjNIyfNCnA6Nm8,952
 xoscar/backends/indigen/__init__.py,sha256=tKHP5ClzedBRBpZsLRVErR3EUNbbDm4CY4u0rCFJr44,685