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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: comfy-env
-Version: 0.0.32
+Version: 0.0.33
 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.33}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "comfy-env"
-version = "0.0.32"
+version = "0.0.33"
 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.33}/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.33}/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