xoscar 0.4.4__cp312-cp312-macosx_11_0_arm64.whl → 0.4.5__cp312-cp312-macosx_11_0_arm64.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,12 +196,14 @@ 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
@@ -232,14 +234,11 @@ def _cancel_all_tasks(loop):
 
 
 def _safe_run_forever(loop):
-    loop.run_forever()
-    _cancel_all_tasks(loop)
-
-
-def _safe_exit_thread(loop, thread):
-    # To avoid _enter_buffered_busy: could not acquire lock
-    loop.call_soon_threadsafe(loop.stop)
-    thread.join()
+    try:
+        loop.run_forever()
+    finally:
+        _cancel_all_tasks(loop)
+        loop.stop()
 
 
 class ActorCaller:
@@ -253,7 +252,7 @@ class ActorCaller:
         target=_safe_run_forever, args=(_close_loop,), daemon=True
     )
     _close_thread.start()
-    atexit.register(_safe_exit_thread, _close_loop, _close_thread)
+    atexit.register(_close_loop.call_soon_threadsafe, _close_loop.stop)
 
     def __init__(self):
         self._thread_local = threading.local()

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

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

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

@@ -1,7 +1,7 @@
-xoscar-0.4.4.dist-info/RECORD,,
-xoscar-0.4.4.dist-info/WHEEL,sha256=7Wd-yga4fjSiXpUH443rsPZpiZ4h8-uNrXJrYRW_e14,109
-xoscar-0.4.4.dist-info/top_level.txt,sha256=vYlqqY4Nys8Thm1hePIuUv8eQePdULVWMmt7lXtX_ZA,21
-xoscar-0.4.4.dist-info/METADATA,sha256=8sNSbbwMLWNK_U4dPToYPbX3J3epO77vL9ivudhzOBY,9042
+xoscar-0.4.5.dist-info/RECORD,,
+xoscar-0.4.5.dist-info/WHEEL,sha256=7Wd-yga4fjSiXpUH443rsPZpiZ4h8-uNrXJrYRW_e14,109
+xoscar-0.4.5.dist-info/top_level.txt,sha256=vYlqqY4Nys8Thm1hePIuUv8eQePdULVWMmt7lXtX_ZA,21
+xoscar-0.4.5.dist-info/METADATA,sha256=VBE6NGqxBQ98kZBu6a7orT-YY5EExPhmLhuWKxATIdw,9042
 xoscar/_utils.pyx,sha256=UR1FtYXAYKIdEWR9HulEpMbSOrkQWi6xGz63d4IQmG0,7059
 xoscar/backend.py,sha256=is436OPkZfSpQXaoqTRVta5eoye_pp45RFgCstAk2hU,1850
 xoscar/core.pxd,sha256=4lBq8J0kjcXcsGuvN7Kv4xcL5liHwTTFWlqyK7XAEnw,1280
@@ -10,16 +10,16 @@ xoscar/context.pxd,sha256=qKa0OyDPZtVymftSh447m-RzFZgmz8rGqQBa7qlauvc,725
 xoscar/batch.py,sha256=DpArS0L3WYJ_HVPG-6hSYEwoAFY1mY2-mlC4Jp5M_Dw,7872
 xoscar/nvutils.py,sha256=qmW4mKLU0WB2yCs198ccQOgLL02zB7Fsa-AotO3NOmg,20412
 xoscar/constants.py,sha256=QHHSREw6uWBBjQDCFqlNfTvBZgniJPGy42KSIsR8Fqw,787
-xoscar/core.cpython-312-darwin.so,sha256=7wqynIxWaVy3G8lLpEc4tLNmdqaTV10Y14aMmKXLXQk,441048
+xoscar/core.cpython-312-darwin.so,sha256=KH0D7xdWW12a-UWEFEVFy7kwx-rWMKq8C4Nub2JK06c,441048
 xoscar/__init__.py,sha256=0zX8kKaio3ZIrlzB79WybcravMJw1OxPWjDspTgJFyQ,1608
-xoscar/context.cpython-312-darwin.so,sha256=2MhhRnZACTq0S3C3QLyIUaw5KlWjmqo0rOCdVWiknC4,210096
+xoscar/context.cpython-312-darwin.so,sha256=3-X7ZLTVZKBGSPg6ojdZSjj6Y0YR9AAdcKEvS8CAHjQ,210096
 xoscar/api.py,sha256=3hztPoOxg8A_mlhWyWgVP7FMXG0PATA1TP4Rbaj7A-g,13327
 xoscar/utils.py,sha256=jUw6OICZUPBbmS1b3GE4vLctJf6fCKXrYtLtBuK-Oqc,16483
 xoscar/debug.py,sha256=9Z8SgE2WaKYQcyDo-5-DxEJQ533v7kWjrvCd28pSx3E,5069
 xoscar/libcpp.pxd,sha256=DJqBxLFOKL4iRr9Kale5UH3rbvPRD1x5bTSOPHFpz9I,1147
 xoscar/context.pyx,sha256=8CdgPnWcE9eOp3N600WgDQ03MCi8P73eUOGcfV7Zksg,10942
 xoscar/errors.py,sha256=wBlQOKsXf0Fc4skN39tDie0YZT-VIAuLNRgoDl2pZcA,1241
-xoscar/_utils.cpython-312-darwin.so,sha256=lsIkFKKoo9m7h_lAlS2yu0lsTN-l99golhT-BBJY1e0,167104
+xoscar/_utils.cpython-312-darwin.so,sha256=7cz3aggZUR_ZX_doaGtveeVF4o2t4HELTczbf_MaDnc,167104
 xoscar/core.pyx,sha256=Aqc2i8Fetsd5wRAPF4kL0ddnBZn3E2HRNCvup79BbQc,21730
 xoscar/driver.py,sha256=498fowtJr6b3FE8FIOA_Tc1Vwx88nfZw7p0FxrML0h4,1372
 xoscar/profiling.py,sha256=BC5OF0HzSaXv8V7w-y-B8r5gV5DgxHFoTEIF6jCMioQ,8015
@@ -43,7 +43,7 @@ xoscar/serialization/exception.py,sha256=Jy8Lsk0z-VJyEUaWeuZIwkmxqaoB-nLKMa1D15C
 xoscar/serialization/pyfury.py,sha256=sifOnVMYoS82PzZEkzkfxesmMHei23k5UAUUKUyoOYQ,1163
 xoscar/serialization/core.pxd,sha256=k4RoJgX5E5LGs4jdCQ7vvcn26MabXbrWoWhkO49X6YI,985
 xoscar/serialization/core.pyi,sha256=-pQARSj91rt3iU4ftWGFH6jYwsSKYCT_Ya7EJsaGEjg,1874
-xoscar/serialization/core.cpython-312-darwin.so,sha256=C1JbvtxHHk1psPa9xKhy3jmPvueUka3rEHNnKKzvgw0,378600
+xoscar/serialization/core.cpython-312-darwin.so,sha256=aN6upOoaRg8aac89nrdofdfVM_Q6aSTOtmSPfeNTDVY,378600
 xoscar/serialization/__init__.py,sha256=5Y_C3cYbQJIZ09LRjeCf-jrkLma7mfN8I5bznHrdsbg,846
 xoscar/serialization/numpy.py,sha256=5Kem87CvpJmzUMp3QHk4WeHU30FoQWTJJP2SwIcaQG0,2919
 xoscar/serialization/cuda.py,sha256=iFUEnN4SiquBIhyieyOrfw3TnKnW-tU_vYgqOxO_DrA,3758
@@ -54,10 +54,10 @@ xoscar/backends/config.py,sha256=EG26f0GwX_f4dAhwTW77RBjiK9h8R_3JrD-rBF1bAq8,498
 xoscar/backends/message.pyi,sha256=__2piPWLUQBmkDzx_nsHMOC2wHG53IKVGU_47zwgdKM,6112
 xoscar/backends/allocate_strategy.py,sha256=tC1Nbq2tJohahUwd-zoRYHEDX65wyuX8tmeY45uWj_w,4845
 xoscar/backends/__init__.py,sha256=VHEBQcUWM5bj027W8EUf9PiJUAP7JoMrRw3Tsvy5ySw,643
-xoscar/backends/core.py,sha256=3hWgmVYddSy341wsinYOr0yFSlICC9SBr-KQ_KeJRLw,10262
+xoscar/backends/core.py,sha256=rXJ73IC5lgERXCWvVrDEEyGAILlwVJs7XIWBCFUEVCc,10166
 xoscar/backends/context.py,sha256=Vr_PibRxYCDQ_gYK7r-BOlw9TXw8VQbFsVTH7K7mHPk,15470
 xoscar/backends/router.py,sha256=mhSvM5KVfV882jricVcpyxAqHEvhS4zL6ivczC6fOTE,7746
-xoscar/backends/message.cpython-312-darwin.so,sha256=x07X_vc1YySo0flCaCAoajdL-5nJAD4Xfcd7zggNiRA,361648
+xoscar/backends/message.cpython-312-darwin.so,sha256=gXqwzRpdWwpgZb2bAKkn8lSsQkRVSeLZw6gshoRtjoo,361648
 xoscar/backends/message.pyx,sha256=uyzilPc_7SqNwGUL4U-Zbfqku8bfZyRW_Lt_S3I_LEU,17930
 xoscar/backends/pool.py,sha256=Z7Wdab9dBF3SdQpmzgZhY0d09oTvg5gpFgzYH7vuc4w,59841
 xoscar/backends/indigen/backend.py,sha256=znl_fZzWGEtLH8hZ9j9Kkf0fva25jEem2_KO7I1RVvc,1612
@@ -72,8 +72,8 @@ xoscar/backends/communication/__init__.py,sha256=tB05BlK63iWQnfJgRzKt4mFKRtmWUki
 xoscar/backends/communication/core.py,sha256=sJeE3foRIqVPXldzYpFKHDSsabfAIFBU4JuXY4OyklY,2130
 xoscar/backends/communication/utils.py,sha256=AmovE-hmWLXNCPwHafYuaRjOk8m42BUyT3XBqfXQRVI,3664
 xoscar/backends/communication/errors.py,sha256=V3CdBe2xX9Rwv32f2dH2Msc84yaUhlyerZ42-739o1Q,723
-xoscar/backends/communication/socket.py,sha256=R9jF_Iy3HTSPXkBGrws5ckK-EjYnaPBSTdMqMZYqxqc,13972
-xoscar/backends/communication/dummy.py,sha256=sKBqoFkftm6ynV3p5UNGI4VYFGlrOHJgJlqj35PGAgk,8479
+xoscar/backends/communication/socket.py,sha256=_1tuBZrSmdEC6c6QIj_7JQh23ruIIQPwySDMcrndzwA,14267
+xoscar/backends/communication/dummy.py,sha256=6kLkxjNk4xTQ-IlNZD6cftNCx5UsGOur2jk7ikrNUCg,8157
 xoscar/backends/communication/base.py,sha256=0P4Tr35GSWpRp394e9jVWUUoKKa-gIk177eYPw1BnSU,7421
 xoscar/aio/__init__.py,sha256=kViDKR_kJe59VQViHITKEfBcIgN4ZJblUyd8zl0E3ZI,675
 xoscar/aio/file.py,sha256=PBtkLp-Q7XtYl-zk00s18TtgIrkNr60J3Itf66ctO1o,1486