xoscar 0.7.11__cp311-cp311-macosx_11_0_arm64.whl → 0.7.12__cp311-cp311-macosx_11_0_arm64.whl

xoscar/virtualenv/uv.py

@@ -16,17 +16,24 @@ from __future__ import annotations
 
 import logging
 import os
+import re
 import shutil
 import subprocess
 import sys
 import sysconfig
+import tempfile
+from importlib.metadata import distributions
 from pathlib import Path
 from typing import Optional
 
+from packaging.requirements import Requirement
+from packaging.version import Version
+
 from .core import VirtualEnvManager
 from .utils import run_subprocess_with_logger
 
 UV_PATH = os.getenv("XOSCAR_UV_PATH")
+SKIP_INSTALLED = bool(int(os.getenv("XOSCAR_VIRTUAL_ENV_SKIP_INSTALLED", "0")))
 logger = logging.getLogger(__name__)
 
 
@@ -46,7 +53,8 @@ class UVVirtualEnvManager(VirtualEnvManager):
             return True
         return shutil.which("uv") is not None
 
-    def create_env(self, python_path: Path | None = None) -> None:
+    @staticmethod
+    def _get_uv_path() -> str:
         if (uv_path := UV_PATH) is None:
             try:
                 from uv import find_uv_bin
@@ -55,6 +63,10 @@ class UVVirtualEnvManager(VirtualEnvManager):
             except (ImportError, FileNotFoundError):
                 logger.warning("Fail to find uv bin, use system one")
                 uv_path = "uv"
+        return uv_path
+
+    def create_env(self, python_path: Path | None = None) -> None:
+        uv_path = self._get_uv_path()
         cmd = [uv_path, "venv", str(self.env_path), "--system-site-packages"]
         if python_path:
             cmd += ["--python", str(python_path)]
@@ -67,6 +79,112 @@ class UVVirtualEnvManager(VirtualEnvManager):
         logger.info("Creating virtualenv via command: %s", cmd)
         subprocess.run(cmd, check=True)
 
+    def _resolve_install_plan(
+        self, specs: list[str], pinned: dict[str, str]
+    ) -> list[str]:
+        """
+        Run uv --dry-run with pinned constraints and return
+        a list like ['package==version', ...].
+        """
+        with tempfile.NamedTemporaryFile("w+", delete=True) as f:
+            for name, ver in pinned.items():
+                f.write(f"{name}=={ver}\n")
+            f.flush()  # make sure content is on disk
+
+            cmd = [
+                self._get_uv_path(),
+                "pip",
+                "install",
+                "-p",
+                str(self.env_path),
+                "--dry-run",
+                "--constraint",
+                f.name,
+                *specs,
+            ]
+            result = subprocess.run(cmd, check=True, text=True, capture_output=True)
+
+        # the temp file is automatically deleted here
+        deps = [
+            f"{m.group(1)}=={m.group(2)}"
+            for line in result.stderr.splitlines()
+            if (m := re.match(r"^\+ (\S+)==(\S+)$", line.strip()))
+        ]
+        return deps
+
+    @staticmethod
+    def _split_specs(
+        specs: list[str], installed: dict[str, str]
+    ) -> tuple[list[str], dict[str, str]]:
+        """
+        Split the given requirement specs into:
+        - to_resolve: specs that need to be passed to the resolver (unsatisfied ones)
+        - pinned: already satisfied specs, used for constraint to lock their versions
+        """
+        to_resolve: list[str] = []
+        pinned: dict[str, str] = {}
+
+        for spec_str in specs:
+            req = Requirement(spec_str)
+            name = req.name.lower()
+            cur_ver = installed.get(name)
+
+            if cur_ver is None:
+                # Package not installed, needs resolution
+                to_resolve.append(spec_str)
+                continue
+
+            if not req.specifier:
+                # No version constraint, already satisfied
+                pinned[name] = cur_ver
+                continue
+
+            try:
+                if Version(cur_ver) in req.specifier:
+                    # Version satisfies the specifier, pin it
+                    pinned[name] = cur_ver
+                else:
+                    # Version does not satisfy, needs resolution
+                    to_resolve.append(spec_str)
+            except Exception:
+                # Parsing error, be conservative and resolve it
+                to_resolve.append(spec_str)
+
+        return to_resolve, pinned
+
+    def _filter_packages_not_installed(self, packages: list[str]) -> list[str]:
+        """
+        Filter out packages that are already installed with the same version.
+        """
+
+        # all the installed packages in system site packages
+        installed = {
+            dist.metadata["Name"].lower(): dist.version
+            for dist in distributions()
+            if dist.metadata and "Name" in dist.metadata
+        }
+
+        # exclude those packages that satisfied in system site packages
+        to_resolve, pinned = self._split_specs(packages, installed)
+        if not to_resolve:
+            logger.debug("All requirement specifiers satisfied by system packages.")
+            return []
+
+        resolved = self._resolve_install_plan(to_resolve, pinned)
+        logger.debug(f"Resolved install list: {resolved}")
+        if not resolved:
+            # no packages to install
+            return []
+
+        final = []
+        for item in resolved:
+            name, version = item.split("==")
+            key = name.lower()
+            if key not in installed or installed[key] != version:
+                final.append(item)
+        logger.debug(f"Filtered install list: {final}")
+        return final
+
     def install_packages(self, packages: list[str], **kwargs):
         """
         Install packages into the virtual environment using uv.
@@ -75,22 +193,36 @@ class UVVirtualEnvManager(VirtualEnvManager):
         if not packages:
             return
 
-        # extend the ability of pip
-        # maybe replace #system_torch# to the real version
         packages = self.process_packages(packages)
         log = kwargs.pop("log", False)
+        skip_installed = kwargs.pop("skip_installed", SKIP_INSTALLED)
+        uv_path = self._get_uv_path()
+
+        if skip_installed:
+            packages = self._filter_packages_not_installed(packages)
+            if not packages:
+                logger.info("All required packages are already installed.")
+                return
+
+            cmd = [
+                uv_path,
+                "pip",
+                "install",
+                "-p",
+                str(self.env_path),
+                "--color=always",
+                "--no-deps",
+            ] + packages
+        else:
+            cmd = [
+                uv_path,
+                "pip",
+                "install",
+                "-p",
+                str(self.env_path),
+                "--color=always",
+            ] + packages
 
-        uv_path = UV_PATH or "uv"
-        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"]:
             cmd += ["-i", kwargs["index_url"]]
         param_and_option = [
@@ -100,12 +232,13 @@ class UVVirtualEnvManager(VirtualEnvManager):
         ]
         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]
+                val = kwargs[param]
+                cmd += (
+                    [option, val]
+                    if isinstance(val, str)
+                    else [opt for v in val for opt in (option, v)]
+                )
+
         if kwargs.get("no_build_isolation", False):
             cmd += ["--no-build-isolation"]
 
@@ -118,8 +251,7 @@ class UVVirtualEnvManager(VirtualEnvManager):
                 self._install_process = process
             returncode = process.returncode
 
-        self._install_process = None  # install finished, clear reference
-
+        self._install_process = None
         if returncode != 0:
             raise subprocess.CalledProcessError(returncode, cmd)
 

{xoscar-0.7.11.dist-info → xoscar-0.7.12.dist-info}/METADATA

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

{xoscar-0.7.11.dist-info → xoscar-0.7.12.dist-info}/RECORD

@@ -1,9 +1,9 @@
-xoscar-0.7.11.dist-info/RECORD,,
-xoscar-0.7.11.dist-info/WHEEL,sha256=1Yl4xfCXx_BC0nXnlbd5xfzR2RyoNx_gSIEdv2OLRuM,137
-xoscar-0.7.11.dist-info/top_level.txt,sha256=vYlqqY4Nys8Thm1hePIuUv8eQePdULVWMmt7lXtX_ZA,21
-xoscar-0.7.11.dist-info/METADATA,sha256=PDSZhxwM8g2RzmkuPLu6aynwy5WrFKV1jyv8XVkUY_4,9135
+xoscar-0.7.12.dist-info/RECORD,,
+xoscar-0.7.12.dist-info/WHEEL,sha256=1Yl4xfCXx_BC0nXnlbd5xfzR2RyoNx_gSIEdv2OLRuM,137
+xoscar-0.7.12.dist-info/top_level.txt,sha256=vYlqqY4Nys8Thm1hePIuUv8eQePdULVWMmt7lXtX_ZA,21
+xoscar-0.7.12.dist-info/METADATA,sha256=fNJZZhysdC6gdYZ67SfKjoIlNsse08kV5978cNQmnyo,9135
 xoscar/_utils.pyx,sha256=frgVQ5xGp92jBKc4PsPmjOlVsXlKeHWtTOAMfHmBaII,7380
-xoscar/_utils.cpython-311-darwin.so,sha256=fFwnPg9jX9DDEN1b3xhaDo35T4JUFkszN0NnJlXv4IU,170672
+xoscar/_utils.cpython-311-darwin.so,sha256=J08xuZOHYk2viARaeL29_YUBXJRvrx3eQx1PbBJCUv8,170672
 xoscar/backend.py,sha256=is436OPkZfSpQXaoqTRVta5eoye_pp45RFgCstAk2hU,1850
 xoscar/core.pxd,sha256=I_C2ka7XryyGnnAVXUVm8xfS1gtIrCs6X-9rswgOcUU,1317
 xoscar/_version.py,sha256=ClSPrUjgGRGHIkVMQV9XQnkQ-n0akJMnq_rh819nqFE,23719
@@ -14,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=E_xLJqSemB3musT0V35VzQRjERk7HubTFbZo9sQxwlI,213456
+xoscar/context.cpython-311-darwin.so,sha256=vy1EJJ-tjU9lasyOCRzq3A_sXCfkUfUGGKqKc3cJMdw,213456
 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=SUILonk8WjQHiMypnknxWLVphvRhfBeX-uwE8txCbds,413112
+xoscar/core.cpython-311-darwin.so,sha256=8MQSseZtoi01zOkPJGEPoDiBBlWL40yvDUQ0pwhExfk,413112
 xoscar/errors.py,sha256=wBlQOKsXf0Fc4skN39tDie0YZT-VIAuLNRgoDl2pZcA,1241
 xoscar/core.pyx,sha256=phN-yYV0A0QI8WFi2jCu0nc4CnShTepfDi0V7ZrLYPY,22092
 xoscar/driver.py,sha256=498fowtJr6b3FE8FIOA_Tc1Vwx88nfZw7p0FxrML0h4,1372
@@ -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=irIssXfqax08ODNBZKeSAdNDkTeZotttcjVEFMZGYrM,382808
+xoscar/serialization/core.cpython-311-darwin.so,sha256=9GlRcZpKEYzfBloIkvyuX9HSyovoOVsa-PuqZyabKOw,382808
 xoscar/serialization/core.pyx,sha256=bjR-zXGm9qersk7kYPzpjpMIxDl_Auur4BCubRfKmfA,29626
 xoscar/serialization/mlx.py,sha256=tRu_7o6RizdRhbr88EasHrZtShimAsLy3pIEO-by29o,2118
-xoscar/backends/message.cpython-311-darwin.so,sha256=kcuPWTWOCyW9kwZfeZtkrUXe9yOzojk6cCVre24zyg0,368656
+xoscar/backends/message.cpython-311-darwin.so,sha256=s8j5YkJKgcW2jkvw-JL4pNNqDFpBa5npxl_rvfwVOzI,368656
 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
@@ -84,4 +84,4 @@ xoscar/aio/base.py,sha256=9j0f1piwfE5R5GIvV212vSD03ixdaeSzSSsO2kxJZVE,2249
 xoscar/virtualenv/__init__.py,sha256=65t9_X1DvbanNjFy366SiiWZrRTpa9SXWMXPmqayE-4,1117
 xoscar/virtualenv/core.py,sha256=qHKqI6R92SN0_OWVAX1xy9wJiZr-r0VfLHTskZtZE4U,2851
 xoscar/virtualenv/utils.py,sha256=mL_uATHhj82xec0-0IZ6N8yI-laPAB4t8G3alPUGtPA,2439
-xoscar/virtualenv/uv.py,sha256=ef7InUP0VwPJe-ssZpWCMDN69lEp4aIRFtEgVff82eI,4884
+xoscar/virtualenv/uv.py,sha256=PWq5Ht-uFOrwyKGF0bGZzZiuJUvGmr_OZADzRSfLKfk,9322