xoscar 0.7.12__cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl → 0.7.14__cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl

xoscar/virtualenv/core.py

@@ -29,7 +29,13 @@ class VirtualEnvManager(ABC):
         self.env_path = env_path.resolve()
 
     @abstractmethod
-    def create_env(self, python_path: Path | None = None) -> None:
+    def exists_env(self) -> bool:
+        pass
+
+    @abstractmethod
+    def create_env(
+        self, python_path: Path | None = None, exists: str = "ignore"
+    ) -> None:
         pass
 
     @abstractmethod

xoscar/virtualenv/uv.py

@@ -65,9 +65,44 @@ class UVVirtualEnvManager(VirtualEnvManager):
                 uv_path = "uv"
         return uv_path
 
-    def create_env(self, python_path: Path | None = None) -> None:
+    def exists_env(self) -> bool:
+        """Check if virtual environment already exists."""
+        return self.env_path.exists() and (self.env_path / "pyvenv.cfg").exists()
+
+    def create_env(
+        self, python_path: Path | None = None, exists: str = "ignore"
+    ) -> None:
+        """
+        Create virtual environment.
+
+        Args:
+            python_path: Path to Python interpreter to use
+            exists: How to handle existing environment:
+                - "ignore": Skip creation if environment already exists (default)
+                - "error": Raise error if environment exists
+                - "clear": Remove existing environment and create new one
+        """
+        if self.exists_env():
+            if exists == "error":
+                raise FileExistsError(
+                    f"Virtual environment already exists at {self.env_path}"
+                )
+            elif exists == "ignore":
+                logger.info(
+                    f"Virtual environment already exists at {self.env_path}, skipping creation"
+                )
+                return
+            elif exists == "clear":
+                logger.info(f"Removing existing virtual environment at {self.env_path}")
+                self.remove_env()
+            else:
+                raise ValueError(
+                    f"Invalid exists option: {exists}. Must be one of: error, clear, ignore"
+                )
+
         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)]
         elif _is_in_pyinstaller():
@@ -115,16 +150,25 @@ 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 spec_str.startswith(
+                ("git+", "http://", "https://", "svn+", "hg+", "bzr+")
+            ):
+                keep.append(spec_str)
+                continue
+
             req = Requirement(spec_str)
             name = req.name.lower()
             cur_ver = installed.get(name)
@@ -150,7 +194,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]:
         """
@@ -165,18 +209,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.12.dist-info → xoscar-0.7.14.dist-info}/METADATA

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

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

@@ -78,10 +78,10 @@ xoscar/serialization/numpy.py,sha256=5Kem87CvpJmzUMp3QHk4WeHU30FoQWTJJP2SwIcaQG0
 xoscar/serialization/pyfury.py,sha256=sifOnVMYoS82PzZEkzkfxesmMHei23k5UAUUKUyoOYQ,1163
 xoscar/serialization/scipy.py,sha256=yOEi0NB8cqQ6e2UnCZ1w006RsB7T725tIL-DM_hNcsU,2482
 xoscar/virtualenv/__init__.py,sha256=65t9_X1DvbanNjFy366SiiWZrRTpa9SXWMXPmqayE-4,1117
-xoscar/virtualenv/core.py,sha256=qHKqI6R92SN0_OWVAX1xy9wJiZr-r0VfLHTskZtZE4U,2851
+xoscar/virtualenv/core.py,sha256=MV1lbkixGl45REHS04uaPuqPKxyVbBmVnB_umuR_eWw,2957
 xoscar/virtualenv/utils.py,sha256=mL_uATHhj82xec0-0IZ6N8yI-laPAB4t8G3alPUGtPA,2439
-xoscar/virtualenv/uv.py,sha256=PWq5Ht-uFOrwyKGF0bGZzZiuJUvGmr_OZADzRSfLKfk,9322
-xoscar-0.7.12.dist-info/METADATA,sha256=fNJZZhysdC6gdYZ67SfKjoIlNsse08kV5978cNQmnyo,9135
-xoscar-0.7.12.dist-info/WHEEL,sha256=SqeGUsDS88JbDMFEmg5kozXLxkaYruG6PG7xezonLcQ,154
-xoscar-0.7.12.dist-info/top_level.txt,sha256=vYlqqY4Nys8Thm1hePIuUv8eQePdULVWMmt7lXtX_ZA,21
-xoscar-0.7.12.dist-info/RECORD,,
+xoscar/virtualenv/uv.py,sha256=8fsZtUfMfSI1FZL7eLMfF-znG7fGVwshdERiHqSvems,11119
+xoscar-0.7.14.dist-info/METADATA,sha256=bTouvWumRWQDRY1ApYh9XVZ7HthHSUa8ctv-___IW6U,9135
+xoscar-0.7.14.dist-info/WHEEL,sha256=SqeGUsDS88JbDMFEmg5kozXLxkaYruG6PG7xezonLcQ,154
+xoscar-0.7.14.dist-info/top_level.txt,sha256=vYlqqY4Nys8Thm1hePIuUv8eQePdULVWMmt7lXtX_ZA,21
+xoscar-0.7.14.dist-info/RECORD,,