comfy-env 0.0.32__tar.gz → 0.0.34__tar.gz

{comfy_env-0.0.32 → comfy_env-0.0.34}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: comfy-env
-Version: 0.0.32
+Version: 0.0.34
 Summary: Environment management for ComfyUI custom nodes - CUDA wheel resolution and process isolation
 Project-URL: Homepage, https://github.com/PozzettiAndrea/comfy-env
 Project-URL: Repository, https://github.com/PozzettiAndrea/comfy-env

{comfy_env-0.0.32 → comfy_env-0.0.34}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "comfy-env"
-version = "0.0.32"
+version = "0.0.34"
 description = "Environment management for ComfyUI custom nodes - CUDA wheel resolution and process isolation"
 readme = "README.md"
 license = {text = "MIT"}

{comfy_env-0.0.32 → comfy_env-0.0.34}/src/comfy_env/env/manager.py

@@ -386,20 +386,26 @@ class IsolatedEnvManager:
                 self.log(f"  Installing {package} ({method})...")
 
                 if method == "index":
-                    # PEP 503 index - use --extra-index-url
+                    # PEP 503 index - try to resolve exact wheel URL first
                     index_url = self._substitute_template(config["index_url"], vars_dict)
                     pkg_spec = f"{package}=={version}" if version else package
                     # Try to resolve exact wheel URL from index
                     wheel_url = resolve_wheel_from_index(index_url, package, vars_dict, version)
                     if wheel_url:
+                        # Install from resolved URL directly (guarantees we get what we resolved)
                         self.log(f"    Wheel: {wheel_url}")
+                        result = subprocess.run(
+                            pip_args + ["--no-deps", wheel_url],
+                            capture_output=True, text=True,
+                        )
                     else:
+                        # Fallback to index-based resolution
                         self.log(f"    Index: {index_url}")
                         self.log(f"    Package: {pkg_spec}")
-                    result = subprocess.run(
-                        pip_args + ["--extra-index-url", index_url, "--no-deps", pkg_spec],
-                        capture_output=True, text=True,
-                    )
+                        result = subprocess.run(
+                            pip_args + ["--extra-index-url", index_url, "--no-deps", pkg_spec],
+                            capture_output=True, text=True,
+                        )
 
                 elif method in ("github_index", "find_links"):
                     # GitHub Pages or generic find-links
@@ -408,14 +414,20 @@ class IsolatedEnvManager:
                     # Try to resolve exact wheel URL from find-links page
                     wheel_url = resolve_wheel_from_index(index_url, package, vars_dict, version)
                     if wheel_url:
+                        # Install from resolved URL directly (guarantees we get what we resolved)
                         self.log(f"    Wheel: {wheel_url}")
+                        result = subprocess.run(
+                            pip_args + ["--no-deps", wheel_url],
+                            capture_output=True, text=True,
+                        )
                     else:
+                        # Fallback to find-links based resolution
                         self.log(f"    Find-links: {index_url}")
                         self.log(f"    Package: {pkg_spec}")
-                    result = subprocess.run(
-                        pip_args + ["--find-links", index_url, "--no-deps", pkg_spec],
-                        capture_output=True, text=True,
-                    )
+                        result = subprocess.run(
+                            pip_args + ["--find-links", index_url, "--no-deps", pkg_spec],
+                            capture_output=True, text=True,
+                        )
 
                 elif method == "pypi_variant":
                     # Transform package name based on CUDA version

{comfy_env-0.0.32 → comfy_env-0.0.34}/src/comfy_env/install.py

@@ -475,7 +475,7 @@ def _install_cuda_package(
         method = config["method"]
 
         if method == "index":
-            # PEP 503 index - use pip --extra-index-url
+            # PEP 503 index - try to resolve exact wheel URL first
             index_url = _substitute_template(config["index_url"], env)
             # Check for version_template (e.g., detectron2 with embedded torch/cuda version)
             if "version_template" in config:
@@ -489,14 +489,17 @@ def _install_cuda_package(
             vars_dict = env.as_dict()
             wheel_url = resolve_wheel_from_index(index_url, package, vars_dict, actual_version)
             if wheel_url:
+                # Install from resolved URL directly (guarantees we get what we resolved)
                 log(f"    Wheel: {wheel_url}")
+                _pip_install([wheel_url], no_deps=True, log=log)
             else:
+                # Fallback to index-based resolution
                 log(f"    Index: {index_url}")
                 log(f"    Package: {pkg_spec}")
-            _pip_install_with_index(pkg_spec, index_url, log)
+                _pip_install_with_index(pkg_spec, index_url, log)
 
         elif method == "github_index":
-            # GitHub Pages index - use pip --find-links
+            # GitHub Pages index - try to resolve exact wheel URL first
             index_url = _substitute_template(config["index_url"], env)
             pkg_spec = f"{package}=={version}" if version else package
             log(f"  Installing {package} (github_index)...")
@@ -504,14 +507,17 @@ def _install_cuda_package(
             vars_dict = env.as_dict()
             wheel_url = resolve_wheel_from_index(index_url, package, vars_dict, version)
             if wheel_url:
+                # Install from resolved URL directly (guarantees we get what we resolved)
                 log(f"    Wheel: {wheel_url}")
+                _pip_install([wheel_url], no_deps=True, log=log)
             else:
+                # Fallback to find-links based resolution
                 log(f"    Find-links: {index_url}")
                 log(f"    Package: {pkg_spec}")
-            _pip_install_with_find_links(pkg_spec, index_url, log)
+                _pip_install_with_find_links(pkg_spec, index_url, log)
 
         elif method == "find_links":
-            # Generic find-links (e.g., PyG) - use pip --find-links
+            # Generic find-links (e.g., PyG) - try to resolve exact wheel URL first
             index_url = _substitute_template(config["index_url"], env)
             pkg_spec = f"{package}=={version}" if version else package
             log(f"  Installing {package} (find_links)...")
@@ -519,11 +525,14 @@ def _install_cuda_package(
             vars_dict = env.as_dict()
             wheel_url = resolve_wheel_from_index(index_url, package, vars_dict, version)
             if wheel_url:
+                # Install from resolved URL directly (guarantees we get what we resolved)
                 log(f"    Wheel: {wheel_url}")
+                _pip_install([wheel_url], no_deps=True, log=log)
             else:
+                # Fallback to find-links based resolution
                 log(f"    Find-links: {index_url}")
                 log(f"    Package: {pkg_spec}")
-            _pip_install_with_find_links(pkg_spec, index_url, log)
+                _pip_install_with_find_links(pkg_spec, index_url, log)
 
         elif method == "pypi_variant":
             # Transform package name based on CUDA version

{comfy_env-0.0.32 → comfy_env-0.0.34}/src/comfy_env/pixi.py

@@ -276,6 +276,7 @@ def create_pixi_toml(
 
 def clean_pixi_artifacts(
     node_dir: Path,
+    env_name: Optional[str] = None,
     log: Callable[[str], None] = print,
 ) -> None:
     """
@@ -286,6 +287,7 @@ def clean_pixi_artifacts(
 
     Args:
         node_dir: Directory containing the pixi artifacts.
+        env_name: Environment name (for removing _env_ symlink).
         log: Logging callback.
     """
     pixi_toml = node_dir / "pixi.toml"
@@ -302,6 +304,13 @@ def clean_pixi_artifacts(
         shutil.rmtree(pixi_dir)
         log("  Removed previous .pixi/ directory")
 
+    # Remove _env_ symlink if it exists
+    if env_name:
+        symlink_path = node_dir / f"_env_{env_name}"
+        if symlink_path.is_symlink():
+            symlink_path.unlink()
+            log(f"  Removed previous _env_{env_name} symlink")
+
 
 def pixi_install(
     env_config: IsolatedEnv,
@@ -344,7 +353,7 @@ def pixi_install(
         return True
 
     # Clean previous pixi artifacts
-    clean_pixi_artifacts(node_dir, log)
+    clean_pixi_artifacts(node_dir, env_config.name, log)
 
     # Ensure pixi is installed
     pixi_path = ensure_pixi(log=log)
@@ -373,6 +382,22 @@ def pixi_install(
                 log(f"  {line}")
 
     log("pixi install completed successfully!")
+
+    # Create _env_{name} symlink for compatibility with uv backend
+    # This ensures code that expects _env_envname/bin/python works with pixi
+    symlink_path = node_dir / f"_env_{env_config.name}"
+    pixi_env_path = node_dir / ".pixi" / "envs" / "default"
+
+    if pixi_env_path.exists():
+        # Remove existing symlink or directory if present
+        if symlink_path.is_symlink():
+            symlink_path.unlink()
+        elif symlink_path.exists():
+            shutil.rmtree(symlink_path)
+
+        symlink_path.symlink_to(pixi_env_path)
+        log(f"Created symlink: _env_{env_config.name} -> .pixi/envs/default")
+
     return True
 
 

{comfy_env-0.0.32 → comfy_env-0.0.34}/src/comfy_env/wheel_sources.yml

@@ -49,12 +49,12 @@ packages:
     description: Spline convolutions for PyTorch
 
   # ===========================================================================
-  # pytorch3d - Facebook's official wheels
-  # https://github.com/facebookresearch/pytorch3d/blob/main/INSTALL.md
+  # pytorch3d - MiroPsota's torch_packages_builder
+  # https://github.com/MiroPsota/torch_packages_builder
   # ===========================================================================
   pytorch3d:
     method: index
-    index_url: "https://dl.fbaipublicfiles.com/pytorch3d/packaging/wheels/py3{py_minor}_cu{cuda_short}_pyt{torch_short}/download.html"
+    index_url: "https://miropsota.github.io/torch_packages_builder/pytorch3d/"
     description: PyTorch3D - 3D deep learning library
 
   # ===========================================================================