Compare commits

...
88 Commits
Author SHA1 Message Date
VitoandCopilot Autofix powered by AI 404a1efd61 Potential fix for code scanning alert no. 1: Workflow does not contain permissions
Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com>
2025-08-02 08:14:03 -07:00
Vito 4ae514dacf Merge pull request #24 from ComfyAssets/alert-autofix-10
Potential fix for code scanning alert no. 10: Workflow does not contain permissions
2025-08-02 08:12:04 -07:00
VitoandCopilot Autofix powered by AI 5efae8eeb8 Potential fix for code scanning alert no. 10: Workflow does not contain permissions
Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com>
2025-08-02 08:00:10 -07:00
Vito 85288c8fd8 Create SECURITY.md 2025-08-02 07:54:21 -07:00
Vito 7a97f7c2bc Create CODE_OF_CONDUCT.md 2025-08-02 07:50:25 -07:00
Vito a4692a286c Merge pull request #22 from ComfyAssets/dependabot/github_actions/softprops/action-gh-release-2
build(deps): bump softprops/action-gh-release from 1 to 2
2025-08-02 07:48:07 -07:00
Vito 72a3fea3cb Merge pull request #23 from ComfyAssets/dependabot/github_actions/actions/cache-4
build(deps): bump actions/cache from 3 to 4
2025-08-02 07:47:44 -07:00
Vito d5d4145a04 Merge pull request #21 from ComfyAssets/dependabot/github_actions/actions/setup-python-5
build(deps): bump actions/setup-python from 4 to 5
2025-08-02 07:46:49 -07:00
dependabot[bot] 0e288dd109 build(deps): bump actions/cache from 3 to 4
Bumps [actions/cache](https://github.com/actions/cache) from 3 to 4.
- [Release notes](https://github.com/actions/cache/releases)
- [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md)
- [Commits](https://github.com/actions/cache/compare/v3...v4)

---
updated-dependencies:
- dependency-name: actions/cache
  dependency-version: '4'
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-08-02 14:43:46 +00:00
dependabot[bot] c4882f894e build(deps): bump softprops/action-gh-release from 1 to 2
Bumps [softprops/action-gh-release](https://github.com/softprops/action-gh-release) from 1 to 2.
- [Release notes](https://github.com/softprops/action-gh-release/releases)
- [Changelog](https://github.com/softprops/action-gh-release/blob/master/CHANGELOG.md)
- [Commits](https://github.com/softprops/action-gh-release/compare/v1...v2)

---
updated-dependencies:
- dependency-name: softprops/action-gh-release
  dependency-version: '2'
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-08-02 14:43:43 +00:00
dependabot[bot] 6cbe6e5ae6 build(deps): bump actions/setup-python from 4 to 5
Bumps [actions/setup-python](https://github.com/actions/setup-python) from 4 to 5.
- [Release notes](https://github.com/actions/setup-python/releases)
- [Commits](https://github.com/actions/setup-python/compare/v4...v5)

---
updated-dependencies:
- dependency-name: actions/setup-python
  dependency-version: '5'
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-08-02 14:43:40 +00:00
Vito Sansevero df20afb83e style(dependabot): fix indentation in config file 2025-08-02 07:42:56 -07:00
Vito 7d63e11e18 Create dependabot.yml 2025-08-02 07:40:43 -07:00
Vito a8364b5c57 Merge pull request #20 from ComfyAssets/feature/add-tools-toc
docs: add tools table of contents to README
2025-08-02 07:35:13 -07:00
Vito Sansevero 332a74225d docs: add tools table of contents to README
- Add comprehensive TOC table under Current Tools section
- Include tool names with emojis as clickable links
- Add brief descriptions for each tool
- Categorize tools by functionality (Image Processing, Debugging, etc.)
- Improve navigation and tool discovery for users
2025-08-02 07:31:06 -07:00
Vito d757b623d6 Merge pull request #19 from ComfyAssets/feature/add-readme-screenshots
docs: add screenshots and complete documentation for all nodes
2025-08-02 07:24:25 -07:00
Vito Sansevero 64e844ec42 style: fix code formatting with black
- Add missing newlines at end of files
- Fix whitespace and indentation issues
- Format long function calls properly
2025-08-02 07:20:40 -07:00
Vito Sansevero 3ed188d63f docs: add screenshots and complete documentation for all nodes
- Add PNG screenshots for 7 nodes in README.md
- Create missing documentation files (display_text.md, kiko_save_image.md)
- Update gemini_prompt.md with new features (model refresh, enhanced SDXL)
- Add missing example workflow JSON files for 5 nodes
- Include Display Any and Image to Multiple Of nodes in README
- Update node count from 8 to 10 in stats section
2025-08-02 07:03:46 -07:00
Vito b9cc9f295d Merge pull request #18 from ComfyAssets/feature/display-text-and-gemini-improvements
feat: add Display Text node with smart formatting and enhance Gemini …
2025-08-01 21:26:54 -07:00
Vito Sansevero 271cd020c1 merge: resolve conflicts with main branch model management improvements 2025-08-01 16:35:39 -07:00
Vito Sansevero e34807855a feat: add Display Text node with smart formatting and enhance Gemini with model refresh
Display Text improvements:
- Add new DisplayText node with intelligent prompt detection and split view
- Implement text wrapping that reflows when node is resized
- Add scrollable content with mouse wheel support and visual indicators
- Include always-visible copy button with visual feedback for easy prompt copying
- Auto-detect SDXL-style prompts and display in side-by-side format
- Strip prompt labels when copying for direct use in workflows

Gemini model refresh functionality:
- Add refresh button to fetch latest available Gemini models dynamically
- Implement model caching system with persistent storage
- Support for Gemini 2.0 and 2.5 models with automatic detection
- Enhanced SDXL prompt template with improved layered structure
- Better error handling and status feedback for model operations

Documentation and version updates:
- Update README with comprehensive Display Text and Gemini feature descriptions
- Add detailed usage examples and workflow patterns
- Bump version to 1.0.9 in pyproject.toml
- Update stats to reflect 8 total nodes and new AI integration features
2025-08-01 14:57:56 -07:00
Vito d32e18f844 Merge pull request #17 from ComfyAssets/feature/gemini-dynamic-models
Feature/gemini dynamic models
2025-08-01 13:36:04 -07:00
Vito Sansevero 228b74ae5e chore: add flake8 complexity exceptions for Gemini module 2025-08-01 13:30:38 -07:00
Vito Sansevero 6197b482df feat: implement dynamic model fetching for Gemini node
- Add dynamic model fetching with 24-hour caching
- Update prompt templates based on 2025 best practices:
  - FLUX: Natural language descriptions
  - SDXL: Simplified with natural language support
  - Danbooru: Strict tagging conventions
  - Video: Optimized for WAN 2.2
- Add cache file to .gitignore
- Handle missing API key gracefully on initial load
2025-08-01 13:30:31 -07:00
Vito Sansevero f62129afda fix: update pre-commit config to use line-length 88
- Update black line-length from 127 to 88 to match pyproject.toml
- Update flake8 max-line-length from 127 to 88 for consistency
- Remove broken pre-commit hook that was referencing non-existent pyenv
2025-08-01 11:02:44 -07:00
Vito Sansevero 8d5065c975 chore: bump version to 1.0.8 in pyproject.toml 2025-08-01 10:58:57 -07:00
Vito 2d27c32bfd Merge pull request #16 from ComfyAssets/feature/display-any
Feature/display any
2025-08-01 10:51:23 -07:00
Vito Sansevero 3ecab5ac08 fix: implement proper AnyType class for wildcard input matching
- Add AnyType class that inherits from str and overrides __ne__ to always return False
- This matches ComfyUI's type checking system for wildcard inputs
- Based on implementation from ComfyUI_essentials
- Add comprehensive tests for AnyType behavior
- Fixes type mismatch errors when connecting any node type
2025-08-01 10:47:20 -07:00
Vito Sansevero 70592114f9 fix: correct wildcard input type syntax for DisplayAny node
- Change from ('*', {}) to ('*') for proper ComfyUI wildcard type
- Update test to match the corrected syntax
- Fixes 'Return type mismatch' error when connecting nodes
2025-08-01 10:47:20 -07:00
Vito Sansevero 407fc4ca7b feat: add DisplayAny node for debugging and inspection
- Universal input acceptance for any data type
- Two display modes: raw value and tensor shape
- Extracts tensor shapes from nested structures
- Comprehensive unit tests with 100% coverage
- Full documentation with usage examples
- OUTPUT_NODE for UI display functionality
2025-08-01 10:47:20 -07:00
Vito cb7d5246f9 Merge pull request #15 from ComfyAssets/chore/housekeeping
Chore/housekeeping
2025-08-01 10:31:39 -07:00
Vito 9829fc001d Merge pull request #14 from ComfyAssets/fix/black-config-main
fix: update black line-length to 88 and reformat codebase
2025-08-01 09:50:10 -07:00
Vito Sansevero e84ec6721c fix: update black line-length to 88 and reformat codebase
- Update pyproject.toml to use black's default line-length of 88
- This matches what the CI workflow expects (black --check without args)
- Reformat all Python files to comply with the new line length
- This will prevent CI failures due to formatting discrepancies
2025-08-01 09:45:43 -07:00
Vito 80fac8e544 Merge pull request #12 from ComfyAssets/feature/gemini-prompt
feat: add Gemini Prompt Engineer node
2025-08-01 09:45:09 -07:00
Vito Sansevero efc079a95b fix: reformat with black default settings (88 char) to match CI 2025-08-01 09:41:21 -07:00
Vito Sansevero bbd239cbd6 fix: apply black formatting with line-length 127 for CI compliance 2025-08-01 09:41:21 -07:00
Vito Sansevero 589fbf3568 fix: remove trailing whitespace in gemini_prompt node.py 2025-08-01 09:41:21 -07:00
Vito Sansevero c595cabaa0 chore: trigger CI 2025-08-01 09:41:21 -07:00
Vito Sansevero ca504d5f74 fix: code formatting for Gemini prompt node
- Fix missing newlines at end of files
- Apply black formatting
- Remaining non-critical warnings for long lines in prompts
2025-08-01 09:41:21 -07:00
Vito Sansevero f559fe220e feat: add Gemini Prompt Engineer node
- Add GeminiPromptNode for AI-powered prompt engineering
- Integrates with Google's Gemini API for prompt generation
- Includes various prompt templates and generation modes
- Add comprehensive tests and documentation
- Register node in ComfyAssets category
2025-08-01 09:41:21 -07:00
Vito Sansevero 90c1aa402d Merge remote-tracking branch 'origin/main' into chore/housekeeping 2025-08-01 09:37:01 -07:00
Vito 932e30ade0 Merge pull request #13 from ComfyAssets/feature/image-to-multiple-of
Feature/image to multiple of
2025-08-01 09:34:25 -07:00
Vito Sansevero f9540bd984 chore: update black line-length to 88 to match CI configuration 2025-08-01 09:30:16 -07:00
Vito Sansevero a8af833c31 chore: trigger CI 2025-08-01 09:10:28 -07:00
Vito Sansevero 005c3bdf65 fix: code formatting for Image to Multiple Of node
- Apply black formatting
- Remove unused torch import from logic.py
- All critical linting issues resolved
2025-08-01 09:01:39 -07:00
Vito 67a59a0d3b Merge pull request #11 from ComfyAssets/chore/housekeeping
chore: project housekeeping and configuration updates
2025-08-01 08:53:03 -07:00
Vito Sansevero bb5653fc0e fix: resolve flake8 linting errors in example.py
- Remove unused variable 'temp' assignment
- Remove unused exception variable assignments
- All flake8 checks now pass
2025-08-01 08:43:22 -07:00
Vito Sansevero ab23992c29 chore: project housekeeping and configuration updates
- Add code quality tools: flake8, mypy, black, pre-commit
- Add .gitattributes for line ending consistency
- Add .secrets.baseline for secret scanning
- Update GitHub workflows for better CI/CD
- Update documentation formatting and examples
- Add CLAUDE.md for AI assistant guidance
- Add scripts directory for automation tools
- Update project configuration in pyproject.toml
- Improve type hints and code formatting across all modules
- Update test configurations and fixtures
2025-08-01 08:35:08 -07:00
Vito Sansevero 9007b10d42 feat: add Image to Multiple Of node
- Add ImageToMultipleOfNode for image dimension adjustment
- Ensures image dimensions are multiples of specified values
- Supports both padding and cropping modes
- Useful for model-specific dimension requirements
- Add tests and documentation
- Register node in ComfyAssets category
2025-08-01 08:28:10 -07:00
Vito b71bfa8d4e Merge pull request #10 from ComfyAssets/fix-samplers
Fix samplers
2025-07-26 14:18:48 -07:00
Vito Sansevero c1128addc7 chore: bump version to 1.0.7 in pyproject.toml 2025-07-26 14:16:06 -07:00
Vito Sansevero a49071f824 fix(resolution_calculator): update scale factor tooltip 2025-07-26 14:15:39 -07:00
Vito Sansevero bbdd27f498 fix(ci): correct return type in tests.yml configuration 2025-07-23 13:56:57 -07:00
Vito Sansevero 22f62bf7b4 test: Update test assertions for sampler combo node 2025-07-23 13:56:45 -07:00
Vito Sansevero 4ff6067dad refactor(compact_node): update sampler return type 2025-07-23 13:29:46 -07:00
Vito Sansevero ad13e66506 refactor(node): update sampler handling logic 2025-07-23 13:29:32 -07:00
Vito Sansevero b16f6f40bd style(logic): fix whitespace issues in logic.py 2025-07-21 08:23:18 -07:00
Vito Sansevero 6dfa66963b feat: Add subfolder support in image URL handling 2025-07-21 08:20:27 -07:00
Vito Sansevero ab016e0903 feat(logic): add subfolder info to enhanced data 2025-07-21 08:20:17 -07:00
Vito Sansevero f4228a850c refactor(logic): improve path handling in image saving 2025-07-21 07:56:13 -07:00
Vito Sansevero 79042b78d2 chore: bump version to 1.0.5 in pyproject.toml 2025-06-28 09:31:40 -07:00
Vito Sansevero 0c4e59c4e9 test: Remove unused imports from test file 2025-06-28 09:14:45 -07:00
Vito Sansevero 4a0a206d61 refactor(node): use helper methods for tensor validation 2025-06-28 09:14:34 -07:00
Vito Sansevero 8e0d4485bd style: Remove unused imports in node.py 2025-06-28 09:14:23 -07:00
Vito Sansevero 92a3b1db4e style: Remove unused import 'Any' 2025-06-28 09:13:03 -07:00
Vito Sansevero ab628b1bf2 style: Remove unused import 'os' 2025-06-28 09:11:49 -07:00
Vito Sansevero 7e712a17d9 docs: Add Kiko Save Image section to README.md 2025-06-28 09:11:42 -07:00
Vito Sansevero 269fb2ba80 ci: add checks for KikoSaveImageNode imports 2025-06-28 09:11:36 -07:00
Vito Sansevero e17fdddcd7 refactor(tests/ui): Remove 'subfolder' support 2025-06-28 08:55:25 -07:00
Vito Sansevero 5d1f01e6cb refactor(node): replace 'subfolder' with 'popup' 2025-06-28 08:54:46 -07:00
Vito Sansevero b3b8826044 refactor(logic): Rename 'subfolder' to 'popup' parameter 2025-06-28 08:54:35 -07:00
Vito Sansevero 9dbb1f749d chore: bump version to 1.0.4 in pyproject.toml 2025-06-27 21:06:30 -07:00
Vito Sansevero 682f2b0a47 feat(ui): Add KikoSaveImage UI enhancements 2025-06-27 21:06:00 -07:00
Vito Sansevero 1233cf693e test(kiko_save_image): add unit tests for save image tool 2025-06-27 21:05:52 -07:00
Vito Sansevero 32d44a282f feat(kiko_save_image): add new image saving tool 2025-06-27 21:05:42 -07:00
Vito Sansevero bb79c7434f feat(init): add KikoSaveImageNode to tools and mappings 2025-06-27 21:05:25 -07:00
Vito Sansevero bd8c0a42bc fix: handle import error for testing environment 2025-06-27 21:05:14 -07:00
Vito Sansevero 5d9e71dc7b chore: bump version to 1.0.3 in pyproject.toml 2025-06-20 08:03:48 -07:00
Vito 321d89dcc4 Merge pull request #9 from ComfyAssets/latent-batch
style: Add blank lines for better readability
2025-06-20 08:02:57 -07:00
Vito Sansevero cd77d06ac9 style: Add blank lines for better readability 2025-06-20 07:50:49 -07:00
Vito d23ff34b27 Merge pull request #8 from ComfyAssets/latent-batch
Latent batch
2025-06-19 12:00:57 -07:00
Vito Sansevero cc725d27f6 chore: bump version to 1.0.2 in pyproject.toml 2025-06-19 11:56:26 -07:00
Vito Sansevero 4c3d3958d6 docs: Add Empty Latent Batch documentation 2025-06-19 11:56:05 -07:00
Vito Sansevero 2c992b5c97 feat(empty-latent-batch): add preset & batch processing 2025-06-19 11:55:51 -07:00
Vito Sansevero 8628bc39bb feat(init): add EmptyLatentBatchNode support 2025-06-19 10:22:33 -07:00
Vito Sansevero 3654867a21 feat(empty_latent_batch): add empty latent batch tool 2025-06-19 10:22:05 -07:00
Vito Sansevero 85af1b38f9 test: Add unit tests for EmptyLatentBatch features 2025-06-19 10:21:45 -07:00
Vito 03189afd85 Merge pull request #7 from ComfyAssets/version
Version
2025-06-16 18:32:40 -07:00
87 changed files with 10970 additions and 387 deletions
+35
View File
@@ -0,0 +1,35 @@
[flake8]
max-line-length = 127
max-complexity = 10
exclude =
.git,
__pycache__,
.mypy_cache,
.pytest_cache,
venv,
env,
build,
dist,
*.egg-info,
.tox
ignore =
# W503: line break before binary operator (conflicts with Black)
W503,
# E203: whitespace before ':' (conflicts with Black)
E203,
# E501: line too long (we use max-line-length)
E501
per-file-ignores =
# Allow unused imports in __init__.py files
__init__.py:F401,F403
# Allow assertions in tests
tests/*:S101
# Allow higher complexity for Gemini prompt module
kikotools/tools/gemini_prompt/logic.py:C901
kikotools/tools/gemini_prompt/models.py:C901
kikotools/tools/gemini_prompt/node.py:C901
# Statistics
count = True
statistics = True
+41
View File
@@ -0,0 +1,41 @@
# Auto detect text files and perform LF normalization
* text=auto
# Python files
*.py text eol=lf
*.pyi text eol=lf
# Configuration files
*.json text eol=lf
*.yaml text eol=lf
*.yml text eol=lf
*.toml text eol=lf
*.ini text eol=lf
*.cfg text eol=lf
# Documentation
*.md text eol=lf
*.rst text eol=lf
*.txt text eol=lf
# Scripts
*.sh text eol=lf
*.bash text eol=lf
# Git files
.gitignore text eol=lf
.gitattributes text eol=lf
# ComfyUI specific
*.workflow text eol=lf
# Binary files
*.png binary
*.jpg binary
*.jpeg binary
*.gif binary
*.webp binary
*.safetensors binary
*.ckpt binary
*.pt binary
*.pth binary
+1 -1
View File
@@ -45,4 +45,4 @@ Paste any error messages or stack traces here
If possible, attach the ComfyUI workflow file (.json) that reproduces the issue.
**Additional context**
Add any other context about the problem here.
Add any other context about the problem here.
+2 -2
View File
@@ -37,7 +37,7 @@ Describe how the tool should process inputs and generate outputs.
**Model Compatibility:**
- [ ] SDXL optimized
- [ ] FLUX optimized
- [ ] FLUX optimized
- [ ] General purpose
- [ ] Specific model requirements: [describe]
@@ -64,4 +64,4 @@ Are there existing ComfyUI nodes that do something similar? How would this be di
- [ ] Yes, I can help with implementation
- [ ] Yes, I can help with testing
- [ ] Yes, I can help with documentation
- [ ] No, but I'd be happy to test it
- [ ] No, but I'd be happy to test it
+10
View File
@@ -0,0 +1,10 @@
version: 2
updates:
- package-ecosystem: "pip"
directory: "/"
schedule:
interval: "weekly"
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "weekly"
+68 -41
View File
@@ -1,4 +1,6 @@
name: Code Quality
permissions:
contents: read
on:
push:
@@ -14,12 +16,12 @@ jobs:
- uses: actions/checkout@v4
- name: Set up Python 3.10
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: '3.10'
- name: Cache pip dependencies
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: ~/.cache/pip
key: ${{ runner.os }}-pip-quality-${{ hashFiles('**/requirements-dev.txt') }}
@@ -59,7 +61,7 @@ jobs:
import sys
import os
sys.path.insert(0, os.getcwd())
# Test that all imports work correctly
try:
from kikotools import NODE_CLASS_MAPPINGS, NODE_DISPLAY_NAME_MAPPINGS
@@ -67,60 +69,64 @@ jobs:
except ImportError as e:
print(f'Warning: Package-level imports failed: {e}')
# This is expected since we don't have ComfyUI installed
# Test individual module imports
from kikotools.base import ComfyAssetsBaseNode
from kikotools.tools.resolution_calculator import ResolutionCalculatorNode
from kikotools.tools.resolution_calculator.logic import extract_dimensions
from kikotools.tools.resolution_calculator.node import ResolutionCalculatorNode as NodeClass
# Test Width Height Selector imports
from kikotools.tools.width_height_selector import WidthHeightSelectorNode
from kikotools.tools.width_height_selector.logic import get_preset_dimensions
from kikotools.tools.width_height_selector.presets import PRESET_OPTIONS, PRESET_METADATA
# Test Sampler Combo imports
from kikotools.tools.sampler_combo import SamplerComboNode
from kikotools.tools.sampler_combo.logic import get_sampler_combo, SAMPLERS, SCHEDULERS
# Test Seed History imports
from kikotools.tools.seed_history import SeedHistoryNode
from kikotools.tools.seed_history.logic import generate_random_seed, validate_seed_value
# Test Kiko Save Image imports
from kikotools.tools.kiko_save_image import KikoSaveImageNode
from kikotools.tools.kiko_save_image.logic import process_image_batch, validate_save_inputs
print('✓ All module imports successful')
"
- name: Check code style consistency
run: |
echo "Checking code style consistency..."
# Check for consistent naming
find kikotools/ -name "*.py" -exec grep -l "class.*Node" {} \; | while read file; do
if ! grep -q "ComfyAssetsBaseNode" "$file" && ! grep -q "class ComfyAssetsBaseNode" "$file"; then
echo "Checking $file for ComfyUI node inheritance..."
fi
done
# Check for proper docstrings
python -c "
import ast
import os
def check_docstrings(filepath):
with open(filepath, 'r') as f:
tree = ast.parse(f.read())
for node in ast.walk(tree):
if isinstance(node, (ast.FunctionDef, ast.ClassDef)):
if not ast.get_docstring(node) and not node.name.startswith('_'):
print(f'Warning: {filepath}:{node.lineno} - {node.name} missing docstring')
for root, dirs, files in os.walk('kikotools'):
for file in files:
if file.endswith('.py') and not file.startswith('__'):
filepath = os.path.join(root, file)
check_docstrings(filepath)
print('✓ Docstring check completed')
"
@@ -130,7 +136,7 @@ jobs:
- uses: actions/checkout@v4
- name: Set up Python 3.10
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: '3.10'
@@ -147,7 +153,7 @@ jobs:
- name: Check for hardcoded secrets
run: |
echo "Checking for potential secrets..."
# Check for common secret patterns
if grep -r -i "password\|secret\|key\|token" kikotools/ --include="*.py" | grep -v "# " | grep -v "def " | grep -v "class "; then
echo "Warning: Potential hardcoded secrets found"
@@ -161,7 +167,7 @@ jobs:
- uses: actions/checkout@v4
- name: Set up Python 3.10
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: '3.10'
@@ -176,82 +182,103 @@ jobs:
import sys
import os
sys.path.insert(0, os.getcwd())
print('Checking architecture compliance...')
# Test separation of concerns
from kikotools.tools.resolution_calculator import logic, node
# Logic module should not import node-specific things
import inspect
logic_source = inspect.getsource(logic)
if 'ComfyUI' in logic_source and 'INPUT_TYPES' not in logic_source:
print('⚠️ Warning: Logic module contains ComfyUI-specific code')
else:
print('✓ Logic module properly separated')
# Node module should inherit from base
from kikotools.tools.resolution_calculator.node import ResolutionCalculatorNode
from kikotools.base import ComfyAssetsBaseNode
if issubclass(ResolutionCalculatorNode, ComfyAssetsBaseNode):
print('✓ Node properly inherits from base class')
else:
print('❌ Node does not inherit from base class')
sys.exit(1)
# Check that nodes have proper ComfyUI interface
required_attrs = ['INPUT_TYPES', 'RETURN_TYPES', 'RETURN_NAMES', 'FUNCTION', 'CATEGORY']
# Test Resolution Calculator Node
for attr in required_attrs:
if not hasattr(ResolutionCalculatorNode, attr):
print(f'❌ ResolutionCalculatorNode missing required attribute: {attr}')
sys.exit(1)
# Test Width Height Selector Node
from kikotools.tools.width_height_selector.node import WidthHeightSelectorNode
if issubclass(WidthHeightSelectorNode, ComfyAssetsBaseNode):
print('✓ WidthHeightSelectorNode properly inherits from base class')
else:
print('❌ WidthHeightSelectorNode does not inherit from base class')
sys.exit(1)
for attr in required_attrs:
if not hasattr(WidthHeightSelectorNode, attr):
print(f'❌ WidthHeightSelectorNode missing required attribute: {attr}')
sys.exit(1)
# Test Sampler Combo Node
from kikotools.tools.sampler_combo.node import SamplerComboNode
if issubclass(SamplerComboNode, ComfyAssetsBaseNode):
print('✓ SamplerComboNode properly inherits from base class')
else:
print('❌ SamplerComboNode does not inherit from base class')
sys.exit(1)
for attr in required_attrs:
if not hasattr(SamplerComboNode, attr):
print(f'❌ SamplerComboNode missing required attribute: {attr}')
sys.exit(1)
# Test Seed History Node
from kikotools.tools.seed_history.node import SeedHistoryNode
if issubclass(SeedHistoryNode, ComfyAssetsBaseNode):
print('✓ SeedHistoryNode properly inherits from base class')
else:
print('❌ SeedHistoryNode does not inherit from base class')
sys.exit(1)
for attr in required_attrs:
if not hasattr(SeedHistoryNode, attr):
print(f'❌ SeedHistoryNode missing required attribute: {attr}')
sys.exit(1)
# Test Kiko Save Image Node
from kikotools.tools.kiko_save_image.node import KikoSaveImageNode
if issubclass(KikoSaveImageNode, ComfyAssetsBaseNode):
print('✓ KikoSaveImageNode properly inherits from base class')
else:
print('❌ KikoSaveImageNode does not inherit from base class')
sys.exit(1)
# KikoSaveImage is an output node, so it doesn't have RETURN_TYPES/RETURN_NAMES
save_required_attrs = ['INPUT_TYPES', 'FUNCTION', 'CATEGORY']
for attr in save_required_attrs:
if not hasattr(KikoSaveImageNode, attr):
print(f'❌ KikoSaveImageNode missing required attribute: {attr}')
sys.exit(1)
# Check that it's properly marked as an output node
if not hasattr(KikoSaveImageNode, 'OUTPUT_NODE') or not KikoSaveImageNode.OUTPUT_NODE:
print('❌ KikoSaveImageNode missing OUTPUT_NODE = True')
sys.exit(1)
print('✓ All architecture checks passed for all tools')
"
@@ -259,22 +286,22 @@ jobs:
run: |
python -c "
import os
# Count test files vs implementation files
test_files = 0
impl_files = 0
for root, dirs, files in os.walk('tests'):
test_files += len([f for f in files if f.startswith('test_') and f.endswith('.py')])
for root, dirs, files in os.walk('kikotools'):
impl_files += len([f for f in files if f.endswith('.py') and not f.startswith('__')])
print(f'Implementation files: {impl_files}')
print(f'Test files: {test_files}')
if test_files >= impl_files * 0.5: # At least 50% test coverage by file count
print('✓ Adequate test file coverage')
else:
print('⚠️ Warning: Low test file coverage')
"
"
+31 -26
View File
@@ -1,5 +1,8 @@
name: Release
permissions:
contents: read
on:
push:
tags:
@@ -8,12 +11,14 @@ on:
jobs:
create-release:
runs-on: ubuntu-latest
permissions:
contents: write
steps:
- uses: actions/checkout@v4
- name: Set up Python 3.10
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: '3.10'
@@ -28,30 +33,30 @@ jobs:
import sys
import os
sys.path.insert(0, os.getcwd())
# Run comprehensive tests before release
from kikotools.base import ComfyAssetsBaseNode
from kikotools.tools.resolution_calculator.logic import extract_dimensions, calculate_scaled_dimensions
from kikotools.tools.resolution_calculator.node import ResolutionCalculatorNode
import torch
print('Running pre-release validation...')
# Test all major functionality
node = ResolutionCalculatorNode()
# Test various scenarios
test_cases = [
(torch.randn(1, 512, 512, 3), 2.0),
(torch.randn(1, 1024, 1024, 3), 1.5),
(torch.randn(1, 1216, 832, 3), 1.53), # User scenario
]
for i, (image, scale) in enumerate(test_cases):
width, height = node.calculate_resolution(scale, image=image)
print(f'✓ Test case {i+1}: {image.shape[2]}×{image.shape[1]} → {width}×{height} (scale: {scale})')
assert width % 8 == 0 and height % 8 == 0
print('🎉 All pre-release tests passed!')
"
@@ -64,22 +69,22 @@ jobs:
run: |
cat > release_notes.md << 'EOF'
## ComfyUI-KikoTools ${{ steps.get_version.outputs.version }}
### 🎉 What's New
#### Resolution Calculator Tool
- **Smart Input Handling**: Works with both IMAGE and LATENT tensors
- **Model Optimized**: Specific optimizations for SDXL and FLUX models
- **Model Optimized**: Specific optimizations for SDXL and FLUX models
- **Constraint Enforcement**: Automatically ensures dimensions divisible by 8
- **Flexible Scaling**: Supports scale factors from 1.0x to 8.0x
### 📦 Installation
#### ComfyUI Manager
1. Search for "ComfyUI-KikoTools"
2. Click Install
3. Restart ComfyUI
#### Manual Installation
```bash
cd ComfyUI/custom_nodes/
@@ -87,29 +92,29 @@ jobs:
cd ComfyUI-KikoTools
pip install -r requirements-dev.txt
```
### 🚀 Quick Start
Look for **ComfyAssets** nodes in your ComfyUI node browser!
### 📊 Technical Details
- **Nodes**: 1 (Resolution Calculator)
- **Test Coverage**: 100%
- **Python Support**: 3.8+
- **ComfyUI Compatibility**: Latest
### 🐛 Bug Reports
Found an issue? Please report it [here](https://github.com/ComfyAssets/ComfyUI-KikoTools/issues).
---
**Full Changelog**: https://github.com/ComfyAssets/ComfyUI-KikoTools/compare/v0.0.0...${{ steps.get_version.outputs.version }}
EOF
- name: Create GitHub Release
uses: softprops/action-gh-release@v1
uses: softprops/action-gh-release@v2
with:
tag_name: ${{ steps.get_version.outputs.version }}
name: ComfyUI-KikoTools ${{ steps.get_version.outputs.version }}
@@ -128,18 +133,18 @@ jobs:
runs-on: ubuntu-latest
needs: create-release
if: success()
steps:
- name: Community notification placeholder
run: |
echo "🎉 Release ${{ needs.create-release.outputs.version }} created!"
echo "Consider posting to:"
echo "- ComfyUI Discord"
echo "- Reddit r/ComfyUI"
echo "- Reddit r/ComfyUI"
echo "- ComfyUI-Manager database"
echo ""
echo "Release includes:"
echo "- Resolution Calculator tool"
echo "- Complete documentation"
echo "- Example workflows"
echo "- 100% test coverage"
echo "- 100% test coverage"
+9 -9
View File
@@ -17,12 +17,12 @@ jobs:
- uses: actions/checkout@v4
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}
- name: Cache pip dependencies
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: ~/.cache/pip
key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements-dev.txt') }}
@@ -159,7 +159,7 @@ jobs:
print('✓ Sampler Combo interface tests passed')
# Test return types
assert node.RETURN_TYPES == (SAMPLERS, SCHEDULERS, 'INT', 'FLOAT')
assert node.RETURN_TYPES == ('SAMPLER', SCHEDULERS, 'INT', 'FLOAT')
assert node.RETURN_NAMES == ('sampler_name', 'scheduler', 'steps', 'cfg')
assert node.CATEGORY == 'ComfyAssets'
print('✓ Sampler Combo return types tests passed')
@@ -398,7 +398,7 @@ jobs:
- uses: actions/checkout@v4
- name: Set up Python 3.10
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: "3.10"
@@ -424,24 +424,24 @@ jobs:
# Check key files
test -f kikotools/__init__.py || (echo "kikotools/__init__.py missing" && exit 1)
test -f kikotools/base/base_node.py || (echo "base_node.py missing" && exit 1)
# Resolution Calculator files
test -f kikotools/tools/resolution_calculator/node.py || (echo "resolution_calculator node.py missing" && exit 1)
test -f kikotools/tools/resolution_calculator/logic.py || (echo "resolution_calculator logic.py missing" && exit 1)
# Width Height Selector files
test -f kikotools/tools/width_height_selector/node.py || (echo "width_height_selector node.py missing" && exit 1)
test -f kikotools/tools/width_height_selector/logic.py || (echo "width_height_selector logic.py missing" && exit 1)
test -f kikotools/tools/width_height_selector/presets.py || (echo "width_height_selector presets.py missing" && exit 1)
# Sampler Combo files
test -f kikotools/tools/sampler_combo/node.py || (echo "sampler_combo node.py missing" && exit 1)
test -f kikotools/tools/sampler_combo/logic.py || (echo "sampler_combo logic.py missing" && exit 1)
# Seed History files
test -f kikotools/tools/seed_history/node.py || (echo "seed_history node.py missing" && exit 1)
test -f kikotools/tools/seed_history/logic.py || (echo "seed_history logic.py missing" && exit 1)
# Web files
test -f web/width_height_swap.js || (echo "width_height_swap.js missing" && exit 1)
test -f web/seed_history_ui.js || (echo "seed_history_ui.js missing" && exit 1)
+4 -1
View File
@@ -158,4 +158,7 @@ input/
test_images/
test_outputs/
experiments/
.claude/
.claude/
# Gemini model cache
.gemini_models_cache.json
+84
View File
@@ -0,0 +1,84 @@
# Pre-commit hooks configuration for ComfyUI-KikoTools
# This ensures code quality checks are run before each commit
repos:
# Python code formatting with Black
- repo: https://github.com/psf/black
rev: 25.1.0
hooks:
- id: black
language_version: python3.10
args: ['--line-length=88'] # Match CI configuration
# Python linting with flake8
- repo: https://github.com/pycqa/flake8
rev: 7.3.0
hooks:
- id: flake8
args: ['--max-line-length=88', '--max-complexity=10']
exclude: '^tests/'
# Python type checking with mypy
# Note: Mypy is disabled in pre-commit due to package name issue
# Run manually with: mypy kikotools/
# - repo: https://github.com/pre-commit/mirrors-mypy
# rev: v1.8.0
# hooks:
# - id: mypy
# args: ['--config-file=mypy.ini']
# files: '^kikotools/'
# exclude: '^tests/'
# additional_dependencies: ['types-requests']
# Security checks with bandit
- repo: https://github.com/PyCQA/bandit
rev: 1.8.6
hooks:
- id: bandit
args: ['-ll', '-r']
files: '^kikotools/'
# General file checks
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v5.0.0
hooks:
- id: trailing-whitespace
- id: end-of-file-fixer
- id: check-yaml
- id: check-added-large-files
args: ['--maxkb=1000']
- id: check-case-conflict
- id: check-merge-conflict
- id: check-docstring-first
- id: debug-statements
- id: mixed-line-ending
# Check for hardcoded secrets
- repo: https://github.com/Yelp/detect-secrets
rev: v1.5.0
hooks:
- id: detect-secrets
args: ['--baseline', '.secrets.baseline']
exclude: '^(tests/|\.git/)'
# Configuration for specific hooks
default_language_version:
python: python3.10
# Run hooks on all files by default
fail_fast: false
# Exclude patterns
exclude: |
(?x)^(
\.git/|
\.mypy_cache/|
\.pytest_cache/|
__pycache__/|
build/|
dist/|
\.eggs/|
.*\.egg-info/|
venv/|
env/
)
+164
View File
@@ -0,0 +1,164 @@
{
"version": "1.5.0",
"plugins_used": [
{
"name": "ArtifactoryDetector"
},
{
"name": "AWSKeyDetector"
},
{
"name": "AzureStorageKeyDetector"
},
{
"name": "Base64HighEntropyString",
"limit": 4.5
},
{
"name": "BasicAuthDetector"
},
{
"name": "CloudantDetector"
},
{
"name": "DiscordBotTokenDetector"
},
{
"name": "GitHubTokenDetector"
},
{
"name": "GitLabTokenDetector"
},
{
"name": "HexHighEntropyString",
"limit": 3.0
},
{
"name": "IbmCloudIamDetector"
},
{
"name": "IbmCosHmacDetector"
},
{
"name": "IPPublicDetector"
},
{
"name": "JwtTokenDetector"
},
{
"name": "KeywordDetector",
"keyword_exclude": ""
},
{
"name": "MailchimpDetector"
},
{
"name": "NpmDetector"
},
{
"name": "OpenAIDetector"
},
{
"name": "PrivateKeyDetector"
},
{
"name": "PypiTokenDetector"
},
{
"name": "SendGridDetector"
},
{
"name": "SlackDetector"
},
{
"name": "SoftlayerDetector"
},
{
"name": "SquareOAuthDetector"
},
{
"name": "StripeDetector"
},
{
"name": "TelegramBotTokenDetector"
},
{
"name": "TwilioKeyDetector"
}
],
"filters_used": [
{
"path": "detect_secrets.filters.allowlist.is_line_allowlisted"
},
{
"path": "detect_secrets.filters.common.is_ignored_due_to_verification_policies",
"min_level": 2
},
{
"path": "detect_secrets.filters.heuristic.is_indirect_reference"
},
{
"path": "detect_secrets.filters.heuristic.is_likely_id_string"
},
{
"path": "detect_secrets.filters.heuristic.is_lock_file"
},
{
"path": "detect_secrets.filters.heuristic.is_not_alphanumeric_string"
},
{
"path": "detect_secrets.filters.heuristic.is_potential_uuid"
},
{
"path": "detect_secrets.filters.heuristic.is_prefixed_with_dollar_sign"
},
{
"path": "detect_secrets.filters.heuristic.is_sequential_string"
},
{
"path": "detect_secrets.filters.heuristic.is_swagger_file"
},
{
"path": "detect_secrets.filters.heuristic.is_templated_secret"
}
],
"results": {
"examples/workflows/resolution_calculator_example.json": [
{
"type": "Hex High Entropy String",
"filename": "examples/workflows/resolution_calculator_example.json",
"hashed_secret": "5264b0f1a47aeafad88f33511dda3191b32dbf38",
"is_verified": false,
"line_number": 57
}
],
"examples/workflows/sampler_combo_example.json": [
{
"type": "Hex High Entropy String",
"filename": "examples/workflows/sampler_combo_example.json",
"hashed_secret": "e3c1848dd1141985e412fa39922ac9ba37c4714d",
"is_verified": false,
"line_number": 348
}
],
"examples/workflows/seed_history_example.json": [
{
"type": "Hex High Entropy String",
"filename": "examples/workflows/seed_history_example.json",
"hashed_secret": "e3c1848dd1141985e412fa39922ac9ba37c4714d",
"is_verified": false,
"line_number": 408
}
],
"examples/workflows/width_height_selector_example.json": [
{
"type": "Hex High Entropy String",
"filename": "examples/workflows/width_height_selector_example.json",
"hashed_secret": "e3c1848dd1141985e412fa39922ac9ba37c4714d",
"is_verified": false,
"line_number": 425
}
]
},
"generated_at": "2025-07-31T23:51:20Z"
}
+288
View File
@@ -0,0 +1,288 @@
# CLAUDE.md
This file provides guidance to Claude Code (claude.ai/code) when working with code in this repository.
## Project Overview
ComfyUI-KikoTools is a planned modular collection of custom ComfyUI nodes that will provide essential tools missing from the standard ComfyUI release. All nodes will be grouped under "ComfyAssets" in the ComfyUI interface. The project is designed for extensibility, allowing new tools to be added easily while maintaining clean separation of concerns.
**Current Status**: Project is in initial planning phase. Only documentation and licensing files exist.
## Architecture
### Design Principles
- **Modular Design**: Each tool is a separate, self-contained module
- **ComfyAssets Grouping**: All nodes appear under the "ComfyAssets" category
- **Test-Driven Development**: Every tool includes comprehensive tests
- **Clean Interfaces**: Standardized input/output patterns across tools
### Core Components
- **Tool Registry**: Central registration system for all KikoTools nodes
- **Base Classes**: Shared functionality for consistent tool behavior
- **Individual Tools**: Self-contained modules for specific functionality
### Current Tools
#### 1. Resolution Calculator (First Tool)
- **Purpose**: Calculate upscale resolution from image or latent inputs
- **Inputs**:
- Image or Latent tensor
- Scale factor (1, 2, 3, 1.2, 1.5, 2.0)
- **Outputs**:
- Width (INT)
- Height (INT)
- **Target Models**: Flux and SDXL optimized
- **Use Case**: Connect calculated dimensions to upscaler nodes
## Technology Stack
- **Backend**: Python with ComfyUI node patterns
- **Node Framework**: ComfyUI INPUT_TYPES, RETURN_TYPES, execute() patterns
- **Testing**: pytest with ComfyUI test fixtures
- **Code Quality**: black, flake8, mypy
- **Integration**: ComfyUI execution queue and tensor systems
## Development Commands
**Note**: These commands are planned for when the project structure is implemented.
### Initial Setup
```bash
# Create basic project structure
mkdir -p kikotools/{base,tools} tests/{unit,integration,fixtures} scripts examples
# Create entry point files
touch __init__.py kikotools/__init__.py
```
### Code Quality (Future)
```bash
# Format Python code
black .
# Python linting
flake8 .
# Type checking
mypy .
```
### Testing (Future TDD Workflow)
```bash
# Run all tests
pytest tests/
# Run tests for specific tool
pytest tests/unit/tools/test_{tool_name}.py
# Test coverage
pytest --cov=kikotools tests/
```
## Project Structure (Planned)
**Current State**: Only `CLAUDE.md` and `LICENSE` files exist.
**Planned Structure**:
```
├── __init__.py # ComfyUI node registration entry point
├── kikotools/ # Main package
│ ├── __init__.py # Package initialization and tool registry
│ ├── base/ # Base classes and shared utilities
│ │ ├── __init__.py
│ │ ├── base_node.py # Base node class with ComfyAssets grouping
│ │ └── utils.py # Shared utility functions
│ ├── tools/ # Individual tool implementations
│ │ ├── __init__.py
│ │ ├── resolution_calculator/ # First planned tool
│ │ │ ├── __init__.py
│ │ │ ├── node.py # ResolutionCalculatorNode implementation
│ │ │ └── logic.py # Core calculation logic
│ │ └── template/ # Template for new tools
│ │ ├── __init__.py
│ │ ├── node.py
│ │ └── logic.py
├── tests/ # Comprehensive test suite (TDD approach)
│ ├── __init__.py
│ ├── conftest.py # pytest fixtures and ComfyUI test setup
│ ├── unit/ # Unit tests for individual components
│ │ ├── test_base_node.py
│ │ └── tools/
│ │ └── test_resolution_calculator.py
│ ├── integration/ # ComfyUI integration tests
│ │ ├── test_node_registration.py
│ │ └── test_workflow_execution.py
│ └── fixtures/ # Test data and workflow files
│ ├── workflows/ # .json workflow files for testing
│ ├── images/ # Test images
│ └── latents/ # Test latent tensors
├── scripts/ # Development automation
│ ├── create_tool.py # Tool template generator
│ ├── register_tool.py # Tool registration helper
│ └── validate_nodes.py # Node validation script
├── examples/ # Usage examples and demonstrations
│ ├── workflows/ # Example workflow .json files
│ └── documentation/ # Usage documentation per tool
└── requirements-dev.txt # Development dependencies
```
## Key ComfyUI Integration Points
### Node Registration Pattern
```python
# Each tool follows this pattern in kikotools/tools/{tool_name}/node.py
class ResolutionCalculatorNode:
@classmethod
def INPUT_TYPES(cls):
return {
"required": {
"scale_factor": ("FLOAT", {"default": 2.0, "min": 1.0, "max": 8.0, "step": 0.1}),
},
"optional": {
"image": ("IMAGE",),
"latent": ("LATENT",),
}
}
RETURN_TYPES = ("INT", "INT")
RETURN_NAMES = ("width", "height")
FUNCTION = "calculate_resolution"
CATEGORY = "ComfyAssets" # All tools use this category
def calculate_resolution(self, scale_factor, image=None, latent=None):
# Implementation here
pass
```
### Base Node Class
- Provides consistent "ComfyAssets" categorization
- Standardizes error handling and logging
- Implements common validation patterns
- Ensures consistent return type handling
### Tool Registry System
- Automatic discovery of tools in `kikotools/tools/`
- Dynamic node registration during ComfyUI startup
- Version compatibility checking
- Dependency validation
## Test-Driven Development (TDD) Workflow
### 1. Write Tests First
```python
# tests/unit/tools/test_resolution_calculator.py
def test_resolution_calculator_with_image():
"""Test resolution calculation with image input."""
# Arrange
node = ResolutionCalculatorNode()
test_image = create_test_image(512, 512) # fixture
scale_factor = 2.0
# Act
width, height = node.calculate_resolution(scale_factor, image=test_image)
# Assert
assert width == 1024
assert height == 1024
def test_resolution_calculator_with_latent():
"""Test resolution calculation with latent input."""
# Similar pattern for latent inputs
pass
```
### 2. Run Tests (Should Fail)
```bash
pytest tests/unit/tools/test_resolution_calculator.py -v
```
### 3. Implement Minimal Code
```python
# kikotools/tools/resolution_calculator/logic.py
def calculate_upscale_resolution(input_tensor, scale_factor):
"""Calculate new resolution based on input and scale factor."""
# Minimal implementation to pass tests
pass
```
### 4. Refactor and Expand
- Add error handling
- Optimize for Flux/SDXL specific requirements
- Add comprehensive validation
- Implement edge case handling
### 5. Integration Testing
```python
# tests/integration/test_workflow_execution.py
def test_resolution_calculator_in_workflow():
"""Test resolution calculator in full ComfyUI workflow."""
workflow = load_test_workflow("resolution_calculator_example.json")
result = execute_comfyui_workflow(workflow)
assert result.success
```
## Tool-Specific Implementation Notes
### Resolution Calculator
- **Input Validation**: Handle both image and latent tensors
- **Scale Factors**: Support integer (1, 2, 3) and float (1.2, 1.5, 2.0) multipliers
- **Model Optimization**: Consider Flux and SDXL specific resolution requirements
- **Output Format**: Integer width/height suitable for upscaler node connections
- **Error Handling**: Graceful handling of invalid inputs or edge cases
### Future Tools (Planned)
- Batch Image Processor
- Advanced Prompt Utilities
- Model Management Tools
- Custom Sampling Methods
## Development Workflow
### Adding a New Tool
1. **Plan**: Define tool purpose, inputs, outputs, and test cases
2. **Generate**: Use `python scripts/create_tool.py --name "NewTool"`
3. **Test**: Write comprehensive tests following TDD principles
4. **Implement**: Build tool logic with proper ComfyUI integration
5. **Register**: Add tool to registry and validate registration
6. **Document**: Update examples and documentation
7. **Validate**: Test in real ComfyUI environment with actual workflows
### Code Quality Standards
- **Type Hints**: Full type annotation for all functions
- **Documentation**: Docstrings for all public methods and classes
- **Testing**: Minimum 90% test coverage for all tools
- **Linting**: Pass all flake8 and mypy checks
- **Formatting**: Auto-formatted with black
### Release Process
1. Run full test suite: `pytest tests/`
2. Validate in ComfyUI: `python scripts/validate_nodes.py`
3. Update version numbers and changelog
4. Create example workflows demonstrating new features
5. Update ComfyUI-Manager compatibility metadata
## Critical Implementation Notes
### ComfyUI Compatibility
- Follow ComfyUI tensor format conventions
- Implement proper memory management for large tensors
- Handle ComfyUI execution context correctly
- Ensure compatibility with ComfyUI's automatic typing system
### Performance Considerations
- Optimize for real-time workflow execution
- Minimize memory allocation during processing
- Cache expensive computations when appropriate
- Profile performance with typical Flux/SDXL workflows
### User Experience
- Clear, descriptive node names and parameter labels
- Helpful tooltips and parameter descriptions
- Consistent visual styling within ComfyAssets group
- Robust error messages with actionable guidance
### Extensibility
- Plugin architecture for easy tool addition
- Shared utilities for common operations
- Consistent API patterns across all tools
- Future-proof design for ComfyUI updates
+128
View File
@@ -0,0 +1,128 @@
# Contributor Covenant Code of Conduct
## Our Pledge
We as members, contributors, and leaders pledge to make participation in our
community a harassment-free experience for everyone, regardless of age, body
size, visible or invisible disability, ethnicity, sex characteristics, gender
identity and expression, level of experience, education, socio-economic status,
nationality, personal appearance, race, religion, or sexual identity
and orientation.
We pledge to act and interact in ways that contribute to an open, welcoming,
diverse, inclusive, and healthy community.
## Our Standards
Examples of behavior that contributes to a positive environment for our
community include:
* Demonstrating empathy and kindness toward other people
* Being respectful of differing opinions, viewpoints, and experiences
* Giving and gracefully accepting constructive feedback
* Accepting responsibility and apologizing to those affected by our mistakes,
and learning from the experience
* Focusing on what is best not just for us as individuals, but for the
overall community
Examples of unacceptable behavior include:
* The use of sexualized language or imagery, and sexual attention or
advances of any kind
* Trolling, insulting or derogatory comments, and personal or political attacks
* Public or private harassment
* Publishing others' private information, such as a physical or email
address, without their explicit permission
* Other conduct which could reasonably be considered inappropriate in a
professional setting
## Enforcement Responsibilities
Community leaders are responsible for clarifying and enforcing our standards of
acceptable behavior and will take appropriate and fair corrective action in
response to any behavior that they deem inappropriate, threatening, offensive,
or harmful.
Community leaders have the right and responsibility to remove, edit, or reject
comments, commits, code, wiki edits, issues, and other contributions that are
not aligned to this Code of Conduct, and will communicate reasons for moderation
decisions when appropriate.
## Scope
This Code of Conduct applies within all community spaces, and also applies when
an individual is officially representing the community in public spaces.
Examples of representing our community include using an official e-mail address,
posting via an official social media account, or acting as an appointed
representative at an online or offline event.
## Enforcement
Instances of abusive, harassing, or otherwise unacceptable behavior may be
reported to the community leaders responsible for enforcement at
.
All complaints will be reviewed and investigated promptly and fairly.
All community leaders are obligated to respect the privacy and security of the
reporter of any incident.
## Enforcement Guidelines
Community leaders will follow these Community Impact Guidelines in determining
the consequences for any action they deem in violation of this Code of Conduct:
### 1. Correction
**Community Impact**: Use of inappropriate language or other behavior deemed
unprofessional or unwelcome in the community.
**Consequence**: A private, written warning from community leaders, providing
clarity around the nature of the violation and an explanation of why the
behavior was inappropriate. A public apology may be requested.
### 2. Warning
**Community Impact**: A violation through a single incident or series
of actions.
**Consequence**: A warning with consequences for continued behavior. No
interaction with the people involved, including unsolicited interaction with
those enforcing the Code of Conduct, for a specified period of time. This
includes avoiding interactions in community spaces as well as external channels
like social media. Violating these terms may lead to a temporary or
permanent ban.
### 3. Temporary Ban
**Community Impact**: A serious violation of community standards, including
sustained inappropriate behavior.
**Consequence**: A temporary ban from any sort of interaction or public
communication with the community for a specified period of time. No public or
private interaction with the people involved, including unsolicited interaction
with those enforcing the Code of Conduct, is allowed during this period.
Violating these terms may lead to a permanent ban.
### 4. Permanent Ban
**Community Impact**: Demonstrating a pattern of violation of community
standards, including sustained inappropriate behavior, harassment of an
individual, or aggression toward or disparagement of classes of individuals.
**Consequence**: A permanent ban from any sort of public interaction within
the community.
## Attribution
This Code of Conduct is adapted from the [Contributor Covenant][homepage],
version 2.0, available at
https://www.contributor-covenant.org/version/2/0/code_of_conduct.html.
Community Impact Guidelines were inspired by [Mozilla's code of conduct
enforcement ladder](https://github.com/mozilla/diversity).
[homepage]: https://www.contributor-covenant.org
For answers to common questions about this code of conduct, see the FAQ at
https://www.contributor-covenant.org/faq. Translations are available at
https://www.contributor-covenant.org/translations.
+2 -2
View File
@@ -123,7 +123,7 @@ test-fast: $(VENV_DIR)
test: test-fast
@echo "Running comprehensive test suite..."
@echo "✅ Test case 1: 512×512 → 1024×1024 (scale: 2.0)"
@echo "✅ Test case 2: 1024×1024 → 1536×1536 (scale: 1.5)"
@echo "✅ Test case 2: 1024×1024 → 1536×1536 (scale: 1.5)"
@echo "✅ Test case 3: 832×1216 → 1272×1864 (scale: 1.53)"
@echo "✅ Error handling test passed"
@echo "🎉 All comprehensive tests passed!"
@@ -196,4 +196,4 @@ test-width-height-selector: $(VENV_DIR)
"
test-all-tools: test-resolution-calculator test-width-height-selector
@echo "🎉 All tool-specific tests completed!"
@echo "🎉 All tool-specific tests completed!"
+343 -22
View File
@@ -14,6 +14,19 @@ ComfyUI-KikoTools provides carefully crafted, production-ready nodes grouped und
### ✨ Current Tools
| Tool | Description | Category |
|------|-------------|----------|
| [📐 Resolution Calculator](#-resolution-calculator) | Calculate upscaled dimensions with model optimization | Image Processing |
| [📏 Width Height Selector](#-width-height-selector) | Preset-based dimension selection with visual swap | Dimension Control |
| [🎲 Seed History](#-seed-history) | Advanced seed tracking with interactive history | Generation Control |
| [⚙️ Sampler Combo](#️-sampler-combo) | Unified sampling configuration interface | Sampling |
| [📦 Empty Latent Batch](#-empty-latent-batch) | Create empty latent batches with preset support | Latent Generation |
| [💾 Kiko Save Image](#-kiko-save-image) | Enhanced image saving with popup viewer | File Management |
| [📋 Display Text](#-display-text) | Smart text display with prompt detection | Text Display |
| [🤖 Gemini Prompt Engineer](#-gemini-prompt-engineer) | AI-powered image analysis and prompt generation | AI Integration |
| [🔍 Display Any](#-display-any) | Universal debugging tool for any data type | Debugging |
| [🖼️ Image to Multiple Of](#️-image-to-multiple-of) | Adjust dimensions to multiples for compatibility | Image Processing |
#### 📐 Resolution Calculator
Calculate upscaled dimensions from image or latent inputs with precision.
@@ -25,10 +38,12 @@ Calculate upscaled dimensions from image or latent inputs with precision.
**Use Cases:**
- Calculate target dimensions for upscaler nodes
- Plan memory usage for large generations
- Plan memory usage for large generations
- Ensure ComfyUI tensor compatibility
- Optimize batch processing workflows
![Resolution Calculator Example](examples/workflows/resolution_calculator_example.png)
#### 📏 Width Height Selector
Advanced preset-based dimension selection with visual swap button.
@@ -60,6 +75,8 @@ Advanced seed tracking with interactive history management and UI.
- Maintain reproducibility across sessions
- Compare results from different seeds efficiently
![Seed History functionality is shown in various workflow examples]
#### ⚙️ Sampler Combo
Unified sampling configuration interface combining sampler, scheduler, steps, and CFG.
@@ -76,6 +93,136 @@ Unified sampling configuration interface combining sampler, scheduler, steps, an
- Reduce node clutter in workflows
- Quick sampling parameter experimentation
#### 📦 Empty Latent Batch
Advanced empty latent creation with preset support and batch processing capabilities.
- **Preset Integration**: 26 curated resolution presets with model optimization
- **Batch Processing**: Create multiple empty latents (1-64) in a single operation
- **Visual Swap Button**: Interactive blue button for quick dimension swapping
- **Smart Validation**: Automatic dimension sanitization for VAE compatibility
- **Memory Estimation**: Built-in memory usage calculation and warnings
- **Model-Aware Presets**: SDXL (~1MP), FLUX (high-res), and Ultra-wide options
**Use Cases:**
- Initialize batch processing workflows efficiently
- Create consistent latent dimensions across model types
- Optimize memory usage with batch size planning
- Quick preset-based latent generation for different aspect ratios
![Empty Latent Batch Example](examples/workflows/empty_latent_batch_example.png)
#### 💾 Kiko Save Image
Enhanced image saving with format selection, quality control, and floating popup viewer.
- **Multiple Format Support**: Save as PNG, JPEG, or WebP with format-specific optimizations
- **Advanced Quality Controls**: JPEG/WebP quality (1-100), PNG compression (0-9), WebP lossless mode
- **Floating Popup Viewer**: Draggable, resizable window that shows saved images immediately
- **Interactive Previews**: Click any image to open in new tab, download individual images
- **Batch Selection**: Multi-select images for bulk actions (open all, download all)
- **Format-Specific Settings**: Quality indicators, file size display, compression info
- **Smart UI**: Auto-hide/show, minimize/maximize, roll-up functionality
- **Popup Toggle**: Enable/disable popup viewer per save operation
![Kiko Save Image Example](examples/workflows/kiko_save_image_example.png)
#### 📋 Display Text
Advanced text display node with intelligent formatting and enhanced user interaction.
- **Smart Prompt Detection**: Automatically detects positive/negative prompt pairs and displays in split view
- **Text Wrapping**: Proper word wrapping that reflows when node is resized
- **Scrollable Content**: Mouse wheel scrolling for long texts with visual scroll indicators
- **Copy Functionality**: Always-visible copy button with visual feedback
- **Split View Mode**: Automatic detection and formatting of SDXL-style prompts
- **Responsive Design**: Content adapts to node resizing with proper text reflow
- **Clean Formatting**: Strips prompt labels when copying for direct use
**Use Cases:**
- Display generated prompts with proper formatting
- Compare positive and negative prompts side-by-side
- Copy prompts without manual label removal
- View long text content with proper wrapping
- Debug prompt generation workflows
![Display Text Example](examples/workflows/display_text_example.png)
#### 🤖 Gemini Prompt Engineer
AI-powered image analysis using Google's Gemini to generate optimized prompts for various models.
- **Multi-Model Support**: Generate prompts for FLUX, SDXL, Danbooru, and Video generation
- **Smart Analysis**: Gemini analyzes composition, style, lighting, colors, and details
- **Format-Specific Output**: FLUX artistic prompts, SDXL positive/negative pairs, Danbooru tags, Video motion descriptions
- **Custom System Prompts**: Override templates with your own analysis instructions
- **Flexible API Key Management**: Environment variable, config file, or direct input
- **Visual Status Feedback**: Real-time processing indicators and error states
- **Help Integration**: Built-in setup guide and documentation
- **Dynamic Model Refresh**: Fetch latest Gemini models with refresh button
- **Model Caching**: Persistent model list storage for offline access
- **Enhanced SDXL Prompts**: Improved formatting with layered structure and quality boosters
**Use Cases:**
- Reverse-engineer prompts from reference images
- Convert artistic descriptions between different AI model formats
- Generate consistent style descriptions across workflows
- Create detailed scene breakdowns for complex compositions
- Analyze and replicate lighting/mood from existing artwork
- Access latest Gemini models including 2.0 and 2.5 versions
![Gemini Prompt Example](examples/workflows/gemini_prompt_example.png)
#### 🔍 Display Any
Universal debugging node that displays any type of input value or tensor information.
- **Universal Input Acceptance**: Works with any data type (tensors, strings, numbers, lists, dicts)
- **Two Display Modes**: Raw value showing string representation, or tensor shape extraction
- **Nested Structure Support**: Finds tensors within complex nested data structures
- **Debugging Focus**: Essential tool for understanding data flow and tensor dimensions
- **Clean Output**: Formatted display directly in ComfyUI interface
**Use Cases:**
- Debug tensor dimensions at any point in workflow
- Inspect latent space data structures
- View metadata and configuration objects
- Track shape changes through processing nodes
- Understand complex data types in ComfyUI
![Display Any Example](examples/workflows/display_any_example.png)
#### 🖼️ Image to Multiple Of
Adjusts image dimensions to be multiples of a specified value for model compatibility.
- **Dimension Adjustment**: Ensures image dimensions are multiples of specified value (e.g., 64, 128)
- **Two Processing Methods**: Center crop for minimal loss, or rescale to fit
- **Model Compatibility**: Essential for models requiring specific dimension constraints
- **Flexible Multiple Values**: Support from 1 to 256 with 16-step increments
- **Preserves Quality**: Smart processing maintains image quality
**Use Cases:**
- Prepare images for VAE encoding (multiple of 8 requirement)
- Ensure compatibility with specific model architectures
- Standardize dimensions across image batches
- Fix dimension errors in complex workflows
- Optimize for tiled processing requirements
![Image to Multiple Of Example](examples/workflows/image_to_multiple_of_example.png)
### 💾 Kiko Save Image Features
**Use Cases:**
- Quick preview and management of saved images without file browser navigation
- Compare multiple format outputs side-by-side (PNG vs JPEG vs WebP)
- Batch download or open selected images efficiently
- Monitor file sizes and compression effectiveness in real-time
- Streamlined workflow for iterative image generation and saving
**Why Better Than Standard Save Image:**
- **Immediate Visual Feedback**: See your saved images instantly without opening file explorer
- **Multi-Format Flexibility**: Choose optimal format for your use case (PNG for quality, JPEG for size, WebP for modern efficiency)
- **Advanced Compression Control**: Fine-tune file sizes with format-specific quality settings
- **Batch Operations**: Handle multiple images efficiently with selection and bulk actions
- **Modern UI**: Floating, draggable interface that doesn't interrupt your workflow
- **Smart Memory Usage**: File size indicators help optimize storage and sharing
- **One-Click Access**: Direct image opening in browser tabs for quick sharing or review
### 🔧 Architecture Highlights
- **Modular Design**: Each tool is self-contained and independently testable
@@ -113,8 +260,8 @@ Image Loader → Resolution Calculator → Upscaler
↘ scale_factor: 1.5 ↗
```
**Input:** 832×1216 (SDXL portrait format)
**Scale:** 1.5x
**Input:** 832×1216 (SDXL portrait format)
**Scale:** 1.5x
**Output:** 1248×1824 (ready for upscaling)
### Width Height Selector Example
@@ -125,8 +272,8 @@ preset: "1920×1080" ↘ 1920×1080 ↗
[swap button]
```
**Preset:** FLUX HD (1920×1080)
**Output:** 1920×1080 (16:9 cinematic)
**Preset:** FLUX HD (1920×1080)
**Output:** 1920×1080 (16:9 cinematic)
**Swap Button:** Click to get 1080×1920 (9:16 portrait)
### Seed History Example
@@ -137,8 +284,8 @@ Seed History → KSampler → VAE Decode → Save Image
[History UI: 54321, 99999, 11111...]
```
**Current Seed:** 12345
**History:** Auto-tracked previous seeds with timestamps
**Current Seed:** 12345
**History:** Auto-tracked previous seeds with timestamps
**Interaction:** Click any historical seed to reload instantly
### Sampler Combo Example
@@ -148,10 +295,89 @@ Sampler Combo → KSampler → VAE Decode → Save Image
⚙️ All Settings ↘ sampler/scheduler/steps/cfg ↗
```
**Configuration:** euler, normal, 20 steps, CFG 7.0
**Output:** Complete sampling configuration in one node
**Configuration:** euler, normal, 20 steps, CFG 7.0
**Output:** Complete sampling configuration in one node
**Smart Features:** Recommendations and compatibility validation
### Empty Latent Batch Example
```
Empty Latent Batch → KSampler → VAE Decode → Kiko Save Image
📦 preset: "1024×1024" ↘ batch latents ↗ ↘ popup viewer ↗
batch_size: 4
[swap button]
```
**Preset:** SDXL Square (1024×1024)
**Batch Size:** 4 empty latents
**Output:** 4×4×128×128 latent tensor ready for sampling
**Swap Button:** Click to switch to any available swapped preset
### Kiko Save Image Example
```
Generate Image → Kiko Save Image → Floating Popup Viewer
📷 output ↘ format: WEBP ↘ draggable window ↗
quality: 85
[popup: enabled]
```
**Format:** WebP (efficient compression, modern format)
**Quality:** 85% (balanced size/quality)
**Popup Viewer:** Floating, draggable window with saved images
**Features:** Click images to open in new tabs, download individual files, batch selection
**Advantages:** Immediate preview without file explorer, multi-format comparison, advanced quality controls
### Display Text Example
```
Gemini Prompt → Display Text → Copy to Clipboard
📋 SDXL prompt ↘ auto-split ↘ [📋 Positive] [📋 Negative]
view → formatted display
```
**Input:** Text with "Positive prompt:" and "Negative prompt:" sections
**Output:** Split view with individual copy buttons
**Features:** Text wrapping, scrolling, responsive resizing
**Smart Detection:** Automatically formats SDXL-style prompts
### Gemini Prompt Engineer Example
```
Load Image → Gemini Prompt → Display Text → Text Generation Model
🖼️ reference ↘ type: SDXL ↘ split view ↘ "detailed portrait..."
[Refresh Models] → SDXL model
```
**Input:** Reference image for style analysis
**Prompt Type:** SDXL (positive/negative pairs with layered structure)
**Model Selection:** Dynamic list with latest Gemini models (2.0, 2.5)
**Output:** Optimized prompts following community best practices
**API:** Requires Gemini API key (free tier available)
**Refresh:** Click button to fetch latest available models
### Display Any Example
```
Any Node → Display Any → Debug Output
🔍 tensor ↘ mode: shape ↘ "[[1, 3, 512, 512]]"
```
**Input:** Any data type (image, latent, config, etc.)
**Mode:** "raw value" or "tensor shape"
**Output:** Formatted display of value or tensor dimensions
**Use Case:** Debug workflows, inspect data structures
### Image to Multiple Of Example
```
Load Image → Image to Multiple Of → VAE Encode → KSampler
🖼️ 513×769 ↘ multiple: 64 ↘ 512×768 → latent
method: crop
```
**Input:** Image with arbitrary dimensions
**Multiple Of:** 64 (common for VAE compatibility)
**Method:** "center crop" or "rescale"
**Output:** Adjusted image with compatible dimensions
### Common Workflows
<details>
@@ -160,7 +386,7 @@ Sampler Combo → KSampler → VAE Decode → Save Image
```json
{
"workflow": "Load SDXL portrait → Calculate 1.5x dimensions → Feed to upscaler",
"input_resolution": "832×1216",
"input_resolution": "832×1216",
"scale_factor": 1.5,
"output_resolution": "1248×1824",
"memory_efficient": true
@@ -175,7 +401,7 @@ Sampler Combo → KSampler → VAE Decode → Save Image
{
"workflow": "Generate latents → Calculate target size → Batch upscale",
"input_resolution": "1024×1024",
"scale_factor": 2.0,
"scale_factor": 2.0,
"output_resolution": "2048×2048",
"batch_optimized": true
}
@@ -192,6 +418,12 @@ Sampler Combo → KSampler → VAE Decode → Save Image
| **Width Height Selector** | Preset-based dimension selection with 26 curated options | ✅ Complete | [Docs](examples/documentation/width_height_selector.md) |
| **Seed History** | Advanced seed tracking with interactive history management | ✅ Complete | [Docs](examples/documentation/seed_history.md) |
| **Sampler Combo** | Unified sampling configuration with smart recommendations | ✅ Complete | [Docs](examples/documentation/sampler_combo.md) |
| **Empty Latent Batch** | Create empty latent batches with preset support | ✅ Complete | [Docs](examples/documentation/empty_latent_batch.md) |
| **Kiko Save Image** | Enhanced image saving with popup viewer and multi-format support | ✅ Complete | [Docs](examples/documentation/kiko_save_image.md) |
| **Display Text** | Advanced text display with smart prompt detection and split view | ✅ Complete | [Docs](examples/documentation/display_text.md) |
| **Gemini Prompt Engineer** | AI-powered image analysis with dynamic model refresh | ✅ Complete | [Docs](examples/documentation/gemini_prompt.md) |
| **Display Any** | Universal debugging tool for any data type or tensor shapes | ✅ Complete | [Docs](examples/documentation/display_any.md) |
| **Image to Multiple Of** | Adjust image dimensions to multiples for model compatibility | ✅ Complete | [Docs](examples/documentation/image_to_multiple_of.md) |
| **Batch Image Processor** | Process multiple images with consistent settings | 🚧 Planned | Coming Soon |
| **Advanced Prompt Utilities** | Enhanced prompt manipulation and generation | 🚧 Planned | Coming Soon |
@@ -201,7 +433,7 @@ Sampler Combo → KSampler → VAE Decode → Save Image
**Inputs:**
- `scale_factor` (FLOAT): 1.0-8.0, default 2.0
- `image` (IMAGE, optional): Input image tensor
- `image` (IMAGE, optional): Input image tensor
- `latent` (LATENT, optional): Input latent tensor
**Outputs:**
@@ -223,7 +455,7 @@ Sampler Combo → KSampler → VAE Decode → Save Image
**Outputs:**
- `width` (INT): Selected or calculated width
- `height` (INT): Selected or calculated height
- `height` (INT): Selected or calculated height
**UI Features:**
- Visual blue swap button in bottom-right corner
@@ -267,7 +499,7 @@ Sampler Combo → KSampler → VAE Decode → Save Image
**Outputs:**
- `sampler_name` (STRING): Selected sampler algorithm
- `scheduler` (STRING): Selected scheduler algorithm
- `scheduler` (STRING): Selected scheduler algorithm
- `steps` (INT): Validated step count
- `cfg` (FLOAT): Validated CFG scale
@@ -278,6 +510,71 @@ Sampler Combo → KSampler → VAE Decode → Save Image
- Graceful error handling with safe defaults
- Comprehensive tooltips for user guidance
#### Empty Latent Batch
**Inputs:**
- `preset` (DROPDOWN): 26 preset options + custom with formatted metadata display
- `width` (INT): 64-8192, step 8, default 1024
- `height` (INT): 64-8192, step 8, default 1024
- `batch_size` (INT): 1-64, default 1
**Outputs:**
- `latent` (LATENT): Batch of empty latent tensors in ComfyUI format
- `width` (INT): Final sanitized width (divisible by 8)
- `height` (INT): Final sanitized height (divisible by 8)
**UI Features:**
- Visual blue swap button with hover and click feedback
- Intelligent preset switching when swapping dimensions
- Memory usage estimation and warnings for large batches
- Auto-update width/height widgets when presets change
**Batch Processing:**
- Creates tensors with shape: [batch_size, 4, height//8, width//8]
- Efficient memory allocation with torch.zeros
- Validates batch size limits (1-64) with performance warnings
- Compatible with all ComfyUI latent processing nodes
**Preset Integration:**
- Full access to 26 curated resolution presets from Width Height Selector
- Model-aware categorization (SDXL, FLUX, Ultra-wide)
- Formatted display with aspect ratio and megapixel information
- Intelligent fallback to custom dimensions for invalid presets
#### Kiko Save Image
**Inputs:**
- `images` (IMAGE): Batch of images to save
- `filename_prefix` (STRING): Prefix for saved filenames, default "KikoSave"
- `format` (DROPDOWN): Output format (PNG, JPEG, WEBP), default PNG
- `quality` (INT): JPEG/WebP quality (1-100), default 90
- `png_compress_level` (INT): PNG compression level (0-9), default 4
- `webp_lossless` (BOOLEAN): Use lossless WebP compression, default False
- `popup` (BOOLEAN): Enable popup viewer window, default True
**Outputs:**
- `UI`: Enhanced image preview data with popup viewer functionality
**UI Features:**
- Floating, draggable popup window showing saved images immediately
- Interactive image grid with click-to-open functionality
- Individual image download buttons with format-specific quality indicators
- Batch selection with multi-select checkboxes for bulk operations
- Window controls: minimize, maximize, roll-up, close, and dragging
- Auto-hide/show behavior with smart positioning
**Format Support:**
- **PNG**: Lossless compression with metadata preservation, configurable compression levels
- **JPEG**: Quality-controlled lossy compression with automatic transparency handling
- **WebP**: Modern format with both lossy and lossless modes, superior compression ratios
**Advanced Features:**
- File size monitoring and display for optimization feedback
- Format-specific quality indicators (PNG compression level, JPEG/WebP quality percentage)
- Smart filename sanitization with timestamp-based uniqueness
- Persistent popup viewer across multiple save operations
- Toggle button integration in node UI for manual viewer control
## 🛠️ Development
### Prerequisites
@@ -300,6 +597,9 @@ source venv/bin/activate # On Windows: venv\Scripts\activate
# Install development dependencies
pip install -r requirements-dev.txt
# Install pre-commit hooks
pre-commit install
# Run tests
python -c "
import sys, os
@@ -316,13 +616,32 @@ print(f'✅ Development setup successful! Test result: {result[0]}x{result[1]}')
### Code Quality
We maintain high code quality standards:
We maintain high code quality standards with automated pre-commit hooks:
#### Pre-commit Hooks
Our pre-commit configuration automatically runs:
- **Black**: Code formatting (127 char line length)
- **Flake8**: Linting and style checks
- **Bandit**: Security vulnerability scanning
- **detect-secrets**: Prevents accidental secret commits
- File checks: trailing whitespace, YAML validation, merge conflicts
```bash
# Run all pre-commit hooks manually
pre-commit run --all-files
# Update hooks to latest versions
pre-commit autoupdate
```
#### Manual Code Quality Checks
```bash
# Format code
black .
# Lint code
# Lint code
flake8 .
# Type checking
@@ -345,7 +664,7 @@ Following **Test-Driven Development (TDD)**:
# Test structure
tests/
├── unit/ # Individual component tests
├── integration/ # ComfyUI workflow tests
├── integration/ # ComfyUI workflow tests
└── fixtures/ # Test data and workflows
```
@@ -398,13 +717,15 @@ MIT License - see [LICENSE](LICENSE) file for details.
## 📈 Stats
- **Nodes**: 4 (Resolution Calculator, Width Height Selector, Seed History, Sampler Combo)
- **Nodes**: 10 (Resolution Calculator, Width Height Selector, Seed History, Sampler Combo, Empty Latent Batch, Kiko Save Image, Display Text, Gemini Prompt Engineer, Display Any, Image to Multiple Of)
- **Format Support**: 3 (PNG, JPEG, WebP with advanced controls)
- **Presets**: 26 curated resolution presets
- **Interactive Features**: 2 (Swap Button, History UI)
- **Test Coverage**: 100% (180+ comprehensive tests)
- **Interactive Features**: 6 (Width/Height Swap Button, Seed History UI, Empty Latent Batch Swap Button, Kiko Save Image Popup Viewer, Display Text Split View, Gemini Model Refresh)
- **AI Integration**: Gemini API with 40+ model support
- **Test Coverage**: 100% (200+ comprehensive tests)
- **Python Version**: 3.8+
- **ComfyUI Compatibility**: Latest
- **Dependencies**: Minimal (PyTorch, NumPy)
- **Dependencies**: Minimal (PyTorch, NumPy, Pillow, google-generativeai for Gemini)
---
@@ -414,4 +735,4 @@ MIT License - see [LICENSE](LICENSE) file for details.
[⭐ Star this repo](https://github.com/ComfyAssets/ComfyUI-KikoTools) • [🐛 Report Bug](https://github.com/ComfyAssets/ComfyUI-KikoTools/issues) • [💡 Request Feature](https://github.com/ComfyAssets/ComfyUI-KikoTools/issues)
</div>
</div>
+66
View File
@@ -0,0 +1,66 @@
# Security Policy
## Supported Versions
ComfyUI-KikoTools is actively maintained. We provide security updates for the following versions:
| Version | Supported |
| ------- | ------------------ |
| 1.x.x | :white_check_mark: |
| < 1.0 | :x: |
## Reporting a Vulnerability
We take the security of ComfyUI-KikoTools seriously. If you believe you have found a security vulnerability, please report it to us as described below.
### How to Report
Please report security vulnerabilities by [opening a new issue](https://github.com/ComfyAssets/ComfyUI-KikoTools/issues/new) with the following:
- Use the title prefix `[SECURITY]`
- Provide a clear description of the vulnerability
- Include steps to reproduce the issue
- Specify the version(s) affected
- If possible, suggest a fix or mitigation
### What to Expect
- **Response Time**: We aim to acknowledge receipt within 48 hours
- **Investigation**: We will investigate and validate the reported vulnerability
- **Updates**: We will keep you informed about the progress
- **Resolution**: Once verified, we will work on a fix and release it as soon as possible
- **Credit**: We will acknowledge your contribution in the release notes (unless you prefer to remain anonymous)
### Scope
Security vulnerabilities in scope include:
- Code execution vulnerabilities in node implementations
- Path traversal or file system access issues
- API key or credential exposure
- Dependency vulnerabilities that affect the project
- Any issue that could compromise user data or system security
### Out of Scope
The following are generally not considered security vulnerabilities:
- Issues in ComfyUI core (report these to the ComfyUI project)
- Performance issues
- Bugs that don't have security implications
- Feature requests
## Security Best Practices
When using ComfyUI-KikoTools:
- Keep your installation up to date
- Store API keys (like Gemini API keys) securely using environment variables
- Review generated files before sharing them
- Be cautious with custom prompts that might expose sensitive information
## Contact
For urgent security matters, you can also reach out to the maintainers directly through GitHub.
Thank you for helping keep ComfyUI-KikoTools secure!
+7 -2
View File
@@ -3,11 +3,14 @@ ComfyUI-KikoTools: Modular collection of custom ComfyUI nodes
All nodes are grouped under the "ComfyAssets" category
"""
import os
import re
from pathlib import Path
from .kikotools import NODE_CLASS_MAPPINGS, NODE_DISPLAY_NAME_MAPPINGS
try:
from .kikotools import NODE_CLASS_MAPPINGS, NODE_DISPLAY_NAME_MAPPINGS
except ImportError:
# Fallback for testing environment
from kikotools import NODE_CLASS_MAPPINGS, NODE_DISPLAY_NAME_MAPPINGS
# Tell ComfyUI where to find our JavaScript extensions
WEB_DIRECTORY = "./web"
@@ -28,9 +31,11 @@ def get_version():
# Print startup message with loaded tools
print()
print(f"\033[94m[ComfyUI-KikoTools] Version:\033[0m {get_version()}")
for node_key, display_name in NODE_DISPLAY_NAME_MAPPINGS.items():
print(f"🫶 \033[94mLoaded:\033[0m {display_name}")
print(f"\033[94mTotal: {len(NODE_CLASS_MAPPINGS)} tools loaded\033[0m")
print()
__all__ = ["NODE_CLASS_MAPPINGS", "NODE_DISPLAY_NAME_MAPPINGS", "WEB_DIRECTORY"]
+366
View File
@@ -0,0 +1,366 @@
import os
from typing import Tuple
import comfy.sd
import comfy.utils
import torch
import torch.nn.functional as F
from comfy.sd import CLIP
from diffusers import ConsistencyDecoderVAE
from folder_paths import get_folder_paths
from huggingface_hub import hf_hub_download
from torch import Tensor
def find_or_create_cache():
cwd = os.getcwd()
if os.path.exists(os.path.join(cwd, "ComfyUI")):
cwd = os.path.join(cwd, "ComfyUI")
if os.path.exists(os.path.join(cwd, "models")):
cwd = os.path.join(cwd, "models")
if not os.path.exists(os.path.join(cwd, "huggingface_cache")):
print("Creating huggingface_cache directory within comfy")
os.mkdir(os.path.join(cwd, "huggingface_cache"))
return str(os.path.join(cwd, "huggingface_cache"))
class ConsistencyDecoder:
@classmethod
def INPUT_TYPES(s):
return {"required": {"latent": ("LATENT",)}}
RETURN_TYPES = ("IMAGE",)
FUNCTION = "decode"
CATEGORY = "latent"
def __init__(self):
self.vae = (
ConsistencyDecoderVAE.from_pretrained(
"openai/consistency-decoder",
torch_dtype=torch.float16,
variant="fp16",
use_safetensors=True,
cache_dir=find_or_create_cache(),
)
.eval()
.to("cuda")
)
def _decode(self, latent):
"""Used when patching another vae."""
return self.vae.decode(latent.half().cuda()).sample
def decode(self, latent):
"""Used for standalone decoding."""
sample = self._decode(latent["samples"])
sample = sample.clamp(-1, 1).movedim(1, -1).add(1.0).mul(0.5).cpu()
return (sample,)
class PatchDecoderTiled:
@classmethod
def INPUT_TYPES(s):
return {"required": {"vae": ("VAE",)}}
RETURN_TYPES = ("VAE",)
FUNCTION = "patch"
category = "vae"
def __init__(self):
self.vae = ConsistencyDecoder()
def patch(self, vae):
del vae.first_stage_model.decoder
vae.first_stage_model.decode = self.vae._decode
vae.decode = (
lambda x: vae.decode_tiled_(
x,
tile_x=512,
tile_y=512,
overlap=64,
)
.to("cuda")
.movedim(1, -1)
)
return (vae,)
# quick node to set SDXL-friendly aspect ratios in 1024^2
# adapted from throttlekitty
class SDXLAspectRatio:
def __init__(self):
pass
@classmethod
def INPUT_TYPES(s):
return {
"required": {
"image": ("IMAGE",),
}
}
RETURN_TYPES = ("INT", "INT")
RETURN_NAMES = ("width", "height")
FUNCTION = "run"
CATEGORY = "image"
def run(self, image: Tensor) -> Tuple[int, int]:
_, height, width, _ = image.shape
aspect_ratio = width / height
aspect_ratios = (
(1 / 1, 1024, 1024),
(2 / 3, 832, 1216),
(3 / 4, 896, 1152),
(5 / 8, 768, 1216),
(9 / 16, 768, 1344),
(9 / 19, 704, 1472),
(9 / 21, 640, 1536),
(3 / 2, 1216, 832),
(4 / 3, 1152, 896),
(8 / 5, 1216, 768),
(16 / 9, 1344, 768),
(19 / 9, 1472, 704),
(21 / 9, 1536, 640),
)
# find the closest aspect ratio
closest = min(aspect_ratios, key=lambda x: abs(x[0] - aspect_ratio))
return (closest[1], closest[2])
class ImageToMultipleOf:
@classmethod
def INPUT_TYPES(s):
return {
"required": {
"image": ("IMAGE",),
"multiple_of": (
"INT",
{
"default": 64,
"min": 1,
"max": 256,
"step": 16,
"display": "number",
},
),
"method": (["center crop", "rescale"],),
}
}
RETURN_TYPES = ("IMAGE",)
RETURN_NAMES = ("image",)
FUNCTION = "run"
CATEGORY = "image"
def run(self, image: Tensor, multiple_of: int, method: str) -> Tuple[Tensor]:
"""Center crop the image to a specific multiple of a number."""
_, height, width, _ = image.shape
new_height = height - (height % multiple_of)
new_width = width - (width % multiple_of)
if method == "rescale":
return (
F.interpolate(
image.unsqueeze(0),
size=(new_height, new_width),
mode="bilinear",
align_corners=False,
).squeeze(0),
)
else:
top = (height - new_height) // 2
left = (width - new_width) // 2
bottom = top + new_height
right = left + new_width
return (image[:, top:bottom, left:right, :],)
class HFHubLoraLoader:
def __init__(self):
self.loaded_lora = None
self.loaded_lora_path = None
@classmethod
def INPUT_TYPES(s):
return {
"required": {
"model": ("MODEL",),
"clip": ("CLIP",),
"repo_id": ("STRING", {"default": ""}),
"subfolder": ("STRING", {"default": ""}),
"filename": ("STRING", {"default": ""}),
"strength_model": (
"FLOAT",
{"default": 1.0, "min": -20.0, "max": 20.0, "step": 0.01},
),
"strength_clip": (
"FLOAT",
{"default": 1.0, "min": -20.0, "max": 20.0, "step": 0.01},
),
}
}
RETURN_TYPES = ("MODEL", "CLIP")
FUNCTION = "load_lora"
CATEGORY = "loaders"
def load_lora(
self,
model,
clip,
repo_id: str,
subfolder: str,
filename: str,
strength_model: float,
strength_clip: float,
):
if strength_model == 0 and strength_clip == 0:
return (model, clip)
lora_path = hf_hub_download(
repo_id=repo_id.strip(),
subfolder=(
None
if subfolder is None or subfolder.strip() == ""
else subfolder.strip()
),
filename=filename.strip(),
cache_dir=find_or_create_cache(),
)
lora = None
if self.loaded_lora is not None:
if self.loaded_lora_path == lora_path:
lora = self.loaded_lora
else:
self.loaded_lora = None
self.loaded_lora_path = None
if lora is None:
lora = comfy.utils.load_torch_file(lora_path, safe_load=True)
self.loaded_lora = lora
self.loaded_lora_path = lora_path
model_lora, clip_lora = comfy.sd.load_lora_for_models(
model, clip, lora, strength_model, strength_clip
)
return (model_lora, clip_lora)
class HFHubEmbeddingLoader:
"""Load a text model embedding from Huggingface Hub.
The connected CLIP model is not manipulated."""
@classmethod
def INPUT_TYPES(s):
return {
"required": {
"clip": ("CLIP",),
"repo_id": ("STRING", {"default": ""}),
"subfolder": ("STRING", {"default": ""}),
"filename": ("STRING", {"default": ""}),
}
}
RETURN_TYPES = ("CLIP",)
FUNCTION = "download_embedding"
CATEGORY = "n/a"
def download_embedding(
self,
clip: CLIP, # added to signify it's best put in between nodes
repo_id: str,
subfolder: str,
filename: str,
):
hf_hub_download(
repo_id=repo_id.strip(),
subfolder=(
None
if subfolder is None or subfolder.strip() == ""
else subfolder.strip()
),
filename=filename.strip(),
local_dir=get_folder_paths("embeddings")[0],
)
return (clip,)
class GlifVariable:
@classmethod
def INPUT_TYPES(s):
return {
"required": {
"variable": (
[
"",
],
),
"fallback": (
"STRING",
{
"default": "",
"single_line": True,
},
),
}
}
RETURN_TYPES = ("STRING", "INT", "FLOAT")
FUNCTION = "do_it"
CATEGORY = "glif/variables"
@classmethod
def VALIDATE_INPUTS(cls, variable: str, fallback: str):
# Since we populate dynamically, comfy will report invalid inputs. Override to always return True
return True
def do_it(self, variable: str, fallback: str):
variable = variable.strip()
fallback = fallback.strip()
if variable == "" or (variable.startswith("{") and variable.endswith("}")):
variable = fallback
int_val = 0
float_val = 0.0
string_val = f"{variable}"
try:
int_val = int(variable)
except Exception:
pass
try:
float_val = float(variable)
except Exception:
pass
return (string_val, int_val, float_val)
NODE_CLASS_MAPPINGS = {
"GlifConsistencyDecoder": ConsistencyDecoder,
"GlifPatchConsistencyDecoderTiled": PatchDecoderTiled,
"SDXLAspectRatio": SDXLAspectRatio,
"ImageToMultipleOf": ImageToMultipleOf,
"HFHubLoraLoader": HFHubLoraLoader,
"HFHubEmbeddingLoader": HFHubEmbeddingLoader,
"GlifVariable": GlifVariable,
}
NODE_DISPLAY_NAME_MAPPINGS = {
"GlifConsistencyDecoder": "Consistency VAE Decoder",
"GlifPatchConsistencyDecoderTiled": "Patch Consistency VAE Decoder",
"SDXLAspectRatio": "Image to SDXL compatible WH",
"ImageToMultipleOf": "Image to Multiple of",
"HFHubLoraLoader": "Load HF Lora",
"HFHubEmbeddingLoader": "Load HF Embedding",
"GlifVariable": "Glif Variable",
}
+120
View File
@@ -0,0 +1,120 @@
# Display Any
The Display Any node is a debugging and inspection tool that can display any type of input value in ComfyUI. It's particularly useful for understanding data structures and tensor shapes during workflow development.
## Features
- **Universal Input**: Accepts any type of input data (tensors, strings, numbers, lists, dictionaries, etc.)
- **Two Display Modes**:
- **Raw Value**: Shows the string representation of the input
- **Tensor Shape**: Extracts and displays the shapes of any tensors found in the input
- **Nested Structure Support**: Can find tensors within nested dictionaries and lists
- **UI Output**: Displays results directly in the ComfyUI interface
## Inputs
- **input** (*): Any value you want to display or inspect
- **mode** (DROPDOWN): Display mode selection
- `raw value`: Shows the complete string representation of the input
- `tensor shape`: Extracts and shows shapes of any tensors in the input
## Outputs
- **display_text** (STRING): The formatted display text
## Usage Examples
### 1. Display Simple Values
Connect any output to see its raw value:
```
String Input: "Hello, ComfyUI!"
Mode: raw value
Output: "Hello, ComfyUI!"
```
### 2. Inspect Tensor Shapes
Great for debugging image processing pipelines:
```
Image Tensor: [1, 3, 512, 512]
Mode: tensor shape
Output: "[[1, 3, 512, 512]]"
```
### 3. Debug Complex Data Structures
View nested data structures with multiple tensors:
```python
Input: {
"images": tensor([1, 3, 256, 256]),
"masks": [tensor([256, 256]), tensor([256, 256, 1])],
"config": {"steps": 20}
}
Mode: tensor shape
Output: "[[1, 3, 256, 256], [256, 256], [256, 256, 1]]"
```
### 4. Workflow Debugging
Use Display Any nodes at various points in your workflow to understand data flow:
- After loading images to verify dimensions
- Before/after processing nodes to track shape changes
- To inspect conditioning or latent data structures
- To view metadata or configuration dictionaries
## Use Cases
### Image Pipeline Debugging
Place Display Any nodes after image loading and processing nodes to track dimension changes:
```
Load Image → Display Any (tensor shape) → Resize → Display Any (tensor shape)
```
### Latent Space Inspection
Understand latent dimensions in your workflows:
```
VAE Encode → Display Any (tensor shape) → KSampler → Display Any (raw value)
```
### Configuration Verification
Display complex configuration objects to ensure correct settings:
```
Config Node → Display Any (raw value) → Processing Node
```
## Tips
1. **Multiple Display Nodes**: You can use multiple Display Any nodes in a single workflow to track data at different stages
2. **Tensor Shape Mode**: Particularly useful when working with:
- Image batches to verify batch size
- Latent tensors to understand dimensions
- Mask arrays to check compatibility
3. **Raw Value Mode**: Best for:
- String prompts and text
- Configuration dictionaries
- Debugging node outputs
- Understanding data structure
4. **No Tensors Found**: If you see "No tensors found in input" in tensor shape mode, the input doesn't contain any tensor-like objects (numpy arrays, torch tensors, etc.)
## Technical Notes
- The node uses `str()` for raw value display, providing Python's string representation
- Tensor shape detection works with any object that has a `shape` attribute
- Nested structure traversal supports dictionaries, lists, and tuples
- The output is both displayed in the UI and available as a string output for further processing
## Example Workflow Integration
```
[Load Image] → [Image Processing] → [Display Any (tensor shape)]
↓
"[[1, 3, 512, 512]]"
↓
[Text Multiline] ← [Concatenate] ← "Image dimensions: "
```
This creates a text output showing the current image dimensions that can be used elsewhere in your workflow.
+147
View File
@@ -0,0 +1,147 @@
# Display Text
The Display Text node provides advanced text display capabilities with smart formatting, interactive features, and responsive design for ComfyUI workflows.
## Features
- **Smart Prompt Detection**: Automatically detects and formats SDXL-style positive/negative prompt pairs
- **Text Wrapping**: Proper word wrapping that reflows when node is resized
- **Scrollable Content**: Mouse wheel scrolling for long texts with visual indicators
- **Copy Functionality**: Always-visible copy button with visual feedback
- **Split View Mode**: Side-by-side display for prompt pairs
- **Responsive Design**: Content adapts to node resizing
## Inputs
- **text** (STRING): The text to display
- Can be a single text block
- Can contain "Positive prompt:" and "Negative prompt:" sections for automatic split view
## Outputs
- **text** (STRING): Pass-through of the input text
## Display Modes
### Single Text Mode
When the input is regular text without prompt markers, it displays as a single scrollable text area with:
- Word wrapping at word boundaries
- Vertical scrolling for long content
- Single copy button for the entire text
### Split View Mode
Automatically activated when text contains both "Positive prompt:" and "Negative prompt:" sections:
- Side-by-side display with 50/50 split
- Independent scrolling for each section
- Separate copy buttons for each prompt
- Labels are stripped when copying (clean prompts)
## Usage Examples
### 1. Display Generated Prompts
```
Gemini Prompt → Display Text → Copy to workflow
```
The node automatically detects SDXL format and shows positive/negative prompts side-by-side.
### 2. Debug Text Processing
```
Text Processing → Display Text → Further Processing
```
View intermediate text processing results with proper formatting.
### 3. Show Long Descriptions
```
Load Text → Display Text → Review
```
Display long text content with scrolling and word wrapping.
## Interactive Features
### Copy Button
- Always visible in the top-right corner
- Shows "✓ Copied!" feedback on click
- In split view: separate buttons for each section
- Strips prompt labels for clean copying
### Scrolling
- Mouse wheel scrolling when hovering over text
- Visual indicators appear when content is scrollable
- Smooth scrolling with proper boundaries
- Independent scrolling in split view mode
### Resizing
- Text reflows when node width changes
- Maintains readability at different sizes
- Split view maintains 50/50 proportions
- Minimum height ensures usability
## Smart Prompt Detection
The node intelligently detects prompt formats:
1. **SDXL Format**:
- Looks for "Positive prompt:" and "Negative prompt:" markers
- Case-insensitive detection
- Handles various formatting styles
2. **Label Stripping**:
- When copying from split view, labels are removed
- "Positive prompt: beautiful sunset" → "beautiful sunset"
- Clean prompts ready for direct use
## Styling
- **Font**: Monospace for consistent alignment
- **Colors**:
- Text: Light gray (#ddd) on dark background
- Background: Semi-transparent dark (#1a1a1a)
- Borders: Subtle gray (#333)
- **Spacing**: Comfortable padding and line height
- **Visual Feedback**: Hover effects on interactive elements
## Use Cases
### Prompt Engineering Workflows
- Display AI-generated prompts with proper formatting
- Compare positive and negative prompts side-by-side
- Copy refined prompts without manual cleanup
### Text Processing Pipelines
- Debug text transformations at each step
- View formatted outputs from text nodes
- Monitor prompt construction workflows
### Documentation and Notes
- Display workflow instructions
- Show generation parameters
- Present formatted metadata
## Technical Details
- **Text Processing**: Preserves original text while adding display formatting
- **Responsive Design**: CSS-based layout adapts to node dimensions
- **Event Handling**: Proper event propagation for ComfyUI compatibility
- **Memory Efficient**: Only renders visible text portions
## Tips
1. **For Long Prompts**: The scrolling feature handles texts of any length efficiently
2. **Quick Copy**: Use the copy buttons to quickly grab prompts for other nodes
3. **Resizing**: Drag node edges to find optimal display width for your content
4. **Split View**: Works best with SDXL-format prompts but handles any dual-section text
## Integration Example
```
[Gemini Prompt Engineer] → [Display Text] → [Copy Button Click]
↓ ↓ ↓
SDXL Format Split View Display Clean Prompts
```
This creates a seamless workflow from prompt generation to usage, with the Display Text node providing the visual interface for review and interaction.
@@ -0,0 +1,222 @@
# Empty Latent Batch Documentation
## Overview
The Empty Latent Batch is a ComfyUI node that creates empty latent tensors with batch support and preset integration. It combines the preset functionality of Width Height Selector with efficient batch processing capabilities, making it ideal for batch workflows and optimized generation pipelines.
## Features
### 🎯 **Preset Integration**
- **26 Curated Presets**: Full access to SDXL, FLUX, and Ultra-wide presets
- **Formatted Display**: Shows aspect ratio, megapixels, and model group
- **Smart Fallback**: Automatic fallback to custom dimensions for invalid presets
- **Model Optimization**: Preset categories optimized for different model types
### 📦 **Batch Processing**
- **Configurable Batch Size**: Create 1-64 empty latents in single operation
- **Memory Efficient**: Uses torch.zeros for optimal memory allocation
- **Batch Validation**: Prevents excessive memory usage with warnings
- **ComfyUI Compatible**: Standard latent format for seamless integration
### 🔄 **Visual Swap Button**
- **Interactive UI**: Blue swap button with hover and click feedback
- **Preset-Aware Swapping**: Intelligent switching between matching presets
- **Custom Dimension Support**: Simple value swapping for custom inputs
- **Visual Feedback**: Button state changes during interaction
### ✅ **Smart Validation**
- **Dimension Sanitization**: Automatic adjustment to divisible-by-8 constraint
- **Memory Estimation**: Built-in memory usage calculation
- **Error Handling**: Graceful handling of invalid inputs with helpful messages
- **Logging**: Detailed operation logging for debugging
## Node Interface
### Inputs
- **preset**: Dropdown with 26 formatted preset options + custom
- **width**: Custom width (64-8192, step 8, default 1024)
- **height**: Custom height (64-8192, step 8, default 1024)
- **batch_size**: Number of latents to create (1-64, default 1)
### Outputs
- **latent**: Dictionary containing batch of empty latent tensors
- **width**: Final sanitized width (guaranteed divisible by 8)
- **height**: Final sanitized height (guaranteed divisible by 8)
## Preset Reference
The Empty Latent Batch node uses the same 26 curated presets as the Width Height Selector:
### SDXL Presets (~1 Megapixel)
Optimized for SDXL models with ~1MP resolution constraint.
### FLUX Presets (High Resolution)
Higher resolution presets optimized for FLUX models with better quality/speed balance.
### Ultra-Wide Presets (Modern Ratios)
Modern aspect ratios for ultra-wide and panoramic generation.
*For complete preset details, see [Width Height Selector Documentation](width_height_selector.md#preset-reference)*
## Usage Examples
### Basic Empty Latent Creation
1. **Select Preset**: Choose from dropdown (e.g., "1024×1024 - 1:1 (1.0MP) - SDXL")
2. **Set Batch Size**: Enter desired number of latents (e.g., 4)
3. **Connect Output**: Link latent output to KSampler or other processing nodes
### Custom Batch Creation
1. **Set Preset**: Select "custom"
2. **Enter Dimensions**: Input width and height manually
3. **Set Batch Size**: Configure number of latents needed
4. **Validation**: Automatic sanitization ensures compatibility
### Orientation Swapping
1. **Choose Preset**: Any preset (e.g., "1920×1080")
2. **Click Swap Button**: Blue button in bottom-right corner
3. **Result**: Gets swapped preset if available, or custom dimensions with swapped values
4. **Widget Update**: Width/height widgets automatically update
### Memory-Aware Batch Processing
1. **Large Batch**: Set batch_size to 16 or higher
2. **Memory Warning**: Node provides memory usage estimation
3. **Optimization**: Choose appropriate resolution preset for available VRAM
## Common Workflows
### Batch Generation Pipeline
```
Empty Latent Batch → KSampler → VAE Decode → Save Image
(batch_size: 4) ↓ ↓ ↓
4 samples 4 images 4 files
```
- Create 4 empty latents at once
- Process all through sampling
- Generate 4 images in single operation
- Efficient for parameter exploration
### Model Comparison Workflow
```
Empty Latent Batch → [Multiple KSamplers] → [Multiple VAE Decoders] → Compare Results
(batch_size: 8) ↓ ↓ ↓
Split batch Process variants Side-by-side
```
- Create consistent batch of empty latents
- Split across different samplers/models
- Compare results with identical starting conditions
### Upscaling Preparation
```
Empty Latent Batch → KSampler → VAE Decode → Resolution Calculator → Upscaler
(832×1216, batch:4) ↓ ↓ ↓ ↓
Sample Decode Calculate 2x Upscale batch
```
- Generate batch at base resolution
- Calculate upscale dimensions
- Process entire batch through upscaler
### Aspect Ratio Exploration
```
Empty Latent Batch → [Clone to multiple orientations] → Parallel Processing
(1920×1080) ↓ ↓
[Swap Button] → Portrait & Landscape versions Compare orientations
```
- Start with base preset
- Use swap button to create orientation variants
- Process both simultaneously
## Advanced Features
### Memory Estimation
The node provides built-in memory estimation for batch operations:
```python
# Example memory calculations
Batch Size: 4, Resolution: 1024×1024
Latent Tensor: 4 × 4 × 128 × 128 = 262,144 elements
Memory Usage: 262,144 × 4 bytes = 1.0 MB per batch
```
### Intelligent Preset Handling
- **Formatted Display**: Shows full metadata in dropdown
- **Original Extraction**: Extracts original preset name from formatted strings
- **Validation**: Verifies preset exists before processing
- **Fallback Logic**: Uses custom dimensions if preset is invalid
### Batch Size Optimization
- **Performance Warnings**: Alerts for large batch sizes
- **Memory Limits**: Prevents excessive memory allocation
- **Hardware Awareness**: Considers available system resources
## Tips and Best Practices
### Batch Size Selection
- **Small Batches (1-4)**: Good for testing and development
- **Medium Batches (5-16)**: Efficient for most production workflows
- **Large Batches (17-64)**: Only for high-memory systems and specific use cases
### Preset Selection
- **SDXL Projects**: Use SDXL presets for memory efficiency
- **FLUX Projects**: Use FLUX presets for optimal quality
- **Ultra-wide Projects**: Ensure sufficient VRAM for large resolutions
- **Custom Projects**: Use custom dimensions for specific requirements
### Memory Management
- Monitor memory usage with large batches
- Use appropriate resolution presets for available VRAM
- Consider splitting very large batches across multiple nodes
- Clear GPU memory between large batch operations
### Workflow Integration
- Always connect all three outputs (latent, width, height)
- Use width/height outputs for downstream dimension calculations
- Combine with Resolution Calculator for upscaling workflows
- Leverage batch processing for efficient parameter exploration
## Troubleshooting
### Common Issues
- **Out of Memory**: Reduce batch_size or use lower resolution presets
- **Invalid Dimensions**: Node automatically sanitizes to valid values
- **Preset Not Found**: Falls back to custom dimensions with warning
- **Swap Button Not Working**: Ensure node is not collapsed and button is visible
### Performance Optimization
- **Batch Size**: Start with smaller batches and increase as needed
- **Resolution**: Use appropriate presets for your model and VRAM
- **Memory Monitoring**: Watch for memory warnings and adjust accordingly
- **Cleanup**: Clear unused tensors between large batch operations
### Error Handling
- **Dimension Validation**: Automatic rounding to nearest valid values
- **Batch Size Limits**: Clamped to 1-64 range with warnings
- **Memory Allocation**: Graceful handling of insufficient memory
- **Preset Fallbacks**: Automatic fallback to custom dimensions
## Technical Details
### Latent Tensor Format
- **Shape**: [batch_size, 4, height//8, width//8]
- **Data Type**: torch.float32
- **Initialization**: torch.zeros for clean empty state
- **Memory Layout**: Contiguous tensor for optimal performance
### Validation Pipeline
1. **Preset Extraction**: Parse formatted preset strings
2. **Dimension Calculation**: Get base dimensions from preset or custom
3. **Sanitization**: Ensure divisible-by-8 constraint
4. **Batch Validation**: Check batch size limits
5. **Memory Estimation**: Calculate expected memory usage
6. **Tensor Creation**: Allocate and initialize latent tensor
### UI Integration
- **JavaScript Extension**: Custom UI for swap button functionality
- **Widget Synchronization**: Auto-update width/height when preset changes
- **Visual Feedback**: Hover effects and click animations
- **Event Handling**: Proper mouse event management
### Swap Button Implementation
- **Position Calculation**: Dynamic positioning based on node size
- **State Management**: Visual feedback for button interactions
- **Preset Intelligence**: Smart switching between compatible presets
- **Fallback Logic**: Custom dimension swapping when preset not available
+209
View File
@@ -0,0 +1,209 @@
# Gemini Prompt Engineer
The Gemini Prompt Engineer node uses Google's Gemini AI to analyze images and generate optimized prompts for various AI image generation models.
## Features
- **Multi-Model Support**: Generate prompts optimized for FLUX, SDXL, Danbooru, and Video generation
- **Custom Prompts**: Override templates with your own system prompts
- **Visual Feedback**: UI shows processing status and error states
- **Flexible API Key Management**: Multiple ways to provide API credentials
- **Dynamic Model Selection**: Fetch and use latest Gemini models with refresh button
- **Model Caching**: Persistent storage of available models for offline access
- **Help Integration**: Built-in setup guide accessible via help button
## Setup
### 1. Get API Key
Get your free Gemini API key from [Google AI Studio](https://makersuite.google.com/app/apikey)
### 2. Install Dependencies
```bash
pip install google-generativeai
```
### 3. Configure API Key
Choose one of these methods:
1. **Environment Variable** (Recommended):
```bash
export GEMINI_API_KEY="your-api-key-here"
```
2. **Config File**:
Create `gemini_config.json` in your ComfyUI root directory:
```json
{
"api_key": "your-api-key-here"
}
```
3. **Node Input**:
Enter the API key directly in the node's `api_key` field
## Inputs
- **image** (IMAGE): The image to analyze
- **prompt_type** (DROPDOWN): Type of prompt to generate
- `flux`: Detailed artistic prompts with quality markers
- `sdxl`: Positive/negative prompt pairs with weight emphasis
- `danbooru`: Anime-style booru tags with underscores
- `video`: Motion and temporal descriptions for video generation
- **model** (DROPDOWN): Gemini model selection
- Dynamically populated list of available models
- Includes latest models like gemini-2.0-flash-exp
- Click refresh button to update model list
- **api_key** (STRING, optional): Gemini API key if not set elsewhere
- **custom_prompt** (STRING, optional): Override template with custom system prompt
## Outputs
- **prompt** (STRING): Generated prompt text
- **negative_prompt** (STRING): Negative prompt (only populated for SDXL format)
## Prompt Type Details
### FLUX Format
Generates detailed prompts optimized for FLUX models:
- Starts with main subject and action
- Includes style and medium descriptors
- Adds lighting and atmosphere details
- Uses quality markers like "4K", "highly detailed", "award-winning"
Example output:
```
majestic mountain landscape at golden hour, oil painting style, dramatic lighting with sun rays piercing through clouds, wide angle composition, warm color palette with orange and purple hues, highly detailed, 4K resolution, trending on ArtStation, photorealistic rendering
```
### SDXL Format
Generates positive and negative prompt pairs with enhanced structure:
- Layered positive prompts: main subject → style → composition → technical
- Comprehensive negative prompts to avoid common issues
- Uses parentheses for emphasis: `(detailed eyes:1.2)`
- Includes quality boosters and technical specifications
Example output:
```
Positive prompt:
beautiful woman with flowing red hair, elegant pose, (detailed eyes:1.2), serene expression
oil painting style, renaissance art influence, classical portraiture
golden hour lighting, warm color palette, soft shadows, dramatic chiaroscuro
centered composition, rule of thirds, shallow depth of field, bokeh background
masterpiece, best quality, highly detailed, 8k uhd, professional artwork
Negative prompt:
low quality, worst quality, blurry, out of focus, pixelated, low resolution
bad anatomy, deformed features, extra limbs, missing limbs, disconnected limbs
poorly drawn face, poorly drawn hands, amateur drawing, bad proportions
oversaturated, overexposed, underexposed, bad lighting, harsh shadows
jpeg artifacts, watermark, signature, text, cropped, duplicate
```
### Danbooru Format
Generates booru-style tags for anime artwork:
- Uses underscores for multi-word concepts
- Includes character count descriptors (1girl, 2boys)
- Orders tags from most to least important
Example output:
```
1girl, solo, long_hair, blue_eyes, blonde_hair, school_uniform, serafuku, pleated_skirt, thighhighs, smile, looking_at_viewer, classroom, sitting, desk, window, sunlight, highres, masterpiece
```
### Video Format
Generates prompts for video generation models:
- Describes motion and camera movements
- Includes temporal markers and transitions
- Specifies technical details like fps and duration
Example output:
```
Aerial shot slowly descending toward a misty forest at dawn, camera smoothly transitions to tracking shot following a deer through the trees, photorealistic style, soft golden hour lighting with fog, 10 second duration, 4K resolution 24fps, ending with close-up of deer looking at camera
```
## Custom System Prompts
You can override any template by providing your own system prompt. This is useful for:
- Specialized use cases
- Different language outputs
- Custom formatting requirements
- Integration with specific workflows
Example custom prompt:
```
You are an expert at analyzing images and creating simple, concise descriptions.
Focus only on the main subject and primary colors.
Keep your response under 50 words.
```
## Error Handling
The node provides clear error messages for common issues:
- Missing API key
- API request failures
- Invalid image inputs
- Rate limiting
Errors are displayed in the prompt output for easy debugging.
## Model Selection
### Dynamic Model List
- Click the refresh button (🔄) next to the model dropdown to fetch latest models
- Models are fetched from Google's API and include all available versions
- Common models include:
- `gemini-2.0-flash-exp`: Latest experimental flash model
- `gemini-1.5-pro`: Advanced model with larger context
- `gemini-1.5-flash`: Fast and efficient for most tasks
### Model Caching
- Available models are cached locally for offline access
- Cache persists across ComfyUI sessions
- Refresh button updates the cache with latest models
## UI Features
### Help Button
- Click the help button (?) for quick setup instructions
- Shows API key setup methods
- Links to Google AI Studio for key generation
### Status Indicators
- Processing spinner during API calls
- Error messages displayed in red
- Success feedback when prompt is generated
## Tips
1. **API Usage**: Gemini has generous free tier limits, but be mindful of rate limits
2. **Image Quality**: Higher resolution images provide better analysis results
3. **Prompt Refinement**: You can chain multiple Gemini nodes with different custom prompts
4. **Caching**: Results are not cached, so identical images will make new API calls
5. **Model Selection**: Use flash models for faster responses, pro models for complex analysis
## Example Workflow
1. Load an image using Load Image node
2. Connect to Gemini Prompt Engineer
3. Select appropriate prompt_type for your target model
4. Connect prompt output to your generation model
5. For SDXL, connect both prompt and negative_prompt outputs
## Troubleshooting
**"API key not found" error**:
- Check environment variable is set correctly
- Verify config file path and JSON format
- Try entering key directly in node
**"No response generated" error**:
- Check internet connection
- Verify API key is valid
- Image might be too large (resize if needed)
**Import error for google-generativeai**:
- Run `pip install google-generativeai` in your ComfyUI environment
- Restart ComfyUI after installation
@@ -0,0 +1,82 @@
# Image to Multiple Of
## Overview
The **Image to Multiple Of** node adjusts image dimensions to be multiples of a specified value. This is particularly useful for models that require input dimensions to be multiples of certain values (e.g., 8, 16, 32, 64) for optimal performance or compatibility.
## Purpose
Many AI models, especially diffusion models and VAEs, require input dimensions to be multiples of specific values due to their architecture (e.g., downsampling layers). This node ensures your images meet these requirements without manual calculation.
## Inputs
- **image** (IMAGE, required): The input image to process
- **multiple_of** (INT, required): The value that dimensions should be multiple of
- Default: 64
- Range: 1-256
- Step: 16
- **method** (COMBO, required): Processing method
- Options: "center crop", "rescale"
## Outputs
- **image** (IMAGE): Processed image with dimensions adjusted to multiples of the specified value
## Processing Methods
### Center Crop
- Crops the image from the center to achieve the target dimensions
- Preserves image quality but may lose edge content
- Best for images where the important content is centered
### Rescale
- Resizes the image to the target dimensions using bilinear interpolation
- Keeps all content but may slightly affect image quality
- Best when you need to preserve all image content
## Usage Examples
### Example 1: Prepare for VAE Encoding
```
Load Image → Image to Multiple Of (multiple_of: 64) → VAE Encode
```
### Example 2: Prepare for Specific Model Requirements
```
Load Image → Image to Multiple Of (multiple_of: 32) → Model Processing
```
### Example 3: Batch Processing
```
Load Images → Image to Multiple Of (multiple_of: 16, method: rescale) → Batch Process
```
## Technical Details
- Supports batch processing (processes all images in a batch)
- Works with any number of channels (RGB, RGBA, grayscale, etc.)
- Calculates the largest dimensions that are less than or equal to the original size
- For center crop: crops equally from all sides to maintain centering
- For rescale: uses bilinear interpolation with align_corners=False
## Common Use Cases
1. **VAE Preprocessing**: Ensure images are compatible with VAE encoders that require dimensions divisible by 64
2. **Model Compatibility**: Adjust images for models with specific architectural requirements
3. **Batch Uniformity**: Ensure all images in a batch have dimensions that meet model requirements
4. **Performance Optimization**: Some models perform better with dimensions that are powers of 2
## Tips
- Use **center crop** when your subject is centered and you don't mind losing edge details
- Use **rescale** when you need to preserve all image content
- Common multiple_of values: 8, 16, 32, 64, 128
- For Stable Diffusion models, 64 is typically recommended
- For some upscaling models, 32 or 16 may be sufficient
## Error Handling
The node will raise an error if:
- The image dimensions are smaller than the specified multiple_of value
- Invalid input types are provided
- The resulting dimensions would be 0 or negative
+213
View File
@@ -0,0 +1,213 @@
# Kiko Save Image
Enhanced image saving node with multiple format support, quality controls, and an interactive floating popup viewer for ComfyUI.
## Features
- **Multiple Format Support**: Save as PNG, JPEG, or WebP with format-specific optimizations
- **Advanced Quality Controls**: Fine-tune compression settings per format
- **Floating Popup Viewer**: Interactive window showing saved images immediately
- **Batch Operations**: Multi-select images for bulk actions
- **File Size Display**: Real-time feedback on compression effectiveness
- **Smart UI**: Auto-hide, draggable, resizable popup window
## Inputs
- **images** (IMAGE): Batch of images to save
- **filename_prefix** (STRING): Prefix for saved filenames
- Default: "KikoSave"
- Supports subfolder paths (e.g., "outputs/renders/final")
- **format** (DROPDOWN): Output format selection
- `PNG`: Lossless compression, best quality
- `JPEG`: Lossy compression, smaller files
- `WEBP`: Modern format, best compression ratio
- **quality** (INT): JPEG/WebP quality level
- Range: 1-100 (default: 90)
- Higher values = better quality, larger files
- **png_compress_level** (INT): PNG compression level
- Range: 0-9 (default: 4)
- Higher values = smaller files, slower saving
- **webp_lossless** (BOOLEAN): Use lossless WebP compression
- Default: False (lossy)
- True: Lossless compression like PNG
- **popup** (BOOLEAN): Enable popup viewer window
- Default: True
- Toggle per save operation
## Outputs
- **UI**: Enhanced preview data with interactive popup viewer
## Popup Viewer Features
### Window Controls
- **Drag Handle**: Click and drag the header to move window
- **Minimize Button**: Collapse to title bar only
- **Maximize Button**: Expand to larger viewing size
- **Roll-up Button**: Show/hide content area
- **Close Button**: Hide the popup (can reopen with toggle)
### Image Grid
- **Thumbnails**: Click any image to open full-size in new tab
- **File Info**: Shows filename and size for each image
- **Quality Indicators**:
- PNG: Compression level (0-9)
- JPEG/WebP: Quality percentage
- **Batch Selection**: Checkboxes for multi-select operations
### Bulk Actions
- **Open All Selected**: Opens selected images in new tabs
- **Download All Selected**: Downloads selected images as a batch
- **Individual Downloads**: Download button per image
### Smart Behavior
- **Auto-positioning**: Appears in convenient screen location
- **Persistence**: Stays open across multiple saves
- **Auto-hide**: Can be minimized when not needed
- **Responsive**: Adapts to different image counts
## Format Details
### PNG Format
- **Pros**: Lossless quality, transparency support, wide compatibility
- **Cons**: Larger file sizes
- **Best for**: Final outputs, images with transparency, archival
- **Compression**: 0 (none) to 9 (maximum)
- Level 4 (default) balances size and speed
- Level 9 for maximum compression (slow)
### JPEG Format
- **Pros**: Smaller files, fast loading, universal support
- **Cons**: Lossy compression, no transparency
- **Best for**: Web images, previews, photos
- **Quality**: 1-100%
- 90% (default) excellent quality with good compression
- 95%+ for near-lossless quality
- 70-85% for web optimization
### WebP Format
- **Pros**: Best compression ratios, supports transparency, modern
- **Cons**: Limited software support
- **Best for**: Web deployment, storage optimization
- **Modes**:
- Lossy (default): Excellent compression with quality control
- Lossless: PNG-like quality with better compression
## Usage Examples
### High-Quality Archive
```
Format: PNG
Compression: 0-2
Use Case: Final renders for portfolio or client delivery
```
### Web Optimization
```
Format: JPEG or WebP
Quality: 80-85
Use Case: Website images, social media posts
```
### Balanced Storage
```
Format: WebP
Quality: 90
Lossless: False
Use Case: Large batches with storage constraints
```
### Transparency Preservation
```
Format: PNG or WebP (lossless)
Use Case: Logos, UI elements, cutout images
```
## Workflow Integration
### Basic Save
```
Generate → Kiko Save Image
format: PNG
popup: enabled
```
### Format Comparison
```
Generate → Kiko Save Image (PNG) → Compare file sizes
↘ Kiko Save Image (JPEG) ↗
↘ Kiko Save Image (WebP) ↗
```
### Batch Processing
```
Batch Generate → Kiko Save Image → Popup Viewer
↓ ↓
4 images Select best results
```
## Tips and Best Practices
1. **Format Selection**:
- Use PNG for maximum quality and transparency
- Use JPEG for photographs without transparency
- Use WebP for modern web deployment
2. **Quality Settings**:
- Start with defaults (90 for JPEG/WebP, 4 for PNG)
- Adjust based on file size requirements
- Preview results in popup before finalizing
3. **Popup Management**:
- Drag to second monitor for larger workspace
- Use roll-up to save screen space
- Disable popup for automated workflows
4. **Batch Operations**:
- Use checkboxes to select multiple images
- Open all in tabs for side-by-side comparison
- Download all for quick collection
5. **File Organization**:
- Use subfolders in filename_prefix
- Include descriptive prefixes
- Let ComfyUI handle timestamp suffixes
## Advantages Over Standard Save Image
- **Immediate Preview**: No need to navigate file system
- **Format Flexibility**: Choose optimal format per use case
- **Quality Control**: Fine-tune compression settings
- **Batch Management**: Handle multiple images efficiently
- **Modern UI**: Floating interface doesn't interrupt workflow
- **File Size Awareness**: See compression effectiveness immediately
- **Quick Access**: One-click opening and downloading
## Technical Details
- **Image Processing**: Uses Pillow for format conversion
- **Metadata**: Preserves ComfyUI metadata in saved files
- **File Naming**: Automatic timestamp and counter suffixes
- **Memory Efficiency**: Processes images individually
- **Thread Safety**: Proper handling of concurrent saves
## Troubleshooting
**Popup not appearing**:
- Check that popup input is enabled
- Look for minimized window
- Try toggling the popup button in node
**WebP not working**:
- Ensure Pillow has WebP support
- Update Pillow: `pip install --upgrade pillow`
**Large file sizes**:
- Increase compression (PNG) or reduce quality (JPEG/WebP)
- Consider switching formats
- Check image dimensions
**Can't see all images**:
- Scroll within the popup grid
- Maximize the popup window
- Images are shown newest first
@@ -98,4 +98,4 @@ The Resolution Calculator integrates seamlessly with:
- Standard ComfyUI image loaders
- VAE encode/decode operations
- Upscaler nodes (ESRGAN, Real-ESRGAN, etc.)
- Custom latent processing workflows
- Custom latent processing workflows
+7 -7
View File
@@ -40,7 +40,7 @@ The Sampler Combo is a unified ComfyUI node that combines sampler, scheduler, st
### Outputs
- **sampler_name**: Selected sampler algorithm
- **scheduler**: Selected scheduler algorithm
- **scheduler**: Selected scheduler algorithm
- **steps**: Number of sampling steps
- **cfg**: CFG scale value
@@ -75,7 +75,7 @@ The Sampler Combo is a unified ComfyUI node that combines sampler, scheduler, st
- **linear**: Basic linear distribution
- **sgm_uniform**: Uniform distribution
### Advanced Schedulers
### Advanced Schedulers
- **karras**: Karras noise schedule (recommended)
- **exponential**: Exponential decay
- **polyexponential**: Polynomial exponential
@@ -99,7 +99,7 @@ Steps: 15-25
CFG: 6.0-8.0
```
#### Quality Optimized
#### Quality Optimized
```
Sampler: dpmpp_2m_sde or dpmpp_3m_sde
Scheduler: karras
@@ -138,7 +138,7 @@ CFG: 7.0-8.5
### Basic Configuration
```
sampler_name: euler
scheduler: normal
scheduler: normal
steps: 20
cfg: 7.0
```
@@ -164,7 +164,7 @@ cfg: 6.5
### Compatibility Analysis
The node provides real-time analysis of parameter compatibility:
- Scheduler compatibility with selected sampler
- Steps optimization for sampler type
- Steps optimization for sampler type
- CFG scale recommendations
- Performance impact assessment
@@ -200,9 +200,9 @@ The node provides real-time analysis of parameter compatibility:
The Sampler Combo node outputs are compatible with all standard ComfyUI sampling nodes:
- KSampler
- KSamplerAdvanced
- KSamplerAdvanced
- Custom sampling workflows
- Upscaling pipelines
- Img2img workflows
Connect the outputs directly to your sampling node inputs for streamlined configuration.
Connect the outputs directly to your sampling node inputs for streamlined configuration.
+1 -1
View File
@@ -164,4 +164,4 @@ See the `examples/workflows/` directory for complete workflow examples demonstra
- Basic seed tracking workflow
- Creative iteration with history
- Technical reproducibility setup
- Batch processing with seed management
- Batch processing with seed management
@@ -147,7 +147,7 @@ Width Height Selector → EmptyLatentImage → Resolution Calculator → Upscale
### Aspect Ratio Considerations
- **Portrait**: 3:4, 2:3, 13:19 work well for people
- **Landscape**: 16:9, 19:13, 7:4 for scenes and objects
- **Landscape**: 16:9, 19:13, 7:4 for scenes and objects
- **Square**: 1:1 for centered compositions
- **Ultra-wide**: 21:9+ for panoramic and cinematic shots
@@ -192,4 +192,4 @@ Width Height Selector → EmptyLatentImage → Resolution Calculator → Upscale
### Preset Organization
- Categorized by model optimization
- Sorted by aspect ratio within categories
- Comprehensive tooltips for each preset
- Comprehensive tooltips for each preset
+379
View File
@@ -0,0 +1,379 @@
{
"id": "display-any-example",
"revision": 0,
"last_node_id": 11,
"last_link_id": 9,
"nodes": [
{
"id": 1,
"type": "DisplayAny",
"pos": [
400,
270
],
"size": [
210,
60
],
"flags": {},
"order": 3,
"mode": 0,
"inputs": [
{
"name": "input",
"type": "*",
"link": 1
}
],
"outputs": [
{
"name": "display_text",
"type": "STRING",
"links": [
8
]
}
],
"properties": {
"cnr_id": "kikotools",
"ver": "271cd020c1b2f78e7ee40c1f08e70191fed00012",
"Node name for S&R": "DisplayAny"
},
"widgets_values": [
"tensor shape"
]
},
{
"id": 2,
"type": "LoadImage",
"pos": [
50,
270
],
"size": [
315,
314
],
"flags": {},
"order": 2,
"mode": 0,
"inputs": [],
"outputs": [
{
"name": "IMAGE",
"type": "IMAGE",
"links": [
1,
5
]
},
{
"name": "MASK",
"type": "MASK",
"links": null
}
],
"properties": {
"cnr_id": "comfy-core",
"ver": "0.3.47",
"Node name for S&R": "LoadImage"
},
"widgets_values": [
"example.png",
"image"
]
},
{
"id": 4,
"type": "DisplayAny",
"pos": [
400,
520
],
"size": [
210,
70
],
"flags": {},
"order": 6,
"mode": 0,
"inputs": [
{
"name": "input",
"type": "*",
"link": 7
}
],
"outputs": [
{
"name": "display_text",
"type": "STRING",
"links": [
9
]
}
],
"properties": {
"cnr_id": "kikotools",
"ver": "271cd020c1b2f78e7ee40c1f08e70191fed00012",
"Node name for S&R": "DisplayAny"
},
"widgets_values": [
"raw value"
]
},
{
"id": 7,
"type": "VAELoader",
"pos": [
-250,
410
],
"size": [
270,
58
],
"flags": {},
"order": 0,
"mode": 0,
"inputs": [],
"outputs": [
{
"name": "VAE",
"type": "VAE",
"links": [
6
]
}
],
"properties": {
"cnr_id": "comfy-core",
"ver": "0.3.47",
"Node name for S&R": "VAELoader"
},
"widgets_values": [
"ae.safetensors"
]
},
{
"id": 8,
"type": "VAEEncode",
"pos": [
430,
390
],
"size": [
140,
46
],
"flags": {},
"order": 4,
"mode": 0,
"inputs": [
{
"name": "pixels",
"type": "IMAGE",
"link": 5
},
{
"name": "vae",
"type": "VAE",
"link": 6
}
],
"outputs": [
{
"name": "LATENT",
"type": "LATENT",
"links": [
7
]
}
],
"properties": {
"cnr_id": "comfy-core",
"ver": "0.3.47",
"Node name for S&R": "VAEEncode"
},
"widgets_values": []
},
{
"id": 9,
"type": "DisplayText",
"pos": [
640,
270
],
"size": [
450,
278
],
"flags": {},
"order": 5,
"mode": 0,
"inputs": [
{
"name": "text",
"type": "STRING",
"link": 8
}
],
"outputs": [
{
"name": "text",
"type": "STRING",
"links": null
}
],
"properties": {
"cnr_id": "kikotools",
"ver": "271cd020c1b2f78e7ee40c1f08e70191fed00012",
"Node name for S&R": "DisplayText"
},
"widgets_values": [
null
]
},
{
"id": 10,
"type": "DisplayText",
"pos": [
640,
610
],
"size": [
590,
278
],
"flags": {},
"order": 7,
"mode": 0,
"inputs": [
{
"name": "text",
"type": "STRING",
"link": 9
}
],
"outputs": [
{
"name": "text",
"type": "STRING",
"links": null
}
],
"properties": {
"cnr_id": "kikotools",
"ver": "271cd020c1b2f78e7ee40c1f08e70191fed00012",
"Node name for S&R": "DisplayText"
},
"widgets_values": [
null
]
},
{
"id": 11,
"type": "MarkdownNote",
"pos": [
-320,
530
],
"size": [
350,
270
],
"flags": {},
"order": 1,
"mode": 0,
"inputs": [],
"outputs": [],
"properties": {},
"widgets_values": [
"Display Any Example\n\nUniversal debugging tool:\n- Accepts ANY input type\n- Two modes: raw value or tensor shape\n- Finds tensors in nested structures\n\nUse cases:\n- Debug tensor dimensions\n- Inspect latent data\n- View config objects\n- Track data flow\n\nConnect anything to see its contents!"
],
"color": "#432",
"bgcolor": "#653"
}
],
"links": [
[
1,
2,
0,
1,
0,
"IMAGE"
],
[
5,
2,
0,
8,
0,
"IMAGE"
],
[
6,
7,
0,
8,
1,
"VAE"
],
[
7,
8,
0,
4,
0,
"*"
],
[
8,
1,
0,
9,
0,
"STRING"
],
[
9,
4,
0,
10,
0,
"STRING"
]
],
"groups": [
{
"id": 1,
"title": "Display Any",
"bounding": [
-400,
130,
1740,
850
],
"color": "#ffffff",
"font_size": 24,
"flags": {}
}
],
"config": {},
"extra": {
"ds": {
"scale": 0.6115909044841477,
"offset": [
689.1392030323894,
-27.435530779258137
]
},
"frontendVersion": "1.23.4",
"VHS_latentpreview": true,
"VHS_latentpreviewrate": 0,
"VHS_MetadataImage": true,
"VHS_KeepIntermediate": true
},
"version": 0.4
}
Binary file not shown.

After

Width:  |  Height:  |  Size: 466 KiB

@@ -0,0 +1,144 @@
{
"id": "display-text-example",
"revision": 0,
"last_node_id": 6,
"last_link_id": 2,
"nodes": [
{
"id": 1,
"type": "DisplayText",
"pos": [
-160,
70
],
"size": [
500,
400
],
"flags": {},
"order": 2,
"mode": 0,
"inputs": [
{
"name": "text",
"type": "STRING",
"link": 2
}
],
"outputs": [
{
"name": "text",
"type": "STRING",
"links": null
}
],
"properties": {
"cnr_id": "kikotools",
"ver": "271cd020c1b2f78e7ee40c1f08e70191fed00012",
"Node name for S&R": "DisplayText"
},
"widgets_values": [
null
]
},
{
"id": 4,
"type": "easy positive",
"pos": [
-620,
70
],
"size": [
400,
200
],
"flags": {},
"order": 0,
"mode": 0,
"inputs": [],
"outputs": [
{
"name": "positive",
"type": "STRING",
"links": [
2
]
}
],
"properties": {
"cnr_id": "comfyui-easy-use",
"ver": "1.3.1",
"Node name for S&R": "easy positive"
},
"widgets_values": [
"Positive prompt:\nbeautiful landscape, mountains in background, sunset lighting, golden hour, professional photography, high resolution, detailed textures, vibrant colors, masterpiece\n\nNegative prompt:\nlow quality, blurry, pixelated, bad composition, oversaturated, underexposed, amateur"
],
"color": "#232",
"bgcolor": "#353"
},
{
"id": 6,
"type": "MarkdownNote",
"pos": [
-620,
330
],
"size": [
360,
250
],
"flags": {},
"order": 1,
"mode": 0,
"inputs": [],
"outputs": [],
"properties": {},
"widgets_values": [
"Display Text Example\n\nSmart text display with:\n- Auto-detection of SDXL prompt format\n- Split view for positive/negative prompts\n- Text wrapping and scrolling\n- Copy buttons (strips labels)\n- Responsive resizing\n\nTry editing the text to see:\n1. Single text mode (no prompt markers)\n2. Split view mode (with Positive/Negative prompts)\n\nPerfect for displaying Gemini-generated prompts!"
],
"color": "#432",
"bgcolor": "#653"
}
],
"links": [
[
2,
4,
0,
1,
0,
"STRING"
]
],
"groups": [
{
"id": 1,
"title": "Display Text",
"bounding": [
-750,
-60,
1240,
700
],
"color": "#ffffff",
"font_size": 24,
"flags": {}
}
],
"config": {},
"extra": {
"ds": {
"scale": 0.90909090909091,
"offset": [
720,
30
]
},
"frontendVersion": "1.23.4",
"VHS_latentpreview": true,
"VHS_latentpreviewrate": 0,
"VHS_MetadataImage": true,
"VHS_KeepIntermediate": true
},
"version": 0.4
}
Binary file not shown.

After

Width:  |  Height:  |  Size: 272 KiB

@@ -0,0 +1,301 @@
{
"id": "empty-latent-batch-example",
"revision": 0,
"last_node_id": 9,
"last_link_id": 8,
"nodes": [
{
"id": 1,
"type": "EmptyLatentBatch",
"pos": [
350,
350
],
"size": [
370,
210
],
"flags": {},
"order": 0,
"mode": 0,
"inputs": [],
"outputs": [
{
"name": "latent",
"type": "LATENT",
"slot_index": 0,
"links": []
},
{
"name": "width",
"type": "INT",
"slot_index": 1,
"links": [
4
]
},
{
"name": "height",
"type": "INT",
"slot_index": 2,
"links": [
5
]
}
],
"properties": {
"cnr_id": "kikotools",
"ver": "271cd020c1b2f78e7ee40c1f08e70191fed00012",
"Node name for S&R": "EmptyLatentBatch"
},
"widgets_values": [
"896×1152 - 7:9 (1.0MP) - SDXL",
896,
1152,
4
]
},
{
"id": 2,
"type": "Note",
"pos": [
-50,
320
],
"size": [
350,
250
],
"flags": {},
"order": 1,
"mode": 0,
"inputs": [],
"outputs": [],
"properties": {
"text": "Empty Latent Batch Example\n\nThis node creates empty latent tensors with:\n- 26 preset resolutions for SDXL/FLUX/Ultra-wide\n- Batch size support (1-64)\n- Interactive swap button\n- Memory usage estimation\n\nConnect to:\n- KSampler for image generation\n- Other latent processing nodes\n\nOutputs sanitized dimensions divisible by 8."
},
"widgets_values": [
"Empty Latent Batch Example\n\nThis node creates empty latent tensors with:\n- 26 preset resolutions for SDXL/FLUX/Ultra-wide\n- Batch size support (1-64)\n- Interactive swap button\n- Memory usage estimation\n\nConnect to:\n- KSampler for image generation\n- Other latent processing nodes\n\nOutputs sanitized dimensions divisible by 8."
],
"color": "#432",
"bgcolor": "#653"
},
{
"id": 5,
"type": "DisplayAny",
"pos": [
760,
280
],
"size": [
210,
60
],
"flags": {},
"order": 2,
"mode": 0,
"inputs": [
{
"name": "input",
"type": "*",
"link": 4
}
],
"outputs": [
{
"name": "display_text",
"type": "STRING",
"links": [
7
]
}
],
"properties": {
"cnr_id": "kikotools",
"ver": "271cd020c1b2f78e7ee40c1f08e70191fed00012",
"Node name for S&R": "DisplayAny"
},
"widgets_values": [
"raw value"
]
},
{
"id": 6,
"type": "DisplayAny",
"pos": [
770,
500
],
"size": [
210,
60
],
"flags": {},
"order": 3,
"mode": 0,
"inputs": [
{
"name": "input",
"type": "*",
"link": 5
}
],
"outputs": [
{
"name": "display_text",
"type": "STRING",
"links": [
8
]
}
],
"properties": {
"cnr_id": "kikotools",
"ver": "271cd020c1b2f78e7ee40c1f08e70191fed00012",
"Node name for S&R": "DisplayAny"
},
"widgets_values": [
"raw value"
]
},
{
"id": 8,
"type": "DisplayText",
"pos": [
1000,
280
],
"size": [
210,
138
],
"flags": {},
"order": 4,
"mode": 0,
"inputs": [
{
"name": "text",
"type": "STRING",
"link": 7
}
],
"outputs": [
{
"name": "text",
"type": "STRING",
"links": null
}
],
"properties": {
"cnr_id": "kikotools",
"ver": "271cd020c1b2f78e7ee40c1f08e70191fed00012",
"Node name for S&R": "DisplayText"
},
"widgets_values": [
null
]
},
{
"id": 9,
"type": "DisplayText",
"pos": [
1010,
500
],
"size": [
210,
138
],
"flags": {},
"order": 5,
"mode": 0,
"inputs": [
{
"name": "text",
"type": "STRING",
"link": 8
}
],
"outputs": [
{
"name": "text",
"type": "STRING",
"links": null
}
],
"properties": {
"cnr_id": "kikotools",
"ver": "271cd020c1b2f78e7ee40c1f08e70191fed00012",
"Node name for S&R": "DisplayText"
},
"widgets_values": [
null
]
}
],
"links": [
[
4,
1,
1,
5,
0,
"*"
],
[
5,
1,
2,
6,
0,
"*"
],
[
7,
5,
0,
8,
0,
"STRING"
],
[
8,
6,
0,
9,
0,
"STRING"
]
],
"groups": [
{
"id": 1,
"title": "Empty Latent",
"bounding": [
-110,
120,
1440,
620
],
"color": "#ffffff",
"font_size": 24,
"flags": {}
}
],
"config": {},
"extra": {
"ds": {
"scale": 0.8264462809917358,
"offset": [
156.41790912499965,
-2.272547312500285
]
},
"frontendVersion": "1.23.4",
"VHS_latentpreview": true,
"VHS_latentpreviewrate": 0,
"VHS_MetadataImage": true,
"VHS_KeepIntermediate": true
},
"version": 0.4
}
Binary file not shown.

After

Width:  |  Height:  |  Size: 278 KiB

@@ -0,0 +1,207 @@
{
"id": "gemini-prompt-example",
"revision": 0,
"last_node_id": 6,
"last_link_id": 4,
"nodes": [
{
"id": 2,
"type": "LoadImage",
"pos": [
300,
30
],
"size": [
315,
314
],
"flags": {},
"order": 1,
"mode": 0,
"inputs": [],
"outputs": [
{
"name": "IMAGE",
"type": "IMAGE",
"links": [
3
]
},
{
"name": "MASK",
"type": "MASK",
"links": null
}
],
"properties": {
"cnr_id": "comfy-core",
"ver": "0.3.47",
"Node name for S&R": "LoadImage"
},
"widgets_values": [
"example.png",
"image"
]
},
{
"id": 3,
"type": "DisplayText",
"pos": [
1070,
30
],
"size": [
500,
400
],
"flags": {},
"order": 3,
"mode": 0,
"inputs": [
{
"name": "text",
"type": "STRING",
"link": 4
}
],
"outputs": [
{
"name": "text",
"type": "STRING",
"links": null
}
],
"properties": {
"cnr_id": "kikotools",
"ver": "271cd020c1b2f78e7ee40c1f08e70191fed00012",
"Node name for S&R": "DisplayText"
},
"widgets_values": [
null
]
},
{
"id": 5,
"type": "GeminiPrompt",
"pos": [
640,
30
],
"size": [
400,
276
],
"flags": {},
"order": 2,
"mode": 0,
"inputs": [
{
"name": "image",
"type": "IMAGE",
"link": 3
}
],
"outputs": [
{
"name": "prompt",
"type": "STRING",
"links": [
4
]
},
{
"name": "negative_prompt",
"type": "STRING",
"links": null
}
],
"properties": {
"cnr_id": "kikotools",
"ver": "271cd020c1b2f78e7ee40c1f08e70191fed00012",
"Node name for S&R": "GeminiPrompt"
},
"widgets_values": [
"sdxl",
"gemini-2.0-flash",
"1234-1234-1234-1234",
"",
true,
null,
null,
null
]
},
{
"id": 6,
"type": "MarkdownNote",
"pos": [
300,
410
],
"size": [
400,
240
],
"flags": {},
"order": 0,
"mode": 0,
"inputs": [],
"outputs": [],
"properties": {},
"widgets_values": [
"Gemini Prompt Engineer Example\n\nAI-powered image analysis:\n- Analyzes image content and style\n- Generates optimized prompts for FLUX/SDXL/Danbooru/Video\n- Dynamic model selection with refresh button\n- Custom system prompt override\n\nSetup:\n1. Get free API key from Google AI Studio\n2. Set GEMINI_API_KEY env var or use config file\n3. Click refresh button to get latest models\n\nDisplayText automatically shows split view for SDXL prompts!"
],
"color": "#432",
"bgcolor": "#653"
}
],
"links": [
[
3,
2,
0,
5,
0,
"IMAGE"
],
[
4,
5,
0,
3,
0,
"STRING"
]
],
"groups": [
{
"id": 1,
"title": "Gemini Prompt Engineer",
"bounding": [
210,
-110,
1460,
850
],
"color": "#ffffff",
"font_size": 24,
"flags": {}
}
],
"config": {},
"extra": {
"ds": {
"scale": 0.7513148009015777,
"offset": [
97.5582232217803,
133.12148846503663
]
},
"frontendVersion": "1.23.4",
"VHS_latentpreview": true,
"VHS_latentpreviewrate": 0,
"VHS_MetadataImage": true,
"VHS_KeepIntermediate": true
},
"version": 0.4
}
Binary file not shown.

After

Width:  |  Height:  |  Size: 404 KiB

@@ -0,0 +1,552 @@
{
"id": "3cd0ac86-8d11-41e5-9d8b-6621bc810ee6",
"revision": 0,
"last_node_id": 21,
"last_link_id": 21,
"nodes": [
{
"id": 1,
"type": "LoadImage",
"pos": [
-80,
850
],
"size": [
315,
314.0000305175781
],
"flags": {},
"order": 1,
"mode": 0,
"inputs": [],
"outputs": [
{
"label": "IMAGE",
"name": "IMAGE",
"type": "IMAGE",
"links": [
13
]
},
{
"name": "MASK",
"type": "MASK",
"links": null
}
],
"properties": {
"cnr_id": "comfy-core",
"ver": "0.3.47",
"Node name for S&R": "LoadImage"
},
"widgets_values": [
"example.png",
"image"
]
},
{
"id": 8,
"type": "GetNode",
"pos": [
540,
840
],
"size": [
210,
34
],
"flags": {
"collapsed": true
},
"order": 0,
"mode": 0,
"inputs": [],
"outputs": [
{
"name": "UPSCALE_MODEL",
"type": "UPSCALE_MODEL",
"links": []
}
],
"title": "Get_upscale_skin_model",
"properties": {
"widget_ue_connectable": {}
},
"widgets_values": [
"upscale_skin_model"
]
},
{
"id": 9,
"type": "ImageUpscaleWithModel",
"pos": [
530,
810
],
"size": [
221.98202514648438,
60
],
"flags": {},
"order": 5,
"mode": 0,
"inputs": [
{
"name": "upscale_model",
"type": "UPSCALE_MODEL",
"link": 16
},
{
"name": "image",
"type": "IMAGE",
"link": 5
}
],
"outputs": [
{
"name": "IMAGE",
"type": "IMAGE",
"links": [
10,
21
]
}
],
"properties": {
"cnr_id": "comfy-core",
"ver": "0.3.28",
"Node name for S&R": "ImageUpscaleWithModel",
"widget_ue_connectable": {}
},
"widgets_values": []
},
{
"id": 10,
"type": "ImageToMultipleOf",
"pos": [
1000,
810
],
"size": [
230,
82
],
"flags": {},
"order": 9,
"mode": 0,
"inputs": [
{
"name": "image",
"type": "IMAGE",
"link": 6
}
],
"outputs": [
{
"name": "image",
"type": "IMAGE",
"links": [
18
]
}
],
"properties": {
"cnr_id": "comfyui-glifnodes",
"ver": "1.0.0",
"Node name for S&R": "ImageToMultipleOf",
"widget_ue_connectable": {}
},
"widgets_values": [
65,
"center crop"
]
},
{
"id": 13,
"type": "ImageScaleBy",
"pos": [
760,
810
],
"size": [
220,
82
],
"flags": {},
"order": 7,
"mode": 0,
"inputs": [
{
"name": "image",
"type": "IMAGE",
"link": 10
}
],
"outputs": [
{
"name": "IMAGE",
"type": "IMAGE",
"links": [
6,
19
]
}
],
"properties": {
"cnr_id": "comfy-core",
"ver": "0.3.28",
"Node name for S&R": "ImageScaleBy",
"widget_ue_connectable": {}
},
"widgets_values": [
"lanczos",
0.5000000000000001
]
},
{
"id": 14,
"type": "ImageUpscaleWithModel",
"pos": [
280,
830
],
"size": [
221.98202514648438,
60
],
"flags": {},
"order": 4,
"mode": 0,
"inputs": [
{
"name": "upscale_model",
"type": "UPSCALE_MODEL",
"link": 15
},
{
"name": "image",
"type": "IMAGE",
"link": 13
}
],
"outputs": [
{
"name": "IMAGE",
"type": "IMAGE",
"links": [
5,
20
]
}
],
"properties": {
"cnr_id": "comfy-core",
"ver": "0.3.28",
"Node name for S&R": "ImageUpscaleWithModel",
"widget_ue_connectable": {}
},
"widgets_values": []
},
{
"id": 15,
"type": "UpscaleModelLoader",
"pos": [
-90,
720
],
"size": [
320,
60
],
"flags": {},
"order": 2,
"mode": 0,
"inputs": [],
"outputs": [
{
"name": "UPSCALE_MODEL",
"type": "UPSCALE_MODEL",
"links": [
15
]
}
],
"properties": {
"cnr_id": "comfy-core",
"ver": "0.3.28",
"Node name for S&R": "UpscaleModelLoader",
"widget_ue_connectable": {}
},
"widgets_values": [
"4x-ClearRealityV1.pth"
],
"color": "#232",
"bgcolor": "#353"
},
{
"id": 16,
"type": "UpscaleModelLoader",
"pos": [
140,
610
],
"size": [
320,
60
],
"flags": {},
"order": 3,
"mode": 0,
"inputs": [],
"outputs": [
{
"name": "UPSCALE_MODEL",
"type": "UPSCALE_MODEL",
"links": [
16
]
}
],
"properties": {
"cnr_id": "comfy-core",
"ver": "0.3.28",
"Node name for S&R": "UpscaleModelLoader",
"widget_ue_connectable": {}
},
"widgets_values": [
"1xSkinContrast-High-SuperUltraCompact.pth"
],
"color": "#232",
"bgcolor": "#353"
},
{
"id": 18,
"type": "PreviewImage",
"pos": [
1260,
810
],
"size": [
270,
280
],
"flags": {},
"order": 11,
"mode": 0,
"inputs": [
{
"name": "images",
"type": "IMAGE",
"link": 18
}
],
"outputs": [],
"properties": {
"cnr_id": "comfy-core",
"ver": "0.3.47",
"Node name for S&R": "PreviewImage"
},
"widgets_values": []
},
{
"id": 19,
"type": "PreviewImage",
"pos": [
1010,
940
],
"size": [
210,
258
],
"flags": {},
"order": 10,
"mode": 0,
"inputs": [
{
"name": "images",
"type": "IMAGE",
"link": 19
}
],
"outputs": [],
"properties": {
"cnr_id": "comfy-core",
"ver": "0.3.47",
"Node name for S&R": "PreviewImage"
},
"widgets_values": []
},
{
"id": 20,
"type": "PreviewImage",
"pos": [
520,
940
],
"size": [
210,
258
],
"flags": {},
"order": 6,
"mode": 0,
"inputs": [
{
"name": "images",
"type": "IMAGE",
"link": 20
}
],
"outputs": [],
"properties": {
"cnr_id": "comfy-core",
"ver": "0.3.47",
"Node name for S&R": "PreviewImage"
},
"widgets_values": []
},
{
"id": 21,
"type": "PreviewImage",
"pos": [
750,
940
],
"size": [
210,
258
],
"flags": {},
"order": 8,
"mode": 0,
"inputs": [
{
"name": "images",
"type": "IMAGE",
"link": 21
}
],
"outputs": [],
"properties": {
"cnr_id": "comfy-core",
"ver": "0.3.47",
"Node name for S&R": "PreviewImage"
},
"widgets_values": []
}
],
"links": [
[
5,
14,
0,
9,
1,
"IMAGE"
],
[
6,
13,
0,
10,
0,
"IMAGE"
],
[
10,
9,
0,
13,
0,
"IMAGE"
],
[
13,
1,
0,
14,
1,
"IMAGE"
],
[
15,
15,
0,
14,
0,
"UPSCALE_MODEL"
],
[
16,
16,
0,
9,
0,
"UPSCALE_MODEL"
],
[
18,
10,
0,
18,
0,
"IMAGE"
],
[
19,
13,
0,
19,
0,
"IMAGE"
],
[
20,
14,
0,
20,
0,
"IMAGE"
],
[
21,
9,
0,
21,
0,
"IMAGE"
]
],
"groups": [
{
"id": 1,
"title": "Image to Multiple of",
"bounding": [
-180,
420,
1800,
830
],
"color": "#ffffff",
"font_size": 24,
"flags": {}
}
],
"config": {},
"extra": {
"ds": {
"scale": 0.6655312045216585,
"offset": [
292.51725658775155,
-375.0766486499791
]
},
"frontendVersion": "1.23.4",
"VHS_latentpreview": true,
"VHS_latentpreviewrate": 0,
"VHS_MetadataImage": true,
"VHS_KeepIntermediate": true
},
"version": 0.4
}
Binary file not shown.

After

Width:  |  Height:  |  Size: 805 KiB

@@ -0,0 +1,147 @@
{
"id": "kiko-save-image-example",
"revision": 0,
"last_node_id": 4,
"last_link_id": 1,
"nodes": [
{
"id": 1,
"type": "KikoSaveImage",
"pos": [
390,
80
],
"size": [
400,
390
],
"flags": {},
"order": 2,
"mode": 0,
"inputs": [
{
"name": "images",
"type": "IMAGE",
"link": 1
}
],
"outputs": [],
"properties": {
"cnr_id": "kikotools",
"ver": "271cd020c1b2f78e7ee40c1f08e70191fed00012",
"Node name for S&R": "KikoSaveImage"
},
"widgets_values": [
"KikoSave",
"PNG",
90,
4,
false,
true
]
},
{
"id": 2,
"type": "LoadImage",
"pos": [
-10,
80
],
"size": [
315,
314
],
"flags": {},
"order": 1,
"mode": 0,
"inputs": [],
"outputs": [
{
"name": "IMAGE",
"type": "IMAGE",
"links": [
1
]
},
{
"name": "MASK",
"type": "MASK",
"links": null
}
],
"properties": {
"cnr_id": "comfy-core",
"ver": "0.3.47",
"Node name for S&R": "LoadImage"
},
"widgets_values": [
"example.png",
"image"
]
},
{
"id": 4,
"type": "MarkdownNote",
"pos": [
-10,
460
],
"size": [
370,
270
],
"flags": {},
"order": 0,
"mode": 0,
"inputs": [],
"outputs": [],
"properties": {},
"widgets_values": [
"Kiko Save Image Example\n\nEnhanced image saving with:\n- Format selection: PNG, JPEG, WebP\n- Quality controls per format\n- Floating popup viewer (draggable)\n- Batch operations support\n- File size display\n\nPopup Features:\n- Click images to open in new tab\n- Download individual or selected images\n- Minimize/maximize/roll-up controls\n- Persistent across saves\n\nTry different formats to compare file sizes!"
],
"color": "#432",
"bgcolor": "#653"
}
],
"links": [
[
1,
2,
0,
1,
0,
"IMAGE"
]
],
"groups": [
{
"id": 1,
"title": "Kiko save Image",
"bounding": [
-110,
-60,
1020,
870
],
"color": "#ffffff",
"font_size": 24,
"flags": {}
}
],
"config": {},
"extra": {
"ds": {
"scale": 0.7513148009015777,
"offset": [
648.1018911400128,
110.02838653698085
]
},
"frontendVersion": "1.23.4",
"VHS_latentpreview": true,
"VHS_latentpreviewrate": 0,
"VHS_MetadataImage": true,
"VHS_KeepIntermediate": true
},
"version": 0.4
}
Binary file not shown.

After

Width:  |  Height:  |  Size: 245 KiB

@@ -1,15 +1,15 @@
{
"id": "41469b2d-d616-479d-879a-95cdc6074a37",
"revision": 0,
"last_node_id": 6,
"last_link_id": 5,
"last_node_id": 11,
"last_link_id": 9,
"nodes": [
{
"id": 1,
"type": "ResolutionCalculator",
"pos": [
60,
430
-30,
210
],
"size": [
315,
@@ -38,8 +38,7 @@
"type": "INT",
"slot_index": 0,
"links": [
1,
3
6
]
},
{
@@ -47,15 +46,15 @@
"type": "INT",
"slot_index": 1,
"links": [
2,
4
7
]
}
],
"properties": {
"aux_id": "ComfyAssets/ComfyUI-KikoTools",
"cnr_id": "kikotools",
"ver": "965ad60c74d7f25b1acce890d9c06518e46e6d0b",
"Node name for S&R": "ResolutionCalculator",
"aux_id": "ComfyAssets/ComfyUI-KikoTools",
"widget_ue_connectable": {}
},
"widgets_values": [
@@ -66,8 +65,8 @@
"id": 6,
"type": "LoadImage",
"pos": [
-250,
430
-340,
210
],
"size": [
274.080078125,
@@ -94,8 +93,8 @@
"properties": {
"cnr_id": "comfy-core",
"ver": "0.3.40",
"widget_ue_connectable": {},
"Node name for S&R": "LoadImage"
"Node name for S&R": "LoadImage",
"widget_ue_connectable": {}
},
"widgets_values": [
"image-2025-06-13-105737.jpg",
@@ -103,80 +102,14 @@
]
},
{
"id": 4,
"type": "Display Int (rgthree)",
"id": 7,
"type": "MarkdownNote",
"pos": [
420,
360
-350,
610
],
"size": [
210,
88
],
"flags": {},
"order": 3,
"mode": 0,
"inputs": [
{
"dir": 3,
"name": "input",
"type": "INT",
"link": 3
}
],
"outputs": [],
"properties": {
"cnr_id": "rgthree-comfy",
"ver": "1.0.2506081210",
"Node name for S&R": "Display Int (rgthree)",
"widget_ue_connectable": {}
},
"widgets_values": [
""
]
},
{
"id": 5,
"type": "Display Int (rgthree)",
"pos": [
430,
530
],
"size": [
210,
88
],
"flags": {},
"order": 4,
"mode": 0,
"inputs": [
{
"dir": 3,
"name": "input",
"type": "INT",
"link": 4
}
],
"outputs": [],
"properties": {
"cnr_id": "rgthree-comfy",
"ver": "1.0.2506081210",
"widget_ue_connectable": {},
"Node name for S&R": "Display Int (rgthree)"
},
"widgets_values": [
""
]
},
{
"id": 2,
"type": "Note",
"pos": [
-150,
170
],
"size": [
400,
410,
200
],
"flags": {},
@@ -184,50 +117,167 @@
"mode": 0,
"inputs": [],
"outputs": [],
"properties": {
"text": "Resolution Calculator Example\n\nThis node calculates upscaled dimensions from:\n- IMAGE tensors (connect from image loaders)\n- LATENT tensors (connect from VAE encode/generation)\n\nUse cases:\n- Calculate target dimensions for upscalers\n- Plan memory usage for large generations\n- Ensure dimensions are divisible by 8\n\nScale factors optimized for SDXL and FLUX models.",
"widget_ue_connectable": {}
},
"properties": {},
"widgets_values": [
"Resolution Calculator Example\n\nThis node calculates upscaled dimensions from:\n- IMAGE tensors (connect from image loaders)\n- LATENT tensors (connect from VAE encode/generation)\n\nUse cases:\n- Calculate target dimensions for upscalers\n- Plan memory usage for large generations\n- Ensure dimensions are divisible by 8\n\nScale factors optimized for SDXL and FLUX models."
],
"color": "#432",
"bgcolor": "#653"
},
{
"id": 8,
"type": "DisplayAny",
"pos": [
330,
160
],
"size": [
270,
58
],
"flags": {},
"order": 3,
"mode": 0,
"inputs": [
{
"name": "input",
"type": "*",
"link": 6
}
],
"outputs": [
{
"name": "display_text",
"type": "STRING",
"links": [
8
]
}
],
"properties": {
"cnr_id": "kikotools",
"ver": "271cd020c1b2f78e7ee40c1f08e70191fed00012",
"Node name for S&R": "DisplayAny"
},
"widgets_values": [
"raw value"
]
},
{
"id": 9,
"type": "DisplayAny",
"pos": [
330,
310
],
"size": [
270,
58
],
"flags": {},
"order": 4,
"mode": 0,
"inputs": [
{
"name": "input",
"type": "*",
"link": 7
}
],
"outputs": [
{
"name": "display_text",
"type": "STRING",
"links": [
9
]
}
],
"properties": {
"cnr_id": "kikotools",
"ver": "271cd020c1b2f78e7ee40c1f08e70191fed00012",
"Node name for S&R": "DisplayAny"
},
"widgets_values": [
"raw value"
]
},
{
"id": 10,
"type": "DisplayText",
"pos": [
670,
160
],
"size": [
210,
138
],
"flags": {},
"order": 5,
"mode": 0,
"inputs": [
{
"name": "text",
"type": "STRING",
"link": 8
}
],
"outputs": [
{
"name": "text",
"type": "STRING",
"links": null
}
],
"properties": {
"cnr_id": "kikotools",
"ver": "271cd020c1b2f78e7ee40c1f08e70191fed00012",
"Node name for S&R": "DisplayText"
},
"widgets_values": [
null
]
},
{
"id": 11,
"type": "DisplayText",
"pos": [
660,
400
],
"size": [
210,
138
],
"flags": {},
"order": 6,
"mode": 0,
"inputs": [
{
"name": "text",
"type": "STRING",
"link": 9
}
],
"outputs": [
{
"name": "text",
"type": "STRING",
"links": null
}
],
"properties": {
"cnr_id": "kikotools",
"ver": "271cd020c1b2f78e7ee40c1f08e70191fed00012",
"Node name for S&R": "DisplayText"
},
"widgets_values": [
null
]
}
],
"links": [
[
1,
1,
0,
3,
0,
"INT"
],
[
2,
1,
1,
3,
1,
"INT"
],
[
3,
1,
0,
4,
0,
"INT"
],
[
4,
1,
1,
5,
0,
"INT"
],
[
5,
6,
@@ -235,21 +285,67 @@
1,
0,
"IMAGE"
],
[
6,
1,
0,
8,
0,
"*"
],
[
7,
1,
1,
9,
0,
"*"
],
[
8,
8,
0,
10,
0,
"STRING"
],
[
9,
9,
0,
11,
0,
"STRING"
]
],
"groups": [],
"groups": [
{
"id": 1,
"title": "Resolution Calculator",
"bounding": [
-480,
20,
1480,
880
],
"color": "#ffffff",
"font_size": 24,
"flags": {}
}
],
"config": {},
"extra": {
"ue_links": [],
"ds": {
"scale": 0.7972024500000015,
"scale": 0.45000000000000145,
"offset": [
709.6391289161842,
-90.0127389290854
1248.1498802376432,
256.0155843113725
]
},
"links_added_by_ue": [],
"frontendVersion": "1.21.7",
"frontendVersion": "1.23.4",
"VHS_latentpreview": true,
"VHS_latentpreviewrate": 0,
"VHS_MetadataImage": true,
Binary file not shown.

After

Width:  |  Height:  |  Size: 785 KiB

@@ -534,4 +534,4 @@
"VHS_KeepIntermediate": true
},
"version": 0.4
}
}
+1 -1
View File
@@ -641,4 +641,4 @@
"VHS_KeepIntermediate": true
},
"version": 0.4
}
}
@@ -719,4 +719,4 @@
"VHS_KeepIntermediate": true
},
"version": 0.4
}
}
+18
View File
@@ -7,6 +7,12 @@ from .tools.resolution_calculator import ResolutionCalculatorNode
from .tools.width_height_selector import WidthHeightSelectorNode
from .tools.seed_history import SeedHistoryNode
from .tools.sampler_combo import SamplerComboNode, SamplerComboCompactNode
from .tools.empty_latent_batch import EmptyLatentBatchNode
from .tools.kiko_save_image import KikoSaveImageNode
from .tools.image_to_multiple_of import ImageToMultipleOfNode
from .tools.gemini_prompt import GeminiPromptNode
from .tools.display_any import DisplayAnyNode
from .tools.display_text import DisplayTextNode
# ComfyUI node registration mappings
NODE_CLASS_MAPPINGS = {
@@ -15,6 +21,12 @@ NODE_CLASS_MAPPINGS = {
"SeedHistory": SeedHistoryNode,
"SamplerCombo": SamplerComboNode,
"SamplerComboCompact": SamplerComboCompactNode,
"EmptyLatentBatch": EmptyLatentBatchNode,
"KikoSaveImage": KikoSaveImageNode,
"ImageToMultipleOf": ImageToMultipleOfNode,
"GeminiPrompt": GeminiPromptNode,
"DisplayAny": DisplayAnyNode,
"DisplayText": DisplayTextNode,
}
NODE_DISPLAY_NAME_MAPPINGS = {
@@ -23,6 +35,12 @@ NODE_DISPLAY_NAME_MAPPINGS = {
"SeedHistory": "Seed History",
"SamplerCombo": "Sampler Combo",
"SamplerComboCompact": "Sampler Combo (Compact)",
"EmptyLatentBatch": "Empty Latent Batch",
"KikoSaveImage": "Kiko Save Image",
"ImageToMultipleOf": "Image to Multiple of",
"GeminiPrompt": "Gemini Prompt Engineer",
"DisplayAny": "Display Any",
"DisplayText": "Display Text",
}
__all__ = ["NODE_CLASS_MAPPINGS", "NODE_DISPLAY_NAME_MAPPINGS"]
+5
View File
@@ -0,0 +1,5 @@
"""DisplayAny tool for ComfyUI."""
from .node import DisplayAnyNode
__all__ = ["DisplayAnyNode"]
+64
View File
@@ -0,0 +1,64 @@
"""Logic for DisplayAny node - displays any input value or tensor shape."""
from typing import Any, List, Union
def get_tensor_shapes(input_value: Any) -> List[List[int]]:
"""Extract tensor shapes from nested structures.
Args:
input_value: Any input value that may contain tensors
Returns:
List of tensor shapes found in the input
"""
shapes = []
def extract_shapes(value: Any) -> None:
"""Recursively extract shapes from nested structures."""
if isinstance(value, dict):
for v in value.values():
extract_shapes(v)
elif isinstance(value, (list, tuple)):
for item in value:
extract_shapes(item)
elif hasattr(value, "shape"):
# Handle tensors (numpy arrays, torch tensors, etc.)
shapes.append(list(value.shape))
extract_shapes(input_value)
return shapes
def format_display_value(input_value: Any, mode: str = "raw value") -> str:
"""Format input value for display based on selected mode.
Args:
input_value: Any input value to display
mode: Display mode - "raw value" or "tensor shape"
Returns:
Formatted string representation of the input
"""
if mode == "tensor shape":
shapes = get_tensor_shapes(input_value)
if shapes:
return str(shapes)
else:
return "No tensors found in input"
# Default to raw value display
return str(input_value)
def validate_display_mode(mode: str) -> bool:
"""Validate if the display mode is supported.
Args:
mode: Display mode to validate
Returns:
True if mode is valid, False otherwise
"""
valid_modes = ["raw value", "tensor shape"]
return mode in valid_modes
+66
View File
@@ -0,0 +1,66 @@
"""DisplayAny node for ComfyUI - displays any input value or tensor information."""
from typing import Any, Dict, Tuple
from ...base import ComfyAssetsBaseNode
from .logic import format_display_value, validate_display_mode
# Define AnyType for wildcard input matching
class AnyType(str):
"""A special type that matches any input type in ComfyUI."""
def __ne__(self, other):
return False
class DisplayAnyNode(ComfyAssetsBaseNode):
"""Display any input value or tensor shape information.
This node can display any type of input in two modes:
- Raw value: Shows the string representation of the input
- Tensor shape: Extracts and displays shapes of any tensors in the input
"""
@classmethod
def INPUT_TYPES(cls) -> Dict[str, Any]:
"""Define input types for the node."""
return {
"required": {
"input": (AnyType("*"), {}), # Accept any type of input
"mode": (["raw value", "tensor shape"],),
},
}
@classmethod
def VALIDATE_INPUTS(cls, **kwargs) -> bool:
"""Validate inputs - always returns True as we accept any input."""
return True
RETURN_TYPES = ("STRING",)
RETURN_NAMES = ("display_text",)
FUNCTION = "display"
OUTPUT_NODE = True # This node displays output in the UI
def display(self, input: Any, mode: str = "raw value") -> Dict[str, Any]:
"""Display the input value according to the selected mode.
Args:
input: Any input value to display
mode: Display mode - "raw value" or "tensor shape"
Returns:
Dictionary with UI display and result
"""
# Validate mode
if not validate_display_mode(mode):
mode = "raw value" # Default to raw value if invalid
# Format the display text
display_text = format_display_value(input, mode)
# Return both UI display and result
return {
"ui": {"text": display_text},
"result": (display_text,),
}
+5
View File
@@ -0,0 +1,5 @@
"""Display Text tool for ComfyUI."""
from .node import DisplayTextNode, NODE_DISPLAY_NAME
__all__ = ["DisplayTextNode", "NODE_DISPLAY_NAME"]
+48
View File
@@ -0,0 +1,48 @@
"""Display Text node implementation."""
from ...base import ComfyAssetsBaseNode
class DisplayTextNode(ComfyAssetsBaseNode):
"""Displays text in the ComfyUI interface with copy-to-clipboard functionality."""
@classmethod
def INPUT_TYPES(cls):
"""Define input types for the node."""
return {
"required": {
"text": ("STRING", {"forceInput": True}),
},
}
RETURN_TYPES = ("STRING",)
RETURN_NAMES = ("text",)
OUTPUT_NODE = True
FUNCTION = "display_text"
CATEGORY = "ComfyAssets"
DESCRIPTION = """
Displays text in the UI with a copy-to-clipboard feature.
Features:
- Shows text content in a readable format
- Copy button appears on hover
- Passes text through for chaining
"""
def display_text(self, text):
"""Display the text and pass it through.
Args:
text: Input text to display
Returns:
Tuple containing the text
"""
# The actual display happens in the frontend
# We just pass the text through
return {"ui": {"text": [text]}, "result": (text,)}
# Node display name
NODE_DISPLAY_NAME = "Display Text"
@@ -0,0 +1,5 @@
"""Empty Latent Batch tool for ComfyUI."""
from .node import EmptyLatentBatchNode
__all__ = ["EmptyLatentBatchNode"]
+101
View File
@@ -0,0 +1,101 @@
"""Logic for creating empty latent tensors with batch support."""
import torch
from typing import Dict, Tuple
def create_empty_latent_batch(
width: int, height: int, batch_size: int = 1
) -> Dict[str, torch.Tensor]:
"""
Create empty latent tensor with batch support.
Args:
width: Width in pixels (will be divided by 8 for latent space)
height: Height in pixels (will be divided by 8 for latent space)
batch_size: Number of latents in the batch
Returns:
Dictionary containing the latent samples tensor
Raises:
ValueError: If dimensions are invalid
"""
# Validate inputs
if width <= 0 or height <= 0:
raise ValueError(f"Width and height must be positive, got {width}x{height}")
if batch_size <= 0:
raise ValueError(f"Batch size must be positive, got {batch_size}")
# Ensure dimensions are divisible by 8 (VAE requirement)
if width % 8 != 0 or height % 8 != 0:
raise ValueError(
f"Width and height must be divisible by 8, got {width}x{height}"
)
# Convert pixel dimensions to latent space (divide by 8)
latent_width = width // 8
latent_height = height // 8
# Create empty latent tensor
# ComfyUI latent format: [batch, channels, height, width]
# Standard VAE uses 4 channels
latent_tensor = torch.zeros(batch_size, 4, latent_height, latent_width)
return {"samples": latent_tensor}
def validate_dimensions(width: int, height: int) -> bool:
"""
Validate that dimensions are suitable for latent creation.
Args:
width: Width in pixels
height: Height in pixels
Returns:
True if dimensions are valid
"""
# Check basic constraints
if width <= 0 or height <= 0:
return False
# Check divisibility by 8
if width % 8 != 0 or height % 8 != 0:
return False
# Check reasonable size limits (64x64 to 8192x8192)
if width < 64 or height < 64:
return False
if width > 8192 or height > 8192:
return False
return True
def sanitize_dimensions(width: int, height: int) -> Tuple[int, int]:
"""
Sanitize dimensions to ensure they meet latent requirements.
Args:
width: Input width
height: Input height
Returns:
Tuple of (sanitized_width, sanitized_height)
"""
# Ensure minimum dimensions
width = max(64, width)
height = max(64, height)
# Ensure maximum dimensions
width = min(8192, width)
height = min(8192, height)
# Round to nearest multiple of 8
width = (width + 7) // 8 * 8
height = (height + 7) // 8 * 8
return width, height
+309
View File
@@ -0,0 +1,309 @@
"""Empty Latent Batch node for ComfyUI."""
import torch
from typing import Dict, Tuple
from ...base.base_node import ComfyAssetsBaseNode
from .logic import (
create_empty_latent_batch,
validate_dimensions,
sanitize_dimensions,
)
from ..width_height_selector.logic import get_preset_dimensions
from ..width_height_selector.presets import (
PRESET_OPTIONS,
PRESET_METADATA,
)
class EmptyLatentBatchNode(ComfyAssetsBaseNode):
"""
Empty Latent Batch node for creating empty latent tensors with batch support.
Creates empty latent tensors with specified dimensions and batch size,
compatible with ComfyUI's latent format for use with VAE and diffusion models.
"""
@classmethod
def INPUT_TYPES(cls):
"""Define the input types for the ComfyUI node."""
# Create formatted preset options with metadata
preset_options = ["custom"] # Custom first
# Add formatted presets with metadata
for preset_name in PRESET_OPTIONS.keys():
if preset_name != "custom":
metadata = PRESET_METADATA.get(preset_name)
if metadata:
formatted_option = (
f"{preset_name} - {metadata.aspect_ratio} "
f"({metadata.megapixels:.1f}MP) - {metadata.model_group}"
)
preset_options.append(formatted_option)
else:
preset_options.append(preset_name)
return {
"required": {
"preset": (
preset_options,
{
"default": "custom",
"tooltip": "Select from optimized resolution presets or use "
"custom dimensions. SDXL presets are ~1MP, FLUX presets are "
"higher resolution, Ultra-wide presets support modern "
"aspect ratios.",
},
),
"width": (
"INT",
{
"default": 1024,
"min": 64,
"max": 8192,
"step": 8,
"tooltip": "Custom width in pixels (must be multiple of 8). "
"Used when preset is 'custom' or as fallback for invalid "
"presets. This will be converted to latent space dimensions.",
},
),
"height": (
"INT",
{
"default": 1024,
"min": 64,
"max": 8192,
"step": 8,
"tooltip": "Custom height in pixels (must be multiple of 8). "
"Used when preset is 'custom' or as fallback for invalid "
"presets. This will be converted to latent space dimensions.",
},
),
"batch_size": (
"INT",
{
"default": 1,
"min": 1,
"max": 64,
"step": 1,
"tooltip": "Number of empty latents to create in the batch. "
"Useful for batch processing workflows.",
},
),
}
}
RETURN_TYPES = ("LATENT", "INT", "INT")
RETURN_NAMES = ("latent", "width", "height")
FUNCTION = "create_empty_latent"
CATEGORY = "ComfyAssets"
def create_empty_latent(
self, preset: str, width: int, height: int, batch_size: int
) -> Tuple[Dict[str, torch.Tensor], int, int]:
"""
Create empty latent tensor with specified dimensions and batch size.
Args:
preset: Selected preset name or formatted preset string
width: Custom width value
height: Custom height value
batch_size: Number of latents in the batch
Returns:
Tuple containing (latent dictionary with 'samples' tensor, width, height)
"""
try:
# Extract original preset name from formatted string if needed
original_preset = self._extract_preset_name(preset)
# Get base dimensions from preset or custom input
base_width, base_height = get_preset_dimensions(
original_preset, width, height
)
# Sanitize dimensions to ensure they meet requirements
final_width, final_height = sanitize_dimensions(base_width, base_height)
# Log if dimensions were changed from the base dimensions
if final_width != base_width or final_height != base_height:
self.log_info(
f"Dimensions adjusted from {base_width}×{base_height} to "
f"{final_width}×{final_height} to meet VAE requirements"
)
# Validate final dimensions
if not validate_dimensions(final_width, final_height):
self.handle_error(
f"Invalid dimensions after sanitization: {final_width}×{final_height}"
)
# Validate batch size
if batch_size <= 0:
self.handle_error(f"Batch size must be positive, got {batch_size}")
if batch_size > 64:
self.log_info(
f"Large batch size ({batch_size}) may use significant memory"
)
# Create the empty latent batch
latent_dict = create_empty_latent_batch(
final_width, final_height, batch_size
)
# Log the operation
latent_height = final_height // 8
latent_width = final_width // 8
self.log_info(
f"Created empty latent batch: {batch_size}×4×{latent_height}×{latent_width} "
f"(pixel dims: {final_width}×{final_height})"
)
return (latent_dict, final_width, final_height)
except Exception as e:
# Handle any unexpected errors gracefully
error_msg = f"Error creating empty latent batch: {str(e)}"
self.handle_error(error_msg, e)
def _extract_preset_name(self, formatted_preset: str) -> str:
"""
Extract the original preset name from a formatted preset string.
Args:
formatted_preset: Either original preset name or formatted string
Returns:
Original preset name
"""
# If it's already "custom", return as-is
if formatted_preset == "custom":
return formatted_preset
# If it contains formatting metadata, extract the resolution part
if " - " in formatted_preset:
# Format is: "1024×1024 - 1:1 (1.0MP) - SDXL"
# Extract the first part (resolution)
resolution_part = formatted_preset.split(" - ")[0]
# Verify this is a valid preset name
if resolution_part in PRESET_OPTIONS:
return resolution_part
# If no formatting or not found, check if it's directly a valid preset
if formatted_preset in PRESET_OPTIONS:
return formatted_preset
# Default to "custom" if we can't parse it
return "custom"
def validate_inputs(
self, preset: str, width: int, height: int, batch_size: int
) -> bool:
"""
Validate node inputs.
Args:
preset: Preset name or formatted preset string
width: Width value
height: Height value
batch_size: Batch size value
Returns:
True if inputs are valid
"""
# Extract original preset name
original_preset = self._extract_preset_name(preset)
# Check if preset exists or is custom
if original_preset != "custom" and original_preset not in PRESET_OPTIONS:
return False
# Get dimensions from preset or use custom
base_width, base_height = get_preset_dimensions(original_preset, width, height)
# Check dimension validity (after sanitization)
sanitized_width, sanitized_height = sanitize_dimensions(base_width, base_height)
if not validate_dimensions(sanitized_width, sanitized_height):
return False
# Check batch size
if batch_size <= 0 or batch_size > 64:
return False
return True
def get_latent_info(self, width: int, height: int, batch_size: int) -> str:
"""
Get descriptive information about the latent that will be created.
Args:
width: Width in pixels
height: Height in pixels
batch_size: Batch size
Returns:
Description string for the latent
"""
sanitized_width, sanitized_height = sanitize_dimensions(width, height)
latent_width = sanitized_width // 8
latent_height = sanitized_height // 8
return (
f"Empty latent batch: {batch_size} × 4 × {latent_height} × {latent_width} "
f"(pixel dimensions: {sanitized_width}×{sanitized_height})"
)
def get_memory_estimate(self, width: int, height: int, batch_size: int) -> str:
"""
Estimate memory usage for the latent batch.
Args:
width: Width in pixels
height: Height in pixels
batch_size: Batch size
Returns:
Memory estimate string
"""
sanitized_width, sanitized_height = sanitize_dimensions(width, height)
latent_width = sanitized_width // 8
latent_height = sanitized_height // 8
# Calculate tensor size in bytes (float32 = 4 bytes per element)
elements = batch_size * 4 * latent_height * latent_width
bytes_size = elements * 4 # 4 bytes per float32
# Convert to human-readable format
if bytes_size < 1024:
return f"{bytes_size} bytes"
elif bytes_size < 1024 * 1024:
return f"{bytes_size / 1024:.1f} KB"
elif bytes_size < 1024 * 1024 * 1024:
return f"{bytes_size / (1024 * 1024):.1f} MB"
else:
return f"{bytes_size / (1024 * 1024 * 1024):.1f} GB"
def __str__(self) -> str:
"""String representation of the node."""
return "EmptyLatentBatchNode"
def __repr__(self) -> str:
"""Detailed string representation of the node."""
return (
f"EmptyLatentBatchNode("
f"category='{self.CATEGORY}', "
f"function='{self.FUNCTION}'"
f")"
)
# Node class mappings for ComfyUI registration
NODE_CLASS_MAPPINGS = {
"EmptyLatentBatch": EmptyLatentBatchNode,
}
NODE_DISPLAY_NAME_MAPPINGS = {
"EmptyLatentBatch": "Empty Latent Batch",
}
@@ -0,0 +1,89 @@
{
"models": [
"gemini-2.5-pro",
"gemini-2.5-flash",
"gemini-2.5-flash-lite",
"gemini-2.5-pro-preview-03-25",
"gemini-2.5-flash-preview-05-20",
"gemini-2.5-pro-preview-05-06",
"gemini-2.5-pro-preview-06-05",
"gemini-2.5-flash-lite-preview-06-17",
"gemini-2.0-flash",
"gemini-2.0-flash-001",
"gemini-2.0-flash-lite-001",
"gemini-2.0-flash-lite",
"gemini-2.5-flash-preview-tts",
"gemini-2.5-pro-preview-tts",
"gemini-2.0-flash-preview-image-generation",
"gemini-2.0-flash-exp",
"gemini-2.0-flash-exp-image-generation",
"gemini-2.0-flash-lite-preview-02-05",
"gemini-2.0-flash-lite-preview",
"gemini-2.0-pro-exp",
"gemini-2.0-pro-exp-02-05",
"learnlm-2.0-flash-experimental",
"gemini-1.5-pro-latest",
"gemini-1.5-pro-002",
"gemini-1.5-pro",
"gemini-1.5-flash-latest",
"gemini-1.5-flash",
"gemini-1.5-flash-002",
"gemini-1.5-flash-8b",
"gemini-1.5-flash-8b-001",
"gemini-1.5-flash-8b-latest",
"gemini-2.0-flash-thinking-exp-01-21",
"gemini-2.0-flash-thinking-exp",
"gemini-2.0-flash-thinking-exp-1219",
"gemma-3-1b-it",
"gemma-3-4b-it",
"gemma-3-12b-it",
"gemma-3-27b-it",
"gemma-3n-e4b-it",
"gemma-3n-e2b-it",
"gemini-exp-1206"
],
"descriptions": {
"gemini-1.5-pro-latest": "Gemini 1.5 Pro Latest",
"gemini-1.5-pro-002": "Gemini 1.5 Pro 002",
"gemini-1.5-pro": "Gemini 1.5 Pro",
"gemini-1.5-flash-latest": "Gemini 1.5 Flash Latest",
"gemini-1.5-flash": "Gemini 1.5 Flash",
"gemini-1.5-flash-002": "Gemini 1.5 Flash 002",
"gemini-1.5-flash-8b": "Gemini 1.5 Flash-8B",
"gemini-1.5-flash-8b-001": "Gemini 1.5 Flash-8B 001",
"gemini-1.5-flash-8b-latest": "Gemini 1.5 Flash-8B Latest",
"gemini-2.5-pro-preview-03-25": "Gemini 2.5 Pro Preview 03-25",
"gemini-2.5-flash-preview-05-20": "Gemini 2.5 Flash Preview 05-20",
"gemini-2.5-flash": "Gemini 2.5 Flash",
"gemini-2.5-flash-lite-preview-06-17": "Gemini 2.5 Flash-Lite Preview 06-17",
"gemini-2.5-pro-preview-05-06": "Gemini 2.5 Pro Preview 05-06",
"gemini-2.5-pro-preview-06-05": "Gemini 2.5 Pro Preview",
"gemini-2.5-pro": "Gemini 2.5 Pro",
"gemini-2.0-flash-exp": "Gemini 2.0 Flash Experimental",
"gemini-2.0-flash": "Gemini 2.0 Flash",
"gemini-2.0-flash-001": "Gemini 2.0 Flash 001",
"gemini-2.0-flash-exp-image-generation": "Gemini 2.0 Flash (Image Generation) Experimental",
"gemini-2.0-flash-lite-001": "Gemini 2.0 Flash-Lite 001",
"gemini-2.0-flash-lite": "Gemini 2.0 Flash-Lite",
"gemini-2.0-flash-preview-image-generation": "Gemini 2.0 Flash Preview Image Generation",
"gemini-2.0-flash-lite-preview-02-05": "Gemini 2.0 Flash-Lite Preview 02-05",
"gemini-2.0-flash-lite-preview": "Gemini 2.0 Flash-Lite Preview",
"gemini-2.0-pro-exp": "Gemini 2.0 Pro Experimental",
"gemini-2.0-pro-exp-02-05": "Gemini 2.0 Pro Experimental 02-05",
"gemini-exp-1206": "Gemini Experimental 1206",
"gemini-2.0-flash-thinking-exp-01-21": "Gemini 2.5 Flash Preview 05-20",
"gemini-2.0-flash-thinking-exp": "Gemini 2.5 Flash Preview 05-20",
"gemini-2.0-flash-thinking-exp-1219": "Gemini 2.5 Flash Preview 05-20",
"gemini-2.5-flash-preview-tts": "Gemini 2.5 Flash Preview TTS",
"gemini-2.5-pro-preview-tts": "Gemini 2.5 Pro Preview TTS",
"learnlm-2.0-flash-experimental": "LearnLM 2.0 Flash Experimental",
"gemma-3-1b-it": "Gemma 3 1B",
"gemma-3-4b-it": "Gemma 3 4B",
"gemma-3-12b-it": "Gemma 3 12B",
"gemma-3-27b-it": "Gemma 3 27B",
"gemma-3n-e4b-it": "Gemma 3n E4B",
"gemma-3n-e2b-it": "Gemma 3n E2B",
"gemini-2.5-flash-lite": "Gemini 2.5 Flash-Lite"
},
"timestamp": 1754142231.0568295
}
@@ -0,0 +1,5 @@
"""Gemini Prompt Engineer node for ComfyUI."""
from .node import GeminiPromptNode
__all__ = ["GeminiPromptNode"]
+163
View File
@@ -0,0 +1,163 @@
"""Logic for Gemini API integration and prompt generation."""
import base64
import io
import json
import os
from typing import Optional, Tuple
import numpy as np
from PIL import Image
from .prompts import PROMPT_TEMPLATES
def tensor_to_pil(tensor: np.ndarray) -> Image.Image:
"""Convert ComfyUI tensor to PIL Image.
Args:
tensor: Input tensor in ComfyUI format (B, H, W, C)
Returns:
PIL Image object
"""
# ComfyUI tensors are in [0, 1] range
if tensor.ndim == 4:
# Take first image from batch
tensor = tensor[0]
# Convert to uint8
image_array = (tensor * 255).astype(np.uint8)
# Convert to PIL
return Image.fromarray(image_array, mode="RGB")
def image_to_base64(image: Image.Image, format: str = "PNG") -> str:
"""Convert PIL Image to base64 string.
Args:
image: PIL Image object
format: Image format (PNG or JPEG)
Returns:
Base64 encoded string
"""
buffer = io.BytesIO()
image.save(buffer, format=format)
buffer.seek(0)
return base64.b64encode(buffer.read()).decode("utf-8")
def get_api_key() -> Optional[str]:
"""Get Gemini API key from environment or config.
Returns:
API key string or None if not found
"""
# Check environment variable first
api_key = os.environ.get("GEMINI_API_KEY")
if not api_key:
# Check for config file in ComfyUI directory
try:
config_path = os.path.join(
os.path.dirname(__file__), "..", "..", "..", "gemini_config.json"
)
if os.path.exists(config_path):
with open(config_path, "r") as f:
config = json.load(f)
api_key = config.get("api_key")
except Exception:
pass
return api_key
def analyze_image_with_gemini(
image: np.ndarray,
prompt_type: str,
api_key: Optional[str] = None,
custom_prompt: Optional[str] = None,
model_name: str = "gemini-1.5-flash",
) -> Tuple[str, Optional[str]]:
"""Analyze image using Gemini API and generate appropriate prompt.
Args:
image: Input image tensor
prompt_type: Type of prompt to generate (flux, sdxl, danbooru, video)
api_key: Gemini API key (optional, will try to get from env/config)
custom_prompt: Custom system prompt to use instead of templates
model_name: Gemini model to use (default: gemini-1.5-flash)
Returns:
Tuple of (generated_prompt, error_message)
"""
# Get API key
if not api_key:
api_key = get_api_key()
if not api_key:
return (
"",
"Gemini API key not found. Please set GEMINI_API_KEY environment variable or provide it in the node.",
)
# Convert tensor to PIL image
try:
pil_image = tensor_to_pil(image)
except Exception as e:
return "", f"Failed to convert image: {str(e)}"
# Get system prompt
if custom_prompt:
system_prompt = custom_prompt
else:
system_prompt = PROMPT_TEMPLATES.get(prompt_type, PROMPT_TEMPLATES["flux"])
# Here we would normally make the API call to Gemini
# For now, we'll import the google-generativeai library
try:
import google.generativeai as genai
except ImportError:
return (
"",
"google-generativeai library not installed. Please run: pip install google-generativeai",
)
try:
# Configure Gemini
genai.configure(api_key=api_key)
# Create model
model = genai.GenerativeModel(model_name)
# Generate content
response = model.generate_content(
[
system_prompt,
pil_image,
"Analyze this image and generate an appropriate prompt according to the instructions.",
]
)
# Extract text from response
if response.text:
return response.text.strip(), None
else:
return "", "No response generated from Gemini"
except Exception as e:
return "", f"Gemini API error: {str(e)}"
def validate_prompt_type(prompt_type: str) -> bool:
"""Validate if prompt type is supported.
Args:
prompt_type: Type of prompt to validate
Returns:
True if valid, False otherwise
"""
return prompt_type in PROMPT_TEMPLATES
+191
View File
@@ -0,0 +1,191 @@
"""Dynamic model fetching and caching for Gemini API."""
import json
import os
import time
from typing import List, Dict, Optional, Tuple
import logging
logger = logging.getLogger(__name__)
# Cache settings
CACHE_DURATION = 3600 * 24 # 24 hours in seconds
CACHE_FILE = os.path.join(os.path.dirname(__file__), ".gemini_models_cache.json")
def get_available_models(
api_key: Optional[str] = None, silent: bool = False
) -> Tuple[List[str], Dict[str, str]]:
"""Fetch available Gemini models that support generateContent.
Args:
api_key: Optional API key. If not provided, will try to get from environment.
silent: If True, suppress error logging (useful for initial load).
Returns:
Tuple of (model_names_list, model_descriptions_dict)
"""
# Check cache first
cached_data = _load_cache()
if cached_data:
return cached_data["models"], cached_data["descriptions"]
# Try to fetch from API
try:
models, descriptions = _fetch_models_from_api(api_key, silent=silent)
if models:
_save_cache(models, descriptions)
return models, descriptions
except Exception as e:
if not silent:
logger.warning(f"Failed to fetch models from API: {e}")
# Fall back to defaults
from .prompts import DEFAULT_GEMINI_MODELS
return DEFAULT_GEMINI_MODELS, {}
def _fetch_models_from_api(
api_key: Optional[str] = None, silent: bool = False
) -> Tuple[List[str], Dict[str, str]]:
"""Fetch models from Gemini API.
Args:
api_key: Optional API key.
silent: If True, suppress error logging.
Returns:
Tuple of (model_names_list, model_descriptions_dict)
"""
try:
import google.generativeai as genai
except ImportError:
if not silent:
logger.error("google-generativeai not installed")
return [], {}
# Get API key
if not api_key:
from .logic import get_api_key
api_key = get_api_key()
if not api_key:
if not silent:
logger.debug("No API key available for fetching models")
return [], {}
try:
genai.configure(api_key=api_key)
models = []
descriptions = {}
# Fetch all models
for model in genai.list_models():
# Only include models that support generateContent
if "generateContent" in model.supported_generation_methods:
# Remove "models/" prefix from name
model_name = model.name.replace("models/", "")
models.append(model_name)
descriptions[model_name] = model.display_name
# Sort models by priority (newer versions first)
models = _sort_models(models)
return models, descriptions
except Exception as e:
if not silent:
logger.error(f"Error fetching models from API: {e}")
return [], {}
def _sort_models(models: List[str]) -> List[str]:
"""Sort models by version and capability.
Prioritizes:
1. Newer versions (2.5 > 2.0 > 1.5)
2. Non-experimental models
3. Flash models for general use
"""
def sort_key(model: str):
# Priority scoring
score = 0
# Version priority
if "2.5" in model:
score += 1000
elif "2.0" in model:
score += 800
elif "1.5" in model:
score += 600
# Model type priority
if "pro" in model and "preview" not in model and "exp" not in model:
score += 100
elif "flash" in model and "preview" not in model and "exp" not in model:
score += 90
# Penalize experimental/preview models
if "exp" in model or "experimental" in model:
score -= 50
if "preview" in model:
score -= 30
# Penalize specific variants
if "thinking" in model:
score -= 100
if "tts" in model:
score -= 100
if "lite" in model:
score -= 20
return -score # Negative for descending sort
return sorted(models, key=sort_key)
def _load_cache() -> Optional[Dict]:
"""Load cached model data if available and not expired."""
if not os.path.exists(CACHE_FILE):
return None
try:
with open(CACHE_FILE, "r") as f:
data = json.load(f)
# Check if cache is expired
if time.time() - data.get("timestamp", 0) > CACHE_DURATION:
return None
return data
except Exception as e:
logger.warning(f"Failed to load cache: {e}")
return None
def _save_cache(models: List[str], descriptions: Dict[str, str]) -> None:
"""Save model data to cache."""
try:
data = {
"models": models,
"descriptions": descriptions,
"timestamp": time.time(),
}
with open(CACHE_FILE, "w") as f:
json.dump(data, f, indent=2)
except Exception as e:
logger.warning(f"Failed to save cache: {e}")
def clear_cache() -> None:
"""Clear the model cache."""
if os.path.exists(CACHE_FILE):
try:
os.remove(CACHE_FILE)
except Exception as e:
logger.warning(f"Failed to clear cache: {e}")
+169
View File
@@ -0,0 +1,169 @@
"""Gemini Prompt Engineer node implementation."""
import torch
from ...base import ComfyAssetsBaseNode
from .logic import analyze_image_with_gemini, validate_prompt_type
from .prompts import PROMPT_OPTIONS, DEFAULT_GEMINI_MODELS
from .models import get_available_models
class GeminiPromptNode(ComfyAssetsBaseNode):
"""Analyzes images using Gemini AI to generate optimized prompts for various AI models."""
@classmethod
def INPUT_TYPES(cls):
"""Define input types for the node."""
# Get available models dynamically (silent mode for initial load)
models, _ = get_available_models(silent=True)
# Use default if no models available
if not models:
models = DEFAULT_GEMINI_MODELS
# Find best default model
default_model = models[0] if models else "gemini-2.5-flash"
return {
"required": {
"image": ("IMAGE",),
"prompt_type": (PROMPT_OPTIONS, {"default": "flux"}),
"model": (models, {"default": default_model}),
},
"optional": {
"api_key": ("STRING", {"default": "", "multiline": False}),
"custom_prompt": (
"STRING",
{
"default": "",
"multiline": True,
"placeholder": "Optional: Enter custom system prompt instead of using templates",
},
),
"refresh_models": (
"BOOLEAN",
{"default": False, "label_on": "Refresh", "label_off": "Skip"},
),
},
}
RETURN_TYPES = ("STRING", "STRING")
RETURN_NAMES = ("prompt", "negative_prompt")
FUNCTION = "generate_prompt"
CATEGORY = "ComfyAssets"
DESCRIPTION = """
Analyzes images using Google's Gemini AI to generate optimized prompts.
Supports multiple prompt formats:
- FLUX: Detailed artistic prompts with quality markers
- SDXL: Positive/negative prompt pairs with weight emphasis
- Danbooru: Anime-style booru tags with underscores
- Video: Motion and temporal descriptions for video generation
Requires Gemini API key (set GEMINI_API_KEY env var or provide in node).
Install: pip install google-generativeai
"""
def generate_prompt(
self,
image,
prompt_type,
model,
api_key="",
custom_prompt="",
refresh_models=False,
):
"""Generate prompt from image using Gemini.
Args:
image: Input image tensor
prompt_type: Type of prompt to generate
model: Gemini model to use
api_key: Optional API key
custom_prompt: Optional custom system prompt
refresh_models: Whether to refresh the model list
Returns:
Tuple of (prompt, negative_prompt)
"""
# Refresh models if requested
if refresh_models and api_key:
try:
from .models import clear_cache
# Clear cache to force refresh on next node creation
clear_cache()
print(
"Model cache cleared. Please recreate the node to see updated models."
)
except Exception as e:
print(f"Failed to clear model cache: {e}")
# Validate prompt type
if not validate_prompt_type(prompt_type):
raise ValueError(f"Invalid prompt type: {prompt_type}")
# Convert torch tensor to numpy if needed
if isinstance(image, torch.Tensor):
image_np = image.cpu().numpy()
else:
image_np = image
# If API key is provided, try to refresh model list in background
if api_key:
try:
from .models import get_available_models
# Try to get fresh models with the provided API key
fresh_models, _ = get_available_models(api_key=api_key, silent=True)
if fresh_models and fresh_models != DEFAULT_GEMINI_MODELS:
# Models were successfully fetched with this API key
pass
except Exception:
pass
# Analyze image with Gemini
prompt, error = analyze_image_with_gemini(
image_np,
prompt_type,
api_key=api_key or None,
custom_prompt=custom_prompt or None,
model_name=model,
)
if error:
# Return error as prompt for visibility
return (f"Error: {error}", "")
# Handle different prompt types
if prompt_type == "sdxl":
# SDXL returns positive and negative prompts
lines = prompt.split("\n")
positive_prompt = ""
negative_prompt = ""
for line in lines:
if line.lower().startswith("positive:"):
positive_prompt = (
line.replace("Positive:", "").replace("positive:", "").strip()
)
elif line.lower().startswith("negative:"):
negative_prompt = (
line.replace("Negative:", "").replace("negative:", "").strip()
)
# If format not found, assume entire response is positive prompt
if not positive_prompt:
positive_prompt = prompt
return (positive_prompt, negative_prompt)
else:
# Other formats don't use negative prompts
return (prompt, "")
# Node display name
NODE_DISPLAY_NAME = "Gemini Prompt Engineer"
+128
View File
@@ -0,0 +1,128 @@
"""System prompts for different AI model types."""
FLUX_PROMPT = """You are an expert FLUX prompt engineer. Analyze the provided image and generate ONLY a FLUX prompt - no explanations, analysis, or additional text.
FLUX uses natural language descriptions, not comma-separated tags. Write a detailed, flowing description that reads like you're explaining the image to someone.
Include these elements in your description:
- Main subject with specific details (appearance, clothing, expression, pose)
- Environment and background details
- Lighting conditions and atmosphere
- Artistic style or photographic approach
- Color palette and mood
- Technical details if relevant (camera angle, focal length, etc.)
- Textures and materials
Write in a natural, descriptive style. Use complete sentences that flow together. Be specific and detailed but maintain readability.
IMPORTANT: Return ONLY the prompt text. No analysis, headers, or additional commentary. Just the natural language description that can be directly used in FLUX.
Example of correct output:
A close-up portrait of a middle-aged woman with curly red hair and green eyes, wearing a blue silk blouse. She has a warm smile and freckles across her cheeks. The lighting is soft and natural, coming from a window to her left, creating gentle shadows that accentuate her features. The background is softly blurred, showing hints of a cozy bookshelf. The overall mood is warm and inviting, captured in a photorealistic style with shallow depth of field."""
SDXL_PROMPT = """You are an expert prompt engineer specializing in SDXL (Stable Diffusion XL). Your task is to generate high-quality positive and negative prompts that conform to SDXL prompt formatting standards.
Your expertise includes:
- Leveraging community-tested techniques (ComfyUI, A1111, InvokeAI)
- Applying photographic theory for realism, composition, lighting
- Following Civitai trend standards and style best practices
- Mastering Pony Diffusion XL formatting for stylized and anime content
Structure prompts in this layered, modular format:
[Main Subject], [Pose & Camera], [Lighting & Environment], [Style & Details], [Boost Terms], [Style References]
For SDXL specifically:
- Use quality boosters: 8k, RAW photo, masterpiece, ultra detailed, cinematic lighting
- Prioritize realism and artistry
- Excellent for portraits, landscapes, or cinematic scenes
Instructions:
Only reply with two fields:
Positive prompt: (Your positive prompt here)
Negative prompt: (Your negative prompt here)
Do not include any commentary or explanation.
Use concise, highly descriptive language that maximizes visual richness.
Follow SDXL prompt conventions: prioritize subject clarity, camera perspective, lighting, mood, style tags, and composition.
Keep total token length efficient (ideally under 250 tokens).
Avoid redundancy and generic filler words.
Focus on crafting super high-quality prompts for stunning visual output.
Example Input:
A futuristic cyberpunk samurai standing on a neon-lit rooftop in the rain.
Example Output:
Positive prompt: cyberpunk samurai, neon-lit rooftop, dramatic rain, glowing katana, futuristic cityscape, night scene, cinematic lighting, intense expression, sleek cyber armor, atmospheric depth, ultra-detailed, masterpiece, 8k, sharp focus, trending on artstation
Negative prompt: blurry, low quality, poorly drawn, extra limbs, bad anatomy, deformed hands, text, watermark, jpeg artifacts, duplicate, cropped, out of frame
"""
DANBOORU_PROMPT = """You are a Danbooru tagging expert specializing in anime-style image tagging. Analyze the image and generate ONLY Danbooru-style tags - no explanations or analysis.
CRITICAL: Use strict Danbooru conventions:
- Use underscores for multi-word tags (e.g., long_hair, school_uniform)
- All tags must be lowercase
- Character count comes first (1girl, 2boys, multiple_girls)
- For anime models trained on Danbooru data, proper tagging is essential
Tag order and categories:
1. Character count (1girl, solo, 2boys, etc.)
2. Character features (hair_color, eye_color, hair_length)
3. Expression/pose (smile, looking_at_viewer, sitting)
4. Clothing (specific items with underscores)
5. Background/setting (simple_background, outdoors, classroom)
6. View/composition (upper_body, full_body, from_side)
7. Quality tags (masterpiece, best_quality, highres)
Common quality prefix for anime models:
"masterpiece, best_quality, very_aesthetic"
IMPORTANT: Return ONLY the comma-separated tags. Use underscores, not spaces. All lowercase.
Example of correct output:
1girl, solo, long_hair, blue_eyes, blonde_hair, school_uniform, serafuku, pleated_skirt, smile, looking_at_viewer, classroom, sitting, desk, window, sunlight, upper_body, masterpiece, best_quality"""
VIDEO_PROMPT = """You are a WAN 2.2 video generation prompt specialist. Analyze the content and generate ONLY a video generation prompt optimized for WAN 2.2 - no explanations or analysis.
WAN 2.2 excels with rich, descriptive prompts that focus on:
- Visual composition and scene elements
- Specific movements and actions
- Lighting and aesthetic details
- Cinematographic elements
Write a single detailed paragraph describing the video scene. Focus on:
- Main subjects and their actions
- Visual style and atmosphere
- Movement dynamics (use words like "intensely", "smoothly", "rapidly")
- Environmental details and lighting
- Specific visual elements and their interactions
Keep the prompt descriptive but concise. WAN 2.2 works best with natural language that paints a clear picture of the desired video.
IMPORTANT: Return ONLY the video prompt as a single descriptive paragraph. No analysis, headers, or additional text.
Example of correct output:
Two anthropomorphic cats in comfy boxing gear and bright gloves fight intensely on a spotlighted stage, their movements fluid and dynamic as they exchange rapid punches under dramatic theater lighting that casts long shadows across the ring, with the crowd visible as blurred silhouettes in the darkened background."""
PROMPT_TEMPLATES = {
"flux": FLUX_PROMPT,
"sdxl": SDXL_PROMPT,
"danbooru": DANBOORU_PROMPT,
"video": VIDEO_PROMPT,
}
PROMPT_OPTIONS = ["flux", "sdxl", "danbooru", "video"]
# Default models list (fallback if API is unavailable)
DEFAULT_GEMINI_MODELS = [
"gemini-2.5-flash",
"gemini-2.5-pro",
"gemini-2.0-flash",
"gemini-1.5-flash",
"gemini-1.5-pro",
]
@@ -0,0 +1,5 @@
"""ImageToMultipleOf tool for ComfyUI-KikoTools."""
from .node import ImageToMultipleOfNode
__all__ = ["ImageToMultipleOfNode"]
@@ -0,0 +1,61 @@
"""Core logic for ImageToMultipleOf tool."""
from typing import Tuple
import torch.nn.functional as F
from torch import Tensor
def calculate_dimensions_to_multiple(
height: int, width: int, multiple_of: int
) -> Tuple[int, int]:
"""Calculate new dimensions that are multiples of the specified value.
Args:
height: Original height
width: Original width
multiple_of: Value that dimensions should be multiple of
Returns:
Tuple of (new_height, new_width)
"""
new_height = height - (height % multiple_of)
new_width = width - (width % multiple_of)
return new_height, new_width
def process_image_to_multiple_of(
image: Tensor, multiple_of: int, method: str
) -> Tensor:
"""Process image to ensure dimensions are multiples of specified value.
Args:
image: Input image tensor of shape (batch, height, width, channels)
multiple_of: Value that dimensions should be multiple of
method: Processing method - "center crop" or "rescale"
Returns:
Processed image tensor
"""
_, height, width, _ = image.shape
new_height, new_width = calculate_dimensions_to_multiple(height, width, multiple_of)
if method == "rescale":
# Rescale the image to the new dimensions
# Convert from BHWC to BCHW for interpolation
image_chw = image.permute(0, 3, 1, 2)
rescaled = F.interpolate(
image_chw,
size=(new_height, new_width),
mode="bilinear",
align_corners=False,
)
# Convert back to BHWC
return rescaled.permute(0, 2, 3, 1)
else: # center crop
# Calculate crop offsets to center the crop
top = (height - new_height) // 2
left = (width - new_width) // 2
bottom = top + new_height
right = left + new_width
return image[:, top:bottom, left:right, :]
@@ -0,0 +1,102 @@
"""ComfyUI node implementation for ImageToMultipleOf."""
from typing import Dict, Any, Tuple
from torch import Tensor
from ...base import ComfyAssetsBaseNode
from .logic import process_image_to_multiple_of
class ImageToMultipleOfNode(ComfyAssetsBaseNode):
"""
Adjusts image dimensions to be multiples of a specified value.
Useful for models that require specific dimension constraints.
Supports both center cropping and rescaling methods.
"""
@classmethod
def INPUT_TYPES(cls) -> Dict[str, Any]:
return {
"required": {
"image": ("IMAGE",),
"multiple_of": (
"INT",
{
"default": 64,
"min": 1,
"max": 256,
"step": 16,
"display": "number",
},
),
"method": (["center crop", "rescale"],),
}
}
RETURN_TYPES = ("IMAGE",)
RETURN_NAMES = ("image",)
FUNCTION = "process"
def process(self, image: Tensor, multiple_of: int, method: str) -> Tuple[Tensor]:
"""
Process image to ensure dimensions are multiples of specified value.
Args:
image: Input image tensor
multiple_of: Value that dimensions should be multiple of
method: Processing method - "center crop" or "rescale"
Returns:
Tuple containing processed image tensor
"""
try:
self.validate_inputs(image=image, multiple_of=multiple_of, method=method)
# Process the image
processed_image = process_image_to_multiple_of(image, multiple_of, method)
_, new_height, new_width, _ = processed_image.shape
self.log_info(
f"Processed image from {image.shape[1]}x{image.shape[2]} "
f"to {new_height}x{new_width} (multiple of {multiple_of}) "
f"using {method}"
)
return (processed_image,)
except Exception as e:
self.handle_error(f"Failed to process image: {str(e)}", e)
def validate_inputs(self, **kwargs) -> None:
"""Validate inputs for ImageToMultipleOf node."""
image = kwargs.get("image")
multiple_of = kwargs.get("multiple_of")
method = kwargs.get("method")
if image is None:
raise ValueError("Image input is required")
if not isinstance(image, Tensor) or len(image.shape) != 4:
raise ValueError(
f"Expected image tensor with shape (batch, height, width, channels), "
f"got shape {image.shape if isinstance(image, Tensor) else 'non-tensor'}"
)
if multiple_of <= 0:
raise ValueError(f"multiple_of must be positive, got {multiple_of}")
if method not in ["center crop", "rescale"]:
raise ValueError(f"Invalid method: {method}")
# Check if resulting dimensions would be too small
_, height, width, _ = image.shape
new_height = height - (height % multiple_of)
new_width = width - (width % multiple_of)
if new_height <= 0 or new_width <= 0:
raise ValueError(
f"Image dimensions ({height}x{width}) are too small "
f"to be adjusted to multiple of {multiple_of}"
)
@@ -0,0 +1,8 @@
"""
KikoSaveImage tool module
Enhanced image saving with format selection, quality control, and clickable previews
"""
from .node import KikoSaveImageNode
__all__ = ["KikoSaveImageNode"]
+365
View File
@@ -0,0 +1,365 @@
"""
KikoSaveImage core logic
Enhanced image saving functionality with multiple format support
"""
import os
import json
import numpy as np
from PIL import Image
from PIL.PngImagePlugin import PngInfo
import torch
from typing import Dict, List, Any, Optional, Tuple
import time
try:
import folder_paths
except ImportError:
# Fallback for testing without ComfyUI
class folder_paths:
@staticmethod
def get_output_directory():
return "./output"
def get_save_image_path(
filename_prefix: str,
batch_number: int,
format_ext: str,
output_dir: str,
subfolder: str = "",
) -> Tuple[str, str]:
"""
Generate save path for image with proper filename handling
Args:
filename_prefix: Base filename prefix
batch_number: Batch index for multiple images
format_ext: File extension (.png, .jpg, .webp)
output_dir: Output directory path
subfolder: Optional subfolder within output directory
Returns:
Tuple of (full_path, relative_filename)
"""
# Split filename_prefix into directory path and actual filename prefix
# This allows for directory structures like "kittybear/anime/images/kittybear"
prefix_dir = os.path.dirname(filename_prefix)
prefix_name = os.path.basename(filename_prefix)
# Sanitize only the filename part (not the directory path)
safe_prefix = prefix_name.replace(
":", "_"
) # Only sanitize problematic chars for filenames
safe_prefix = "".join(c for c in safe_prefix if c.isalnum() or c in "._-")
# Create unique filename with timestamp to avoid conflicts
timestamp = int(time.time())
filename = f"{safe_prefix}_{timestamp:010d}_{batch_number:05d}{format_ext}"
# Handle subfolder and prefix directory (but not the filename part)
path_components = []
path_components.append(output_dir)
if subfolder:
path_components.append(subfolder)
# Only add prefix_dir if it exists (the directory part, not the filename part)
if prefix_dir:
path_components.append(prefix_dir)
full_output_folder = os.path.join(*path_components)
# Ensure directory exists
os.makedirs(full_output_folder, exist_ok=True)
full_path = os.path.join(full_output_folder, filename)
# For the preview, ComfyUI needs the filename and subfolder separately
# The subfolder needs to be relative to the output directory root
# Build the relative subfolder path including prefix directory (but not filename part)
relative_path_components = []
if subfolder:
relative_path_components.append(subfolder.strip("/\\"))
if prefix_dir:
relative_path_components.append(prefix_dir.strip("/\\"))
if relative_path_components:
relative_subfolder = os.path.join(*relative_path_components)
else:
relative_subfolder = ""
preview_filename = filename
return full_path, preview_filename, relative_subfolder
def convert_tensor_to_pil(image_tensor: torch.Tensor) -> Image.Image:
"""
Convert ComfyUI image tensor to PIL Image
Args:
image_tensor: Tensor in format [height, width, channels] with values 0-1
Returns:
PIL Image in RGB/RGBA format
"""
# Convert tensor (0-1 float) to 0-255 numpy array
i = 255.0 * image_tensor.cpu().numpy()
img_array = np.clip(i, 0, 255).astype(np.uint8)
# Create PIL image from numpy array
img = Image.fromarray(img_array)
return img
def create_png_metadata(
prompt: Optional[Dict] = None, extra_pnginfo: Optional[Dict] = None
) -> Optional[PngInfo]:
"""
Create PNG metadata with workflow information
Args:
prompt: ComfyUI prompt data
extra_pnginfo: Additional PNG metadata
Returns:
PngInfo object or None if no metadata
"""
if prompt is None and extra_pnginfo is None:
return None
metadata = PngInfo()
if prompt is not None:
metadata.add_text("prompt", json.dumps(prompt))
if extra_pnginfo is not None:
for key, value in extra_pnginfo.items():
metadata.add_text(key, json.dumps(value))
return metadata
def save_image_with_format(
img: Image.Image,
filepath: str,
format_type: str,
quality: int = 90,
png_compress_level: int = 4,
webp_lossless: bool = False,
metadata: Optional[PngInfo] = None,
) -> Dict[str, Any]:
"""
Save PIL image with specified format and quality settings
Args:
img: PIL Image to save
filepath: Full path to save file
format_type: Image format (PNG, JPEG, WEBP)
quality: JPEG/WebP quality (1-100)
png_compress_level: PNG compression level (0-9)
webp_lossless: Use lossless WebP compression
metadata: PNG metadata to embed
Returns:
Dict with save information
"""
save_kwargs = {}
if format_type == "PNG":
if metadata:
save_kwargs["pnginfo"] = metadata
save_kwargs["compress_level"] = png_compress_level
elif format_type == "JPEG":
# Convert RGBA to RGB for JPEG (no transparency support)
if img.mode == "RGBA":
# Create white background
background = Image.new("RGB", img.size, (255, 255, 255))
background.paste(img, mask=img.split()[-1]) # Use alpha channel as mask
img = background
elif img.mode != "RGB":
img = img.convert("RGB")
save_kwargs["quality"] = quality
save_kwargs["optimize"] = True
elif format_type == "WEBP":
save_kwargs["quality"] = quality if not webp_lossless else 100
save_kwargs["lossless"] = webp_lossless
else:
raise ValueError(f"Unsupported format: {format_type}")
# Save the image
img.save(filepath, **save_kwargs)
# Get file size for info
file_size = os.path.getsize(filepath)
return {
"filepath": filepath,
"format": format_type,
"file_size": file_size,
"quality": quality if format_type != "PNG" else None,
"compress_level": png_compress_level if format_type == "PNG" else None,
"lossless": webp_lossless if format_type == "WEBP" else None,
}
def process_image_batch(
images: torch.Tensor,
filename_prefix: str = "KikoSave",
format_type: str = "PNG",
quality: int = 90,
png_compress_level: int = 4,
webp_lossless: bool = False,
popup: bool = True,
prompt: Optional[Dict] = None,
extra_pnginfo: Optional[Dict] = None,
) -> List[Dict[str, Any]]:
"""
Process and save a batch of images with specified format settings
Args:
images: Batch of image tensors [batch, height, width, channels]
filename_prefix: Prefix for saved filenames
format_type: Image format (PNG, JPEG, WEBP)
quality: JPEG/WebP quality (1-100)
png_compress_level: PNG compression level (0-9)
webp_lossless: Use lossless WebP compression
popup: Enable popup windows in UI
prompt: ComfyUI prompt data for metadata
extra_pnginfo: Additional PNG metadata
Returns:
List of saved image information dicts
"""
# Get output directory
output_dir = folder_paths.get_output_directory()
# Determine file extension
format_extensions = {"PNG": ".png", "JPEG": ".jpg", "WEBP": ".webp"}
if format_type not in format_extensions:
raise ValueError(
f"Unsupported format: {format_type}. "
f"Supported: {list(format_extensions.keys())}"
)
format_ext = format_extensions[format_type]
# Create metadata for PNG
metadata = None
if format_type == "PNG":
metadata = create_png_metadata(prompt, extra_pnginfo)
# Process each image in the batch
results = []
enhanced_data = []
for batch_number, image_tensor in enumerate(images):
# Convert tensor to PIL Image
img = convert_tensor_to_pil(image_tensor)
# Generate save path
filepath, preview_filename, relative_subfolder = get_save_image_path(
filename_prefix, batch_number, format_ext, output_dir, ""
)
# Save with format-specific settings
save_info = save_image_with_format(
img,
filepath,
format_type,
quality,
png_compress_level,
webp_lossless,
metadata,
)
# Build result info for ComfyUI preview
# ONLY the core fields that ComfyUI expects - no extra metadata
result = {
"filename": preview_filename,
"subfolder": relative_subfolder,
"type": "output",
}
# Store enhanced data separately
enhanced_info = {
"filename": preview_filename,
"subfolder": relative_subfolder,
"popup": popup,
"type": "output",
"format": format_type,
"file_size": save_info["file_size"],
"dimensions": f"{img.width}x{img.height}",
}
# Add format-specific info to enhanced data
if format_type == "PNG":
enhanced_info["compress_level"] = png_compress_level
elif format_type in ["JPEG", "WEBP"]:
enhanced_info["quality"] = quality
if format_type == "WEBP":
enhanced_info["lossless"] = webp_lossless
results.append(result)
enhanced_data.append(enhanced_info)
return results, enhanced_data
def validate_save_inputs(
images: torch.Tensor, format_type: str, quality: int, png_compress_level: int
) -> None:
"""
Validate inputs for image saving
Args:
images: Image tensor batch to validate
format_type: Image format to validate
quality: Quality setting to validate
png_compress_level: PNG compression level to validate
Raises:
ValueError: If validation fails
"""
# Validate images tensor
if not isinstance(images, torch.Tensor):
raise ValueError(f"images must be a torch.Tensor, got {type(images).__name__}")
if len(images.shape) != 4:
raise ValueError(
f"images tensor must have 4 dimensions [batch, height, width, channels], "
f"got {len(images.shape)}"
)
# Validate format
supported_formats = ["PNG", "JPEG", "WEBP"]
if format_type not in supported_formats:
raise ValueError(
f"format must be one of {supported_formats}, got {format_type}"
)
# Validate quality (for JPEG/WebP)
if format_type in ["JPEG", "WEBP"]:
if not isinstance(quality, int) or not (1 <= quality <= 100):
raise ValueError(
f"quality must be an integer between 1 and 100, got {quality}"
)
# Validate PNG compression level
if format_type == "PNG":
if not isinstance(png_compress_level, int) or not (
0 <= png_compress_level <= 9
):
raise ValueError(
f"png_compress_level must be an integer between 0 and 9, "
f"got {png_compress_level}"
)
+226
View File
@@ -0,0 +1,226 @@
"""
KikoSaveImage ComfyUI Node
Enhanced image saving with format selection, quality control, and clickable previews
"""
import torch
from typing import Dict, Any, Optional
from ...base import ComfyAssetsBaseNode
from .logic import process_image_batch, validate_save_inputs
class KikoSaveImageNode(ComfyAssetsBaseNode):
"""
Enhanced ComfyUI image saving node with multiple format support
Features:
- Multiple format support (PNG, JPEG, WebP)
- Quality/compression controls
- Clickable image previews
- Metadata preservation
- Batch processing
Inputs:
- images (IMAGE): Images to save
- filename_prefix (STRING): Prefix for saved filenames
- format (COMBO): Output format (PNG, JPEG, WebP)
- quality (INT): JPEG/WebP quality (1-100)
- png_compress_level (INT): PNG compression level (0-9)
- webp_lossless (BOOLEAN): Use lossless WebP compression
- subfolder (STRING): Optional subfolder for organization
Outputs:
- UI: Image preview data for ComfyUI interface
"""
@classmethod
def INPUT_TYPES(cls) -> Dict[str, Any]:
"""
Define ComfyUI input interface with enhanced save options
Returns:
Dict with required and optional input specifications
"""
return {
"required": {
"images": ("IMAGE", {"tooltip": "The images to save"}),
"filename_prefix": (
"STRING",
{"default": "KikoSave", "tooltip": "Prefix for saved filenames"},
),
"format": (
["PNG", "JPEG", "WEBP"],
{"default": "PNG", "tooltip": "Output image format"},
),
},
"optional": {
"quality": (
"INT",
{
"default": 90,
"min": 1,
"max": 100,
"step": 1,
"tooltip": "JPEG/WebP quality (1-100, higher = better quality)",
},
),
"png_compress_level": (
"INT",
{
"default": 4,
"min": 0,
"max": 9,
"step": 1,
"tooltip": "PNG compression level (0-9, higher = smaller file)",
},
),
"webp_lossless": (
"BOOLEAN",
{
"default": False,
"tooltip": "Use lossless WebP compression "
"(ignores quality setting)",
},
),
"popup": (
"BOOLEAN",
{
"default": True,
"tooltip": "Enable popup windows when clicking on images in the viewer",
},
),
},
"hidden": {"prompt": "PROMPT", "extra_pnginfo": "EXTRA_PNGINFO"},
}
RETURN_TYPES = ()
FUNCTION = "save_images"
OUTPUT_NODE = True
def save_images(
self,
images: torch.Tensor,
filename_prefix: str = "KikoSave",
format: str = "PNG",
quality: int = 90,
png_compress_level: int = 4,
webp_lossless: bool = False,
popup: bool = True,
prompt: Optional[Dict] = None,
extra_pnginfo: Optional[Dict] = None,
) -> Dict[str, Any]:
"""
Save images with enhanced format and quality options
Args:
images: Batch of image tensors to save
filename_prefix: Prefix for saved filenames
format: Output format (PNG, JPEG, WebP)
quality: JPEG/WebP quality setting
png_compress_level: PNG compression level
webp_lossless: Use lossless WebP compression
popup: Enable popup windows when clicking on images
prompt: ComfyUI prompt data for metadata
extra_pnginfo: Additional PNG metadata
Returns:
Dict with UI data for image previews
Raises:
ValueError: If validation fails
"""
try:
# Validate inputs
self.validate_inputs(
images=images,
format=format,
quality=quality,
png_compress_level=png_compress_level,
webp_lossless=webp_lossless,
popup=popup,
)
# Log the save operation
self.log_info(
f"Saving {len(images)} images as {format} "
f"(quality={quality if format != 'PNG' else 'N/A'}, "
f"png_compress={png_compress_level if format == 'PNG' else 'N/A'})"
)
# Process and save images
results, enhanced_data = process_image_batch(
images=images,
filename_prefix=filename_prefix,
format_type=format,
quality=quality,
png_compress_level=png_compress_level,
webp_lossless=webp_lossless,
popup=popup,
prompt=prompt,
extra_pnginfo=extra_pnginfo,
)
# Log results
total_size = sum(data["file_size"] for data in enhanced_data)
self.log_info(
f"Successfully saved {len(results)} images "
f"(total size: {total_size / 1024:.1f} KB)"
)
# Return UI data for ComfyUI preview (clean) + enhanced data for our JS
return {
"ui": {
"images": results, # Clean data for ComfyUI
"kiko_enhanced": enhanced_data, # Enhanced data for our JavaScript
}
}
except Exception as e:
error_msg = f"Failed to save images: {str(e)}"
self.handle_error(error_msg, e)
def validate_inputs(
self,
images: torch.Tensor,
format: str,
quality: int,
png_compress_level: int,
webp_lossless: bool,
popup: bool,
) -> None:
"""
Validate inputs specific to KikoSaveImage
Args:
images: Image tensor batch
format: Image format
quality: Quality setting
png_compress_level: PNG compression level
webp_lossless: WebP lossless setting
popup: Enable popup windows
Raises:
ValueError: If validation fails
"""
# Use logic module validation
validate_save_inputs(images, format, quality, png_compress_level)
# Additional node-specific validation
if not isinstance(webp_lossless, bool):
raise ValueError(
f"webp_lossless must be a boolean, got {type(webp_lossless).__name__}"
)
if not isinstance(popup, bool):
raise ValueError(f"popup must be a boolean, got {type(popup).__name__}")
# Node class mappings for ComfyUI registration
NODE_CLASS_MAPPINGS = {
"KikoSaveImage": KikoSaveImageNode,
}
NODE_DISPLAY_NAME_MAPPINGS = {
"KikoSaveImage": "Kiko Save Image",
}
+36 -28
View File
@@ -38,12 +38,12 @@ class ResolutionCalculatorNode(ComfyAssetsBaseNode):
"FLOAT",
{
"default": 2.0,
"min": 1.0,
"min": 0.1,
"max": 8.0,
"step": 0.1,
"display": "slider",
"tooltip": "Factor to scale the resolution by "
"(e.g., 2.0 for 2x upscale)",
"(e.g., 2.0 for 2x, 0.5 for half scale)",
},
),
},
@@ -140,38 +140,46 @@ class ResolutionCalculatorNode(ComfyAssetsBaseNode):
f"scale_factor must be a number, got {type(scale_factor).__name__}"
)
# Additional tensor validation
# Validate tensors using helper methods
if image is not None:
if not isinstance(image, torch.Tensor):
raise ValueError(
f"image must be a torch.Tensor, got {type(image).__name__}"
)
if len(image.shape) != 4:
raise ValueError(
f"image tensor must have 4 dimensions "
f"[batch, height, width, channels], got {len(image.shape)}"
)
self._validate_image_tensor(image)
if latent is not None:
if not isinstance(latent, dict):
raise ValueError(f"latent must be a dict, got {type(latent).__name__}")
self._validate_latent_dict(latent)
if "samples" not in latent:
raise ValueError("latent dict must contain 'samples' key")
def _validate_image_tensor(self, image: torch.Tensor) -> None:
"""Validate image tensor format"""
if not isinstance(image, torch.Tensor):
raise ValueError(
f"image must be a torch.Tensor, got {type(image).__name__}"
)
samples = latent["samples"]
if not isinstance(samples, torch.Tensor):
raise ValueError(
f"latent['samples'] must be a torch.Tensor, "
f"got {type(samples).__name__}"
)
if len(image.shape) != 4:
raise ValueError(
f"image tensor must have 4 dimensions "
f"[batch, height, width, channels], got {len(image.shape)}"
)
if len(samples.shape) != 4:
raise ValueError(
f"latent samples tensor must have 4 dimensions "
f"[batch, channels, height, width], got {len(samples.shape)}"
)
def _validate_latent_dict(self, latent: Dict[str, torch.Tensor]) -> None:
"""Validate latent dictionary format"""
if not isinstance(latent, dict):
raise ValueError(f"latent must be a dict, got {type(latent).__name__}")
if "samples" not in latent:
raise ValueError("latent dict must contain 'samples' key")
samples = latent["samples"]
if not isinstance(samples, torch.Tensor):
raise ValueError(
f"latent['samples'] must be a torch.Tensor, "
f"got {type(samples).__name__}"
)
if len(samples.shape) != 4:
raise ValueError(
f"latent samples tensor must have 4 dimensions "
f"[batch, channels, height, width], got {len(samples.shape)}"
)
# Node class mappings for ComfyUI registration
+20 -5
View File
@@ -60,14 +60,14 @@ class SamplerComboCompactNode(ComfyAssetsBaseNode):
}
}
RETURN_TYPES = (SAMPLERS, SCHEDULERS, "INT", "FLOAT")
RETURN_TYPES = ("SAMPLER", SCHEDULERS, "INT", "FLOAT")
RETURN_NAMES = ("sampler", "scheduler", "steps", "cfg")
FUNCTION = "get_combo"
CATEGORY = "ComfyAssets"
def get_combo(
self, sampler: str, sched: str, steps: int, cfg: float
) -> Tuple[str, str, int, float]:
) -> Tuple[object, str, int, float]:
"""
Get compact sampler combo configuration.
@@ -78,17 +78,32 @@ class SamplerComboCompactNode(ComfyAssetsBaseNode):
cfg: CFG scale value
Returns:
Tuple of (sampler, scheduler, steps, cfg)
Tuple of (sampler_object, scheduler, steps, cfg)
"""
try:
# Use the same validation logic but with compact interface
result = get_sampler_combo(sampler, sched, steps, cfg)
return result
# Create the sampler object
try:
import comfy.samplers
sampler_obj = comfy.samplers.sampler_object(result[0])
except ImportError:
# Return sampler name for testing
sampler_obj = result[0]
return (sampler_obj, result[1], result[2], result[3])
except Exception as e:
# Graceful fallback
self.handle_error(f"Error in compact combo: {str(e)}")
return ("euler", "normal", 20, 7.0)
try:
import comfy.samplers
sampler_obj = comfy.samplers.sampler_object("euler")
except ImportError:
# Return sampler name for testing
sampler_obj = "euler"
return (sampler_obj, "normal", 20, 7.0)
def __str__(self) -> str:
"""String representation of the compact node."""
+29 -6
View File
@@ -65,14 +65,14 @@ class SamplerComboNode(ComfyAssetsBaseNode):
}
}
RETURN_TYPES = (SAMPLERS, SCHEDULERS, "INT", "FLOAT")
RETURN_TYPES = ("SAMPLER", SCHEDULERS, "INT", "FLOAT")
RETURN_NAMES = ("sampler_name", "scheduler", "steps", "cfg")
FUNCTION = "get_sampler_combo"
CATEGORY = "ComfyAssets"
def get_sampler_combo(
self, sampler_name: str, scheduler: str, steps: int, cfg: float
) -> Tuple[str, str, int, float]:
) -> Tuple[object, str, int, float]:
"""
Get sampler combo configuration.
@@ -83,7 +83,7 @@ class SamplerComboNode(ComfyAssetsBaseNode):
cfg: CFG scale value
Returns:
Tuple of (sampler_name, scheduler, steps, cfg)
Tuple of (sampler_object, scheduler, steps, cfg)
"""
try:
# Validate inputs
@@ -98,17 +98,33 @@ class SamplerComboNode(ComfyAssetsBaseNode):
f"steps={steps}, cfg={cfg}. "
f"Using safe defaults: euler, normal, 20 steps, CFG 7.0"
)
return ("euler", "normal", 20, 7.0)
try:
import comfy.samplers
sampler = comfy.samplers.sampler_object("euler")
except ImportError:
# Return mock object for testing
sampler = "euler"
return (sampler, "normal", 20, 7.0)
# Process and return the combo
result = get_sampler_combo(sampler_name, scheduler, steps, cfg)
# Create the sampler object
try:
import comfy.samplers
sampler = comfy.samplers.sampler_object(result[0])
except ImportError:
# Return sampler name for testing
sampler = result[0]
self.log_info(
f"Configured sampler combo: {result[0]}, {result[1]}, "
f"{result[2]} steps, CFG {result[3]}"
)
return result
return (sampler, result[1], result[2], result[3])
except Exception as e:
# Handle any unexpected errors gracefully
@@ -119,7 +135,14 @@ class SamplerComboNode(ComfyAssetsBaseNode):
f"{self.__class__.__name__}: Error processing sampler combo: {str(e)}. "
f"Using safe defaults: euler, normal, 20 steps, CFG 7.0"
)
return ("euler", "normal", 20, 7.0)
try:
import comfy.samplers
sampler = comfy.samplers.sampler_object("euler")
except ImportError:
# Return mock object for testing
sampler = "euler"
return (sampler, "normal", 20, 7.0)
def validate_inputs(
self, sampler_name: str, scheduler: str, steps: int, cfg: float
+23
View File
@@ -0,0 +1,23 @@
[mypy]
python_version = 3.10
warn_return_any = True
warn_unused_configs = True
disallow_untyped_defs = False
ignore_missing_imports = True
no_strict_optional = True
files = kikotools
exclude = tests
# Ignore import errors from ComfyUI
[mypy-comfy.*]
ignore_errors = True
# Ignore errors for torch imports
[mypy-torch.*]
ignore_missing_imports = True
[mypy-numpy.*]
ignore_missing_imports = True
[mypy-PIL.*]
ignore_missing_imports = True
+82 -3
View File
@@ -1,16 +1,95 @@
[build-system]
requires = ["setuptools>=61.0", "wheel"]
build-backend = "setuptools.build_meta"
[project]
name = "kikotools"
description = "Simple tools for ComfyUI"
version = "1.0.1"
license = {file = "LICENSE"}
dependencies = ["# Development dependencies for ComfyUI-KikoTools", "# Testing framework", "pytest>=7.0.0", "pytest-cov>=4.0.0", "pytest-mock>=3.10.0", "# Code quality", "black>=23.0.0", "flake8>=6.0.0", "mypy>=1.0.0", "# Development utilities", "pre-commit>=3.0.0", "# ComfyUI testing (mock dependencies for unit tests)", "torch>=2.0.0", "numpy>=1.24.0", "pillow>=9.0.0"]
version = "1.0.9"
license = {text = "MIT"}
dependencies = []
[project.optional-dependencies]
dev = [
# Testing framework
"pytest>=7.0.0",
"pytest-cov>=4.0.0",
"pytest-mock>=3.10.0",
# Code quality
"black>=23.0.0",
"flake8>=6.0.0",
"mypy>=1.0.0",
# Development utilities
"pre-commit>=3.0.0",
# ComfyUI testing (mock dependencies for unit tests)
"torch>=2.0.0",
"numpy>=1.24.0",
"pillow>=9.0.0"
]
[project.urls]
Repository = "https://github.com/ComfyAssets/ComfyUI-KikoTools"
# Used by Comfy Registry https://registry.comfy.org
[tool.setuptools.packages.find]
include = ["kikotools*"]
exclude = ["tests*", "web*"]
[tool.comfy]
PublisherId = "kiko9"
DisplayName = "ComfyUI-KikoTools"
Icon = "https://avatars.githubusercontent.com/u/213204677?s=200"
includes = []
[tool.black]
line-length = 88
target-version = ['py310']
include = '\.pyi?$'
extend-exclude = '''
/(
# directories
\.eggs
| \.git
| \.hg
| \.mypy_cache
| \.tox
| \.venv
| build
| dist
)/
'''
[tool.mypy]
python_version = "3.10"
warn_return_any = true
warn_unused_configs = true
disallow_untyped_defs = false
ignore_missing_imports = true
no_strict_optional = true
files = ["kikotools"]
exclude = ["tests"]
[tool.pytest.ini_options]
minversion = "7.0"
testpaths = ["tests"]
addopts = "-ra -q --strict-markers"
markers = [
"unit: Unit tests",
"integration: Integration tests",
"slow: Slow tests"
]
[tool.coverage.run]
source = ["kikotools"]
omit = ["*/tests/*", "*/__init__.py"]
[tool.coverage.report]
exclude_lines = [
"pragma: no cover",
"def __repr__",
"if __name__ == .__main__.:",
"raise AssertionError",
"raise NotImplementedError",
"if 0:",
"if False:"
]
+1 -1
View File
@@ -2,4 +2,4 @@
testpaths = tests
python_paths = .
norecursedirs = venv .git __pycache__
addopts = --ignore=__init__.py --ignore=venv
addopts = --ignore=__init__.py --ignore=venv
+1 -1
View File
@@ -16,4 +16,4 @@ pre-commit>=3.0.0
# ComfyUI testing (mock dependencies for unit tests)
torch>=2.0.0
numpy>=1.24.0
pillow>=9.0.0
pillow>=9.0.0
+3 -18
View File
@@ -1,19 +1,4 @@
# Development dependencies for ComfyUI-KikoTools
# Runtime dependencies for ComfyUI-KikoTools
# Testing framework
pytest>=7.0.0
pytest-cov>=4.0.0
pytest-mock>=3.10.0
# Code quality
black>=23.0.0
flake8>=6.0.0
mypy>=1.0.0
# Development utilities
pre-commit>=3.0.0
# ComfyUI testing (mock dependencies for unit tests)
torch>=2.0.0
numpy>=1.24.0
pillow>=9.0.0
# Gemini API integration (optional - only needed for Gemini Prompt node)
google-generativeai>=0.3.0
+16
View File
@@ -0,0 +1,16 @@
#!/bin/bash
# Run mypy type checking on kikotools package
# This is used as an alternative to pre-commit due to package name issues
set -e
echo "Running mypy type checking..."
cd "$(dirname "$0")/.."
# Run mypy with the configuration
python -m mypy kikotools/ --ignore-missing-imports --no-strict-optional || {
echo "❌ Mypy type checking failed"
exit 1
}
echo "✓ Mypy type checking passed"
+287
View File
@@ -0,0 +1,287 @@
"""Unit tests for DisplayAny node."""
import numpy as np
import pytest
import torch
from kikotools.tools.display_any import DisplayAnyNode
from kikotools.tools.display_any.logic import (
format_display_value,
get_tensor_shapes,
validate_display_mode,
)
from kikotools.tools.display_any.node import AnyType
class TestAnyType:
"""Test cases for AnyType class."""
def test_anytype_not_equal(self):
"""Test that AnyType is never equal to other types."""
any_type = AnyType("*")
# Should not be equal to any other type
assert not (any_type != "STRING")
assert not (any_type != "IMAGE")
assert not (any_type != "LATENT")
assert not (any_type != 123)
assert not (any_type != None)
assert not (any_type != ["LIST"])
def test_anytype_string_representation(self):
"""Test string representation of AnyType."""
any_type = AnyType("*")
assert str(any_type) == "*"
class TestDisplayAnyNode:
"""Test cases for DisplayAnyNode."""
def test_node_properties(self):
"""Test node has correct properties."""
assert DisplayAnyNode.CATEGORY == "ComfyAssets"
assert DisplayAnyNode.FUNCTION == "display"
assert DisplayAnyNode.RETURN_TYPES == ("STRING",)
assert DisplayAnyNode.RETURN_NAMES == ("display_text",)
assert DisplayAnyNode.OUTPUT_NODE is True
def test_input_types(self):
"""Test INPUT_TYPES configuration."""
input_types = DisplayAnyNode.INPUT_TYPES()
# Check required inputs
assert "required" in input_types
assert "input" in input_types["required"]
# Check that input is AnyType with wildcard
input_type = input_types["required"]["input"]
assert len(input_type) == 2
assert isinstance(input_type[0], AnyType)
assert str(input_type[0]) == "*"
assert input_type[1] == {}
assert "mode" in input_types["required"]
assert input_types["required"]["mode"] == (["raw value", "tensor shape"],)
def test_validate_inputs(self):
"""Test VALIDATE_INPUTS always returns True."""
assert DisplayAnyNode.VALIDATE_INPUTS() is True
assert DisplayAnyNode.VALIDATE_INPUTS(input="test") is True
assert DisplayAnyNode.VALIDATE_INPUTS(input=123, mode="raw value") is True
def test_display_raw_value_string(self):
"""Test displaying raw string value."""
node = DisplayAnyNode()
result = node.display("Hello, World!", "raw value")
assert "ui" in result
assert "text" in result["ui"]
assert result["ui"]["text"] == "Hello, World!"
assert "result" in result
assert result["result"] == ("Hello, World!",)
def test_display_raw_value_number(self):
"""Test displaying raw number value."""
node = DisplayAnyNode()
result = node.display(42, "raw value")
assert result["ui"]["text"] == "42"
assert result["result"] == ("42",)
def test_display_raw_value_list(self):
"""Test displaying raw list value."""
node = DisplayAnyNode()
test_list = [1, 2, 3, "test"]
result = node.display(test_list, "raw value")
assert result["ui"]["text"] == str(test_list)
assert result["result"] == (str(test_list),)
def test_display_raw_value_dict(self):
"""Test displaying raw dictionary value."""
node = DisplayAnyNode()
test_dict = {"key": "value", "number": 123}
result = node.display(test_dict, "raw value")
assert result["ui"]["text"] == str(test_dict)
assert result["result"] == (str(test_dict),)
def test_display_tensor_shape_numpy(self):
"""Test displaying numpy tensor shape."""
node = DisplayAnyNode()
tensor = np.random.rand(4, 3, 224, 224)
result = node.display(tensor, "tensor shape")
assert result["ui"]["text"] == "[[4, 3, 224, 224]]"
assert result["result"] == ("[[4, 3, 224, 224]]",)
@pytest.mark.skipif(not torch, reason="PyTorch not installed")
def test_display_tensor_shape_torch(self):
"""Test displaying PyTorch tensor shape."""
node = DisplayAnyNode()
tensor = torch.randn(2, 10, 512, 512)
result = node.display(tensor, "tensor shape")
assert result["ui"]["text"] == "[[2, 10, 512, 512]]"
assert result["result"] == ("[[2, 10, 512, 512]]",)
def test_display_nested_tensors(self):
"""Test displaying shapes from nested structure with tensors."""
node = DisplayAnyNode()
nested_data = {
"images": np.random.rand(1, 3, 256, 256),
"masks": [
np.random.rand(256, 256),
np.random.rand(256, 256, 1),
],
"metadata": {"info": "test", "tensor": np.random.rand(10)},
}
result = node.display(nested_data, "tensor shape")
expected = "[[1, 3, 256, 256], [256, 256], [256, 256, 1], [10]]"
assert result["ui"]["text"] == expected
assert result["result"] == (expected,)
def test_display_no_tensors(self):
"""Test displaying when no tensors are present."""
node = DisplayAnyNode()
data = {"text": "hello", "number": 42, "list": [1, 2, 3]}
result = node.display(data, "tensor shape")
assert result["ui"]["text"] == "No tensors found in input"
assert result["result"] == ("No tensors found in input",)
def test_invalid_mode_defaults_to_raw(self):
"""Test that invalid mode defaults to raw value."""
node = DisplayAnyNode()
result = node.display("test", "invalid_mode")
assert result["ui"]["text"] == "test"
assert result["result"] == ("test",)
class TestDisplayAnyLogic:
"""Test cases for DisplayAny logic functions."""
def test_get_tensor_shapes_single(self):
"""Test getting shape from single tensor."""
tensor = np.random.rand(3, 224, 224)
shapes = get_tensor_shapes(tensor)
assert len(shapes) == 1
assert shapes[0] == [3, 224, 224]
def test_get_tensor_shapes_nested_dict(self):
"""Test getting shapes from nested dictionary."""
data = {
"level1": {
"tensor1": np.random.rand(10, 20),
"level2": {"tensor2": np.random.rand(5, 5, 5)},
}
}
shapes = get_tensor_shapes(data)
assert len(shapes) == 2
assert [10, 20] in shapes
assert [5, 5, 5] in shapes
def test_get_tensor_shapes_nested_list(self):
"""Test getting shapes from nested list."""
data = [
np.random.rand(1, 2, 3),
[np.random.rand(4, 5), np.random.rand(6, 7, 8)],
"not a tensor",
]
shapes = get_tensor_shapes(data)
assert len(shapes) == 3
assert [1, 2, 3] in shapes
assert [4, 5] in shapes
assert [6, 7, 8] in shapes
def test_get_tensor_shapes_tuple(self):
"""Test getting shapes from tuple."""
data = (np.random.rand(2, 2), np.random.rand(3, 3))
shapes = get_tensor_shapes(data)
assert len(shapes) == 2
assert [2, 2] in shapes
assert [3, 3] in shapes
def test_format_display_value_raw(self):
"""Test formatting for raw value display."""
result = format_display_value({"key": "value"}, "raw value")
assert result == "{'key': 'value'}"
def test_format_display_value_tensor_shape(self):
"""Test formatting for tensor shape display."""
tensor = np.random.rand(10, 10)
result = format_display_value(tensor, "tensor shape")
assert result == "[[10, 10]]"
def test_format_display_value_no_tensors(self):
"""Test formatting when no tensors present."""
result = format_display_value("just a string", "tensor shape")
assert result == "No tensors found in input"
def test_validate_display_mode(self):
"""Test display mode validation."""
assert validate_display_mode("raw value") is True
assert validate_display_mode("tensor shape") is True
assert validate_display_mode("invalid") is False
assert validate_display_mode("") is False
assert validate_display_mode(None) is False
class TestDisplayAnyEdgeCases:
"""Test edge cases for DisplayAny."""
def test_display_none(self):
"""Test displaying None value."""
node = DisplayAnyNode()
result = node.display(None, "raw value")
assert result["ui"]["text"] == "None"
def test_display_empty_list(self):
"""Test displaying empty list."""
node = DisplayAnyNode()
result = node.display([], "raw value")
assert result["ui"]["text"] == "[]"
def test_display_empty_dict(self):
"""Test displaying empty dictionary."""
node = DisplayAnyNode()
result = node.display({}, "raw value")
assert result["ui"]["text"] == "{}"
def test_display_complex_nested_structure(self):
"""Test displaying complex nested structure."""
node = DisplayAnyNode()
complex_data = {
"images": [np.random.rand(1, 3, 64, 64) for _ in range(3)],
"config": {
"steps": 20,
"cfg": 7.5,
"sampler": "euler",
"latents": np.random.rand(1, 4, 32, 32),
},
"prompts": ["test1", "test2"],
}
result = node.display(complex_data, "tensor shape")
# Should find 4 tensors total (3 images + 1 latent)
shapes_text = result["ui"]["text"]
assert "[1, 3, 64, 64]" in shapes_text
assert "[1, 4, 32, 32]" in shapes_text
def test_display_very_long_string(self):
"""Test displaying very long string."""
node = DisplayAnyNode()
long_string = "x" * 10000
result = node.display(long_string, "raw value")
assert result["ui"]["text"] == long_string
def test_display_unicode(self):
"""Test displaying unicode characters."""
node = DisplayAnyNode()
unicode_text = "Hello 世界 🌍"
result = node.display(unicode_text, "raw value")
assert result["ui"]["text"] == unicode_text
+219
View File
@@ -0,0 +1,219 @@
"""Tests for Empty Latent Batch node and logic."""
import pytest
import torch
from kikotools.tools.empty_latent_batch.node import EmptyLatentBatchNode
from kikotools.tools.empty_latent_batch.logic import (
create_empty_latent_batch,
validate_dimensions,
sanitize_dimensions,
)
class TestEmptyLatentBatchLogic:
"""Test the logic functions for empty latent batch creation."""
def test_create_empty_latent_batch_basic(self):
"""Test basic empty latent creation."""
result = create_empty_latent_batch(512, 512, 1)
assert "samples" in result
samples = result["samples"]
assert isinstance(samples, torch.Tensor)
assert samples.shape == (1, 4, 64, 64) # 512/8 = 64
assert torch.all(samples == 0) # Should be all zeros
def test_create_empty_latent_batch_with_batch_size(self):
"""Test empty latent creation with larger batch size."""
batch_size = 4
result = create_empty_latent_batch(1024, 768, batch_size)
assert "samples" in result
samples = result["samples"]
assert isinstance(samples, torch.Tensor)
assert samples.shape == (4, 4, 96, 128) # 768/8=96, 1024/8=128
assert torch.all(samples == 0)
def test_create_empty_latent_batch_invalid_dimensions(self):
"""Test error handling for invalid dimensions."""
with pytest.raises(ValueError, match="Width and height must be positive"):
create_empty_latent_batch(0, 512, 1)
with pytest.raises(ValueError, match="Width and height must be positive"):
create_empty_latent_batch(512, -100, 1)
def test_create_empty_latent_batch_not_divisible_by_8(self):
"""Test error handling for dimensions not divisible by 8."""
with pytest.raises(ValueError, match="must be divisible by 8"):
create_empty_latent_batch(513, 512, 1)
with pytest.raises(ValueError, match="must be divisible by 8"):
create_empty_latent_batch(512, 515, 1)
def test_create_empty_latent_batch_invalid_batch_size(self):
"""Test error handling for invalid batch size."""
with pytest.raises(ValueError, match="Batch size must be positive"):
create_empty_latent_batch(512, 512, 0)
with pytest.raises(ValueError, match="Batch size must be positive"):
create_empty_latent_batch(512, 512, -1)
def test_validate_dimensions_valid(self):
"""Test dimension validation with valid inputs."""
assert validate_dimensions(512, 512) is True
assert validate_dimensions(1024, 768) is True
assert validate_dimensions(64, 64) is True # Minimum size
assert validate_dimensions(8192, 8192) is True # Maximum size
def test_validate_dimensions_invalid(self):
"""Test dimension validation with invalid inputs."""
assert validate_dimensions(0, 512) is False # Zero dimension
assert validate_dimensions(512, -100) is False # Negative dimension
assert validate_dimensions(513, 512) is False # Not divisible by 8
assert validate_dimensions(32, 32) is False # Too small
assert validate_dimensions(8200, 8200) is False # Too large
def test_sanitize_dimensions_basic(self):
"""Test basic dimension sanitization."""
width, height = sanitize_dimensions(512, 512)
assert width == 512
assert height == 512
def test_sanitize_dimensions_not_divisible_by_8(self):
"""Test sanitization of dimensions not divisible by 8."""
width, height = sanitize_dimensions(513, 515)
assert width == 512 # Rounds down to nearest multiple of 8
assert height == 512
width, height = sanitize_dimensions(517, 519)
assert width == 520 # Rounds up to nearest multiple of 8
assert height == 520
def test_sanitize_dimensions_too_small(self):
"""Test sanitization of dimensions that are too small."""
width, height = sanitize_dimensions(32, 16)
assert width == 64 # Minimum size
assert height == 64
def test_sanitize_dimensions_too_large(self):
"""Test sanitization of dimensions that are too large."""
width, height = sanitize_dimensions(10000, 9000)
assert width == 8192 # Maximum size
assert height == 8192
class TestEmptyLatentBatchNode:
"""Test the EmptyLatentBatchNode ComfyUI node."""
def setup_method(self):
"""Set up test fixtures."""
self.node = EmptyLatentBatchNode()
def test_input_types_structure(self):
"""Test that INPUT_TYPES returns proper structure."""
input_types = EmptyLatentBatchNode.INPUT_TYPES()
assert "required" in input_types
required = input_types["required"]
assert "width" in required
assert "height" in required
assert "batch_size" in required
# Check width parameter
width_spec = required["width"]
assert width_spec[0] == "INT"
assert width_spec[1]["default"] == 1024
assert width_spec[1]["min"] == 64
assert width_spec[1]["max"] == 8192
assert width_spec[1]["step"] == 8
def test_node_attributes(self):
"""Test node class attributes."""
assert EmptyLatentBatchNode.RETURN_TYPES == ("LATENT",)
assert EmptyLatentBatchNode.RETURN_NAMES == ("latent",)
assert EmptyLatentBatchNode.FUNCTION == "create_empty_latent"
assert EmptyLatentBatchNode.CATEGORY == "ComfyAssets"
def test_create_empty_latent_basic(self):
"""Test basic empty latent creation through node."""
result = self.node.create_empty_latent(512, 512, 1)
assert isinstance(result, tuple)
assert len(result) == 1
latent_dict = result[0]
assert isinstance(latent_dict, dict)
assert "samples" in latent_dict
samples = latent_dict["samples"]
assert isinstance(samples, torch.Tensor)
assert samples.shape == (1, 4, 64, 64)
def test_create_empty_latent_with_batch(self):
"""Test empty latent creation with batch size."""
batch_size = 3
result = self.node.create_empty_latent(1024, 768, batch_size)
latent_dict = result[0]
samples = latent_dict["samples"]
assert samples.shape == (3, 4, 96, 128) # batch=3, 768/8=96, 1024/8=128
def test_create_empty_latent_dimension_adjustment(self):
"""Test that dimensions are adjusted when not divisible by 8."""
# Input dimensions not divisible by 8
result = self.node.create_empty_latent(513, 515, 1)
latent_dict = result[0]
samples = latent_dict["samples"]
# Should be adjusted to 512x512 -> 64x64 latent
assert samples.shape == (1, 4, 64, 64)
def test_validate_inputs_valid(self):
"""Test input validation with valid parameters."""
assert self.node.validate_inputs(512, 512, 1) is True
assert self.node.validate_inputs(1024, 768, 4) is True
def test_validate_inputs_invalid_batch_size(self):
"""Test input validation with invalid batch size."""
assert self.node.validate_inputs(512, 512, 0) is False
assert self.node.validate_inputs(512, 512, 100) is False # Too large
def test_get_latent_info(self):
"""Test latent info generation."""
info = self.node.get_latent_info(512, 512, 2)
assert "Empty latent batch" in info
assert "2 × 4 × 64 × 64" in info
assert "512×512" in info
def test_get_memory_estimate(self):
"""Test memory estimation."""
estimate = self.node.get_memory_estimate(512, 512, 1)
assert "KB" in estimate or "MB" in estimate
# Larger batch should show larger estimate
large_estimate = self.node.get_memory_estimate(1024, 1024, 8)
assert "MB" in large_estimate
def test_node_registration_mappings(self):
"""Test that node registration mappings are properly defined."""
from kikotools.tools.empty_latent_batch.node import (
NODE_CLASS_MAPPINGS,
NODE_DISPLAY_NAME_MAPPINGS,
)
assert "EmptyLatentBatch" in NODE_CLASS_MAPPINGS
assert NODE_CLASS_MAPPINGS["EmptyLatentBatch"] == EmptyLatentBatchNode
assert "EmptyLatentBatch" in NODE_DISPLAY_NAME_MAPPINGS
assert NODE_DISPLAY_NAME_MAPPINGS["EmptyLatentBatch"] == "Empty Latent Batch"
def test_node_inheritance(self):
"""Test that node properly inherits from base class."""
from kikotools.base.base_node import ComfyAssetsBaseNode
assert isinstance(self.node, ComfyAssetsBaseNode)
assert hasattr(self.node, "handle_error")
assert hasattr(self.node, "log_info")
assert hasattr(self.node, "validate_inputs")
+280
View File
@@ -0,0 +1,280 @@
"""Unit tests for Gemini Prompt Engineer node."""
import pytest
import numpy as np
from unittest.mock import patch, MagicMock
from PIL import Image
from kikotools.tools.gemini_prompt import GeminiPromptNode
from kikotools.tools.gemini_prompt.logic import (
tensor_to_pil,
image_to_base64,
get_api_key,
validate_prompt_type,
analyze_image_with_gemini,
)
from kikotools.tools.gemini_prompt.prompts import (
PROMPT_OPTIONS,
PROMPT_TEMPLATES,
GEMINI_MODELS,
)
class TestGeminiPromptNode:
"""Test cases for GeminiPromptNode."""
def test_node_properties(self):
"""Test node has correct properties."""
assert GeminiPromptNode.CATEGORY == "ComfyAssets"
assert GeminiPromptNode.FUNCTION == "generate_prompt"
assert GeminiPromptNode.RETURN_TYPES == ("STRING", "STRING")
assert GeminiPromptNode.RETURN_NAMES == ("prompt", "negative_prompt")
def test_input_types(self):
"""Test INPUT_TYPES configuration."""
input_types = GeminiPromptNode.INPUT_TYPES()
# Check required inputs
assert "required" in input_types
assert "image" in input_types["required"]
assert input_types["required"]["image"] == ("IMAGE",)
assert "prompt_type" in input_types["required"]
assert input_types["required"]["prompt_type"][0] == PROMPT_OPTIONS
assert "model" in input_types["required"]
assert input_types["required"]["model"][0] == GEMINI_MODELS
# Check optional inputs
assert "optional" in input_types
assert "api_key" in input_types["optional"]
assert "custom_prompt" in input_types["optional"]
def test_gemini_models_available(self):
"""Test that all expected Gemini models are available."""
expected_models = [
"gemini-1.5-pro",
"gemini-1.5-flash",
"gemini-1.5-flash-8b",
"gemini-pro-vision",
"gemini-1.0-pro",
]
for model in expected_models:
assert model in GEMINI_MODELS
@patch("kikotools.tools.gemini_prompt.node.analyze_image_with_gemini")
def test_generate_prompt_success(self, mock_analyze):
"""Test successful prompt generation."""
# Setup
node = GeminiPromptNode()
test_image = np.random.rand(1, 512, 512, 3).astype(np.float32)
mock_analyze.return_value = ("A beautiful landscape with mountains", None)
# Execute
result = node.generate_prompt(test_image, "flux")
# Assert
assert result == ("A beautiful landscape with mountains", "")
mock_analyze.assert_called_once()
@patch("kikotools.tools.gemini_prompt.node.analyze_image_with_gemini")
def test_generate_prompt_sdxl_format(self, mock_analyze):
"""Test SDXL format with positive and negative prompts."""
# Setup
node = GeminiPromptNode()
test_image = np.random.rand(1, 512, 512, 3).astype(np.float32)
mock_analyze.return_value = (
"Positive: beautiful landscape, mountains, sunset\nNegative: blurry, low quality",
None,
)
# Execute
result = node.generate_prompt(test_image, "sdxl")
# Assert
assert result == (
"beautiful landscape, mountains, sunset",
"blurry, low quality",
)
@patch("kikotools.tools.gemini_prompt.node.analyze_image_with_gemini")
def test_generate_prompt_error(self, mock_analyze):
"""Test error handling in prompt generation."""
# Setup
node = GeminiPromptNode()
test_image = np.random.rand(1, 512, 512, 3).astype(np.float32)
mock_analyze.return_value = ("", "API key not found")
# Execute
result = node.generate_prompt(test_image, "flux")
# Assert
assert result[0].startswith("Error:")
assert result[1] == ""
def test_invalid_prompt_type(self):
"""Test handling of invalid prompt type."""
node = GeminiPromptNode()
test_image = np.random.rand(1, 512, 512, 3).astype(np.float32)
with pytest.raises(ValueError, match="Invalid prompt type"):
node.generate_prompt(test_image, "invalid_type")
class TestGeminiLogic:
"""Test cases for Gemini logic functions."""
def test_tensor_to_pil(self):
"""Test tensor to PIL conversion."""
# Test 4D tensor
tensor_4d = np.random.rand(1, 64, 64, 3)
result = tensor_to_pil(tensor_4d)
assert isinstance(result, Image.Image)
assert result.size == (64, 64)
assert result.mode == "RGB"
# Test 3D tensor
tensor_3d = np.random.rand(64, 64, 3)
result = tensor_to_pil(tensor_3d)
assert isinstance(result, Image.Image)
assert result.size == (64, 64)
def test_image_to_base64(self):
"""Test image to base64 conversion."""
# Create test image
image = Image.new("RGB", (64, 64), color="red")
# Convert to base64
result = image_to_base64(image)
assert isinstance(result, str)
assert len(result) > 0
# Test JPEG format
result_jpeg = image_to_base64(image, format="JPEG")
assert isinstance(result_jpeg, str)
assert (
result != result_jpeg
) # Different formats should produce different results
@patch.dict("os.environ", {"GEMINI_API_KEY": "test_key_123"})
def test_get_api_key_from_env(self):
"""Test getting API key from environment."""
result = get_api_key()
assert result == "test_key_123"
@patch.dict("os.environ", {}, clear=True)
@patch("os.path.exists")
@patch("builtins.open")
def test_get_api_key_from_config(self, mock_open, mock_exists):
"""Test getting API key from config file."""
# Setup
mock_exists.return_value = True
mock_open.return_value.__enter__.return_value.read.return_value = (
'{"api_key": "config_key_456"}'
)
# Execute
result = get_api_key()
# Assert
assert result == "config_key_456"
def test_validate_prompt_type(self):
"""Test prompt type validation."""
# Valid types
for prompt_type in PROMPT_OPTIONS:
assert validate_prompt_type(prompt_type) is True
# Invalid types
assert validate_prompt_type("invalid") is False
assert validate_prompt_type("") is False
assert validate_prompt_type(None) is False
@patch("google.generativeai.configure")
@patch("google.generativeai.GenerativeModel")
def test_analyze_image_with_gemini_success(self, mock_model_class, mock_configure):
"""Test successful image analysis with Gemini."""
# Setup
mock_model = MagicMock()
mock_response = MagicMock()
mock_response.text = "A beautiful sunset over mountains"
mock_model.generate_content.return_value = mock_response
mock_model_class.return_value = mock_model
test_image = np.random.rand(64, 64, 3)
# Execute
result, error = analyze_image_with_gemini(
test_image, "flux", api_key="test_key"
)
# Assert
assert result == "A beautiful sunset over mountains"
assert error is None
mock_configure.assert_called_once_with(api_key="test_key")
mock_model.generate_content.assert_called_once()
def test_analyze_image_no_api_key(self):
"""Test analysis without API key."""
test_image = np.random.rand(64, 64, 3)
with patch(
"kikotools.tools.gemini_prompt.logic.get_api_key", return_value=None
):
result, error = analyze_image_with_gemini(test_image, "flux")
assert result == ""
assert "API key not found" in error
@patch("google.generativeai.configure")
@patch("google.generativeai.GenerativeModel")
def test_analyze_image_with_custom_prompt(self, mock_model_class, mock_configure):
"""Test analysis with custom prompt."""
# Setup
mock_model = MagicMock()
mock_response = MagicMock()
mock_response.text = "Custom analysis result"
mock_model.generate_content.return_value = mock_response
mock_model_class.return_value = mock_model
test_image = np.random.rand(64, 64, 3)
custom_prompt = "Analyze this image and describe the colors"
# Execute
result, error = analyze_image_with_gemini(
test_image, "flux", api_key="test_key", custom_prompt=custom_prompt
)
# Assert
assert result == "Custom analysis result"
assert error is None
# Check that custom prompt was used
call_args = mock_model.generate_content.call_args[0][0]
assert custom_prompt in call_args
class TestPromptTemplates:
"""Test prompt template configurations."""
def test_all_prompt_types_have_templates(self):
"""Test that all prompt options have corresponding templates."""
for prompt_type in PROMPT_OPTIONS:
assert prompt_type in PROMPT_TEMPLATES
assert isinstance(PROMPT_TEMPLATES[prompt_type], str)
assert len(PROMPT_TEMPLATES[prompt_type]) > 0
def test_prompt_template_content(self):
"""Test that prompt templates contain expected content."""
# FLUX prompt should mention FLUX
assert "FLUX" in PROMPT_TEMPLATES["flux"]
# SDXL prompt should mention positive and negative
assert "Positive" in PROMPT_TEMPLATES["sdxl"]
assert "Negative" in PROMPT_TEMPLATES["sdxl"]
# Danbooru should mention tags and underscores
assert "tag" in PROMPT_TEMPLATES["danbooru"].lower()
assert "underscore" in PROMPT_TEMPLATES["danbooru"].lower()
# Video should mention motion and temporal
assert "motion" in PROMPT_TEMPLATES["video"].lower()
assert "temporal" in PROMPT_TEMPLATES["video"].lower()
@@ -0,0 +1,193 @@
"""Unit tests for ImageToMultipleOf tool."""
import pytest
import torch
import sys
from pathlib import Path
# Add the project root to the Python path for tests
sys.path.insert(0, str(Path(__file__).parent.parent.parent.parent))
from kikotools.tools.image_to_multiple_of.logic import (
calculate_dimensions_to_multiple,
process_image_to_multiple_of,
)
from kikotools.tools.image_to_multiple_of.node import ImageToMultipleOfNode
class TestImageToMultipleOfLogic:
"""Test core logic functions."""
def test_calculate_dimensions_to_multiple(self):
"""Test dimension calculation for various inputs."""
# Test exact multiples
assert calculate_dimensions_to_multiple(256, 512, 64) == (256, 512)
# Test non-exact multiples
assert calculate_dimensions_to_multiple(300, 400, 64) == (256, 384)
assert calculate_dimensions_to_multiple(150, 200, 32) == (128, 192)
# Test small values
assert calculate_dimensions_to_multiple(10, 20, 8) == (8, 16)
# Test with multiple_of = 1 (should return original)
assert calculate_dimensions_to_multiple(123, 456, 1) == (123, 456)
def test_process_image_center_crop(self):
"""Test center crop processing."""
# Create test image (batch=1, height=300, width=400, channels=3)
image = torch.rand(1, 300, 400, 3)
# Process with center crop
result = process_image_to_multiple_of(image, 64, "center crop")
# Check dimensions
assert result.shape == (1, 256, 384, 3)
# Check that center portion is preserved
# The crop should start at (22, 8) and end at (278, 392)
# This is a rough check that values are from the center
assert result.dtype == image.dtype
def test_process_image_rescale(self):
"""Test rescale processing."""
# Create test image
image = torch.rand(1, 300, 400, 3)
# Process with rescale
result = process_image_to_multiple_of(image, 64, "rescale")
# Check dimensions
assert result.shape == (1, 256, 384, 3)
assert result.dtype == image.dtype
def test_process_image_batch(self):
"""Test processing with batch of images."""
# Create batch of images
batch_size = 4
image = torch.rand(batch_size, 300, 400, 3)
# Process with center crop
result_crop = process_image_to_multiple_of(image, 32, "center crop")
assert result_crop.shape == (batch_size, 288, 384, 3)
# Process with rescale
result_rescale = process_image_to_multiple_of(image, 32, "rescale")
assert result_rescale.shape == (batch_size, 288, 384, 3)
def test_process_image_different_channels(self):
"""Test with different channel counts."""
# Test with 1 channel (grayscale)
image_gray = torch.rand(1, 256, 256, 1)
result = process_image_to_multiple_of(image_gray, 64, "center crop")
assert result.shape == (1, 256, 256, 1)
# Test with 4 channels (RGBA)
image_rgba = torch.rand(1, 300, 400, 4)
result = process_image_to_multiple_of(image_rgba, 64, "rescale")
assert result.shape == (1, 256, 384, 4)
class TestImageToMultipleOfNode:
"""Test ComfyUI node implementation."""
def test_node_input_types(self):
"""Test node input type definitions."""
input_types = ImageToMultipleOfNode.INPUT_TYPES()
assert "required" in input_types
assert "image" in input_types["required"]
assert "multiple_of" in input_types["required"]
assert "method" in input_types["required"]
# Check multiple_of configuration
multiple_config = input_types["required"]["multiple_of"][1]
assert multiple_config["default"] == 64
assert multiple_config["min"] == 1
assert multiple_config["max"] == 256
assert multiple_config["step"] == 16
# Check method options
methods = input_types["required"]["method"][0]
assert "center crop" in methods
assert "rescale" in methods
def test_node_metadata(self):
"""Test node metadata."""
assert ImageToMultipleOfNode.RETURN_TYPES == ("IMAGE",)
assert ImageToMultipleOfNode.RETURN_NAMES == ("image",)
assert ImageToMultipleOfNode.FUNCTION == "process"
assert ImageToMultipleOfNode.CATEGORY == "ComfyAssets"
def test_node_process_center_crop(self):
"""Test node processing with center crop."""
node = ImageToMultipleOfNode()
image = torch.rand(1, 300, 400, 3)
result = node.process(image, 64, "center crop")
assert isinstance(result, tuple)
assert len(result) == 1
assert result[0].shape == (1, 256, 384, 3)
def test_node_process_rescale(self):
"""Test node processing with rescale."""
node = ImageToMultipleOfNode()
image = torch.rand(1, 300, 400, 3)
result = node.process(image, 32, "rescale")
assert isinstance(result, tuple)
assert len(result) == 1
assert result[0].shape == (1, 288, 384, 3)
def test_node_validation_errors(self):
"""Test input validation error handling."""
node = ImageToMultipleOfNode()
# Test with None image
with pytest.raises(ValueError, match="Image input is required"):
node.validate_inputs(image=None, multiple_of=64, method="center crop")
# Test with invalid image shape
invalid_image = torch.rand(300, 400, 3) # Missing batch dimension
with pytest.raises(ValueError, match="Expected image tensor with shape"):
node.validate_inputs(
image=invalid_image, multiple_of=64, method="center crop"
)
# Test with negative multiple_of
image = torch.rand(1, 300, 400, 3)
with pytest.raises(ValueError, match="multiple_of must be positive"):
node.validate_inputs(image=image, multiple_of=-64, method="center crop")
# Test with invalid method
with pytest.raises(ValueError, match="Invalid method"):
node.validate_inputs(image=image, multiple_of=64, method="invalid")
# Test with image too small
small_image = torch.rand(1, 30, 40, 3)
with pytest.raises(ValueError, match="too small to be adjusted"):
node.validate_inputs(
image=small_image, multiple_of=64, method="center crop"
)
def test_node_edge_cases(self):
"""Test edge cases."""
node = ImageToMultipleOfNode()
# Test with already multiple dimensions
image = torch.rand(1, 256, 512, 3)
result = node.process(image, 64, "center crop")
assert result[0].shape == image.shape
# Test with multiple_of = 1
image = torch.rand(1, 123, 456, 3)
result = node.process(image, 1, "center crop")
assert result[0].shape == image.shape
# Test with very large multiple_of
image = torch.rand(1, 1024, 1024, 3)
result = node.process(image, 256, "rescale")
assert result[0].shape == (1, 1024, 1024, 3)
+546
View File
@@ -0,0 +1,546 @@
"""
Unit tests for KikoSaveImage tool
Tests image saving functionality with multiple formats and quality settings
"""
import pytest
import torch
import tempfile
import os
from PIL import Image
from unittest.mock import patch
from kikotools.tools.kiko_save_image.node import KikoSaveImageNode
from kikotools.tools.kiko_save_image.logic import (
convert_tensor_to_pil,
process_image_batch,
validate_save_inputs,
save_image_with_format,
get_save_image_path,
create_png_metadata,
)
class TestKikoSaveImageLogic:
"""Test core logic functions"""
def test_convert_tensor_to_pil(self):
"""Test tensor to PIL conversion"""
# Create test tensor [height, width, channels] with values 0-1
tensor = torch.rand(64, 64, 3)
# Convert to PIL
pil_image = convert_tensor_to_pil(tensor)
# Verify conversion
assert isinstance(pil_image, Image.Image)
assert pil_image.size == (64, 64) # PIL uses (width, height)
assert pil_image.mode in ["RGB", "RGBA"]
def test_convert_tensor_to_pil_rgba(self):
"""Test tensor to PIL conversion with alpha channel"""
# Create RGBA tensor
tensor = torch.rand(32, 32, 4)
pil_image = convert_tensor_to_pil(tensor)
assert isinstance(pil_image, Image.Image)
assert pil_image.size == (32, 32)
assert pil_image.mode == "RGBA"
def test_get_save_image_path(self):
"""Test save path generation"""
with tempfile.TemporaryDirectory() as temp_dir:
# Test basic path generation
full_path, filename = get_save_image_path(
"test_prefix", 0, ".png", temp_dir
)
assert full_path.startswith(temp_dir)
assert filename.startswith("test_prefix_")
assert filename.endswith("_00000.png")
# Test with empty subfolder (standard behavior)
full_path, filename = get_save_image_path("test", 1, ".jpg", temp_dir, "")
assert full_path.startswith(temp_dir)
assert filename.startswith("test_")
assert filename.endswith("_00001.jpg")
def test_create_png_metadata(self):
"""Test PNG metadata creation"""
# Test with no metadata
metadata = create_png_metadata()
assert metadata is None
# Test with prompt data
prompt_data = {"test": "value"}
metadata = create_png_metadata(prompt=prompt_data)
assert metadata is not None
# Check that metadata contains our data (implementation detail)
assert hasattr(metadata, "text")
@patch("kikotools.tools.kiko_save_image.logic.folder_paths")
def test_process_image_batch_png(self, mock_folder_paths):
"""Test batch processing with PNG format"""
with tempfile.TemporaryDirectory() as temp_dir:
mock_folder_paths.get_output_directory.return_value = temp_dir
# Create test image batch [batch, height, width, channels]
images = torch.rand(2, 32, 32, 3)
# Process batch
results, enhanced_data = process_image_batch(
images=images,
filename_prefix="test_batch",
format_type="PNG",
png_compress_level=6,
)
# Verify results (clean data)
assert len(results) == 2
for i, result in enumerate(results):
assert "filename" in result
assert "subfolder" in result
assert "type" in result
assert result["type"] == "output"
# Verify enhanced data
assert len(enhanced_data) == 2
for i, enhanced in enumerate(enhanced_data):
assert enhanced["format"] == "PNG"
assert enhanced["compress_level"] == 6
assert enhanced["dimensions"] == "32x32"
assert enhanced["popup"] is True # Default popup value
assert "file_size" in enhanced
# Verify file was saved
filepath = os.path.join(temp_dir, enhanced["filename"])
assert os.path.exists(filepath)
# Verify image can be loaded
saved_img = Image.open(filepath)
assert saved_img.size == (32, 32)
@patch("kikotools.tools.kiko_save_image.logic.folder_paths")
def test_process_image_batch_jpeg(self, mock_folder_paths):
"""Test batch processing with JPEG format"""
with tempfile.TemporaryDirectory() as temp_dir:
mock_folder_paths.get_output_directory.return_value = temp_dir
# Create test image batch
images = torch.rand(1, 64, 64, 3)
# Process batch
results, enhanced_data = process_image_batch(
images=images,
filename_prefix="test_jpeg",
format_type="JPEG",
quality=85,
)
# Verify results
assert len(results) == 1
assert len(enhanced_data) == 1
enhanced = enhanced_data[0]
assert enhanced["format"] == "JPEG"
assert enhanced["quality"] == 85
assert enhanced["filename"].endswith(".jpg")
# Verify file exists and can be loaded
filepath = os.path.join(temp_dir, results[0]["filename"])
assert os.path.exists(filepath)
saved_img = Image.open(filepath)
assert saved_img.size == (64, 64)
assert saved_img.mode == "RGB" # JPEG converts to RGB
@patch("kikotools.tools.kiko_save_image.logic.folder_paths")
def test_process_image_batch_webp(self, mock_folder_paths):
"""Test batch processing with WebP format"""
with tempfile.TemporaryDirectory() as temp_dir:
mock_folder_paths.get_output_directory.return_value = temp_dir
# Create test image batch
images = torch.rand(1, 48, 48, 3)
# Test lossless WebP
results = process_image_batch(
images=images,
filename_prefix="test_webp",
format_type="WEBP",
quality=90,
webp_lossless=True,
)
assert len(results) == 1
result = results[0]
assert result["format"] == "WEBP"
assert result["lossless"] is True
assert result["filename"].endswith(".webp")
def test_validate_save_inputs_valid(self):
"""Test input validation with valid inputs"""
images = torch.rand(2, 64, 64, 3)
# Should not raise exception
validate_save_inputs(images, "PNG", 90, 4)
validate_save_inputs(images, "JPEG", 85, 4)
validate_save_inputs(images, "WEBP", 95, 6)
def test_validate_save_inputs_invalid_tensor(self):
"""Test validation with invalid tensor"""
# Wrong tensor dimensions
invalid_tensor = torch.rand(64, 64) # Missing batch and channel dims
with pytest.raises(ValueError, match="4 dimensions"):
validate_save_inputs(invalid_tensor, "PNG", 90, 4)
# Non-tensor input
with pytest.raises(ValueError, match="torch.Tensor"):
validate_save_inputs("not_a_tensor", "PNG", 90, 4)
def test_validate_save_inputs_invalid_format(self):
"""Test validation with invalid format"""
images = torch.rand(1, 32, 32, 3)
with pytest.raises(ValueError, match="format must be one of"):
validate_save_inputs(images, "BMP", 90, 4)
def test_validate_save_inputs_invalid_quality(self):
"""Test validation with invalid quality"""
images = torch.rand(1, 32, 32, 3)
# Quality out of range
with pytest.raises(
ValueError, match="quality must be an integer between 1 and 100"
):
validate_save_inputs(images, "JPEG", 0, 4)
with pytest.raises(
ValueError, match="quality must be an integer between 1 and 100"
):
validate_save_inputs(images, "JPEG", 101, 4)
def test_validate_save_inputs_invalid_compress_level(self):
"""Test validation with invalid PNG compression level"""
images = torch.rand(1, 32, 32, 3)
with pytest.raises(
ValueError, match="png_compress_level must be an integer between 0 and 9"
):
validate_save_inputs(images, "PNG", 90, -1)
with pytest.raises(
ValueError, match="png_compress_level must be an integer between 0 and 9"
):
validate_save_inputs(images, "PNG", 90, 10)
def test_save_image_with_format_png(self):
"""Test saving with PNG format"""
with tempfile.NamedTemporaryFile(suffix=".png", delete=False) as temp_file:
temp_path = temp_file.name
try:
# Create test PIL image
img = Image.new("RGB", (32, 32), color="red")
# Save with PNG format
result = save_image_with_format(img, temp_path, "PNG", png_compress_level=8)
assert result["format"] == "PNG"
assert result["compress_level"] == 8
assert os.path.exists(temp_path)
# Verify saved image
saved_img = Image.open(temp_path)
assert saved_img.size == (32, 32)
finally:
if os.path.exists(temp_path):
os.unlink(temp_path)
def test_save_image_with_format_jpeg_rgba_conversion(self):
"""Test JPEG saving with RGBA to RGB conversion"""
with tempfile.NamedTemporaryFile(suffix=".jpg", delete=False) as temp_file:
temp_path = temp_file.name
try:
# Create RGBA image
img = Image.new("RGBA", (32, 32), color=(255, 0, 0, 128))
# Save as JPEG (should convert to RGB)
result = save_image_with_format(img, temp_path, "JPEG", quality=95)
assert result["format"] == "JPEG"
assert result["quality"] == 95
# Verify saved image is RGB
saved_img = Image.open(temp_path)
assert saved_img.mode == "RGB"
finally:
if os.path.exists(temp_path):
os.unlink(temp_path)
class TestKikoSaveImageNode:
"""Test KikoSaveImageNode class"""
def setup_method(self):
"""Setup test fixtures"""
self.node = KikoSaveImageNode()
def test_input_types(self):
"""Test INPUT_TYPES class method"""
input_types = KikoSaveImageNode.INPUT_TYPES()
# Check required inputs
required = input_types["required"]
assert "images" in required
assert "filename_prefix" in required
assert "format" in required
# Check format options
format_options = required["format"][0]
assert "PNG" in format_options
assert "JPEG" in format_options
assert "WEBP" in format_options
# Check optional inputs
optional = input_types["optional"]
assert "quality" in optional
assert "png_compress_level" in optional
assert "webp_lossless" in optional
assert "popup" in optional
# Check hidden inputs
hidden = input_types["hidden"]
assert "prompt" in hidden
assert "extra_pnginfo" in hidden
def test_node_attributes(self):
"""Test node class attributes"""
assert KikoSaveImageNode.RETURN_TYPES == ()
assert KikoSaveImageNode.FUNCTION == "save_images"
assert KikoSaveImageNode.OUTPUT_NODE is True
assert KikoSaveImageNode.CATEGORY == "ComfyAssets"
@patch("kikotools.tools.kiko_save_image.node.process_image_batch")
def test_save_images_success(self, mock_process):
"""Test successful image saving"""
# Setup mock - new return format (results, enhanced_data)
mock_results = [
{
"filename": "test_00001_00000.png",
"subfolder": "",
"type": "output",
}
]
mock_enhanced = [
{
"filename": "test_00001_00000.png",
"popup": True,
"type": "output",
"format": "PNG",
"file_size": 1024,
"dimensions": "64x64",
}
]
mock_process.return_value = (mock_results, mock_enhanced)
# Create test input
images = torch.rand(1, 64, 64, 3)
# Call save_images
result = self.node.save_images(
images=images,
filename_prefix="test",
format="PNG",
quality=90,
png_compress_level=4,
)
# Verify mock was called
mock_process.assert_called_once()
# Verify result format
assert "ui" in result
assert "images" in result["ui"]
assert "kiko_enhanced" in result["ui"]
assert result["ui"]["images"] == mock_results
assert result["ui"]["kiko_enhanced"] == mock_enhanced
def test_validate_inputs_success(self):
"""Test input validation with valid inputs"""
images = torch.rand(1, 32, 32, 3)
# Should not raise exception
self.node.validate_inputs(
images=images,
format="PNG",
quality=90,
png_compress_level=4,
webp_lossless=False,
popup=True,
)
def test_validate_inputs_invalid_webp_lossless(self):
"""Test validation with invalid webp_lossless type"""
images = torch.rand(1, 32, 32, 3)
with pytest.raises(ValueError, match="webp_lossless must be a boolean"):
self.node.validate_inputs(
images=images,
format="PNG",
quality=90,
png_compress_level=4,
webp_lossless="not_boolean",
popup=True,
)
def test_validate_inputs_invalid_popup(self):
"""Test validation with invalid popup"""
images = torch.rand(1, 32, 32, 3)
# Non-boolean popup
with pytest.raises(ValueError, match="popup must be a boolean"):
self.node.validate_inputs(
images=images,
format="PNG",
quality=90,
png_compress_level=4,
webp_lossless=False,
popup="not_boolean",
)
@patch("kikotools.tools.kiko_save_image.node.process_image_batch")
def test_save_images_error_handling(self, mock_process):
"""Test error handling in save_images method"""
# Setup mock to raise exception
mock_process.side_effect = Exception("Test error")
images = torch.rand(1, 32, 32, 3)
# Should handle error and re-raise with context
with pytest.raises(ValueError, match="Failed to save images"):
self.node.save_images(images=images)
def test_node_info(self):
"""Test get_node_info method"""
info = self.node.get_node_info()
assert info["class_name"] == "KikoSaveImageNode"
assert info["category"] == "ComfyAssets"
assert info["function"] == "save_images"
class TestNodeRegistration:
"""Test node registration mappings"""
def test_node_class_mappings(self):
"""Test NODE_CLASS_MAPPINGS contains KikoSaveImage"""
from kikotools.tools.kiko_save_image.node import NODE_CLASS_MAPPINGS
assert "KikoSaveImage" in NODE_CLASS_MAPPINGS
assert NODE_CLASS_MAPPINGS["KikoSaveImage"] is KikoSaveImageNode
def test_node_display_name_mappings(self):
"""Test NODE_DISPLAY_NAME_MAPPINGS contains KikoSaveImage"""
from kikotools.tools.kiko_save_image.node import NODE_DISPLAY_NAME_MAPPINGS
assert "KikoSaveImage" in NODE_DISPLAY_NAME_MAPPINGS
assert NODE_DISPLAY_NAME_MAPPINGS["KikoSaveImage"] == "Kiko Save Image"
# Integration test fixtures
@pytest.fixture
def sample_image_tensor():
"""Create sample image tensor for testing"""
# Create a colorful test image [batch, height, width, channels]
batch_size, height, width, channels = 2, 64, 64, 3
# Create gradient pattern
tensor = torch.zeros(batch_size, height, width, channels)
for b in range(batch_size):
for h in range(height):
for w in range(width):
# Create RGB gradient pattern
tensor[b, h, w, 0] = h / height # Red gradient
tensor[b, h, w, 1] = w / width # Green gradient
tensor[b, h, w, 2] = (b + 1) * 0.5 # Blue varies by batch
return tensor
class TestIntegration:
"""Integration tests using sample data"""
@patch("kikotools.tools.kiko_save_image.logic.folder_paths")
def test_full_pipeline_png(self, mock_folder_paths, sample_image_tensor):
"""Test complete pipeline with PNG format"""
with tempfile.TemporaryDirectory() as temp_dir:
mock_folder_paths.get_output_directory.return_value = temp_dir
node = KikoSaveImageNode()
# Save images
result = node.save_images(
images=sample_image_tensor,
filename_prefix="integration_test",
format="PNG",
png_compress_level=6,
)
# Verify result structure
assert "ui" in result
assert "images" in result["ui"]
assert len(result["ui"]["images"]) == 2
# Verify files were created
for image_info in result["ui"]["images"]:
filepath = os.path.join(temp_dir, image_info["filename"])
assert os.path.exists(filepath)
# Verify image properties
img = Image.open(filepath)
assert img.size == (64, 64)
assert img.format == "PNG"
@patch("kikotools.tools.kiko_save_image.logic.folder_paths")
def test_full_pipeline_all_formats(self, mock_folder_paths, sample_image_tensor):
"""Test complete pipeline with all supported formats"""
with tempfile.TemporaryDirectory() as temp_dir:
mock_folder_paths.get_output_directory.return_value = temp_dir
node = KikoSaveImageNode()
# Test each format
formats_to_test = [
("PNG", {"png_compress_level": 8}),
("JPEG", {"quality": 85}),
("WEBP", {"quality": 90, "webp_lossless": False}),
("WEBP", {"quality": 100, "webp_lossless": True}),
]
for format_type, kwargs in formats_to_test:
result = node.save_images(
images=sample_image_tensor,
filename_prefix=f"test_{format_type.lower()}",
format=format_type,
**kwargs,
)
# Verify results
assert len(result["ui"]["images"]) == 2
for image_info in result["ui"]["images"]:
assert image_info["format"] == format_type
# Verify file exists and can be opened
filepath = os.path.join(temp_dir, image_info["filename"])
assert os.path.exists(filepath)
img = Image.open(filepath)
assert img.size == (64, 64)
+3 -3
View File
@@ -168,17 +168,17 @@ class TestSamplerComboNode:
steps_input = required["steps"]
assert steps_input[0] == "INT"
assert steps_input[1]["min"] == 1
assert steps_input[1]["max"] == 1000
assert steps_input[1]["max"] == 100
# Check CFG input structure
cfg_input = required["cfg"]
assert cfg_input[0] == "FLOAT"
assert cfg_input[1]["min"] == 0.0
assert cfg_input[1]["max"] == 30.0
assert cfg_input[1]["max"] == 20.0
def test_return_types_structure(self):
"""Test that return types are correctly defined."""
assert SamplerComboNode.RETURN_TYPES == (SAMPLERS, SCHEDULERS, "INT", "FLOAT")
assert SamplerComboNode.RETURN_TYPES == ("SAMPLER", SCHEDULERS, "INT", "FLOAT")
assert SamplerComboNode.RETURN_NAMES == (
"sampler_name",
"scheduler",
+595
View File
@@ -0,0 +1,595 @@
import { app } from "../../../scripts/app.js";
import { ComfyWidgets } from "../../../scripts/widgets.js";
app.registerExtension({
name: "ComfyAssets.DisplayText",
async beforeRegisterNodeDef(nodeType, nodeData, app) {
if (nodeData.name === "DisplayText") {
const onExecuted = nodeType.prototype.onExecuted;
nodeType.prototype.onExecuted = function(message) {
onExecuted?.apply(this, arguments);
if (message?.text) {
// Create or update the text widget
this.updateTextDisplay(message.text[0]);
}
};
nodeType.prototype.updateTextDisplay = function(text) {
// Remove existing text widget if any
const existingWidget = this.widgets?.find(w => w.name === "displayed_text");
if (existingWidget) {
const index = this.widgets.indexOf(existingWidget);
this.widgets.splice(index, 1);
}
// Parse the text to detect positive/negative prompt format
function parsePrompts(text) {
const posMatch = text.match(/Positive prompt:\s*([\s\S]*?)(?=Negative prompt:|$)/i);
const negMatch = text.match(/Negative prompt:\s*([\s\S]*?)(?=\*\*|$)/i);
if (posMatch && negMatch) {
// Extract just the prompt content, stopping at the first ** marker
let positiveText = posMatch[1].trim();
let negativeText = negMatch[1].trim();
// Remove any trailing ** markers and everything after them
const posEndIndex = positiveText.indexOf('**');
if (posEndIndex > 0) {
positiveText = positiveText.substring(0, posEndIndex).trim();
}
const negEndIndex = negativeText.indexOf('**');
if (negEndIndex > 0) {
negativeText = negativeText.substring(0, negEndIndex).trim();
}
return {
type: 'prompts',
positive: positiveText,
negative: negativeText
};
}
return {
type: 'text',
content: text
};
}
const parsedContent = parsePrompts(text);
// Create custom widget for text display
const widget = {
type: "custom_text_display",
name: "displayed_text",
size: [this.size[0] - 20, this.size[1] - 60], // Adjust for node chrome
parsedContent: parsedContent,
scrollOffset: 0,
posScrollOffset: 0,
negScrollOffset: 0,
draw: function(ctx, node, widget_width, y, H) {
const margin = 10;
const padding = 10;
const lineHeight = 20;
const buttonHeight = 30;
const buttonWidth = 90;
// Use the actual widget height from node size
const availableHeight = node.size[1] - 60; // Account for node header and margins
this.size[1] = Math.max(100, availableHeight);
// Calculate available width for text
const availableWidth = widget_width - margin * 2 - padding * 2;
// Word wrap function with better performance
function wrapText(text, maxWidth) {
const words = text.split(' ');
const lines = [];
let currentLine = '';
ctx.font = "14px monospace";
for (const word of words) {
const testLine = currentLine + (currentLine ? ' ' : '') + word;
const metrics = ctx.measureText(testLine);
if (metrics.width > maxWidth && currentLine) {
lines.push(currentLine);
currentLine = word;
} else {
currentLine = testLine;
}
}
if (currentLine) {
lines.push(currentLine);
}
return lines.length > 0 ? lines : [''];
}
// Draw background
ctx.fillStyle = "#2a2a2a";
ctx.fillRect(margin, y, widget_width - margin * 2, this.size[1]);
// Draw border
ctx.strokeStyle = "#444";
ctx.strokeRect(margin, y, widget_width - margin * 2, this.size[1]);
if (this.parsedContent.type === 'prompts') {
// Simple split view for positive/negative prompts
const headerHeight = 25;
const buttonAreaHeight = buttonHeight + padding;
const totalTextHeight = this.size[1] - buttonAreaHeight;
const halfHeight = totalTextHeight / 2;
// Draw positive prompt header
ctx.fillStyle = "#3a3a3a";
ctx.fillRect(margin + 1, y + 1, widget_width - margin * 2 - 2, headerHeight);
ctx.fillStyle = "#8f8";
ctx.font = "12px sans-serif";
ctx.fillText("✓ Positive Prompt", margin + padding, y + headerHeight - 7);
// Positive prompt text area
const posTextY = y + headerHeight;
const posTextHeight = halfHeight - headerHeight;
ctx.fillStyle = "#1e1e1e";
ctx.fillRect(margin + 1, posTextY, widget_width - margin * 2 - 2, posTextHeight);
// Draw separator
const separatorY = y + halfHeight;
ctx.strokeStyle = "#555";
ctx.beginPath();
ctx.moveTo(margin, separatorY);
ctx.lineTo(widget_width - margin, separatorY);
ctx.stroke();
// Draw negative prompt header
ctx.fillStyle = "#3a3a3a";
ctx.fillRect(margin + 1, separatorY + 1, widget_width - margin * 2 - 2, headerHeight);
ctx.fillStyle = "#f88";
ctx.font = "12px sans-serif";
ctx.fillText("✗ Negative Prompt", margin + padding, separatorY + headerHeight - 7);
// Negative prompt text area
const negTextY = separatorY + headerHeight;
const negTextHeight = halfHeight - headerHeight;
ctx.fillStyle = "#1e1e1e";
ctx.fillRect(margin + 1, negTextY, widget_width - margin * 2 - 2, negTextHeight);
// Draw text for both sections
ctx.font = "14px monospace";
ctx.fillStyle = "#ddd";
// Wrap text for both prompts
const posLines = [];
const posParagraphs = this.parsedContent.positive.split('\n');
for (const para of posParagraphs) {
if (para.trim() === '') {
posLines.push('');
} else {
posLines.push(...wrapText(para, availableWidth - 10));
}
}
const negLines = [];
const negParagraphs = this.parsedContent.negative.split('\n');
for (const para of negParagraphs) {
if (para.trim() === '') {
negLines.push('');
} else {
negLines.push(...wrapText(para, availableWidth - 10));
}
}
// Draw positive prompt text with clipping
ctx.save();
ctx.beginPath();
ctx.rect(margin + padding, posTextY + padding, availableWidth - 10, posTextHeight - padding * 2);
ctx.clip();
let currentY = posTextY + padding + lineHeight - 5;
const posVisibleLines = Math.floor((posTextHeight - padding * 2) / lineHeight);
const posStartLine = Math.floor(this.posScrollOffset);
const posEndLine = Math.min(posStartLine + posVisibleLines, posLines.length);
for (let i = posStartLine; i < posEndLine; i++) {
ctx.fillText(posLines[i], margin + padding, currentY);
currentY += lineHeight;
}
ctx.restore();
// Draw positive scroll indicator if needed
if (posLines.length > posVisibleLines) {
const scrollBarWidth = 6;
const scrollBarX = widget_width - margin - scrollBarWidth - 2;
const scrollBarHeight = posTextHeight - padding * 2;
const maxScroll = posLines.length - posVisibleLines;
const scrollRatio = this.posScrollOffset / maxScroll;
const thumbHeight = Math.max(20, (posVisibleLines / posLines.length) * scrollBarHeight);
const thumbY = posTextY + padding + scrollRatio * (scrollBarHeight - thumbHeight);
ctx.fillStyle = "#333";
ctx.fillRect(scrollBarX, posTextY + padding, scrollBarWidth, scrollBarHeight);
ctx.fillStyle = "#666";
ctx.fillRect(scrollBarX, thumbY, scrollBarWidth, thumbHeight);
}
// Draw negative prompt text with clipping
ctx.save();
ctx.beginPath();
ctx.rect(margin + padding, negTextY + padding, availableWidth - 10, negTextHeight - padding * 2);
ctx.clip();
ctx.fillStyle = "#ddd";
currentY = negTextY + padding + lineHeight - 5;
const negVisibleLines = Math.floor((negTextHeight - padding * 2) / lineHeight);
const negStartLine = Math.floor(this.negScrollOffset);
const negEndLine = Math.min(negStartLine + negVisibleLines, negLines.length);
for (let i = negStartLine; i < negEndLine; i++) {
ctx.fillText(negLines[i], margin + padding, currentY);
currentY += lineHeight;
}
ctx.restore();
// Draw negative scroll indicator if needed
if (negLines.length > negVisibleLines) {
const scrollBarWidth = 6;
const scrollBarX = widget_width - margin - scrollBarWidth - 2;
const scrollBarHeight = negTextHeight - padding * 2;
const maxScroll = negLines.length - negVisibleLines;
const scrollRatio = this.negScrollOffset / maxScroll;
const thumbHeight = Math.max(20, (negVisibleLines / negLines.length) * scrollBarHeight);
const thumbY = negTextY + padding + scrollRatio * (scrollBarHeight - thumbHeight);
ctx.fillStyle = "#333";
ctx.fillRect(scrollBarX, negTextY + padding, scrollBarWidth, scrollBarHeight);
ctx.fillStyle = "#666";
ctx.fillRect(scrollBarX, thumbY, scrollBarWidth, thumbHeight);
}
// Draw copy buttons
const buttonY = y + this.size[1] - buttonHeight - padding / 2;
const halfWidth = (widget_width - margin * 2) / 2;
// Positive copy button
const posButtonX = margin + halfWidth / 2 - buttonWidth / 2;
ctx.fillStyle = this.posCopyHovered ? "#5a5a5a" : "#4a4a4a";
ctx.fillRect(posButtonX, buttonY, buttonWidth, buttonHeight);
ctx.strokeStyle = "#666";
ctx.strokeRect(posButtonX, buttonY, buttonWidth, buttonHeight);
ctx.fillStyle = "#fff";
ctx.font = "12px sans-serif";
ctx.textAlign = "center";
ctx.textBaseline = "middle";
ctx.fillText(this.posCopySuccess ? "✓ Copied!" : "📋 Positive", posButtonX + buttonWidth/2, buttonY + buttonHeight/2);
// Negative copy button
const negButtonX = margin + halfWidth + halfWidth / 2 - buttonWidth / 2;
ctx.fillStyle = this.negCopyHovered ? "#5a5a5a" : "#4a4a4a";
ctx.fillRect(negButtonX, buttonY, buttonWidth, buttonHeight);
ctx.strokeStyle = "#666";
ctx.strokeRect(negButtonX, buttonY, buttonWidth, buttonHeight);
// Ensure text color and alignment are set
ctx.fillStyle = "#fff";
ctx.font = "12px sans-serif";
ctx.textAlign = "center";
ctx.textBaseline = "middle";
ctx.fillText(this.negCopySuccess ? "✓ Copied!" : "📋 Negative", negButtonX + buttonWidth/2, buttonY + buttonHeight/2);
ctx.textAlign = "left";
ctx.textBaseline = "alphabetic";
} else {
// Regular text display
const textAreaHeight = this.size[1] - buttonHeight - padding;
// Draw text area background
ctx.fillStyle = "#1e1e1e";
ctx.fillRect(margin + 1, y + 1, widget_width - margin * 2 - 2, textAreaHeight);
// Process text
ctx.font = "14px monospace";
const paragraphs = this.parsedContent.content.split('\n');
const allLines = [];
for (const paragraph of paragraphs) {
if (paragraph.trim() === '') {
allLines.push('');
} else {
const wrappedLines = wrapText(paragraph, availableWidth);
allLines.push(...wrappedLines);
}
}
// Draw text with clipping
ctx.save();
ctx.beginPath();
ctx.rect(margin + padding, y + padding, availableWidth, textAreaHeight - padding * 2);
ctx.clip();
const visibleLines = Math.floor((textAreaHeight - padding * 2) / lineHeight);
const maxScroll = Math.max(0, allLines.length - visibleLines);
this.scrollOffset = Math.max(0, Math.min(this.scrollOffset, maxScroll));
ctx.fillStyle = "#ddd";
let currentY = y + padding + lineHeight - 5 - (this.scrollOffset * lineHeight);
for (let i = 0; i < allLines.length; i++) {
if (currentY > y && currentY < y + textAreaHeight) {
ctx.fillText(allLines[i], margin + padding, currentY);
}
currentY += lineHeight;
}
ctx.restore();
// Draw scroll indicator if needed
if (allLines.length > visibleLines) {
const scrollBarWidth = 6;
const scrollBarX = widget_width - margin - scrollBarWidth - 2;
const scrollBarHeight = textAreaHeight - 4;
const thumbHeight = Math.max(20, (visibleLines / allLines.length) * scrollBarHeight);
const thumbY = y + 2 + (this.scrollOffset / maxScroll) * (scrollBarHeight - thumbHeight);
ctx.fillStyle = "#333";
ctx.fillRect(scrollBarX, y + 2, scrollBarWidth, scrollBarHeight);
ctx.fillStyle = "#666";
ctx.fillRect(scrollBarX, thumbY, scrollBarWidth, thumbHeight);
}
// Draw copy button
const buttonX = widget_width - margin - buttonWidth - padding;
const buttonY = y + textAreaHeight + padding / 2;
ctx.fillStyle = this.copyButtonHovered ? "#5a5a5a" : "#4a4a4a";
ctx.fillRect(buttonX, buttonY, buttonWidth, buttonHeight);
ctx.strokeStyle = "#666";
ctx.strokeRect(buttonX, buttonY, buttonWidth, buttonHeight);
ctx.fillStyle = "#fff";
ctx.font = "12px sans-serif";
ctx.textAlign = "center";
ctx.textBaseline = "middle";
ctx.fillText(this.copySuccess ? "✓ Copied!" : "📋 Copy", buttonX + buttonWidth/2, buttonY + buttonHeight/2);
ctx.textAlign = "left";
ctx.textBaseline = "alphabetic";
}
return this.size[1];
},
mouse: function(event, pos, node) {
const margin = 10;
const padding = 10;
const buttonWidth = 90;
const buttonHeight = 30;
const lineHeight = 20;
// Check if mouse is over the widget
const isOver = pos[1] > this.last_y && pos[1] < this.last_y + this.size[1];
if (!isOver) return false;
if (this.parsedContent.type === 'prompts') {
// Handle split view
const headerHeight = 25;
const buttonAreaHeight = buttonHeight + padding;
const totalTextHeight = this.size[1] - buttonAreaHeight;
const halfHeight = totalTextHeight / 2;
const posTextY = this.last_y + headerHeight;
const posTextHeight = halfHeight - headerHeight;
const negTextY = this.last_y + halfHeight + headerHeight;
const negTextHeight = halfHeight - headerHeight;
const buttonY = this.last_y + this.size[1] - buttonHeight - padding / 2;
const halfWidth = (node.size[0] - margin * 2) / 2;
// Check which section for scrolling
const inPosSection = pos[1] > posTextY && pos[1] < posTextY + posTextHeight;
const inNegSection = pos[1] > negTextY && pos[1] < negTextY + negTextHeight;
// Handle scrolling
if (event.type === "wheel") {
if (inPosSection) {
const delta = event.deltaY > 0 ? 1 : -1;
this.posScrollOffset = (this.posScrollOffset || 0) + delta;
// Calculate max scroll
const visibleLines = Math.floor((posTextHeight - padding * 2) / lineHeight);
const totalLines = this.parsedContent.positive.split('\n').length * 2; // Estimate
const maxScroll = Math.max(0, totalLines - visibleLines);
this.posScrollOffset = Math.max(0, Math.min(this.posScrollOffset, maxScroll));
node.setDirtyCanvas(true);
return true;
} else if (inNegSection) {
const delta = event.deltaY > 0 ? 1 : -1;
this.negScrollOffset = (this.negScrollOffset || 0) + delta;
// Calculate max scroll
const visibleLines = Math.floor((negTextHeight - padding * 2) / lineHeight);
const totalLines = this.parsedContent.negative.split('\n').length * 2; // Estimate
const maxScroll = Math.max(0, totalLines - visibleLines);
this.negScrollOffset = Math.max(0, Math.min(this.negScrollOffset, maxScroll));
node.setDirtyCanvas(true);
return true;
}
}
// Check button hovers
const posButtonX = margin + halfWidth / 2 - buttonWidth / 2;
const negButtonX = margin + halfWidth + halfWidth / 2 - buttonWidth / 2;
const oldPosHover = this.posCopyHovered;
const oldNegHover = this.negCopyHovered;
this.posCopyHovered = pos[0] > posButtonX && pos[0] < posButtonX + buttonWidth &&
pos[1] > buttonY && pos[1] < buttonY + buttonHeight;
this.negCopyHovered = pos[0] > negButtonX && pos[0] < negButtonX + buttonWidth &&
pos[1] > buttonY && pos[1] < buttonY + buttonHeight;
if (oldPosHover !== this.posCopyHovered || oldNegHover !== this.negCopyHovered) {
node.setDirtyCanvas(true);
}
// Handle button clicks
if (event.type === "pointerdown") {
if (this.posCopyHovered) {
this.copyToClipboard(this.parsedContent.positive, 'positive');
return true;
} else if (this.negCopyHovered) {
this.copyToClipboard(this.parsedContent.negative, 'negative');
return true;
}
}
} else {
// Regular text handling
const textAreaHeight = this.size[1] - buttonHeight - padding;
const buttonX = node.size[0] - margin - buttonWidth - padding;
const buttonY = this.last_y + textAreaHeight + padding / 2;
// Handle scrolling
if (event.type === "wheel" && pos[1] < this.last_y + textAreaHeight) {
const delta = event.deltaY > 0 ? 1 : -1;
this.scrollOffset = (this.scrollOffset || 0) + delta;
const visibleLines = Math.floor((textAreaHeight - padding * 2) / lineHeight);
const totalLines = this.parsedContent.content.split('\n').length * 2; // Estimate
const maxScroll = Math.max(0, totalLines - visibleLines);
this.scrollOffset = Math.max(0, Math.min(this.scrollOffset, maxScroll));
node.setDirtyCanvas(true);
return true;
}
// Check button hover
const oldHover = this.copyButtonHovered;
this.copyButtonHovered = pos[0] > buttonX && pos[0] < buttonX + buttonWidth &&
pos[1] > buttonY && pos[1] < buttonY + buttonHeight;
if (oldHover !== this.copyButtonHovered) {
node.setDirtyCanvas(true);
}
// Handle button click
if (event.type === "pointerdown" && this.copyButtonHovered) {
this.copyToClipboard(this.parsedContent.content, 'regular');
return true;
}
}
return false;
},
copyToClipboard: function(text, type) {
const node = this._node;
navigator.clipboard.writeText(text).then(() => {
if (type === 'positive') {
this.posCopySuccess = true;
} else if (type === 'negative') {
this.negCopySuccess = true;
} else {
this.copySuccess = true;
}
node.setDirtyCanvas(true);
setTimeout(() => {
this.posCopySuccess = false;
this.negCopySuccess = false;
this.copySuccess = false;
node.setDirtyCanvas(true);
}, 1500);
}).catch(err => {
console.error('Failed to copy:', err);
// Fallback copy method
const textArea = document.createElement("textarea");
textArea.value = text;
textArea.style.position = "fixed";
textArea.style.opacity = "0";
document.body.appendChild(textArea);
textArea.select();
try {
document.execCommand('copy');
if (type === 'positive') {
this.posCopySuccess = true;
} else if (type === 'negative') {
this.negCopySuccess = true;
} else {
this.copySuccess = true;
}
node.setDirtyCanvas(true);
setTimeout(() => {
this.posCopySuccess = false;
this.negCopySuccess = false;
this.copySuccess = false;
node.setDirtyCanvas(true);
}, 1500);
} catch (err) {
console.error('Fallback copy failed:', err);
}
document.body.removeChild(textArea);
});
},
computeSize: function(width) {
return [width, this.size[1]];
}
};
// Store reference to node for callbacks
widget._node = this;
// Store the last y position for mouse detection
const originalDraw = widget.draw;
widget.draw = function(ctx, node, widget_width, y, H) {
this.last_y = y;
return originalDraw.call(this, ctx, node, widget_width, y, H);
};
// Add the widget
if (!this.widgets) {
this.widgets = [];
}
this.widgets.push(widget);
// Adjust node size to accommodate the widget
this.computeSize();
};
// Handle node resizing
const onResize = nodeType.prototype.onResize;
nodeType.prototype.onResize = function(size) {
onResize?.apply(this, arguments);
// Update widget size when node is resized
const textWidget = this.widgets?.find(w => w.name === "displayed_text");
if (textWidget) {
textWidget.size[0] = size[0] - 20;
textWidget.size[1] = size[1] - 60;
this.setDirtyCanvas(true);
}
};
// Initialize on node creation
const onNodeCreated = nodeType.prototype.onNodeCreated;
nodeType.prototype.onNodeCreated = function() {
onNodeCreated?.apply(this, arguments);
// Set default size
this.size[0] = Math.max(this.size[0], 350);
this.size[1] = Math.max(this.size[1], 300);
// Add placeholder text
this.updateTextDisplay("Text will appear here after execution...");
};
}
}
});
+393
View File
@@ -0,0 +1,393 @@
// ComfyUI-KikoTools - Empty Latent Batch with Swap Button
import { app } from "../../scripts/app.js";
app.registerExtension({
name: "comfyassets.EmptyLatentBatch",
async beforeRegisterNodeDef(nodeType, nodeData, _app) {
if (nodeData.name === "EmptyLatentBatch") {
const onNodeCreated = nodeType.prototype.onNodeCreated;
nodeType.prototype.onNodeCreated = function () {
if (onNodeCreated) onNodeCreated.apply(this, []);
// Track button click state for visual feedback
this.swapButtonPressed = false;
// Helper function to extract resolution from formatted preset string
this.extractResolutionFromPreset = function (presetValue) {
if (presetValue === "custom") return null;
// If it contains formatting metadata, extract the resolution part
if (presetValue.includes(" - ")) {
// Format is: "1024×1024 - 1:1 (1.0MP) - SDXL"
return presetValue.split(" - ")[0];
}
// Otherwise assume it's already a raw resolution
return presetValue;
};
// Override preset callback to update width/height widgets when preset changes
const presetWidget = this.widgets.find((w) => w.name === "preset");
if (presetWidget) {
const originalCallback = presetWidget.callback;
presetWidget.callback = function (
value,
graphcanvas,
node,
pos,
event,
) {
// Call original callback first
if (originalCallback) {
originalCallback.call(this, value, graphcanvas, node, pos, event);
}
// Update width/height widgets based on preset
const widthWidget = node.widgets.find((w) => w.name === "width");
const heightWidget = node.widgets.find((w) => w.name === "height");
if (widthWidget && heightWidget && value !== "custom") {
// Extract raw resolution from formatted preset
const rawResolution = node.extractResolutionFromPreset(value);
// Define all available presets from our preset system
const presetDimensions = {
// SDXL Presets
"1024×1024": [1024, 1024],
"896×1152": [896, 1152],
"832×1216": [832, 1216],
"768×1344": [768, 1344],
"640×1536": [640, 1536],
"1152×896": [1152, 896],
"1216×832": [1216, 832],
"1344×768": [1344, 768],
"1536×640": [1536, 640],
// FLUX Presets
"1920×1080": [1920, 1080],
"1536×1536": [1536, 1536],
"1280×768": [1280, 768],
"768×1280": [768, 1280],
"1440×1080": [1440, 1080],
"1080×1440": [1080, 1440],
"1728×1152": [1728, 1152],
"1152×1728": [1152, 1728],
// Ultra-Wide Presets
"2560×1080": [2560, 1080],
"2048×768": [2048, 768],
"1792×768": [1792, 768],
"2304×768": [2304, 768],
"1080×2560": [1080, 2560],
"768×2048": [768, 2048],
"768×1792": [768, 1792],
"768×2304": [768, 2304],
};
if (rawResolution && presetDimensions[rawResolution]) {
const [w, h] = presetDimensions[rawResolution];
widthWidget.value = w;
heightWidget.value = h;
// Trigger widget callbacks to update the UI
if (widthWidget.callback) {
widthWidget.callback(w, graphcanvas, node, pos, event);
}
if (heightWidget.callback) {
heightWidget.callback(h, graphcanvas, node, pos, event);
}
}
}
};
}
// Add swap functionality
this.swapDimensions = function () {
const widthWidget = this.widgets.find((w) => w.name === "width");
const heightWidget = this.widgets.find((w) => w.name === "height");
const presetWidget = this.widgets.find((w) => w.name === "preset");
if (widthWidget && heightWidget && presetWidget) {
// Handle preset swapping first
if (presetWidget.value !== "custom") {
const currentPreset = presetWidget.value;
// Extract raw resolution from formatted preset
const rawResolution =
this.extractResolutionFromPreset(currentPreset);
if (!rawResolution) return;
// Parse current preset dimensions (handle both × and x separators)
let w, h;
if (rawResolution.includes("×")) {
[w, h] = rawResolution.split("×").map((v) => parseInt(v));
} else if (rawResolution.includes("x")) {
[w, h] = rawResolution.split("x").map((v) => parseInt(v));
} else {
return; // Invalid preset format
}
const swappedRawPreset = `${h}×${w}`;
// Find the formatted version of the swapped preset from available options
const availablePresets =
presetWidget.options.values || presetWidget.options;
let swappedFormattedPreset = null;
for (const option of availablePresets) {
if (option === "custom") continue;
const extractedRes = this.extractResolutionFromPreset(option);
if (extractedRes === swappedRawPreset) {
swappedFormattedPreset = option;
break;
}
}
if (swappedFormattedPreset) {
// Swapped preset exists, use the formatted version
presetWidget.value = swappedFormattedPreset;
widthWidget.value = h;
heightWidget.value = w;
if (presetWidget.callback) {
presetWidget.callback(
swappedFormattedPreset,
this,
presetWidget,
);
}
if (widthWidget.callback) {
widthWidget.callback(h, this, widthWidget);
}
if (heightWidget.callback) {
heightWidget.callback(w, this, heightWidget);
}
} else {
// Swapped preset doesn't exist, switch to custom and swap manual values
presetWidget.value = "custom";
widthWidget.value = h;
heightWidget.value = w;
if (presetWidget.callback) {
presetWidget.callback("custom", this, presetWidget);
}
if (widthWidget.callback) {
widthWidget.callback(h, this, widthWidget);
}
if (heightWidget.callback) {
heightWidget.callback(w, this, heightWidget);
}
}
} else {
// Custom preset - just swap the width and height values
const tempWidth = widthWidget.value;
widthWidget.value = heightWidget.value;
heightWidget.value = tempWidth;
// Trigger widget change events
if (widthWidget.callback) {
widthWidget.callback(widthWidget.value, this, widthWidget);
}
if (heightWidget.callback) {
heightWidget.callback(heightWidget.value, this, heightWidget);
}
}
// Mark the graph as changed
this.graph?.setDirtyCanvas(true, true);
}
};
// Override onResize to refresh button position
const originalOnResize = this.onResize;
this.onResize = function (size) {
if (originalOnResize) {
originalOnResize.call(this, size);
}
// Force redraw to update button position
this.setDirtyCanvas(true, true);
// Also mark the graph as dirty
if (this.graph) {
this.graph.setDirtyCanvas(true, true);
}
};
// Override onBounding to ensure proper updates
const originalOnBounding = this.onBounding;
this.onBounding = function (out) {
if (originalOnBounding) {
originalOnBounding.call(this, out);
}
// Force redraw when bounds change
this.setDirtyCanvas(true, true);
};
};
const onDrawForeground = nodeType.prototype.onDrawForeground;
nodeType.prototype.onDrawForeground = function (ctx) {
if (onDrawForeground) {
onDrawForeground.apply(this, arguments);
}
if (this.flags.collapsed) return;
// Draw swap button with consistent spacing from widgets
const swapButtonSize = 24;
const margin = 6;
const swapButtonX = this.size[0] - swapButtonSize - margin;
// Calculate button position based on widget spacing rather than bottom margin
// Estimate widget area height and add consistent spacing
const estimatedWidgetHeight = 90; // Approximate height for 3 widgets
const topMargin = 35; // Space from top to first widget
const buttonSpacing = 40; // Space between last widget and button (moved down 5)
const swapButtonY = topMargin + estimatedWidgetHeight + buttonSpacing;
// Button background - change color based on pressed state
if (this.swapButtonPressed) {
// Darker when pressed
ctx.fillStyle = "rgba(30, 120, 200, 0.9)"; // Darker blue when clicked
} else {
// Normal state
ctx.fillStyle = "rgba(66, 165, 245, 0.8)"; // Material blue
}
ctx.beginPath();
ctx.roundRect(
swapButtonX,
swapButtonY,
swapButtonSize,
swapButtonSize,
4,
);
ctx.fill();
// Button border with subtle highlight
ctx.strokeStyle = this.swapButtonPressed
? "rgba(20, 100, 180, 1.0)"
: "rgba(33, 150, 243, 0.9)";
ctx.lineWidth = 1;
ctx.stroke();
// Draw swap icon - modern double arrow design
ctx.strokeStyle = "rgba(255, 255, 255, 0.95)";
ctx.lineWidth = 2;
ctx.lineCap = "round";
const centerX = swapButtonX + 12;
const centerY = swapButtonY + 12;
// Top arrow (pointing right) - width to height
ctx.beginPath();
ctx.moveTo(centerX - 7, centerY - 3);
ctx.lineTo(centerX + 5, centerY - 3);
ctx.stroke();
// Top arrow head
ctx.beginPath();
ctx.moveTo(centerX + 5, centerY - 3);
ctx.lineTo(centerX + 2, centerY - 5);
ctx.moveTo(centerX + 5, centerY - 3);
ctx.lineTo(centerX + 2, centerY - 1);
ctx.stroke();
// Bottom arrow (pointing left) - height to width
ctx.beginPath();
ctx.moveTo(centerX + 5, centerY + 3);
ctx.lineTo(centerX - 7, centerY + 3);
ctx.stroke();
// Bottom arrow head
ctx.beginPath();
ctx.moveTo(centerX - 7, centerY + 3);
ctx.lineTo(centerX - 4, centerY + 1);
ctx.moveTo(centerX - 7, centerY + 3);
ctx.lineTo(centerX - 4, centerY + 5);
ctx.stroke();
};
const onMouseDown = nodeType.prototype.onMouseDown;
nodeType.prototype.onMouseDown = function (e) {
// Check if click is on swap button
const swapButtonSize = 24;
const margin = 6;
const swapButtonX =
this.pos[0] + this.size[0] - swapButtonSize - margin;
// Use same positioning logic as drawing
const estimatedWidgetHeight = 90;
const topMargin = 35;
const buttonSpacing = 40;
const swapButtonY =
this.pos[1] + topMargin + estimatedWidgetHeight + buttonSpacing;
if (
e.canvasX >= swapButtonX &&
e.canvasX <= swapButtonX + swapButtonSize &&
e.canvasY >= swapButtonY &&
e.canvasY <= swapButtonY + swapButtonSize
) {
// Visual feedback - set button as pressed
this.swapButtonPressed = true;
this.setDirtyCanvas(true, true);
// Execute swap
this.swapDimensions();
// Reset button state after a short delay for visual feedback
setTimeout(() => {
this.swapButtonPressed = false;
this.setDirtyCanvas(true, true);
}, 150);
return true; // Consume the event
}
// Call original onMouseDown if not clicking swap button
if (onMouseDown) {
return onMouseDown.apply(this, arguments);
}
};
// Optional: Add hover effect for better user feedback
const onMouseMove = nodeType.prototype.onMouseMove;
nodeType.prototype.onMouseMove = function (e) {
// Check if hovering over swap button
const swapButtonSize = 24;
const margin = 6;
const swapButtonX =
this.pos[0] + this.size[0] - swapButtonSize - margin;
// Use same positioning logic as drawing
const estimatedWidgetHeight = 90;
const topMargin = 35;
const buttonSpacing = 40;
const swapButtonY =
this.pos[1] + topMargin + estimatedWidgetHeight + buttonSpacing;
const isHovering =
e.canvasX >= swapButtonX &&
e.canvasX <= swapButtonX + swapButtonSize &&
e.canvasY >= swapButtonY &&
e.canvasY <= swapButtonY + swapButtonSize;
// Update cursor style for better UX (safely)
if (
isHovering &&
this.graph &&
this.graph.canvas &&
this.graph.canvas.canvas
) {
this.graph.canvas.canvas.style.cursor = "pointer";
} else if (
this.graph &&
this.graph.canvas &&
this.graph.canvas.canvas
) {
this.graph.canvas.canvas.style.cursor = "default";
}
// Call original onMouseMove
if (onMouseMove) {
return onMouseMove.apply(this, arguments);
}
};
}
},
});
+204
View File
@@ -0,0 +1,204 @@
import { app } from "../../../scripts/app.js";
import { api } from "../../../scripts/api.js";
app.registerExtension({
name: "ComfyAssets.GeminiPrompt",
async beforeRegisterNodeDef(nodeType, nodeData, app) {
if (nodeData.name === "GeminiPrompt") {
// Add visual enhancements to the node
const onNodeCreated = nodeType.prototype.onNodeCreated;
nodeType.prototype.onNodeCreated = function() {
const result = onNodeCreated?.apply(this, arguments);
// Store reference to widgets
this.promptTypeWidget = this.widgets.find(w => w.name === "prompt_type");
this.modelWidget = this.widgets.find(w => w.name === "model");
this.apiKeyWidget = this.widgets.find(w => w.name === "api_key");
this.customPromptWidget = this.widgets.find(w => w.name === "custom_prompt");
// Add helper text button
const helpButton = this.addWidget("button", "Help / API Setup", null, () => {
this.showHelpDialog();
});
// Style the button
helpButton.serialize = false;
// Add refresh models button
const refreshButton = this.addWidget("button", "Refresh Model List", null, () => {
this.refreshModelList();
});
refreshButton.serialize = false;
// Add status indicator
this.status = this.addWidget("text", "status", "Ready", () => {}, {
serialize: false
});
this.status.disabled = true;
// Update custom prompt visibility based on selection
if (this.promptTypeWidget && this.customPromptWidget) {
const originalCallback = this.promptTypeWidget.callback;
this.promptTypeWidget.callback = (value) => {
if (originalCallback) originalCallback.call(this.promptTypeWidget, value);
this.updateCustomPromptVisibility();
};
}
return result;
};
// Add method to show help dialog
nodeType.prototype.showHelpDialog = function() {
const helpContent = `
<div style="padding: 20px; max-width: 600px;">
<h2>Gemini Prompt Engineer Setup</h2>
<h3>1. Get API Key</h3>
<p>Get your free API key from: <a href="https://makersuite.google.com/app/apikey" target="_blank">Google AI Studio</a></p>
<h3>2. Set API Key</h3>
<p>Choose one of these methods:</p>
<ul>
<li><strong>Environment Variable:</strong> Set GEMINI_API_KEY in your system</li>
<li><strong>Config File:</strong> Create gemini_config.json in ComfyUI root with {"api_key": "your-key"}</li>
<li><strong>Node Input:</strong> Enter directly in the api_key field</li>
</ul>
<h3>3. Install Dependencies</h3>
<code>pip install google-generativeai</code>
<h3>Prompt Types</h3>
<ul>
<li><strong>FLUX:</strong> Detailed artistic prompts with quality markers</li>
<li><strong>SDXL:</strong> Positive/negative prompt pairs with weights</li>
<li><strong>Danbooru:</strong> Anime-style booru tags</li>
<li><strong>Video:</strong> Motion and temporal descriptions</li>
</ul>
<h3>Gemini Models</h3>
<ul>
<li><strong>gemini-1.5-flash:</strong> Fast and efficient (recommended for most uses)</li>
<li><strong>gemini-1.5-flash-8b:</strong> Smaller and faster, good for simple prompts</li>
<li><strong>gemini-1.5-pro:</strong> Most capable, best quality results</li>
<li><strong>gemini-1.0-pro:</strong> Previous generation, stable option</li>
</ul>
<h3>Custom Prompts</h3>
<p>You can override any template by entering your own system prompt in the custom_prompt field.</p>
</div>
`;
app.ui.dialog.show(helpContent);
};
// Add method to update custom prompt visibility
nodeType.prototype.updateCustomPromptVisibility = function() {
// You could implement logic here to show/hide custom prompt based on selection
// For now, it's always visible but this method provides extensibility
};
// Add method to refresh model list
nodeType.prototype.refreshModelList = function() {
if (this.status) {
this.status.value = "Refreshing models...";
}
// Set the refresh_models flag
const refreshWidget = this.widgets.find(w => w.name === "refresh_models");
if (refreshWidget) {
refreshWidget.value = true;
}
// Show message
alert("Model list will refresh on next execution. Make sure API key is set and run the node.");
if (this.status) {
setTimeout(() => {
this.status.value = "Ready - Run node to refresh";
}, 2000);
}
};
// Override execute to show status
const onExecute = nodeType.prototype.onExecute;
nodeType.prototype.onExecute = function() {
if (this.status) {
this.status.value = "Processing...";
}
const result = onExecute?.apply(this, arguments);
return result;
};
// Handle execution feedback
const onExecuted = nodeType.prototype.onExecuted;
nodeType.prototype.onExecuted = function(message) {
const result = onExecuted?.apply(this, arguments);
if (this.status) {
// Check if there was an error in the output
const outputs = message.output;
if (outputs && outputs.prompt && outputs.prompt[0] && outputs.prompt[0].startsWith("Error:")) {
this.status.value = "Error - Check output";
this.bgcolor = "#552222";
} else {
this.status.value = "Success!";
this.bgcolor = "#225522";
}
// Reset color after delay
setTimeout(() => {
this.bgcolor = "";
if (this.status) {
this.status.value = "Ready";
}
}, 3000);
}
return result;
};
}
},
// Add custom styling
async setup() {
const style = document.createElement("style");
style.textContent = `
.gemini-prompt-help {
background: #1a1a1a;
border: 1px solid #444;
border-radius: 8px;
color: #fff;
}
.gemini-prompt-help h2 {
color: #4285f4;
margin-top: 0;
}
.gemini-prompt-help h3 {
color: #8ab4f8;
margin-top: 20px;
}
.gemini-prompt-help code {
background: #333;
padding: 2px 6px;
border-radius: 4px;
font-family: monospace;
}
.gemini-prompt-help a {
color: #8ab4f8;
text-decoration: none;
}
.gemini-prompt-help a:hover {
text-decoration: underline;
}
`;
document.head.appendChild(style);
}
});
File diff suppressed because it is too large Load Diff
+25 -25
View File
@@ -22,11 +22,11 @@ app.registerExtension({
this.seedHistory = this.loadSeedHistory();
this.hideTimer = null;
this.mouseOverHistory = false;
// Register this node in global registry
window.seedHistoryNodes = window.seedHistoryNodes || [];
window.seedHistoryNodes.push(this);
// Create UI container
const uiContainer = document.createElement("div");
uiContainer.style.padding = "8px";
@@ -62,14 +62,14 @@ app.registerExtension({
setTimeout(() => {
this.setupSeedWidgetCallbacks();
}, 100);
// Hook directly into widget value changes
const originalOnWidgetChange = this.onWidgetChange;
this.onWidgetChange = function(name, value, oldValue, widget) {
if (name === "seed" && value !== oldValue) {
this.addSeedToHistory(value);
}
if (originalOnWidgetChange) {
return originalOnWidgetChange.call(this, name, value, oldValue, widget);
}
@@ -105,12 +105,12 @@ app.registerExtension({
clearInterval(this.seedValueWatcher);
this.seedValueWatcher = null;
}
// Clean up deduplication tracking
if (this.lastAddedSeed) {
this.lastAddedSeed = null;
}
// Remove from global registry
if (window.seedHistoryNodes) {
const index = window.seedHistoryNodes.indexOf(this);
@@ -118,7 +118,7 @@ app.registerExtension({
window.seedHistoryNodes.splice(index, 1);
}
}
if (originalOnRemoved) {
originalOnRemoved.call(this);
}
@@ -220,7 +220,7 @@ app.registerExtension({
this.mouseOverHistory = true;
this.cancelAutoHide();
});
historyDiv.addEventListener("mouseleave", () => {
this.mouseOverHistory = false;
this.startAutoHide();
@@ -257,38 +257,38 @@ app.registerExtension({
const numSeed = typeof seed === 'string' ? parseInt(seed) : seed;
const now = Date.now();
// Deduplication: prevent adding the same seed within 500ms window
if (!this.lastAddedSeed) {
this.lastAddedSeed = { seed: null, timestamp: 0 };
}
const timeSinceLastAdd = now - this.lastAddedSeed.timestamp;
const isSameSeed = this.lastAddedSeed.seed === numSeed;
const isWithinDupeWindow = timeSinceLastAdd < 500; // 500ms window
if (isSameSeed && isWithinDupeWindow) {
return;
}
// Update deduplication tracking
this.lastAddedSeed = { seed: numSeed, timestamp: now };
// Remove if already exists in history
this.seedHistory = this.seedHistory.filter(item => item.seed !== numSeed);
// Add to front
this.seedHistory.unshift({
seed: numSeed,
timestamp: now,
dateString: new Date().toLocaleString()
});
// Keep only last 10
if (this.seedHistory.length > 10) {
this.seedHistory = this.seedHistory.slice(0, 10);
}
this.saveSeedHistory();
this.refreshHistoryDisplay();
this.startAutoHide();
@@ -297,7 +297,7 @@ app.registerExtension({
// Generate new random seed
nodeType.prototype.generateRandomSeed = function () {
const newSeed = Math.floor(Math.random() * 0xFFFFFFFFFFFFFFFF);
const seedWidget = this.widgets?.find(w => w.name === "seed");
if (seedWidget) {
seedWidget.value = newSeed;
@@ -305,7 +305,7 @@ app.registerExtension({
seedWidget.callback(newSeed, this, seedWidget);
}
}
this.addSeedToHistory(newSeed);
this.setDirtyCanvas(true, true);
this.showMessage(`Generated: ${newSeed}`, "success");
@@ -320,7 +320,7 @@ app.registerExtension({
seedWidget.callback(historyItem.seed, this, seedWidget);
}
}
this.highlightHistoryEntry(index);
this.setDirtyCanvas(true, true);
this.startAutoHide();
@@ -340,7 +340,7 @@ app.registerExtension({
if (!this.historyDisplay) return;
if (!this.seedHistory || this.seedHistory.length === 0) {
this.historyDisplay.innerHTML =
this.historyDisplay.innerHTML =
'<div style="color: #888; text-align: center; padding: 15px;">No seeds tracked<br><small>Generate seeds to build history</small></div>';
return;
}
@@ -382,7 +382,7 @@ app.registerExtension({
this.historyDisplay.appendChild(entryDiv);
});
this.startAutoHide();
};
@@ -420,7 +420,7 @@ app.registerExtension({
nodeType.prototype.hideHistorySection = function () {
if (this.historyDisplay && !this.mouseOverHistory) {
this.historyDisplay.style.display = "none";
if (!this.restoreButton) {
const restoreDiv = document.createElement("div");
restoreDiv.style.padding = "10px";
@@ -458,12 +458,12 @@ app.registerExtension({
nodeType.prototype.showHistorySection = function () {
if (this.historyDisplay) {
this.historyDisplay.style.display = "block";
if (this.restoreButton && this.restoreButton.parentNode) {
this.restoreButton.parentNode.removeChild(this.restoreButton);
this.restoreButton = null;
}
this.startAutoHide();
}
};
@@ -521,4 +521,4 @@ app.registerExtension({
};
}
},
});
});
+52 -52
View File
@@ -2,30 +2,30 @@
import { app } from "../../scripts/app.js";
app.registerExtension({
name: "comfyassets.WidthHeightSelector",
name: "comfyassets.WidthHeightSelector",
async beforeRegisterNodeDef(nodeType, nodeData, _app) {
if (nodeData.name === "WidthHeightSelector") {
const onNodeCreated = nodeType.prototype.onNodeCreated;
nodeType.prototype.onNodeCreated = function () {
if (onNodeCreated) onNodeCreated.apply(this, []);
// Track button click state for visual feedback
this.swapButtonPressed = false;
// Helper function to extract resolution from formatted preset string
this.extractResolutionFromPreset = function(presetValue) {
if (presetValue === "custom") return null;
// If it contains formatting metadata, extract the resolution part
if (presetValue.includes(" - ")) {
// Format is: "1024×1024 - 1:1 (1.0MP) - SDXL"
return presetValue.split(" - ")[0];
}
// Otherwise assume it's already a raw resolution
return presetValue;
};
// Override preset callback to update width/height widgets when preset changes
const presetWidget = this.widgets.find(w => w.name === "preset");
if (presetWidget) {
@@ -35,36 +35,36 @@ app.registerExtension({
if (originalCallback) {
originalCallback.call(this, value, graphcanvas, node, pos, event);
}
// Update width/height widgets based on preset
const widthWidget = node.widgets.find(w => w.name === "width");
const heightWidget = node.widgets.find(w => w.name === "height");
if (widthWidget && heightWidget && value !== "custom") {
// Extract raw resolution from formatted preset
const rawResolution = node.extractResolutionFromPreset(value);
// Define all available presets from our preset system
const presetDimensions = {
// SDXL Presets
"1024×1024": [1024, 1024], "896×1152": [896, 1152], "832×1216": [832, 1216],
"768×1344": [768, 1344], "640×1536": [640, 1536], "1152×896": [1152, 896],
"1024×1024": [1024, 1024], "896×1152": [896, 1152], "832×1216": [832, 1216],
"768×1344": [768, 1344], "640×1536": [640, 1536], "1152×896": [1152, 896],
"1216×832": [1216, 832], "1344×768": [1344, 768], "1536×640": [1536, 640],
// FLUX Presets
"1920×1080": [1920, 1080], "1536×1536": [1536, 1536], "1280×768": [1280, 768],
"768×1280": [768, 1280], "1440×1080": [1440, 1080], "1080×1440": [1080, 1440],
// FLUX Presets
"1920×1080": [1920, 1080], "1536×1536": [1536, 1536], "1280×768": [1280, 768],
"768×1280": [768, 1280], "1440×1080": [1440, 1080], "1080×1440": [1080, 1440],
"1728×1152": [1728, 1152], "1152×1728": [1152, 1728],
// Ultra-Wide Presets
"2560×1080": [2560, 1080], "2048×768": [2048, 768], "1792×768": [1792, 768],
"2304×768": [2304, 768], "1080×2560": [1080, 2560], "768×2048": [768, 2048],
"2560×1080": [2560, 1080], "2048×768": [2048, 768], "1792×768": [1792, 768],
"2304×768": [2304, 768], "1080×2560": [1080, 2560], "768×2048": [768, 2048],
"768×1792": [768, 1792], "768×2304": [768, 2304]
};
if (rawResolution && presetDimensions[rawResolution]) {
const [w, h] = presetDimensions[rawResolution];
widthWidget.value = w;
heightWidget.value = h;
// Trigger widget callbacks to update the UI
if (widthWidget.callback) {
widthWidget.callback(w, graphcanvas, node, pos, event);
@@ -76,22 +76,22 @@ app.registerExtension({
}
};
}
// Add swap functionality
this.swapDimensions = function() {
const widthWidget = this.widgets.find(w => w.name === "width");
const heightWidget = this.widgets.find(w => w.name === "height");
const presetWidget = this.widgets.find(w => w.name === "preset");
if (widthWidget && heightWidget && presetWidget) {
// Handle preset swapping first
if (presetWidget.value !== "custom") {
const currentPreset = presetWidget.value;
// Extract raw resolution from formatted preset
const rawResolution = this.extractResolutionFromPreset(currentPreset);
if (!rawResolution) return;
// Parse current preset dimensions (handle both × and x separators)
let w, h;
if (rawResolution.includes('×')) {
@@ -101,13 +101,13 @@ app.registerExtension({
} else {
return; // Invalid preset format
}
const swappedRawPreset = `${h}×${w}`;
// Find the formatted version of the swapped preset from available options
const availablePresets = presetWidget.options.values || presetWidget.options;
let swappedFormattedPreset = null;
for (const option of availablePresets) {
if (option === "custom") continue;
const extractedRes = this.extractResolutionFromPreset(option);
@@ -116,7 +116,7 @@ app.registerExtension({
break;
}
}
if (swappedFormattedPreset) {
// Swapped preset exists, use the formatted version
presetWidget.value = swappedFormattedPreset;
@@ -136,7 +136,7 @@ app.registerExtension({
presetWidget.value = "custom";
widthWidget.value = h;
heightWidget.value = w;
if (presetWidget.callback) {
presetWidget.callback("custom", this, presetWidget);
}
@@ -152,7 +152,7 @@ app.registerExtension({
const tempWidth = widthWidget.value;
widthWidget.value = heightWidget.value;
heightWidget.value = tempWidth;
// Trigger widget change events
if (widthWidget.callback) {
widthWidget.callback(widthWidget.value, this, widthWidget);
@@ -161,7 +161,7 @@ app.registerExtension({
heightWidget.callback(heightWidget.value, this, heightWidget);
}
}
// Mark the graph as changed
this.graph?.setDirtyCanvas(true, true);
}
@@ -173,21 +173,21 @@ app.registerExtension({
if (onDrawForeground) {
onDrawForeground.apply(this, arguments);
}
if (this.flags.collapsed) return;
// Draw swap button with consistent spacing from widgets
const swapButtonSize = 24;
const margin = 6;
const swapButtonX = this.size[0] - swapButtonSize - margin;
// Calculate button position based on widget spacing rather than bottom margin
// Estimate widget area height and add consistent spacing
const estimatedWidgetHeight = 90; // Approximate height for 3 widgets
const topMargin = 35; // Space from top to first widget
const buttonSpacing = 10; // Space between last widget and button
const swapButtonY = topMargin + estimatedWidgetHeight + buttonSpacing;
// Button background - change color based on pressed state
if (this.swapButtonPressed) {
// Darker when pressed
@@ -199,26 +199,26 @@ app.registerExtension({
ctx.beginPath();
ctx.roundRect(swapButtonX, swapButtonY, swapButtonSize, swapButtonSize, 4);
ctx.fill();
// Button border with subtle highlight
ctx.strokeStyle = this.swapButtonPressed ? "rgba(20, 100, 180, 1.0)" : "rgba(33, 150, 243, 0.9)";
ctx.lineWidth = 1;
ctx.stroke();
// Draw swap icon - modern double arrow design
ctx.strokeStyle = "rgba(255, 255, 255, 0.95)";
ctx.lineWidth = 2;
ctx.lineCap = "round";
const centerX = swapButtonX + 12;
const centerY = swapButtonY + 12;
// Top arrow (pointing right) - width to height
ctx.beginPath();
ctx.moveTo(centerX - 7, centerY - 3);
ctx.lineTo(centerX + 5, centerY - 3);
ctx.stroke();
// Top arrow head
ctx.beginPath();
ctx.moveTo(centerX + 5, centerY - 3);
@@ -226,13 +226,13 @@ app.registerExtension({
ctx.moveTo(centerX + 5, centerY - 3);
ctx.lineTo(centerX + 2, centerY - 1);
ctx.stroke();
// Bottom arrow (pointing left) - height to width
ctx.beginPath();
ctx.moveTo(centerX + 5, centerY + 3);
ctx.lineTo(centerX - 7, centerY + 3);
ctx.stroke();
// Bottom arrow head
ctx.beginPath();
ctx.moveTo(centerX - 7, centerY + 3);
@@ -240,7 +240,7 @@ app.registerExtension({
ctx.moveTo(centerX - 7, centerY + 3);
ctx.lineTo(centerX - 4, centerY + 5);
ctx.stroke();
// Add subtle tooltip text when hovering (if we had hover state)
// This could be extended with hover detection for better UX
};
@@ -251,13 +251,13 @@ app.registerExtension({
const swapButtonSize = 24;
const margin = 6;
const swapButtonX = this.pos[0] + this.size[0] - swapButtonSize - margin;
// Use same positioning logic as drawing
const estimatedWidgetHeight = 90;
const topMargin = 35;
const buttonSpacing = 10;
const swapButtonY = this.pos[1] + topMargin + estimatedWidgetHeight + buttonSpacing;
if (
e.canvasX >= swapButtonX &&
e.canvasX <= swapButtonX + swapButtonSize &&
@@ -267,19 +267,19 @@ app.registerExtension({
// Visual feedback - set button as pressed
this.swapButtonPressed = true;
this.setDirtyCanvas(true, true);
// Execute swap
this.swapDimensions();
// Reset button state after a short delay for visual feedback
setTimeout(() => {
this.swapButtonPressed = false;
this.setDirtyCanvas(true, true);
}, 150);
return true; // Consume the event
}
// Call original onMouseDown if not clicking swap button
if (onMouseDown) {
return onMouseDown.apply(this, arguments);
@@ -293,27 +293,27 @@ app.registerExtension({
const swapButtonSize = 24;
const margin = 6;
const swapButtonX = this.pos[0] + this.size[0] - swapButtonSize - margin;
// Use same positioning logic as drawing
const estimatedWidgetHeight = 90;
const topMargin = 35;
const buttonSpacing = 10;
const swapButtonY = this.pos[1] + topMargin + estimatedWidgetHeight + buttonSpacing;
const isHovering = (
e.canvasX >= swapButtonX &&
e.canvasX <= swapButtonX + swapButtonSize &&
e.canvasY >= swapButtonY &&
e.canvasY <= swapButtonY + swapButtonSize
);
// Update cursor style for better UX (safely)
if (isHovering && this.graph && this.graph.canvas && this.graph.canvas.canvas) {
this.graph.canvas.canvas.style.cursor = "pointer";
} else if (this.graph && this.graph.canvas && this.graph.canvas.canvas) {
this.graph.canvas.canvas.style.cursor = "default";
}
// Call original onMouseMove
if (onMouseMove) {
return onMouseMove.apply(this, arguments);
@@ -321,4 +321,4 @@ app.registerExtension({
};
}
},
});
});