xoscar 0.7.14__cp311-cp311-macosx_10_9_x86_64.whl → 0.7.16__cp311-cp311-macosx_10_9_x86_64.whl

xoscar/virtualenv/core.py

@@ -14,10 +14,24 @@
 
 from __future__ import annotations
 
+import ast
 import importlib
+import operator
 from abc import ABC, abstractmethod
 from pathlib import Path
 
+from packaging.markers import Marker, default_environment
+from packaging.requirements import InvalidRequirement, Requirement
+from packaging.version import Version
+
+from .platform import (
+    check_cuda_available,
+    check_npu_available,
+    get_cuda_arch,
+    get_cuda_version,
+)
+from .utils import is_vcs_url
+
 
 class VirtualEnvManager(ABC):
     @classmethod
@@ -79,6 +93,13 @@ class VirtualEnvManager(ABC):
             else:
                 processed.append(pkg)
 
+        # apply extended syntax including:
+        # - has_cuda: whether CUDA is available (bool)
+        # - cuda_version: CUDA version string, e.g. "12.1" (str)
+        # - cuda_arch: CUDA architecture string, e.g. "sm_80" (str)
+        # - has_npu: whether an NPU is available (bool)
+        processed = filter_requirements(processed)
+
         return processed
 
     @abstractmethod
@@ -96,3 +117,152 @@ class VirtualEnvManager(ABC):
     @abstractmethod
     def remove_env(self):
         pass
+
+
+def get_env() -> dict[str, str | bool]:
+    env = default_environment().copy()
+    # Your custom env vars here, e.g.:
+    env.update(
+        {
+            "has_cuda": check_cuda_available(),
+            "cuda_version": get_cuda_version(),
+            "cuda_arch": get_cuda_arch(),
+            "has_npu": check_npu_available(),
+        }
+    )
+    return env
+
+
+STANDARD_ENV_VARS = set(default_environment().keys())
+
+
+def is_custom_marker(marker_str: str) -> bool:
+    try:
+        marker = Marker(marker_str)
+    except Exception:
+        return True
+
+    def traverse_markers(node):
+        if isinstance(node, tuple):
+            env_var = node[0]
+            if env_var not in STANDARD_ENV_VARS:
+                return True
+            return False
+        elif isinstance(node, list):
+            return any(traverse_markers(child) for child in node)
+        return False
+
+    return traverse_markers(marker._markers)
+
+
+def eval_custom_marker(marker_str: str, env: dict) -> bool:
+    ops = {
+        ast.Eq: operator.eq,
+        ast.NotEq: operator.ne,
+        ast.Lt: operator.lt,
+        ast.LtE: operator.le,
+        ast.Gt: operator.gt,
+        ast.GtE: operator.ge,
+        ast.And: lambda a, b: a and b,
+        ast.Or: lambda a, b: a or b,
+        ast.Not: operator.not_,
+    }
+
+    def normalize_value(val):
+        # Normalize for boolean
+        if isinstance(val, str):
+            if val.lower() == "true":
+                return True
+            if val.lower() == "false":
+                return False
+
+        # Normalize for version-like fields
+        if isinstance(val, str):
+            if val.count(".") >= 1 and all(
+                part.isdigit() for part in val.split(".") if part
+            ):
+                return Version(val)
+
+        return val
+
+    def maybe_parse_cuda_arch(val):
+        if isinstance(val, str) and val.startswith("sm_"):
+            try:
+                return int(val[3:])
+            except ValueError:
+                return val
+        return val
+
+    def _eval(node):
+        if isinstance(node, ast.BoolOp):
+            left = _eval(node.values[0])
+            for right_node in node.values[1:]:
+                right = _eval(right_node)
+                op = ops[type(node.op)]
+                left = op(left, right)
+            return left
+
+        elif isinstance(node, ast.UnaryOp) and isinstance(node.op, ast.Not):
+            return not _eval(node.operand)
+
+        elif isinstance(node, ast.Compare):
+            left = _eval(node.left)
+            left = maybe_parse_cuda_arch(normalize_value(left))
+
+            for op_node, right_expr in zip(node.ops, node.comparators):
+                right = _eval(right_expr)
+                right = maybe_parse_cuda_arch(normalize_value(right))
+
+                op_func = ops[type(op_node)]
+                if not op_func(left, right):
+                    return False
+                left = right  # for chained comparisons
+
+            return True
+
+        elif isinstance(node, ast.Name):
+            return normalize_value(env.get(node.id))
+
+        elif isinstance(node, ast.Constant):
+            return node.value
+
+        elif isinstance(node, ast.Str):  # Python <3.8
+            return node.s
+
+        else:
+            raise ValueError(f"Unsupported expression: {ast.dump(node)}")
+
+    tree = ast.parse(marker_str, mode="eval")
+    return _eval(tree.body)
+
+
+def filter_requirements(requirements: list[str]) -> list[str]:
+    """
+    Filter requirements by evaluating markers in given env.
+    If env is None, use get_env().
+    """
+    env = get_env()
+    result = []
+    for req_str in requirements:
+        if is_vcs_url(req_str):
+            result.append(req_str)
+        elif ";" in req_str:
+            req_part, marker_part = req_str.split(";", 1)
+            marker_part = marker_part.strip()
+            try:
+                req = Requirement(req_str)
+                if req.marker is None or req.marker.evaluate(env):
+                    result.append(f"{req.name}{req.specifier}")
+                    continue
+            except InvalidRequirement:
+                if is_custom_marker(marker_part):
+                    if eval_custom_marker(marker_part, env):
+                        req = Requirement(req_part.strip())
+                        result.append(str(req))
+                else:
+                    raise
+        else:
+            req = Requirement(req_str.strip())
+            result.append(str(req))
+
+    return result

xoscar/virtualenv/platform.py

@@ -0,0 +1,53 @@
+# 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.
+
+from typing import Optional
+
+
+def check_cuda_available() -> bool:
+    try:
+        import torch
+
+        return torch.cuda.is_available()
+    except (ImportError, AttributeError):
+        return False
+
+
+def get_cuda_version() -> Optional[str]:
+    try:
+        import torch
+
+        return torch.version.cuda  # e.g. '12.1'
+    except (ImportError, AttributeError):
+        return None
+
+
+def get_cuda_arch() -> Optional[str]:
+    try:
+        import torch
+
+        major, minor = torch.cuda.get_device_capability()
+        return f"sm_{major}{minor}"  # e.g. 'sm_80'
+    except (ImportError, AttributeError):
+        return None
+
+
+def check_npu_available() -> bool:
+    try:
+        import torch
+        import torch_npu  # noqa: F401
+
+        return torch.npu.is_available()
+    except ImportError:
+        return False

xoscar/virtualenv/utils.py

@@ -82,3 +82,19 @@ def run_subprocess_with_logger(
         process.wait()
         for t in threads:
             t.join()
+
+
+def is_vcs_url(spec_str: str) -> bool:
+    """
+    Check if the given spec string is a VCS URL.
+
+    Supports common VCS schemes like git+, svn+, hg+, bzr+, and HTTP/HTTPS URLs.
+
+    Args:
+        spec_str (str): The package spec string.
+
+    Returns:
+        bool: True if it's a VCS URL, False otherwise.
+    """
+    vcs_prefixes = ("git+", "http://", "https://", "svn+", "hg+", "bzr+")
+    return spec_str.startswith(vcs_prefixes)

xoscar/virtualenv/uv.py

@@ -30,7 +30,7 @@ from packaging.requirements import Requirement
 from packaging.version import Version
 
 from .core import VirtualEnvManager
-from .utils import run_subprocess_with_logger
+from .utils import is_vcs_url, run_subprocess_with_logger
 
 UV_PATH = os.getenv("XOSCAR_UV_PATH")
 SKIP_INSTALLED = bool(int(os.getenv("XOSCAR_VIRTUAL_ENV_SKIP_INSTALLED", "0")))
@@ -163,9 +163,7 @@ class UVVirtualEnvManager(VirtualEnvManager):
 
         for spec_str in specs:
             # skip git+xxx
-            if spec_str.startswith(
-                ("git+", "http://", "https://", "svn+", "hg+", "bzr+")
-            ):
+            if is_vcs_url(spec_str):
                 keep.append(spec_str)
                 continue
 
@@ -241,6 +239,9 @@ class UVVirtualEnvManager(VirtualEnvManager):
             return
 
         packages = self.process_packages(packages)
+        if not packages:
+            return
+
         log = kwargs.pop("log", False)
         skip_installed = kwargs.pop("skip_installed", SKIP_INSTALLED)
         uv_path = self._get_uv_path()

{xoscar-0.7.14.dist-info → xoscar-0.7.16.dist-info}/METADATA

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

{xoscar-0.7.14.dist-info → xoscar-0.7.16.dist-info}/RECORD

@@ -1,9 +1,9 @@
-xoscar-0.7.14.dist-info/RECORD,,
-xoscar-0.7.14.dist-info/WHEEL,sha256=9JW_xs4qhQPk0BxaQRvBEJlozFusVYXbUecyREdMua0,138
-xoscar-0.7.14.dist-info/top_level.txt,sha256=vYlqqY4Nys8Thm1hePIuUv8eQePdULVWMmt7lXtX_ZA,21
-xoscar-0.7.14.dist-info/METADATA,sha256=bTouvWumRWQDRY1ApYh9XVZ7HthHSUa8ctv-___IW6U,9135
+xoscar-0.7.16.dist-info/RECORD,,
+xoscar-0.7.16.dist-info/WHEEL,sha256=9JW_xs4qhQPk0BxaQRvBEJlozFusVYXbUecyREdMua0,138
+xoscar-0.7.16.dist-info/top_level.txt,sha256=vYlqqY4Nys8Thm1hePIuUv8eQePdULVWMmt7lXtX_ZA,21
+xoscar-0.7.16.dist-info/METADATA,sha256=Yt5bo1VSoHeKy8IPnhVlorXbAkW0Cdws6o4VJZG5Y2E,9135
 xoscar/_utils.pyx,sha256=frgVQ5xGp92jBKc4PsPmjOlVsXlKeHWtTOAMfHmBaII,7380
-xoscar/_utils.cpython-311-darwin.so,sha256=9dgbnAEiBP6JTRKFSb92g9n8Pvv5RP6X87lofpOZ_fE,163280
+xoscar/_utils.cpython-311-darwin.so,sha256=DoUAhw768YeQdV2V1CDprhLy1J5kbzhU1hUIxwGrVeU,163224
 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=ACYXRSdWIxbm4RIewPUZ9syNEsXIYIq0h36BnLr0i_0,201688
+xoscar/context.cpython-311-darwin.so,sha256=uQGxaP9I1yi0o9_SeUujTC0qL-N3P9AYaiLq-iw43Mo,201176
 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=d3IyD8qnlbyJw0uRDlRLb1Ks8FWx8rewfTVtxDslMT8,416456
+xoscar/core.cpython-311-darwin.so,sha256=-M1bg2Qr-KACDFxvs9ohSVHx2buruvtYTMp6tKLCBGs,416088
 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=MHCtIBDrTKopKvEPnZdkZR1qMR3aEE-B7vs5mc-y0uE,394264
+xoscar/serialization/core.cpython-311-darwin.so,sha256=WxoeDAcocoGOA9mwMwEnvCMveeQnqmCGmTgOQXnAbQo,393808
 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=gCxwtSYk7lJykaxlTtvGG2MtfRFikFwu0-JrdBchgyY,374728
+xoscar/backends/message.cpython-311-darwin.so,sha256=Reuxv8pHds6EDfiP_b_9k21UtdmKqi_eEx7j7nlZ_ig,374680
 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
@@ -82,6 +82,7 @@ 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=MV1lbkixGl45REHS04uaPuqPKxyVbBmVnB_umuR_eWw,2957
-xoscar/virtualenv/utils.py,sha256=mL_uATHhj82xec0-0IZ6N8yI-laPAB4t8G3alPUGtPA,2439
-xoscar/virtualenv/uv.py,sha256=8fsZtUfMfSI1FZL7eLMfF-znG7fGVwshdERiHqSvems,11119
+xoscar/virtualenv/core.py,sha256=Ij36UQaej9fFaz1PfqkEtL1ss8yBribXHcWT115kH-o,8098
+xoscar/virtualenv/platform.py,sha256=3f5EQEXbq_sf4pRJ_0lg4y1V_22qadUdQjmVjIaZaoU,1403
+xoscar/virtualenv/utils.py,sha256=qKHw7Gg0n3JuzKFjhBnftPq2QWlgNJLk1sGPr5GzamM,2875
+xoscar/virtualenv/uv.py,sha256=VBw045LN8gYMLgjaazt7-tnwBveWr7YYE2zjDsL18h0,11091