Catch ValueError when importing comfy_kitchen in quant_ops - #15457
Catch ValueError when importing comfy_kitchen in quant_ops#15457chelsealong wants to merge 2 commits into
Conversation
comfy_kitchen's custom ops (e.g. na3d) annotate arguments with PEP 585 generics like list[int]. torch.library.infer_schema only accepts that syntax from torch>=2.7, so importing comfy_kitchen on an older torch raises ValueError instead of ImportError, which the quant_ops import guard didn't catch, crashing ComfyUI at startup instead of falling back to fp8/fp4 being unavailable. Fixes Comfy-Org#15441
|
No actionable comments were generated in the recent review. 🎉 ℹ️ Recent review info⚙️ Run configurationConfiguration used: Path: .coderabbit.yaml Review profile: ASSERTIVE Plan: Pro Plus Run ID: 📒 Files selected for processing (2)
📜 Recent review details🧰 Additional context used📓 Path-based instructions (6)**/*📄 CodeRabbit inference engine (AGENTS.md)
Files:
**/*.py📄 CodeRabbit inference engine (AGENTS.md)
Files:
**/*.{py,json}📄 CodeRabbit inference engine (AGENTS.md)
Files:
**/*.{py,md,txt,json}📄 CodeRabbit inference engine (AGENTS.md)
Files:
**⚙️ CodeRabbit configuration file
Files:
comfy/**⚙️ CodeRabbit configuration file
Files:
🧠 Learnings (3)📚 Learning: 2026-02-21T14:01:41.482ZApplied to files:
📚 Learning: 2026-05-13T12:31:45.069ZApplied to files:
📚 Learning: 2026-08-06T22:18:59.719ZApplied to files:
🔇 Additional comments (3)
📝 WalkthroughWalkthrough
🚥 Pre-merge checks | ✅ 5✅ Passed checks (5 passed)
Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. Comment |
There was a problem hiding this comment.
Actionable comments posted: 2
🤖 Prompt for all review comments with AI agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
Inline comments:
In `@comfy/quant_ops.py`:
- Around line 68-71: In the comfy_kitchen import handling around the
`_CK_AVAILABLE` initialization, only convert the known
torch.library.infer_schema PEP 585 `list[int]` incompatibility into the
unavailable fallback. Inspect the caught ValueError’s message or relevant
exception details to identify that specific schema-inference failure, and
re-raise all other ValueError instances unchanged; preserve the existing
ImportError fallback behavior.
In `@tests-unit/comfy_quant/test_quant_ops_import_guard.py`:
- Around line 20-35: In the test around fake_import and spec.loader.exec_module,
assert that triggered is populated immediately after module execution and before
asserting module._CK_AVAILABLE is false, confirming the injected ValueError path
was exercised.
🪄 Autofix
Fix all unresolved CodeRabbit comments on this PR:
- Push a commit to this branch (recommended)
- Create a new PR with the fixes
ℹ️ Review info
⚙️ Run configuration
Configuration used: Path: .coderabbit.yaml
Review profile: ASSERTIVE
Plan: Pro Plus
Run ID: 90a9419b-2240-4d41-af00-f0704b358f89
📒 Files selected for processing (2)
comfy/quant_ops.pytests-unit/comfy_quant/test_quant_ops_import_guard.py
📜 Review details
🧰 Additional context used
📓 Path-based instructions (6)
**/*
📄 CodeRabbit inference engine (AGENTS.md)
**/*: Keep changes small, direct, and limited to the narrowest necessary code path and smallest number of files.
Prefer practical fixes, minimal dependencies, and existing repository patterns; remove obsolete, dead, unreachable, or unused code.
Preserve existing APIs, node names, model-loading behavior, file layout, and workflow compatibility unless replacement is explicitly intended.
Core ComfyUI must not add outbound internet requests, telemetry, tracking, reporting, remote configuration, or background network activity. User-authorized model downloads are limited to the requested artifact and must exclude telemetry and unrelated metadata.
Files:
comfy/quant_ops.pytests-unit/comfy_quant/test_quant_ops_import_guard.py
**/*.py
📄 CodeRabbit inference engine (AGENTS.md)
**/*.py: Keep state and capability flags on the object that owns the behavior. Prefer explicit parent-owned attributes over probing child objects withgetattr; use child checks only when the child owns the delegated behavior.
Preserve shared method signatures, argument order, return shapes, side effects, and error behavior unless every affected caller and interface is intentionally updated.
Do not add unused compatibility parameters, flags, attributes, constructor options, or model-specific options to shared helpers; keep one-off behavior at the integration boundary.
Normalize third-party return conventions at integration boundaries so core code receives the expected type and shape; avoid undocumented caller-side unwrapping.
Do not addtorch.no_grad,torch.inference_mode, or inference-mode wrappers. Do not add model freeze/unfreeze toggles; only disable globally enabled inference mode when a training path requires gradients.
Remove inference-only training behavior such as dropout while preserving checkpoint and state-dict compatibility; usenn.Identitywhen deleting a module would alter keys or ordering.
Keep imports at module scope except established optional-backend probes or imports required to avoid cycles; avoid unnecessarytry/exceptblocks and use specific exceptions with useful fallbacks.
Do not add workarounds for unsupported library versions, especially PyTorch exception-and-float-cast retries, unless a comment names the exact versions still requiring them.
Let unsupported model formats, invalid quantization metadata, and bad states fail with clear errors instead of silently degrading output.
Match local style, keep comments sparse and useful, and remove comments that merely restate obvious code.
Treat dtype, device placement, VRAM use, and offloading as correctness concerns across CPU, CUDA, ROCm, MPS, DirectML, XPU, NPU, and low-VRAM environments.
Prefer existing ComfyUI and Comfy Kitchen operations, quantization helpers, cast/offload helpe...
Files:
comfy/quant_ops.pytests-unit/comfy_quant/test_quant_ops_import_guard.py
**/*.{py,json}
📄 CodeRabbit inference engine (AGENTS.md)
Treat legacy combo,
io.Combo, andio.DynamicCombovalues affecting filesystem access as untrusted; revalidate them at load/save boundaries withfolder_paths, containment checks, or fixed allowlists.
Files:
comfy/quant_ops.pytests-unit/comfy_quant/test_quant_ops_import_guard.py
**/*.{py,md,txt,json}
📄 CodeRabbit inference engine (AGENTS.md)
Keep warning and info messages short and actionable, remove noisy or misleading logging, and make documentation edits concise, factual, and tied to changed behavior.
Files:
comfy/quant_ops.pytests-unit/comfy_quant/test_quant_ops_import_guard.py
**
⚙️ CodeRabbit configuration file
**: IMPORTANT: Only comment on issues directly introduced by this PR's code changes.
Treat AGENTS.md as mandatory repository policy, not optional style guidance.
Flag PR changes that violate AGENTS.md even when the code is otherwise functional.
In particular, enforce architecture boundaries, dtype/device/memory rules,
interface contracts, import style, no unnecessary try/except blocks, no inline
imports, no outbound internet paths in core ComfyUI, and narrow scoped fixes.
Prefer direct findings over suggestions when a rule is violated. Only ignore
AGENTS.md when it clearly conflicts with a newer explicit maintainer instruction
in the PR.
Do NOT flag pre-existing issues in code that was merely moved, re-indented,
de-indented, or reformatted without logic changes. If code appears in the diff
only due to whitespace or structural reformatting (e.g., removing awith:block),
treat it as unchanged. Contributors should not feel obligated to address
pre-existing issues outside the scope of their contribution.
Files:
comfy/quant_ops.pytests-unit/comfy_quant/test_quant_ops_import_guard.py
comfy/**
⚙️ CodeRabbit configuration file
comfy/**: Core ML/diffusion engine. Focus on:
- Backward compatibility (breaking changes affect all custom nodes)
- Memory management and GPU resource handling
- Performance implications in hot paths
- Thread safety for concurrent execution
Files:
comfy/quant_ops.py
🧠 Learnings (3)
📚 Learning: 2026-02-21T14:01:41.482Z
Learnt from: pythongosssss
Repo: Comfy-Org/ComfyUI PR: 12555
File: comfy_extras/nodes_glsl.py:719-724
Timestamp: 2026-02-21T14:01:41.482Z
Learning: In PyOpenGL, bare Python scalars can be accepted for 1-element array parameters by NumberHandler. This means you can pass an int/float directly to OpenGL texture deletion (e.g., glDeleteTextures(tex)) without wrapping in a list. Verify function-specific expectations and ensure types match what the OpenGL call expects; use explicit lists only when the API requires an array.
Applied to files:
comfy/quant_ops.pytests-unit/comfy_quant/test_quant_ops_import_guard.py
📚 Learning: 2026-05-13T12:31:45.069Z
Learnt from: rattus128
Repo: Comfy-Org/ComfyUI PR: 13802
File: comfy/pinned_memory.py:19-30
Timestamp: 2026-05-13T12:31:45.069Z
Learning: When reviewing code that uses comfy/pinned_memory.py’s `HostBuffer.extend(size=..., reallocate=...)`: by default (`reallocate` is not True / False), `extend(size=...)` is a *relative increment* that grows the buffer by `size` bytes—so slicing like `[offset:offset+size]` after `hostbuf.extend(size=size)` is correct and the argument should not be rewritten to `offset + size`. Only in the single-segment reallocation mode (`reallocate=True`, e.g., as used by `resize_pin_buffer()` in `comfy/model_management.py`) should `size` be treated as an *absolute target* and the call/arguments should be checked accordingly.
Applied to files:
comfy/quant_ops.py
📚 Learning: 2026-08-06T22:18:59.719Z
Learnt from: kijai
Repo: Comfy-Org/ComfyUI PR: 15362
File: comfy/ldm/wan/model_animate2.py:186-223
Timestamp: 2026-08-06T22:18:59.719Z
Learning: When reviewing ComfyUI quantization code, treat `comfy.quant_ops.TensorWiseINT8Layout` and `comfy.quant_ops.TensorCoreConvRotW4A4Layout` as re-exports from `comfy_kitchen`. Validate their behavior against the re-exported `comfy_kitchen` implementations rather than assuming they are local fallback classes.
Applied to files:
comfy/quant_ops.py
🔇 Additional comments (1)
tests-unit/comfy_quant/test_quant_ops_import_guard.py (1)
1-17: LGTM!Also applies to: 36-39
Re-raise ValueErrors from comfy_kitchen import that aren't the known torch.library.infer_schema list[int] incompatibility, so unrelated failures (e.g. bad backend state) surface instead of silently degrading to the fallback. Also assert the mocked import was actually intercepted in the existing test.
|
Addressed both CodeRabbit comments: |
Fixes #15441
Problem
On PyTorch < 2.7, importing
comfy_kitchen>= 0.2.28 can crash ComfyUI atstartup instead of degrading gracefully.
comfy_kitchen's custom ops (e.g.na3dinbackends/eager/na.py) annotate arguments with PEP 585 genericssuch as
list[int], andtorch.library.infer_schemaonly accepts thatsyntax starting with
torch>=2.7. On older torch versions the import raises:comfy/quant_ops.pyalready guards thecomfy_kitchenimport to letComfyUI keep running (without fp8/fp4 support) when
comfy_kitchenismissing or incompatible, but the guard only caught
ImportError, not thisValueError, so it propagated and crashed startup instead.This is not ROCm-specific — any environment on torch <= 2.6 (CUDA included)
hits it. See the issue discussion, where this root cause was identified by
@0xDELUXA.
Fix
Widen the
exceptclause incomfy/quant_ops.pyto also catchValueError,matching the existing pattern already used in
comfy/float.pyfor the samekind of optional-dependency probing (
except (AttributeError, ImportError)).Test plan
Added
tests-unit/comfy_quant/test_quant_ops_import_guard.py, which loadscomfy/quant_ops.pyas a standalone module withcomfy_kitchen's importmocked to raise the exact
ValueErrorfrom the issue, and asserts the modulestill imports successfully with
_CK_AVAILABLE = False.Confirmed the test fails without the fix and passes with it:
Also ran the existing quant test suite and the broader
tests-unitsuite(with
comfy_kitchen==0.2.28actually installed) to confirm no regressions:Ran
ruff checkon the changed files: all checks passed.AI disclosure
This PR was prepared with AI assistance (Claude Code).