xoscar 0.7.5__cp312-cp312-win_amd64.whl → 0.7.7__cp312-cp312-win_amd64.whl

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__)
@@ -46,7 +47,14 @@ class UVVirtualEnvManager(VirtualEnvManager):
         return shutil.which("uv") is not None
 
     def create_env(self, python_path: Path | None = None) -> None:
-        uv_path = UV_PATH or "uv"
+        if (uv_path := UV_PATH) is None:
+            try:
+                from uv import find_uv_bin
+
+                uv_path = find_uv_bin()
+            except (ImportError, FileNotFoundError):
+                logger.warning("Fail to find uv bin, use system one")
+                uv_path = "uv"
         cmd = [uv_path, "venv", str(self.env_path), "--system-site-packages"]
         if python_path:
             cmd += ["--python", str(python_path)]
@@ -70,9 +78,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 +108,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.5.dist-info → xoscar-0.7.7.dist-info}/METADATA

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

{xoscar-0.7.5.dist-info → xoscar-0.7.7.dist-info}/RECORD

@@ -1,5 +1,5 @@
 xoscar/__init__.py,sha256=lzCXUmkuIjcjkiNQFekysdJR_ZhlbjcfR5ka1bZZNQg,1683
-xoscar/_utils.cp312-win_amd64.pyd,sha256=uQ5TXH_mp5MEtiAvyTst8SJCnPgdfJZQ2wf598qlnX0,108032
+xoscar/_utils.cp312-win_amd64.pyd,sha256=fTm4v7_2D5kuHRs3THi64n5-X8eEZ6uxyr8y8c-yT2w,108032
 xoscar/_utils.pxd,sha256=rlNbTg5lhXA-jCOLksqF4jhUlNn0xw2jx1HxdLa34pc,1193
 xoscar/_utils.pyx,sha256=TWScgqmJGYzjbWBOShBLkq07ldfYEQ5fw6V4OytX_IA,7626
 xoscar/_version.py,sha256=bsfCVAo_o9LkiP3AjPsP4SRRqhjuS0t4D1WGJPzbdls,24412
@@ -7,10 +7,10 @@ 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=KdhTbZflbVGEml2Wm6L1l0-ZsEyymy3zJ9bTYZgdP9I,154112
+xoscar/context.cp312-win_amd64.pyd,sha256=J_VQotR5RPdUqfn2-nOqmiifXLVEOvmTgFR2fPJYbqQ,154112
 xoscar/context.pxd,sha256=6n6IAbmArSRq8EjcsbS6npW8xP1jI0qOoS1fF0oyj-o,746
 xoscar/context.pyx,sha256=FOJVerGOvxe2USryXEQA0rpaFX_ScxISH6QWKUcahY8,11310
-xoscar/core.cp312-win_amd64.pyd,sha256=Ya_fTgNDUZB4WRplV9sSEsXdg_4b63KuayTepnvqK3A,313344
+xoscar/core.cp312-win_amd64.pyd,sha256=ikmyNU4Ii4K3NbLBmggfqOGkfRx0PfIjcaGJJ4hxQlo,313344
 xoscar/core.pxd,sha256=9IZP7dYGfnF1I-obIls8R8b6forxDOPbiM3v5nVslLk,1368
 xoscar/core.pyx,sha256=U6jCZN74MQHi7HkQRaVGm_w5q-FMsw0nnE3aU6533_Q,22756
 xoscar/debug.py,sha256=hrmxIH6zvTKasQo6PUUgXu5mgEsR0g87Fvpw7CoHipg,5257
@@ -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=008EZ889W4q5j1SpUHHRoQVCWSs-doQEt8lJ-cR-Hqk,253952
+xoscar/backends/message.cp312-win_amd64.pyd,sha256=2cFh2Nv8vXfTvu8dhcoLQdoYlSe97D3XXOL6LAYBHnA,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=H0B187s2-79fz-7g0ZZZWR3Zny1rYC3F_JUrE27HSlY,620544
-xoscar/collective/xoscar_pygloo.cp312-win_amd64.pyd,sha256=oA2U23B0WWCU2LrT9PzF29Hn6kIdhkm06od89BcUngE,838656
+xoscar/collective/uv.dll,sha256=LCQwCIOnTYhvoNLwK3UiP4JYBJEzQWHp9WlEZ7BklgY,620544
+xoscar/collective/xoscar_pygloo.cp312-win_amd64.pyd,sha256=DRkU8g0ZzehLcaSeTzg2R62VIYBXnDGLQRrnTumSB3U,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=uYxnMja1_2zqDaho4X7uObf-Mlaa6WcL9lviU0SuQxg,271360
+xoscar/serialization/core.cp312-win_amd64.pyd,sha256=ydSOlNWdUPRL0qzHKrUR7DJ1OOhuqxVabWM3aq6EBaw,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
@@ -83,8 +83,9 @@ xoscar/serialization/pyfury.py,sha256=3ucal29Hr7PX9_1SfB2x43FE2xw_C0rLkVv3foL7qw
 xoscar/serialization/scipy.py,sha256=9ph-yoRoNiwUZTwQrn35U60VPirWlncXNAg6EXvqMR4,2554
 xoscar/virtualenv/__init__.py,sha256=rhJ7I6x7aXjKOCzSqsKLwqFJMh4YC2sqchEIJNEfI58,1151
 xoscar/virtualenv/core.py,sha256=ygnDO6QA3gXoT-uiME8Cn-ET_PtwCUxy1i8uCOd9J7Q,2834
-xoscar/virtualenv/uv.py,sha256=hv5lOyBqeeqIKBlBSCgT9Njlf9pH3X42IWa47gmlrwM,4263
-xoscar-0.7.5.dist-info/METADATA,sha256=VE6KAHQNwZfFnTWXnZ6pKg-F58lW_s0XUXNC3PXZHSI,9417
-xoscar-0.7.5.dist-info/WHEEL,sha256=8UP9x9puWI0P1V_d7K2oMTBqfeLNm21CTzZ_Ptr0NXU,101
-xoscar-0.7.5.dist-info/top_level.txt,sha256=vYlqqY4Nys8Thm1hePIuUv8eQePdULVWMmt7lXtX_ZA,21
-xoscar-0.7.5.dist-info/RECORD,,
+xoscar/virtualenv/utils.py,sha256=tZYB1kAEym5e8WK9SxhW7VgZzXk6fJMm6MoBA7pY4gM,2523
+xoscar/virtualenv/uv.py,sha256=BltNzYn07WvviQFq0Hmi2AB8XEqKlR7HYThuKXn3TRk,4927
+xoscar-0.7.7.dist-info/METADATA,sha256=hwHj3iUTNIl68U9ZNz_5j0SsoAB2mpbe0vYCFZJNu9M,9417
+xoscar-0.7.7.dist-info/WHEEL,sha256=8UP9x9puWI0P1V_d7K2oMTBqfeLNm21CTzZ_Ptr0NXU,101
+xoscar-0.7.7.dist-info/top_level.txt,sha256=vYlqqY4Nys8Thm1hePIuUv8eQePdULVWMmt7lXtX_ZA,21
+xoscar-0.7.7.dist-info/RECORD,,