comfy-env 0.0.35__tar.gz → 0.0.37__tar.gz

{comfy_env-0.0.35 → comfy_env-0.0.37}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: comfy-env
-Version: 0.0.35
+Version: 0.0.37
 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.35 → comfy_env-0.0.37}/pyproject.toml

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

{comfy_env-0.0.35 → comfy_env-0.0.37}/src/comfy_env/install.py

@@ -484,19 +484,31 @@ def _install_cuda_package(
             else:
                 pkg_spec = f"{package}=={version}" if version else package
             log(f"  Installing {package} (index)...")
-            # Try to resolve exact wheel URL from index
-            actual_version = resolved_version if "version_template" in config else version
-            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)
+
+            # Resolve version: use provided version, default_version, or None
+            effective_version = version if version and version != "*" else config.get("default_version")
+
+            # Check for wheel_template first (direct URL construction, no index parsing)
+            if "wheel_template" in config and effective_version:
+                vars_dict = env.as_dict()
+                vars_dict["version"] = effective_version
+                wheel_url = _substitute_template(config["wheel_template"], vars_dict)
                 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)
+                # Try to resolve exact wheel URL from index
+                actual_version = resolved_version if "version_template" in config else version
+                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:
+                    raise InstallError(
+                        f"Failed to resolve wheel URL for {package} from index {index_url}. "
+                        "No matching wheel found and PyPI fallback is disabled.",
+                    )
 
         elif method == "github_index":
             # GitHub Pages index - try to resolve exact wheel URL first

{comfy_env-0.0.35 → comfy_env-0.0.37}/src/comfy_env/stubs/folder_paths.py

@@ -11,7 +11,7 @@ from pathlib import Path
 _comfyui_base = None
 
 def _find_comfyui_base():
-    """Find ComfyUI base from COMFYUI_BASE env var or by walking up."""
+    """Find ComfyUI base from COMFYUI_BASE env var, child dirs, or by walking up."""
     global _comfyui_base
     if _comfyui_base:
         return _comfyui_base
@@ -21,8 +21,18 @@ def _find_comfyui_base():
         _comfyui_base = Path(os.environ["COMFYUI_BASE"])
         return _comfyui_base
 
+    # Check common child directories (for test environments)
+    # Also check parent's children (isolated venv is sibling to .comfy-test-env)
+    cwd = Path.cwd().resolve()
+    for base in [cwd, cwd.parent]:
+        for child in [".comfy-test-env/ComfyUI", "ComfyUI"]:
+            candidate = base / child
+            if (candidate / "main.py").exists() and (candidate / "comfy").exists():
+                _comfyui_base = candidate
+                return _comfyui_base
+
     # Walk up from cwd looking for ComfyUI
-    current = Path.cwd().resolve()
+    current = cwd
     for _ in range(10):
         if (current / "main.py").exists() and (current / "comfy").exists():
             _comfyui_base = current

{comfy_env-0.0.35 → comfy_env-0.0.37}/src/comfy_env/wheel_sources.yml

@@ -56,6 +56,7 @@ packages:
     method: index
     index_url: "https://miropsota.github.io/torch_packages_builder/pytorch3d/"
     wheel_template: "https://miropsota.github.io/torch_packages_builder/pytorch3d/pytorch3d-{version}%2Bpt{torch_version}cu{cuda_short}-{py_tag}-{py_tag}-{platform}.whl"
+    default_version: "0.7.9"
     description: PyTorch3D - 3D deep learning library
 
   # ===========================================================================

{comfy_env-0.0.35 → comfy_env-0.0.37}/src/comfy_env/workers/venv.py

@@ -594,7 +594,16 @@ class PersistentVenvWorker(Worker):
         self._worker_script.write_text(_PERSISTENT_WORKER_SCRIPT)
 
     def _find_comfyui_base(self) -> Optional[Path]:
-        """Find ComfyUI base directory by walking up from working_dir."""
+        """Find ComfyUI base directory."""
+        # Check common child directories (for test environments)
+        # Also check parent's children (isolated venv is sibling to .comfy-test-env)
+        for base in [self.working_dir, self.working_dir.parent]:
+            for child in [".comfy-test-env/ComfyUI", "ComfyUI"]:
+                candidate = base / child
+                if (candidate / "main.py").exists() and (candidate / "comfy").exists():
+                    return candidate
+
+        # Walk up from working_dir (standard ComfyUI custom_nodes layout)
         current = self.working_dir.resolve()
         for _ in range(10):
             if (current / "main.py").exists() and (current / "comfy").exists():