xoscar 0.7.4__cp311-cp311-macosx_11_0_arm64.whl → 0.7.6__cp311-cp311-macosx_11_0_arm64.whl

xoscar/backends/indigen/pool.py

@@ -186,8 +186,8 @@ class MainActorPool(MainActorPoolBase):
                         # as the double fork may result in a new process as the parent.
                         psutil.Process(main_pool_pid)
                     except psutil.NoSuchProcess:
-                        logger.info("Exit due to main pool %s exit.", main_pool_pid)
-                        os._exit(0)
+                        logger.error("Exit due to main pool %s exit.", main_pool_pid)
+                        os._exit(233)  # Special exit code for debugging.
                     except Exception as e:
                         logger.exception("Check ppid failed: %s", e)
                     time.sleep(10)
@@ -286,8 +286,12 @@ class MainActorPool(MainActorPoolBase):
                 "-sn",
                 shm.name,
             ]
+            # We need to inherit the parent environment to ensure the subprocess works correctly on Windows.
+            new_env = dict(os.environ)
+            env = actor_pool_config.get_pool_config(process_index).get("env") or {}
+            new_env.update(env)
             logger.info("Creating sub pool via command: %s", cmd)
-            process = await create_subprocess_exec(*cmd)
+            process = await create_subprocess_exec(*cmd, env=new_env)
 
             def _get_external_addresses():
                 try:

xoscar/virtualenv/utils.py

@@ -0,0 +1,84 @@
+# Copyright 2022-2025 XProbe Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import logging
+import re
+import subprocess
+import sys
+import threading
+from contextlib import contextmanager
+from typing import BinaryIO, Callable, Iterator, List, Optional, TextIO, Union
+
+logger = logging.getLogger(__name__)
+
+ansi_escape = re.compile(r"\x1B\[[0-?]*[ -/]*[@-~]")
+
+
+def clean_ansi(text: str) -> str:
+    """Remove ANSI escape sequences from text."""
+    return ansi_escape.sub("", text)
+
+
+def stream_reader(
+    stream: BinaryIO, log_func: Callable[[str], None], output_stream: TextIO
+) -> None:
+    """
+    Read from the stream, write to logger, and also write to the terminal.
+    """
+    for line in iter(stream.readline, b""):
+        decoded = line.decode(errors="replace")
+        output_stream.write(decoded)
+        output_stream.flush()
+        log_func(clean_ansi(decoded.rstrip("\n")))
+
+
+@contextmanager
+def run_subprocess_with_logger(
+    cmd: Union[str, List[str]], cwd: Optional[str] = None, env: Optional[dict] = None
+) -> Iterator[subprocess.Popen]:
+    """
+    Run a subprocess, redirect stdout to logger.info and stderr to logger.error.
+    Returns the Popen object as a context manager.
+
+    :param cmd: Command to execute
+    :param kwargs: Additional arguments passed to subprocess.Popen
+    :yield: The subprocess.Popen object
+    """
+
+    process = subprocess.Popen(
+        cmd,
+        stdout=subprocess.PIPE,
+        stderr=subprocess.PIPE,
+        cwd=cwd,
+        env=env,
+        bufsize=1,
+    )
+
+    threads = [
+        threading.Thread(
+            target=stream_reader, args=(process.stdout, logger.info, sys.stdout)
+        ),
+        threading.Thread(
+            target=stream_reader, args=(process.stderr, logger.error, sys.stderr)
+        ),
+    ]
+    for t in threads:
+        t.start()
+
+    try:
+        yield process
+    finally:
+        process.wait()
+        for t in threads:
+            t.join()

xoscar/virtualenv/uv.py

@@ -24,6 +24,7 @@ from pathlib import Path
 from typing import Optional
 
 from .core import VirtualEnvManager
+from .utils import run_subprocess_with_logger
 
 UV_PATH = os.getenv("XOSCAR_UV_PATH")
 logger = logging.getLogger(__name__)
@@ -70,9 +71,17 @@ class UVVirtualEnvManager(VirtualEnvManager):
         # extend the ability of pip
         # maybe replace #system_torch# to the real version
         packages = self.process_packages(packages)
+        log = kwargs.pop("log", False)
 
         uv_path = UV_PATH or "uv"
-        cmd = [uv_path, "pip", "install", "-p", str(self.env_path)] + packages
+        cmd = [
+            uv_path,
+            "pip",
+            "install",
+            "-p",
+            str(self.env_path),
+            "--color=always",
+        ] + packages
 
         # Handle known pip-related kwargs
         if "index_url" in kwargs and kwargs["index_url"]:
@@ -92,8 +101,13 @@ class UVVirtualEnvManager(VirtualEnvManager):
                     cmd += [option, param_value]
 
         logger.info("Installing packages via command: %s", cmd)
-        self._install_process = process = subprocess.Popen(cmd)
-        returncode = process.wait()
+        if not log:
+            self._install_process = process = subprocess.Popen(cmd)
+            returncode = process.wait()
+        else:
+            with run_subprocess_with_logger(cmd) as process:
+                self._install_process = process
+            returncode = process.returncode
 
         self._install_process = None  # install finished, clear reference
 

{xoscar-0.7.4.dist-info → xoscar-0.7.6.dist-info}/METADATA

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

{xoscar-0.7.4.dist-info → xoscar-0.7.6.dist-info}/RECORD

@@ -1,5 +1,9 @@
+xoscar-0.7.6.dist-info/RECORD,,
+xoscar-0.7.6.dist-info/WHEEL,sha256=1Yl4xfCXx_BC0nXnlbd5xfzR2RyoNx_gSIEdv2OLRuM,137
+xoscar-0.7.6.dist-info/top_level.txt,sha256=vYlqqY4Nys8Thm1hePIuUv8eQePdULVWMmt7lXtX_ZA,21
+xoscar-0.7.6.dist-info/METADATA,sha256=yFaPaVus0ZE31vkzMxminezb084hGtdOpHiTsFVELgI,9134
 xoscar/_utils.pyx,sha256=frgVQ5xGp92jBKc4PsPmjOlVsXlKeHWtTOAMfHmBaII,7380
-xoscar/_utils.cpython-311-darwin.so,sha256=Greuwqz9kQTyFzyONl-ThCjRwka_uWicy4JIjNzGEOg,170000
+xoscar/_utils.cpython-311-darwin.so,sha256=soXiF6juFuAitVtZ20DlA2ISTpIcs6h5JOU3soP3vyU,170000
 xoscar/backend.py,sha256=is436OPkZfSpQXaoqTRVta5eoye_pp45RFgCstAk2hU,1850
 xoscar/core.pxd,sha256=I_C2ka7XryyGnnAVXUVm8xfS1gtIrCs6X-9rswgOcUU,1317
 xoscar/_version.py,sha256=ClSPrUjgGRGHIkVMQV9XQnkQ-n0akJMnq_rh819nqFE,23719
@@ -10,11 +14,11 @@ xoscar/constants.py,sha256=QHHSREw6uWBBjQDCFqlNfTvBZgniJPGy42KSIsR8Fqw,787
 xoscar/__init__.py,sha256=sy7Wtn2EuQZI0I4Az_MfsBVZm4G0DRj46qRyExgmnJk,1622
 xoscar/api.py,sha256=zxNqOjGiTIKuAip9WJ0LOoM7yevD6P5rb-sLynpZ2Zo,14648
 xoscar/utils.py,sha256=MaKiW4Vphwhh8c0yoqN8G8hbJr1zXgpf49EdvmGc1ZU,16500
-xoscar/context.cpython-311-darwin.so,sha256=tB-FyPF9f_e2Ab76LUoJIMFhLDpl8xPVmYEx8PVYTw4,213120
+xoscar/context.cpython-311-darwin.so,sha256=WNuQmYoMYWR82o9K_dd1gUmm8L7fWPbbIVxMWDrqHxA,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=A6Qr32ydN7r5J0kxusqqK3Xax2xw_T3KKWkvS80juvU,412728
+xoscar/core.cpython-311-darwin.so,sha256=hcIYo765EVuqK2jgl20qzY25CNc70BoqLoNIU5Gtj6c,412728
 xoscar/errors.py,sha256=wBlQOKsXf0Fc4skN39tDie0YZT-VIAuLNRgoDl2pZcA,1241
 xoscar/core.pyx,sha256=phN-yYV0A0QI8WFi2jCu0nc4CnShTepfDi0V7ZrLYPY,22092
 xoscar/driver.py,sha256=498fowtJr6b3FE8FIOA_Tc1Vwx88nfZw7p0FxrML0h4,1372
@@ -42,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=yGM9eL8RMDghyCeagQk_CGCc3kpmNGb27V9fBKIym8M,365960
+xoscar/serialization/core.cpython-311-darwin.so,sha256=8S5lMayIWBdUCk5z2W_al2c8v3CQqclgLRbhBM0_BDI,365960
 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=TIOawq8R81kIsworOXlB_ijUzDC0AT0akB9yDK_DDkM,368144
+xoscar/backends/message.cpython-311-darwin.so,sha256=24lqNKZD8Ixx4V0uq0OeVyuBJCeYou92WWZMkPu8vC0,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
@@ -59,7 +63,7 @@ xoscar/backends/indigen/shared_memory.py,sha256=wqbckbgnd0qNm5KzlP_hklF3F_n8fKnC
 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=lzX_bJ07kvUurseZBr1WPL71USBcva62Xo_C6kgo5_g,15857
+xoscar/backends/indigen/pool.py,sha256=uL-tL9uG7HdXIJ8usQOauiqvr2_a0ztMVB2FnLzjdnM,16173
 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
@@ -79,8 +83,5 @@ xoscar/aio/parallelism.py,sha256=VSsjk8wP-Bw7tLeUsTyLVNgp91thjxEfE3pCrw_vF5Q,129
 xoscar/aio/base.py,sha256=9j0f1piwfE5R5GIvV212vSD03ixdaeSzSSsO2kxJZVE,2249
 xoscar/virtualenv/__init__.py,sha256=65t9_X1DvbanNjFy366SiiWZrRTpa9SXWMXPmqayE-4,1117
 xoscar/virtualenv/core.py,sha256=dZqwg2IzHsLEERvohZx0rvBINopMRUImqxG3HHGO0q4,2744
-xoscar/virtualenv/uv.py,sha256=mR4gevfB8eFMmSLfvOYM-QhyqWyDsqO-V4bkRuhOOWA,4145
-xoscar-0.7.4.dist-info/RECORD,,
-xoscar-0.7.4.dist-info/WHEEL,sha256=1Yl4xfCXx_BC0nXnlbd5xfzR2RyoNx_gSIEdv2OLRuM,137
-xoscar-0.7.4.dist-info/top_level.txt,sha256=vYlqqY4Nys8Thm1hePIuUv8eQePdULVWMmt7lXtX_ZA,21
-xoscar-0.7.4.dist-info/METADATA,sha256=Er_dlAOGng8Du9y2bXQt42CAe9IG8nOTMjOgzGHVMyo,9134
+xoscar/virtualenv/utils.py,sha256=mL_uATHhj82xec0-0IZ6N8yI-laPAB4t8G3alPUGtPA,2439
+xoscar/virtualenv/uv.py,sha256=pwjOlvwz_ZlO1GQg_yqca-G6Ro_0L7H1Uf5dJPB6lQQ,4526