xoscar 0.7.0rc1__cp311-cp311-win_amd64.whl → 0.7.1__cp311-cp311-win_amd64.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/utils.py

@@ -89,7 +89,7 @@ def wrap_exception(
 ) -> BaseException:
     """Generate an exception wraps the cause exception."""
 
-    def __init__(self):
+    def __init__(self, *args, **kwargs):
         pass
 
     def __getattr__(self, item):

xoscar/virtualenv/core.py

@@ -40,7 +40,7 @@ class VirtualEnvManager(ABC):
         pass
 
     @abstractmethod
-    def get_python_path(self) -> str:
+    def get_python_path(self) -> str | None:
         pass
 
     @abstractmethod

xoscar/virtualenv/uv.py

@@ -51,12 +51,19 @@ class UVVirtualEnvManager(VirtualEnvManager):
         # Handle known pip-related kwargs
         if "index_url" in kwargs and kwargs["index_url"]:
             cmd += ["-i", kwargs["index_url"]]
-        if "extra_index_url" in kwargs and kwargs["extra_index_url"]:
-            cmd += ["--extra-index-url", kwargs["extra_index_url"]]
-        if "find_links" in kwargs and kwargs["find_links"]:
-            cmd += ["-f", kwargs["find_links"]]
-        if "trusted_host" in kwargs and kwargs["trusted_host"]:
-            cmd += ["--trusted-host", kwargs["trusted_host"]]
+        param_and_option = [
+            ("extra_index_url", "--extra-index-url"),
+            ("find_links", "-f"),
+            ("trusted_host", "--trusted-host"),
+        ]
+        for param, option in param_and_option:
+            if param in kwargs and kwargs[param]:
+                param_value = kwargs[param]
+                if isinstance(param_value, list):
+                    for it in param_value:
+                        cmd += [option, it]
+                else:
+                    cmd += [option, param_value]
 
         self._install_process = process = subprocess.Popen(cmd)
         returncode = process.wait()
@@ -71,8 +78,10 @@ class UVVirtualEnvManager(VirtualEnvManager):
             self._install_process.terminate()
             self._install_process.wait()
 
-    def get_python_path(self) -> str:
-        return str(self.env_path.joinpath("bin/python"))
+    def get_python_path(self) -> str | None:
+        if self.env_path.exists():
+            return str(self.env_path.joinpath("bin/python"))
+        return None
 
     def get_lib_path(self) -> str:
         return sysconfig.get_path("purelib", vars={"base": str(self.env_path)})

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

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

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

@@ -1,16 +1,16 @@
-xoscar/__init__.py,sha256=dlwtB7dnDp5WME6CZVQY7d9lk1yJ9s___H5UxjGlAd4,1668
-xoscar/_utils.cp311-win_amd64.pyd,sha256=RZn6Rq_k7uaJVIh5ozncS2kW0GM6dyREyfi_CWOpwZc,113664
+xoscar/__init__.py,sha256=lzCXUmkuIjcjkiNQFekysdJR_ZhlbjcfR5ka1bZZNQg,1683
+xoscar/_utils.cp311-win_amd64.pyd,sha256=EQBVRr7zj_YPnhSJQ5fP-tFcRaSaJI46nSok5ogzW9w,106496
 xoscar/_utils.pxd,sha256=rlNbTg5lhXA-jCOLksqF4jhUlNn0xw2jx1HxdLa34pc,1193
 xoscar/_utils.pyx,sha256=TWScgqmJGYzjbWBOShBLkq07ldfYEQ5fw6V4OytX_IA,7626
 xoscar/_version.py,sha256=bsfCVAo_o9LkiP3AjPsP4SRRqhjuS0t4D1WGJPzbdls,24412
-xoscar/api.py,sha256=B5oXv4vgMxMteh1YNaBmNFDrUFmYa_dCdzfaWwwZnCo,13820
+xoscar/api.py,sha256=QQDHn-_FiDExmOxEk8BUnq4Qrx13VX3shSlEEqPQJo0,15175
 xoscar/backend.py,sha256=8G5JwjoOT6Q2slb11eXNApxgcmvNQUCdQzkoIMDwLcQ,1917
 xoscar/batch.py,sha256=Jk5BSpvMFAV9DrRy0a9tgPvIo_dt8cbJReZBL0cnOPc,8128
 xoscar/constants.py,sha256=GJ1KEOxwnqksc9K_GH42TSWpQECeC6ti3KJmE3PUcTw,810
-xoscar/context.cp311-win_amd64.pyd,sha256=z4FxtyfyH8w5vw9u6jVsZzFXPIqvF1UyyFzfMQLrStA,155648
+xoscar/context.cp311-win_amd64.pyd,sha256=uxuulCQ8nX5b1e9BVZ2Habpe0pJcrZouKuKknLPTiaw,152576
 xoscar/context.pxd,sha256=6n6IAbmArSRq8EjcsbS6npW8xP1jI0qOoS1fF0oyj-o,746
 xoscar/context.pyx,sha256=FOJVerGOvxe2USryXEQA0rpaFX_ScxISH6QWKUcahY8,11310
-xoscar/core.cp311-win_amd64.pyd,sha256=EW3MixCUFWs82Ed85Dxi6Rh5BTJP3EOPwZMxMPghyzI,327680
+xoscar/core.cp311-win_amd64.pyd,sha256=oazyJdzba8_NxKvWIn_c934gGqre0BznPZd4ckBhSiw,302592
 xoscar/core.pxd,sha256=9IZP7dYGfnF1I-obIls8R8b6forxDOPbiM3v5nVslLk,1368
 xoscar/core.pyx,sha256=U6jCZN74MQHi7HkQRaVGm_w5q-FMsw0nnE3aU6533_Q,22756
 xoscar/debug.py,sha256=hrmxIH6zvTKasQo6PUUgXu5mgEsR0g87Fvpw7CoHipg,5257
@@ -19,7 +19,7 @@ xoscar/errors.py,sha256=hfIAlYuSVfB3dAQYr8hTLAMmfy5en6Y8mihdtw1gTEE,1304
 xoscar/libcpp.pxd,sha256=XGy887HXdRsvF47s-A7PvHX6Gaf15d_azRscWJY0Hc8,1178
 xoscar/nvutils.py,sha256=z6RCVs0sgKFm55TTgAYG3qy5f_AKJzjcH2kcRB-wTJQ,21129
 xoscar/profiling.py,sha256=LUqkj6sSxaFj0ltS7Yk2kFsh5ieHY417xypTYHwQOb4,8275
-xoscar/utils.py,sha256=wiDLdRUi4hgdrKVehzDMVRpym8oEcbdpo900o3BpoMM,17000
+xoscar/utils.py,sha256=lYZWgnyTLL3vowzJ37ycPPPeaxQPhunGsYadRc0sAaM,17017
 xoscar/aio/__init__.py,sha256=ZLJlVJJH5EhItKD6tLTBri-4FV4kT1O2qdIfBC-df98,691
 xoscar/aio/base.py,sha256=ytknTCjTjNQbTM7l7QGXqPYYUkD7qq-zVBGVZ34L1Tc,2335
 xoscar/aio/file.py,sha256=x1wrvDgtTFMv-6gjSPpBU26jAO5uEAlXGGnFtx7uevQ,1545
@@ -30,7 +30,7 @@ xoscar/backends/allocate_strategy.py,sha256=DzvTlixwzTANURI2mDLHm3vcaugSPDxU6UQZ
 xoscar/backends/config.py,sha256=86j0g_Xrl8ENPzBWi296yWg9QEcljvdKK-yJbfYTvQ0,5532
 xoscar/backends/context.py,sha256=qWwksx8JxYcKR-LQA3PvXh4ReuuTTEyDaLbjpxGXcTA,16766
 xoscar/backends/core.py,sha256=fbekAxys_t1Dv7if-1R6uVvC_yAxNkXLeQ1V1ZSAfC0,11161
-xoscar/backends/message.cp311-win_amd64.pyd,sha256=JNuf0qd_mfTh0i2BLrCksNTycYN8ySsVzYQn4OtfoTg,281600
+xoscar/backends/message.cp311-win_amd64.pyd,sha256=1VmU5K3adiDba8-3-IG_FtuOdFj7aDZf7mr_wSuqb0M,246784
 xoscar/backends/message.pyx,sha256=lBEjMJv4VyxmeO9lHXJJazOajbFnTLak4PSBcLoPZvU,20331
 xoscar/backends/pool.py,sha256=bS_m8XBkfQQsCOaLEzM6HkV5e78dPPp1bCH6yjvPEss,62153
 xoscar/backends/router.py,sha256=EjfNpQUrhFU15eYe1kRPueziHgI2gfDViUzm7ruvXDE,10817
@@ -57,8 +57,8 @@ xoscar/collective/common.py,sha256=9c7xq3IOUvfA0I9GnpalUqXZOzmF6IEILv4zL64BYVE,3
 xoscar/collective/core.py,sha256=191aPxbUgWpjzrqyozndImDAQhZFmqoQdBkHFLDfXN0,24239
 xoscar/collective/process_group.py,sha256=kTPbrLMJSGhqbiWvTIiz-X3W0rZWd_CFn_zUIlXbOlM,23286
 xoscar/collective/utils.py,sha256=p3WEVtXvnVhkuO5mRgQBhBRFr1dKHcDKMjrbMyuiyfg,1219
-xoscar/collective/uv.dll,sha256=Ub3SLLnKWOcLl9E3w3ZXa18hNz2xmTKLz-Cdj3_IMF0,620544
-xoscar/collective/xoscar_pygloo.cp311-win_amd64.pyd,sha256=WPROh5U3jIRr11kqfHo5SVuj-N6zmPv2lQf1EnfOkyc,831488
+xoscar/collective/uv.dll,sha256=jDAnx_UyjG2HnAZ_TicDInXMPeVqbdy4AuVH9aKGUws,620544
+xoscar/collective/xoscar_pygloo.cp311-win_amd64.pyd,sha256=f_iMxs7gHR9M6CPBxBDDnLfjw6iw4QvYj2RaNDdiMcw,831488
 xoscar/metrics/__init__.py,sha256=RjXuuYw4I2YYgD8UY2Z5yCZk0Z56xMJ1n40O80Dtxf8,726
 xoscar/metrics/api.py,sha256=dtJ4QrIqQNXhJedeqOPs4TXKgrRGZFFN50xAd9SCfec,9144
 xoscar/metrics/backends/__init__.py,sha256=ZHepfhCDRuK9yz4pAM7bjpWDvS3Ijp1YgyynoUFLeuU,594
@@ -69,7 +69,7 @@ xoscar/metrics/backends/prometheus/__init__.py,sha256=ZHepfhCDRuK9yz4pAM7bjpWDvS
 xoscar/metrics/backends/prometheus/prometheus_metric.py,sha256=65hb8O3tmsEJ7jgOrIwl_suj9SE5Tmqcfjuk0urkLvE,2120
 xoscar/serialization/__init__.py,sha256=tS8C49yrW_geWNEsbgW3phK1q4YN1ojI6CN-vroIFYM,876
 xoscar/serialization/aio.py,sha256=7YLXgkWpQ3ANy-TZ1qO8Mt4_J3cZFhFh2FEgUgxMT60,4873
-xoscar/serialization/core.cp311-win_amd64.pyd,sha256=_fF9v9HJOcVYkIw2VDITQAE-NSEmDhiMXltyVHMntAU,294400
+xoscar/serialization/core.cp311-win_amd64.pyd,sha256=KT3qoPxrOwAodk8rEAKdufsZWP0fDDLAQ7biRHCAYQY,267264
 xoscar/serialization/core.pxd,sha256=X-47bqBM2Kzw5SkLqICdKD0gU6CpmLsBxC3kfW--wVk,1013
 xoscar/serialization/core.pyx,sha256=ZKexLRnRwZXXn2045kR7xfM_szcoPNrDuouQCWtpFp8,30570
 xoscar/serialization/cuda.py,sha256=Fj4Cpr_YmkGceUCo0mQn8fRvmHP_5WcLdRx6epZ3RC0,3869
@@ -79,9 +79,9 @@ xoscar/serialization/numpy.py,sha256=C6WVx-Sdl2OHBAvVY34DFjAKXlekMbpc2ni6bR8wxYo
 xoscar/serialization/pyfury.py,sha256=3ucal29Hr7PX9_1SfB2x43FE2xw_C0rLkVv3foL7qwM,1200
 xoscar/serialization/scipy.py,sha256=9ph-yoRoNiwUZTwQrn35U60VPirWlncXNAg6EXvqMR4,2554
 xoscar/virtualenv/__init__.py,sha256=rhJ7I6x7aXjKOCzSqsKLwqFJMh4YC2sqchEIJNEfI58,1151
-xoscar/virtualenv/core.py,sha256=9Uo3_0lrv8-tuxqi8Zt7PbAjAn015ozA5tNwFOpo94o,1387
-xoscar/virtualenv/uv.py,sha256=lHYh_vTljCKjV1YFn4jrE4V2ns8VlMO2PJF1xCdDfvI,3046
-xoscar-0.7.0rc1.dist-info/METADATA,sha256=RLZL0BHnO5IYoIgEDs5BayxsCszNxEivQPoTbhNozu8,9363
-xoscar-0.7.0rc1.dist-info/WHEEL,sha256=y4n9_669c4ZQLyT56MHjc_JUbnwtaZfMVMycweN557o,102
-xoscar-0.7.0rc1.dist-info/top_level.txt,sha256=vYlqqY4Nys8Thm1hePIuUv8eQePdULVWMmt7lXtX_ZA,21
-xoscar-0.7.0rc1.dist-info/RECORD,,
+xoscar/virtualenv/core.py,sha256=FeLmheIkQk0JOayVdUBEMyltAQhidQqbHguCMTHB0Sw,1394
+xoscar/virtualenv/uv.py,sha256=v1LvpxtUu2ja4Cy2EqD-BGxb8zZle5Zj-91QPZH_C10,3273
+xoscar-0.7.1.dist-info/METADATA,sha256=9OmPACIrv37yJ6XfD5h9B6ynOc30kt5plHupHPUpOEg,9360
+xoscar-0.7.1.dist-info/WHEEL,sha256=y4n9_669c4ZQLyT56MHjc_JUbnwtaZfMVMycweN557o,102
+xoscar-0.7.1.dist-info/top_level.txt,sha256=vYlqqY4Nys8Thm1hePIuUv8eQePdULVWMmt7lXtX_ZA,21
+xoscar-0.7.1.dist-info/RECORD,,