xoscar 0.7.0rc1__cp312-cp312-win_amd64.whl → 0.7.2__cp312-cp312-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

@@ -14,6 +14,7 @@
 
 from __future__ import annotations
 
+import importlib
 from abc import ABC, abstractmethod
 from pathlib import Path
 
@@ -35,12 +36,49 @@ class VirtualEnvManager(ABC):
     def install_packages(self, packages: list[str], **kwargs):
         pass
 
+    @staticmethod
+    def process_packages(packages: list[str]) -> list[str]:
+        """
+        Process a list of package names, replacing placeholders like #system_<package>#
+        with the installed version of the corresponding package from the system environment.
+
+        Example:
+            "#system_torch#" -> "torch==2.1.0" (if torch 2.1.0 is installed)
+
+        Args:
+            packages (list[str]): A list of package names, which may include placeholders.
+
+        Returns:
+            list[str]: A new list with resolved package names and versions.
+
+        Raises:
+            RuntimeError: If a specified system package is not found in the environment.
+        """
+        processed = []
+
+        for pkg in packages:
+            if pkg.startswith("#system_") and pkg.endswith("#"):
+                real_pkg = pkg[
+                    len("#system_") : -1
+                ]  # Extract actual package name, e.g., "torch"
+                try:
+                    version = importlib.metadata.version(real_pkg)
+                except importlib.metadata.PackageNotFoundError:
+                    raise RuntimeError(
+                        f"System package '{real_pkg}' not found. Cannot resolve '{pkg}'."
+                    )
+                processed.append(f"{real_pkg}=={version}")
+            else:
+                processed.append(pkg)
+
+        return processed
+
     @abstractmethod
     def cancel_install(self):
         pass
 
     @abstractmethod
-    def get_python_path(self) -> str:
+    def get_python_path(self) -> str | None:
         pass
 
     @abstractmethod

xoscar/virtualenv/uv.py

@@ -46,17 +46,28 @@ class UVVirtualEnvManager(VirtualEnvManager):
         if not packages:
             return
 
+        # extend the ability of pip
+        # maybe replace #system_torch# to the real version
+        packages = self.process_packages(packages)
+
         cmd = ["uv", "pip", "install", "-p", str(self.env_path)] + packages
 
         # 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 +82,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.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: xoscar
-Version: 0.7.0rc1
+Version: 0.7.2
 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.2.dist-info}/RECORD

@@ -1,16 +1,16 @@
-xoscar/__init__.py,sha256=dlwtB7dnDp5WME6CZVQY7d9lk1yJ9s___H5UxjGlAd4,1668
-xoscar/_utils.cp312-win_amd64.pyd,sha256=qTSAoPZX-Di6jfGvBhQ8w5ZfaWDqB-5TAJFQE0rPZlA,115200
+xoscar/__init__.py,sha256=lzCXUmkuIjcjkiNQFekysdJR_ZhlbjcfR5ka1bZZNQg,1683
+xoscar/_utils.cp312-win_amd64.pyd,sha256=rNsqnCgaVQqlfZGFxrC1gThlPFzhS1H4ytVJ561diaU,108032
 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.cp312-win_amd64.pyd,sha256=1mvEB4so4ahN5jIMh2ZbEUrqnmoaBszxm7j4wYGcq10,159232
+xoscar/context.cp312-win_amd64.pyd,sha256=FK-IGbZJx0c5vnvJLgSRloXC-eVRRAXErFgpVBdA1MU,154112
 xoscar/context.pxd,sha256=6n6IAbmArSRq8EjcsbS6npW8xP1jI0qOoS1fF0oyj-o,746
 xoscar/context.pyx,sha256=FOJVerGOvxe2USryXEQA0rpaFX_ScxISH6QWKUcahY8,11310
-xoscar/core.cp312-win_amd64.pyd,sha256=Ti6S-LW_yeStV1U-wMJRZx3mWIUH1gL7ewXDxNsSqkI,332800
+xoscar/core.cp312-win_amd64.pyd,sha256=PUWgzEszNfc7fDO1ezvyHRenAZyLhZmCdV88GgsNFmY,313856
 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.cp312-win_amd64.pyd,sha256=8eVSsaVL86R6jL9mOZWJHShEzs0WhiBSaiI1QeT5uQQ,284160
+xoscar/backends/message.cp312-win_amd64.pyd,sha256=YwDkPAFYiUpDWTy7utsqnRsehCX1P2CvcJ1kyLVwZjo,253952
 xoscar/backends/message.pyi,sha256=m1PrSLvj-IbrHuVfQGoPDs6prI-GJV1vQJqZ5WdQcY4,6798
 xoscar/backends/message.pyx,sha256=lBEjMJv4VyxmeO9lHXJJazOajbFnTLak4PSBcLoPZvU,20331
 xoscar/backends/pool.py,sha256=bS_m8XBkfQQsCOaLEzM6HkV5e78dPPp1bCH6yjvPEss,62153
@@ -58,8 +58,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=hErZjWl6tIzSRCAoz4BKptqN8wVEukWqpzl7fNQwLjI,620544
-xoscar/collective/xoscar_pygloo.cp312-win_amd64.pyd,sha256=yrYa352aGgoj4524ZId36d9qpH_vcNUY4TUHRf3PiRs,838656
+xoscar/collective/uv.dll,sha256=zQEDeoVesb0MB3t0Mhxkpt3_XTFCLIGuTd9cFh_1E4g,620544
+xoscar/collective/xoscar_pygloo.cp312-win_amd64.pyd,sha256=QajdyhHwrczR0kzLNOO58zmal6K-hOjvlkOpezIUCw8,838656
 xoscar/collective/xoscar_pygloo.pyi,sha256=6KRzElgNBBKWh-VivUw1b5Dolp17MgwA91hQo33EysU,7616
 xoscar/metrics/__init__.py,sha256=RjXuuYw4I2YYgD8UY2Z5yCZk0Z56xMJ1n40O80Dtxf8,726
 xoscar/metrics/api.py,sha256=dtJ4QrIqQNXhJedeqOPs4TXKgrRGZFFN50xAd9SCfec,9144
@@ -71,7 +71,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.cp312-win_amd64.pyd,sha256=RUNWPYgXlM54rVXbWDDBk9yGZHkywk27OUDteibi4SQ,292352
+xoscar/serialization/core.cp312-win_amd64.pyd,sha256=DWj6rJZ2QS89oXFiR9qePRy-Wku868V2ChfT_86QfG0,271360
 xoscar/serialization/core.pxd,sha256=X-47bqBM2Kzw5SkLqICdKD0gU6CpmLsBxC3kfW--wVk,1013
 xoscar/serialization/core.pyi,sha256=Zof9373qy2lmjenSuMznEiTSCNW6WQB7rmSXrRbjUo0,1931
 xoscar/serialization/core.pyx,sha256=ZKexLRnRwZXXn2045kR7xfM_szcoPNrDuouQCWtpFp8,30570
@@ -82,9 +82,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=BBcGc-2N-8aExxlPtpWPtG3FI-ki1R3YSUvwChPmYlM,9420
-xoscar-0.7.0rc1.dist-info/WHEEL,sha256=VryZucl_XSB78oskhQFN0jfmderyetLlP0R6bZqf7Ys,101
-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=ygnDO6QA3gXoT-uiME8Cn-ET_PtwCUxy1i8uCOd9J7Q,2834
+xoscar/virtualenv/uv.py,sha256=xTya0Qo3PjbF5bxFjMtNLQpem6u9Ouvl-bm8vd6K-g4,3424
+xoscar-0.7.2.dist-info/METADATA,sha256=gEgMmPpsr1KzyuzzLt4uGA8M7qkIFWHnnhIoD-rzsZo,9417
+xoscar-0.7.2.dist-info/WHEEL,sha256=b7PoVIxzH_MOHKjftqMzQiGKfdHRlRFepVBVPg0y3vc,101
+xoscar-0.7.2.dist-info/top_level.txt,sha256=vYlqqY4Nys8Thm1hePIuUv8eQePdULVWMmt7lXtX_ZA,21
+xoscar-0.7.2.dist-info/RECORD,,

{xoscar-0.7.0rc1.dist-info → xoscar-0.7.2.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.3.1)
+Generator: setuptools (80.7.1)
 Root-Is-Purelib: false
 Tag: cp312-cp312-win_amd64