comfy-env 0.0.43__py3-none-any.whl → 0.0.44__py3-none-any.whl

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/install.py

@@ -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}...")

comfy_env/wheel_sources.yml

@@ -25,18 +25,22 @@ 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
 
   # ===========================================================================
@@ -114,7 +118,8 @@ packages:
   # 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
 
   # ===========================================================================
@@ -131,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

{comfy_env-0.0.43.dist-info → comfy_env-0.0.44.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: comfy-env
-Version: 0.0.43
+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.43.dist-info → comfy_env-0.0.44.dist-info}/RECORD

@@ -2,7 +2,7 @@ comfy_env/__init__.py,sha256=OQJFNjmArjLcgrfHAFxgDJQFH_IhxibqMXbU5bu_j9Q,3822
 comfy_env/cli.py,sha256=hZv_oJsmaMoG62Fr2Fjp778P_32BHr4fzS7G4lULSwU,13153
 comfy_env/decorator.py,sha256=6JCKwLHaZtOLVDexs_gh_-NtS2ZK0V7nGCPqkyeYEAA,16688
 comfy_env/errors.py,sha256=8hN8NDlo8oBUdapc-eT3ZluigI5VBzfqsSBvQdfWlz4,9943
-comfy_env/install.py,sha256=lKkW55mDLut3zpJOUgjAi-BdLluBRPN-bblONHjo-Ws,16595
+comfy_env/install.py,sha256=m4NKlfCcQGI5xzVRjHw3ep-lWbqx5kE1e21sUUZ2Leo,17528
 comfy_env/nodes.py,sha256=CWUe35jU5SKk4ur-SddZePdqWgxJDlxGhpcJiu5pAK4,4354
 comfy_env/pixi.py,sha256=y25mUDhB3bCqhPMGF0h23Tf8ZHykK4gLJrkvOhsPWmE,14398
 comfy_env/registry.py,sha256=w-QwvAPFlCrBYRAv4cXkp2zujQPZn8Fk5DUxKCtox8o,3430
@@ -11,7 +11,7 @@ comfy_env/env/__init__.py,sha256=imQdoQEQvrRT-QDtyNpFlkVbm2fBzgACdpQwRPd09fI,115
 comfy_env/env/config.py,sha256=Ila-5Yal3bj6jENbBeYJlZtkbgdwnzJzImVZK3ZF1lg,7645
 comfy_env/env/config_file.py,sha256=HzFKeQh9zQ--K1V-XuvgE6DiE_bYrXrChL1ZT8Tzlq4,24684
 comfy_env/env/cuda_gpu_detection.py,sha256=YLuXUdWg6FeKdNyLlQAHPlveg4rTenXJ2VbeAaEi9QE,9755
-comfy_env/env/manager.py,sha256=eDcrtJeNrW3jYb0q0R_DmUfAYjGo5Cs4BMuZUxWEzeg,21789
+comfy_env/env/manager.py,sha256=C-lniAu1dhgUViNtl-78c7ZkiQMnbsaUGpIVi51Uzw8,22909
 comfy_env/env/security.py,sha256=dNSitAnfBNVdvxgBBntYw33AJaCs_S1MHb7KJhAVYzM,8171
 comfy_env/env/platform/__init__.py,sha256=Nb5MPZIEeanSMEWwqU4p4bnEKTJn1tWcwobnhq9x9IY,614
 comfy_env/env/platform/base.py,sha256=iS0ptTTVjXRwPU4qWUdvHI7jteuzxGSjWr5BUQ7hGiU,2453
@@ -36,9 +36,9 @@ comfy_env/workers/pool.py,sha256=MtjeOWfvHSCockq8j1gfnxIl-t01GSB79T5N4YB82Lg,695
 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=PmsVOu5i89tBYkGRupo2bjOLPBmk06q4GNUwDWsd9F8,32088
-comfy_env/wheel_sources.yml,sha256=07-ruJ7HHGtXJUs7rDmud8X6OsBcfogZKG6cyU7Gacg,7950
-comfy_env-0.0.43.dist-info/METADATA,sha256=HzyWA3jqZjM9YsoFQEhZkHMTB8b8agepqMvo2YkOQY8,7138
-comfy_env-0.0.43.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-comfy_env-0.0.43.dist-info/entry_points.txt,sha256=J4fXeqgxU_YenuW_Zxn_pEL7J-3R0--b6MS5t0QmAr0,49
-comfy_env-0.0.43.dist-info/licenses/LICENSE,sha256=E68QZMMpW4P2YKstTZ3QU54HRQO8ecew09XZ4_Vn870,1093
-comfy_env-0.0.43.dist-info/RECORD,,
+comfy_env/wheel_sources.yml,sha256=M9Z3PPJrimV_B4tRRmZ8o_z6phZanJY_iEcjfMimtZw,8141
+comfy_env-0.0.44.dist-info/METADATA,sha256=6FS6i66IxVfnZafLY1Dyte4wc5dKM4CLt2pZho2_S18,7138
+comfy_env-0.0.44.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+comfy_env-0.0.44.dist-info/entry_points.txt,sha256=J4fXeqgxU_YenuW_Zxn_pEL7J-3R0--b6MS5t0QmAr0,49
+comfy_env-0.0.44.dist-info/licenses/LICENSE,sha256=E68QZMMpW4P2YKstTZ3QU54HRQO8ecew09XZ4_Vn870,1093
+comfy_env-0.0.44.dist-info/RECORD,,