comfy-env 0.0.35__py3-none-any.whl → 0.0.37__py3-none-any.whl

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/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/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/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():

{comfy_env-0.0.35.dist-info → comfy_env-0.0.37.dist-info}/METADATA

@@ -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.dist-info → comfy_env-0.0.37.dist-info}/RECORD

@@ -3,7 +3,7 @@ comfy_env/cli.py,sha256=X-GCQMP0mtMcE3ZgkT-VLQ4Gq3UUvcb_Ux_NClEFhgI,15975
 comfy_env/decorator.py,sha256=6JCKwLHaZtOLVDexs_gh_-NtS2ZK0V7nGCPqkyeYEAA,16688
 comfy_env/errors.py,sha256=8hN8NDlo8oBUdapc-eT3ZluigI5VBzfqsSBvQdfWlz4,9943
 comfy_env/index_resolver.py,sha256=D8BttTJ7BOiukUvmdT6_dGdzFV3CahGL2m28X-HwPeE,4650
-comfy_env/install.py,sha256=eS3Q8T9bFP4AH2PfqLmjqWA8cu8vJsg02aXBTP5x1IQ,30446
+comfy_env/install.py,sha256=SeYcnvFErBpAvTMG1L02PMKt39yrD_9WHGiFfaJ_igA,31172
 comfy_env/nodes.py,sha256=CWUe35jU5SKk4ur-SddZePdqWgxJDlxGhpcJiu5pAK4,4354
 comfy_env/pixi.py,sha256=y25mUDhB3bCqhPMGF0h23Tf8ZHykK4gLJrkvOhsPWmE,14398
 comfy_env/registry.py,sha256=uFCtGmWYvwGCqObXgzmArX7o5JsFNsHXxayofk3m6no,2569
@@ -27,16 +27,16 @@ comfy_env/ipc/torch_bridge.py,sha256=WzdwDJa3N_1fEl9OeZxikvMbwryO5P63o0WmEDpS18A
 comfy_env/ipc/transport.py,sha256=XQlRcfQsd4nd909KIYnZKvsS3ksGpGjyVucn8jvmLIU,9698
 comfy_env/ipc/worker.py,sha256=oxTLF9xXrl8CRx_JVNBdkxZh35NuzfkdxhaUtUuXogs,6661
 comfy_env/stubs/__init__.py,sha256=jMeWEKY30y8QqYX9AUyuZbmm607erQTc4N7YaDoAH00,38
-comfy_env/stubs/folder_paths.py,sha256=Pv30qHeHBmfK5icIpmXnTGvZkRMJHDrTh9mQ1WMclLg,1713
+comfy_env/stubs/folder_paths.py,sha256=K90J34EG6LD4eZP8YG-xMeBmqwpp_wA8E92DKMXd1GQ,2189
 comfy_env/workers/__init__.py,sha256=IKZwOvrWOGqBLDUIFAalg4CdqzJ_YnAdxo2Ha7gZTJ0,1467
 comfy_env/workers/base.py,sha256=ZILYXlvGCWuCZXmjKqfG8VeD19ihdYaASdlbasl2BMo,2312
 comfy_env/workers/pool.py,sha256=MtjeOWfvHSCockq8j1gfnxIl-t01GSB79T5N4YB82Lg,6956
 comfy_env/workers/tensor_utils.py,sha256=TCuOAjJymrSbkgfyvcKtQ_KbVWTqSwP9VH_bCaFLLq8,6409
 comfy_env/workers/torch_mp.py,sha256=4YSNPn7hALrvMVbkO4RkTeFTcc0lhfLMk5QTWjY4PHw,22134
-comfy_env/workers/venv.py,sha256=_ekHfZPqBIPY08DjqiXm6cTBQH4DrbxRWR3AAv3mit8,31589
-comfy_env/wheel_sources.yml,sha256=bPUOez9puILIh28FBWSacgiK9bx03aUwwZqLaWE6PqA,8978
-comfy_env-0.0.35.dist-info/METADATA,sha256=jFl8nMSZjewzGmHEIu0XlH-m1g75oy2igVP9adUpX3c,5400
-comfy_env-0.0.35.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-comfy_env-0.0.35.dist-info/entry_points.txt,sha256=J4fXeqgxU_YenuW_Zxn_pEL7J-3R0--b6MS5t0QmAr0,49
-comfy_env-0.0.35.dist-info/licenses/LICENSE,sha256=E68QZMMpW4P2YKstTZ3QU54HRQO8ecew09XZ4_Vn870,1093
-comfy_env-0.0.35.dist-info/RECORD,,
+comfy_env/workers/venv.py,sha256=PmsVOu5i89tBYkGRupo2bjOLPBmk06q4GNUwDWsd9F8,32088
+comfy_env/wheel_sources.yml,sha256=WHSSgbEXDKgRdJAi5FKiEU0l5dFxP_1p4JThc1bbqj8,9007
+comfy_env-0.0.37.dist-info/METADATA,sha256=R3q3cGBk8UxTqwtBBp4RqyozCkO_k8_0wy0qhNMhI9A,5400
+comfy_env-0.0.37.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+comfy_env-0.0.37.dist-info/entry_points.txt,sha256=J4fXeqgxU_YenuW_Zxn_pEL7J-3R0--b6MS5t0QmAr0,49
+comfy_env-0.0.37.dist-info/licenses/LICENSE,sha256=E68QZMMpW4P2YKstTZ3QU54HRQO8ecew09XZ4_Vn870,1093
+comfy_env-0.0.37.dist-info/RECORD,,