xoscar 0.7.1__tar.gz → 0.7.3__tar.gz

{xoscar-0.7.1 → xoscar-0.7.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 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.3/xoscar/virtualenv/core.py

@@ -0,0 +1,90 @@
+# 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 __future__ import annotations
+
+import importlib
+from abc import ABC, abstractmethod
+from pathlib import Path
+
+
+class VirtualEnvManager(ABC):
+    @classmethod
+    @abstractmethod
+    def is_available(cls):
+        pass
+
+    def __init__(self, env_path: Path):
+        self.env_path = env_path.resolve()
+
+    @abstractmethod
+    def create_env(self, python_path: Path | None = None) -> None:
+        pass
+
+    @abstractmethod
+    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
+
+    @abstractmethod
+    def get_python_path(self) -> str | None:
+        pass
+
+    @abstractmethod
+    def get_lib_path(self) -> str:
+        pass
+
+    @abstractmethod
+    def remove_env(self):
+        pass

{xoscar-0.7.1 → xoscar-0.7.3}/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 → xoscar-0.7.3}/xoscar.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 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/xoscar/virtualenv/core.py

@@ -1,52 +0,0 @@
-# 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 __future__ import annotations
-
-from abc import ABC, abstractmethod
-from pathlib import Path
-
-
-class VirtualEnvManager(ABC):
-    @classmethod
-    @abstractmethod
-    def is_available(cls):
-        pass
-
-    def __init__(self, env_path: Path):
-        self.env_path = env_path.resolve()
-
-    @abstractmethod
-    def create_env(self, python_path: Path | None = None) -> None:
-        pass
-
-    @abstractmethod
-    def install_packages(self, packages: list[str], **kwargs):
-        pass
-
-    @abstractmethod
-    def cancel_install(self):
-        pass
-
-    @abstractmethod
-    def get_python_path(self) -> str | None:
-        pass
-
-    @abstractmethod
-    def get_lib_path(self) -> str:
-        pass
-
-    @abstractmethod
-    def remove_env(self):
-        pass