xoscar 0.6.1__cp39-cp39-win_amd64.whl → 0.7.0__cp39-cp39-win_amd64.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,16 +1,16 @@
 xoscar/__init__.py,sha256=dlwtB7dnDp5WME6CZVQY7d9lk1yJ9s___H5UxjGlAd4,1668
-xoscar/_utils.cp39-win_amd64.pyd,sha256=ytFpzTkxz_hlcOXyu1W4vausTvV_2LH8GlS2EPgXQk8,118272
+xoscar/_utils.cp39-win_amd64.pyd,sha256=iU-psWQOoaz8z6L4O_06u7QubzHmRadAsuEq2fQidzo,111104
 xoscar/_utils.pxd,sha256=rlNbTg5lhXA-jCOLksqF4jhUlNn0xw2jx1HxdLa34pc,1193
-xoscar/_utils.pyx,sha256=18MUutw6M8Het9FcnrDMjexiJ3zxYljpTNRiYKGD-Jw,7524
+xoscar/_utils.pyx,sha256=TWScgqmJGYzjbWBOShBLkq07ldfYEQ5fw6V4OytX_IA,7626
 xoscar/_version.py,sha256=bsfCVAo_o9LkiP3AjPsP4SRRqhjuS0t4D1WGJPzbdls,24412
 xoscar/api.py,sha256=B5oXv4vgMxMteh1YNaBmNFDrUFmYa_dCdzfaWwwZnCo,13820
 xoscar/backend.py,sha256=8G5JwjoOT6Q2slb11eXNApxgcmvNQUCdQzkoIMDwLcQ,1917
 xoscar/batch.py,sha256=Jk5BSpvMFAV9DrRy0a9tgPvIo_dt8cbJReZBL0cnOPc,8128
 xoscar/constants.py,sha256=GJ1KEOxwnqksc9K_GH42TSWpQECeC6ti3KJmE3PUcTw,810
-xoscar/context.cp39-win_amd64.pyd,sha256=JBKo0rZNBSZobajE8z9DMFFzRaMurZQUbusmIq9NDi4,159232
+xoscar/context.cp39-win_amd64.pyd,sha256=PdBrdDNWQTDh4xUQ1HyrqC5eKdZoGY7oGu0uYNGQcGY,155136
 xoscar/context.pxd,sha256=6n6IAbmArSRq8EjcsbS6npW8xP1jI0qOoS1fF0oyj-o,746
 xoscar/context.pyx,sha256=FOJVerGOvxe2USryXEQA0rpaFX_ScxISH6QWKUcahY8,11310
-xoscar/core.cp39-win_amd64.pyd,sha256=p0CxpsJbdJDTazvcI4y45BnapCcLanpQ_Rw5rOcVvxk,337920
+xoscar/core.cp39-win_amd64.pyd,sha256=TAQ7ytkJYL9-WG7CbBun7N59rxrFH5FXweqQJQwMzzc,306176
 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,9 +30,9 @@ 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.cp39-win_amd64.pyd,sha256=RKtn6H5pwS15ACjwganUQwO__VuKTD6DHBAVRx6cqjA,284672
+xoscar/backends/message.cp39-win_amd64.pyd,sha256=UOef1yZVqozJ9F5JfMwAP4SWOlC0qzLyzYzA6frPagY,248832
 xoscar/backends/message.pyx,sha256=lBEjMJv4VyxmeO9lHXJJazOajbFnTLak4PSBcLoPZvU,20331
-xoscar/backends/pool.py,sha256=XFij5l9FCbMC1isXp4tpr6YsZVxf4GfpIRfwn-nhCGE,62638
+xoscar/backends/pool.py,sha256=bS_m8XBkfQQsCOaLEzM6HkV5e78dPPp1bCH6yjvPEss,62153
 xoscar/backends/router.py,sha256=EjfNpQUrhFU15eYe1kRPueziHgI2gfDViUzm7ruvXDE,10817
 xoscar/backends/communication/__init__.py,sha256=i0RWfN_no-xwlzLUl8Av8zZqVWxfgBaT2qbUvOLt37s,1093
 xoscar/backends/communication/base.py,sha256=wmWTeE4lcB_ohqyJJ6MdzMGcrOqy2RSKRp8y-NDuFdY,7736
@@ -43,19 +43,22 @@ xoscar/backends/communication/socket.py,sha256=Ecg30cXzTxtbg7GrcUHC_1fLrLMsHNdae
 xoscar/backends/communication/ucx.py,sha256=SQh461aiqdKKZe9fC4sDroFO2FmtQ_vX0oKSQjnqoFA,20498
 xoscar/backends/communication/utils.py,sha256=F-muF5_ow9JzAPAZ3d8XaGDiz3bRZOdWmWBDwQOVLe0,3761
 xoscar/backends/indigen/__init__.py,sha256=Khr2aGbaIw_04NIdY7QNhdljCKbmmzLb4NeAOM3LF8M,701
+xoscar/backends/indigen/__main__.py,sha256=VeHSoiqCRyx9QMFO4Bnsiblhrn63qKY604Fv476ziVk,529
 xoscar/backends/indigen/backend.py,sha256=cCMkZDEKuRQlFb6v79JvWi5lfzsvAafznOeEWlw7CWY,1663
 xoscar/backends/indigen/driver.py,sha256=uLPBAxG7q8ds6yc-baeYUWu_m4K1gST3_BPqkfnlarw,978
-xoscar/backends/indigen/pool.py,sha256=KU36v_Co2sujDiOGhX2I4TZ7kgmDr1Zga8co7uW88TA,17711
+xoscar/backends/indigen/fate_sharing.py,sha256=r1U5hJ1tVOQa-ncCcX731LKbHon1i-WQdxcqwLX5sOQ,8876
+xoscar/backends/indigen/pool.py,sha256=-QTv73H21eXFHOp5pFt7F09-E9sAcZDfnxeO9eEjXew,16182
+xoscar/backends/indigen/shared_memory.py,sha256=bfRKIvmtnUmkx9zhgwEMFO-in082Eb-YO2txFeFvhIY,19630
 xoscar/backends/test/__init__.py,sha256=xgE4hbD3g46G1GDJEeozaXIk57XaahmFMNQsnRzRcrs,698
 xoscar/backends/test/backend.py,sha256=Q4C6TFQzZogjugGmPh3QZw4IigL8VGCFOJ5fKkE1Uvk,1301
-xoscar/backends/test/pool.py,sha256=Eg_P--ErTwd2EowpZZg9BMhAG9UBOfXEHVhEId3OqPw,7465
+xoscar/backends/test/pool.py,sha256=gh9Q7ml8XSCZS7EB5FSTwJdVesYMXRuvyS6HefWrF1U,7079
 xoscar/collective/__init__.py,sha256=3tTgFXALDbAwmEDtmBX7PN7N6ZrcPFC4evMXMIhBtsg,801
 xoscar/collective/common.py,sha256=9c7xq3IOUvfA0I9GnpalUqXZOzmF6IEILv4zL64BYVE,3663
 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=RQCaM3lMwDJk_fyPNUBW74O7_9nxS_HpitHAal3lwo8,620544
-xoscar/collective/xoscar_pygloo.cp39-win_amd64.pyd,sha256=ms2_jjmEbaTzh3dXZOkEH0TKu7YZB161XJA7bw7SD7o,783360
+xoscar/collective/uv.dll,sha256=A-QBNU_1Ee76ZMllC2nRAxWFFuWuXxhVrqYMHWBxP4o,620544
+xoscar/collective/xoscar_pygloo.cp39-win_amd64.pyd,sha256=OZQgaHiqaIiMbK2yrOwxMx-AtjgTeYNs0KtGuUA-bKY,783360
 xoscar/metrics/__init__.py,sha256=RjXuuYw4I2YYgD8UY2Z5yCZk0Z56xMJ1n40O80Dtxf8,726
 xoscar/metrics/api.py,sha256=dtJ4QrIqQNXhJedeqOPs4TXKgrRGZFFN50xAd9SCfec,9144
 xoscar/metrics/backends/__init__.py,sha256=ZHepfhCDRuK9yz4pAM7bjpWDvS3Ijp1YgyynoUFLeuU,594
@@ -66,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.cp39-win_amd64.pyd,sha256=MsgZeC9LTukfxAAyksAf_qfUies6yLzG8R0o_srpM7g,299008
+xoscar/serialization/core.cp39-win_amd64.pyd,sha256=RgXiQjLlhAtdNnmX8NMLJJgCuoZR7G2dUJlAr57olEM,269824
 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
@@ -76,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=pk6Pcv2Aewk1d-oTau1wyP80p8McIi7DodWL9PcDg1Q,1311
-xoscar/virtualenv/uv.py,sha256=xNNjv8Ywkwx6I1B_yQr8nkEUgJbIFNaseUCzWIo41nY,2921
-xoscar-0.6.1.dist-info/METADATA,sha256=7Qhpj9UNCrGu-3Sgfg2VW9QLaJNr5R_bzZDnlNKkkBE,9300
-xoscar-0.6.1.dist-info/WHEEL,sha256=yA7mxgqX2UV73NtJdMh2AAmdb628loM81912H3s5r00,100
-xoscar-0.6.1.dist-info/top_level.txt,sha256=vYlqqY4Nys8Thm1hePIuUv8eQePdULVWMmt7lXtX_ZA,21
-xoscar-0.6.1.dist-info/RECORD,,
+xoscar/virtualenv/core.py,sha256=FeLmheIkQk0JOayVdUBEMyltAQhidQqbHguCMTHB0Sw,1394
+xoscar/virtualenv/uv.py,sha256=v1LvpxtUu2ja4Cy2EqD-BGxb8zZle5Zj-91QPZH_C10,3273
+xoscar-0.7.0.dist-info/METADATA,sha256=fdIFMff170aAaqB_-FtVAsSaDampWmkFBR8DdY2qb-8,9360
+xoscar-0.7.0.dist-info/WHEEL,sha256=yA7mxgqX2UV73NtJdMh2AAmdb628loM81912H3s5r00,100
+xoscar-0.7.0.dist-info/top_level.txt,sha256=vYlqqY4Nys8Thm1hePIuUv8eQePdULVWMmt7lXtX_ZA,21
+xoscar-0.7.0.dist-info/RECORD,,