xoscar 0.7.1__cp310-cp310-macosx_11_0_arm64.whl → 0.7.3__cp310-cp310-macosx_11_0_arm64.whl

xoscar/virtualenv/core.py

@@ -14,6 +14,7 @@
 
 from __future__ import annotations
 
+import importlib
 from abc import ABC, abstractmethod
 from pathlib import Path
 
@@ -35,6 +36,43 @@ 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

xoscar/virtualenv/uv.py

@@ -14,14 +14,22 @@
 
 from __future__ import annotations
 
+import os
 import shutil
 import subprocess
+import sys
 import sysconfig
 from pathlib import Path
 from typing import Optional
 
 from .core import VirtualEnvManager
 
+UV_PATH = os.getenv("XOSCAR_UV_PATH")
+
+
+def _is_in_pyinstaller():
+    return hasattr(sys, "_MEIPASS")
+
 
 class UVVirtualEnvManager(VirtualEnvManager):
     def __init__(self, env_path: Path):
@@ -30,12 +38,21 @@ class UVVirtualEnvManager(VirtualEnvManager):
 
     @classmethod
     def is_available(cls):
+        if UV_PATH is not None:
+            # user specified uv, just treat it as existed
+            return True
         return shutil.which("uv") is not None
 
     def create_env(self, python_path: Path | None = None) -> None:
-        cmd = ["uv", "venv", str(self.env_path), "--system-site-packages"]
+        uv_path = UV_PATH or "uv"
+        cmd = [uv_path, "venv", str(self.env_path), "--system-site-packages"]
         if python_path:
             cmd += ["--python", str(python_path)]
+        elif _is_in_pyinstaller():
+            # in pyinstaller, uv would find the system python
+            # in this case we'd better specify the same python version
+            python_version = f"{sys.version_info.major}.{sys.version_info.minor}.{sys.version_info.micro}"
+            cmd += ["--python", python_version]
         subprocess.run(cmd, check=True)
 
     def install_packages(self, packages: list[str], **kwargs):
@@ -46,7 +63,12 @@ class UVVirtualEnvManager(VirtualEnvManager):
         if not packages:
             return
 
-        cmd = ["uv", "pip", "install", "-p", str(self.env_path)] + packages
+        # extend the ability of pip
+        # maybe replace #system_torch# to the real version
+        packages = self.process_packages(packages)
+
+        uv_path = UV_PATH or "uv"
+        cmd = [uv_path, "pip", "install", "-p", str(self.env_path)] + packages
 
         # Handle known pip-related kwargs
         if "index_url" in kwargs and kwargs["index_url"]:

{xoscar-0.7.1.dist-info → xoscar-0.7.3.dist-info}/METADATA

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

{xoscar-0.7.1.dist-info → xoscar-0.7.3.dist-info}/RECORD

@@ -1,7 +1,7 @@
-xoscar-0.7.1.dist-info/RECORD,,
-xoscar-0.7.1.dist-info/WHEEL,sha256=adaOEtyuP97RoRqh2LNimBtjXokZHsp60v8dUwE5uKE,137
-xoscar-0.7.1.dist-info/top_level.txt,sha256=vYlqqY4Nys8Thm1hePIuUv8eQePdULVWMmt7lXtX_ZA,21
-xoscar-0.7.1.dist-info/METADATA,sha256=GNHx0SyIciNz1W7kBgcn5Dwti9Xak-p353ybGr52avQ,9134
+xoscar-0.7.3.dist-info/RECORD,,
+xoscar-0.7.3.dist-info/WHEEL,sha256=adaOEtyuP97RoRqh2LNimBtjXokZHsp60v8dUwE5uKE,137
+xoscar-0.7.3.dist-info/top_level.txt,sha256=vYlqqY4Nys8Thm1hePIuUv8eQePdULVWMmt7lXtX_ZA,21
+xoscar-0.7.3.dist-info/METADATA,sha256=YW_Z9Lp7sSYz75-skFu6UzYiZM0ufBHiCiq5lDN6B6Y,9134
 xoscar/_utils.pyx,sha256=frgVQ5xGp92jBKc4PsPmjOlVsXlKeHWtTOAMfHmBaII,7380
 xoscar/backend.py,sha256=is436OPkZfSpQXaoqTRVta5eoye_pp45RFgCstAk2hU,1850
 xoscar/core.pxd,sha256=I_C2ka7XryyGnnAVXUVm8xfS1gtIrCs6X-9rswgOcUU,1317
@@ -10,7 +10,7 @@ xoscar/context.pxd,sha256=qKa0OyDPZtVymftSh447m-RzFZgmz8rGqQBa7qlauvc,725
 xoscar/batch.py,sha256=DpArS0L3WYJ_HVPG-6hSYEwoAFY1mY2-mlC4Jp5M_Dw,7872
 xoscar/nvutils.py,sha256=qmW4mKLU0WB2yCs198ccQOgLL02zB7Fsa-AotO3NOmg,20412
 xoscar/constants.py,sha256=QHHSREw6uWBBjQDCFqlNfTvBZgniJPGy42KSIsR8Fqw,787
-xoscar/_utils.cpython-310-darwin.so,sha256=tBhYC44nuhY9VJZ9TTYC4ZVnbt-MlK7DEVM8xYgB2Rs,168944
+xoscar/_utils.cpython-310-darwin.so,sha256=2G7Cf8vLVND1TolJx4ufYtXQLrzfwLWD2e0o3pWw9Wc,168944
 xoscar/__init__.py,sha256=sy7Wtn2EuQZI0I4Az_MfsBVZm4G0DRj46qRyExgmnJk,1622
 xoscar/api.py,sha256=zxNqOjGiTIKuAip9WJ0LOoM7yevD6P5rb-sLynpZ2Zo,14648
 xoscar/utils.py,sha256=MaKiW4Vphwhh8c0yoqN8G8hbJr1zXgpf49EdvmGc1ZU,16500
@@ -20,8 +20,8 @@ xoscar/context.pyx,sha256=8CdgPnWcE9eOp3N600WgDQ03MCi8P73eUOGcfV7Zksg,10942
 xoscar/errors.py,sha256=wBlQOKsXf0Fc4skN39tDie0YZT-VIAuLNRgoDl2pZcA,1241
 xoscar/core.pyx,sha256=phN-yYV0A0QI8WFi2jCu0nc4CnShTepfDi0V7ZrLYPY,22092
 xoscar/driver.py,sha256=498fowtJr6b3FE8FIOA_Tc1Vwx88nfZw7p0FxrML0h4,1372
-xoscar/context.cpython-310-darwin.so,sha256=uDwZX43LjXQg4hPgrEdlmvSwCiyhUAbI-AgKTpg2_Oc,211488
-xoscar/core.cpython-310-darwin.so,sha256=MF0Cl22HXuFrwOHQk5FHwFwAkEgnHdK3FZrGNeOoU64,409624
+xoscar/context.cpython-310-darwin.so,sha256=oCSV2_AXtzKIJc8svljtjcPeTs0mxM7RL3eyfVa-Y0g,211488
+xoscar/core.cpython-310-darwin.so,sha256=jOfu5nBXC-la2ntN4olAgI0yjFNMz-rlL-AQUb9_stc,409624
 xoscar/profiling.py,sha256=BC5OF0HzSaXv8V7w-y-B8r5gV5DgxHFoTEIF6jCMioQ,8015
 xoscar/_utils.pxd,sha256=5KYAL3jfPdejsHnrGGT2s--ZUX5SXznQWpHVSno429k,1157
 xoscar/metrics/__init__.py,sha256=9Badi7rxYikGm2dQiNCrj9GgMRBxwuR3JaEKcFZmfak,705
@@ -47,11 +47,11 @@ xoscar/serialization/cuda.py,sha256=iFUEnN4SiquBIhyieyOrfw3TnKnW-tU_vYgqOxO_DrA,
 xoscar/serialization/scipy.py,sha256=yOEi0NB8cqQ6e2UnCZ1w006RsB7T725tIL-DM_hNcsU,2482
 xoscar/serialization/aio.py,sha256=5DySPgDxU43ec7_5Ct44-Oqt7YNSJBfuf8VdQgQlChA,4731
 xoscar/serialization/core.pyx,sha256=bjR-zXGm9qersk7kYPzpjpMIxDl_Auur4BCubRfKmfA,29626
-xoscar/serialization/core.cpython-310-darwin.so,sha256=SQRDy0ZD5IgDh0kPN2bZaFiqpbNMlMm--S0hfkbs0gE,379912
+xoscar/serialization/core.cpython-310-darwin.so,sha256=PJ-hpMB51DaUcBfO8qJTnIosfHLyN3g98G_g50a7hRc,379912
 xoscar/serialization/mlx.py,sha256=N_cvbTUBKc14XWYsPIMz4kDstyRN1DNhb4BVRgnQm8Y,1872
 xoscar/backends/config.py,sha256=4tZMiXAMMS8qQ4SX_LjONLtSQVfZTx3m-IK3EqbkYdk,5375
 xoscar/backends/allocate_strategy.py,sha256=tC1Nbq2tJohahUwd-zoRYHEDX65wyuX8tmeY45uWj_w,4845
-xoscar/backends/message.cpython-310-darwin.so,sha256=5qTZf8-vFGxub_5i1W6LftbDhXGzQRfEu-G4LkQOykk,348688
+xoscar/backends/message.cpython-310-darwin.so,sha256=LpSEisbIndQcRTfVLWnHGrt4bioCOgdZXqNPtHGRxt8,348688
 xoscar/backends/__init__.py,sha256=VHEBQcUWM5bj027W8EUf9PiJUAP7JoMrRw3Tsvy5ySw,643
 xoscar/backends/core.py,sha256=EH-fHlV9x3bnruEHaUtGYO7osKLfLJ4AQHtuzA_mr2g,10857
 xoscar/backends/context.py,sha256=XfDPG2eDhAhE6hWBEkEsHTnyyOYN9R3houlMjAL7BFw,16329
@@ -82,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=Ld5bSkKp8ywekGuUq61uyms5I8Hm1WdbkbLxmCw-ML0,1342
-xoscar/virtualenv/uv.py,sha256=rVurn1PKlvR22Bm_F1uouIb1eMkB_wr-_29dBvMl7bo,3182
+xoscar/virtualenv/core.py,sha256=dZqwg2IzHsLEERvohZx0rvBINopMRUImqxG3HHGO0q4,2744
+xoscar/virtualenv/uv.py,sha256=5mmE-7eeEB2zBJHdktTDvawHG9jIvKfifhJ5Wa0YmMI,3964