xoscar 0.7.0__cp39-cp39-macosx_11_0_arm64.whl → 0.7.1__cp39-cp39-macosx_11_0_arm64.whl

xoscar/__init__.py

@@ -33,6 +33,7 @@ from .api import (
     wait_actor_pool_recovered,
     get_pool_config,
     generator,
+    wait_for,
 )
 from .backends import allocate_strategy
 from .backends.pool import MainActorPoolType

xoscar/api.py

@@ -26,6 +26,7 @@ from numbers import Number
 from typing import (
     TYPE_CHECKING,
     Any,
+    Awaitable,
     Dict,
     Generic,
     List,
@@ -181,6 +182,39 @@ async def create_actor_pool(
     )
 
 
+async def wait_for(fut: Awaitable[Any], timeout: int | float | None = None) -> Any:
+    # asyncio.wait_for() on Xoscar actor call cannot work as expected,
+    # because when time out, the future will be cancelled, but an actor call will catch this error,
+    # and send a CancelMessage to the dest pool, if the CancelMessage cannot be processed correctly(e.g. the dest pool hangs),
+    # the time out will never happen. Thus this PR added a new API so that no matter the CancelMessage delivered or not,
+    # the timeout will happen as expected.
+    loop = asyncio.get_running_loop()
+    new_fut = loop.create_future()
+    task = asyncio.ensure_future(fut)
+
+    def on_done(f: asyncio.Future):
+        if new_fut.done():
+            return
+        if f.cancelled():
+            new_fut.cancel()
+        elif f.exception():
+            new_fut.set_exception(f.exception())  # type: ignore
+        else:
+            new_fut.set_result(f.result())
+
+    task.add_done_callback(on_done)
+
+    try:
+        return await asyncio.wait_for(new_fut, timeout)
+    except asyncio.TimeoutError:
+        if not task.done():
+            try:
+                task.cancel()  # Try to cancel without waiting
+            except Exception:
+                logger.warning("Failed to cancel task", exc_info=True)
+        raise
+
+
 def buffer_ref(address: str, buffer: Any) -> BufferRef:
     """
     Init buffer ref according address and buffer.

{xoscar-0.7.0.dist-info → xoscar-0.7.1.dist-info}/METADATA

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

{xoscar-0.7.0.dist-info → xoscar-0.7.1.dist-info}/RECORD

@@ -1,7 +1,7 @@
-xoscar-0.7.0.dist-info/RECORD,,
-xoscar-0.7.0.dist-info/WHEEL,sha256=Z5iiTeA1Kq3SZjXuZqO8kPXm4OCIFNqgCso-TxxW5Uk,135
-xoscar-0.7.0.dist-info/top_level.txt,sha256=vYlqqY4Nys8Thm1hePIuUv8eQePdULVWMmt7lXtX_ZA,21
-xoscar-0.7.0.dist-info/METADATA,sha256=beSTIQsGUSOi5z0cGWQdavB4uSrNCcCtZxrpaZ0IMC8,9134
+xoscar-0.7.1.dist-info/RECORD,,
+xoscar-0.7.1.dist-info/WHEEL,sha256=Z5iiTeA1Kq3SZjXuZqO8kPXm4OCIFNqgCso-TxxW5Uk,135
+xoscar-0.7.1.dist-info/top_level.txt,sha256=vYlqqY4Nys8Thm1hePIuUv8eQePdULVWMmt7lXtX_ZA,21
+xoscar-0.7.1.dist-info/METADATA,sha256=GNHx0SyIciNz1W7kBgcn5Dwti9Xak-p353ybGr52avQ,9134
 xoscar/_utils.pyx,sha256=frgVQ5xGp92jBKc4PsPmjOlVsXlKeHWtTOAMfHmBaII,7380
 xoscar/backend.py,sha256=is436OPkZfSpQXaoqTRVta5eoye_pp45RFgCstAk2hU,1850
 xoscar/core.pxd,sha256=I_C2ka7XryyGnnAVXUVm8xfS1gtIrCs6X-9rswgOcUU,1317
@@ -10,20 +10,20 @@ 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/__init__.py,sha256=0zX8kKaio3ZIrlzB79WybcravMJw1OxPWjDspTgJFyQ,1608
-xoscar/api.py,sha256=3hztPoOxg8A_mlhWyWgVP7FMXG0PATA1TP4Rbaj7A-g,13327
-xoscar/core.cpython-39-darwin.so,sha256=CbVABWkLsf_-NtmSVDI8TuRu9mCAHCh9QBNAoMp7J68,409768
+xoscar/__init__.py,sha256=sy7Wtn2EuQZI0I4Az_MfsBVZm4G0DRj46qRyExgmnJk,1622
+xoscar/api.py,sha256=zxNqOjGiTIKuAip9WJ0LOoM7yevD6P5rb-sLynpZ2Zo,14648
+xoscar/core.cpython-39-darwin.so,sha256=eU8opGMUQ8TyXz0BuxQNKIa5_NaMFNX7IanK9vCFl_0,409768
 xoscar/utils.py,sha256=MaKiW4Vphwhh8c0yoqN8G8hbJr1zXgpf49EdvmGc1ZU,16500
 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-39-darwin.so,sha256=aGQuBD5OTbtgj-ioFK68EGkRT4vhHyHo0ZrS8fpreVM,169128
+xoscar/_utils.cpython-39-darwin.so,sha256=R428K1G4bHIbUxQ90Fs7W9YtDa22MAXDGlQiWo7ZP0g,169128
 xoscar/core.pyx,sha256=phN-yYV0A0QI8WFi2jCu0nc4CnShTepfDi0V7ZrLYPY,22092
 xoscar/driver.py,sha256=498fowtJr6b3FE8FIOA_Tc1Vwx88nfZw7p0FxrML0h4,1372
 xoscar/profiling.py,sha256=BC5OF0HzSaXv8V7w-y-B8r5gV5DgxHFoTEIF6jCMioQ,8015
 xoscar/_utils.pxd,sha256=5KYAL3jfPdejsHnrGGT2s--ZUX5SXznQWpHVSno429k,1157
-xoscar/context.cpython-39-darwin.so,sha256=t_yYcRZPoWpvgsC6jkO5sbYSzCB2vE7ORlk6XtHloY0,211584
+xoscar/context.cpython-39-darwin.so,sha256=lSXvfbQNwEV-VGyfTGqXlbeuevWBBxjym5fRrWYY4cI,211584
 xoscar/metrics/__init__.py,sha256=9Badi7rxYikGm2dQiNCrj9GgMRBxwuR3JaEKcFZmfak,705
 xoscar/metrics/api.py,sha256=BBlMIFvVAGVfrtpeJ1YlH9Tqhy9OzGavwvGyeHcQ0Tk,8856
 xoscar/metrics/backends/__init__.py,sha256=h_JgzSqV5lP6vQ6XX_17kE4IY4BRnvKta_7VLQAL1ms,581
@@ -43,13 +43,13 @@ xoscar/serialization/pyfury.py,sha256=sifOnVMYoS82PzZEkzkfxesmMHei23k5UAUUKUyoOY
 xoscar/serialization/core.pxd,sha256=k4RoJgX5E5LGs4jdCQ7vvcn26MabXbrWoWhkO49X6YI,985
 xoscar/serialization/__init__.py,sha256=v76XC2OQLp-Yk4_U3_IVguEylMeyRw1UrkU_DPDMh0U,856
 xoscar/serialization/numpy.py,sha256=5Kem87CvpJmzUMp3QHk4WeHU30FoQWTJJP2SwIcaQG0,2919
-xoscar/serialization/core.cpython-39-darwin.so,sha256=_hliPPpHw6aY4BeWJbMkV8ePZq5QW_tt5gVpklc4OOo,379992
+xoscar/serialization/core.cpython-39-darwin.so,sha256=bA3YGThawp_N_MGPs9vOGEXdnShYzAnNODXfQUDtrLk,379992
 xoscar/serialization/cuda.py,sha256=iFUEnN4SiquBIhyieyOrfw3TnKnW-tU_vYgqOxO_DrA,3758
 xoscar/serialization/scipy.py,sha256=yOEi0NB8cqQ6e2UnCZ1w006RsB7T725tIL-DM_hNcsU,2482
 xoscar/serialization/aio.py,sha256=5DySPgDxU43ec7_5Ct44-Oqt7YNSJBfuf8VdQgQlChA,4731
 xoscar/serialization/core.pyx,sha256=bjR-zXGm9qersk7kYPzpjpMIxDl_Auur4BCubRfKmfA,29626
 xoscar/serialization/mlx.py,sha256=N_cvbTUBKc14XWYsPIMz4kDstyRN1DNhb4BVRgnQm8Y,1872
-xoscar/backends/message.cpython-39-darwin.so,sha256=eyJMDD2AYViM4BxOZhGS2NgPI8E8NnHbksyOPN8E1MA,365376
+xoscar/backends/message.cpython-39-darwin.so,sha256=busEDQR1RyUMLKsnZO4ejikzPvy0NblIa60P53cDrVU,365376
 xoscar/backends/config.py,sha256=4tZMiXAMMS8qQ4SX_LjONLtSQVfZTx3m-IK3EqbkYdk,5375
 xoscar/backends/allocate_strategy.py,sha256=tC1Nbq2tJohahUwd-zoRYHEDX65wyuX8tmeY45uWj_w,4845
 xoscar/backends/__init__.py,sha256=VHEBQcUWM5bj027W8EUf9PiJUAP7JoMrRw3Tsvy5ySw,643