xoscar 0.7.13__cp310-cp310-win_amd64.whl → 0.7.15__cp310-cp310-win_amd64.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")))
@@ -150,16 +150,23 @@ class UVVirtualEnvManager(VirtualEnvManager):
     @staticmethod
     def _split_specs(
         specs: list[str], installed: dict[str, str]
-    ) -> tuple[list[str], dict[str, str]]:
+    ) -> tuple[list[str], list[str], dict[str, str]]:
         """
         Split the given requirement specs into:
+        - keep： specs that need to be kept, e.g. git+github://xxx
         - to_resolve: specs that need to be passed to the resolver (unsatisfied ones)
         - pinned: already satisfied specs, used for constraint to lock their versions
         """
+        keep: list[str] = []
         to_resolve: list[str] = []
         pinned: dict[str, str] = {}
 
         for spec_str in specs:
+            # skip git+xxx
+            if is_vcs_url(spec_str):
+                keep.append(spec_str)
+                continue
+
             req = Requirement(spec_str)
             name = req.name.lower()
             cur_ver = installed.get(name)
@@ -185,7 +192,7 @@ class UVVirtualEnvManager(VirtualEnvManager):
                 # Parsing error, be conservative and resolve it
                 to_resolve.append(spec_str)
 
-        return to_resolve, pinned
+        return keep, to_resolve, pinned
 
     def _filter_packages_not_installed(self, packages: list[str]) -> list[str]:
         """
@@ -200,18 +207,21 @@ class UVVirtualEnvManager(VirtualEnvManager):
         }
 
         # exclude those packages that satisfied in system site packages
-        to_resolve, pinned = self._split_specs(packages, installed)
-        if not to_resolve:
+        keep, to_resolve, pinned = self._split_specs(packages, installed)
+        if not keep and 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 []
+        if to_resolve:
+            resolved = self._resolve_install_plan(to_resolve, pinned)
+            logger.debug(f"Resolved install list: {resolved}")
+            if not keep and not resolved:
+                # no packages to install
+                return []
+        else:
+            resolved = []
 
-        final = []
+        final = keep.copy()
         for item in resolved:
             name, version = item.split("==")
             key = name.lower()

{xoscar-0.7.13.dist-info → xoscar-0.7.15.dist-info}/METADATA

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

{xoscar-0.7.13.dist-info → xoscar-0.7.15.dist-info}/RECORD

@@ -1,5 +1,5 @@
 xoscar/__init__.py,sha256=lzCXUmkuIjcjkiNQFekysdJR_ZhlbjcfR5ka1bZZNQg,1683
-xoscar/_utils.cp310-win_amd64.pyd,sha256=nmBSgCK2Z5MGqm6H0QCZnAJiIWxGZYmNOlrlmQPfado,114688
+xoscar/_utils.cp310-win_amd64.pyd,sha256=bNNhQkNkh_Xt1WWo7GcHbQG0k1YNtCY3ez9tGOjPlZg,114688
 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.cp310-win_amd64.pyd,sha256=t0Gzt74d1231kIB_w0sCM3IkE2EQpEBr51xfRKdPe3M,163328
+xoscar/context.cp310-win_amd64.pyd,sha256=dpQ0bzJUEZm6nL1Ob5Hk8uw-Y9YGQNPDsgKoOIsGCs0,163328
 xoscar/context.pxd,sha256=6n6IAbmArSRq8EjcsbS6npW8xP1jI0qOoS1fF0oyj-o,746
 xoscar/context.pyx,sha256=FOJVerGOvxe2USryXEQA0rpaFX_ScxISH6QWKUcahY8,11310
-xoscar/core.cp310-win_amd64.pyd,sha256=Ba0bkhHHGerrtgt46VWpWuadMs79Jjt7T-Z3S7DdGnU,322560
+xoscar/core.cp310-win_amd64.pyd,sha256=4xTapsOHaG-Qm4kYXELECbb9rjfTJXXlPsoQk-ATK74,322560
 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.cp310-win_amd64.pyd,sha256=Qw1SKYEQfFk7CgKwJtjOw1b50iU7Q-MknPigYzHRM_U,244224
+xoscar/backends/message.cp310-win_amd64.pyd,sha256=dwBkJebB1fjizkDmxEsWfQiP-ILcTkSNOWPzBmG2a68,244224
 xoscar/backends/message.pyx,sha256=lBEjMJv4VyxmeO9lHXJJazOajbFnTLak4PSBcLoPZvU,20331
 xoscar/backends/pool.py,sha256=bS_m8XBkfQQsCOaLEzM6HkV5e78dPPp1bCH6yjvPEss,62153
 xoscar/backends/router.py,sha256=EjfNpQUrhFU15eYe1kRPueziHgI2gfDViUzm7ruvXDE,10817
@@ -57,8 +57,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=3ul6fWxSHi06SxoM2b6v9hSFJTNCeUt-LyzSJMaidAw,620544
-xoscar/collective/xoscar_pygloo.cp310-win_amd64.pyd,sha256=ZaJueCiHmhHPvIQvIVOn3690j-ws6Ao2A0E0OmagheE,779264
+xoscar/collective/uv.dll,sha256=KX9ZnryPkciO7uQIRyU-SGh5b65TxO4AU6mGv_wGb1Y,620544
+xoscar/collective/xoscar_pygloo.cp310-win_amd64.pyd,sha256=Dx0LsE6WUAdRX_6Q3Jzc_UALwC5i8cIk_5nuTeWkA74,779264
 xoscar/metrics/__init__.py,sha256=RjXuuYw4I2YYgD8UY2Z5yCZk0Z56xMJ1n40O80Dtxf8,726
 xoscar/metrics/api.py,sha256=dtJ4QrIqQNXhJedeqOPs4TXKgrRGZFFN50xAd9SCfec,9144
 xoscar/metrics/backends/__init__.py,sha256=ZHepfhCDRuK9yz4pAM7bjpWDvS3Ijp1YgyynoUFLeuU,594
@@ -69,7 +69,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.cp310-win_amd64.pyd,sha256=H32yQnWWtlGD8rUUpV4C49FexOC7kkgIvD9WdG-m-Nw,266752
+xoscar/serialization/core.cp310-win_amd64.pyd,sha256=HKa_kVPKvo5UNBhM1pg4wCNpaGG5FVkWxN0_T7l8768,266752
 xoscar/serialization/core.pxd,sha256=X-47bqBM2Kzw5SkLqICdKD0gU6CpmLsBxC3kfW--wVk,1013
 xoscar/serialization/core.pyx,sha256=ZKexLRnRwZXXn2045kR7xfM_szcoPNrDuouQCWtpFp8,30570
 xoscar/serialization/cuda.py,sha256=Fj4Cpr_YmkGceUCo0mQn8fRvmHP_5WcLdRx6epZ3RC0,3869
@@ -79,10 +79,11 @@ xoscar/serialization/numpy.py,sha256=C6WVx-Sdl2OHBAvVY34DFjAKXlekMbpc2ni6bR8wxYo
 xoscar/serialization/pyfury.py,sha256=3ucal29Hr7PX9_1SfB2x43FE2xw_C0rLkVv3foL7qwM,1200
 xoscar/serialization/scipy.py,sha256=9ph-yoRoNiwUZTwQrn35U60VPirWlncXNAg6EXvqMR4,2554
 xoscar/virtualenv/__init__.py,sha256=rhJ7I6x7aXjKOCzSqsKLwqFJMh4YC2sqchEIJNEfI58,1151
-xoscar/virtualenv/core.py,sha256=5w1UDnzLHKyrFFwqAJFXVxkpXrd5ux8OlxSR3971bMo,3055
-xoscar/virtualenv/utils.py,sha256=tZYB1kAEym5e8WK9SxhW7VgZzXk6fJMm6MoBA7pY4gM,2523
-xoscar/virtualenv/uv.py,sha256=hHWtt6xxNTKNbuHpYXicgXxb2IDBg5Nqtn7Mw4xBEQU,10976
-xoscar-0.7.13.dist-info/METADATA,sha256=s6pbK1V7uqX__vGJo4Gk-kJFi4KaCBDS4bcDGqtKlJo,9361
-xoscar-0.7.13.dist-info/WHEEL,sha256=NVXpD7b4Gxps0cd2ds5rr5TG8W4ApEwx_i5J99qMZ5E,102
-xoscar-0.7.13.dist-info/top_level.txt,sha256=vYlqqY4Nys8Thm1hePIuUv8eQePdULVWMmt7lXtX_ZA,21
-xoscar-0.7.13.dist-info/RECORD,,
+xoscar/virtualenv/core.py,sha256=nRfOcKQbb-4TjtLmeMepFnMPLySJAIFwFJsXvXnNv44,8366
+xoscar/virtualenv/platform.py,sha256=rkcqR_lTVJh3AVlP5TJ0NmUKbKKw47S56gRiHPDRimI,1456
+xoscar/virtualenv/utils.py,sha256=WzhEnwgGNQV5sRqZrdvCyQPcJqI5V9feBLM_Mr7UD-w,2975
+xoscar/virtualenv/uv.py,sha256=gxi7QzKcIeftnIU04J9hlXmwVmYiPS2yvlXVojIRdZ4,11364
+xoscar-0.7.15.dist-info/METADATA,sha256=u9K8aSLM_jctYU_4ZT1oCj6FrEuwqigYVhH1ceqd0Gw,9361
+xoscar-0.7.15.dist-info/WHEEL,sha256=NVXpD7b4Gxps0cd2ds5rr5TG8W4ApEwx_i5J99qMZ5E,102
+xoscar-0.7.15.dist-info/top_level.txt,sha256=vYlqqY4Nys8Thm1hePIuUv8eQePdULVWMmt7lXtX_ZA,21
+xoscar-0.7.15.dist-info/RECORD,,