comfy-env 0.0.65__tar.gz → 0.0.67__tar.gz

{comfy_env-0.0.65 → comfy_env-0.0.67}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: comfy-env
-Version: 0.0.65
+Version: 0.0.67
 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
@@ -17,7 +17,7 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Requires-Python: >=3.10
-Requires-Dist: pyyaml>=6.0
+Requires-Dist: tomli-w>=1.0.0
 Requires-Dist: tomli>=2.0.0; python_version < '3.11'
 Requires-Dist: uv>=0.4.0
 Provides-Extra: dev
@@ -68,8 +68,7 @@ Create a `comfy-env.toml` in your node directory:
 
 ```toml
 [cuda]
-nvdiffrast = "0.4.0"
-pytorch3d = "0.7.9"
+packages = ["nvdiffrast", "pytorch3d"]
 
 [packages]
 requirements = ["transformers>=4.56", "pillow"]
@@ -152,12 +151,6 @@ comfy-env install
 # Dry run (show what would be installed)
 comfy-env install --dry-run
 
-# Resolve wheel URLs without installing
-comfy-env resolve nvdiffrast==0.4.0
-
-# List all packages in the built-in registry
-comfy-env list-packages
-
 # Verify installation
 comfy-env doctor
 ```
@@ -167,11 +160,9 @@ comfy-env doctor
 ### Simple Format (comfy-env.toml)
 
 ```toml
-# CUDA packages (uses built-in registry)
+# CUDA packages from https://pozzettiandrea.github.io/cuda-wheels/
 [cuda]
-nvdiffrast = "0.4.0"
-pytorch3d = "0.7.9"
-torch-scatter = "2.1.2"
+packages = ["nvdiffrast", "pytorch3d", "torch-scatter"]
 
 # Regular pip packages
 [packages]
@@ -185,7 +176,7 @@ requirements = ["transformers>=4.56", "pillow"]
 linux = ["libgl1", "libopengl0"]  # apt packages
 
 [local.cuda]
-nvdiffrast = "0.4.0"
+packages = ["nvdiffrast"]
 
 [local.packages]
 requirements = ["pillow", "numpy"]
@@ -196,82 +187,32 @@ python = "3.10"
 cuda = "12.8"
 
 [myenv.cuda]
-torch-scatter = "2.1.2"
+packages = ["torch-scatter"]
 
 [myenv.packages]
 requirements = ["transformers>=4.56"]
-
-# Custom wheel templates (override built-in registry)
-[wheel_sources]
-my-custom-pkg = "https://my-server.com/my-pkg-{version}+cu{cuda_short}-{py_tag}-{platform}.whl"
-```
-
-## Writing Wheel Templates
-
-### Template Variables
-
-| Variable | Example | Description |
-|----------|---------|-------------|
-| `{version}` | `0.4.0` | Package version |
-| `{cuda_version}` | `12.8` | Full CUDA version |
-| `{cuda_short}` | `128` | CUDA without dot |
-| `{cuda_major}` | `12` | CUDA major only |
-| `{torch_version}` | `2.8.0` | Full PyTorch version |
-| `{torch_mm}` | `28` | PyTorch major.minor no dot |
-| `{torch_dotted_mm}` | `2.8` | PyTorch major.minor with dot |
-| `{py_version}` | `3.10` | Python version |
-| `{py_short}` | `310` | Python without dot |
-| `{py_tag}` | `cp310` | Python wheel tag |
-| `{platform}` | `linux_x86_64` | Platform tag |
-
-### Common Wheel URL Patterns
-
-**Pattern 1: Simple CUDA + Python**
-```
-https://example.com/{package}-{version}+cu{cuda_short}-{py_tag}-{py_tag}-{platform}.whl
-```
-
-**Pattern 2: CUDA + PyTorch**
-```
-https://example.com/{package}-{version}+cu{cuda_short}torch{torch_mm}-{py_tag}-{py_tag}-{platform}.whl
-```
-
-**Pattern 3: GitHub Releases**
-```
-https://github.com/org/repo/releases/download/v{version}/{package}-{version}+cu{cuda_short}-{py_tag}-{platform}.whl
-```
-
-### How to Find the Right Template
-
-1. Download a wheel manually from the source
-2. Look at the filename pattern: `nvdiffrast-0.4.0+cu128torch28-cp310-cp310-linux_x86_64.whl`
-3. Replace values with variables: `nvdiffrast-{version}+cu{cuda_short}torch{torch_mm}-{py_tag}-{py_tag}-{platform}.whl`
-4. Prepend the base URL
-
-### Testing Your Template
-
-```bash
-comfy-env resolve my-package==1.0.0
 ```
 
-This shows the resolved URL without installing.
+## CUDA Wheels Index
 
-### Adding Custom Wheel Sources
+CUDA packages are installed from the [cuda-wheels](https://pozzettiandrea.github.io/cuda-wheels/) index, which provides pre-built wheels for:
 
-If a package isn't in the built-in registry, add it to your `comfy-env.toml`:
+- **PyTorch Geometric**: torch-scatter, torch-cluster, torch-sparse, torch-spline-conv
+- **NVIDIA**: nvdiffrast, pytorch3d, gsplat
+- **Attention**: flash-attn, sageattention
+- **Mesh Processing**: cumesh, cubvh
+- **Others**: spconv, detectron2, lietorch, and more
 
-```toml
-[cuda]
-my-custom-pkg = "1.0.0"
+Wheels are automatically selected based on your GPU, CUDA version, PyTorch version, and Python version.
 
-[wheel_sources]
-my-custom-pkg = "https://my-server.com/my-custom-pkg-{version}+cu{cuda_short}-{py_tag}-{platform}.whl"
-```
+### Supported Configurations
 
-Resolution order:
-1. User's `[wheel_sources]` in comfy-env.toml (highest priority)
-2. Built-in `wheel_sources.yml` registry
-3. Error if not found
+| GPU Architecture | CUDA | PyTorch |
+|-----------------|------|---------|
+| Blackwell (sm_100+) | 12.8 | 2.8+ |
+| Ada/Hopper/Ampere (sm_80+) | 12.8 | 2.8 |
+| Turing (sm_75) | 12.8 | 2.8 |
+| Pascal (sm_60) | 12.4 | 2.4 |
 
 ## API Reference
 
@@ -299,7 +240,7 @@ env = RuntimeEnv.detect()
 print(env)
 # Python 3.10, CUDA 12.8, PyTorch 2.8.0, GPU: NVIDIA GeForce RTX 4090
 
-# Get template variables
+# Get environment variables
 vars_dict = env.as_dict()
 # {'cuda_version': '12.8', 'cuda_short': '128', 'torch_mm': '28', ...}
 ```
@@ -344,16 +285,6 @@ print(get_gpu_summary())
 # GPU 0: NVIDIA GeForce RTX 5090 (sm_120) [Blackwell - CUDA 12.8]
 ```
 
-## Built-in Package Registry
-
-Run `comfy-env list-packages` to see all packages in the built-in registry.
-
-The registry includes:
-- PyTorch Geometric packages (torch-scatter, torch-cluster, torch-sparse)
-- NVIDIA packages (nvdiffrast, pytorch3d, gsplat)
-- Flash Attention (flash-attn)
-- And more
-
 ## License
 
 MIT - see LICENSE file.

{comfy_env-0.0.65 → comfy_env-0.0.67}/README.md

@@ -40,8 +40,7 @@ Create a `comfy-env.toml` in your node directory:
 
 ```toml
 [cuda]
-nvdiffrast = "0.4.0"
-pytorch3d = "0.7.9"
+packages = ["nvdiffrast", "pytorch3d"]
 
 [packages]
 requirements = ["transformers>=4.56", "pillow"]
@@ -124,12 +123,6 @@ comfy-env install
 # Dry run (show what would be installed)
 comfy-env install --dry-run
 
-# Resolve wheel URLs without installing
-comfy-env resolve nvdiffrast==0.4.0
-
-# List all packages in the built-in registry
-comfy-env list-packages
-
 # Verify installation
 comfy-env doctor
 ```
@@ -139,11 +132,9 @@ comfy-env doctor
 ### Simple Format (comfy-env.toml)
 
 ```toml
-# CUDA packages (uses built-in registry)
+# CUDA packages from https://pozzettiandrea.github.io/cuda-wheels/
 [cuda]
-nvdiffrast = "0.4.0"
-pytorch3d = "0.7.9"
-torch-scatter = "2.1.2"
+packages = ["nvdiffrast", "pytorch3d", "torch-scatter"]
 
 # Regular pip packages
 [packages]
@@ -157,7 +148,7 @@ requirements = ["transformers>=4.56", "pillow"]
 linux = ["libgl1", "libopengl0"]  # apt packages
 
 [local.cuda]
-nvdiffrast = "0.4.0"
+packages = ["nvdiffrast"]
 
 [local.packages]
 requirements = ["pillow", "numpy"]
@@ -168,82 +159,32 @@ python = "3.10"
 cuda = "12.8"
 
 [myenv.cuda]
-torch-scatter = "2.1.2"
+packages = ["torch-scatter"]
 
 [myenv.packages]
 requirements = ["transformers>=4.56"]
-
-# Custom wheel templates (override built-in registry)
-[wheel_sources]
-my-custom-pkg = "https://my-server.com/my-pkg-{version}+cu{cuda_short}-{py_tag}-{platform}.whl"
-```
-
-## Writing Wheel Templates
-
-### Template Variables
-
-| Variable | Example | Description |
-|----------|---------|-------------|
-| `{version}` | `0.4.0` | Package version |
-| `{cuda_version}` | `12.8` | Full CUDA version |
-| `{cuda_short}` | `128` | CUDA without dot |
-| `{cuda_major}` | `12` | CUDA major only |
-| `{torch_version}` | `2.8.0` | Full PyTorch version |
-| `{torch_mm}` | `28` | PyTorch major.minor no dot |
-| `{torch_dotted_mm}` | `2.8` | PyTorch major.minor with dot |
-| `{py_version}` | `3.10` | Python version |
-| `{py_short}` | `310` | Python without dot |
-| `{py_tag}` | `cp310` | Python wheel tag |
-| `{platform}` | `linux_x86_64` | Platform tag |
-
-### Common Wheel URL Patterns
-
-**Pattern 1: Simple CUDA + Python**
-```
-https://example.com/{package}-{version}+cu{cuda_short}-{py_tag}-{py_tag}-{platform}.whl
-```
-
-**Pattern 2: CUDA + PyTorch**
-```
-https://example.com/{package}-{version}+cu{cuda_short}torch{torch_mm}-{py_tag}-{py_tag}-{platform}.whl
-```
-
-**Pattern 3: GitHub Releases**
-```
-https://github.com/org/repo/releases/download/v{version}/{package}-{version}+cu{cuda_short}-{py_tag}-{platform}.whl
-```
-
-### How to Find the Right Template
-
-1. Download a wheel manually from the source
-2. Look at the filename pattern: `nvdiffrast-0.4.0+cu128torch28-cp310-cp310-linux_x86_64.whl`
-3. Replace values with variables: `nvdiffrast-{version}+cu{cuda_short}torch{torch_mm}-{py_tag}-{py_tag}-{platform}.whl`
-4. Prepend the base URL
-
-### Testing Your Template
-
-```bash
-comfy-env resolve my-package==1.0.0
 ```
 
-This shows the resolved URL without installing.
+## CUDA Wheels Index
 
-### Adding Custom Wheel Sources
+CUDA packages are installed from the [cuda-wheels](https://pozzettiandrea.github.io/cuda-wheels/) index, which provides pre-built wheels for:
 
-If a package isn't in the built-in registry, add it to your `comfy-env.toml`:
+- **PyTorch Geometric**: torch-scatter, torch-cluster, torch-sparse, torch-spline-conv
+- **NVIDIA**: nvdiffrast, pytorch3d, gsplat
+- **Attention**: flash-attn, sageattention
+- **Mesh Processing**: cumesh, cubvh
+- **Others**: spconv, detectron2, lietorch, and more
 
-```toml
-[cuda]
-my-custom-pkg = "1.0.0"
+Wheels are automatically selected based on your GPU, CUDA version, PyTorch version, and Python version.
 
-[wheel_sources]
-my-custom-pkg = "https://my-server.com/my-custom-pkg-{version}+cu{cuda_short}-{py_tag}-{platform}.whl"
-```
+### Supported Configurations
 
-Resolution order:
-1. User's `[wheel_sources]` in comfy-env.toml (highest priority)
-2. Built-in `wheel_sources.yml` registry
-3. Error if not found
+| GPU Architecture | CUDA | PyTorch |
+|-----------------|------|---------|
+| Blackwell (sm_100+) | 12.8 | 2.8+ |
+| Ada/Hopper/Ampere (sm_80+) | 12.8 | 2.8 |
+| Turing (sm_75) | 12.8 | 2.8 |
+| Pascal (sm_60) | 12.4 | 2.4 |
 
 ## API Reference
 
@@ -271,7 +212,7 @@ env = RuntimeEnv.detect()
 print(env)
 # Python 3.10, CUDA 12.8, PyTorch 2.8.0, GPU: NVIDIA GeForce RTX 4090
 
-# Get template variables
+# Get environment variables
 vars_dict = env.as_dict()
 # {'cuda_version': '12.8', 'cuda_short': '128', 'torch_mm': '28', ...}
 ```
@@ -316,16 +257,6 @@ print(get_gpu_summary())
 # GPU 0: NVIDIA GeForce RTX 5090 (sm_120) [Blackwell - CUDA 12.8]
 ```
 
-## Built-in Package Registry
-
-Run `comfy-env list-packages` to see all packages in the built-in registry.
-
-The registry includes:
-- PyTorch Geometric packages (torch-scatter, torch-cluster, torch-sparse)
-- NVIDIA packages (nvdiffrast, pytorch3d, gsplat)
-- Flash Attention (flash-attn)
-- And more
-
 ## License
 
 MIT - see LICENSE file.

{comfy_env-0.0.65 → comfy_env-0.0.67}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "comfy-env"
-version = "0.0.65"
+version = "0.0.67"
 description = "Environment management for ComfyUI custom nodes - CUDA wheel resolution and process isolation"
 readme = "README.md"
 license = {text = "MIT"}
@@ -20,8 +20,8 @@ classifiers = [
 ]
 dependencies = [
     "tomli>=2.0.0; python_version < '3.11'",  # TOML parsing (built-in tomllib for 3.11+)
+    "tomli-w>=1.0.0",  # TOML writing (no stdlib equivalent)
     "uv>=0.4.0",  # Fast Python package installer and venv creator
-    "pyyaml>=6.0",  # YAML parsing for wheel_sources.yml
 ]
 
 [project.optional-dependencies]
@@ -42,9 +42,6 @@ build-backend = "hatchling.build"
 [tool.hatch.build.targets.wheel]
 packages = ["src/comfy_env"]
 
-[tool.hatch.build.targets.wheel.force-include]
-"src/comfy_env/wheel_sources.yml" = "comfy_env/wheel_sources.yml"
-
 [tool.ruff]
 line-length = 100
 target-version = "py310"

comfy_env-0.0.67/src/comfy_env/__init__.py

@@ -0,0 +1,108 @@
+"""
+comfy-env: Environment management for ComfyUI custom nodes.
+
+All dependencies go through pixi for unified management.
+
+Main APIs:
+- install(): Install dependencies from comfy-env.toml
+- wrap_isolated_nodes(): Wrap nodes for subprocess isolation
+"""
+
+from importlib.metadata import version, PackageNotFoundError
+
+try:
+    __version__ = version("comfy-env")
+except PackageNotFoundError:
+    __version__ = "0.0.0-dev"
+
+# Config types and parsing
+from .config import (
+    ComfyEnvConfig,
+    NodeReq,
+    load_config,
+    discover_config,
+    CONFIG_FILE_NAME,
+)
+
+# Pixi integration
+from .pixi import (
+    ensure_pixi,
+    get_pixi_path,
+    get_pixi_python,
+    pixi_run,
+    pixi_install,
+    CUDA_WHEELS_INDEX,
+    detect_cuda_version,
+    detect_cuda_environment,
+    get_recommended_cuda_version,
+    GPUInfo,
+    CUDAEnvironment,
+)
+
+# Workers
+from .workers import (
+    Worker,
+    WorkerError,
+    MPWorker,
+    SubprocessWorker,
+)
+
+# Isolation
+from .isolation import wrap_isolated_nodes
+
+# Install API
+from .install import install, verify_installation
+
+# Prestartup helpers
+from .prestartup import setup_env
+
+# Errors
+from .errors import (
+    EnvManagerError,
+    ConfigError,
+    WheelNotFoundError,
+    DependencyError,
+    CUDANotFoundError,
+    InstallError,
+)
+
+__all__ = [
+    # Install API
+    "install",
+    "verify_installation",
+    # Prestartup
+    "setup_env",
+    # Isolation
+    "wrap_isolated_nodes",
+    # Config
+    "ComfyEnvConfig",
+    "NodeReq",
+    "load_config",
+    "discover_config",
+    "CONFIG_FILE_NAME",
+    # Pixi
+    "ensure_pixi",
+    "get_pixi_path",
+    "get_pixi_python",
+    "pixi_run",
+    "pixi_install",
+    "CUDA_WHEELS_INDEX",
+    # CUDA detection
+    "detect_cuda_version",
+    "detect_cuda_environment",
+    "get_recommended_cuda_version",
+    "GPUInfo",
+    "CUDAEnvironment",
+    # Workers
+    "Worker",
+    "WorkerError",
+    "MPWorker",
+    "SubprocessWorker",
+    # Errors
+    "EnvManagerError",
+    "ConfigError",
+    "WheelNotFoundError",
+    "DependencyError",
+    "CUDANotFoundError",
+    "InstallError",
+]