xoscar 0.6.1__cp311-cp311-macosx_11_0_arm64.whl → 0.7.0__cp311-cp311-macosx_11_0_arm64.whl

xoscar/backends/test/pool.py

@@ -16,12 +16,11 @@
 from __future__ import annotations
 
 import asyncio
-import multiprocessing
 from typing import Any, Optional
 
 from ..communication import DummyServer, gen_local_address
 from ..config import ActorPoolConfig
-from ..indigen.pool import MainActorPool, SubActorPool, SubpoolStatus
+from ..indigen.pool import MainActorPool, SubActorPool
 from ..message import ControlMessage, ControlMessageType, new_message_id
 from ..pool import ActorPoolType
 
@@ -50,33 +49,25 @@ class TestMainActorPool(MainActorPool):
         cls,
         actor_pool_config: ActorPoolConfig,
         process_index: int,
-        start_method: str | None = None,
+        start_python: str | None = None,
     ):
-        status_queue: multiprocessing.Queue = multiprocessing.Queue()
-        return (
-            asyncio.create_task(
-                cls._create_sub_pool(actor_pool_config, process_index, status_queue, 0)
-            ),
-            status_queue,
-        )
+        return await cls._create_sub_pool_test(actor_pool_config, process_index, 0)
 
     @classmethod
     async def wait_sub_pools_ready(cls, create_pool_tasks: list[asyncio.Task]):
         addresses = []
         tasks = []
         for t in create_pool_tasks:
-            pool_task, queue = await t
+            pool_task, external_addresses = await t
             tasks.append(pool_task)
-            status = await asyncio.to_thread(queue.get)
-            addresses.append(status.external_addresses)
+            addresses.append(external_addresses)
         return tasks, addresses
 
     @classmethod
-    async def _create_sub_pool(
+    async def _create_sub_pool_test(
         cls,
         actor_config: ActorPoolConfig,
         process_index: int,
-        status_queue: multiprocessing.Queue,
         main_pool_pid: int,
     ):
         pool: TestSubActorPool = await TestSubActorPool.create(
@@ -87,11 +78,9 @@ class TestMainActorPool(MainActorPool):
             }
         )
         await pool.start()
-        status_queue.put(
-            SubpoolStatus(status=0, external_addresses=[pool.external_address])
-        )
         actor_config.reset_pool_external_address(process_index, [pool.external_address])
-        await pool.join()
+        cur_pool_config = actor_config.get_pool_config(process_index)
+        return None, cur_pool_config["external_address"]
 
     def _sync_pool_config(self, actor_pool_config: ActorPoolConfig):
         # test pool does not create routers, thus can skip this step
@@ -107,7 +96,7 @@ class TestMainActorPool(MainActorPool):
         suspend_sigint: bool | None = None,
         use_uvloop: bool | None = None,
         logging_conf: dict | None = None,
-        start_method: str | None = None,
+        start_python: str | None = None,
         kwargs: dict | None = None,
     ):
         external_address = (
@@ -162,12 +151,12 @@ class TestMainActorPool(MainActorPool):
         return addresses[0][0]
 
     async def kill_sub_pool(
-        self, process: multiprocessing.Process, force: bool = False
+        self, process: asyncio.subprocess.Process, force: bool = False
     ):
-        process.cancel()  # type: ignore
+        pass
 
-    async def is_sub_pool_alive(self, process: multiprocessing.Process):
-        return not process.cancelled()  # type: ignore
+    async def is_sub_pool_alive(self, process: asyncio.subprocess.Process):
+        return True
 
 
 class TestSubActorPool(SubActorPool):

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

@@ -39,6 +39,10 @@ class VirtualEnvManager(ABC):
     def cancel_install(self):
         pass
 
+    @abstractmethod
+    def get_python_path(self) -> str | None:
+        pass
+
     @abstractmethod
     def get_lib_path(self) -> str:
         pass

xoscar/virtualenv/uv.py

@@ -33,7 +33,7 @@ class UVVirtualEnvManager(VirtualEnvManager):
         return shutil.which("uv") is not None
 
     def create_env(self, python_path: Path | None = None) -> None:
-        cmd = ["uv", "venv", str(self.env_path)]
+        cmd = ["uv", "venv", str(self.env_path), "--system-site-packages"]
         if python_path:
             cmd += ["--python", str(python_path)]
         subprocess.run(cmd, check=True)
@@ -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,6 +78,11 @@ class UVVirtualEnvManager(VirtualEnvManager):
             self._install_process.terminate()
             self._install_process.wait()
 
+    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.6.1.dist-info → xoscar-0.7.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: xoscar
-Version: 0.6.1
+Version: 0.7.0
 Summary: Python actor framework for heterogeneous computing.
 Home-page: http://github.com/xorbitsai/xoscar
 Author: Qin Xuye
@@ -24,6 +24,7 @@ Requires-Dist: cloudpickle>=1.5.0
 Requires-Dist: psutil>=5.9.0
 Requires-Dist: tblib>=1.7.0
 Requires-Dist: packaging
+Requires-Dist: click
 Requires-Dist: uvloop>=0.14.0; sys_platform != "win32"
 Requires-Dist: scipy>=1.0.0; sys_platform != "win32" or python_version >= "3.10"
 Requires-Dist: scipy<=1.9.1,>=1.0.0; sys_platform == "win32" and python_version < "3.10"
@@ -41,6 +42,7 @@ Requires-Dist: sphinx-intl>=0.9.9; extra == "dev"
 Requires-Dist: flake8>=3.8.0; extra == "dev"
 Requires-Dist: black; extra == "dev"
 Requires-Dist: uv; extra == "dev"
+Requires-Dist: click; extra == "dev"
 Provides-Extra: doc
 Requires-Dist: ipython>=6.5.0; extra == "doc"
 Requires-Dist: sphinx; extra == "doc"

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

@@ -1,9 +1,9 @@
-xoscar-0.6.1.dist-info/RECORD,,
-xoscar-0.6.1.dist-info/WHEEL,sha256=blxD6xcJba1KnhvJi5Nf3B2hb91L0ZBhRHqICPm8T04,110
-xoscar-0.6.1.dist-info/top_level.txt,sha256=vYlqqY4Nys8Thm1hePIuUv8eQePdULVWMmt7lXtX_ZA,21
-xoscar-0.6.1.dist-info/METADATA,sha256=G1ypXuZl-ZjV48coc-vldRpkEeOq43k5BXIBowvxmo0,9076
-xoscar/_utils.pyx,sha256=6iqO4eTwEI-n9i39n_TKz7MWqbytMRnVNubdJ5egL6o,7279
-xoscar/_utils.cpython-311-darwin.so,sha256=0oBWrWtr_5js1BaBqX9SrfK_yVX3R7pc44myyiPtLDo,167488
+xoscar-0.7.0.dist-info/RECORD,,
+xoscar-0.7.0.dist-info/WHEEL,sha256=1Yl4xfCXx_BC0nXnlbd5xfzR2RyoNx_gSIEdv2OLRuM,137
+xoscar-0.7.0.dist-info/top_level.txt,sha256=vYlqqY4Nys8Thm1hePIuUv8eQePdULVWMmt7lXtX_ZA,21
+xoscar-0.7.0.dist-info/METADATA,sha256=beSTIQsGUSOi5z0cGWQdavB4uSrNCcCtZxrpaZ0IMC8,9134
+xoscar/_utils.pyx,sha256=frgVQ5xGp92jBKc4PsPmjOlVsXlKeHWtTOAMfHmBaII,7380
+xoscar/_utils.cpython-311-darwin.so,sha256=zY5nCC5X6kFLCLq2_Ujcd8uRItRe0CeVrYykQy2BuzM,170000
 xoscar/backend.py,sha256=is436OPkZfSpQXaoqTRVta5eoye_pp45RFgCstAk2hU,1850
 xoscar/core.pxd,sha256=I_C2ka7XryyGnnAVXUVm8xfS1gtIrCs6X-9rswgOcUU,1317
 xoscar/_version.py,sha256=ClSPrUjgGRGHIkVMQV9XQnkQ-n0akJMnq_rh819nqFE,23719
@@ -13,12 +13,12 @@ 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/utils.py,sha256=jUw6OICZUPBbmS1b3GE4vLctJf6fCKXrYtLtBuK-Oqc,16483
-xoscar/context.cpython-311-darwin.so,sha256=XGWZfuzmTnjNz4Bbc3lbEJXCc4Zm9V1TjF3Kx7AEsoA,210080
+xoscar/utils.py,sha256=MaKiW4Vphwhh8c0yoqN8G8hbJr1zXgpf49EdvmGc1ZU,16500
+xoscar/context.cpython-311-darwin.so,sha256=KG9FebuOi1uyxxvJQT1HTwhTP2IBzowXui1uk5XmQss,213120
 xoscar/debug.py,sha256=9Z8SgE2WaKYQcyDo-5-DxEJQ533v7kWjrvCd28pSx3E,5069
 xoscar/libcpp.pxd,sha256=DJqBxLFOKL4iRr9Kale5UH3rbvPRD1x5bTSOPHFpz9I,1147
 xoscar/context.pyx,sha256=8CdgPnWcE9eOp3N600WgDQ03MCi8P73eUOGcfV7Zksg,10942
-xoscar/core.cpython-311-darwin.so,sha256=com29YaXLzT9ResYRlPJ6fJyqJmh6Njf2hDXrEGbrbg,425192
+xoscar/core.cpython-311-darwin.so,sha256=bY-LxsRND2W2uAr_fyhHn5qitz8HpN01RWzMY6BJxOY,412728
 xoscar/errors.py,sha256=wBlQOKsXf0Fc4skN39tDie0YZT-VIAuLNRgoDl2pZcA,1241
 xoscar/core.pyx,sha256=phN-yYV0A0QI8WFi2jCu0nc4CnShTepfDi0V7ZrLYPY,22092
 xoscar/driver.py,sha256=498fowtJr6b3FE8FIOA_Tc1Vwx88nfZw7p0FxrML0h4,1372
@@ -32,7 +32,7 @@ xoscar/metrics/backends/prometheus/__init__.py,sha256=h_JgzSqV5lP6vQ6XX_17kE4IY4
 xoscar/metrics/backends/prometheus/prometheus_metric.py,sha256=MxoMvVrg0pOkKpkjJ0PcAuEaaEJR2FZljmPrLjQ1-oc,2050
 xoscar/metrics/backends/console/console_metric.py,sha256=y5CCtH33j3AqI5_Uhwi4mgOcAhyhb4cWv_YvR6fxcbQ,2082
 xoscar/metrics/backends/console/__init__.py,sha256=h_JgzSqV5lP6vQ6XX_17kE4IY4BRnvKta_7VLQAL1ms,581
-xoscar/collective/xoscar_pygloo.cpython-311-darwin.so,sha256=_g-_eIrLBIenvknD6W3vBH_5AJwF_CisQMjsGeVuDAw,1144448
+xoscar/collective/xoscar_pygloo.cpython-311-darwin.so,sha256=MXGgbltKdczOvdpt8Tmo4KRG97Cz62OKHg2sbF7DqGA,1144352
 xoscar/collective/__init__.py,sha256=XsClIkO_3Jd8GDifYuAbZCmJLAo9ZqGvnjUn9iuogmU,774
 xoscar/collective/core.py,sha256=NVR-7Iaq3aDPCN6fgXcq9Ew6uFEszRwxYqmUG9FLcws,23502
 xoscar/collective/common.py,sha256=INAnISbfnRicbbbDHTqbSr9ITb89ZphH5BUkSpEdXXU,3561
@@ -46,10 +46,10 @@ xoscar/serialization/numpy.py,sha256=5Kem87CvpJmzUMp3QHk4WeHU30FoQWTJJP2SwIcaQG0
 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.cpython-311-darwin.so,sha256=1It8ADYO7Qs4k6q6ZHJVMISn1zonVuqjFkgVQ8_jZfU,378792
+xoscar/serialization/core.cpython-311-darwin.so,sha256=SMSg6dHmQiFFhKInOigFXvckKSwfvxvEoISRy5cNBZM,382472
 xoscar/serialization/core.pyx,sha256=bjR-zXGm9qersk7kYPzpjpMIxDl_Auur4BCubRfKmfA,29626
 xoscar/serialization/mlx.py,sha256=N_cvbTUBKc14XWYsPIMz4kDstyRN1DNhb4BVRgnQm8Y,1872
-xoscar/backends/message.cpython-311-darwin.so,sha256=YJNayEDFcFuq4L_1hRL5VL5aiYaYlKAY3ifb22Kno74,381264
+xoscar/backends/message.cpython-311-darwin.so,sha256=KXnr1poVvwWggRD3_CtElKzZ4hgPNZyzxfPNNNqjvnM,368144
 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
@@ -57,14 +57,17 @@ xoscar/backends/core.py,sha256=EH-fHlV9x3bnruEHaUtGYO7osKLfLJ4AQHtuzA_mr2g,10857
 xoscar/backends/context.py,sha256=XfDPG2eDhAhE6hWBEkEsHTnyyOYN9R3houlMjAL7BFw,16329
 xoscar/backends/router.py,sha256=MVl5naz-FYf-Wla7XRn3kRxOpWV0SjKDsKNluifVA8M,10532
 xoscar/backends/message.pyx,sha256=krGVtZ1YDaZX8yWhaNHwZiudQooLvcGlw6x3Sq7jxjE,19685
-xoscar/backends/pool.py,sha256=OezOhvvXAV3TpODhLHmJVgqCfowb3aA_fWZKPodm8bE,61003
+xoscar/backends/pool.py,sha256=nrh8qobaukkjUOOOTR9t90i-wbXlgma3TNRjvwkwmcg,60528
 xoscar/backends/indigen/backend.py,sha256=znl_fZzWGEtLH8hZ9j9Kkf0fva25jEem2_KO7I1RVvc,1612
+xoscar/backends/indigen/shared_memory.py,sha256=wqbckbgnd0qNm5KzlP_hklF3F_n8fKnCehSox5uMwNs,19082
 xoscar/backends/indigen/__init__.py,sha256=tKHP5ClzedBRBpZsLRVErR3EUNbbDm4CY4u0rCFJr44,685
+xoscar/backends/indigen/fate_sharing.py,sha256=3QUHwq5Cjk9oCKFUISvkqHaoxWZIaXcq8JNOetdBl-A,8655
 xoscar/backends/indigen/driver.py,sha256=VGzkacYKykegW5qhCuhx01gdgBZEKJjNIyfNCnA6Nm8,952
-xoscar/backends/indigen/pool.py,sha256=v0Ps79W0WyeFSt2YxCJnh7q_1dnRQmo9887gcW3pNoc,17226
+xoscar/backends/indigen/pool.py,sha256=7-a_T2D_gG9MhhfkaNj2QGy7FjK06n2xwyD9Tw-rfqc,15732
+xoscar/backends/indigen/__main__.py,sha256=-pfio-Y4Ogbk6lBFksH-gRatp-N6sZ7wuNc-i2YsLJc,510
 xoscar/backends/test/backend.py,sha256=nv9WFhH5Bbq4Q1HB9yfpciZBaeHT4IQAtzugBWESrUY,1263
 xoscar/backends/test/__init__.py,sha256=j2ZfD6prD9WjUxRUDC7Eq5Z7N7TkL6fFr59oNyc_vY4,682
-xoscar/backends/test/pool.py,sha256=TW4X6J-92Pti66103poQBNDBznX6CBD3RLOc_zixjTo,7257
+xoscar/backends/test/pool.py,sha256=1MrdNnQZkeBJMYrn3NGUe1VpvsUM_HlTm3l7SSynzpo,6882
 xoscar/backends/communication/ucx.py,sha256=_Dp9Ld2MWIa1txSGMnmfYwJDT0esxS-GOd2FQ4BdHiM,19960
 xoscar/backends/communication/__init__.py,sha256=oFIg83Ga93-AhrG52TE85Z2LgpGZu1RCgQu1RWi62zQ,1063
 xoscar/backends/communication/core.py,sha256=sJeE3foRIqVPXldzYpFKHDSsabfAIFBU4JuXY4OyklY,2130
@@ -79,5 +82,5 @@ xoscar/aio/lru.py,sha256=rpXCqSLtPV5xnWtd6uDwQQFGgIPEgvmWEQDkPNUx9cM,6311
 xoscar/aio/parallelism.py,sha256=VSsjk8wP-Bw7tLeUsTyLVNgp91thjxEfE3pCrw_vF5Q,1293
 xoscar/aio/base.py,sha256=9j0f1piwfE5R5GIvV212vSD03ixdaeSzSSsO2kxJZVE,2249
 xoscar/virtualenv/__init__.py,sha256=65t9_X1DvbanNjFy366SiiWZrRTpa9SXWMXPmqayE-4,1117
-xoscar/virtualenv/core.py,sha256=YMN6yHoNeEc8ecbJMbZkKeWKUABK1mUZ_OYOjcbRqWs,1263
-xoscar/virtualenv/uv.py,sha256=l9w5JxETbW2wN8vfZR7k7aKTz4cWV4MvH06MoogBOVc,2842
+xoscar/virtualenv/core.py,sha256=Ld5bSkKp8ywekGuUq61uyms5I8Hm1WdbkbLxmCw-ML0,1342
+xoscar/virtualenv/uv.py,sha256=rVurn1PKlvR22Bm_F1uouIb1eMkB_wr-_29dBvMl7bo,3182

{xoscar-0.6.1.dist-info → xoscar-0.7.0.dist-info}/WHEEL

@@ -2,4 +2,5 @@ Wheel-Version: 1.0
 Generator: bdist_wheel (0.45.1)
 Root-Is-Purelib: false
 Tag: cp311-cp311-macosx_11_0_arm64
+Generator: delocate 0.13.0