comfy-env 0.0.41__tar.gz → 0.0.43__tar.gz

{comfy_env-0.0.41 → comfy_env-0.0.43}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: comfy-env
-Version: 0.0.41
+Version: 0.0.43
 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
@@ -67,17 +67,12 @@ curl -LsSf https://astral.sh/uv/install.sh | sh
 Create a `comfy-env.toml` in your node directory:
 
 ```toml
-[env]
-name = "my-node"
-python = "3.10"
-cuda = "auto"
+[cuda]
+nvdiffrast = "0.4.0"
+pytorch3d = "0.7.9"
 
 [packages]
 requirements = ["transformers>=4.56", "pillow"]
-no_deps = ["nvdiffrast==0.4.0", "pytorch3d>=0.7.8"]
-
-[sources]
-wheel_sources = ["https://github.com/PozzettiAndrea/nvdiffrast-full-wheels/releases/download/"]
 ```
 
 Then in your `__init__.py`:
@@ -122,56 +117,124 @@ 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
 ```
 
-## Configurations
+## Configuration
 
-### comfy-env.toml
+### Simple Format (comfy-env.toml)
 
 ```toml
-[env]
-name = "my-node"          # Unique name for caching
-python = "3.10"           # Python version
-cuda = "auto"             # "auto", "12.8", "12.4", or null
+# CUDA packages (uses built-in registry)
+[cuda]
+nvdiffrast = "0.4.0"
+pytorch3d = "0.7.9"
+torch-scatter = "2.1.2"
 
+# Regular pip packages
 [packages]
-requirements = [          # Regular pip packages
-    "transformers>=4.56",
-    "pillow",
-]
-no_deps = [               # CUDA packages (installed with --no-deps)
-    "nvdiffrast==0.4.0",
-    "pytorch3d>=0.7.8",
-]
-
-[sources]
-wheel_sources = [         # GitHub releases with pre-built wheels
-    "https://github.com/.../releases/download/",
-]
-index_urls = [            # Extra pip index URLs
-    "https://pypi.org/simple/",
-]
-
-[worker]                  # For isolation mode
-package = "worker"        # worker/__main__.py
+requirements = ["transformers>=4.56", "pillow"]
 ```
 
-### Template Variables
+### Full Format
+
+```toml
+[system]
+linux = ["libgl1", "libopengl0"]  # apt packages
+
+[local.cuda]
+nvdiffrast = "0.4.0"
+
+[local.packages]
+requirements = ["pillow", "numpy"]
+
+# For isolated environments (creates separate venv)
+[myenv]
+python = "3.10"
+cuda = "12.8"
+
+[myenv.cuda]
+torch-scatter = "2.1.2"
 
-Wheel URLs support these template variables:
+[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 |
-| `{torch_version}` | `2.8.0` | PyTorch version |
-| `{torch_mm}` | `28` | PyTorch major.minor |
+| `{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.
+
+### Adding Custom Wheel Sources
+
+If a package isn't in the built-in registry, add it to your `comfy-env.toml`:
+
+```toml
+[cuda]
+my-custom-pkg = "1.0.0"
+
+[wheel_sources]
+my-custom-pkg = "https://my-server.com/my-custom-pkg-{version}+cu{cuda_short}-{py_tag}-{platform}.whl"
+```
+
+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
+
 ## API Reference
 
 ### install()
@@ -185,23 +248,22 @@ install()
 # Explicit config
 install(config="comfy-env.toml")
 
-# Isolated mode (creates separate venv)
-install(mode="isolated")
-
 # Dry run
 install(dry_run=True)
 ```
 
-### WheelResolver
+### RuntimeEnv
 
 ```python
-from comfy_env import RuntimeEnv, WheelResolver
+from comfy_env import RuntimeEnv
 
 env = RuntimeEnv.detect()
-resolver = WheelResolver()
+print(env)
+# Python 3.10, CUDA 12.8, PyTorch 2.8.0, GPU: NVIDIA GeForce RTX 4090
 
-url = resolver.resolve("nvdiffrast", "0.4.0", env)
-print(url)  # https://github.com/.../nvdiffrast-0.4.0+cu128torch28-...whl
+# Get template variables
+vars_dict = env.as_dict()
+# {'cuda_version': '12.8', 'cuda_short': '128', 'torch_mm': '28', ...}
 ```
 
 ### Workers (for isolation)
@@ -224,6 +286,16 @@ 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.43/README.md

@@ -0,0 +1,273 @@
+# comfy-env
+
+Environment management for ComfyUI custom nodes. Provides:
+
+1. **CUDA Wheel Resolution** - Install pre-built CUDA wheels (nvdiffrast, pytorch3d) without compilation
+2. **Process Isolation** - Run nodes in separate Python environments with their own dependencies
+
+## Why?
+
+ComfyUI custom nodes face two challenges:
+
+**Type 1: Dependency Conflicts**
+- Node A needs `torch==2.1.0` with CUDA 11.8
+- Node B needs `torch==2.8.0` with CUDA 12.8
+
+**Type 2: CUDA Package Installation**
+- Users don't have compilers installed
+- Building from source takes forever
+- pip install fails with cryptic errors
+
+This package solves both problems.
+
+## Installation
+
+```bash
+pip install comfy-env
+```
+
+Requires [uv](https://github.com/astral-sh/uv) for fast environment creation:
+
+```bash
+curl -LsSf https://astral.sh/uv/install.sh | sh
+```
+
+## Quick Start
+
+### In-Place Installation (Type 2 - CUDA Wheels)
+
+Create a `comfy-env.toml` in your node directory:
+
+```toml
+[cuda]
+nvdiffrast = "0.4.0"
+pytorch3d = "0.7.9"
+
+[packages]
+requirements = ["transformers>=4.56", "pillow"]
+```
+
+Then in your `__init__.py`:
+
+```python
+from comfy_env import install
+
+# Install CUDA wheels into current environment
+install()
+```
+
+### Process Isolation (Type 1 - Separate Venv)
+
+For nodes that need completely separate dependencies:
+
+```python
+from comfy_env import isolated
+
+@isolated(env="my-node")
+class MyNode:
+    FUNCTION = "process"
+    RETURN_TYPES = ("IMAGE",)
+
+    def process(self, image):
+        # Runs in isolated subprocess with its own venv
+        import conflicting_package
+        return (result,)
+```
+
+## CLI
+
+```bash
+# Show detected environment
+comfy-env info
+
+# Install from config
+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
+```
+
+## Configuration
+
+### Simple Format (comfy-env.toml)
+
+```toml
+# CUDA packages (uses built-in registry)
+[cuda]
+nvdiffrast = "0.4.0"
+pytorch3d = "0.7.9"
+torch-scatter = "2.1.2"
+
+# Regular pip packages
+[packages]
+requirements = ["transformers>=4.56", "pillow"]
+```
+
+### Full Format
+
+```toml
+[system]
+linux = ["libgl1", "libopengl0"]  # apt packages
+
+[local.cuda]
+nvdiffrast = "0.4.0"
+
+[local.packages]
+requirements = ["pillow", "numpy"]
+
+# For isolated environments (creates separate venv)
+[myenv]
+python = "3.10"
+cuda = "12.8"
+
+[myenv.cuda]
+torch-scatter = "2.1.2"
+
+[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.
+
+### Adding Custom Wheel Sources
+
+If a package isn't in the built-in registry, add it to your `comfy-env.toml`:
+
+```toml
+[cuda]
+my-custom-pkg = "1.0.0"
+
+[wheel_sources]
+my-custom-pkg = "https://my-server.com/my-custom-pkg-{version}+cu{cuda_short}-{py_tag}-{platform}.whl"
+```
+
+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
+
+## API Reference
+
+### install()
+
+```python
+from comfy_env import install
+
+# Auto-discover config
+install()
+
+# Explicit config
+install(config="comfy-env.toml")
+
+# Dry run
+install(dry_run=True)
+```
+
+### RuntimeEnv
+
+```python
+from comfy_env import RuntimeEnv
+
+env = RuntimeEnv.detect()
+print(env)
+# Python 3.10, CUDA 12.8, PyTorch 2.8.0, GPU: NVIDIA GeForce RTX 4090
+
+# Get template variables
+vars_dict = env.as_dict()
+# {'cuda_version': '12.8', 'cuda_short': '128', 'torch_mm': '28', ...}
+```
+
+### Workers (for isolation)
+
+```python
+from comfy_env import TorchMPWorker
+
+# Same-venv isolation (zero-copy tensors)
+worker = TorchMPWorker()
+result = worker.call(my_function, image=tensor)
+```
+
+## GPU Detection
+
+```python
+from comfy_env import detect_cuda_version, get_gpu_summary
+
+cuda = detect_cuda_version()  # "12.8", "12.4", or None
+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.41 → comfy_env-0.0.43}/pyproject.toml

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

{comfy_env-0.0.41 → comfy_env-0.0.43}/src/comfy_env/__init__.py

@@ -1,4 +1,9 @@
-__version__ = "0.0.14"
+from importlib.metadata import version, PackageNotFoundError
+
+try:
+    __version__ = version("comfy-env")
+except PackageNotFoundError:
+    __version__ = "0.0.0-dev"  # Fallback for editable installs
 
 from .env.config import IsolatedEnv, EnvManagerConfig, LocalConfig, NodeReq, CondaConfig
 from .env.config_file import (
@@ -31,8 +36,8 @@ from .ipc.worker import BaseWorker, register
 from .decorator import isolated, shutdown_all_processes
 
 # New in-place installation API
-from .install import install, verify_installation, setup
-from .resolver import RuntimeEnv, WheelResolver
+from .install import install, verify_installation
+from .resolver import RuntimeEnv
 
 # Pixi integration (for conda packages)
 from .pixi import (
@@ -82,7 +87,6 @@ __all__ = [
     "install",
     "verify_installation",
     "RuntimeEnv",
-    "WheelResolver",
     # Pixi integration (for conda packages)
     "ensure_pixi",
     "get_pixi_path",