comfy-env 0.0.42__tar.gz → 0.0.44__tar.gz

{comfy_env-0.0.42 → comfy_env-0.0.44}/PKG-INFO

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

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

{comfy_env-0.0.42 → comfy_env-0.0.44}/src/comfy_env/env/manager.py

@@ -383,13 +383,19 @@ class IsolatedEnvManager:
 
                 if "wheel_template" in config:
                     # Direct wheel URL from template
-                    effective_version = version or config.get("default_version")
-                    if not effective_version:
-                        raise RuntimeError(f"Package {package} requires version (no default in registry)")
-
-                    vars_dict["version"] = effective_version
-                    wheel_url = self._substitute_template(config["wheel_template"], vars_dict)
-                    self.log(f"  Installing {package}=={effective_version}...")
+                    template = config["wheel_template"]
+
+                    # Only require version if template uses {version}
+                    effective_version = None
+                    if "{version}" in template:
+                        effective_version = version or config.get("default_version")
+                        if not effective_version:
+                            raise RuntimeError(f"Package {package} requires version (no default in registry)")
+                        vars_dict["version"] = effective_version
+
+                    wheel_url = self._substitute_template(template, vars_dict)
+                    version_str = f"=={effective_version}" if effective_version else ""
+                    self.log(f"  Installing {package}{version_str}...")
                     self.log(f"    URL: {wheel_url}")
                     result = subprocess.run(
                         pip_args + ["--no-deps", wheel_url],
@@ -398,6 +404,19 @@ class IsolatedEnvManager:
                     if result.returncode != 0:
                         raise RuntimeError(f"Failed to install {package}: {result.stderr}")
 
+                elif "find_links" in config:
+                    # find_links: pip resolves wheel from index URL
+                    find_links_url = config["find_links"]
+                    effective_version = version or config.get("default_version")
+                    pkg_spec = f"{package}=={effective_version}" if effective_version else package
+                    self.log(f"  Installing {pkg_spec} from {find_links_url}...")
+                    result = subprocess.run(
+                        pip_args + ["--no-deps", "--find-links", find_links_url, pkg_spec],
+                        capture_output=True, text=True,
+                    )
+                    if result.returncode != 0:
+                        raise RuntimeError(f"Failed to install {package}: {result.stderr}")
+
                 elif "package_name" in config:
                     # PyPI variant (e.g., spconv-cu124)
                     pkg_name = self._substitute_template(config["package_name"], vars_dict)
@@ -411,7 +430,7 @@ class IsolatedEnvManager:
                         raise RuntimeError(f"Failed to install {package}: {result.stderr}")
 
                 else:
-                    raise RuntimeError(f"Package {package} in registry but missing wheel_template or package_name")
+                    raise RuntimeError(f"Package {package} in registry but missing wheel_template, find_links, or package_name")
 
             else:
                 # Not in registry - error

{comfy_env-0.0.42 → comfy_env-0.0.44}/src/comfy_env/install.py

@@ -310,7 +310,7 @@ def _install_local(
 
     cuda_packages = []
     for pkg, ver in local_config.cuda_packages.items():
-        if ver:
+        if ver and ver != "*":
             cuda_packages.append(f"{pkg}=={ver}")
         else:
             cuda_packages.append(pkg)
@@ -367,11 +367,25 @@ def _resolve_wheel_url(
 
         # wheel_template: direct URL
         if "wheel_template" in config:
+            template = config["wheel_template"]
+
+            # Only require version if template uses {version}
+            if "{version}" in template:
+                effective_version = version or config.get("default_version")
+                if not effective_version:
+                    raise InstallError(f"Package {package} requires version (no default in registry)")
+                vars_dict["version"] = effective_version
+
+            return _substitute_template(template, vars_dict)
+
+        # find_links: pip resolves wheel from index (e.g., miropsota's detectron2)
+        if "find_links" in config:
+            find_links_url = config["find_links"]
             effective_version = version or config.get("default_version")
-            if not effective_version:
-                raise InstallError(f"Package {package} requires version (no default in registry)")
-            vars_dict["version"] = effective_version
-            return _substitute_template(config["wheel_template"], vars_dict)
+            if effective_version:
+                return f"find_links:{find_links_url}:{package}=={effective_version}"
+            else:
+                return f"find_links:{find_links_url}:{package}"
 
         # package_name: PyPI variant (e.g., spconv-cu124)
         if "package_name" in config:
@@ -406,6 +420,11 @@ def _install_cuda_package(
         pkg_spec = f"{pkg_name}=={version}" if version else pkg_name
         log(f"  Installing {package} as {pkg_spec} from PyPI...")
         _pip_install([pkg_spec], no_deps=False, log=log)
+    elif url_or_marker.startswith("find_links:"):
+        # find_links: pip resolves from index URL
+        _, find_links_url, pkg_spec = url_or_marker.split(":", 2)
+        log(f"  Installing {pkg_spec} from {find_links_url}...")
+        _pip_install([pkg_spec, "--find-links", find_links_url], no_deps=True, log=log)
     else:
         # Direct wheel URL
         log(f"  Installing {package}...")
@@ -445,6 +464,9 @@ def _pip_install(
     pip_cmd = _get_pip_command()
 
     args = pip_cmd + ["install"]
+    # uv requires --system when not in a venv (CI environments)
+    if _is_using_uv():
+        args.append("--system")
     if no_deps:
         args.append("--no-deps")
     args.extend(packages)
@@ -469,6 +491,11 @@ def _get_pip_command() -> List[str]:
     return [sys.executable, "-m", "pip"]
 
 
+def _is_using_uv() -> bool:
+    """Check if we're using uv for pip commands."""
+    return shutil.which("uv") is not None
+
+
 def verify_installation(
     packages: List[str],
     log: Callable[[str], None] = print,

{comfy_env-0.0.42 → comfy_env-0.0.44}/src/comfy_env/wheel_sources.yml

@@ -25,85 +25,101 @@ packages:
   # ===========================================================================
   torch-scatter:
     wheel_template: "https://data.pyg.org/whl/torch-{torch_version}%2Bcu{cuda_short}/torch_scatter-{version}%2Bpt{torch_mm}cu{cuda_short}-{py_tag}-{py_tag}-{platform}.whl"
+    default_version: "2.1.2"
     description: Scatter operations for PyTorch
 
   torch-cluster:
     wheel_template: "https://data.pyg.org/whl/torch-{torch_version}%2Bcu{cuda_short}/torch_cluster-{version}%2Bpt{torch_mm}cu{cuda_short}-{py_tag}-{py_tag}-{platform}.whl"
+    default_version: "1.6.3"
     description: Clustering algorithms for PyTorch
 
   torch-sparse:
     wheel_template: "https://data.pyg.org/whl/torch-{torch_version}%2Bcu{cuda_short}/torch_sparse-{version}%2Bpt{torch_mm}cu{cuda_short}-{py_tag}-{py_tag}-{platform}.whl"
+    default_version: "0.6.18"
     description: Sparse tensor operations for PyTorch
 
   torch-spline-conv:
     wheel_template: "https://data.pyg.org/whl/torch-{torch_version}%2Bcu{cuda_short}/torch_spline_conv-{version}%2Bpt{torch_mm}cu{cuda_short}-{py_tag}-{py_tag}-{platform}.whl"
+    default_version: "1.2.2"
     description: Spline convolutions for PyTorch
 
   # ===========================================================================
-  # PozzettiAndrea cuda-wheels (unified PEP 503 index)
-  # https://pozzettiandrea.github.io/cuda-wheels
+  # PozzettiAndrea cuda-wheels (GitHub releases)
+  # https://github.com/PozzettiAndrea/cuda-wheels/releases
   # ===========================================================================
   pytorch3d:
-    wheel_template: "https://pozzettiandrea.github.io/cuda-wheels/pytorch3d/pytorch3d-{version}%2Bcu{cuda_short}torch{torch_mm}-{py_tag}-{py_tag}-{platform}.whl"
+    wheel_template: "https://github.com/PozzettiAndrea/cuda-wheels/releases/download/pytorch3d-latest/pytorch3d-{version}%2Bcu{cuda_short}torch{torch_mm}-{py_tag}-{py_tag}-{platform}.whl"
     default_version: "0.7.9"
     description: PyTorch3D - 3D deep learning library
 
   nvdiffrast:
-    wheel_template: "https://pozzettiandrea.github.io/cuda-wheels/nvdiffrast/nvdiffrast-{version}%2Bcu{cuda_short}torch{torch_mm}-{py_tag}-{py_tag}-{platform}.whl"
+    wheel_template: "https://github.com/PozzettiAndrea/cuda-wheels/releases/download/nvdiffrast-latest/nvdiffrast-{version}%2Bcu{cuda_short}torch{torch_mm}-{py_tag}-{py_tag}-{platform}.whl"
+    default_version: "0.4.0"
     description: NVIDIA differentiable rasterizer
 
   cumesh:
-    wheel_template: "https://pozzettiandrea.github.io/cuda-wheels/cumesh/cumesh-{version}%2Bcu{cuda_short}torch{torch_mm}-{py_tag}-{py_tag}-{platform}.whl"
+    wheel_template: "https://github.com/PozzettiAndrea/cuda-wheels/releases/download/cumesh-latest/cumesh-{version}%2Bcu{cuda_short}torch{torch_mm}-{py_tag}-{py_tag}-{platform}.whl"
+    default_version: "0.0.1"
     description: CUDA-accelerated mesh utilities
 
   cubvh:
-    wheel_template: "https://pozzettiandrea.github.io/cuda-wheels/cubvh/cubvh-{version}%2Bcu{cuda_short}torch{torch_mm}-{py_tag}-{py_tag}-{platform}.whl"
+    wheel_template: "https://github.com/PozzettiAndrea/cuda-wheels/releases/download/cubvh-latest/cubvh-{version}%2Bcu{cuda_short}torch{torch_mm}-{py_tag}-{py_tag}-{platform}.whl"
+    default_version: "0.1.2"
     description: CUDA BVH acceleration for mesh operations and marching cubes
 
   o_voxel:
-    wheel_template: "https://pozzettiandrea.github.io/cuda-wheels/o-voxel/o_voxel-{version}%2Bcu{cuda_short}torch{torch_mm}-{py_tag}-{py_tag}-{platform}.whl"
+    wheel_template: "https://github.com/PozzettiAndrea/cuda-wheels/releases/download/o_voxel-latest/o_voxel-{version}%2Bcu{cuda_short}torch{torch_mm}-{py_tag}-{py_tag}-{platform}.whl"
+    default_version: "0.0.1"
     description: O-Voxel CUDA extension for TRELLIS
 
   flex_gemm:
-    wheel_template: "https://pozzettiandrea.github.io/cuda-wheels/flex-gemm/flex_gemm-{version}%2Bcu{cuda_short}torch{torch_mm}-{py_tag}-{py_tag}-{platform}.whl"
+    wheel_template: "https://github.com/PozzettiAndrea/cuda-wheels/releases/download/flex_gemm-latest/flex_gemm-{version}%2Bcu{cuda_short}torch{torch_mm}-{py_tag}-{py_tag}-{platform}.whl"
+    default_version: "1.0.0"
     description: Flexible GEMM operations
 
   nvdiffrec_render:
-    wheel_template: "https://pozzettiandrea.github.io/cuda-wheels/nvdiffrec-render/nvdiffrec_render-{version}%2Bcu{cuda_short}torch{torch_mm}-{py_tag}-{py_tag}-{platform}.whl"
+    wheel_template: "https://github.com/PozzettiAndrea/cuda-wheels/releases/download/nvdiffrec_render-latest/nvdiffrec_render-{version}%2Bcu{cuda_short}torch{torch_mm}-{py_tag}-{py_tag}-{platform}.whl"
+    default_version: "0.0.1"
     description: NVDiffRec rendering utilities
 
   gsplat:
-    wheel_template: "https://pozzettiandrea.github.io/cuda-wheels/gsplat/gsplat-{version}%2Bcu{cuda_short}torch{torch_mm}-{py_tag}-{py_tag}-{platform}.whl"
+    wheel_template: "https://github.com/PozzettiAndrea/cuda-wheels/releases/download/gsplat-latest/gsplat-{version}%2Bcu{cuda_short}torch{torch_mm}-{py_tag}-{py_tag}-{platform}.whl"
+    default_version: "1.5.3"
     description: Gaussian splatting rasterization
 
   cc_torch:
-    wheel_template: "https://pozzettiandrea.github.io/cuda-wheels/cc-torch/cc_torch-{version}%2Bcu{cuda_short}torch{torch_mm}-{py_tag}-{py_tag}-{platform}.whl"
+    wheel_template: "https://github.com/PozzettiAndrea/cuda-wheels/releases/download/cc_torch-latest/cc_torch-{version}%2Bcu{cuda_short}torch{torch_mm}-{py_tag}-{py_tag}-{platform}.whl"
+    default_version: "0.2"
     description: GPU-accelerated connected components
 
   torch_generic_nms:
-    wheel_template: "https://pozzettiandrea.github.io/cuda-wheels/torch-generic-nms/torch_generic_nms-{version}%2Bcu{cuda_short}torch{torch_mm}-{py_tag}-{py_tag}-{platform}.whl"
+    wheel_template: "https://github.com/PozzettiAndrea/cuda-wheels/releases/download/torch_generic_nms-latest/torch_generic_nms-{version}%2Bcu{cuda_short}torch{torch_mm}-{py_tag}-{py_tag}-{platform}.whl"
+    default_version: "0.1"
     description: GPU-accelerated Non-Maximum Suppression
 
   lietorch:
-    wheel_template: "https://pozzettiandrea.github.io/cuda-wheels/lietorch/lietorch-{version}%2Bcu{cuda_short}torch{torch_mm}-{py_tag}-{py_tag}-{platform}.whl"
+    wheel_template: "https://github.com/PozzettiAndrea/cuda-wheels/releases/download/lietorch-latest/lietorch-{version}%2Bcu{cuda_short}torch{torch_mm}-{py_tag}-{py_tag}-{platform}.whl"
+    default_version: "0.3"
     description: Lie group operations for PyTorch (DPVO dependency)
 
-  dpvo-cuda:
-    wheel_template: "https://pozzettiandrea.github.io/cuda-wheels/dpvo_cuda/dpvo_cuda-{version}%2Bcu{cuda_short}torch{torch_mm}-{py_tag}-{py_tag}-{platform}.whl"
-    default_version: "1.0.0"
-    description: DPVO CUDA extensions (cuda_corr, cuda_ba, lietorch_backends)
-
   sageattention:
-    wheel_template: "https://pozzettiandrea.github.io/cuda-wheels/sageattention/sageattention-{version}%2Bcu{cuda_short}torch{torch_mm}-{py_tag}-{py_tag}-{platform}.whl"
+    wheel_template: "https://github.com/PozzettiAndrea/cuda-wheels/releases/download/sageattention-latest/sageattention-{version}%2Bcu{cuda_short}torch{torch_mm}-{py_tag}-{py_tag}-{platform}.whl"
+    default_version: "2.2.0"
     description: SageAttention - 2-5x faster than FlashAttention with quantized kernels
 
+  dpvo_cuda:
+    wheel_template: "https://github.com/PozzettiAndrea/cuda-wheels/releases/download/dpvo_cuda-latest/dpvo_cuda-{version}%2Bcu{cuda_short}torch{torch_mm}-{py_tag}-{py_tag}-{platform}.whl"
+    default_version: "0.0.0"
+    description: DPVO CUDA extensions (cuda_corr, cuda_ba, lietorch_backends) - torch 2.4 only
+
   # ===========================================================================
   # detectron2 - Facebook's detection library
   # https://github.com/facebookresearch/detectron2
   # Prebuilt wheels from miropsota's torch_packages_builder
   # ===========================================================================
   detectron2:
-    wheel_template: "https://miropsota.github.io/torch_packages_builder/detectron2/detectron2-0.6%2B2a420edpt{torch_version}cu{cuda_short}-{py_tag}-{py_tag}-{platform}.whl"
+    find_links: "https://miropsota.github.io/torch_packages_builder/detectron2/"
+    default_version: "0.6"
     description: Detectron2 - Facebook's detection and segmentation library
 
   # ===========================================================================
@@ -120,5 +136,6 @@ packages:
   # Note: This uses a special package_name field, not wheel_template
   # ===========================================================================
   spconv:
-    package_name: "spconv-cu{cuda_short2}"
-    description: Sparse convolution library (installs spconv-cu124, spconv-cu126, etc.)
+    wheel_template: "https://github.com/PozzettiAndrea/cuda-wheels/releases/download/spconv_cu{cuda_short}-latest/spconv-{version}%2Bcu{cuda_short}torch{torch_mm}-{py_tag}-{py_tag}-{platform}.whl"
+    default_version: "2.3.8"
+    description: Sparse convolution library