Compare commits
1 Commits
manager-ca
...
draft-v4-c
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
8159ca5875 |
70
.github/workflows/ci.yml
vendored
70
.github/workflows/ci.yml
vendored
@@ -1,70 +0,0 @@
|
|||||||
name: CI
|
|
||||||
|
|
||||||
on:
|
|
||||||
push:
|
|
||||||
branches: [ main, feat/*, fix/* ]
|
|
||||||
pull_request:
|
|
||||||
branches: [ main ]
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
validate-openapi:
|
|
||||||
name: Validate OpenAPI Specification
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
steps:
|
|
||||||
- uses: actions/checkout@v4
|
|
||||||
|
|
||||||
- name: Check if OpenAPI changed
|
|
||||||
id: openapi-changed
|
|
||||||
uses: tj-actions/changed-files@v44
|
|
||||||
with:
|
|
||||||
files: openapi.yaml
|
|
||||||
|
|
||||||
- name: Setup Node.js
|
|
||||||
if: steps.openapi-changed.outputs.any_changed == 'true'
|
|
||||||
uses: actions/setup-node@v4
|
|
||||||
with:
|
|
||||||
node-version: '18'
|
|
||||||
|
|
||||||
- name: Install Redoc CLI
|
|
||||||
if: steps.openapi-changed.outputs.any_changed == 'true'
|
|
||||||
run: |
|
|
||||||
npm install -g @redocly/cli
|
|
||||||
|
|
||||||
- name: Validate OpenAPI specification
|
|
||||||
if: steps.openapi-changed.outputs.any_changed == 'true'
|
|
||||||
run: |
|
|
||||||
redocly lint openapi.yaml
|
|
||||||
|
|
||||||
code-quality:
|
|
||||||
name: Code Quality Checks
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
steps:
|
|
||||||
- uses: actions/checkout@v4
|
|
||||||
with:
|
|
||||||
fetch-depth: 0 # Fetch all history for proper diff
|
|
||||||
|
|
||||||
- name: Get changed Python files
|
|
||||||
id: changed-py-files
|
|
||||||
uses: tj-actions/changed-files@v44
|
|
||||||
with:
|
|
||||||
files: |
|
|
||||||
**/*.py
|
|
||||||
files_ignore: |
|
|
||||||
comfyui_manager/legacy/**
|
|
||||||
|
|
||||||
- name: Setup Python
|
|
||||||
if: steps.changed-py-files.outputs.any_changed == 'true'
|
|
||||||
uses: actions/setup-python@v5
|
|
||||||
with:
|
|
||||||
python-version: '3.9'
|
|
||||||
|
|
||||||
- name: Install dependencies
|
|
||||||
if: steps.changed-py-files.outputs.any_changed == 'true'
|
|
||||||
run: |
|
|
||||||
pip install ruff
|
|
||||||
|
|
||||||
- name: Run ruff linting on changed files
|
|
||||||
if: steps.changed-py-files.outputs.any_changed == 'true'
|
|
||||||
run: |
|
|
||||||
echo "Changed files: ${{ steps.changed-py-files.outputs.all_changed_files }}"
|
|
||||||
echo "${{ steps.changed-py-files.outputs.all_changed_files }}" | xargs -r ruff check
|
|
||||||
30
.github/workflows/publish-to-pypi.yml
vendored
30
.github/workflows/publish-to-pypi.yml
vendored
@@ -4,7 +4,7 @@ on:
|
|||||||
workflow_dispatch:
|
workflow_dispatch:
|
||||||
push:
|
push:
|
||||||
branches:
|
branches:
|
||||||
- manager-v4
|
- main
|
||||||
paths:
|
paths:
|
||||||
- "pyproject.toml"
|
- "pyproject.toml"
|
||||||
|
|
||||||
@@ -21,7 +21,7 @@ jobs:
|
|||||||
- name: Set up Python
|
- name: Set up Python
|
||||||
uses: actions/setup-python@v4
|
uses: actions/setup-python@v4
|
||||||
with:
|
with:
|
||||||
python-version: '3.x'
|
python-version: '3.9'
|
||||||
|
|
||||||
- name: Install build dependencies
|
- name: Install build dependencies
|
||||||
run: |
|
run: |
|
||||||
@@ -31,27 +31,27 @@ jobs:
|
|||||||
- name: Get current version
|
- name: Get current version
|
||||||
id: current_version
|
id: current_version
|
||||||
run: |
|
run: |
|
||||||
CURRENT_VERSION=$(grep -oP '^version = "\K[^"]+' pyproject.toml)
|
CURRENT_VERSION=$(grep -oP 'version = "\K[^"]+' pyproject.toml)
|
||||||
echo "version=$CURRENT_VERSION" >> $GITHUB_OUTPUT
|
echo "version=$CURRENT_VERSION" >> $GITHUB_OUTPUT
|
||||||
echo "Current version: $CURRENT_VERSION"
|
echo "Current version: $CURRENT_VERSION"
|
||||||
|
|
||||||
- name: Build package
|
- name: Build package
|
||||||
run: python -m build
|
run: python -m build
|
||||||
|
|
||||||
# - name: Create GitHub Release
|
- name: Create GitHub Release
|
||||||
# id: create_release
|
id: create_release
|
||||||
# uses: softprops/action-gh-release@v2
|
uses: softprops/action-gh-release@v2
|
||||||
# env:
|
env:
|
||||||
# GITHUB_TOKEN: ${{ github.token }}
|
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||||
# with:
|
with:
|
||||||
# files: dist/*
|
files: dist/*
|
||||||
# tag_name: v${{ steps.current_version.outputs.version }}
|
tag_name: v${{ steps.current_version.outputs.version }}
|
||||||
# draft: false
|
draft: false
|
||||||
# prerelease: false
|
prerelease: false
|
||||||
# generate_release_notes: true
|
generate_release_notes: true
|
||||||
|
|
||||||
- name: Publish to PyPI
|
- name: Publish to PyPI
|
||||||
uses: pypa/gh-action-pypi-publish@76f52bc884231f62b9a034ebfe128415bbaabdfc
|
uses: pypa/gh-action-pypi-publish@release/v1
|
||||||
with:
|
with:
|
||||||
password: ${{ secrets.PYPI_TOKEN }}
|
password: ${{ secrets.PYPI_TOKEN }}
|
||||||
skip-existing: true
|
skip-existing: true
|
||||||
|
|||||||
25
.github/workflows/publish.yml
vendored
Normal file
25
.github/workflows/publish.yml
vendored
Normal file
@@ -0,0 +1,25 @@
|
|||||||
|
name: Publish to Comfy registry
|
||||||
|
on:
|
||||||
|
workflow_dispatch:
|
||||||
|
push:
|
||||||
|
branches:
|
||||||
|
- main-blocked
|
||||||
|
paths:
|
||||||
|
- "pyproject.toml"
|
||||||
|
|
||||||
|
permissions:
|
||||||
|
issues: write
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
publish-node:
|
||||||
|
name: Publish Custom Node to registry
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
if: ${{ github.repository_owner == 'ltdrdata' || github.repository_owner == 'Comfy-Org' }}
|
||||||
|
steps:
|
||||||
|
- name: Check out code
|
||||||
|
uses: actions/checkout@v4
|
||||||
|
- name: Publish Custom Node
|
||||||
|
uses: Comfy-Org/publish-node-action@v1
|
||||||
|
with:
|
||||||
|
## Add your own personal access token to your Github Repository secrets and reference it here.
|
||||||
|
personal_access_token: ${{ secrets.REGISTRY_ACCESS_TOKEN }}
|
||||||
@@ -1,56 +0,0 @@
|
|||||||
# Example: GitHub Actions workflow to auto-update test durations
|
|
||||||
# Rename to .github/workflows/update-test-durations.yml to enable
|
|
||||||
|
|
||||||
name: Update Test Durations
|
|
||||||
|
|
||||||
on:
|
|
||||||
schedule:
|
|
||||||
# Run weekly on Sundays at 2 AM UTC
|
|
||||||
- cron: '0 2 * * 0'
|
|
||||||
workflow_dispatch: # Allow manual trigger
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
update-durations:
|
|
||||||
runs-on: self-hosted
|
|
||||||
|
|
||||||
steps:
|
|
||||||
- uses: actions/checkout@v4
|
|
||||||
|
|
||||||
- name: Set up Python
|
|
||||||
uses: actions/setup-python@v4
|
|
||||||
with:
|
|
||||||
python-version: '3.9'
|
|
||||||
|
|
||||||
- name: Install dependencies
|
|
||||||
run: |
|
|
||||||
python -m pip install --upgrade pip
|
|
||||||
pip install -e .
|
|
||||||
pip install pytest pytest-split
|
|
||||||
|
|
||||||
- name: Update test durations
|
|
||||||
run: |
|
|
||||||
chmod +x tests/update_test_durations.sh
|
|
||||||
./tests/update_test_durations.sh
|
|
||||||
|
|
||||||
- name: Check for changes
|
|
||||||
id: check_changes
|
|
||||||
run: |
|
|
||||||
if git diff --quiet .test_durations; then
|
|
||||||
echo "changed=false" >> $GITHUB_OUTPUT
|
|
||||||
else
|
|
||||||
echo "changed=true" >> $GITHUB_OUTPUT
|
|
||||||
fi
|
|
||||||
|
|
||||||
- name: Create Pull Request
|
|
||||||
if: steps.check_changes.outputs.changed == 'true'
|
|
||||||
uses: peter-evans/create-pull-request@v5
|
|
||||||
with:
|
|
||||||
token: ${{ secrets.GITHUB_TOKEN }}
|
|
||||||
commit-message: 'chore: update test duration data'
|
|
||||||
title: 'Update test duration data'
|
|
||||||
body: |
|
|
||||||
Automated update of `.test_durations` file for optimal parallel test distribution.
|
|
||||||
|
|
||||||
This ensures pytest-split can effectively balance test load across parallel environments.
|
|
||||||
branch: auto/update-test-durations
|
|
||||||
delete-branch: true
|
|
||||||
8
.gitignore
vendored
8
.gitignore
vendored
@@ -19,13 +19,5 @@ pip_overrides.json
|
|||||||
check2.sh
|
check2.sh
|
||||||
/venv/
|
/venv/
|
||||||
build
|
build
|
||||||
dist
|
|
||||||
*.egg-info
|
*.egg-info
|
||||||
.env
|
.env
|
||||||
.git
|
|
||||||
.claude
|
|
||||||
.hypothesis
|
|
||||||
|
|
||||||
# Test artifacts
|
|
||||||
tests/tmp/
|
|
||||||
tests/env/
|
|
||||||
|
|||||||
170
CLAUDE.md
170
CLAUDE.md
@@ -1,170 +0,0 @@
|
|||||||
# CLAUDE.md - Development Guidelines
|
|
||||||
|
|
||||||
## Project Context
|
|
||||||
This is ComfyUI Manager, a Python package that provides management functions for ComfyUI custom nodes, models, and extensions. The project follows modern Python packaging standards and maintains both current (`glob`) and legacy implementations.
|
|
||||||
|
|
||||||
## Code Architecture
|
|
||||||
- **Current Development**: Work in `comfyui_manager/glob/` package
|
|
||||||
- **Legacy Code**: `comfyui_manager/legacy/` (reference only, do not modify unless explicitly asked)
|
|
||||||
- **Common Utilities**: `comfyui_manager/common/` for shared functionality
|
|
||||||
- **Data Models**: `comfyui_manager/data_models/` for API schemas and types
|
|
||||||
|
|
||||||
## Development Workflow for API Changes
|
|
||||||
When modifying data being sent or received:
|
|
||||||
1. Update `openapi.yaml` file first
|
|
||||||
2. Verify YAML syntax using `yaml.safe_load`
|
|
||||||
3. Regenerate types following `data_models/README.md` instructions
|
|
||||||
4. Verify new data model generation
|
|
||||||
5. Verify syntax of generated type files
|
|
||||||
6. Run formatting and linting on generated files
|
|
||||||
7. Update `__init__.py` files in `data_models` to export new models
|
|
||||||
8. Make changes to rest of codebase
|
|
||||||
9. Run CI tests to verify changes
|
|
||||||
|
|
||||||
## Coding Standards
|
|
||||||
### Python Style
|
|
||||||
- Follow PEP 8 coding standards
|
|
||||||
- Use type hints for all function parameters and return values
|
|
||||||
- Target Python 3.9+ compatibility
|
|
||||||
- Line length: 120 characters (as configured in ruff)
|
|
||||||
|
|
||||||
### Security Guidelines
|
|
||||||
- Never hardcode API keys, tokens, or sensitive credentials
|
|
||||||
- Use environment variables for configuration
|
|
||||||
- Validate all user input and file paths
|
|
||||||
- Use prepared statements for database operations
|
|
||||||
- Implement proper error handling without exposing internal details
|
|
||||||
- Follow principle of least privilege for file/network access
|
|
||||||
|
|
||||||
### Code Quality
|
|
||||||
- Write descriptive variable and function names
|
|
||||||
- Include docstrings for public functions and classes
|
|
||||||
- Handle exceptions gracefully with specific error messages
|
|
||||||
- Use logging instead of print statements for debugging
|
|
||||||
- Maintain test coverage for new functionality
|
|
||||||
|
|
||||||
## Dependencies & Tools
|
|
||||||
### Core Dependencies
|
|
||||||
- GitPython, PyGithub for Git operations
|
|
||||||
- typer, rich for CLI interface
|
|
||||||
- transformers, huggingface-hub for AI model handling
|
|
||||||
- uv for fast package management
|
|
||||||
|
|
||||||
### Development Tools
|
|
||||||
- **Linting**: ruff (configured in pyproject.toml)
|
|
||||||
- **Testing**: pytest with coverage
|
|
||||||
- **Pre-commit**: pre-commit hooks for code quality
|
|
||||||
- **Type Checking**: Use type hints, consider mypy for strict checking
|
|
||||||
|
|
||||||
## File Organization
|
|
||||||
- Keep business logic in appropriate modules under `glob/`
|
|
||||||
- Place utility functions in `common/` for reusability
|
|
||||||
- Store UI/frontend code in `js/` directory
|
|
||||||
- Maintain documentation in `docs/` with multilingual support
|
|
||||||
|
|
||||||
### Large Data Files Policy
|
|
||||||
- **NEVER read .json files directly** - These contain large datasets that cause unnecessary token consumption
|
|
||||||
- Use `JSON_REFERENCE.md` for understanding JSON file structures and schemas
|
|
||||||
- Work with processed/filtered data through APIs when possible
|
|
||||||
- For structure analysis, refer to data models in `comfyui_manager/data_models/` instead
|
|
||||||
|
|
||||||
## Git Workflow
|
|
||||||
- Work on feature branches, not main directly
|
|
||||||
- Write clear, descriptive commit messages
|
|
||||||
- Run tests and linting before committing
|
|
||||||
- Keep commits atomic and focused
|
|
||||||
|
|
||||||
## Testing Requirements
|
|
||||||
|
|
||||||
### ⚠️ Critical: Always Reinstall Before Testing
|
|
||||||
**ALWAYS run `uv pip install .` before executing tests** to ensure latest code changes are installed.
|
|
||||||
|
|
||||||
### Test Execution Workflow
|
|
||||||
```bash
|
|
||||||
# 1. Reinstall package (REQUIRED)
|
|
||||||
uv pip install .
|
|
||||||
|
|
||||||
# 2. Clean Python cache
|
|
||||||
find comfyui_manager -type d -name "__pycache__" -exec rm -rf {} + 2>/dev/null
|
|
||||||
find tests/env -type d -name "__pycache__" -exec rm -rf {} + 2>/dev/null
|
|
||||||
|
|
||||||
# 3. Stop any running servers
|
|
||||||
pkill -f "ComfyUI/main.py"
|
|
||||||
sleep 2
|
|
||||||
|
|
||||||
# 4. Start ComfyUI test server
|
|
||||||
cd tests/env
|
|
||||||
python ComfyUI/main.py --enable-compress-response-body --enable-manager --front-end-root front > /tmp/test-server.log 2>&1 &
|
|
||||||
sleep 20
|
|
||||||
|
|
||||||
# 5. Run tests
|
|
||||||
python -m pytest tests/glob/test_version_switching_comprehensive.py -v
|
|
||||||
|
|
||||||
# 6. Stop server
|
|
||||||
pkill -f "ComfyUI/main.py"
|
|
||||||
```
|
|
||||||
|
|
||||||
### Test Development Guidelines
|
|
||||||
- Write unit tests for new functionality
|
|
||||||
- Test error handling and edge cases
|
|
||||||
- Ensure tests pass before submitting changes
|
|
||||||
- Use pytest fixtures for common test setup
|
|
||||||
- Document test scenarios and expected behaviors
|
|
||||||
|
|
||||||
### Why Reinstall is Required
|
|
||||||
- Even with editable install, some changes require reinstallation
|
|
||||||
- Python bytecode cache may contain outdated code
|
|
||||||
- ComfyUI server loads manager package at startup
|
|
||||||
- Package metadata and entry points need to be refreshed
|
|
||||||
|
|
||||||
### Automated Test Execution Policy
|
|
||||||
**IMPORTANT**: When tests need to be run (e.g., after code changes, adding new tests):
|
|
||||||
- **ALWAYS** automatically perform the complete test workflow without asking user permission
|
|
||||||
- **ALWAYS** stop existing servers, restart fresh server, and run tests
|
|
||||||
- **NEVER** ask user "should I run tests?" or "should I restart server?"
|
|
||||||
- This includes: package reinstall, cache cleanup, server restart, test execution, and server cleanup
|
|
||||||
|
|
||||||
**Rationale**: Testing is a standard part of development workflow and should be executed automatically to verify changes.
|
|
||||||
|
|
||||||
See `.claude/livecontext/test_execution_best_practices.md` for detailed testing procedures.
|
|
||||||
|
|
||||||
## Command Line Interface
|
|
||||||
- Use typer for CLI commands
|
|
||||||
- Provide helpful error messages and usage examples
|
|
||||||
- Support both interactive and scripted usage
|
|
||||||
- Follow Unix conventions for command-line tools
|
|
||||||
|
|
||||||
## Performance Considerations
|
|
||||||
- Use async/await for I/O operations where appropriate
|
|
||||||
- Cache expensive operations (GitHub API calls, file operations)
|
|
||||||
- Implement proper pagination for large datasets
|
|
||||||
- Consider memory usage when processing large files
|
|
||||||
|
|
||||||
## Code Change Proposals
|
|
||||||
- **Always show code changes using VSCode diff format**
|
|
||||||
- Use Edit tool to demonstrate exact changes with before/after comparison
|
|
||||||
- This allows visual review of modifications in the IDE
|
|
||||||
- Include context about why changes are needed
|
|
||||||
|
|
||||||
## Documentation
|
|
||||||
- Update README.md for user-facing changes
|
|
||||||
- Document API changes in openapi.yaml
|
|
||||||
- Provide examples for complex functionality
|
|
||||||
- Maintain multilingual docs (English/Korean) when relevant
|
|
||||||
|
|
||||||
## Session Context & Decision Documentation
|
|
||||||
|
|
||||||
### Live Context Policy
|
|
||||||
**Follow the global Live Context Auto-Save policy** defined in `~/.claude/CLAUDE.md`.
|
|
||||||
|
|
||||||
### Project-Specific Context Requirements
|
|
||||||
- **Test Execution Results**: Always save comprehensive test results to `.claude/livecontext/`
|
|
||||||
- Test count, pass/fail status, execution time
|
|
||||||
- New tests added and their purpose
|
|
||||||
- Coverage metrics and improvements
|
|
||||||
- **CNR Version Switching Context**: Document version switching behavior and edge cases
|
|
||||||
- Update vs Install operation differences
|
|
||||||
- Old version handling (preserved vs deleted)
|
|
||||||
- State management insights
|
|
||||||
- **API Changes**: Document OpenAPI schema changes and data model updates
|
|
||||||
- **Architecture Decisions**: Document manager_core.py and manager_server.py design choices
|
|
||||||
@@ -1,187 +0,0 @@
|
|||||||
# ComfyUI Manager Documentation Index
|
|
||||||
|
|
||||||
**Last Updated**: 2025-11-04
|
|
||||||
**Purpose**: Navigate all project documentation organized by purpose and audience
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## 📖 Quick Links
|
|
||||||
|
|
||||||
- **Getting Started**: [README.md](README.md)
|
|
||||||
- **User Documentation**: [docs/](docs/)
|
|
||||||
- **Test Documentation**: [tests/glob/](tests/glob/)
|
|
||||||
- **Contributing**: [CONTRIBUTING.md](CONTRIBUTING.md)
|
|
||||||
- **Development**: [CLAUDE.md](CLAUDE.md)
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## 📚 Documentation Structure
|
|
||||||
|
|
||||||
### Root Level
|
|
||||||
|
|
||||||
| Document | Purpose | Audience |
|
|
||||||
|----------|---------|----------|
|
|
||||||
| [README.md](README.md) | Project overview and quick start | Everyone |
|
|
||||||
| [CONTRIBUTING.md](CONTRIBUTING.md) | Contribution guidelines | Contributors |
|
|
||||||
| [CLAUDE.md](CLAUDE.md) | Development guidelines for AI-assisted development | Developers |
|
|
||||||
| [JSON_REFERENCE.md](JSON_REFERENCE.md) | JSON file schema reference | Developers |
|
|
||||||
|
|
||||||
### User Documentation (`docs/`)
|
|
||||||
|
|
||||||
| Document | Purpose | Language |
|
|
||||||
|----------|---------|----------|
|
|
||||||
| [docs/README.md](docs/README.md) | Documentation overview | English |
|
|
||||||
| [docs/PACKAGE_VERSION_MANAGEMENT.md](docs/PACKAGE_VERSION_MANAGEMENT.md) | Package version management guide | English |
|
|
||||||
| [docs/SECURITY_ENHANCED_INSTALLATION.md](docs/SECURITY_ENHANCED_INSTALLATION.md) | Security features for URL installation | English |
|
|
||||||
| [docs/en/cm-cli.md](docs/en/cm-cli.md) | CLI usage guide | English |
|
|
||||||
| [docs/en/use_aria2.md](docs/en/use_aria2.md) | Aria2 download configuration | English |
|
|
||||||
| [docs/ko/cm-cli.md](docs/ko/cm-cli.md) | CLI usage guide | Korean |
|
|
||||||
|
|
||||||
### Package Documentation
|
|
||||||
|
|
||||||
| Package | Document | Purpose |
|
|
||||||
|---------|----------|---------|
|
|
||||||
| comfyui_manager | [comfyui_manager/README.md](comfyui_manager/README.md) | Package overview |
|
|
||||||
| common | [comfyui_manager/common/README.md](comfyui_manager/common/README.md) | Common utilities documentation |
|
|
||||||
| data_models | [comfyui_manager/data_models/README.md](comfyui_manager/data_models/README.md) | Data model generation guide |
|
|
||||||
| glob | [comfyui_manager/glob/CLAUDE.md](comfyui_manager/glob/CLAUDE.md) | Glob module development guide |
|
|
||||||
| js | [comfyui_manager/js/README.md](comfyui_manager/js/README.md) | JavaScript components |
|
|
||||||
|
|
||||||
### Test Documentation (`tests/`)
|
|
||||||
|
|
||||||
| Document | Purpose | Status |
|
|
||||||
|----------|---------|--------|
|
|
||||||
| [tests/TEST.md](tests/TEST.md) | Testing overview | ✅ |
|
|
||||||
| [tests/glob/README.md](tests/glob/README.md) | Glob API endpoint tests | ✅ Translated |
|
|
||||||
| [tests/glob/TESTING_GUIDE.md](tests/glob/TESTING_GUIDE.md) | Test execution guide | ✅ |
|
|
||||||
| [tests/glob/TEST_INDEX.md](tests/glob/TEST_INDEX.md) | Test documentation unified index | ✅ Translated |
|
|
||||||
| [tests/glob/TEST_LOG.md](tests/glob/TEST_LOG.md) | Test execution log | ✅ Translated |
|
|
||||||
|
|
||||||
### Node Database
|
|
||||||
|
|
||||||
| Document | Purpose |
|
|
||||||
|----------|---------|
|
|
||||||
| [node_db/README.md](node_db/README.md) | Node database information |
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## 🔒 Internal Documentation (`docs/internal/`)
|
|
||||||
|
|
||||||
### CLI Migration (`docs/internal/cli_migration/`)
|
|
||||||
|
|
||||||
Historical documentation for CLI migration from legacy to glob module (completed).
|
|
||||||
|
|
||||||
| Document | Purpose |
|
|
||||||
|----------|---------|
|
|
||||||
| [README.md](docs/internal/cli_migration/README.md) | Migration plan overview |
|
|
||||||
| [CLI_COMPATIBILITY_ANALYSIS.md](docs/internal/cli_migration/CLI_COMPATIBILITY_ANALYSIS.md) | Legacy vs Glob compatibility analysis |
|
|
||||||
| [CLI_IMPLEMENTATION_CONTEXT.md](docs/internal/cli_migration/CLI_IMPLEMENTATION_CONTEXT.md) | Implementation context |
|
|
||||||
| [CLI_IMPLEMENTATION_TODO.md](docs/internal/cli_migration/CLI_IMPLEMENTATION_TODO.md) | Implementation checklist |
|
|
||||||
| [CLI_PURE_GLOB_MIGRATION_PLAN.md](docs/internal/cli_migration/CLI_PURE_GLOB_MIGRATION_PLAN.md) | Technical migration specification |
|
|
||||||
| [CLI_GLOB_API_REFERENCE.md](docs/internal/cli_migration/CLI_GLOB_API_REFERENCE.md) | Glob API reference |
|
|
||||||
| [CLI_IMPLEMENTATION_CONSTRAINTS.md](docs/internal/cli_migration/CLI_IMPLEMENTATION_CONSTRAINTS.md) | Migration constraints |
|
|
||||||
| [CLI_TESTING_CHECKLIST.md](docs/internal/cli_migration/CLI_TESTING_CHECKLIST.md) | Testing checklist |
|
|
||||||
| [CLI_SHOW_LIST_REVISION.md](docs/internal/cli_migration/CLI_SHOW_LIST_REVISION.md) | show_list implementation plan |
|
|
||||||
|
|
||||||
### Test Planning (`docs/internal/test_planning/`)
|
|
||||||
|
|
||||||
Internal test planning documents (in Korean).
|
|
||||||
|
|
||||||
| Document | Purpose | Language |
|
|
||||||
|----------|---------|----------|
|
|
||||||
| [TEST_PLAN_ADDITIONAL.md](docs/internal/test_planning/TEST_PLAN_ADDITIONAL.md) | Additional test scenarios | Korean |
|
|
||||||
| [COMPLEX_SCENARIOS_TEST_PLAN.md](docs/internal/test_planning/COMPLEX_SCENARIOS_TEST_PLAN.md) | Complex multi-version test scenarios | Korean |
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## 📋 Documentation by Audience
|
|
||||||
|
|
||||||
### For Users
|
|
||||||
1. [README.md](README.md) - Start here
|
|
||||||
2. [docs/en/cm-cli.md](docs/en/cm-cli.md) - CLI usage
|
|
||||||
3. [docs/PACKAGE_VERSION_MANAGEMENT.md](docs/PACKAGE_VERSION_MANAGEMENT.md) - Version management
|
|
||||||
|
|
||||||
### For Contributors
|
|
||||||
1. [CONTRIBUTING.md](CONTRIBUTING.md) - Contribution process
|
|
||||||
2. [CLAUDE.md](CLAUDE.md) - Development guidelines
|
|
||||||
3. [comfyui_manager/data_models/README.md](comfyui_manager/data_models/README.md) - Data model workflow
|
|
||||||
|
|
||||||
### For Developers
|
|
||||||
1. [CLAUDE.md](CLAUDE.md) - Development workflow
|
|
||||||
2. [comfyui_manager/glob/CLAUDE.md](comfyui_manager/glob/CLAUDE.md) - Glob module guide
|
|
||||||
3. [JSON_REFERENCE.md](JSON_REFERENCE.md) - Schema reference
|
|
||||||
4. [docs/PACKAGE_VERSION_MANAGEMENT.md](docs/PACKAGE_VERSION_MANAGEMENT.md) - Package management internals
|
|
||||||
|
|
||||||
### For Testers
|
|
||||||
1. [tests/TEST.md](tests/TEST.md) - Testing overview
|
|
||||||
2. [tests/glob/TEST_INDEX.md](tests/glob/TEST_INDEX.md) - Test documentation index
|
|
||||||
3. [tests/glob/TESTING_GUIDE.md](tests/glob/TESTING_GUIDE.md) - Test execution guide
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## 🔄 Documentation Maintenance
|
|
||||||
|
|
||||||
### When to Update
|
|
||||||
- **README.md**: Project structure or main features change
|
|
||||||
- **CLAUDE.md**: Development workflow changes
|
|
||||||
- **Test Documentation**: New tests added or test structure changes
|
|
||||||
- **User Documentation**: User-facing features change
|
|
||||||
- **This Index**: New documentation added or reorganized
|
|
||||||
|
|
||||||
### Documentation Standards
|
|
||||||
- Use clear, descriptive titles
|
|
||||||
- Include "Last Updated" date
|
|
||||||
- Specify target audience
|
|
||||||
- Provide examples where applicable
|
|
||||||
- Keep language simple and accessible
|
|
||||||
- Translate user-facing docs to Korean when possible
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## 🗂️ File Organization
|
|
||||||
|
|
||||||
```
|
|
||||||
comfyui-manager/
|
|
||||||
├── DOCUMENTATION_INDEX.md (this file)
|
|
||||||
├── README.md
|
|
||||||
├── CONTRIBUTING.md
|
|
||||||
├── CLAUDE.md
|
|
||||||
├── JSON_REFERENCE.md
|
|
||||||
├── docs/
|
|
||||||
│ ├── README.md
|
|
||||||
│ ├── PACKAGE_VERSION_MANAGEMENT.md
|
|
||||||
│ ├── SECURITY_ENHANCED_INSTALLATION.md
|
|
||||||
│ ├── en/
|
|
||||||
│ │ ├── cm-cli.md
|
|
||||||
│ │ └── use_aria2.md
|
|
||||||
│ ├── ko/
|
|
||||||
│ │ └── cm-cli.md
|
|
||||||
│ └── internal/
|
|
||||||
│ ├── cli_migration/ (9 files - completed migration docs)
|
|
||||||
│ └── test_planning/ (2 files - Korean test plans)
|
|
||||||
├── comfyui_manager/
|
|
||||||
│ ├── README.md
|
|
||||||
│ ├── common/README.md
|
|
||||||
│ ├── data_models/README.md
|
|
||||||
│ ├── glob/CLAUDE.md
|
|
||||||
│ └── js/README.md
|
|
||||||
├── tests/
|
|
||||||
│ ├── TEST.md
|
|
||||||
│ └── glob/
|
|
||||||
│ ├── README.md
|
|
||||||
│ ├── TESTING_GUIDE.md
|
|
||||||
│ ├── TEST_INDEX.md
|
|
||||||
│ └── TEST_LOG.md
|
|
||||||
└── node_db/
|
|
||||||
└── README.md
|
|
||||||
```
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
**Total Documentation Files**: 36 files organized across 6 categories
|
|
||||||
|
|
||||||
**Translation Status**:
|
|
||||||
- ✅ Core user documentation: English
|
|
||||||
- ✅ CLI guide: English + Korean
|
|
||||||
- ✅ Test documentation: English (translated from Korean)
|
|
||||||
- 📝 Internal planning docs: Korean (preserved as-is for historical reference)
|
|
||||||
@@ -5,10 +5,3 @@ include LICENSE.txt
|
|||||||
include README.md
|
include README.md
|
||||||
include requirements.txt
|
include requirements.txt
|
||||||
include pyproject.toml
|
include pyproject.toml
|
||||||
include custom-node-list.json
|
|
||||||
include extension-node-list.json
|
|
||||||
include extras.json
|
|
||||||
include github-stats.json
|
|
||||||
include model-list.json
|
|
||||||
include alter-list.json
|
|
||||||
include comfyui_manager/channels.list.template
|
|
||||||
51
README.md
51
README.md
@@ -9,7 +9,7 @@
|
|||||||
* V3.16: Support for `uv` has been added. Set `use_uv` in `config.ini`.
|
* V3.16: Support for `uv` has been added. Set `use_uv` in `config.ini`.
|
||||||
* V3.10: `double-click feature` is removed
|
* V3.10: `double-click feature` is removed
|
||||||
* This feature has been moved to https://github.com/ltdrdata/comfyui-connection-helper
|
* This feature has been moved to https://github.com/ltdrdata/comfyui-connection-helper
|
||||||
* V3.3.2: Overhauled. Officially supports [https://registry.comfy.org/](https://registry.comfy.org/).
|
* V3.3.2: Overhauled. Officially supports [https://comfyregistry.org/](https://comfyregistry.org/).
|
||||||
* You can see whole nodes info on [ComfyUI Nodes Info](https://ltdrdata.github.io/) page.
|
* You can see whole nodes info on [ComfyUI Nodes Info](https://ltdrdata.github.io/) page.
|
||||||
|
|
||||||
## Installation
|
## Installation
|
||||||
@@ -215,14 +215,13 @@ The following settings are applied based on the section marked as `is_default`.
|
|||||||
downgrade_blacklist = <Set a list of packages to prevent downgrades. List them separated by commas.>
|
downgrade_blacklist = <Set a list of packages to prevent downgrades. List them separated by commas.>
|
||||||
security_level = <Set the security level => strong|normal|normal-|weak>
|
security_level = <Set the security level => strong|normal|normal-|weak>
|
||||||
always_lazy_install = <Whether to perform dependency installation on restart even in environments other than Windows.>
|
always_lazy_install = <Whether to perform dependency installation on restart even in environments other than Windows.>
|
||||||
network_mode = <Set the network mode => public|private|offline|personal_cloud>
|
network_mode = <Set the network mode => public|private|offline>
|
||||||
```
|
```
|
||||||
|
|
||||||
* network_mode:
|
* network_mode:
|
||||||
- public: An environment that uses a typical public network.
|
- public: An environment that uses a typical public network.
|
||||||
- private: An environment that uses a closed network, where a private node DB is configured via `channel_url`. (Uses cache if available)
|
- private: An environment that uses a closed network, where a private node DB is configured via `channel_url`. (Uses cache if available)
|
||||||
- offline: An environment that does not use any external connections when using an offline network. (Uses cache if available)
|
- offline: An environment that does not use any external connections when using an offline network. (Uses cache if available)
|
||||||
- personal_cloud: Applies relaxed security features in cloud environments such as Google Colab or Runpod, where strong security is not required.
|
|
||||||
|
|
||||||
|
|
||||||
## Additional Feature
|
## Additional Feature
|
||||||
@@ -313,33 +312,31 @@ When you run the `scan.sh` script:
|
|||||||
|
|
||||||
|
|
||||||
## Security policy
|
## Security policy
|
||||||
|
* Edit `config.ini` file: add `security_level = <LEVEL>`
|
||||||
|
* `strong`
|
||||||
|
* doesn't allow `high` and `middle` level risky feature
|
||||||
|
* `normal`
|
||||||
|
* doesn't allow `high` level risky feature
|
||||||
|
* `middle` level risky feature is available
|
||||||
|
* `normal-`
|
||||||
|
* doesn't allow `high` level risky feature if `--listen` is specified and not starts with `127.`
|
||||||
|
* `middle` level risky feature is available
|
||||||
|
* `weak`
|
||||||
|
* all feature is available
|
||||||
|
|
||||||
The security settings are applied based on whether the ComfyUI server's listener is non-local and whether the network mode is set to `personal_cloud`.
|
* `high` level risky features
|
||||||
|
* `Install via git url`, `pip install`
|
||||||
|
* Installation of custom nodes registered not in the `default channel`.
|
||||||
|
* Fix custom nodes
|
||||||
|
|
||||||
* **non-local**: When the server is launched with `--listen` and is bound to a network range other than the local `127.` range, allowing remote IP access.
|
* `middle` level risky features
|
||||||
* **personal\_cloud**: When the `network_mode` is set to `personal_cloud`.
|
* Uninstall/Update
|
||||||
|
* Installation of custom nodes registered in the `default channel`.
|
||||||
|
* Restore/Remove Snapshot
|
||||||
### Risky Level Table
|
* Restart
|
||||||
|
|
||||||
| Risky Level | features |
|
|
||||||
|-------------|---------------------------------------------------------------------------------------------------------------------------------------|
|
|
||||||
| high+ | * `Install via git url`, `pip install`<BR>* Installation of nodepack registered not in the `default channel`. |
|
|
||||||
| high | * Fix nodepack |
|
|
||||||
| middle+ | * Uninstall/Update<BR>* Installation of nodepack registered in the `default channel`.<BR>* Restore/Remove Snapshot<BR>* Install model |
|
|
||||||
| middle | * Restart |
|
|
||||||
| low | * Update ComfyUI |
|
|
||||||
|
|
||||||
|
|
||||||
### Security Level Table
|
|
||||||
|
|
||||||
| Security Level | local | non-local (personal_cloud) | non-local (not personal_cloud) |
|
|
||||||
|----------------|--------------------------------------------------------------------------------------------------------------------------|--------------------------------------------------------------------------------------------------------------------------|--------------------------------|
|
|
||||||
| strong | * Only `weak` level risky features are allowed | * Only `weak` level risky features are allowed | * Only `weak` level risky features are allowed |
|
|
||||||
| normal | * `high+` and `high` level risky features are not allowed<BR>* `middle+` and `middle` level risky features are available | * `high+` and `high` level risky features are not allowed<BR>* `middle+` and `middle` level risky features are available | * `high+`, `high` and `middle+` level risky features are not allowed<BR>* `middle` level risky features are available
|
|
||||||
| normal- | * All features are available | * `high+` and `high` level risky features are not allowed<BR>* `middle+` and `middle` level risky features are available | * `high+`, `high` and `middle+` level risky features are not allowed<BR>* `middle` level risky features are available
|
|
||||||
| weak | * All features are available | * All features are available | * `high+` and `middle+` level risky features are not allowed<BR>* `high`, `middle` and `low` level risky features are available
|
|
||||||
|
|
||||||
|
* `low` level risky features
|
||||||
|
* Update ComfyUI
|
||||||
|
|
||||||
|
|
||||||
# Disclaimer
|
# Disclaimer
|
||||||
|
|||||||
6
channels.list.template
Normal file
6
channels.list.template
Normal file
@@ -0,0 +1,6 @@
|
|||||||
|
default::https://raw.githubusercontent.com/ltdrdata/ComfyUI-Manager/main
|
||||||
|
recent::https://raw.githubusercontent.com/ltdrdata/ComfyUI-Manager/main/node_db/new
|
||||||
|
legacy::https://raw.githubusercontent.com/ltdrdata/ComfyUI-Manager/main/node_db/legacy
|
||||||
|
forked::https://raw.githubusercontent.com/ltdrdata/ComfyUI-Manager/main/node_db/forked
|
||||||
|
dev::https://raw.githubusercontent.com/ltdrdata/ComfyUI-Manager/main/node_db/dev
|
||||||
|
tutorial::https://raw.githubusercontent.com/ltdrdata/ComfyUI-Manager/main/node_db/tutorial
|
||||||
2
cm-cli.sh
Executable file
2
cm-cli.sh
Executable file
@@ -0,0 +1,2 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
python ./comfyui_manager/cm-cli.py $*
|
||||||
@@ -1,49 +0,0 @@
|
|||||||
# ComfyUI-Manager: Core Backend (glob)
|
|
||||||
|
|
||||||
This directory contains the Python backend modules that power ComfyUI-Manager, handling the core functionality of node management, downloading, security, and server operations.
|
|
||||||
|
|
||||||
## Directory Structure
|
|
||||||
- **glob/** - code for new cacheless ComfyUI-Manager
|
|
||||||
- **legacy/** - code for legacy ComfyUI-Manager
|
|
||||||
|
|
||||||
## Core Modules
|
|
||||||
- **manager_core.py**: The central implementation of management functions, handling configuration, installation, updates, and node management.
|
|
||||||
- **manager_server.py**: Implements server functionality and API endpoints for the web interface to interact with the backend.
|
|
||||||
|
|
||||||
## Specialized Modules
|
|
||||||
|
|
||||||
- **share_3rdparty.py**: Manages integration with third-party sharing platforms.
|
|
||||||
|
|
||||||
## Architecture
|
|
||||||
|
|
||||||
The backend follows a modular design pattern with clear separation of concerns:
|
|
||||||
|
|
||||||
1. **Core Layer**: Manager modules provide the primary API and business logic
|
|
||||||
2. **Utility Layer**: Helper modules provide specialized functionality
|
|
||||||
3. **Integration Layer**: Modules that connect to external systems
|
|
||||||
|
|
||||||
## Security Model
|
|
||||||
|
|
||||||
The system implements a comprehensive security framework with multiple levels:
|
|
||||||
|
|
||||||
- **Block**: Highest security - blocks most remote operations
|
|
||||||
- **High**: Allows only specific trusted operations
|
|
||||||
- **Middle**: Standard security for most users
|
|
||||||
- **Normal-**: More permissive for advanced users
|
|
||||||
- **Weak**: Lowest security for development environments
|
|
||||||
|
|
||||||
## Implementation Details
|
|
||||||
|
|
||||||
- The backend is designed to work seamlessly with ComfyUI
|
|
||||||
- Asynchronous task queuing is implemented for background operations
|
|
||||||
- The system supports multiple installation modes
|
|
||||||
- Error handling and risk assessment are integrated throughout the codebase
|
|
||||||
|
|
||||||
## API Integration
|
|
||||||
|
|
||||||
The backend exposes a REST API via `manager_server.py` that enables:
|
|
||||||
- Custom node management (install, update, disable, remove)
|
|
||||||
- Model downloading and organization
|
|
||||||
- System configuration
|
|
||||||
- Snapshot management
|
|
||||||
- Workflow component handling
|
|
||||||
@@ -1,10 +1,8 @@
|
|||||||
import os
|
import os
|
||||||
import logging
|
import logging
|
||||||
from aiohttp import web
|
|
||||||
from .common.manager_security import HANDLER_POLICY
|
|
||||||
from .common import manager_security
|
|
||||||
from comfy.cli_args import args
|
from comfy.cli_args import args
|
||||||
|
|
||||||
|
ENABLE_LEGACY_COMFYUI_MANAGER_FRONT_DEFAULT = True # Enable legacy ComfyUI Manager frontend while new UI is in beta phase
|
||||||
|
|
||||||
def prestartup():
|
def prestartup():
|
||||||
from . import prestartup_script # noqa: F401
|
from . import prestartup_script # noqa: F401
|
||||||
@@ -13,28 +11,17 @@ def prestartup():
|
|||||||
|
|
||||||
def start():
|
def start():
|
||||||
logging.info('[START] ComfyUI-Manager')
|
logging.info('[START] ComfyUI-Manager')
|
||||||
from .common import cm_global # noqa: F401
|
from .glob import manager_server # noqa: F401
|
||||||
|
from .glob import share_3rdparty # noqa: F401
|
||||||
|
from .glob import cm_global # noqa: F401
|
||||||
|
|
||||||
if args.enable_manager:
|
should_show_legacy_manager_front = os.environ.get('ENABLE_LEGACY_COMFYUI_MANAGER_FRONT', 'false') == 'true' or ENABLE_LEGACY_COMFYUI_MANAGER_FRONT_DEFAULT
|
||||||
if args.enable_manager_legacy_ui:
|
if not args.disable_manager and should_show_legacy_manager_front:
|
||||||
try:
|
try:
|
||||||
from .legacy import manager_server # noqa: F401
|
|
||||||
from .legacy import share_3rdparty # noqa: F401
|
|
||||||
from .legacy import manager_core as core
|
|
||||||
import nodes
|
import nodes
|
||||||
|
|
||||||
logging.info("[ComfyUI-Manager] Legacy UI is enabled.")
|
|
||||||
nodes.EXTENSION_WEB_DIRS['comfyui-manager-legacy'] = os.path.join(os.path.dirname(__file__), 'js')
|
nodes.EXTENSION_WEB_DIRS['comfyui-manager-legacy'] = os.path.join(os.path.dirname(__file__), 'js')
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
print("Error enabling legacy ComfyUI Manager frontend:", e)
|
print("Error enabling legacy ComfyUI Manager frontend:", e)
|
||||||
core = None
|
|
||||||
else:
|
|
||||||
from .glob import manager_server # noqa: F401
|
|
||||||
from .glob import share_3rdparty # noqa: F401
|
|
||||||
from .glob import manager_core as core
|
|
||||||
|
|
||||||
if core is not None:
|
|
||||||
manager_security.is_personal_cloud_mode = core.get_config()['network_mode'].lower() == 'personal_cloud'
|
|
||||||
|
|
||||||
|
|
||||||
def should_be_disabled(fullpath:str) -> bool:
|
def should_be_disabled(fullpath:str) -> bool:
|
||||||
@@ -42,7 +29,8 @@ def should_be_disabled(fullpath:str) -> bool:
|
|||||||
1. Disables the legacy ComfyUI-Manager.
|
1. Disables the legacy ComfyUI-Manager.
|
||||||
2. The blocklist can be expanded later based on policies.
|
2. The blocklist can be expanded later based on policies.
|
||||||
"""
|
"""
|
||||||
if args.enable_manager:
|
|
||||||
|
if not args.disable_manager:
|
||||||
# In cases where installation is done via a zip archive, the directory name may not be comfyui-manager, and it may not contain a git repository.
|
# In cases where installation is done via a zip archive, the directory name may not be comfyui-manager, and it may not contain a git repository.
|
||||||
# It is assumed that any installed legacy ComfyUI-Manager will have at least 'comfyui-manager' in its directory name.
|
# It is assumed that any installed legacy ComfyUI-Manager will have at least 'comfyui-manager' in its directory name.
|
||||||
dir_name = os.path.basename(fullpath).lower()
|
dir_name = os.path.basename(fullpath).lower()
|
||||||
@@ -50,55 +38,3 @@ def should_be_disabled(fullpath:str) -> bool:
|
|||||||
return True
|
return True
|
||||||
|
|
||||||
return False
|
return False
|
||||||
|
|
||||||
|
|
||||||
def get_client_ip(request):
|
|
||||||
peername = request.transport.get_extra_info("peername")
|
|
||||||
if peername is not None:
|
|
||||||
host, port = peername
|
|
||||||
return host
|
|
||||||
|
|
||||||
return "unknown"
|
|
||||||
|
|
||||||
|
|
||||||
def create_middleware():
|
|
||||||
connected_clients = set()
|
|
||||||
is_local_mode = manager_security.is_loopback(args.listen)
|
|
||||||
|
|
||||||
@web.middleware
|
|
||||||
async def manager_middleware(request: web.Request, handler):
|
|
||||||
nonlocal connected_clients
|
|
||||||
|
|
||||||
# security policy for remote environments
|
|
||||||
prev_client_count = len(connected_clients)
|
|
||||||
client_ip = get_client_ip(request)
|
|
||||||
connected_clients.add(client_ip)
|
|
||||||
next_client_count = len(connected_clients)
|
|
||||||
|
|
||||||
if prev_client_count == 1 and next_client_count > 1:
|
|
||||||
manager_security.multiple_remote_alert()
|
|
||||||
|
|
||||||
policy = manager_security.get_handler_policy(handler)
|
|
||||||
is_banned = False
|
|
||||||
|
|
||||||
# policy check
|
|
||||||
if len(connected_clients) > 1:
|
|
||||||
if is_local_mode:
|
|
||||||
if HANDLER_POLICY.MULTIPLE_REMOTE_BAN_NON_LOCAL in policy:
|
|
||||||
is_banned = True
|
|
||||||
if HANDLER_POLICY.MULTIPLE_REMOTE_BAN_NOT_PERSONAL_CLOUD in policy:
|
|
||||||
is_banned = not manager_security.is_personal_cloud_mode
|
|
||||||
|
|
||||||
if HANDLER_POLICY.BANNED in policy:
|
|
||||||
is_banned = True
|
|
||||||
|
|
||||||
if is_banned:
|
|
||||||
logging.warning(f"[Manager] Banning request from {client_ip}: {request.path}")
|
|
||||||
response = web.Response(text="[Manager] This request is banned.", status=403)
|
|
||||||
else:
|
|
||||||
response: web.Response = await handler(request)
|
|
||||||
|
|
||||||
return response
|
|
||||||
|
|
||||||
return manager_middleware
|
|
||||||
|
|
||||||
@@ -1,6 +0,0 @@
|
|||||||
default::https://raw.githubusercontent.com/Comfy-Org/ComfyUI-Manager/main
|
|
||||||
recent::https://raw.githubusercontent.com/Comfy-Org/ComfyUI-Manager/main/node_db/new
|
|
||||||
legacy::https://raw.githubusercontent.com/Comfy-Org/ComfyUI-Manager/main/node_db/legacy
|
|
||||||
forked::https://raw.githubusercontent.com/Comfy-Org/ComfyUI-Manager/main/node_db/forked
|
|
||||||
dev::https://raw.githubusercontent.com/Comfy-Org/ComfyUI-Manager/main/node_db/dev
|
|
||||||
tutorial::https://raw.githubusercontent.com/Comfy-Org/ComfyUI-Manager/main/node_db/tutorial
|
|
||||||
@@ -15,7 +15,7 @@ import git
|
|||||||
import importlib
|
import importlib
|
||||||
|
|
||||||
|
|
||||||
from ..common import manager_util
|
import manager_util
|
||||||
|
|
||||||
# read env vars
|
# read env vars
|
||||||
# COMFYUI_FOLDERS_BASE_PATH is not required in cm-cli.py
|
# COMFYUI_FOLDERS_BASE_PATH is not required in cm-cli.py
|
||||||
@@ -35,18 +35,16 @@ if not os.path.exists(os.path.join(comfy_path, 'folder_paths.py')):
|
|||||||
|
|
||||||
|
|
||||||
import utils.extra_config
|
import utils.extra_config
|
||||||
from ..common import cm_global
|
from .glob import cm_global
|
||||||
from ..glob import manager_core as core
|
from .glob import manager_core as core
|
||||||
from ..common import context
|
from .glob.manager_core import unified_manager
|
||||||
from ..glob.manager_core import unified_manager
|
from .glob import cnr_utils
|
||||||
from ..common import cnr_utils
|
|
||||||
|
|
||||||
comfyui_manager_path = os.path.abspath(os.path.dirname(__file__))
|
comfyui_manager_path = os.path.abspath(os.path.dirname(__file__))
|
||||||
|
|
||||||
cm_global.pip_blacklist = {'torch', 'torchaudio', 'torchsde', 'torchvision'}
|
cm_global.pip_blacklist = {'torch', 'torchsde', 'torchvision'}
|
||||||
cm_global.pip_downgrade_blacklist = ['torch', 'torchaudio', 'torchsde', 'torchvision', 'transformers', 'safetensors', 'kornia']
|
cm_global.pip_downgrade_blacklist = ['torch', 'torchsde', 'torchvision', 'transformers', 'safetensors', 'kornia']
|
||||||
|
cm_global.pip_overrides = {'numpy': 'numpy<2'}
|
||||||
cm_global.pip_overrides = {}
|
|
||||||
|
|
||||||
if os.path.exists(os.path.join(manager_util.comfyui_manager_path, "pip_overrides.json")):
|
if os.path.exists(os.path.join(manager_util.comfyui_manager_path, "pip_overrides.json")):
|
||||||
with open(os.path.join(manager_util.comfyui_manager_path, "pip_overrides.json"), 'r', encoding="UTF-8", errors="ignore") as json_file:
|
with open(os.path.join(manager_util.comfyui_manager_path, "pip_overrides.json"), 'r', encoding="UTF-8", errors="ignore") as json_file:
|
||||||
@@ -66,7 +64,7 @@ def check_comfyui_hash():
|
|||||||
repo = git.Repo(comfy_path)
|
repo = git.Repo(comfy_path)
|
||||||
core.comfy_ui_revision = len(list(repo.iter_commits('HEAD')))
|
core.comfy_ui_revision = len(list(repo.iter_commits('HEAD')))
|
||||||
core.comfy_ui_commit_datetime = repo.head.commit.committed_datetime
|
core.comfy_ui_commit_datetime = repo.head.commit.committed_datetime
|
||||||
except Exception:
|
except:
|
||||||
print('[bold yellow]INFO: Frozen ComfyUI mode.[/bold yellow]')
|
print('[bold yellow]INFO: Frozen ComfyUI mode.[/bold yellow]')
|
||||||
core.comfy_ui_revision = 0
|
core.comfy_ui_revision = 0
|
||||||
core.comfy_ui_commit_datetime = 0
|
core.comfy_ui_commit_datetime = 0
|
||||||
@@ -82,7 +80,7 @@ def read_downgrade_blacklist():
|
|||||||
try:
|
try:
|
||||||
import configparser
|
import configparser
|
||||||
config = configparser.ConfigParser(strict=False)
|
config = configparser.ConfigParser(strict=False)
|
||||||
config.read(context.manager_config_path)
|
config.read(core.manager_config.path)
|
||||||
default_conf = config['default']
|
default_conf = config['default']
|
||||||
|
|
||||||
if 'downgrade_blacklist' in default_conf:
|
if 'downgrade_blacklist' in default_conf:
|
||||||
@@ -90,7 +88,7 @@ def read_downgrade_blacklist():
|
|||||||
items = [x.strip() for x in items if x != '']
|
items = [x.strip() for x in items if x != '']
|
||||||
cm_global.pip_downgrade_blacklist += items
|
cm_global.pip_downgrade_blacklist += items
|
||||||
cm_global.pip_downgrade_blacklist = list(set(cm_global.pip_downgrade_blacklist))
|
cm_global.pip_downgrade_blacklist = list(set(cm_global.pip_downgrade_blacklist))
|
||||||
except Exception:
|
except:
|
||||||
pass
|
pass
|
||||||
|
|
||||||
|
|
||||||
@@ -105,7 +103,7 @@ class Ctx:
|
|||||||
self.no_deps = False
|
self.no_deps = False
|
||||||
self.mode = 'cache'
|
self.mode = 'cache'
|
||||||
self.user_directory = None
|
self.user_directory = None
|
||||||
self.custom_nodes_paths = [os.path.join(context.comfy_base_path, 'custom_nodes')]
|
self.custom_nodes_paths = [os.path.join(core.comfy_base_path, 'custom_nodes')]
|
||||||
self.manager_files_directory = os.path.dirname(__file__)
|
self.manager_files_directory = os.path.dirname(__file__)
|
||||||
|
|
||||||
if Ctx.folder_paths is None:
|
if Ctx.folder_paths is None:
|
||||||
@@ -129,7 +127,8 @@ class Ctx:
|
|||||||
if channel is not None:
|
if channel is not None:
|
||||||
self.channel = channel
|
self.channel = channel
|
||||||
|
|
||||||
unified_manager.reload()
|
asyncio.run(unified_manager.reload(cache_mode=self.mode, dont_wait=False))
|
||||||
|
asyncio.run(unified_manager.load_nightly(self.channel, self.mode))
|
||||||
|
|
||||||
def set_no_deps(self, no_deps):
|
def set_no_deps(self, no_deps):
|
||||||
self.no_deps = no_deps
|
self.no_deps = no_deps
|
||||||
@@ -142,14 +141,15 @@ class Ctx:
|
|||||||
if os.path.exists(extra_model_paths_yaml):
|
if os.path.exists(extra_model_paths_yaml):
|
||||||
utils.extra_config.load_extra_path_config(extra_model_paths_yaml)
|
utils.extra_config.load_extra_path_config(extra_model_paths_yaml)
|
||||||
|
|
||||||
context.update_user_directory(user_directory)
|
core.update_user_directory(user_directory)
|
||||||
|
|
||||||
if os.path.exists(context.manager_pip_overrides_path):
|
if os.path.exists(core.manager_pip_overrides_path):
|
||||||
with open(context.manager_pip_overrides_path, 'r', encoding="UTF-8", errors="ignore") as json_file:
|
with open(core.manager_pip_overrides_path, 'r', encoding="UTF-8", errors="ignore") as json_file:
|
||||||
cm_global.pip_overrides = json.load(json_file)
|
cm_global.pip_overrides = json.load(json_file)
|
||||||
|
cm_global.pip_overrides = {'numpy': 'numpy<2'}
|
||||||
|
|
||||||
if os.path.exists(context.manager_pip_blacklist_path):
|
if os.path.exists(core.manager_pip_blacklist_path):
|
||||||
with open(context.manager_pip_blacklist_path, 'r', encoding="UTF-8", errors="ignore") as f:
|
with open(core.manager_pip_blacklist_path, 'r', encoding="UTF-8", errors="ignore") as f:
|
||||||
for x in f.readlines():
|
for x in f.readlines():
|
||||||
y = x.strip()
|
y = x.strip()
|
||||||
if y != '':
|
if y != '':
|
||||||
@@ -162,15 +162,15 @@ class Ctx:
|
|||||||
|
|
||||||
@staticmethod
|
@staticmethod
|
||||||
def get_startup_scripts_path():
|
def get_startup_scripts_path():
|
||||||
return os.path.join(context.manager_startup_script_path, "install-scripts.txt")
|
return os.path.join(core.manager_startup_script_path, "install-scripts.txt")
|
||||||
|
|
||||||
@staticmethod
|
@staticmethod
|
||||||
def get_restore_snapshot_path():
|
def get_restore_snapshot_path():
|
||||||
return os.path.join(context.manager_startup_script_path, "restore-snapshot.json")
|
return os.path.join(core.manager_startup_script_path, "restore-snapshot.json")
|
||||||
|
|
||||||
@staticmethod
|
@staticmethod
|
||||||
def get_snapshot_path():
|
def get_snapshot_path():
|
||||||
return context.manager_snapshot_path
|
return core.manager_snapshot_path
|
||||||
|
|
||||||
@staticmethod
|
@staticmethod
|
||||||
def get_custom_nodes_paths():
|
def get_custom_nodes_paths():
|
||||||
@@ -183,23 +183,13 @@ class Ctx:
|
|||||||
cmd_ctx = Ctx()
|
cmd_ctx = Ctx()
|
||||||
|
|
||||||
|
|
||||||
def install_node(node_spec_str, is_all=False, cnt_msg='', **kwargs):
|
def install_node(node_spec_str, is_all=False, cnt_msg=''):
|
||||||
exit_on_fail = kwargs.get('exit_on_fail', False)
|
if core.is_valid_url(node_spec_str):
|
||||||
print(f"install_node exit on fail:{exit_on_fail}...")
|
# install via urls
|
||||||
|
res = asyncio.run(core.gitclone_install(node_spec_str, no_deps=cmd_ctx.no_deps))
|
||||||
if unified_manager.is_url_like(node_spec_str):
|
|
||||||
# install via git URLs
|
|
||||||
repo_name = os.path.basename(node_spec_str)
|
|
||||||
if repo_name.endswith('.git'):
|
|
||||||
repo_name = repo_name[:-4]
|
|
||||||
res = asyncio.run(unified_manager.repo_install(
|
|
||||||
node_spec_str, repo_name, instant_execution=True, no_deps=cmd_ctx.no_deps
|
|
||||||
))
|
|
||||||
if not res.result:
|
if not res.result:
|
||||||
print(res.msg)
|
print(res.msg)
|
||||||
print(f"[bold red]ERROR: An error occurred while installing '{node_spec_str}'.[/bold red]")
|
print(f"[bold red]ERROR: An error occurred while installing '{node_spec_str}'.[/bold red]")
|
||||||
if exit_on_fail:
|
|
||||||
sys.exit(1)
|
|
||||||
else:
|
else:
|
||||||
print(f"{cnt_msg} [INSTALLED] {node_spec_str:50}")
|
print(f"{cnt_msg} [INSTALLED] {node_spec_str:50}")
|
||||||
else:
|
else:
|
||||||
@@ -228,14 +218,12 @@ def install_node(node_spec_str, is_all=False, cnt_msg='', **kwargs):
|
|||||||
print(f"{cnt_msg} [INSTALLED] {node_name:50}[{res.target}]")
|
print(f"{cnt_msg} [INSTALLED] {node_name:50}[{res.target}]")
|
||||||
elif res.action == 'switch-cnr' and res.result:
|
elif res.action == 'switch-cnr' and res.result:
|
||||||
print(f"{cnt_msg} [INSTALLED] {node_name:50}[{res.target}]")
|
print(f"{cnt_msg} [INSTALLED] {node_name:50}[{res.target}]")
|
||||||
elif (res.action == 'switch-cnr' or res.action == 'install-cnr') and not res.result and cnr_utils.get_nodepack(node_name):
|
elif (res.action == 'switch-cnr' or res.action == 'install-cnr') and not res.result and node_name in unified_manager.cnr_map:
|
||||||
print(f"\nAvailable version of '{node_name}'")
|
print(f"\nAvailable version of '{node_name}'")
|
||||||
show_versions(node_name)
|
show_versions(node_name)
|
||||||
print("")
|
print("")
|
||||||
else:
|
else:
|
||||||
print(f"[bold red]ERROR: An error occurred while installing '{node_name}'.\n{res.msg}[/bold red]")
|
print(f"[bold red]ERROR: An error occurred while installing '{node_name}'.\n{res.msg}[/bold red]")
|
||||||
if exit_on_fail:
|
|
||||||
sys.exit(1)
|
|
||||||
|
|
||||||
|
|
||||||
def reinstall_node(node_spec_str, is_all=False, cnt_msg=''):
|
def reinstall_node(node_spec_str, is_all=False, cnt_msg=''):
|
||||||
@@ -319,10 +307,10 @@ def update_parallel(nodes):
|
|||||||
if 'all' in nodes:
|
if 'all' in nodes:
|
||||||
is_all = True
|
is_all = True
|
||||||
nodes = []
|
nodes = []
|
||||||
for packages in unified_manager.installed_node_packages.values():
|
for x in unified_manager.active_nodes.keys():
|
||||||
for pack in packages:
|
nodes.append(x)
|
||||||
if pack.is_enabled:
|
for x in unified_manager.unknown_active_nodes.keys():
|
||||||
nodes.append(pack.id)
|
nodes.append(x+"@unknown")
|
||||||
else:
|
else:
|
||||||
nodes = [x for x in nodes if x.lower() not in ['comfy', 'comfyui']]
|
nodes = [x for x in nodes if x.lower() not in ['comfy', 'comfyui']]
|
||||||
|
|
||||||
@@ -420,60 +408,109 @@ def disable_node(node_spec_str: str, is_all=False, cnt_msg=''):
|
|||||||
|
|
||||||
|
|
||||||
def show_list(kind, simple=False):
|
def show_list(kind, simple=False):
|
||||||
"""
|
custom_nodes = asyncio.run(unified_manager.get_custom_nodes(channel=cmd_ctx.channel, mode=cmd_ctx.mode))
|
||||||
Show installed nodepacks only with on-demand metadata retrieval
|
|
||||||
Supported kinds: 'installed', 'enabled', 'disabled'
|
|
||||||
"""
|
|
||||||
# Validate supported commands
|
|
||||||
if kind not in ['installed', 'enabled', 'disabled']:
|
|
||||||
print(f"[bold red]Unsupported: 'show {kind}'. Available options: installed/enabled/disabled[/bold red]")
|
|
||||||
print("Note: 'show all', 'show not-installed', and 'show cnr' are no longer supported.")
|
|
||||||
print("Use 'show installed' to see all installed packages.")
|
|
||||||
return
|
|
||||||
|
|
||||||
# Get all installed packages from glob unified_manager
|
# collect not-installed unknown nodes
|
||||||
all_packages = []
|
not_installed_unknown_nodes = []
|
||||||
for packages in unified_manager.installed_node_packages.values():
|
repo_unknown = {}
|
||||||
all_packages.extend(packages)
|
|
||||||
|
|
||||||
# Filter by status
|
for k, v in custom_nodes.items():
|
||||||
if kind == 'enabled':
|
if 'cnr_latest' not in v:
|
||||||
packages = [pkg for pkg in all_packages if pkg.is_enabled]
|
if len(v['files']) == 1:
|
||||||
elif kind == 'disabled':
|
repo_url = v['files'][0]
|
||||||
packages = [pkg for pkg in all_packages if pkg.is_disabled]
|
node_name = repo_url.split('/')[-1]
|
||||||
else: # 'installed'
|
if node_name not in unified_manager.unknown_inactive_nodes and node_name not in unified_manager.unknown_active_nodes:
|
||||||
packages = all_packages
|
not_installed_unknown_nodes.append(v)
|
||||||
|
|
||||||
# Display packages
|
|
||||||
for package in sorted(packages, key=lambda x: x.id):
|
|
||||||
# Basic info from InstalledNodePackage
|
|
||||||
status = "[ ENABLED ]" if package.is_enabled else "[ DISABLED ]"
|
|
||||||
|
|
||||||
# Enhanced info with on-demand CNR retrieval
|
|
||||||
display_name = package.id
|
|
||||||
author = "Unknown"
|
|
||||||
version = package.version
|
|
||||||
|
|
||||||
# Try to get additional info from CNR for better display
|
|
||||||
if package.is_from_cnr:
|
|
||||||
try:
|
|
||||||
cnr_info = cnr_utils.get_nodepack(package.id)
|
|
||||||
if cnr_info:
|
|
||||||
display_name = cnr_info.get('name', package.id)
|
|
||||||
if 'publisher' in cnr_info and 'name' in cnr_info['publisher']:
|
|
||||||
author = cnr_info['publisher']['name']
|
|
||||||
except Exception:
|
|
||||||
# Fallback to basic info if CNR lookup fails
|
|
||||||
pass
|
|
||||||
elif package.is_nightly:
|
|
||||||
version = "nightly"
|
|
||||||
elif package.is_unknown:
|
|
||||||
version = "unknown"
|
|
||||||
|
|
||||||
if simple:
|
|
||||||
print(f"{display_name}@{version}")
|
|
||||||
else:
|
else:
|
||||||
print(f"{status} {display_name:50} {package.id:30} (author: {author:20}) [{version}]")
|
repo_unknown[node_name] = v
|
||||||
|
|
||||||
|
processed = {}
|
||||||
|
unknown_processed = []
|
||||||
|
|
||||||
|
flag = kind in ['all', 'cnr', 'installed', 'enabled']
|
||||||
|
for k, v in unified_manager.active_nodes.items():
|
||||||
|
if flag:
|
||||||
|
cnr = unified_manager.cnr_map[k]
|
||||||
|
processed[k] = "[ ENABLED ] ", cnr['name'], k, cnr['publisher']['name'], v[0]
|
||||||
|
else:
|
||||||
|
processed[k] = None
|
||||||
|
|
||||||
|
if flag and kind != 'cnr':
|
||||||
|
for k, v in unified_manager.unknown_active_nodes.items():
|
||||||
|
item = repo_unknown.get(k)
|
||||||
|
|
||||||
|
if item is None:
|
||||||
|
continue
|
||||||
|
|
||||||
|
log_item = "[ ENABLED ] ", item['title'], k, item['author']
|
||||||
|
unknown_processed.append(log_item)
|
||||||
|
|
||||||
|
flag = kind in ['all', 'cnr', 'installed', 'disabled']
|
||||||
|
for k, v in unified_manager.cnr_inactive_nodes.items():
|
||||||
|
if k in processed:
|
||||||
|
continue
|
||||||
|
|
||||||
|
if flag:
|
||||||
|
cnr = unified_manager.cnr_map[k]
|
||||||
|
processed[k] = "[ DISABLED ] ", cnr['name'], k, cnr['publisher']['name'], ", ".join(list(v.keys()))
|
||||||
|
else:
|
||||||
|
processed[k] = None
|
||||||
|
|
||||||
|
for k, v in unified_manager.nightly_inactive_nodes.items():
|
||||||
|
if k in processed:
|
||||||
|
continue
|
||||||
|
|
||||||
|
if flag:
|
||||||
|
cnr = unified_manager.cnr_map[k]
|
||||||
|
processed[k] = "[ DISABLED ] ", cnr['name'], k, cnr['publisher']['name'], 'nightly'
|
||||||
|
else:
|
||||||
|
processed[k] = None
|
||||||
|
|
||||||
|
if flag and kind != 'cnr':
|
||||||
|
for k, v in unified_manager.unknown_inactive_nodes.items():
|
||||||
|
item = repo_unknown.get(k)
|
||||||
|
|
||||||
|
if item is None:
|
||||||
|
continue
|
||||||
|
|
||||||
|
log_item = "[ DISABLED ] ", item['title'], k, item['author']
|
||||||
|
unknown_processed.append(log_item)
|
||||||
|
|
||||||
|
flag = kind in ['all', 'cnr', 'not-installed']
|
||||||
|
for k, v in unified_manager.cnr_map.items():
|
||||||
|
if k in processed:
|
||||||
|
continue
|
||||||
|
|
||||||
|
if flag:
|
||||||
|
cnr = unified_manager.cnr_map[k]
|
||||||
|
ver_spec = v['latest_version']['version'] if 'latest_version' in v else '0.0.0'
|
||||||
|
processed[k] = "[ NOT INSTALLED ] ", cnr['name'], k, cnr['publisher']['name'], ver_spec
|
||||||
|
else:
|
||||||
|
processed[k] = None
|
||||||
|
|
||||||
|
if flag and kind != 'cnr':
|
||||||
|
for x in not_installed_unknown_nodes:
|
||||||
|
if len(x['files']) == 1:
|
||||||
|
node_id = os.path.basename(x['files'][0])
|
||||||
|
log_item = "[ NOT INSTALLED ] ", x['title'], node_id, x['author']
|
||||||
|
unknown_processed.append(log_item)
|
||||||
|
|
||||||
|
for x in processed.values():
|
||||||
|
if x is None:
|
||||||
|
continue
|
||||||
|
|
||||||
|
prefix, title, short_id, author, ver_spec = x
|
||||||
|
if simple:
|
||||||
|
print(title+'@'+ver_spec)
|
||||||
|
else:
|
||||||
|
print(f"{prefix} {title:50} {short_id:30} (author: {author:20}) \\[{ver_spec}]")
|
||||||
|
|
||||||
|
for x in unknown_processed:
|
||||||
|
prefix, title, short_id, author = x
|
||||||
|
if simple:
|
||||||
|
print(title+'@unknown')
|
||||||
|
else:
|
||||||
|
print(f"{prefix} {title:50} {short_id:30} (author: {author:20}) [UNKNOWN]")
|
||||||
|
|
||||||
|
|
||||||
async def show_snapshot(simple_mode=False):
|
async def show_snapshot(simple_mode=False):
|
||||||
@@ -514,18 +551,41 @@ async def auto_save_snapshot():
|
|||||||
|
|
||||||
|
|
||||||
def get_all_installed_node_specs():
|
def get_all_installed_node_specs():
|
||||||
"""
|
|
||||||
Get all installed node specifications using glob InstalledNodePackage data structure
|
|
||||||
"""
|
|
||||||
res = []
|
res = []
|
||||||
for packages in unified_manager.installed_node_packages.values():
|
processed = set()
|
||||||
for pack in packages:
|
for k, v in unified_manager.active_nodes.items():
|
||||||
node_spec_str = f"{pack.id}@{pack.version}"
|
node_spec_str = f"{k}@{v[0]}"
|
||||||
res.append(node_spec_str)
|
res.append(node_spec_str)
|
||||||
|
processed.add(k)
|
||||||
|
|
||||||
|
for k in unified_manager.cnr_inactive_nodes.keys():
|
||||||
|
if k in processed:
|
||||||
|
continue
|
||||||
|
|
||||||
|
latest = unified_manager.get_from_cnr_inactive_nodes(k)
|
||||||
|
if latest is not None:
|
||||||
|
node_spec_str = f"{k}@{str(latest[0])}"
|
||||||
|
res.append(node_spec_str)
|
||||||
|
|
||||||
|
for k in unified_manager.nightly_inactive_nodes.keys():
|
||||||
|
if k in processed:
|
||||||
|
continue
|
||||||
|
|
||||||
|
node_spec_str = f"{k}@nightly"
|
||||||
|
res.append(node_spec_str)
|
||||||
|
|
||||||
|
for k in unified_manager.unknown_active_nodes.keys():
|
||||||
|
node_spec_str = f"{k}@unknown"
|
||||||
|
res.append(node_spec_str)
|
||||||
|
|
||||||
|
for k in unified_manager.unknown_inactive_nodes.keys():
|
||||||
|
node_spec_str = f"{k}@unknown"
|
||||||
|
res.append(node_spec_str)
|
||||||
|
|
||||||
return res
|
return res
|
||||||
|
|
||||||
|
|
||||||
def for_each_nodes(nodes, act, allow_all=True, **kwargs):
|
def for_each_nodes(nodes, act, allow_all=True):
|
||||||
is_all = False
|
is_all = False
|
||||||
if allow_all and 'all' in nodes:
|
if allow_all and 'all' in nodes:
|
||||||
is_all = True
|
is_all = True
|
||||||
@@ -537,7 +597,7 @@ def for_each_nodes(nodes, act, allow_all=True, **kwargs):
|
|||||||
i = 1
|
i = 1
|
||||||
for x in nodes:
|
for x in nodes:
|
||||||
try:
|
try:
|
||||||
act(x, is_all=is_all, cnt_msg=f'{i}/{total}', **kwargs)
|
act(x, is_all=is_all, cnt_msg=f'{i}/{total}')
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
print(f"ERROR: {e}")
|
print(f"ERROR: {e}")
|
||||||
traceback.print_exc()
|
traceback.print_exc()
|
||||||
@@ -581,17 +641,13 @@ def install(
|
|||||||
None,
|
None,
|
||||||
help="user directory"
|
help="user directory"
|
||||||
),
|
),
|
||||||
exit_on_fail: bool = typer.Option(
|
|
||||||
False,
|
|
||||||
help="Exit on failure"
|
|
||||||
)
|
|
||||||
):
|
):
|
||||||
cmd_ctx.set_user_directory(user_directory)
|
cmd_ctx.set_user_directory(user_directory)
|
||||||
cmd_ctx.set_channel_mode(channel, mode)
|
cmd_ctx.set_channel_mode(channel, mode)
|
||||||
cmd_ctx.set_no_deps(no_deps)
|
cmd_ctx.set_no_deps(no_deps)
|
||||||
|
|
||||||
pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages(), comfy_path, context.manager_files_path)
|
pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages(), comfy_path, core.manager_files_path)
|
||||||
for_each_nodes(nodes, act=install_node, exit_on_fail=exit_on_fail)
|
for_each_nodes(nodes, act=install_node)
|
||||||
pip_fixer.fix_broken()
|
pip_fixer.fix_broken()
|
||||||
|
|
||||||
|
|
||||||
@@ -628,7 +684,7 @@ def reinstall(
|
|||||||
cmd_ctx.set_channel_mode(channel, mode)
|
cmd_ctx.set_channel_mode(channel, mode)
|
||||||
cmd_ctx.set_no_deps(no_deps)
|
cmd_ctx.set_no_deps(no_deps)
|
||||||
|
|
||||||
pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages(), comfy_path, context.manager_files_path)
|
pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages(), comfy_path, core.manager_files_path)
|
||||||
for_each_nodes(nodes, act=reinstall_node)
|
for_each_nodes(nodes, act=reinstall_node)
|
||||||
pip_fixer.fix_broken()
|
pip_fixer.fix_broken()
|
||||||
|
|
||||||
@@ -682,7 +738,7 @@ def update(
|
|||||||
if 'all' in nodes:
|
if 'all' in nodes:
|
||||||
asyncio.run(auto_save_snapshot())
|
asyncio.run(auto_save_snapshot())
|
||||||
|
|
||||||
pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages(), comfy_path, context.manager_files_path)
|
pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages(), comfy_path, core.manager_files_path)
|
||||||
|
|
||||||
for x in nodes:
|
for x in nodes:
|
||||||
if x.lower() in ['comfyui', 'comfy', 'all']:
|
if x.lower() in ['comfyui', 'comfy', 'all']:
|
||||||
@@ -783,7 +839,7 @@ def fix(
|
|||||||
if 'all' in nodes:
|
if 'all' in nodes:
|
||||||
asyncio.run(auto_save_snapshot())
|
asyncio.run(auto_save_snapshot())
|
||||||
|
|
||||||
pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages(), comfy_path, context.manager_files_path)
|
pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages(), comfy_path, core.manager_files_path)
|
||||||
for_each_nodes(nodes, fix_node, allow_all=True)
|
for_each_nodes(nodes, fix_node, allow_all=True)
|
||||||
pip_fixer.fix_broken()
|
pip_fixer.fix_broken()
|
||||||
|
|
||||||
@@ -1060,7 +1116,7 @@ def restore_snapshot(
|
|||||||
print(f"[bold red]ERROR: `{snapshot_path}` is not exists.[/bold red]")
|
print(f"[bold red]ERROR: `{snapshot_path}` is not exists.[/bold red]")
|
||||||
exit(1)
|
exit(1)
|
||||||
|
|
||||||
pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages(), comfy_path, context.manager_files_path)
|
pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages(), comfy_path, core.manager_files_path)
|
||||||
try:
|
try:
|
||||||
asyncio.run(core.restore_snapshot(snapshot_path, extras))
|
asyncio.run(core.restore_snapshot(snapshot_path, extras))
|
||||||
except Exception:
|
except Exception:
|
||||||
@@ -1092,7 +1148,7 @@ def restore_dependencies(
|
|||||||
total = len(node_paths)
|
total = len(node_paths)
|
||||||
i = 1
|
i = 1
|
||||||
|
|
||||||
pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages(), comfy_path, context.manager_files_path)
|
pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages(), comfy_path, core.manager_files_path)
|
||||||
for x in node_paths:
|
for x in node_paths:
|
||||||
print("----------------------------------------------------------------------------------------------------")
|
print("----------------------------------------------------------------------------------------------------")
|
||||||
print(f"Restoring [{i}/{total}]: {x}")
|
print(f"Restoring [{i}/{total}]: {x}")
|
||||||
@@ -1111,7 +1167,7 @@ def post_install(
|
|||||||
):
|
):
|
||||||
path = os.path.expanduser(path)
|
path = os.path.expanduser(path)
|
||||||
|
|
||||||
pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages(), comfy_path, context.manager_files_path)
|
pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages(), comfy_path, core.manager_files_path)
|
||||||
unified_manager.execute_install_script('', path, instant_execution=True)
|
unified_manager.execute_install_script('', path, instant_execution=True)
|
||||||
pip_fixer.fix_broken()
|
pip_fixer.fix_broken()
|
||||||
|
|
||||||
@@ -1151,11 +1207,11 @@ def install_deps(
|
|||||||
with open(deps, 'r', encoding="UTF-8", errors="ignore") as json_file:
|
with open(deps, 'r', encoding="UTF-8", errors="ignore") as json_file:
|
||||||
try:
|
try:
|
||||||
json_obj = json.load(json_file)
|
json_obj = json.load(json_file)
|
||||||
except Exception:
|
except:
|
||||||
print(f"[bold red]Invalid json file: {deps}[/bold red]")
|
print(f"[bold red]Invalid json file: {deps}[/bold red]")
|
||||||
exit(1)
|
exit(1)
|
||||||
|
|
||||||
pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages(), comfy_path, context.manager_files_path)
|
pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages(), comfy_path, core.manager_files_path)
|
||||||
for k in json_obj['custom_nodes'].keys():
|
for k in json_obj['custom_nodes'].keys():
|
||||||
state = core.simple_check_custom_node(k)
|
state = core.simple_check_custom_node(k)
|
||||||
if state == 'installed':
|
if state == 'installed':
|
||||||
@@ -1197,25 +1253,19 @@ def export_custom_node_ids(
|
|||||||
cmd_ctx.set_channel_mode(channel, mode)
|
cmd_ctx.set_channel_mode(channel, mode)
|
||||||
|
|
||||||
with open(path, "w", encoding='utf-8') as output_file:
|
with open(path, "w", encoding='utf-8') as output_file:
|
||||||
# Export CNR package IDs using cnr_utils
|
for x in unified_manager.cnr_map.keys():
|
||||||
try:
|
print(x, file=output_file)
|
||||||
all_cnr = cnr_utils.get_all_nodepackages()
|
|
||||||
for package_id in all_cnr.keys():
|
|
||||||
print(package_id, file=output_file)
|
|
||||||
except Exception:
|
|
||||||
# If CNR lookup fails, continue with installed packages
|
|
||||||
pass
|
|
||||||
|
|
||||||
# Export installed packages that are not from CNR
|
custom_nodes = asyncio.run(unified_manager.get_custom_nodes(channel=cmd_ctx.channel, mode=cmd_ctx.mode))
|
||||||
for packages in unified_manager.installed_node_packages.values():
|
for x in custom_nodes.values():
|
||||||
for pack in packages:
|
if 'cnr_latest' not in x:
|
||||||
if pack.is_unknown or pack.is_nightly:
|
if len(x['files']) == 1:
|
||||||
version_suffix = "@unknown" if pack.is_unknown else "@nightly"
|
repo_url = x['files'][0]
|
||||||
print(f"{pack.id}{version_suffix}", file=output_file)
|
node_id = repo_url.split('/')[-1]
|
||||||
|
print(f"{node_id}@unknown", file=output_file)
|
||||||
|
|
||||||
|
if 'id' in x:
|
||||||
def main():
|
print(f"{x['id']}@unknown", file=output_file)
|
||||||
app()
|
|
||||||
|
|
||||||
|
|
||||||
if __name__ == '__main__':
|
if __name__ == '__main__':
|
||||||
@@ -1,16 +0,0 @@
|
|||||||
# ComfyUI-Manager: Core Backend (glob)
|
|
||||||
|
|
||||||
This directory contains the Python backend modules that power ComfyUI-Manager, handling the core functionality of node management, downloading, security, and server operations.
|
|
||||||
|
|
||||||
## Core Modules
|
|
||||||
|
|
||||||
- **manager_downloader.py**: Handles downloading operations for models, extensions, and other resources.
|
|
||||||
- **manager_util.py**: Provides utility functions used throughout the system.
|
|
||||||
|
|
||||||
## Specialized Modules
|
|
||||||
|
|
||||||
- **cm_global.py**: Maintains global variables and state management across the system.
|
|
||||||
- **cnr_utils.py**: Helper utilities for interacting with the custom node registry (CNR).
|
|
||||||
- **git_utils.py**: Git-specific utilities for repository operations.
|
|
||||||
- **node_package.py**: Handles the packaging and installation of node extensions.
|
|
||||||
- **security_check.py**: Implements the multi-level security system for installation safety.
|
|
||||||
@@ -1,108 +0,0 @@
|
|||||||
import sys
|
|
||||||
import os
|
|
||||||
import logging
|
|
||||||
from . import manager_util
|
|
||||||
import toml
|
|
||||||
import git
|
|
||||||
|
|
||||||
|
|
||||||
# read env vars
|
|
||||||
comfy_path: str = os.environ.get('COMFYUI_PATH')
|
|
||||||
comfy_base_path = os.environ.get('COMFYUI_FOLDERS_BASE_PATH')
|
|
||||||
|
|
||||||
if comfy_path is None:
|
|
||||||
try:
|
|
||||||
comfy_path = os.path.abspath(os.path.dirname(sys.modules['__main__'].__file__))
|
|
||||||
os.environ['COMFYUI_PATH'] = comfy_path
|
|
||||||
except Exception:
|
|
||||||
logging.error("[ComfyUI-Manager] environment variable 'COMFYUI_PATH' is not specified.")
|
|
||||||
exit(-1)
|
|
||||||
|
|
||||||
if comfy_base_path is None:
|
|
||||||
comfy_base_path = comfy_path
|
|
||||||
|
|
||||||
channel_list_template_path = os.path.join(manager_util.comfyui_manager_path, 'channels.list.template')
|
|
||||||
git_script_path = os.path.join(manager_util.comfyui_manager_path, "git_helper.py")
|
|
||||||
|
|
||||||
manager_files_path = None
|
|
||||||
manager_config_path = None
|
|
||||||
manager_channel_list_path = None
|
|
||||||
manager_startup_script_path:str = None
|
|
||||||
manager_snapshot_path = None
|
|
||||||
manager_pip_overrides_path = None
|
|
||||||
manager_pip_blacklist_path = None
|
|
||||||
manager_components_path = None
|
|
||||||
manager_batch_history_path = None
|
|
||||||
|
|
||||||
def update_user_directory(user_dir):
|
|
||||||
global manager_files_path
|
|
||||||
global manager_config_path
|
|
||||||
global manager_channel_list_path
|
|
||||||
global manager_startup_script_path
|
|
||||||
global manager_snapshot_path
|
|
||||||
global manager_pip_overrides_path
|
|
||||||
global manager_pip_blacklist_path
|
|
||||||
global manager_components_path
|
|
||||||
global manager_batch_history_path
|
|
||||||
|
|
||||||
manager_files_path = os.path.abspath(os.path.join(user_dir, 'default', 'ComfyUI-Manager'))
|
|
||||||
if not os.path.exists(manager_files_path):
|
|
||||||
os.makedirs(manager_files_path)
|
|
||||||
|
|
||||||
manager_snapshot_path = os.path.join(manager_files_path, "snapshots")
|
|
||||||
if not os.path.exists(manager_snapshot_path):
|
|
||||||
os.makedirs(manager_snapshot_path)
|
|
||||||
|
|
||||||
manager_startup_script_path = os.path.join(manager_files_path, "startup-scripts")
|
|
||||||
if not os.path.exists(manager_startup_script_path):
|
|
||||||
os.makedirs(manager_startup_script_path)
|
|
||||||
|
|
||||||
manager_config_path = os.path.join(manager_files_path, 'config.ini')
|
|
||||||
manager_channel_list_path = os.path.join(manager_files_path, 'channels.list')
|
|
||||||
manager_pip_overrides_path = os.path.join(manager_files_path, "pip_overrides.json")
|
|
||||||
manager_pip_blacklist_path = os.path.join(manager_files_path, "pip_blacklist.list")
|
|
||||||
manager_components_path = os.path.join(manager_files_path, "components")
|
|
||||||
manager_util.cache_dir = os.path.join(manager_files_path, "cache")
|
|
||||||
manager_batch_history_path = os.path.join(manager_files_path, "batch_history")
|
|
||||||
|
|
||||||
if not os.path.exists(manager_util.cache_dir):
|
|
||||||
os.makedirs(manager_util.cache_dir)
|
|
||||||
|
|
||||||
if not os.path.exists(manager_batch_history_path):
|
|
||||||
os.makedirs(manager_batch_history_path)
|
|
||||||
|
|
||||||
try:
|
|
||||||
import folder_paths
|
|
||||||
update_user_directory(folder_paths.get_user_directory())
|
|
||||||
|
|
||||||
except Exception:
|
|
||||||
# fallback:
|
|
||||||
# This case is only possible when running with cm-cli, and in practice, this case is not actually used.
|
|
||||||
update_user_directory(os.path.abspath(manager_util.comfyui_manager_path))
|
|
||||||
|
|
||||||
|
|
||||||
def get_current_comfyui_ver():
|
|
||||||
"""
|
|
||||||
Extract version from pyproject.toml
|
|
||||||
"""
|
|
||||||
toml_path = os.path.join(comfy_path, 'pyproject.toml')
|
|
||||||
if not os.path.exists(toml_path):
|
|
||||||
return None
|
|
||||||
else:
|
|
||||||
try:
|
|
||||||
with open(toml_path, "r", encoding="utf-8") as f:
|
|
||||||
data = toml.load(f)
|
|
||||||
|
|
||||||
project = data.get('project', {})
|
|
||||||
return project.get('version')
|
|
||||||
except Exception:
|
|
||||||
return None
|
|
||||||
|
|
||||||
|
|
||||||
def get_comfyui_tag():
|
|
||||||
try:
|
|
||||||
with git.Repo(comfy_path) as repo:
|
|
||||||
return repo.git.describe('--tags')
|
|
||||||
except Exception:
|
|
||||||
return None
|
|
||||||
|
|
||||||
@@ -1,36 +0,0 @@
|
|||||||
from enum import Enum
|
|
||||||
|
|
||||||
is_personal_cloud_mode = False
|
|
||||||
handler_policy = {}
|
|
||||||
|
|
||||||
class HANDLER_POLICY(Enum):
|
|
||||||
MULTIPLE_REMOTE_BAN_NON_LOCAL = 1
|
|
||||||
MULTIPLE_REMOTE_BAN_NOT_PERSONAL_CLOUD = 2
|
|
||||||
BANNED = 3
|
|
||||||
|
|
||||||
|
|
||||||
def is_loopback(address):
|
|
||||||
import ipaddress
|
|
||||||
try:
|
|
||||||
return ipaddress.ip_address(address).is_loopback
|
|
||||||
except ValueError:
|
|
||||||
return False
|
|
||||||
|
|
||||||
|
|
||||||
def do_nothing():
|
|
||||||
pass
|
|
||||||
|
|
||||||
|
|
||||||
def get_handler_policy(x):
|
|
||||||
return handler_policy.get(x) or set()
|
|
||||||
|
|
||||||
def add_handler_policy(x, policy):
|
|
||||||
s = handler_policy.get(x)
|
|
||||||
if s is None:
|
|
||||||
s = set()
|
|
||||||
handler_policy[x] = s
|
|
||||||
|
|
||||||
s.add(policy)
|
|
||||||
|
|
||||||
|
|
||||||
multiple_remote_alert = do_nothing
|
|
||||||
@@ -1,68 +0,0 @@
|
|||||||
# Data Models
|
|
||||||
|
|
||||||
This directory contains Pydantic models for ComfyUI Manager, providing type safety, validation, and serialization for the API and internal data structures.
|
|
||||||
|
|
||||||
## Overview
|
|
||||||
|
|
||||||
- `generated_models.py` - All models auto-generated from OpenAPI spec
|
|
||||||
- `__init__.py` - Package exports for all models
|
|
||||||
|
|
||||||
**Note**: All models are now auto-generated from the OpenAPI specification. Manual model files (`task_queue.py`, `state_management.py`) have been deprecated in favor of a single source of truth.
|
|
||||||
|
|
||||||
## Generating Types from OpenAPI
|
|
||||||
|
|
||||||
The state management models are automatically generated from the OpenAPI specification using `datamodel-codegen`. This ensures type safety and consistency between the API specification and the Python code.
|
|
||||||
|
|
||||||
### Prerequisites
|
|
||||||
|
|
||||||
Install the code generator:
|
|
||||||
```bash
|
|
||||||
pipx install datamodel-code-generator
|
|
||||||
```
|
|
||||||
|
|
||||||
### Generation Command
|
|
||||||
|
|
||||||
To regenerate all models after updating the OpenAPI spec:
|
|
||||||
|
|
||||||
```bash
|
|
||||||
datamodel-codegen \
|
|
||||||
--use-subclass-enum \
|
|
||||||
--field-constraints \
|
|
||||||
--strict-types bytes \
|
|
||||||
--use-double-quotes \
|
|
||||||
--input openapi.yaml \
|
|
||||||
--output comfyui_manager/data_models/generated_models.py \
|
|
||||||
--output-model-type pydantic_v2.BaseModel
|
|
||||||
```
|
|
||||||
|
|
||||||
### When to Regenerate
|
|
||||||
|
|
||||||
You should regenerate the models when:
|
|
||||||
|
|
||||||
1. **Adding new API endpoints** that return new data structures
|
|
||||||
2. **Modifying existing schemas** in the OpenAPI specification
|
|
||||||
3. **Adding new state management features** that require new models
|
|
||||||
|
|
||||||
### Important Notes
|
|
||||||
|
|
||||||
- **Single source of truth**: All models are now generated from `openapi.yaml`
|
|
||||||
- **No manual models**: All previously manual models have been migrated to the OpenAPI spec
|
|
||||||
- **OpenAPI requirements**: New schemas must be referenced in API paths to be generated by datamodel-codegen
|
|
||||||
- **Validation**: Always validate the OpenAPI spec before generation:
|
|
||||||
```bash
|
|
||||||
python3 -c "import yaml; yaml.safe_load(open('openapi.yaml'))"
|
|
||||||
```
|
|
||||||
|
|
||||||
### Example: Adding New State Models
|
|
||||||
|
|
||||||
1. Add your schema to `openapi.yaml` under `components/schemas/`
|
|
||||||
2. Reference the schema in an API endpoint response
|
|
||||||
3. Run the generation command above
|
|
||||||
4. Update `__init__.py` to export the new models
|
|
||||||
5. Import and use the models in your code
|
|
||||||
|
|
||||||
### Troubleshooting
|
|
||||||
|
|
||||||
- **Models not generated**: Ensure schemas are under `components/schemas/` (not `parameters/`)
|
|
||||||
- **Missing models**: Verify schemas are referenced in at least one API path
|
|
||||||
- **Import errors**: Check that new models are added to `__init__.py` exports
|
|
||||||
@@ -1,139 +0,0 @@
|
|||||||
"""
|
|
||||||
Data models for ComfyUI Manager.
|
|
||||||
|
|
||||||
This package contains Pydantic models used throughout the ComfyUI Manager
|
|
||||||
for data validation, serialization, and type safety.
|
|
||||||
|
|
||||||
All models are auto-generated from the OpenAPI specification to ensure
|
|
||||||
consistency between the API and implementation.
|
|
||||||
"""
|
|
||||||
|
|
||||||
from .generated_models import (
|
|
||||||
# Core Task Queue Models
|
|
||||||
QueueTaskItem,
|
|
||||||
TaskHistoryItem,
|
|
||||||
TaskStateMessage,
|
|
||||||
TaskExecutionStatus,
|
|
||||||
|
|
||||||
# WebSocket Message Models
|
|
||||||
MessageTaskDone,
|
|
||||||
MessageTaskStarted,
|
|
||||||
MessageTaskFailed,
|
|
||||||
MessageUpdate,
|
|
||||||
ManagerMessageName,
|
|
||||||
|
|
||||||
# State Management Models
|
|
||||||
BatchExecutionRecord,
|
|
||||||
ComfyUISystemState,
|
|
||||||
BatchOperation,
|
|
||||||
InstalledNodeInfo,
|
|
||||||
InstalledModelInfo,
|
|
||||||
ComfyUIVersionInfo,
|
|
||||||
|
|
||||||
# Import Fail Info Models
|
|
||||||
ImportFailInfoBulkRequest,
|
|
||||||
ImportFailInfoBulkResponse,
|
|
||||||
ImportFailInfoItem,
|
|
||||||
ImportFailInfoItem1,
|
|
||||||
|
|
||||||
# Other models
|
|
||||||
OperationType,
|
|
||||||
OperationResult,
|
|
||||||
ManagerPackInfo,
|
|
||||||
ManagerPackInstalled,
|
|
||||||
SelectedVersion,
|
|
||||||
ManagerChannel,
|
|
||||||
ManagerDatabaseSource,
|
|
||||||
ManagerPackState,
|
|
||||||
ManagerPackInstallType,
|
|
||||||
ManagerPack,
|
|
||||||
InstallPackParams,
|
|
||||||
UpdatePackParams,
|
|
||||||
UpdateAllPacksParams,
|
|
||||||
UpdateComfyUIParams,
|
|
||||||
FixPackParams,
|
|
||||||
UninstallPackParams,
|
|
||||||
DisablePackParams,
|
|
||||||
EnablePackParams,
|
|
||||||
UpdateAllQueryParams,
|
|
||||||
UpdateComfyUIQueryParams,
|
|
||||||
ComfyUISwitchVersionQueryParams,
|
|
||||||
QueueStatus,
|
|
||||||
ManagerMappings,
|
|
||||||
ModelMetadata,
|
|
||||||
NodePackageMetadata,
|
|
||||||
SnapshotItem,
|
|
||||||
Error,
|
|
||||||
InstalledPacksResponse,
|
|
||||||
HistoryResponse,
|
|
||||||
HistoryListResponse,
|
|
||||||
InstallType,
|
|
||||||
SecurityLevel,
|
|
||||||
RiskLevel,
|
|
||||||
NetworkMode
|
|
||||||
)
|
|
||||||
|
|
||||||
__all__ = [
|
|
||||||
# Core Task Queue Models
|
|
||||||
"QueueTaskItem",
|
|
||||||
"TaskHistoryItem",
|
|
||||||
"TaskStateMessage",
|
|
||||||
"TaskExecutionStatus",
|
|
||||||
|
|
||||||
# WebSocket Message Models
|
|
||||||
"MessageTaskDone",
|
|
||||||
"MessageTaskStarted",
|
|
||||||
"MessageTaskFailed",
|
|
||||||
"MessageUpdate",
|
|
||||||
"ManagerMessageName",
|
|
||||||
|
|
||||||
# State Management Models
|
|
||||||
"BatchExecutionRecord",
|
|
||||||
"ComfyUISystemState",
|
|
||||||
"BatchOperation",
|
|
||||||
"InstalledNodeInfo",
|
|
||||||
"InstalledModelInfo",
|
|
||||||
"ComfyUIVersionInfo",
|
|
||||||
|
|
||||||
# Import Fail Info Models
|
|
||||||
"ImportFailInfoBulkRequest",
|
|
||||||
"ImportFailInfoBulkResponse",
|
|
||||||
"ImportFailInfoItem",
|
|
||||||
"ImportFailInfoItem1",
|
|
||||||
|
|
||||||
# Other models
|
|
||||||
"OperationType",
|
|
||||||
"OperationResult",
|
|
||||||
"ManagerPackInfo",
|
|
||||||
"ManagerPackInstalled",
|
|
||||||
"SelectedVersion",
|
|
||||||
"ManagerChannel",
|
|
||||||
"ManagerDatabaseSource",
|
|
||||||
"ManagerPackState",
|
|
||||||
"ManagerPackInstallType",
|
|
||||||
"ManagerPack",
|
|
||||||
"InstallPackParams",
|
|
||||||
"UpdatePackParams",
|
|
||||||
"UpdateAllPacksParams",
|
|
||||||
"UpdateComfyUIParams",
|
|
||||||
"FixPackParams",
|
|
||||||
"UninstallPackParams",
|
|
||||||
"DisablePackParams",
|
|
||||||
"EnablePackParams",
|
|
||||||
"UpdateAllQueryParams",
|
|
||||||
"UpdateComfyUIQueryParams",
|
|
||||||
"ComfyUISwitchVersionQueryParams",
|
|
||||||
"QueueStatus",
|
|
||||||
"ManagerMappings",
|
|
||||||
"ModelMetadata",
|
|
||||||
"NodePackageMetadata",
|
|
||||||
"SnapshotItem",
|
|
||||||
"Error",
|
|
||||||
"InstalledPacksResponse",
|
|
||||||
"HistoryResponse",
|
|
||||||
"HistoryListResponse",
|
|
||||||
"InstallType",
|
|
||||||
"SecurityLevel",
|
|
||||||
"RiskLevel",
|
|
||||||
"NetworkMode",
|
|
||||||
]
|
|
||||||
@@ -1,570 +0,0 @@
|
|||||||
# generated by datamodel-codegen:
|
|
||||||
# filename: openapi.yaml
|
|
||||||
# timestamp: 2025-11-01T04:21:38+00:00
|
|
||||||
|
|
||||||
from __future__ import annotations
|
|
||||||
|
|
||||||
from datetime import datetime
|
|
||||||
from enum import Enum
|
|
||||||
from typing import Any, Dict, List, Optional, Union
|
|
||||||
|
|
||||||
from pydantic import BaseModel, Field, RootModel
|
|
||||||
|
|
||||||
|
|
||||||
class OperationType(str, Enum):
|
|
||||||
install = "install"
|
|
||||||
uninstall = "uninstall"
|
|
||||||
update = "update"
|
|
||||||
update_comfyui = "update-comfyui"
|
|
||||||
fix = "fix"
|
|
||||||
disable = "disable"
|
|
||||||
enable = "enable"
|
|
||||||
install_model = "install-model"
|
|
||||||
|
|
||||||
|
|
||||||
class OperationResult(str, Enum):
|
|
||||||
success = "success"
|
|
||||||
failed = "failed"
|
|
||||||
skipped = "skipped"
|
|
||||||
error = "error"
|
|
||||||
skip = "skip"
|
|
||||||
|
|
||||||
|
|
||||||
class TaskExecutionStatus(BaseModel):
|
|
||||||
status_str: OperationResult
|
|
||||||
completed: bool = Field(..., description="Whether the task completed")
|
|
||||||
messages: List[str] = Field(..., description="Additional status messages")
|
|
||||||
|
|
||||||
|
|
||||||
class ManagerMessageName(str, Enum):
|
|
||||||
cm_task_completed = "cm-task-completed"
|
|
||||||
cm_task_started = "cm-task-started"
|
|
||||||
cm_queue_status = "cm-queue-status"
|
|
||||||
|
|
||||||
|
|
||||||
class ManagerPackInfo(BaseModel):
|
|
||||||
id: str = Field(
|
|
||||||
...,
|
|
||||||
description="Either github-author/github-repo or name of pack from the registry",
|
|
||||||
)
|
|
||||||
version: str = Field(..., description="Semantic version or Git commit hash")
|
|
||||||
ui_id: Optional[str] = Field(None, description="Task ID - generated internally")
|
|
||||||
|
|
||||||
|
|
||||||
class ManagerPackInstalled(BaseModel):
|
|
||||||
ver: str = Field(
|
|
||||||
...,
|
|
||||||
description="The version of the pack that is installed (Git commit hash or semantic version)",
|
|
||||||
)
|
|
||||||
cnr_id: Optional[str] = Field(
|
|
||||||
None,
|
|
||||||
description="The name of the pack if installed from the registry (normalized lowercase)",
|
|
||||||
)
|
|
||||||
original_name: Optional[str] = Field(
|
|
||||||
None,
|
|
||||||
description="The original case-preserved name of the pack from the registry",
|
|
||||||
)
|
|
||||||
aux_id: Optional[str] = Field(
|
|
||||||
None,
|
|
||||||
description="The name of the pack if installed from github (author/repo-name format)",
|
|
||||||
)
|
|
||||||
enabled: bool = Field(..., description="Whether the pack is enabled")
|
|
||||||
|
|
||||||
|
|
||||||
class SelectedVersion(str, Enum):
|
|
||||||
latest = "latest"
|
|
||||||
nightly = "nightly"
|
|
||||||
|
|
||||||
|
|
||||||
class ManagerChannel(str, Enum):
|
|
||||||
default = "default"
|
|
||||||
recent = "recent"
|
|
||||||
legacy = "legacy"
|
|
||||||
forked = "forked"
|
|
||||||
dev = "dev"
|
|
||||||
tutorial = "tutorial"
|
|
||||||
|
|
||||||
|
|
||||||
class ManagerDatabaseSource(str, Enum):
|
|
||||||
remote = "remote"
|
|
||||||
local = "local"
|
|
||||||
cache = "cache"
|
|
||||||
|
|
||||||
|
|
||||||
class ManagerPackState(str, Enum):
|
|
||||||
installed = "installed"
|
|
||||||
disabled = "disabled"
|
|
||||||
not_installed = "not_installed"
|
|
||||||
import_failed = "import_failed"
|
|
||||||
needs_update = "needs_update"
|
|
||||||
|
|
||||||
|
|
||||||
class ManagerPackInstallType(str, Enum):
|
|
||||||
git_clone = "git-clone"
|
|
||||||
copy = "copy"
|
|
||||||
cnr = "cnr"
|
|
||||||
|
|
||||||
|
|
||||||
class SecurityLevel(str, Enum):
|
|
||||||
strong = "strong"
|
|
||||||
normal = "normal"
|
|
||||||
normal_ = "normal-"
|
|
||||||
weak = "weak"
|
|
||||||
|
|
||||||
|
|
||||||
class NetworkMode(str, Enum):
|
|
||||||
public = "public"
|
|
||||||
private = "private"
|
|
||||||
offline = "offline"
|
|
||||||
|
|
||||||
|
|
||||||
class RiskLevel(str, Enum):
|
|
||||||
block = "block"
|
|
||||||
high_ = "high+"
|
|
||||||
high = "high"
|
|
||||||
middle_ = "middle+"
|
|
||||||
middle = "middle"
|
|
||||||
|
|
||||||
|
|
||||||
class UpdateState(Enum):
|
|
||||||
false = "false"
|
|
||||||
true = "true"
|
|
||||||
|
|
||||||
|
|
||||||
class ManagerPack(ManagerPackInfo):
|
|
||||||
author: Optional[str] = Field(
|
|
||||||
None, description="Pack author name or 'Unclaimed' if added via GitHub crawl"
|
|
||||||
)
|
|
||||||
files: Optional[List[str]] = Field(
|
|
||||||
None,
|
|
||||||
description="Repository URLs for installation (typically contains one GitHub URL)",
|
|
||||||
)
|
|
||||||
reference: Optional[str] = Field(
|
|
||||||
None, description="The type of installation reference"
|
|
||||||
)
|
|
||||||
title: Optional[str] = Field(None, description="The display name of the pack")
|
|
||||||
cnr_latest: Optional[SelectedVersion] = None
|
|
||||||
repository: Optional[str] = Field(None, description="GitHub repository URL")
|
|
||||||
state: Optional[ManagerPackState] = None
|
|
||||||
update_state: Optional[UpdateState] = Field(
|
|
||||||
None, alias="update-state", description="Update availability status"
|
|
||||||
)
|
|
||||||
stars: Optional[int] = Field(None, description="GitHub stars count")
|
|
||||||
last_update: Optional[datetime] = Field(None, description="Last update timestamp")
|
|
||||||
health: Optional[str] = Field(None, description="Health status of the pack")
|
|
||||||
description: Optional[str] = Field(None, description="Pack description")
|
|
||||||
trust: Optional[bool] = Field(None, description="Whether the pack is trusted")
|
|
||||||
install_type: Optional[ManagerPackInstallType] = None
|
|
||||||
|
|
||||||
|
|
||||||
class InstallPackParams(ManagerPackInfo):
|
|
||||||
selected_version: Union[str, SelectedVersion] = Field(
|
|
||||||
..., description="Semantic version, Git commit hash, latest, or nightly"
|
|
||||||
)
|
|
||||||
repository: Optional[str] = Field(
|
|
||||||
None,
|
|
||||||
description="GitHub repository URL (required if selected_version is nightly)",
|
|
||||||
)
|
|
||||||
pip: Optional[List[str]] = Field(None, description="PyPi dependency names")
|
|
||||||
mode: Optional[ManagerDatabaseSource] = None
|
|
||||||
channel: Optional[ManagerChannel] = None
|
|
||||||
skip_post_install: Optional[bool] = Field(
|
|
||||||
None, description="Whether to skip post-installation steps"
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
class UpdateAllPacksParams(BaseModel):
|
|
||||||
mode: Optional[ManagerDatabaseSource] = None
|
|
||||||
ui_id: Optional[str] = Field(None, description="Task ID - generated internally")
|
|
||||||
|
|
||||||
|
|
||||||
class UpdatePackParams(BaseModel):
|
|
||||||
node_name: str = Field(..., description="Name of the node package to update")
|
|
||||||
node_ver: Optional[str] = Field(
|
|
||||||
None, description="Current version of the node package"
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
class UpdateComfyUIParams(BaseModel):
|
|
||||||
is_stable: Optional[bool] = Field(
|
|
||||||
True,
|
|
||||||
description="Whether to update to stable version (true) or nightly (false)",
|
|
||||||
)
|
|
||||||
target_version: Optional[str] = Field(
|
|
||||||
None,
|
|
||||||
description="Specific version to switch to (for version switching operations)",
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
class FixPackParams(BaseModel):
|
|
||||||
node_name: str = Field(..., description="Name of the node package to fix")
|
|
||||||
node_ver: str = Field(..., description="Version of the node package")
|
|
||||||
|
|
||||||
|
|
||||||
class UninstallPackParams(BaseModel):
|
|
||||||
node_name: str = Field(..., description="Name of the node package to uninstall")
|
|
||||||
is_unknown: Optional[bool] = Field(
|
|
||||||
False, description="Whether this is an unknown/unregistered package"
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
class DisablePackParams(BaseModel):
|
|
||||||
node_name: str = Field(..., description="Name of the node package to disable")
|
|
||||||
is_unknown: Optional[bool] = Field(
|
|
||||||
False, description="Whether this is an unknown/unregistered package"
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
class EnablePackParams(BaseModel):
|
|
||||||
cnr_id: str = Field(
|
|
||||||
..., description="ComfyUI Node Registry ID of the package to enable"
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
class UpdateAllQueryParams(BaseModel):
|
|
||||||
client_id: str = Field(
|
|
||||||
..., description="Client identifier that initiated the request"
|
|
||||||
)
|
|
||||||
ui_id: str = Field(..., description="Base UI identifier for task tracking")
|
|
||||||
mode: Optional[ManagerDatabaseSource] = None
|
|
||||||
|
|
||||||
|
|
||||||
class UpdateComfyUIQueryParams(BaseModel):
|
|
||||||
client_id: str = Field(
|
|
||||||
..., description="Client identifier that initiated the request"
|
|
||||||
)
|
|
||||||
ui_id: str = Field(..., description="UI identifier for task tracking")
|
|
||||||
stable: Optional[bool] = Field(
|
|
||||||
True,
|
|
||||||
description="Whether to update to stable version (true) or nightly (false)",
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
class ComfyUISwitchVersionQueryParams(BaseModel):
|
|
||||||
ver: str = Field(..., description="Version to switch to")
|
|
||||||
client_id: str = Field(
|
|
||||||
..., description="Client identifier that initiated the request"
|
|
||||||
)
|
|
||||||
ui_id: str = Field(..., description="UI identifier for task tracking")
|
|
||||||
|
|
||||||
|
|
||||||
class QueueStatus(BaseModel):
|
|
||||||
total_count: int = Field(
|
|
||||||
..., description="Total number of tasks (pending + running)"
|
|
||||||
)
|
|
||||||
done_count: int = Field(..., description="Number of completed tasks")
|
|
||||||
in_progress_count: int = Field(..., description="Number of tasks currently running")
|
|
||||||
pending_count: Optional[int] = Field(
|
|
||||||
None, description="Number of tasks waiting to be executed"
|
|
||||||
)
|
|
||||||
is_processing: bool = Field(..., description="Whether the task worker is active")
|
|
||||||
client_id: Optional[str] = Field(
|
|
||||||
None, description="Client ID (when filtered by client)"
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
class ManagerMappings1(BaseModel):
|
|
||||||
title_aux: Optional[str] = Field(None, description="The display name of the pack")
|
|
||||||
|
|
||||||
|
|
||||||
class ManagerMappings(
|
|
||||||
RootModel[Optional[Dict[str, List[Union[List[str], ManagerMappings1]]]]]
|
|
||||||
):
|
|
||||||
root: Optional[Dict[str, List[Union[List[str], ManagerMappings1]]]] = Field(
|
|
||||||
None, description="Tuple of [node_names, metadata]"
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
class ModelMetadata(BaseModel):
|
|
||||||
name: str = Field(..., description="Name of the model")
|
|
||||||
type: str = Field(..., description="Type of model")
|
|
||||||
base: Optional[str] = Field(None, description="Base model type")
|
|
||||||
save_path: Optional[str] = Field(None, description="Path for saving the model")
|
|
||||||
url: str = Field(..., description="Download URL")
|
|
||||||
filename: str = Field(..., description="Target filename")
|
|
||||||
ui_id: Optional[str] = Field(None, description="ID for UI reference")
|
|
||||||
|
|
||||||
|
|
||||||
class InstallType(str, Enum):
|
|
||||||
git = "git"
|
|
||||||
copy = "copy"
|
|
||||||
pip = "pip"
|
|
||||||
|
|
||||||
|
|
||||||
class NodePackageMetadata(BaseModel):
|
|
||||||
title: Optional[str] = Field(None, description="Display name of the node package")
|
|
||||||
name: Optional[str] = Field(None, description="Repository/package name")
|
|
||||||
files: Optional[List[str]] = Field(None, description="Source URLs for the package")
|
|
||||||
description: Optional[str] = Field(
|
|
||||||
None, description="Description of the node package functionality"
|
|
||||||
)
|
|
||||||
install_type: Optional[InstallType] = Field(None, description="Installation method")
|
|
||||||
version: Optional[str] = Field(None, description="Version identifier")
|
|
||||||
id: Optional[str] = Field(
|
|
||||||
None, description="Unique identifier for the node package"
|
|
||||||
)
|
|
||||||
ui_id: Optional[str] = Field(None, description="ID for UI reference")
|
|
||||||
channel: Optional[str] = Field(None, description="Source channel")
|
|
||||||
mode: Optional[str] = Field(None, description="Source mode")
|
|
||||||
|
|
||||||
|
|
||||||
class SnapshotItem(RootModel[str]):
|
|
||||||
root: str = Field(..., description="Name of the snapshot")
|
|
||||||
|
|
||||||
|
|
||||||
class Error(BaseModel):
|
|
||||||
error: str = Field(..., description="Error message")
|
|
||||||
|
|
||||||
|
|
||||||
class InstalledPacksResponse(RootModel[Optional[Dict[str, ManagerPackInstalled]]]):
|
|
||||||
root: Optional[Dict[str, ManagerPackInstalled]] = None
|
|
||||||
|
|
||||||
|
|
||||||
class HistoryListResponse(BaseModel):
|
|
||||||
ids: Optional[List[str]] = Field(
|
|
||||||
None, description="List of available batch history IDs"
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
class InstalledNodeInfo(BaseModel):
|
|
||||||
name: str = Field(..., description="Node package name")
|
|
||||||
version: str = Field(..., description="Installed version")
|
|
||||||
repository_url: Optional[str] = Field(None, description="Git repository URL")
|
|
||||||
install_method: str = Field(
|
|
||||||
..., description="Installation method (cnr, git, pip, etc.)"
|
|
||||||
)
|
|
||||||
enabled: Optional[bool] = Field(
|
|
||||||
True, description="Whether the node is currently enabled"
|
|
||||||
)
|
|
||||||
install_date: Optional[datetime] = Field(
|
|
||||||
None, description="ISO timestamp of installation"
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
class InstalledModelInfo(BaseModel):
|
|
||||||
name: str = Field(..., description="Model filename")
|
|
||||||
path: str = Field(..., description="Full path to model file")
|
|
||||||
type: str = Field(..., description="Model type (checkpoint, lora, vae, etc.)")
|
|
||||||
size_bytes: Optional[int] = Field(None, description="File size in bytes", ge=0)
|
|
||||||
hash: Optional[str] = Field(None, description="Model file hash for verification")
|
|
||||||
install_date: Optional[datetime] = Field(
|
|
||||||
None, description="ISO timestamp when added"
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
class ComfyUIVersionInfo(BaseModel):
|
|
||||||
version: str = Field(..., description="ComfyUI version string")
|
|
||||||
commit_hash: Optional[str] = Field(None, description="Git commit hash")
|
|
||||||
branch: Optional[str] = Field(None, description="Git branch name")
|
|
||||||
is_stable: Optional[bool] = Field(
|
|
||||||
False, description="Whether this is a stable release"
|
|
||||||
)
|
|
||||||
last_updated: Optional[datetime] = Field(
|
|
||||||
None, description="ISO timestamp of last update"
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
class BatchOperation(BaseModel):
|
|
||||||
operation_id: str = Field(..., description="Unique operation identifier")
|
|
||||||
operation_type: OperationType
|
|
||||||
target: str = Field(
|
|
||||||
..., description="Target of the operation (node name, model name, etc.)"
|
|
||||||
)
|
|
||||||
target_version: Optional[str] = Field(
|
|
||||||
None, description="Target version for the operation"
|
|
||||||
)
|
|
||||||
result: OperationResult
|
|
||||||
error_message: Optional[str] = Field(
|
|
||||||
None, description="Error message if operation failed"
|
|
||||||
)
|
|
||||||
start_time: datetime = Field(
|
|
||||||
..., description="ISO timestamp when operation started"
|
|
||||||
)
|
|
||||||
end_time: Optional[datetime] = Field(
|
|
||||||
None, description="ISO timestamp when operation completed"
|
|
||||||
)
|
|
||||||
client_id: Optional[str] = Field(
|
|
||||||
None, description="Client that initiated the operation"
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
class ComfyUISystemState(BaseModel):
|
|
||||||
snapshot_time: datetime = Field(
|
|
||||||
..., description="ISO timestamp when snapshot was taken"
|
|
||||||
)
|
|
||||||
comfyui_version: ComfyUIVersionInfo
|
|
||||||
frontend_version: Optional[str] = Field(
|
|
||||||
None, description="ComfyUI frontend version if available"
|
|
||||||
)
|
|
||||||
python_version: str = Field(..., description="Python interpreter version")
|
|
||||||
platform_info: str = Field(
|
|
||||||
..., description="Operating system and platform information"
|
|
||||||
)
|
|
||||||
installed_nodes: Optional[Dict[str, InstalledNodeInfo]] = Field(
|
|
||||||
None, description="Map of installed node packages by name"
|
|
||||||
)
|
|
||||||
installed_models: Optional[Dict[str, InstalledModelInfo]] = Field(
|
|
||||||
None, description="Map of installed models by name"
|
|
||||||
)
|
|
||||||
manager_config: Optional[Dict[str, Any]] = Field(
|
|
||||||
None, description="ComfyUI Manager configuration settings"
|
|
||||||
)
|
|
||||||
comfyui_root_path: Optional[str] = Field(
|
|
||||||
None, description="ComfyUI root installation directory"
|
|
||||||
)
|
|
||||||
model_paths: Optional[Dict[str, List[str]]] = Field(
|
|
||||||
None, description="Map of model types to their configured paths"
|
|
||||||
)
|
|
||||||
manager_version: Optional[str] = Field(None, description="ComfyUI Manager version")
|
|
||||||
security_level: Optional[SecurityLevel] = None
|
|
||||||
network_mode: Optional[NetworkMode] = None
|
|
||||||
cli_args: Optional[Dict[str, Any]] = Field(
|
|
||||||
None, description="Selected ComfyUI CLI arguments"
|
|
||||||
)
|
|
||||||
custom_nodes_count: Optional[int] = Field(
|
|
||||||
None, description="Total number of custom node packages", ge=0
|
|
||||||
)
|
|
||||||
failed_imports: Optional[List[str]] = Field(
|
|
||||||
None, description="List of custom nodes that failed to import"
|
|
||||||
)
|
|
||||||
pip_packages: Optional[Dict[str, str]] = Field(
|
|
||||||
None, description="Map of installed pip packages to their versions"
|
|
||||||
)
|
|
||||||
embedded_python: Optional[bool] = Field(
|
|
||||||
None,
|
|
||||||
description="Whether ComfyUI is running from an embedded Python distribution",
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
class BatchExecutionRecord(BaseModel):
|
|
||||||
batch_id: str = Field(..., description="Unique batch identifier")
|
|
||||||
start_time: datetime = Field(..., description="ISO timestamp when batch started")
|
|
||||||
end_time: Optional[datetime] = Field(
|
|
||||||
None, description="ISO timestamp when batch completed"
|
|
||||||
)
|
|
||||||
state_before: ComfyUISystemState
|
|
||||||
state_after: Optional[ComfyUISystemState] = Field(
|
|
||||||
None, description="System state after batch execution"
|
|
||||||
)
|
|
||||||
operations: Optional[List[BatchOperation]] = Field(
|
|
||||||
None, description="List of operations performed in this batch"
|
|
||||||
)
|
|
||||||
total_operations: Optional[int] = Field(
|
|
||||||
0, description="Total number of operations in batch", ge=0
|
|
||||||
)
|
|
||||||
successful_operations: Optional[int] = Field(
|
|
||||||
0, description="Number of successful operations", ge=0
|
|
||||||
)
|
|
||||||
failed_operations: Optional[int] = Field(
|
|
||||||
0, description="Number of failed operations", ge=0
|
|
||||||
)
|
|
||||||
skipped_operations: Optional[int] = Field(
|
|
||||||
0, description="Number of skipped operations", ge=0
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
class ImportFailInfoBulkRequest(BaseModel):
|
|
||||||
cnr_ids: Optional[List[str]] = Field(
|
|
||||||
None, description="A list of CNR IDs to check."
|
|
||||||
)
|
|
||||||
urls: Optional[List[str]] = Field(
|
|
||||||
None, description="A list of repository URLs to check."
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
class ImportFailInfoItem1(BaseModel):
|
|
||||||
error: Optional[str] = None
|
|
||||||
traceback: Optional[str] = None
|
|
||||||
|
|
||||||
|
|
||||||
class ImportFailInfoItem(RootModel[Optional[ImportFailInfoItem1]]):
|
|
||||||
root: Optional[ImportFailInfoItem1]
|
|
||||||
|
|
||||||
|
|
||||||
class QueueTaskItem(BaseModel):
|
|
||||||
ui_id: str = Field(..., description="Unique identifier for the task")
|
|
||||||
client_id: str = Field(..., description="Client identifier that initiated the task")
|
|
||||||
kind: OperationType
|
|
||||||
params: Union[
|
|
||||||
InstallPackParams,
|
|
||||||
UpdatePackParams,
|
|
||||||
FixPackParams,
|
|
||||||
UninstallPackParams,
|
|
||||||
DisablePackParams,
|
|
||||||
EnablePackParams,
|
|
||||||
ModelMetadata,
|
|
||||||
UpdateComfyUIParams,
|
|
||||||
UpdateAllPacksParams,
|
|
||||||
]
|
|
||||||
|
|
||||||
|
|
||||||
class TaskHistoryItem(BaseModel):
|
|
||||||
ui_id: str = Field(..., description="Unique identifier for the task")
|
|
||||||
client_id: str = Field(..., description="Client identifier that initiated the task")
|
|
||||||
kind: str = Field(..., description="Type of task that was performed")
|
|
||||||
timestamp: datetime = Field(..., description="ISO timestamp when task completed")
|
|
||||||
result: str = Field(..., description="Task result message or details")
|
|
||||||
status: Optional[TaskExecutionStatus] = None
|
|
||||||
batch_id: Optional[str] = Field(
|
|
||||||
None, description="ID of the batch this task belongs to"
|
|
||||||
)
|
|
||||||
end_time: Optional[datetime] = Field(
|
|
||||||
None, description="ISO timestamp when task execution ended"
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
class TaskStateMessage(BaseModel):
|
|
||||||
history: Dict[str, TaskHistoryItem] = Field(
|
|
||||||
..., description="Map of task IDs to their history items"
|
|
||||||
)
|
|
||||||
running_queue: List[QueueTaskItem] = Field(
|
|
||||||
..., description="Currently executing tasks"
|
|
||||||
)
|
|
||||||
pending_queue: List[QueueTaskItem] = Field(
|
|
||||||
..., description="Tasks waiting to be executed"
|
|
||||||
)
|
|
||||||
installed_packs: Dict[str, ManagerPackInstalled] = Field(
|
|
||||||
..., description="Map of currently installed node packages by name"
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
class MessageTaskDone(BaseModel):
|
|
||||||
ui_id: str = Field(..., description="Task identifier")
|
|
||||||
result: str = Field(..., description="Task result message")
|
|
||||||
kind: str = Field(..., description="Type of task")
|
|
||||||
status: Optional[TaskExecutionStatus] = None
|
|
||||||
timestamp: datetime = Field(..., description="ISO timestamp when task completed")
|
|
||||||
state: TaskStateMessage
|
|
||||||
|
|
||||||
|
|
||||||
class MessageTaskStarted(BaseModel):
|
|
||||||
ui_id: str = Field(..., description="Task identifier")
|
|
||||||
kind: str = Field(..., description="Type of task")
|
|
||||||
timestamp: datetime = Field(..., description="ISO timestamp when task started")
|
|
||||||
state: TaskStateMessage
|
|
||||||
|
|
||||||
|
|
||||||
class MessageTaskFailed(BaseModel):
|
|
||||||
ui_id: str = Field(..., description="Task identifier")
|
|
||||||
error: str = Field(..., description="Error message")
|
|
||||||
kind: str = Field(..., description="Type of task")
|
|
||||||
timestamp: datetime = Field(..., description="ISO timestamp when task failed")
|
|
||||||
state: TaskStateMessage
|
|
||||||
|
|
||||||
|
|
||||||
class MessageUpdate(
|
|
||||||
RootModel[Union[MessageTaskDone, MessageTaskStarted, MessageTaskFailed]]
|
|
||||||
):
|
|
||||||
root: Union[MessageTaskDone, MessageTaskStarted, MessageTaskFailed] = Field(
|
|
||||||
..., description="Union type for all possible WebSocket message updates"
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
class HistoryResponse(BaseModel):
|
|
||||||
history: Optional[Dict[str, TaskHistoryItem]] = Field(
|
|
||||||
None, description="Map of task IDs to their history items"
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
class ImportFailInfoBulkResponse(RootModel[Optional[Dict[str, ImportFailInfoItem]]]):
|
|
||||||
root: Optional[Dict[str, ImportFailInfoItem]] = None
|
|
||||||
@@ -1,11 +0,0 @@
|
|||||||
- Anytime you make a change to the data being sent or received, you should follow this process:
|
|
||||||
1. Adjust the openapi.yaml file first
|
|
||||||
2. Verify the syntax of the openapi.yaml file using `yaml.safe_load`
|
|
||||||
3. Regenerate the types following the instructions in the `data_models/README.md` file
|
|
||||||
4. Verify the new data model is generated
|
|
||||||
5. Verify the syntax of the generated types files
|
|
||||||
6. Run formatting and linting on the generated types files
|
|
||||||
7. Adjust the `__init__.py` files in the `data_models` directory to match/export the new data model
|
|
||||||
8. Only then, make the changes to the rest of the codebase
|
|
||||||
9. Run the CI tests to verify that the changes are working
|
|
||||||
- The comfyui_manager is a python package that is used to manage the comfyui server. There are two sub-packages `glob` and `legacy`. These represent the current version (`glob`) and the previous version (`legacy`), not including common utilities and data models. When developing, we work in the `glob` package. You can ignore the `legacy` package entirely, unless you have a very good reason to research how things were done in the legacy or prior major versions of the package. But in those cases, you should just look for the sake of knowledge or reflection, not for changing code (unless explicitly asked to do so).
|
|
||||||
@@ -34,11 +34,6 @@ variables = {}
|
|||||||
APIs = {}
|
APIs = {}
|
||||||
|
|
||||||
|
|
||||||
pip_overrides = {}
|
|
||||||
pip_blacklist = {}
|
|
||||||
pip_downgrade_blacklist = {}
|
|
||||||
|
|
||||||
|
|
||||||
def register_api(k, f):
|
def register_api(k, f):
|
||||||
global APIs
|
global APIs
|
||||||
APIs[k] = f
|
APIs[k] = f
|
||||||
@@ -6,16 +6,11 @@ import time
|
|||||||
from dataclasses import dataclass
|
from dataclasses import dataclass
|
||||||
from typing import List
|
from typing import List
|
||||||
|
|
||||||
from . import context
|
from . import manager_core
|
||||||
from . import manager_util
|
from . import manager_util
|
||||||
|
|
||||||
import requests
|
import requests
|
||||||
import toml
|
import toml
|
||||||
import logging
|
|
||||||
from . import git_utils
|
|
||||||
from cachetools import TTLCache, cached
|
|
||||||
|
|
||||||
query_ttl_cache = TTLCache(maxsize=100, ttl=60)
|
|
||||||
|
|
||||||
base_url = "https://api.comfy.org"
|
base_url = "https://api.comfy.org"
|
||||||
|
|
||||||
@@ -24,34 +19,11 @@ lock = asyncio.Lock()
|
|||||||
|
|
||||||
is_cache_loading = False
|
is_cache_loading = False
|
||||||
|
|
||||||
|
|
||||||
def normalize_package_name(name: str) -> str:
|
|
||||||
"""
|
|
||||||
Normalize package name for case-insensitive matching.
|
|
||||||
|
|
||||||
This follows the same normalization pattern used throughout CNR:
|
|
||||||
- Strip leading/trailing whitespace
|
|
||||||
- Convert to lowercase
|
|
||||||
|
|
||||||
Args:
|
|
||||||
name: Package name to normalize (e.g., "ComfyUI_SigmoidOffsetScheduler" or " NodeName ")
|
|
||||||
|
|
||||||
Returns:
|
|
||||||
Normalized package name (e.g., "comfyui_sigmoidoffsetscheduler")
|
|
||||||
|
|
||||||
Examples:
|
|
||||||
>>> normalize_package_name("ComfyUI_SigmoidOffsetScheduler")
|
|
||||||
"comfyui_sigmoidoffsetscheduler"
|
|
||||||
>>> normalize_package_name(" NodeName ")
|
|
||||||
"nodename"
|
|
||||||
"""
|
|
||||||
return name.strip().lower()
|
|
||||||
|
|
||||||
async def get_cnr_data(cache_mode=True, dont_wait=True):
|
async def get_cnr_data(cache_mode=True, dont_wait=True):
|
||||||
try:
|
try:
|
||||||
return await _get_cnr_data(cache_mode, dont_wait)
|
return await _get_cnr_data(cache_mode, dont_wait)
|
||||||
except asyncio.TimeoutError:
|
except asyncio.TimeoutError:
|
||||||
logging.info("A timeout occurred during the fetch process from ComfyRegistry.")
|
print("A timeout occurred during the fetch process from ComfyRegistry.")
|
||||||
return await _get_cnr_data(cache_mode=True, dont_wait=True) # timeout fallback
|
return await _get_cnr_data(cache_mode=True, dont_wait=True) # timeout fallback
|
||||||
|
|
||||||
async def _get_cnr_data(cache_mode=True, dont_wait=True):
|
async def _get_cnr_data(cache_mode=True, dont_wait=True):
|
||||||
@@ -65,6 +37,7 @@ async def _get_cnr_data(cache_mode=True, dont_wait=True):
|
|||||||
|
|
||||||
full_nodes = {}
|
full_nodes = {}
|
||||||
|
|
||||||
|
|
||||||
# Determine form factor based on environment and platform
|
# Determine form factor based on environment and platform
|
||||||
is_desktop = bool(os.environ.get('__COMFYUI_DESKTOP_VERSION__'))
|
is_desktop = bool(os.environ.get('__COMFYUI_DESKTOP_VERSION__'))
|
||||||
system = platform.system().lower()
|
system = platform.system().lower()
|
||||||
@@ -75,9 +48,9 @@ async def _get_cnr_data(cache_mode=True, dont_wait=True):
|
|||||||
# Get ComfyUI version tag
|
# Get ComfyUI version tag
|
||||||
if is_desktop:
|
if is_desktop:
|
||||||
# extract version from pyproject.toml instead of git tag
|
# extract version from pyproject.toml instead of git tag
|
||||||
comfyui_ver = context.get_current_comfyui_ver() or 'unknown'
|
comfyui_ver = manager_core.get_current_comfyui_ver() or 'unknown'
|
||||||
else:
|
else:
|
||||||
comfyui_ver = context.get_comfyui_tag() or 'unknown'
|
comfyui_ver = manager_core.get_comfyui_tag() or 'unknown'
|
||||||
|
|
||||||
if is_desktop:
|
if is_desktop:
|
||||||
if is_windows:
|
if is_windows:
|
||||||
@@ -106,12 +79,12 @@ async def _get_cnr_data(cache_mode=True, dont_wait=True):
|
|||||||
full_nodes[x['id']] = x
|
full_nodes[x['id']] = x
|
||||||
|
|
||||||
if page % 5 == 0:
|
if page % 5 == 0:
|
||||||
logging.info(f"FETCH ComfyRegistry Data: {page}/{sub_json_obj['totalPages']}")
|
print(f"FETCH ComfyRegistry Data: {page}/{sub_json_obj['totalPages']}")
|
||||||
|
|
||||||
page += 1
|
page += 1
|
||||||
time.sleep(0.5)
|
time.sleep(0.5)
|
||||||
|
|
||||||
logging.info("FETCH ComfyRegistry Data [DONE]")
|
print("FETCH ComfyRegistry Data [DONE]")
|
||||||
|
|
||||||
for v in full_nodes.values():
|
for v in full_nodes.values():
|
||||||
if 'latest_version' not in v:
|
if 'latest_version' not in v:
|
||||||
@@ -127,7 +100,7 @@ async def _get_cnr_data(cache_mode=True, dont_wait=True):
|
|||||||
if cache_state == 'not-cached':
|
if cache_state == 'not-cached':
|
||||||
return {}
|
return {}
|
||||||
else:
|
else:
|
||||||
logging.info("[ComfyUI-Manager] The ComfyRegistry cache update is still in progress, so an outdated cache is being used.")
|
print("[ComfyUI-Manager] The ComfyRegistry cache update is still in progress, so an outdated cache is being used.")
|
||||||
with open(manager_util.get_cache_path(uri), 'r', encoding="UTF-8", errors="ignore") as json_file:
|
with open(manager_util.get_cache_path(uri), 'r', encoding="UTF-8", errors="ignore") as json_file:
|
||||||
return json.load(json_file)['nodes']
|
return json.load(json_file)['nodes']
|
||||||
|
|
||||||
@@ -139,9 +112,9 @@ async def _get_cnr_data(cache_mode=True, dont_wait=True):
|
|||||||
json_obj = await fetch_all()
|
json_obj = await fetch_all()
|
||||||
manager_util.save_to_cache(uri, json_obj)
|
manager_util.save_to_cache(uri, json_obj)
|
||||||
return json_obj['nodes']
|
return json_obj['nodes']
|
||||||
except Exception:
|
except:
|
||||||
res = {}
|
res = {}
|
||||||
logging.warning("Cannot connect to comfyregistry.")
|
print("Cannot connect to comfyregistry.")
|
||||||
finally:
|
finally:
|
||||||
if cache_mode:
|
if cache_mode:
|
||||||
is_cache_loading = False
|
is_cache_loading = False
|
||||||
@@ -164,7 +137,7 @@ def map_node_version(api_node_version):
|
|||||||
Maps node version data from API response to NodeVersion dataclass.
|
Maps node version data from API response to NodeVersion dataclass.
|
||||||
|
|
||||||
Args:
|
Args:
|
||||||
api_node_version (dict): The 'node_version' part of the API response.
|
api_data (dict): The 'node_version' part of the API response.
|
||||||
|
|
||||||
Returns:
|
Returns:
|
||||||
NodeVersion: An instance of NodeVersion dataclass populated with data from the API.
|
NodeVersion: An instance of NodeVersion dataclass populated with data from the API.
|
||||||
@@ -207,7 +180,7 @@ def install_node(node_id, version=None):
|
|||||||
else:
|
else:
|
||||||
url = f"{base_url}/nodes/{node_id}/install?version={version}"
|
url = f"{base_url}/nodes/{node_id}/install?version={version}"
|
||||||
|
|
||||||
response = requests.get(url, verify=not manager_util.bypass_ssl)
|
response = requests.get(url)
|
||||||
if response.status_code == 200:
|
if response.status_code == 200:
|
||||||
# Convert the API response to a NodeVersion object
|
# Convert the API response to a NodeVersion object
|
||||||
return map_node_version(response.json())
|
return map_node_version(response.json())
|
||||||
@@ -215,84 +188,10 @@ def install_node(node_id, version=None):
|
|||||||
return None
|
return None
|
||||||
|
|
||||||
|
|
||||||
@cached(query_ttl_cache)
|
|
||||||
def get_nodepack(packname):
|
|
||||||
"""
|
|
||||||
Retrieves the nodepack
|
|
||||||
|
|
||||||
Args:
|
|
||||||
packname (str): The unique identifier of the node.
|
|
||||||
|
|
||||||
Returns:
|
|
||||||
nodepack info {id, latest_version}
|
|
||||||
"""
|
|
||||||
url = f"{base_url}/nodes/{packname}"
|
|
||||||
|
|
||||||
response = requests.get(url, verify=not manager_util.bypass_ssl)
|
|
||||||
if response.status_code == 200:
|
|
||||||
info = response.json()
|
|
||||||
|
|
||||||
res = {
|
|
||||||
'id': info['id']
|
|
||||||
}
|
|
||||||
|
|
||||||
if 'latest_version' in info:
|
|
||||||
res['latest_version'] = info['latest_version']['version']
|
|
||||||
|
|
||||||
if 'repository' in info:
|
|
||||||
res['repository'] = info['repository']
|
|
||||||
|
|
||||||
return res
|
|
||||||
else:
|
|
||||||
return None
|
|
||||||
|
|
||||||
|
|
||||||
@cached(query_ttl_cache)
|
|
||||||
def get_nodepack_by_url(url):
|
|
||||||
"""
|
|
||||||
Retrieves the nodepack info for installation.
|
|
||||||
|
|
||||||
Args:
|
|
||||||
url (str): The unique identifier of the node.
|
|
||||||
|
|
||||||
Returns:
|
|
||||||
NodeVersion: Node version data or error message.
|
|
||||||
"""
|
|
||||||
|
|
||||||
# example query: https://api.comfy.org/nodes/search?repository_url_search=ltdrdata/ComfyUI-Impact-Pack&limit=1
|
|
||||||
url = f"nodes/search?repository_url_search={url}&limit=1"
|
|
||||||
|
|
||||||
response = requests.get(url, verify=not manager_util.bypass_ssl)
|
|
||||||
if response.status_code == 200:
|
|
||||||
# Convert the API response to a NodeVersion object
|
|
||||||
info = response.json().get('nodes', [])
|
|
||||||
if len(info) > 0:
|
|
||||||
info = info[0]
|
|
||||||
repo_url = info['repository']
|
|
||||||
|
|
||||||
if git_utils.compact_url(url) != git_utils.compact_url(repo_url):
|
|
||||||
return None
|
|
||||||
|
|
||||||
res = {
|
|
||||||
'id': info['id']
|
|
||||||
}
|
|
||||||
|
|
||||||
if 'latest_version' in info:
|
|
||||||
res['latest_version'] = info['latest_version']['version']
|
|
||||||
|
|
||||||
res['repository'] = info['repository']
|
|
||||||
|
|
||||||
return res
|
|
||||||
else:
|
|
||||||
return None
|
|
||||||
else:
|
|
||||||
return None
|
|
||||||
|
|
||||||
|
|
||||||
def all_versions_of_node(node_id):
|
def all_versions_of_node(node_id):
|
||||||
url = f"{base_url}/nodes/{node_id}/versions?statuses=NodeVersionStatusActive&statuses=NodeVersionStatusPending"
|
url = f"{base_url}/nodes/{node_id}/versions?statuses=NodeVersionStatusActive&statuses=NodeVersionStatusPending"
|
||||||
|
|
||||||
response = requests.get(url, verify=not manager_util.bypass_ssl)
|
response = requests.get(url)
|
||||||
if response.status_code == 200:
|
if response.status_code == 200:
|
||||||
return response.json()
|
return response.json()
|
||||||
else:
|
else:
|
||||||
@@ -311,7 +210,7 @@ def read_cnr_info(fullpath):
|
|||||||
data = toml.load(f)
|
data = toml.load(f)
|
||||||
|
|
||||||
project = data.get('project', {})
|
project = data.get('project', {})
|
||||||
name = project.get('name').strip()
|
name = project.get('name').strip().lower()
|
||||||
|
|
||||||
# normalize version
|
# normalize version
|
||||||
# for example: 2.5 -> 2.5.0
|
# for example: 2.5 -> 2.5.0
|
||||||
@@ -338,8 +237,8 @@ def generate_cnr_id(fullpath, cnr_id):
|
|||||||
if not os.path.exists(cnr_id_path):
|
if not os.path.exists(cnr_id_path):
|
||||||
with open(cnr_id_path, "w") as f:
|
with open(cnr_id_path, "w") as f:
|
||||||
return f.write(cnr_id)
|
return f.write(cnr_id)
|
||||||
except Exception:
|
except:
|
||||||
logging.error(f"[ComfyUI Manager] unable to create file: {cnr_id_path}")
|
print(f"[ComfyUI Manager] unable to create file: {cnr_id_path}")
|
||||||
|
|
||||||
|
|
||||||
def read_cnr_id(fullpath):
|
def read_cnr_id(fullpath):
|
||||||
@@ -348,7 +247,8 @@ def read_cnr_id(fullpath):
|
|||||||
if os.path.exists(cnr_id_path):
|
if os.path.exists(cnr_id_path):
|
||||||
with open(cnr_id_path) as f:
|
with open(cnr_id_path) as f:
|
||||||
return f.read().strip()
|
return f.read().strip()
|
||||||
except Exception:
|
except:
|
||||||
pass
|
pass
|
||||||
|
|
||||||
return None
|
return None
|
||||||
|
|
||||||
@@ -1,55 +0,0 @@
|
|||||||
|
|
||||||
SECURITY_MESSAGE_MIDDLE = "ERROR: To use this action, a security_level of `normal or below` is required. Please contact the administrator.\nReference: https://github.com/ltdrdata/ComfyUI-Manager#security-policy"
|
|
||||||
SECURITY_MESSAGE_MIDDLE_P = "ERROR: To use this action, security_level must be `normal or below`, and network_mode must be set to `personal_cloud`. Please contact the administrator.\nReference: https://github.com/ltdrdata/ComfyUI-Manager#security-policy"
|
|
||||||
SECURITY_MESSAGE_NORMAL_MINUS = "ERROR: To use this feature, you must either set '--listen' to a local IP and set the security level to 'normal-' or lower, or set the security level to 'middle' or 'weak'. Please contact the administrator.\nReference: https://github.com/ltdrdata/ComfyUI-Manager#security-policy"
|
|
||||||
SECURITY_MESSAGE_GENERAL = "ERROR: This installation is not allowed in this security_level. Please contact the administrator.\nReference: https://github.com/ltdrdata/ComfyUI-Manager#security-policy"
|
|
||||||
SECURITY_MESSAGE_NORMAL_MINUS_MODEL = "ERROR: Downloading models that are not in '.safetensors' format is only allowed for models registered in the 'default' channel at this security level. If you want to download this model, set the security level to 'normal-' or lower."
|
|
||||||
|
|
||||||
|
|
||||||
def is_loopback(address):
|
|
||||||
import ipaddress
|
|
||||||
|
|
||||||
try:
|
|
||||||
return ipaddress.ip_address(address).is_loopback
|
|
||||||
except ValueError:
|
|
||||||
return False
|
|
||||||
|
|
||||||
|
|
||||||
model_dir_name_map = {
|
|
||||||
"checkpoints": "checkpoints",
|
|
||||||
"checkpoint": "checkpoints",
|
|
||||||
"unclip": "checkpoints",
|
|
||||||
"text_encoders": "text_encoders",
|
|
||||||
"clip": "text_encoders",
|
|
||||||
"vae": "vae",
|
|
||||||
"lora": "loras",
|
|
||||||
"t2i-adapter": "controlnet",
|
|
||||||
"t2i-style": "controlnet",
|
|
||||||
"controlnet": "controlnet",
|
|
||||||
"clip_vision": "clip_vision",
|
|
||||||
"gligen": "gligen",
|
|
||||||
"upscale": "upscale_models",
|
|
||||||
"embedding": "embeddings",
|
|
||||||
"embeddings": "embeddings",
|
|
||||||
"unet": "diffusion_models",
|
|
||||||
"diffusion_model": "diffusion_models",
|
|
||||||
}
|
|
||||||
|
|
||||||
# List of all model directory names used for checking installed models
|
|
||||||
MODEL_DIR_NAMES = [
|
|
||||||
"checkpoints",
|
|
||||||
"loras",
|
|
||||||
"vae",
|
|
||||||
"text_encoders",
|
|
||||||
"diffusion_models",
|
|
||||||
"clip_vision",
|
|
||||||
"embeddings",
|
|
||||||
"diffusers",
|
|
||||||
"vae_approx",
|
|
||||||
"controlnet",
|
|
||||||
"gligen",
|
|
||||||
"upscale_models",
|
|
||||||
"hypernetworks",
|
|
||||||
"photomaker",
|
|
||||||
"classifiers",
|
|
||||||
]
|
|
||||||
@@ -4,7 +4,6 @@ class NetworkMode(enum.Enum):
|
|||||||
PUBLIC = "public"
|
PUBLIC = "public"
|
||||||
PRIVATE = "private"
|
PRIVATE = "private"
|
||||||
OFFLINE = "offline"
|
OFFLINE = "offline"
|
||||||
PERSONAL_CLOUD = "personal_cloud"
|
|
||||||
|
|
||||||
class SecurityLevel(enum.Enum):
|
class SecurityLevel(enum.Enum):
|
||||||
STRONG = "strong"
|
STRONG = "strong"
|
||||||
@@ -156,27 +156,27 @@ def switch_to_default_branch(repo):
|
|||||||
default_branch = repo.git.symbolic_ref(f'refs/remotes/{remote_name}/HEAD').replace(f'refs/remotes/{remote_name}/', '')
|
default_branch = repo.git.symbolic_ref(f'refs/remotes/{remote_name}/HEAD').replace(f'refs/remotes/{remote_name}/', '')
|
||||||
repo.git.checkout(default_branch)
|
repo.git.checkout(default_branch)
|
||||||
return True
|
return True
|
||||||
except Exception:
|
except:
|
||||||
# try checkout master
|
# try checkout master
|
||||||
# try checkout main if failed
|
# try checkout main if failed
|
||||||
try:
|
try:
|
||||||
repo.git.checkout(repo.heads.master)
|
repo.git.checkout(repo.heads.master)
|
||||||
return True
|
return True
|
||||||
except Exception:
|
except:
|
||||||
try:
|
try:
|
||||||
if remote_name is not None:
|
if remote_name is not None:
|
||||||
repo.git.checkout('-b', 'master', f'{remote_name}/master')
|
repo.git.checkout('-b', 'master', f'{remote_name}/master')
|
||||||
return True
|
return True
|
||||||
except Exception:
|
except:
|
||||||
try:
|
try:
|
||||||
repo.git.checkout(repo.heads.main)
|
repo.git.checkout(repo.heads.main)
|
||||||
return True
|
return True
|
||||||
except Exception:
|
except:
|
||||||
try:
|
try:
|
||||||
if remote_name is not None:
|
if remote_name is not None:
|
||||||
repo.git.checkout('-b', 'main', f'{remote_name}/main')
|
repo.git.checkout('-b', 'main', f'{remote_name}/main')
|
||||||
return True
|
return True
|
||||||
except Exception:
|
except:
|
||||||
pass
|
pass
|
||||||
|
|
||||||
print("[ComfyUI Manager] Failed to switch to the default branch")
|
print("[ComfyUI Manager] Failed to switch to the default branch")
|
||||||
@@ -447,7 +447,7 @@ def restore_pip_snapshot(pips, options):
|
|||||||
res = 1
|
res = 1
|
||||||
try:
|
try:
|
||||||
res = subprocess.check_call([sys.executable, '-m', 'pip', 'install'] + non_url)
|
res = subprocess.check_call([sys.executable, '-m', 'pip', 'install'] + non_url)
|
||||||
except Exception:
|
except:
|
||||||
pass
|
pass
|
||||||
|
|
||||||
# fallback
|
# fallback
|
||||||
@@ -456,7 +456,7 @@ def restore_pip_snapshot(pips, options):
|
|||||||
res = 1
|
res = 1
|
||||||
try:
|
try:
|
||||||
res = subprocess.check_call([sys.executable, '-m', 'pip', 'install', x])
|
res = subprocess.check_call([sys.executable, '-m', 'pip', 'install', x])
|
||||||
except Exception:
|
except:
|
||||||
pass
|
pass
|
||||||
|
|
||||||
if res != 0:
|
if res != 0:
|
||||||
@@ -467,7 +467,7 @@ def restore_pip_snapshot(pips, options):
|
|||||||
res = 1
|
res = 1
|
||||||
try:
|
try:
|
||||||
res = subprocess.check_call([sys.executable, '-m', 'pip', 'install', x])
|
res = subprocess.check_call([sys.executable, '-m', 'pip', 'install', x])
|
||||||
except Exception:
|
except:
|
||||||
pass
|
pass
|
||||||
|
|
||||||
if res != 0:
|
if res != 0:
|
||||||
@@ -478,7 +478,7 @@ def restore_pip_snapshot(pips, options):
|
|||||||
res = 1
|
res = 1
|
||||||
try:
|
try:
|
||||||
res = subprocess.check_call([sys.executable, '-m', 'pip', 'install', x])
|
res = subprocess.check_call([sys.executable, '-m', 'pip', 'install', x])
|
||||||
except Exception:
|
except:
|
||||||
pass
|
pass
|
||||||
|
|
||||||
if res != 0:
|
if res != 0:
|
||||||
@@ -46,8 +46,6 @@ def git_url(fullpath):
|
|||||||
|
|
||||||
for k, v in config.items():
|
for k, v in config.items():
|
||||||
if k.startswith('remote ') and 'url' in v:
|
if k.startswith('remote ') and 'url' in v:
|
||||||
if 'Comfy-Org/ComfyUI-Manager' in v['url']:
|
|
||||||
return "https://github.com/ltdrdata/ComfyUI-Manager"
|
|
||||||
return v['url']
|
return v['url']
|
||||||
|
|
||||||
return None
|
return None
|
||||||
@@ -77,14 +75,6 @@ def normalize_to_github_id(url) -> str:
|
|||||||
return None
|
return None
|
||||||
|
|
||||||
|
|
||||||
def compact_url(url):
|
|
||||||
github_id = normalize_to_github_id(url)
|
|
||||||
if github_id is not None:
|
|
||||||
return github_id
|
|
||||||
|
|
||||||
return url
|
|
||||||
|
|
||||||
|
|
||||||
def get_url_for_clone(url):
|
def get_url_for_clone(url):
|
||||||
url = normalize_url(url)
|
url = normalize_url(url)
|
||||||
|
|
||||||
File diff suppressed because it is too large
Load Diff
@@ -55,11 +55,7 @@ def download_url(model_url: str, model_dir: str, filename: str):
|
|||||||
return aria2_download_url(model_url, model_dir, filename)
|
return aria2_download_url(model_url, model_dir, filename)
|
||||||
else:
|
else:
|
||||||
from torchvision.datasets.utils import download_url as torchvision_download_url
|
from torchvision.datasets.utils import download_url as torchvision_download_url
|
||||||
try:
|
|
||||||
return torchvision_download_url(model_url, model_dir, filename)
|
return torchvision_download_url(model_url, model_dir, filename)
|
||||||
except Exception as e:
|
|
||||||
logging.error(f"[ComfyUI-Manager] Failed to download: {model_url} / {repr(e)}")
|
|
||||||
raise
|
|
||||||
|
|
||||||
|
|
||||||
def aria2_find_task(dir: str, filename: str):
|
def aria2_find_task(dir: str, filename: str):
|
||||||
File diff suppressed because it is too large
Load Diff
@@ -15,7 +15,6 @@ import re
|
|||||||
import logging
|
import logging
|
||||||
import platform
|
import platform
|
||||||
import shlex
|
import shlex
|
||||||
from functools import lru_cache
|
|
||||||
|
|
||||||
|
|
||||||
cache_lock = threading.Lock()
|
cache_lock = threading.Lock()
|
||||||
@@ -25,7 +24,6 @@ comfyui_manager_path = os.path.abspath(os.path.join(os.path.dirname(__file__), '
|
|||||||
cache_dir = os.path.join(comfyui_manager_path, '.cache') # This path is also updated together in **manager_core.update_user_directory**.
|
cache_dir = os.path.join(comfyui_manager_path, '.cache') # This path is also updated together in **manager_core.update_user_directory**.
|
||||||
|
|
||||||
use_uv = False
|
use_uv = False
|
||||||
bypass_ssl = False
|
|
||||||
|
|
||||||
def is_manager_pip_package():
|
def is_manager_pip_package():
|
||||||
return not os.path.exists(os.path.join(comfyui_manager_path, '..', 'custom_nodes'))
|
return not os.path.exists(os.path.join(comfyui_manager_path, '..', 'custom_nodes'))
|
||||||
@@ -39,69 +37,23 @@ def add_python_path_to_env():
|
|||||||
os.environ['PATH'] = os.path.dirname(sys.executable)+sep+os.environ['PATH']
|
os.environ['PATH'] = os.path.dirname(sys.executable)+sep+os.environ['PATH']
|
||||||
|
|
||||||
|
|
||||||
@lru_cache(maxsize=2)
|
|
||||||
def get_pip_cmd(force_uv=False):
|
|
||||||
"""
|
|
||||||
Get the base pip command, with automatic fallback to uv if pip is unavailable.
|
|
||||||
|
|
||||||
Args:
|
|
||||||
force_uv (bool): If True, use uv directly without trying pip
|
|
||||||
|
|
||||||
Returns:
|
|
||||||
list: Base command for pip operations
|
|
||||||
"""
|
|
||||||
embedded = 'python_embeded' in sys.executable
|
|
||||||
|
|
||||||
# Try pip first (unless forcing uv)
|
|
||||||
if not force_uv:
|
|
||||||
try:
|
|
||||||
test_cmd = [sys.executable] + (['-s'] if embedded else []) + ['-m', 'pip', '--version']
|
|
||||||
subprocess.check_output(test_cmd, stderr=subprocess.DEVNULL, timeout=5)
|
|
||||||
return [sys.executable] + (['-s'] if embedded else []) + ['-m', 'pip']
|
|
||||||
except Exception:
|
|
||||||
logging.warning("[ComfyUI-Manager] python -m pip not available. Falling back to uv.")
|
|
||||||
|
|
||||||
# Try uv (either forced or pip failed)
|
|
||||||
import shutil
|
|
||||||
|
|
||||||
# Try uv as Python module
|
|
||||||
try:
|
|
||||||
test_cmd = [sys.executable] + (['-s'] if embedded else []) + ['-m', 'uv', '--version']
|
|
||||||
subprocess.check_output(test_cmd, stderr=subprocess.DEVNULL, timeout=5)
|
|
||||||
logging.info("[ComfyUI-Manager] Using uv as Python module for pip operations.")
|
|
||||||
return [sys.executable] + (['-s'] if embedded else []) + ['-m', 'uv', 'pip']
|
|
||||||
except Exception:
|
|
||||||
pass
|
|
||||||
|
|
||||||
# Try standalone uv
|
|
||||||
if shutil.which('uv'):
|
|
||||||
logging.info("[ComfyUI-Manager] Using standalone uv for pip operations.")
|
|
||||||
return ['uv', 'pip']
|
|
||||||
|
|
||||||
# Nothing worked
|
|
||||||
logging.error("[ComfyUI-Manager] Neither python -m pip nor uv are available. Cannot proceed with package operations.")
|
|
||||||
raise Exception("Neither pip nor uv are available for package management")
|
|
||||||
|
|
||||||
|
|
||||||
def make_pip_cmd(cmd):
|
def make_pip_cmd(cmd):
|
||||||
"""
|
if 'python_embeded' in sys.executable:
|
||||||
Create a pip command by combining the cached base pip command with the given arguments.
|
if use_uv:
|
||||||
|
return [sys.executable, '-s', '-m', 'uv', 'pip'] + cmd
|
||||||
Args:
|
else:
|
||||||
cmd (list): List of pip command arguments (e.g., ['install', 'package'])
|
return [sys.executable, '-s', '-m', 'pip'] + cmd
|
||||||
|
else:
|
||||||
Returns:
|
# FIXED: https://github.com/ltdrdata/ComfyUI-Manager/issues/1667
|
||||||
list: Complete command list ready for subprocess execution
|
if use_uv:
|
||||||
"""
|
return [sys.executable, '-m', 'uv', 'pip'] + cmd
|
||||||
global use_uv
|
else:
|
||||||
base_cmd = get_pip_cmd(force_uv=use_uv)
|
return [sys.executable, '-m', 'pip'] + cmd
|
||||||
return base_cmd + cmd
|
|
||||||
|
|
||||||
|
|
||||||
# DON'T USE StrictVersion - cannot handle pre_release version
|
# DON'T USE StrictVersion - cannot handle pre_release version
|
||||||
# try:
|
# try:
|
||||||
# from distutils.version import StrictVersion
|
# from distutils.version import StrictVersion
|
||||||
# except Exception:
|
# except:
|
||||||
# print(f"[ComfyUI-Manager] 'distutils' package not found. Activating fallback mode for compatibility.")
|
# print(f"[ComfyUI-Manager] 'distutils' package not found. Activating fallback mode for compatibility.")
|
||||||
class StrictVersion:
|
class StrictVersion:
|
||||||
def __init__(self, version_string):
|
def __init__(self, version_string):
|
||||||
@@ -187,7 +139,7 @@ async def get_data(uri, silent=False):
|
|||||||
print(f"FETCH DATA from: {uri}", end="")
|
print(f"FETCH DATA from: {uri}", end="")
|
||||||
|
|
||||||
if uri.startswith("http"):
|
if uri.startswith("http"):
|
||||||
async with aiohttp.ClientSession(trust_env=True, connector=aiohttp.TCPConnector(verify_ssl=not bypass_ssl)) as session:
|
async with aiohttp.ClientSession(trust_env=True, connector=aiohttp.TCPConnector(verify_ssl=False)) as session:
|
||||||
headers = {
|
headers = {
|
||||||
'Cache-Control': 'no-cache',
|
'Cache-Control': 'no-cache',
|
||||||
'Pragma': 'no-cache',
|
'Pragma': 'no-cache',
|
||||||
@@ -307,7 +259,7 @@ def get_installed_packages(renew=False):
|
|||||||
pip_map[normalized_name] = y[1]
|
pip_map[normalized_name] = y[1]
|
||||||
except subprocess.CalledProcessError:
|
except subprocess.CalledProcessError:
|
||||||
logging.error("[ComfyUI-Manager] Failed to retrieve the information of installed pip packages.")
|
logging.error("[ComfyUI-Manager] Failed to retrieve the information of installed pip packages.")
|
||||||
return {}
|
return set()
|
||||||
|
|
||||||
return pip_map
|
return pip_map
|
||||||
|
|
||||||
@@ -358,7 +310,6 @@ def parse_requirement_line(line):
|
|||||||
|
|
||||||
|
|
||||||
torch_torchvision_torchaudio_version_map = {
|
torch_torchvision_torchaudio_version_map = {
|
||||||
'2.7.0': ('0.22.0', '2.7.0'),
|
|
||||||
'2.6.0': ('0.21.0', '2.6.0'),
|
'2.6.0': ('0.21.0', '2.6.0'),
|
||||||
'2.5.1': ('0.20.0', '2.5.0'),
|
'2.5.1': ('0.20.0', '2.5.0'),
|
||||||
'2.5.0': ('0.20.0', '2.5.0'),
|
'2.5.0': ('0.20.0', '2.5.0'),
|
||||||
@@ -377,9 +328,16 @@ torch_torchvision_torchaudio_version_map = {
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
def torch_rollback(prev):
|
|
||||||
spec = prev.split('+')
|
class PIPFixer:
|
||||||
if len(spec) > 1:
|
def __init__(self, prev_pip_versions, comfyui_path, manager_files_path):
|
||||||
|
self.prev_pip_versions = { **prev_pip_versions }
|
||||||
|
self.comfyui_path = comfyui_path
|
||||||
|
self.manager_files_path = manager_files_path
|
||||||
|
|
||||||
|
def torch_rollback(self):
|
||||||
|
spec = self.prev_pip_versions['torch'].split('+')
|
||||||
|
if len(spec) > 0:
|
||||||
platform = spec[1]
|
platform = spec[1]
|
||||||
else:
|
else:
|
||||||
cmd = make_pip_cmd(['install', '--force', 'torch', 'torchvision', 'torchaudio'])
|
cmd = make_pip_cmd(['install', '--force', 'torch', 'torchvision', 'torchaudio'])
|
||||||
@@ -403,13 +361,6 @@ def torch_rollback(prev):
|
|||||||
|
|
||||||
subprocess.check_output(cmd, universal_newlines=True)
|
subprocess.check_output(cmd, universal_newlines=True)
|
||||||
|
|
||||||
|
|
||||||
class PIPFixer:
|
|
||||||
def __init__(self, prev_pip_versions, comfyui_path, manager_files_path):
|
|
||||||
self.prev_pip_versions = { **prev_pip_versions }
|
|
||||||
self.comfyui_path = comfyui_path
|
|
||||||
self.manager_files_path = manager_files_path
|
|
||||||
|
|
||||||
def fix_broken(self):
|
def fix_broken(self):
|
||||||
new_pip_versions = get_installed_packages(True)
|
new_pip_versions = get_installed_packages(True)
|
||||||
|
|
||||||
@@ -431,7 +382,7 @@ class PIPFixer:
|
|||||||
elif self.prev_pip_versions['torch'] != new_pip_versions['torch'] \
|
elif self.prev_pip_versions['torch'] != new_pip_versions['torch'] \
|
||||||
or self.prev_pip_versions['torchvision'] != new_pip_versions['torchvision'] \
|
or self.prev_pip_versions['torchvision'] != new_pip_versions['torchvision'] \
|
||||||
or self.prev_pip_versions['torchaudio'] != new_pip_versions['torchaudio']:
|
or self.prev_pip_versions['torchaudio'] != new_pip_versions['torchaudio']:
|
||||||
torch_rollback(self.prev_pip_versions['torch'])
|
self.torch_rollback()
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
logging.error("[ComfyUI-Manager] Failed to restore PyTorch")
|
logging.error("[ComfyUI-Manager] Failed to restore PyTorch")
|
||||||
logging.error(e)
|
logging.error(e)
|
||||||
@@ -462,7 +413,7 @@ class PIPFixer:
|
|||||||
|
|
||||||
if len(targets) > 0:
|
if len(targets) > 0:
|
||||||
for x in targets:
|
for x in targets:
|
||||||
cmd = make_pip_cmd(['install', f"{x}=={versions[0].version_string}"])
|
cmd = make_pip_cmd(['install', f"{x}=={versions[0].version_string}", "numpy<2"])
|
||||||
subprocess.check_output(cmd, universal_newlines=True)
|
subprocess.check_output(cmd, universal_newlines=True)
|
||||||
|
|
||||||
logging.info(f"[ComfyUI-Manager] 'opencv' dependencies were fixed: {targets}")
|
logging.info(f"[ComfyUI-Manager] 'opencv' dependencies were fixed: {targets}")
|
||||||
@@ -470,6 +421,19 @@ class PIPFixer:
|
|||||||
logging.error("[ComfyUI-Manager] Failed to restore opencv")
|
logging.error("[ComfyUI-Manager] Failed to restore opencv")
|
||||||
logging.error(e)
|
logging.error(e)
|
||||||
|
|
||||||
|
# fix numpy
|
||||||
|
try:
|
||||||
|
np = new_pip_versions.get('numpy')
|
||||||
|
if np is not None:
|
||||||
|
if StrictVersion(np) >= StrictVersion('2'):
|
||||||
|
cmd = make_pip_cmd(['install', "numpy<2"])
|
||||||
|
subprocess.check_output(cmd , universal_newlines=True)
|
||||||
|
|
||||||
|
logging.info("[ComfyUI-Manager] 'numpy' dependency were fixed")
|
||||||
|
except Exception as e:
|
||||||
|
logging.error("[ComfyUI-Manager] Failed to restore numpy")
|
||||||
|
logging.error(e)
|
||||||
|
|
||||||
# fix missing frontend
|
# fix missing frontend
|
||||||
try:
|
try:
|
||||||
# NOTE: package name in requirements is 'comfyui-frontend-package'
|
# NOTE: package name in requirements is 'comfyui-frontend-package'
|
||||||
@@ -508,7 +472,7 @@ class PIPFixer:
|
|||||||
normalized_name = parsed['package'].lower().replace('-', '_')
|
normalized_name = parsed['package'].lower().replace('-', '_')
|
||||||
if normalized_name in new_pip_versions:
|
if normalized_name in new_pip_versions:
|
||||||
if 'version' in parsed and 'operator' in parsed:
|
if 'version' in parsed and 'operator' in parsed:
|
||||||
cur = StrictVersion(new_pip_versions[normalized_name])
|
cur = StrictVersion(new_pip_versions[parsed['package']])
|
||||||
dest = parsed['version']
|
dest = parsed['version']
|
||||||
op = parsed['operator']
|
op = parsed['operator']
|
||||||
if cur == dest:
|
if cur == dest:
|
||||||
@@ -556,7 +520,7 @@ def robust_readlines(fullpath):
|
|||||||
try:
|
try:
|
||||||
with open(fullpath, "r") as f:
|
with open(fullpath, "r") as f:
|
||||||
return f.readlines()
|
return f.readlines()
|
||||||
except Exception:
|
except:
|
||||||
encoding = None
|
encoding = None
|
||||||
with open(fullpath, "rb") as f:
|
with open(fullpath, "rb") as f:
|
||||||
raw_data = f.read()
|
raw_data = f.read()
|
||||||
@@ -569,69 +533,3 @@ def robust_readlines(fullpath):
|
|||||||
|
|
||||||
print(f"[ComfyUI-Manager] Failed to recognize encoding for: {fullpath}")
|
print(f"[ComfyUI-Manager] Failed to recognize encoding for: {fullpath}")
|
||||||
return []
|
return []
|
||||||
|
|
||||||
|
|
||||||
def restore_pip_snapshot(pips, options):
|
|
||||||
non_url = []
|
|
||||||
local_url = []
|
|
||||||
non_local_url = []
|
|
||||||
|
|
||||||
for k, v in pips.items():
|
|
||||||
# NOTE: skip torch related packages
|
|
||||||
if k.startswith("torch==") or k.startswith("torchvision==") or k.startswith("torchaudio==") or k.startswith("nvidia-"):
|
|
||||||
continue
|
|
||||||
|
|
||||||
if v == "":
|
|
||||||
non_url.append(k)
|
|
||||||
else:
|
|
||||||
if v.startswith('file:'):
|
|
||||||
local_url.append(v)
|
|
||||||
else:
|
|
||||||
non_local_url.append(v)
|
|
||||||
|
|
||||||
|
|
||||||
# restore other pips
|
|
||||||
failed = []
|
|
||||||
if '--pip-non-url' in options:
|
|
||||||
# try all at once
|
|
||||||
res = 1
|
|
||||||
try:
|
|
||||||
res = subprocess.check_output(make_pip_cmd(['install'] + non_url))
|
|
||||||
except Exception:
|
|
||||||
pass
|
|
||||||
|
|
||||||
# fallback
|
|
||||||
if res != 0:
|
|
||||||
for x in non_url:
|
|
||||||
res = 1
|
|
||||||
try:
|
|
||||||
res = subprocess.check_output(make_pip_cmd(['install', '--no-deps', x]))
|
|
||||||
except Exception:
|
|
||||||
pass
|
|
||||||
|
|
||||||
if res != 0:
|
|
||||||
failed.append(x)
|
|
||||||
|
|
||||||
if '--pip-non-local-url' in options:
|
|
||||||
for x in non_local_url:
|
|
||||||
res = 1
|
|
||||||
try:
|
|
||||||
res = subprocess.check_output(make_pip_cmd(['install', '--no-deps', x]))
|
|
||||||
except Exception:
|
|
||||||
pass
|
|
||||||
|
|
||||||
if res != 0:
|
|
||||||
failed.append(x)
|
|
||||||
|
|
||||||
if '--pip-local-url' in options:
|
|
||||||
for x in local_url:
|
|
||||||
res = 1
|
|
||||||
try:
|
|
||||||
res = subprocess.check_output(make_pip_cmd(['install', '--no-deps', x]))
|
|
||||||
except Exception:
|
|
||||||
pass
|
|
||||||
|
|
||||||
if res != 0:
|
|
||||||
failed.append(x)
|
|
||||||
|
|
||||||
print(f"Installation failed for pip packages: {failed}")
|
|
||||||
@@ -14,7 +14,6 @@ class InstalledNodePackage:
|
|||||||
fullpath: str
|
fullpath: str
|
||||||
disabled: bool
|
disabled: bool
|
||||||
version: str
|
version: str
|
||||||
repo_url: str = None # Git repository URL for nightly packages
|
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def is_unknown(self) -> bool:
|
def is_unknown(self) -> bool:
|
||||||
@@ -47,8 +46,6 @@ class InstalledNodePackage:
|
|||||||
|
|
||||||
@staticmethod
|
@staticmethod
|
||||||
def from_fullpath(fullpath: str, resolve_from_path) -> InstalledNodePackage:
|
def from_fullpath(fullpath: str, resolve_from_path) -> InstalledNodePackage:
|
||||||
from . import git_utils
|
|
||||||
|
|
||||||
parent_folder_name = os.path.basename(os.path.dirname(fullpath))
|
parent_folder_name = os.path.basename(os.path.dirname(fullpath))
|
||||||
module_name = os.path.basename(fullpath)
|
module_name = os.path.basename(fullpath)
|
||||||
|
|
||||||
@@ -57,10 +54,6 @@ class InstalledNodePackage:
|
|||||||
disabled = True
|
disabled = True
|
||||||
elif parent_folder_name == ".disabled":
|
elif parent_folder_name == ".disabled":
|
||||||
# Nodes under custom_nodes/.disabled/* are disabled
|
# Nodes under custom_nodes/.disabled/* are disabled
|
||||||
# Parse directory name format: packagename@version
|
|
||||||
# Examples:
|
|
||||||
# comfyui_sigmoidoffsetscheduler@nightly → id: comfyui_sigmoidoffsetscheduler, version: nightly
|
|
||||||
# comfyui_sigmoidoffsetscheduler@1_0_2 → id: comfyui_sigmoidoffsetscheduler, version: 1.0.2
|
|
||||||
node_id = module_name
|
node_id = module_name
|
||||||
disabled = True
|
disabled = True
|
||||||
else:
|
else:
|
||||||
@@ -68,35 +61,12 @@ class InstalledNodePackage:
|
|||||||
disabled = False
|
disabled = False
|
||||||
|
|
||||||
info = resolve_from_path(fullpath)
|
info = resolve_from_path(fullpath)
|
||||||
repo_url = None
|
|
||||||
version_from_dirname = None
|
|
||||||
|
|
||||||
# For disabled packages, try to extract version from directory name
|
|
||||||
if disabled and parent_folder_name == ".disabled" and '@' in module_name:
|
|
||||||
parts = module_name.split('@')
|
|
||||||
if len(parts) == 2:
|
|
||||||
node_id = parts[0] # Use the normalized name from directory
|
|
||||||
version_from_dirname = parts[1].replace('_', '.') # Convert 1_0_2 → 1.0.2
|
|
||||||
|
|
||||||
if info is None:
|
if info is None:
|
||||||
version = version_from_dirname if version_from_dirname else 'unknown'
|
version = 'unknown'
|
||||||
else:
|
else:
|
||||||
node_id = info['id'] # robust module guessing
|
node_id = info['id'] # robust module guessing
|
||||||
# Prefer version from directory name for disabled packages (preserves 'nightly' literal)
|
|
||||||
# Otherwise use version from package inspection (commit hash for git repos)
|
|
||||||
if version_from_dirname:
|
|
||||||
version = version_from_dirname
|
|
||||||
else:
|
|
||||||
version = info['ver']
|
version = info['ver']
|
||||||
|
|
||||||
# Get repository URL for both nightly and CNR packages
|
|
||||||
if version == 'nightly':
|
|
||||||
# For nightly packages, get repo URL from git
|
|
||||||
repo_url = git_utils.git_url(fullpath)
|
|
||||||
elif 'url' in info and info['url']:
|
|
||||||
# For CNR packages, get repo URL from pyproject.toml
|
|
||||||
repo_url = info['url']
|
|
||||||
|
|
||||||
return InstalledNodePackage(
|
return InstalledNodePackage(
|
||||||
id=node_id, fullpath=fullpath, disabled=disabled, version=version, repo_url=repo_url
|
id=node_id, fullpath=fullpath, disabled=disabled, version=version
|
||||||
)
|
)
|
||||||
@@ -2,8 +2,6 @@ import sys
|
|||||||
import subprocess
|
import subprocess
|
||||||
import os
|
import os
|
||||||
|
|
||||||
from . import manager_util
|
|
||||||
|
|
||||||
|
|
||||||
def security_check():
|
def security_check():
|
||||||
print("[START] Security scan")
|
print("[START] Security scan")
|
||||||
@@ -68,23 +66,18 @@ https://blog.comfy.org/comfyui-statement-on-the-ultralytics-crypto-miner-situati
|
|||||||
"lolMiner": [os.path.join(comfyui_path, 'lolMiner')]
|
"lolMiner": [os.path.join(comfyui_path, 'lolMiner')]
|
||||||
}
|
}
|
||||||
|
|
||||||
installed_pips = subprocess.check_output(manager_util.make_pip_cmd(["freeze"]), text=True)
|
installed_pips = subprocess.check_output([sys.executable, '-m', "pip", "freeze"], text=True)
|
||||||
|
|
||||||
detected = set()
|
detected = set()
|
||||||
try:
|
try:
|
||||||
anthropic_info = subprocess.check_output(manager_util.make_pip_cmd(["show", "anthropic"]), text=True, stderr=subprocess.DEVNULL)
|
anthropic_info = subprocess.check_output([sys.executable, '-m', "pip", "show", "anthropic"], text=True, stderr=subprocess.DEVNULL)
|
||||||
requires_lines = [x for x in anthropic_info.split('\n') if x.startswith("Requires")]
|
anthropic_reqs = [x for x in anthropic_info.split('\n') if x.startswith("Requires")][0].split(': ')[1]
|
||||||
if requires_lines:
|
|
||||||
anthropic_reqs = requires_lines[0].split(": ", 1)[1]
|
|
||||||
if "pycrypto" in anthropic_reqs:
|
if "pycrypto" in anthropic_reqs:
|
||||||
location_lines = [x for x in anthropic_info.split('\n') if x.startswith("Location")]
|
location = [x for x in anthropic_info.split('\n') if x.startswith("Location")][0].split(': ')[1]
|
||||||
if location_lines:
|
|
||||||
location = location_lines[0].split(": ", 1)[1]
|
|
||||||
for fi in os.listdir(location):
|
for fi in os.listdir(location):
|
||||||
if fi.startswith("anthropic"):
|
if fi.startswith("anthropic"):
|
||||||
guide["ComfyUI_LLMVISION"] = (f"\n0.Remove {os.path.join(location, fi)}" + guide["ComfyUI_LLMVISION"])
|
guide["ComfyUI_LLMVISION"] = f"\n0.Remove {os.path.join(location, fi)}" + guide["ComfyUI_LLMVISION"]
|
||||||
detected.add("ComfyUI_LLMVISION")
|
detected.add("ComfyUI_LLMVISION")
|
||||||
|
|
||||||
except subprocess.CalledProcessError:
|
except subprocess.CalledProcessError:
|
||||||
pass
|
pass
|
||||||
|
|
||||||
@@ -1,5 +1,4 @@
|
|||||||
import mimetypes
|
import mimetypes
|
||||||
from ..common import context
|
|
||||||
from . import manager_core as core
|
from . import manager_core as core
|
||||||
|
|
||||||
import os
|
import os
|
||||||
@@ -10,16 +9,6 @@ import hashlib
|
|||||||
|
|
||||||
import folder_paths
|
import folder_paths
|
||||||
from server import PromptServer
|
from server import PromptServer
|
||||||
import logging
|
|
||||||
import sys
|
|
||||||
|
|
||||||
|
|
||||||
try:
|
|
||||||
from nio import AsyncClient, LoginResponse, UploadResponse
|
|
||||||
matrix_nio_is_available = True
|
|
||||||
except Exception:
|
|
||||||
logging.warning(f"[ComfyUI-Manager] The matrix sharing feature has been disabled because the `matrix-nio` dependency is not installed.\n\tTo use this feature, please run the following command:\n\t{sys.executable} -m pip install matrix-nio\n")
|
|
||||||
matrix_nio_is_available = False
|
|
||||||
|
|
||||||
|
|
||||||
def extract_model_file_names(json_data):
|
def extract_model_file_names(json_data):
|
||||||
@@ -77,21 +66,21 @@ async def share_option(request):
|
|||||||
|
|
||||||
|
|
||||||
def get_openart_auth():
|
def get_openart_auth():
|
||||||
if not os.path.exists(os.path.join(context.manager_files_path, ".openart_key")):
|
if not os.path.exists(os.path.join(core.manager_files_path, ".openart_key")):
|
||||||
return None
|
return None
|
||||||
try:
|
try:
|
||||||
with open(os.path.join(context.manager_files_path, ".openart_key"), "r") as f:
|
with open(os.path.join(core.manager_files_path, ".openart_key"), "r") as f:
|
||||||
openart_key = f.read().strip()
|
openart_key = f.read().strip()
|
||||||
return openart_key if openart_key else None
|
return openart_key if openart_key else None
|
||||||
except Exception:
|
except:
|
||||||
return None
|
return None
|
||||||
|
|
||||||
|
|
||||||
def get_matrix_auth():
|
def get_matrix_auth():
|
||||||
if not os.path.exists(os.path.join(context.manager_files_path, "matrix_auth")):
|
if not os.path.exists(os.path.join(core.manager_files_path, "matrix_auth")):
|
||||||
return None
|
return None
|
||||||
try:
|
try:
|
||||||
with open(os.path.join(context.manager_files_path, "matrix_auth"), "r") as f:
|
with open(os.path.join(core.manager_files_path, "matrix_auth"), "r") as f:
|
||||||
matrix_auth = f.read()
|
matrix_auth = f.read()
|
||||||
homeserver, username, password = matrix_auth.strip().split("\n")
|
homeserver, username, password = matrix_auth.strip().split("\n")
|
||||||
if not homeserver or not username or not password:
|
if not homeserver or not username or not password:
|
||||||
@@ -101,36 +90,36 @@ def get_matrix_auth():
|
|||||||
"username": username,
|
"username": username,
|
||||||
"password": password,
|
"password": password,
|
||||||
}
|
}
|
||||||
except Exception:
|
except:
|
||||||
return None
|
return None
|
||||||
|
|
||||||
|
|
||||||
def get_comfyworkflows_auth():
|
def get_comfyworkflows_auth():
|
||||||
if not os.path.exists(os.path.join(context.manager_files_path, "comfyworkflows_sharekey")):
|
if not os.path.exists(os.path.join(core.manager_files_path, "comfyworkflows_sharekey")):
|
||||||
return None
|
return None
|
||||||
try:
|
try:
|
||||||
with open(os.path.join(context.manager_files_path, "comfyworkflows_sharekey"), "r") as f:
|
with open(os.path.join(core.manager_files_path, "comfyworkflows_sharekey"), "r") as f:
|
||||||
share_key = f.read()
|
share_key = f.read()
|
||||||
if not share_key.strip():
|
if not share_key.strip():
|
||||||
return None
|
return None
|
||||||
return share_key
|
return share_key
|
||||||
except Exception:
|
except:
|
||||||
return None
|
return None
|
||||||
|
|
||||||
|
|
||||||
def get_youml_settings():
|
def get_youml_settings():
|
||||||
if not os.path.exists(os.path.join(context.manager_files_path, ".youml")):
|
if not os.path.exists(os.path.join(core.manager_files_path, ".youml")):
|
||||||
return None
|
return None
|
||||||
try:
|
try:
|
||||||
with open(os.path.join(context.manager_files_path, ".youml"), "r") as f:
|
with open(os.path.join(core.manager_files_path, ".youml"), "r") as f:
|
||||||
youml_settings = f.read().strip()
|
youml_settings = f.read().strip()
|
||||||
return youml_settings if youml_settings else None
|
return youml_settings if youml_settings else None
|
||||||
except Exception:
|
except:
|
||||||
return None
|
return None
|
||||||
|
|
||||||
|
|
||||||
def set_youml_settings(settings):
|
def set_youml_settings(settings):
|
||||||
with open(os.path.join(context.manager_files_path, ".youml"), "w") as f:
|
with open(os.path.join(core.manager_files_path, ".youml"), "w") as f:
|
||||||
f.write(settings)
|
f.write(settings)
|
||||||
|
|
||||||
|
|
||||||
@@ -147,7 +136,7 @@ async def api_get_openart_auth(request):
|
|||||||
async def api_set_openart_auth(request):
|
async def api_set_openart_auth(request):
|
||||||
json_data = await request.json()
|
json_data = await request.json()
|
||||||
openart_key = json_data['openart_key']
|
openart_key = json_data['openart_key']
|
||||||
with open(os.path.join(context.manager_files_path, ".openart_key"), "w") as f:
|
with open(os.path.join(core.manager_files_path, ".openart_key"), "w") as f:
|
||||||
f.write(openart_key)
|
f.write(openart_key)
|
||||||
return web.Response(status=200)
|
return web.Response(status=200)
|
||||||
|
|
||||||
@@ -190,36 +179,28 @@ async def api_get_comfyworkflows_auth(request):
|
|||||||
@PromptServer.instance.routes.post("/v2/manager/set_esheep_workflow_and_images")
|
@PromptServer.instance.routes.post("/v2/manager/set_esheep_workflow_and_images")
|
||||||
async def set_esheep_workflow_and_images(request):
|
async def set_esheep_workflow_and_images(request):
|
||||||
json_data = await request.json()
|
json_data = await request.json()
|
||||||
with open(os.path.join(context.manager_files_path, "esheep_share_message.json"), "w", encoding='utf-8') as file:
|
with open(os.path.join(core.manager_files_path, "esheep_share_message.json"), "w", encoding='utf-8') as file:
|
||||||
json.dump(json_data, file, indent=4)
|
json.dump(json_data, file, indent=4)
|
||||||
return web.Response(status=200)
|
return web.Response(status=200)
|
||||||
|
|
||||||
|
|
||||||
@PromptServer.instance.routes.get("/v2/manager/get_esheep_workflow_and_images")
|
@PromptServer.instance.routes.get("/v2/manager/get_esheep_workflow_and_images")
|
||||||
async def get_esheep_workflow_and_images(request):
|
async def get_esheep_workflow_and_images(request):
|
||||||
with open(os.path.join(context.manager_files_path, "esheep_share_message.json"), 'r', encoding='utf-8') as file:
|
with open(os.path.join(core.manager_files_path, "esheep_share_message.json"), 'r', encoding='utf-8') as file:
|
||||||
data = json.load(file)
|
data = json.load(file)
|
||||||
return web.Response(status=200, text=json.dumps(data))
|
return web.Response(status=200, text=json.dumps(data))
|
||||||
|
|
||||||
|
|
||||||
@PromptServer.instance.routes.get("/v2/manager/get_matrix_dep_status")
|
|
||||||
async def get_matrix_dep_status(request):
|
|
||||||
if matrix_nio_is_available:
|
|
||||||
return web.Response(status=200, text='available')
|
|
||||||
else:
|
|
||||||
return web.Response(status=200, text='unavailable')
|
|
||||||
|
|
||||||
|
|
||||||
def set_matrix_auth(json_data):
|
def set_matrix_auth(json_data):
|
||||||
homeserver = json_data['homeserver']
|
homeserver = json_data['homeserver']
|
||||||
username = json_data['username']
|
username = json_data['username']
|
||||||
password = json_data['password']
|
password = json_data['password']
|
||||||
with open(os.path.join(context.manager_files_path, "matrix_auth"), "w") as f:
|
with open(os.path.join(core.manager_files_path, "matrix_auth"), "w") as f:
|
||||||
f.write("\n".join([homeserver, username, password]))
|
f.write("\n".join([homeserver, username, password]))
|
||||||
|
|
||||||
|
|
||||||
def set_comfyworkflows_auth(comfyworkflows_sharekey):
|
def set_comfyworkflows_auth(comfyworkflows_sharekey):
|
||||||
with open(os.path.join(context.manager_files_path, "comfyworkflows_sharekey"), "w") as f:
|
with open(os.path.join(core.manager_files_path, "comfyworkflows_sharekey"), "w") as f:
|
||||||
f.write(comfyworkflows_sharekey)
|
f.write(comfyworkflows_sharekey)
|
||||||
|
|
||||||
|
|
||||||
@@ -253,7 +234,7 @@ async def share_art(request):
|
|||||||
|
|
||||||
try:
|
try:
|
||||||
output_to_share = potential_outputs[int(selected_output_index)]
|
output_to_share = potential_outputs[int(selected_output_index)]
|
||||||
except Exception:
|
except:
|
||||||
# for now, pick the first output
|
# for now, pick the first output
|
||||||
output_to_share = potential_outputs[0]
|
output_to_share = potential_outputs[0]
|
||||||
|
|
||||||
@@ -349,12 +330,15 @@ async def share_art(request):
|
|||||||
workflowId = upload_workflow_json["workflowId"]
|
workflowId = upload_workflow_json["workflowId"]
|
||||||
|
|
||||||
# check if the user has provided Matrix credentials
|
# check if the user has provided Matrix credentials
|
||||||
if matrix_nio_is_available and "matrix" in share_destinations:
|
if "matrix" in share_destinations:
|
||||||
comfyui_share_room_id = '!LGYSoacpJPhIfBqVfb:matrix.org'
|
comfyui_share_room_id = '!LGYSoacpJPhIfBqVfb:matrix.org'
|
||||||
filename = os.path.basename(asset_filepath)
|
filename = os.path.basename(asset_filepath)
|
||||||
content_type = assetFileType
|
content_type = assetFileType
|
||||||
|
|
||||||
try:
|
try:
|
||||||
|
from matrix_client.api import MatrixHttpApi
|
||||||
|
from matrix_client.client import MatrixClient
|
||||||
|
|
||||||
homeserver = 'matrix.org'
|
homeserver = 'matrix.org'
|
||||||
if matrix_auth:
|
if matrix_auth:
|
||||||
homeserver = matrix_auth.get('homeserver', 'matrix.org')
|
homeserver = matrix_auth.get('homeserver', 'matrix.org')
|
||||||
@@ -362,35 +346,20 @@ async def share_art(request):
|
|||||||
if not homeserver.startswith("https://"):
|
if not homeserver.startswith("https://"):
|
||||||
homeserver = "https://" + homeserver
|
homeserver = "https://" + homeserver
|
||||||
|
|
||||||
client = AsyncClient(homeserver, matrix_auth['username'])
|
client = MatrixClient(homeserver)
|
||||||
|
try:
|
||||||
# Login
|
token = client.login(username=matrix_auth['username'], password=matrix_auth['password'])
|
||||||
login_resp = await client.login(matrix_auth['password'])
|
if not token:
|
||||||
if not isinstance(login_resp, LoginResponse) or not login_resp.access_token:
|
return web.json_response({"error": "Invalid Matrix credentials."}, content_type='application/json', status=400)
|
||||||
await client.close()
|
except:
|
||||||
return web.json_response({"error": "Invalid Matrix credentials."}, content_type='application/json', status=400)
|
return web.json_response({"error": "Invalid Matrix credentials."}, content_type='application/json', status=400)
|
||||||
|
|
||||||
# Upload asset
|
matrix = MatrixHttpApi(homeserver, token=token)
|
||||||
with open(asset_filepath, 'rb') as f:
|
with open(asset_filepath, 'rb') as f:
|
||||||
upload_resp, _maybe_keys = await client.upload(f, content_type=content_type, filename=filename)
|
mxc_url = matrix.media_upload(f.read(), content_type, filename=filename)['content_uri']
|
||||||
asset_data = f.seek(0) or f.read() # get size for info below
|
|
||||||
if not isinstance(upload_resp, UploadResponse) or not upload_resp.content_uri:
|
|
||||||
await client.close()
|
|
||||||
return web.json_response({"error": "Failed to upload asset to Matrix."}, content_type='application/json', status=500)
|
|
||||||
mxc_url = upload_resp.content_uri
|
|
||||||
|
|
||||||
# Upload workflow JSON
|
workflow_json_mxc_url = matrix.media_upload(prompt['workflow'], 'application/json', filename='workflow.json')['content_uri']
|
||||||
import io
|
|
||||||
workflow_json_bytes = json.dumps(prompt['workflow']).encode('utf-8')
|
|
||||||
workflow_io = io.BytesIO(workflow_json_bytes)
|
|
||||||
upload_workflow_resp, _maybe_keys = await client.upload(workflow_io, content_type='application/json', filename='workflow.json')
|
|
||||||
workflow_io.seek(0)
|
|
||||||
if not isinstance(upload_workflow_resp, UploadResponse) or not upload_workflow_resp.content_uri:
|
|
||||||
await client.close()
|
|
||||||
return web.json_response({"error": "Failed to upload workflow to Matrix."}, content_type='application/json', status=500)
|
|
||||||
workflow_json_mxc_url = upload_workflow_resp.content_uri
|
|
||||||
|
|
||||||
# Send text message
|
|
||||||
text_content = ""
|
text_content = ""
|
||||||
if title:
|
if title:
|
||||||
text_content += f"{title}\n"
|
text_content += f"{title}\n"
|
||||||
@@ -398,44 +367,9 @@ async def share_art(request):
|
|||||||
text_content += f"{description}\n"
|
text_content += f"{description}\n"
|
||||||
if credits:
|
if credits:
|
||||||
text_content += f"\ncredits: {credits}\n"
|
text_content += f"\ncredits: {credits}\n"
|
||||||
await client.room_send(
|
matrix.send_message(comfyui_share_room_id, text_content)
|
||||||
room_id=comfyui_share_room_id,
|
matrix.send_content(comfyui_share_room_id, mxc_url, filename, 'm.image')
|
||||||
message_type="m.room.message",
|
matrix.send_content(comfyui_share_room_id, workflow_json_mxc_url, 'workflow.json', 'm.file')
|
||||||
content={"msgtype": "m.text", "body": text_content}
|
|
||||||
)
|
|
||||||
|
|
||||||
# Send image
|
|
||||||
await client.room_send(
|
|
||||||
room_id=comfyui_share_room_id,
|
|
||||||
message_type="m.room.message",
|
|
||||||
content={
|
|
||||||
"msgtype": "m.image",
|
|
||||||
"body": filename,
|
|
||||||
"url": mxc_url,
|
|
||||||
"info": {
|
|
||||||
"mimetype": content_type,
|
|
||||||
"size": len(asset_data)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
)
|
|
||||||
|
|
||||||
# Send workflow JSON file
|
|
||||||
await client.room_send(
|
|
||||||
room_id=comfyui_share_room_id,
|
|
||||||
message_type="m.room.message",
|
|
||||||
content={
|
|
||||||
"msgtype": "m.file",
|
|
||||||
"body": "workflow.json",
|
|
||||||
"url": workflow_json_mxc_url,
|
|
||||||
"info": {
|
|
||||||
"mimetype": "application/json",
|
|
||||||
"size": len(workflow_json_bytes)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
)
|
|
||||||
|
|
||||||
await client.close()
|
|
||||||
|
|
||||||
except:
|
except:
|
||||||
import traceback
|
import traceback
|
||||||
traceback.print_exc()
|
traceback.print_exc()
|
||||||
|
|||||||
@@ -1,142 +0,0 @@
|
|||||||
import os
|
|
||||||
import git
|
|
||||||
import logging
|
|
||||||
import traceback
|
|
||||||
|
|
||||||
from comfyui_manager.common import context
|
|
||||||
import folder_paths
|
|
||||||
from comfy.cli_args import args
|
|
||||||
import latent_preview
|
|
||||||
|
|
||||||
from comfyui_manager.glob import manager_core as core
|
|
||||||
from comfyui_manager.common import cm_global
|
|
||||||
|
|
||||||
|
|
||||||
comfy_ui_hash = "-"
|
|
||||||
comfyui_tag = None
|
|
||||||
|
|
||||||
|
|
||||||
def print_comfyui_version():
|
|
||||||
global comfy_ui_hash
|
|
||||||
global comfyui_tag
|
|
||||||
|
|
||||||
is_detached = False
|
|
||||||
try:
|
|
||||||
repo = git.Repo(os.path.dirname(folder_paths.__file__))
|
|
||||||
core.comfy_ui_revision = len(list(repo.iter_commits("HEAD")))
|
|
||||||
|
|
||||||
comfy_ui_hash = repo.head.commit.hexsha
|
|
||||||
cm_global.variables["comfyui.revision"] = core.comfy_ui_revision
|
|
||||||
|
|
||||||
core.comfy_ui_commit_datetime = repo.head.commit.committed_datetime
|
|
||||||
cm_global.variables["comfyui.commit_datetime"] = core.comfy_ui_commit_datetime
|
|
||||||
|
|
||||||
is_detached = repo.head.is_detached
|
|
||||||
current_branch = repo.active_branch.name
|
|
||||||
|
|
||||||
comfyui_tag = context.get_comfyui_tag()
|
|
||||||
|
|
||||||
try:
|
|
||||||
if (
|
|
||||||
not os.environ.get("__COMFYUI_DESKTOP_VERSION__")
|
|
||||||
and core.comfy_ui_commit_datetime.date()
|
|
||||||
< core.comfy_ui_required_commit_datetime.date()
|
|
||||||
):
|
|
||||||
logging.warning(
|
|
||||||
f"\n\n## [WARN] ComfyUI-Manager: Your ComfyUI version ({core.comfy_ui_revision})[{core.comfy_ui_commit_datetime.date()}] is too old. Please update to the latest version. ##\n\n"
|
|
||||||
)
|
|
||||||
except Exception:
|
|
||||||
pass
|
|
||||||
|
|
||||||
# process on_revision_detected -->
|
|
||||||
if "cm.on_revision_detected_handler" in cm_global.variables:
|
|
||||||
for k, f in cm_global.variables["cm.on_revision_detected_handler"]:
|
|
||||||
try:
|
|
||||||
f(core.comfy_ui_revision)
|
|
||||||
except Exception:
|
|
||||||
logging.error(f"[ERROR] '{k}' on_revision_detected_handler")
|
|
||||||
traceback.print_exc()
|
|
||||||
|
|
||||||
del cm_global.variables["cm.on_revision_detected_handler"]
|
|
||||||
else:
|
|
||||||
logging.warning(
|
|
||||||
"[ComfyUI-Manager] Some features are restricted due to your ComfyUI being outdated."
|
|
||||||
)
|
|
||||||
# <--
|
|
||||||
|
|
||||||
if current_branch == "master":
|
|
||||||
if comfyui_tag:
|
|
||||||
logging.info(
|
|
||||||
f"### ComfyUI Version: {comfyui_tag} | Released on '{core.comfy_ui_commit_datetime.date()}'"
|
|
||||||
)
|
|
||||||
else:
|
|
||||||
logging.info(
|
|
||||||
f"### ComfyUI Revision: {core.comfy_ui_revision} [{comfy_ui_hash[:8]}] | Released on '{core.comfy_ui_commit_datetime.date()}'"
|
|
||||||
)
|
|
||||||
else:
|
|
||||||
if comfyui_tag:
|
|
||||||
logging.info(
|
|
||||||
f"### ComfyUI Version: {comfyui_tag} on '{current_branch}' | Released on '{core.comfy_ui_commit_datetime.date()}'"
|
|
||||||
)
|
|
||||||
else:
|
|
||||||
logging.info(
|
|
||||||
f"### ComfyUI Revision: {core.comfy_ui_revision} on '{current_branch}' [{comfy_ui_hash[:8]}] | Released on '{core.comfy_ui_commit_datetime.date()}'"
|
|
||||||
)
|
|
||||||
except Exception:
|
|
||||||
if is_detached:
|
|
||||||
logging.info(
|
|
||||||
f"### ComfyUI Revision: {core.comfy_ui_revision} [{comfy_ui_hash[:8]}] *DETACHED | Released on '{core.comfy_ui_commit_datetime.date()}'"
|
|
||||||
)
|
|
||||||
else:
|
|
||||||
logging.info(
|
|
||||||
"### ComfyUI Revision: UNKNOWN (The currently installed ComfyUI is not a Git repository)"
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
def set_preview_method(method):
|
|
||||||
if method == "auto":
|
|
||||||
args.preview_method = latent_preview.LatentPreviewMethod.Auto
|
|
||||||
elif method == "latent2rgb":
|
|
||||||
args.preview_method = latent_preview.LatentPreviewMethod.Latent2RGB
|
|
||||||
elif method == "taesd":
|
|
||||||
args.preview_method = latent_preview.LatentPreviewMethod.TAESD
|
|
||||||
else:
|
|
||||||
args.preview_method = latent_preview.LatentPreviewMethod.NoPreviews
|
|
||||||
|
|
||||||
core.get_config()["preview_method"] = method
|
|
||||||
|
|
||||||
|
|
||||||
def set_update_policy(mode):
|
|
||||||
core.get_config()["update_policy"] = mode
|
|
||||||
|
|
||||||
|
|
||||||
def set_db_mode(mode):
|
|
||||||
core.get_config()["db_mode"] = mode
|
|
||||||
|
|
||||||
|
|
||||||
def setup_environment():
|
|
||||||
git_exe = core.get_config()["git_exe"]
|
|
||||||
|
|
||||||
if git_exe != "":
|
|
||||||
git.Git().update_environment(GIT_PYTHON_GIT_EXECUTABLE=git_exe)
|
|
||||||
|
|
||||||
|
|
||||||
def initialize_environment():
|
|
||||||
context.comfy_path = os.path.dirname(folder_paths.__file__)
|
|
||||||
core.js_path = os.path.join(context.comfy_path, "web", "extensions")
|
|
||||||
|
|
||||||
# Legacy database paths - kept for potential future use
|
|
||||||
# local_db_model = os.path.join(manager_util.comfyui_manager_path, "model-list.json")
|
|
||||||
# local_db_alter = os.path.join(manager_util.comfyui_manager_path, "alter-list.json")
|
|
||||||
# local_db_custom_node_list = os.path.join(
|
|
||||||
# manager_util.comfyui_manager_path, "custom-node-list.json"
|
|
||||||
# )
|
|
||||||
# local_db_extension_node_mappings = os.path.join(
|
|
||||||
# manager_util.comfyui_manager_path, "extension-node-map.json"
|
|
||||||
# )
|
|
||||||
|
|
||||||
set_preview_method(core.get_config()["preview_method"])
|
|
||||||
print_comfyui_version()
|
|
||||||
setup_environment()
|
|
||||||
|
|
||||||
core.check_invalid_nodes()
|
|
||||||
@@ -1,60 +0,0 @@
|
|||||||
import locale
|
|
||||||
import sys
|
|
||||||
import re
|
|
||||||
|
|
||||||
|
|
||||||
def handle_stream(stream, prefix):
|
|
||||||
stream.reconfigure(encoding=locale.getpreferredencoding(), errors="replace")
|
|
||||||
for msg in stream:
|
|
||||||
if (
|
|
||||||
prefix == "[!]"
|
|
||||||
and ("it/s]" in msg or "s/it]" in msg)
|
|
||||||
and ("%|" in msg or "it [" in msg)
|
|
||||||
):
|
|
||||||
if msg.startswith("100%"):
|
|
||||||
print("\r" + msg, end="", file=sys.stderr),
|
|
||||||
else:
|
|
||||||
print("\r" + msg[:-1], end="", file=sys.stderr),
|
|
||||||
else:
|
|
||||||
if prefix == "[!]":
|
|
||||||
print(prefix, msg, end="", file=sys.stderr)
|
|
||||||
else:
|
|
||||||
print(prefix, msg, end="")
|
|
||||||
|
|
||||||
|
|
||||||
def convert_markdown_to_html(input_text):
|
|
||||||
pattern_a = re.compile(r"\[a/([^]]+)]\(([^)]+)\)")
|
|
||||||
pattern_w = re.compile(r"\[w/([^]]+)]")
|
|
||||||
pattern_i = re.compile(r"\[i/([^]]+)]")
|
|
||||||
pattern_bold = re.compile(r"\*\*([^*]+)\*\*")
|
|
||||||
pattern_white = re.compile(r"%%([^*]+)%%")
|
|
||||||
|
|
||||||
def replace_a(match):
|
|
||||||
return f"<a href='{match.group(2)}' target='blank'>{match.group(1)}</a>"
|
|
||||||
|
|
||||||
def replace_w(match):
|
|
||||||
return f"<p class='cm-warn-note'>{match.group(1)}</p>"
|
|
||||||
|
|
||||||
def replace_i(match):
|
|
||||||
return f"<p class='cm-info-note'>{match.group(1)}</p>"
|
|
||||||
|
|
||||||
def replace_bold(match):
|
|
||||||
return f"<B>{match.group(1)}</B>"
|
|
||||||
|
|
||||||
def replace_white(match):
|
|
||||||
return f"<font color='white'>{match.group(1)}</font>"
|
|
||||||
|
|
||||||
input_text = (
|
|
||||||
input_text.replace("\\[", "[")
|
|
||||||
.replace("\\]", "]")
|
|
||||||
.replace("<", "<")
|
|
||||||
.replace(">", ">")
|
|
||||||
)
|
|
||||||
|
|
||||||
result_text = re.sub(pattern_a, replace_a, input_text)
|
|
||||||
result_text = re.sub(pattern_w, replace_w, result_text)
|
|
||||||
result_text = re.sub(pattern_i, replace_i, result_text)
|
|
||||||
result_text = re.sub(pattern_bold, replace_bold, result_text)
|
|
||||||
result_text = re.sub(pattern_white, replace_white, result_text)
|
|
||||||
|
|
||||||
return result_text.replace("\n", "<BR>")
|
|
||||||
@@ -1,137 +0,0 @@
|
|||||||
import os
|
|
||||||
import logging
|
|
||||||
import concurrent.futures
|
|
||||||
import folder_paths
|
|
||||||
|
|
||||||
from comfyui_manager.glob import manager_core as core
|
|
||||||
from comfyui_manager.glob.constants import model_dir_name_map, MODEL_DIR_NAMES
|
|
||||||
|
|
||||||
|
|
||||||
def get_model_dir(data, show_log=False):
|
|
||||||
if "download_model_base" in folder_paths.folder_names_and_paths:
|
|
||||||
models_base = folder_paths.folder_names_and_paths["download_model_base"][0][0]
|
|
||||||
else:
|
|
||||||
models_base = folder_paths.models_dir
|
|
||||||
|
|
||||||
# NOTE: Validate to prevent path traversal.
|
|
||||||
if any(char in data["filename"] for char in {"/", "\\", ":"}):
|
|
||||||
return None
|
|
||||||
|
|
||||||
if data["save_path"] != "default":
|
|
||||||
if ".." in data["save_path"] or data["save_path"].startswith("/"):
|
|
||||||
if show_log:
|
|
||||||
logging.info(
|
|
||||||
f"[WARN] '{data['save_path']}' is not allowed path. So it will be saved into 'models/etc'."
|
|
||||||
)
|
|
||||||
base_model = os.path.join(models_base, "etc")
|
|
||||||
else:
|
|
||||||
if data["save_path"].startswith("custom_nodes"):
|
|
||||||
logging.warning("The feature to download models into the custom node path is no longer supported.")
|
|
||||||
return None
|
|
||||||
else:
|
|
||||||
base_model = os.path.join(models_base, data["save_path"])
|
|
||||||
else:
|
|
||||||
model_dir_name = model_dir_name_map.get(data["type"].lower())
|
|
||||||
if model_dir_name is not None:
|
|
||||||
base_model = folder_paths.folder_names_and_paths[model_dir_name][0][0]
|
|
||||||
else:
|
|
||||||
base_model = os.path.join(models_base, "etc")
|
|
||||||
|
|
||||||
return base_model
|
|
||||||
|
|
||||||
|
|
||||||
def get_model_path(data, show_log=False):
|
|
||||||
base_model = get_model_dir(data, show_log)
|
|
||||||
if base_model is None:
|
|
||||||
return None
|
|
||||||
else:
|
|
||||||
if data["filename"] == "<huggingface>":
|
|
||||||
return os.path.join(base_model, os.path.basename(data["url"]))
|
|
||||||
else:
|
|
||||||
return os.path.join(base_model, data["filename"])
|
|
||||||
|
|
||||||
|
|
||||||
def check_model_installed(json_obj):
|
|
||||||
def is_exists(model_dir_name, filename, url):
|
|
||||||
if filename == "<huggingface>":
|
|
||||||
filename = os.path.basename(url)
|
|
||||||
|
|
||||||
dirs = folder_paths.get_folder_paths(model_dir_name)
|
|
||||||
|
|
||||||
for x in dirs:
|
|
||||||
if os.path.exists(os.path.join(x, filename)):
|
|
||||||
return True
|
|
||||||
|
|
||||||
return False
|
|
||||||
|
|
||||||
total_models_files = set()
|
|
||||||
for x in MODEL_DIR_NAMES:
|
|
||||||
for y in folder_paths.get_filename_list(x):
|
|
||||||
total_models_files.add(y)
|
|
||||||
|
|
||||||
def process_model_phase(item):
|
|
||||||
if (
|
|
||||||
"diffusion" not in item["filename"]
|
|
||||||
and "pytorch" not in item["filename"]
|
|
||||||
and "model" not in item["filename"]
|
|
||||||
):
|
|
||||||
# non-general name case
|
|
||||||
if item["filename"] in total_models_files:
|
|
||||||
item["installed"] = "True"
|
|
||||||
return
|
|
||||||
|
|
||||||
if item["save_path"] == "default":
|
|
||||||
model_dir_name = model_dir_name_map.get(item["type"].lower())
|
|
||||||
if model_dir_name is not None:
|
|
||||||
item["installed"] = str(
|
|
||||||
is_exists(model_dir_name, item["filename"], item["url"])
|
|
||||||
)
|
|
||||||
else:
|
|
||||||
item["installed"] = "False"
|
|
||||||
else:
|
|
||||||
model_dir_name = item["save_path"].split("/")[0]
|
|
||||||
if model_dir_name in folder_paths.folder_names_and_paths:
|
|
||||||
if is_exists(model_dir_name, item["filename"], item["url"]):
|
|
||||||
item["installed"] = "True"
|
|
||||||
|
|
||||||
if "installed" not in item:
|
|
||||||
if item["filename"] == "<huggingface>":
|
|
||||||
filename = os.path.basename(item["url"])
|
|
||||||
else:
|
|
||||||
filename = item["filename"]
|
|
||||||
|
|
||||||
fullpath = os.path.join(
|
|
||||||
folder_paths.models_dir, item["save_path"], filename
|
|
||||||
)
|
|
||||||
|
|
||||||
item["installed"] = "True" if os.path.exists(fullpath) else "False"
|
|
||||||
|
|
||||||
with concurrent.futures.ThreadPoolExecutor(8) as executor:
|
|
||||||
for item in json_obj["models"]:
|
|
||||||
executor.submit(process_model_phase, item)
|
|
||||||
|
|
||||||
|
|
||||||
async def check_whitelist_for_model(item):
|
|
||||||
from comfyui_manager.data_models import ManagerDatabaseSource
|
|
||||||
|
|
||||||
json_obj = await core.get_data_by_mode(ManagerDatabaseSource.cache.value, "model-list.json")
|
|
||||||
|
|
||||||
for x in json_obj.get("models", []):
|
|
||||||
if (
|
|
||||||
x["save_path"] == item["save_path"]
|
|
||||||
and x["base"] == item["base"]
|
|
||||||
and x["filename"] == item["filename"]
|
|
||||||
):
|
|
||||||
return True
|
|
||||||
|
|
||||||
json_obj = await core.get_data_by_mode(ManagerDatabaseSource.local.value, "model-list.json")
|
|
||||||
|
|
||||||
for x in json_obj.get("models", []):
|
|
||||||
if (
|
|
||||||
x["save_path"] == item["save_path"]
|
|
||||||
and x["base"] == item["base"]
|
|
||||||
and x["filename"] == item["filename"]
|
|
||||||
):
|
|
||||||
return True
|
|
||||||
|
|
||||||
return False
|
|
||||||
@@ -1,40 +0,0 @@
|
|||||||
from comfyui_manager.glob import manager_core as core
|
|
||||||
from comfy.cli_args import args
|
|
||||||
from comfyui_manager.data_models import SecurityLevel, RiskLevel
|
|
||||||
|
|
||||||
|
|
||||||
def is_loopback(address):
|
|
||||||
import ipaddress
|
|
||||||
try:
|
|
||||||
return ipaddress.ip_address(address).is_loopback
|
|
||||||
except ValueError:
|
|
||||||
return False
|
|
||||||
|
|
||||||
|
|
||||||
def is_allowed_security_level(level):
|
|
||||||
is_local_mode = is_loopback(args.listen)
|
|
||||||
is_personal_cloud = core.get_config()['network_mode'].lower() == 'personal_cloud'
|
|
||||||
|
|
||||||
if level == RiskLevel.block.value:
|
|
||||||
return False
|
|
||||||
elif level == RiskLevel.high_.value:
|
|
||||||
if is_local_mode:
|
|
||||||
return core.get_config()['security_level'] in [SecurityLevel.weak.value, SecurityLevel.normal_.value]
|
|
||||||
elif is_personal_cloud:
|
|
||||||
return core.get_config()['security_level'] == SecurityLevel.weak.value
|
|
||||||
else:
|
|
||||||
return False
|
|
||||||
elif level == RiskLevel.high.value:
|
|
||||||
if is_local_mode:
|
|
||||||
return core.get_config()['security_level'] in [SecurityLevel.weak.value, SecurityLevel.normal_.value]
|
|
||||||
else:
|
|
||||||
return core.get_config()['security_level'] == SecurityLevel.weak.value
|
|
||||||
elif level == RiskLevel.middle_.value:
|
|
||||||
if is_local_mode or is_personal_cloud:
|
|
||||||
return core.get_config()['security_level'] in [SecurityLevel.weak.value, SecurityLevel.normal.value, SecurityLevel.normal_.value]
|
|
||||||
else:
|
|
||||||
return False
|
|
||||||
elif level == RiskLevel.middle.value:
|
|
||||||
return core.get_config()['security_level'] in [SecurityLevel.weak.value, SecurityLevel.normal.value, SecurityLevel.normal_.value]
|
|
||||||
else:
|
|
||||||
return True
|
|
||||||
@@ -1,50 +0,0 @@
|
|||||||
# ComfyUI-Manager: Frontend (js)
|
|
||||||
|
|
||||||
This directory contains the JavaScript frontend implementation for ComfyUI-Manager, providing the user interface components that interact with the backend API.
|
|
||||||
|
|
||||||
## Core Components
|
|
||||||
|
|
||||||
- **comfyui-manager.js**: Main entry point that initializes the manager UI and integrates with ComfyUI.
|
|
||||||
- **custom-nodes-manager.js**: Implements the UI for browsing, installing, and managing custom nodes.
|
|
||||||
- **model-manager.js**: Handles the model management interface for downloading and organizing AI models.
|
|
||||||
- **components-manager.js**: Manages reusable workflow components system.
|
|
||||||
- **snapshot.js**: Implements the snapshot system for backing up and restoring installations.
|
|
||||||
|
|
||||||
## Sharing Components
|
|
||||||
|
|
||||||
- **comfyui-share-common.js**: Base functionality for workflow sharing features.
|
|
||||||
- **comfyui-share-copus.js**: Integration with the ComfyUI Opus sharing platform.
|
|
||||||
- **comfyui-share-openart.js**: Integration with the OpenArt sharing platform.
|
|
||||||
- **comfyui-share-youml.js**: Integration with the YouML sharing platform.
|
|
||||||
|
|
||||||
## Utility Components
|
|
||||||
|
|
||||||
- **cm-api.js**: Client-side API wrapper for communication with the backend.
|
|
||||||
- **common.js**: Shared utilities and helper functions used across the frontend.
|
|
||||||
- **node_fixer.js**: Utilities for fixing disconnected links and repairing malformed nodes by recreating them while preserving connections.
|
|
||||||
- **popover-helper.js**: UI component for popup tooltips and contextual information.
|
|
||||||
- **turbogrid.esm.js**: Grid component library - https://github.com/cenfun/turbogrid
|
|
||||||
- **workflow-metadata.js**: Handles workflow metadata parsing, validation and cross-repository compatibility including versioning, dependencies tracking, and resource management.
|
|
||||||
|
|
||||||
## Architecture
|
|
||||||
|
|
||||||
The frontend follows a modular component-based architecture:
|
|
||||||
|
|
||||||
1. **Integration Layer**: Connects with ComfyUI's existing UI system
|
|
||||||
2. **Manager Components**: Individual functional UI components (node manager, model manager, etc.)
|
|
||||||
3. **Sharing Components**: Platform-specific sharing implementations
|
|
||||||
4. **Utility Layer**: Reusable UI components and helpers
|
|
||||||
|
|
||||||
## Implementation Details
|
|
||||||
|
|
||||||
- The frontend integrates directly with ComfyUI's UI system through `app.js`
|
|
||||||
- Dialog-based UI for most manager functions to avoid cluttering the main interface
|
|
||||||
- Asynchronous API calls to handle backend operations without blocking the UI
|
|
||||||
|
|
||||||
## Styling
|
|
||||||
|
|
||||||
CSS files are included for specific components:
|
|
||||||
- **custom-nodes-manager.css**: Styling for the node management UI
|
|
||||||
- **model-manager.css**: Styling for the model management UI
|
|
||||||
|
|
||||||
This frontend implementation provides a comprehensive yet user-friendly interface for managing the ComfyUI ecosystem.
|
|
||||||
@@ -222,6 +222,9 @@ function isBeforeFrontendVersion(compareVersion) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const is_legacy_front = () => isBeforeFrontendVersion('1.2.49');
|
||||||
|
const isNotNewManagerUI = () => isBeforeFrontendVersion('1.16.4');
|
||||||
|
|
||||||
document.head.appendChild(docStyle);
|
document.head.appendChild(docStyle);
|
||||||
|
|
||||||
var update_comfyui_button = null;
|
var update_comfyui_button = null;
|
||||||
@@ -1514,6 +1517,11 @@ app.registerExtension({
|
|||||||
tooltip: "Share"
|
tooltip: "Share"
|
||||||
}).element
|
}).element
|
||||||
);
|
);
|
||||||
|
|
||||||
|
const shouldShowLegacyMenuItems = isNotNewManagerUI();
|
||||||
|
if (shouldShowLegacyMenuItems) {
|
||||||
|
app.menu?.settingsGroup.element.before(cmGroup.element);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
catch(exception) {
|
catch(exception) {
|
||||||
console.log('ComfyUI is outdated. New style menu based features are disabled.');
|
console.log('ComfyUI is outdated. New style menu based features are disabled.');
|
||||||
|
|||||||
@@ -552,20 +552,6 @@ export class ShareDialog extends ComfyDialog {
|
|||||||
this.matrix_destination_checkbox.style.color = "var(--fg-color)";
|
this.matrix_destination_checkbox.style.color = "var(--fg-color)";
|
||||||
this.matrix_destination_checkbox.checked = this.share_option === 'matrix'; //true;
|
this.matrix_destination_checkbox.checked = this.share_option === 'matrix'; //true;
|
||||||
|
|
||||||
try {
|
|
||||||
api.fetchApi(`/v2/manager/get_matrix_dep_status`)
|
|
||||||
.then(response => response.text())
|
|
||||||
.then(data => {
|
|
||||||
if(data == 'unavailable') {
|
|
||||||
matrix_destination_checkbox_text.style.textDecoration = "line-through";
|
|
||||||
this.matrix_destination_checkbox.disabled = true;
|
|
||||||
this.matrix_destination_checkbox.title = "It has been disabled because the 'matrix-nio' dependency is not installed. Please install this dependency to use the matrix sharing feature.";
|
|
||||||
matrix_destination_checkbox_text.title = "It has been disabled because the 'matrix-nio' dependency is not installed. Please install this dependency to use the matrix sharing feature.";
|
|
||||||
}
|
|
||||||
})
|
|
||||||
.catch(error => {});
|
|
||||||
} catch (error) {}
|
|
||||||
|
|
||||||
this.comfyworkflows_destination_checkbox = $el("input", { type: 'checkbox', id: "comfyworkflows_destination" }, [])
|
this.comfyworkflows_destination_checkbox = $el("input", { type: 'checkbox', id: "comfyworkflows_destination" }, [])
|
||||||
const comfyworkflows_destination_checkbox_text = $el("label", {}, [" ComfyWorkflows.com"])
|
const comfyworkflows_destination_checkbox_text = $el("label", {}, [" ComfyWorkflows.com"])
|
||||||
this.comfyworkflows_destination_checkbox.style.color = "var(--fg-color)";
|
this.comfyworkflows_destination_checkbox.style.color = "var(--fg-color)";
|
||||||
|
|||||||
@@ -201,15 +201,13 @@ export class CopusShareDialog extends ComfyDialog {
|
|||||||
});
|
});
|
||||||
this.LockInput = $el("input", {
|
this.LockInput = $el("input", {
|
||||||
type: "text",
|
type: "text",
|
||||||
placeholder: "0",
|
placeholder: "",
|
||||||
style: {
|
style: {
|
||||||
width: "100px",
|
width: "100px",
|
||||||
padding: "7px",
|
padding: "7px",
|
||||||
paddingLeft: "30px",
|
|
||||||
borderRadius: "4px",
|
borderRadius: "4px",
|
||||||
border: "1px solid #ddd",
|
border: "1px solid #ddd",
|
||||||
boxSizing: "border-box",
|
boxSizing: "border-box",
|
||||||
position: "relative",
|
|
||||||
},
|
},
|
||||||
oninput: (event) => {
|
oninput: (event) => {
|
||||||
let input = event.target.value;
|
let input = event.target.value;
|
||||||
@@ -344,11 +342,15 @@ export class CopusShareDialog extends ComfyDialog {
|
|||||||
["0/70"]
|
["0/70"]
|
||||||
);
|
);
|
||||||
// Additional Inputs Section
|
// Additional Inputs Section
|
||||||
const additionalInputsSection = $el("div", { style: { ...sectionStyle } }, [
|
const additionalInputsSection = $el(
|
||||||
|
"div",
|
||||||
|
{ style: { ...sectionStyle, } },
|
||||||
|
[
|
||||||
$el("label", { style: labelStyle }, ["3️⃣ Title "]),
|
$el("label", { style: labelStyle }, ["3️⃣ Title "]),
|
||||||
this.TitleInput,
|
this.TitleInput,
|
||||||
titleNumDom,
|
titleNumDom,
|
||||||
]);
|
]
|
||||||
|
);
|
||||||
const SubtitleSection = $el("div", { style: sectionStyle }, [
|
const SubtitleSection = $el("div", { style: sectionStyle }, [
|
||||||
$el("label", { style: labelStyle }, ["4️⃣ Subtitle "]),
|
$el("label", { style: labelStyle }, ["4️⃣ Subtitle "]),
|
||||||
this.SubTitleInput,
|
this.SubTitleInput,
|
||||||
@@ -377,7 +379,7 @@ export class CopusShareDialog extends ComfyDialog {
|
|||||||
});
|
});
|
||||||
|
|
||||||
const blockChainSection_lock = $el("div", { style: sectionStyle }, [
|
const blockChainSection_lock = $el("div", { style: sectionStyle }, [
|
||||||
$el("label", { style: labelStyle }, ["6️⃣ Download threshold"]),
|
$el("label", { style: labelStyle }, ["6️⃣ Pay to download"]),
|
||||||
$el(
|
$el(
|
||||||
"label",
|
"label",
|
||||||
{
|
{
|
||||||
@@ -390,42 +392,11 @@ export class CopusShareDialog extends ComfyDialog {
|
|||||||
},
|
},
|
||||||
[
|
[
|
||||||
this.radioButtonsCheck_lock,
|
this.radioButtonsCheck_lock,
|
||||||
$el(
|
$el("div", { style: { marginLeft: "5px" ,display:'flex',alignItems:'center'} }, [
|
||||||
"div",
|
|
||||||
{
|
|
||||||
style: {
|
|
||||||
marginLeft: "5px",
|
|
||||||
display: "flex",
|
|
||||||
alignItems: "center",
|
|
||||||
position: "relative",
|
|
||||||
},
|
|
||||||
},
|
|
||||||
[
|
|
||||||
$el("span", { style: { marginLeft: "5px" } }, ["ON"]),
|
$el("span", { style: { marginLeft: "5px" } }, ["ON"]),
|
||||||
$el(
|
$el("span", { style: { marginLeft: "20px",marginRight:'10px' ,color:'#fff'} }, ["Price US$"]),
|
||||||
"span",
|
this.LockInput
|
||||||
{
|
]),
|
||||||
style: {
|
|
||||||
marginLeft: "20px",
|
|
||||||
marginRight: "10px",
|
|
||||||
color: "#fff",
|
|
||||||
},
|
|
||||||
},
|
|
||||||
["Unlock with"]
|
|
||||||
),
|
|
||||||
$el("img", {
|
|
||||||
style: {
|
|
||||||
width: "16px",
|
|
||||||
height: "16px",
|
|
||||||
position: "absolute",
|
|
||||||
right: "75px",
|
|
||||||
zIndex: "100",
|
|
||||||
},
|
|
||||||
src: "https://static.copus.io/images/admin/202507/prod/e2919a1d8f3c2d99d3b8fe27ff94b841.png",
|
|
||||||
}),
|
|
||||||
this.LockInput,
|
|
||||||
]
|
|
||||||
),
|
|
||||||
]
|
]
|
||||||
),
|
),
|
||||||
$el(
|
$el(
|
||||||
@@ -433,25 +404,14 @@ export class CopusShareDialog extends ComfyDialog {
|
|||||||
{ style: { display: "flex", alignItems: "center", cursor: "pointer" } },
|
{ style: { display: "flex", alignItems: "center", cursor: "pointer" } },
|
||||||
[
|
[
|
||||||
this.radioButtonsCheckOff_lock,
|
this.radioButtonsCheckOff_lock,
|
||||||
$el(
|
$el("span", { style: { marginLeft: "5px" } }, ["OFF"]),
|
||||||
"div",
|
|
||||||
{
|
|
||||||
style: {
|
|
||||||
marginLeft: "5px",
|
|
||||||
display: "flex",
|
|
||||||
alignItems: "center",
|
|
||||||
},
|
|
||||||
},
|
|
||||||
[$el("span", { style: { marginLeft: "5px" } }, ["OFF"])]
|
|
||||||
),
|
|
||||||
]
|
]
|
||||||
),
|
),
|
||||||
|
|
||||||
$el(
|
$el(
|
||||||
"p",
|
"p",
|
||||||
{ style: { fontSize: "16px", color: "#fff", margin: "10px 0 0 0" } },
|
{ style: { fontSize: "16px", color: "#fff", margin: "10px 0 0 0" } },
|
||||||
[
|
["Get paid from your workflow. You can change the price and withdraw your earnings on Copus."]
|
||||||
]
|
|
||||||
),
|
),
|
||||||
]);
|
]);
|
||||||
|
|
||||||
@@ -472,7 +432,7 @@ export class CopusShareDialog extends ComfyDialog {
|
|||||||
});
|
});
|
||||||
|
|
||||||
const blockChainSection = $el("div", { style: sectionStyle }, [
|
const blockChainSection = $el("div", { style: sectionStyle }, [
|
||||||
$el("label", { style: labelStyle }, ["8️⃣ Store on blockchain "]),
|
$el("label", { style: labelStyle }, ["7️⃣ Store on blockchain "]),
|
||||||
$el(
|
$el(
|
||||||
"label",
|
"label",
|
||||||
{
|
{
|
||||||
@@ -503,139 +463,6 @@ export class CopusShareDialog extends ComfyDialog {
|
|||||||
),
|
),
|
||||||
]);
|
]);
|
||||||
|
|
||||||
this.ratingRadioButtonsCheck0 = $el("input", {
|
|
||||||
type: "radio",
|
|
||||||
name: "content_rating",
|
|
||||||
value: "0",
|
|
||||||
id: "content_rating0",
|
|
||||||
});
|
|
||||||
this.ratingRadioButtonsCheck1 = $el("input", {
|
|
||||||
type: "radio",
|
|
||||||
name: "content_rating",
|
|
||||||
value: "1",
|
|
||||||
id: "content_rating1",
|
|
||||||
});
|
|
||||||
this.ratingRadioButtonsCheck2 = $el("input", {
|
|
||||||
type: "radio",
|
|
||||||
name: "content_rating",
|
|
||||||
value: "2",
|
|
||||||
id: "content_rating2",
|
|
||||||
});
|
|
||||||
this.ratingRadioButtonsCheck_1 = $el("input", {
|
|
||||||
type: "radio",
|
|
||||||
name: "content_rating",
|
|
||||||
value: "-1",
|
|
||||||
id: "content_rating_1",
|
|
||||||
checked: true,
|
|
||||||
});
|
|
||||||
|
|
||||||
// content rating
|
|
||||||
const contentRatingSection = $el("div", { style: sectionStyle }, [
|
|
||||||
$el("label", { style: labelStyle }, ["7️⃣ Content rating "]),
|
|
||||||
$el(
|
|
||||||
"label",
|
|
||||||
{
|
|
||||||
style: {
|
|
||||||
marginTop: "10px",
|
|
||||||
display: "flex",
|
|
||||||
alignItems: "center",
|
|
||||||
cursor: "pointer",
|
|
||||||
},
|
|
||||||
},
|
|
||||||
[
|
|
||||||
this.ratingRadioButtonsCheck0,
|
|
||||||
$el("img", {
|
|
||||||
style: {
|
|
||||||
width: "12px",
|
|
||||||
height: "12px",
|
|
||||||
marginLeft: "5px",
|
|
||||||
},
|
|
||||||
src: "https://static.copus.io/images/client/202507/test/b9f17da83b054d53cd0cb4508c2c30dc.png",
|
|
||||||
}),
|
|
||||||
$el("span", { style: { marginLeft: "5px", color: "#fff" } }, [
|
|
||||||
"All ages",
|
|
||||||
]),
|
|
||||||
]
|
|
||||||
),
|
|
||||||
$el(
|
|
||||||
"p",
|
|
||||||
{ style: { fontSize: "10px", color: "#fff", marginLeft: "20px" } },
|
|
||||||
["Safe for all viewers; no profanity, violence, or mature themes."]
|
|
||||||
),
|
|
||||||
$el(
|
|
||||||
"label",
|
|
||||||
{ style: { display: "flex", alignItems: "center", cursor: "pointer" } },
|
|
||||||
[
|
|
||||||
this.ratingRadioButtonsCheck1,
|
|
||||||
$el("img", {
|
|
||||||
style: {
|
|
||||||
width: "12px",
|
|
||||||
height: "12px",
|
|
||||||
marginLeft: "5px",
|
|
||||||
},
|
|
||||||
src: "https://static.copus.io/images/client/202507/test/7848bc0d3690671df21c7cf00c4cfc81.png",
|
|
||||||
}),
|
|
||||||
$el("span", { style: { marginLeft: "5px", color: "#fff" } }, [
|
|
||||||
"13+ (Teen)",
|
|
||||||
]),
|
|
||||||
]
|
|
||||||
),
|
|
||||||
$el(
|
|
||||||
"p",
|
|
||||||
{ style: { fontSize: "10px", color: "#fff", marginLeft: "20px" } },
|
|
||||||
[
|
|
||||||
"Mild language, light themes, or cartoon violence; no explicit content. ",
|
|
||||||
]
|
|
||||||
),
|
|
||||||
$el(
|
|
||||||
"label",
|
|
||||||
{ style: { display: "flex", alignItems: "center", cursor: "pointer" } },
|
|
||||||
[
|
|
||||||
this.ratingRadioButtonsCheck2,
|
|
||||||
$el("img", {
|
|
||||||
style: {
|
|
||||||
width: "12px",
|
|
||||||
height: "12px",
|
|
||||||
marginLeft: "5px",
|
|
||||||
},
|
|
||||||
src: "https://static.copus.io/images/client/202507/test/bc51839c208d68d91173e43c23bff039.png",
|
|
||||||
}),
|
|
||||||
$el("span", { style: { marginLeft: "5px", color: "#fff" } }, [
|
|
||||||
"18+ (Explicit)",
|
|
||||||
]),
|
|
||||||
]
|
|
||||||
),
|
|
||||||
$el(
|
|
||||||
"p",
|
|
||||||
{ style: { fontSize: "10px", color: "#fff", marginLeft: "20px" } },
|
|
||||||
[
|
|
||||||
"Explicit content, including sexual content, strong violence, or intense themes. ",
|
|
||||||
]
|
|
||||||
),
|
|
||||||
$el(
|
|
||||||
"label",
|
|
||||||
{ style: { display: "flex", alignItems: "center", cursor: "pointer" } },
|
|
||||||
[
|
|
||||||
this.ratingRadioButtonsCheck_1,
|
|
||||||
$el("img", {
|
|
||||||
style: {
|
|
||||||
width: "12px",
|
|
||||||
height: "12px",
|
|
||||||
marginLeft: "5px",
|
|
||||||
},
|
|
||||||
src: "https://static.copus.io/images/client/202507/test/5c802fdcaaea4e7bbed37393eec0d5ba.png",
|
|
||||||
}),
|
|
||||||
$el("span", { style: { marginLeft: "5px", color: "#fff" } }, [
|
|
||||||
"Not Rated",
|
|
||||||
]),
|
|
||||||
]
|
|
||||||
),
|
|
||||||
$el(
|
|
||||||
"p",
|
|
||||||
{ style: { fontSize: "10px", color: "#fff", marginLeft: "20px" } },
|
|
||||||
["No age rating provided."]
|
|
||||||
),
|
|
||||||
]);
|
|
||||||
|
|
||||||
// Message Section
|
// Message Section
|
||||||
this.message = $el(
|
this.message = $el(
|
||||||
@@ -699,7 +526,6 @@ export class CopusShareDialog extends ComfyDialog {
|
|||||||
DescriptionSection,
|
DescriptionSection,
|
||||||
// contestSection,
|
// contestSection,
|
||||||
blockChainSection_lock,
|
blockChainSection_lock,
|
||||||
contentRatingSection,
|
|
||||||
blockChainSection,
|
blockChainSection,
|
||||||
this.message,
|
this.message,
|
||||||
buttonsSection,
|
buttonsSection,
|
||||||
@@ -761,9 +587,7 @@ export class CopusShareDialog extends ComfyDialog {
|
|||||||
url: data,
|
url: data,
|
||||||
});
|
});
|
||||||
} else {
|
} else {
|
||||||
throw new Error(
|
throw new Error("make sure your API key is correct and try again later");
|
||||||
"make sure your API key is correct and try again later"
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
if (e?.response?.status === 413) {
|
if (e?.response?.status === 413) {
|
||||||
@@ -806,13 +630,6 @@ export class CopusShareDialog extends ComfyDialog {
|
|||||||
storeOnChain: this.radioButtonsCheck.checked ? true : false,
|
storeOnChain: this.radioButtonsCheck.checked ? true : false,
|
||||||
lockState:this.radioButtonsCheck_lock.checked ? 2 : 0,
|
lockState:this.radioButtonsCheck_lock.checked ? 2 : 0,
|
||||||
unlockPrice:this.LockInput.value,
|
unlockPrice:this.LockInput.value,
|
||||||
rating: this.ratingRadioButtonsCheck0.checked
|
|
||||||
? 0
|
|
||||||
: this.ratingRadioButtonsCheck1.checked
|
|
||||||
? 1
|
|
||||||
: this.ratingRadioButtonsCheck2.checked
|
|
||||||
? 2
|
|
||||||
: -1,
|
|
||||||
};
|
};
|
||||||
|
|
||||||
if (!this.keyInput.value) {
|
if (!this.keyInput.value) {
|
||||||
|
|||||||
@@ -714,7 +714,6 @@ export class CustomNodesManager {
|
|||||||
link.href = rowItem.reference;
|
link.href = rowItem.reference;
|
||||||
link.target = '_blank';
|
link.target = '_blank';
|
||||||
link.innerHTML = `<b>${title}</b>`;
|
link.innerHTML = `<b>${title}</b>`;
|
||||||
link.title = rowItem.originalData.id;
|
|
||||||
container.appendChild(link);
|
container.appendChild(link);
|
||||||
|
|
||||||
return container;
|
return container;
|
||||||
@@ -1411,16 +1410,15 @@ export class CustomNodesManager {
|
|||||||
let version_cnt = 0;
|
let version_cnt = 0;
|
||||||
|
|
||||||
if(!is_enable) {
|
if(!is_enable) {
|
||||||
|
|
||||||
if(rowItem.cnr_latest != rowItem.originalData.active_version && obj.length > 0) {
|
|
||||||
versions.push('latest');
|
|
||||||
}
|
|
||||||
|
|
||||||
if(rowItem.originalData.active_version != 'nightly') {
|
if(rowItem.originalData.active_version != 'nightly') {
|
||||||
versions.push('nightly');
|
versions.push('nightly');
|
||||||
default_version = 'nightly';
|
default_version = 'nightly';
|
||||||
version_cnt++;
|
version_cnt++;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if(rowItem.cnr_latest != rowItem.originalData.active_version && obj.length > 0) {
|
||||||
|
versions.push('latest');
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
for(let v of obj) {
|
for(let v of obj) {
|
||||||
@@ -1626,35 +1624,17 @@ export class CustomNodesManager {
|
|||||||
getNodesInWorkflow() {
|
getNodesInWorkflow() {
|
||||||
let usedGroupNodes = new Set();
|
let usedGroupNodes = new Set();
|
||||||
let allUsedNodes = {};
|
let allUsedNodes = {};
|
||||||
const visitedGraphs = new Set();
|
|
||||||
|
|
||||||
const visitGraph = (graph) => {
|
for(let k in app.graph._nodes) {
|
||||||
if (!graph || visitedGraphs.has(graph)) return;
|
let node = app.graph._nodes[k];
|
||||||
visitedGraphs.add(graph);
|
|
||||||
|
|
||||||
const nodes = graph._nodes || graph.nodes || [];
|
if(node.type.startsWith('workflow>')) {
|
||||||
for(let k in nodes) {
|
|
||||||
let node = nodes[k];
|
|
||||||
if (!node) continue;
|
|
||||||
|
|
||||||
// If it's a SubgraphNode, recurse into its graph and continue searching
|
|
||||||
if (node.isSubgraphNode?.() && node.subgraph) {
|
|
||||||
visitGraph(node.subgraph);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!node.type) continue;
|
|
||||||
|
|
||||||
// Group nodes / components
|
|
||||||
if(typeof node.type === 'string' && node.type.startsWith('workflow>')) {
|
|
||||||
usedGroupNodes.add(node.type.slice(9));
|
usedGroupNodes.add(node.type.slice(9));
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
allUsedNodes[node.type] = node;
|
allUsedNodes[node.type] = node;
|
||||||
}
|
}
|
||||||
};
|
|
||||||
|
|
||||||
visitGraph(app.graph);
|
|
||||||
|
|
||||||
for(let k of usedGroupNodes) {
|
for(let k of usedGroupNodes) {
|
||||||
let subnodes = app.graph.extra.groupNodes[k]?.nodes;
|
let subnodes = app.graph.extra.groupNodes[k]?.nodes;
|
||||||
|
|||||||
@@ -81,13 +81,10 @@ export class ModelManager {
|
|||||||
value: ""
|
value: ""
|
||||||
}, {
|
}, {
|
||||||
label: "Installed",
|
label: "Installed",
|
||||||
value: "installed"
|
value: "True"
|
||||||
}, {
|
}, {
|
||||||
label: "Not Installed",
|
label: "Not Installed",
|
||||||
value: "not_installed"
|
value: "False"
|
||||||
}, {
|
|
||||||
label: "In Workflow",
|
|
||||||
value: "in_workflow"
|
|
||||||
}];
|
}];
|
||||||
|
|
||||||
this.typeList = [{
|
this.typeList = [{
|
||||||
@@ -257,31 +254,12 @@ export class ModelManager {
|
|||||||
rowFilter: (rowItem) => {
|
rowFilter: (rowItem) => {
|
||||||
|
|
||||||
const searchableColumns = ["name", "type", "base", "description", "filename", "save_path"];
|
const searchableColumns = ["name", "type", "base", "description", "filename", "save_path"];
|
||||||
const models_extensions = ['.ckpt', '.pt', '.pt2', '.bin', '.pth', '.safetensors', '.pkl', '.sft'];
|
|
||||||
|
|
||||||
let shouldShown = grid.highlightKeywordsFilter(rowItem, searchableColumns, this.keywords);
|
let shouldShown = grid.highlightKeywordsFilter(rowItem, searchableColumns, this.keywords);
|
||||||
|
|
||||||
if (shouldShown) {
|
if (shouldShown) {
|
||||||
if(this.filter) {
|
if(this.filter && rowItem.installed !== this.filter) {
|
||||||
if (this.filter == "in_workflow") {
|
return false;
|
||||||
rowItem.in_workflow = null;
|
|
||||||
if (Array.isArray(app.graph._nodes)) {
|
|
||||||
app.graph._nodes.forEach((item, i) => {
|
|
||||||
if (Array.isArray(item.widgets_values)) {
|
|
||||||
item.widgets_values.forEach((_item, i) => {
|
|
||||||
if (rowItem.in_workflow === null && _item !== null && models_extensions.includes("." + _item.toString().split('.').pop())) {
|
|
||||||
let filename = _item.match(/([^\/]+)(?=\.\w+$)/)[0];
|
|
||||||
if (grid.highlightKeywordsFilter(rowItem, searchableColumns, filename)) {
|
|
||||||
rowItem.in_workflow = "True";
|
|
||||||
grid.highlightKeywordsFilter(rowItem, searchableColumns, "");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return ((this.filter == "installed" && rowItem.installed == "True") || (this.filter == "not_installed" && rowItem.installed == "False") || (this.filter == "in_workflow" && rowItem.in_workflow == "True"));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if(this.type && rowItem.type !== this.type) {
|
if(this.type && rowItem.type !== this.type) {
|
||||||
|
|||||||
@@ -153,7 +153,6 @@ app.registerExtension({
|
|||||||
app.canvas.graph.add(new_node, false);
|
app.canvas.graph.add(new_node, false);
|
||||||
node_info_copy(this, new_node, true);
|
node_info_copy(this, new_node, true);
|
||||||
app.canvas.graph.remove(this);
|
app.canvas.graph.remove(this);
|
||||||
requestAnimationFrame(() => app.canvas.setDirty(true, true))
|
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -70,8 +70,8 @@ class WorkflowMetadataExtension {
|
|||||||
if (cnr_id === "comfy-core") return; // don't allow hijacking comfy-core name
|
if (cnr_id === "comfy-core") return; // don't allow hijacking comfy-core name
|
||||||
if (cnr_id) nodeProperties.cnr_id = cnr_id;
|
if (cnr_id) nodeProperties.cnr_id = cnr_id;
|
||||||
else nodeProperties.aux_id = aux_id;
|
else nodeProperties.aux_id = aux_id;
|
||||||
if (ver) nodeProperties.ver = ver.trim();
|
if (ver) nodeProperties.ver = ver;
|
||||||
} else if (["nodes", "comfy_extras", "comfy_api_nodes"].includes(moduleType)) {
|
} else if (["nodes", "comfy_extras"].includes(moduleType)) {
|
||||||
nodeProperties.cnr_id = "comfy-core";
|
nodeProperties.cnr_id = "comfy-core";
|
||||||
nodeProperties.ver = this.comfyCoreVersion;
|
nodeProperties.ver = this.comfyCoreVersion;
|
||||||
}
|
}
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@@ -1,435 +0,0 @@
|
|||||||
import mimetypes
|
|
||||||
from ..common import context
|
|
||||||
from . import manager_core as core
|
|
||||||
|
|
||||||
import os
|
|
||||||
from aiohttp import web
|
|
||||||
import aiohttp
|
|
||||||
import json
|
|
||||||
import hashlib
|
|
||||||
|
|
||||||
import folder_paths
|
|
||||||
from server import PromptServer
|
|
||||||
|
|
||||||
|
|
||||||
def extract_model_file_names(json_data):
|
|
||||||
"""Extract unique file names from the input JSON data."""
|
|
||||||
file_names = set()
|
|
||||||
model_filename_extensions = {'.safetensors', '.ckpt', '.pt', '.pth', '.bin'}
|
|
||||||
|
|
||||||
# Recursively search for file names in the JSON data
|
|
||||||
def recursive_search(data):
|
|
||||||
if isinstance(data, dict):
|
|
||||||
for value in data.values():
|
|
||||||
recursive_search(value)
|
|
||||||
elif isinstance(data, list):
|
|
||||||
for item in data:
|
|
||||||
recursive_search(item)
|
|
||||||
elif isinstance(data, str) and '.' in data:
|
|
||||||
file_names.add(os.path.basename(data)) # file_names.add(data)
|
|
||||||
|
|
||||||
recursive_search(json_data)
|
|
||||||
return [f for f in list(file_names) if os.path.splitext(f)[1] in model_filename_extensions]
|
|
||||||
|
|
||||||
|
|
||||||
def find_file_paths(base_dir, file_names):
|
|
||||||
"""Find the paths of the files in the base directory."""
|
|
||||||
file_paths = {}
|
|
||||||
|
|
||||||
for root, dirs, files in os.walk(base_dir):
|
|
||||||
# Exclude certain directories
|
|
||||||
dirs[:] = [d for d in dirs if d not in ['.git']]
|
|
||||||
|
|
||||||
for file in files:
|
|
||||||
if file in file_names:
|
|
||||||
file_paths[file] = os.path.join(root, file)
|
|
||||||
return file_paths
|
|
||||||
|
|
||||||
|
|
||||||
def compute_sha256_checksum(filepath):
|
|
||||||
"""Compute the SHA256 checksum of a file, in chunks"""
|
|
||||||
sha256 = hashlib.sha256()
|
|
||||||
with open(filepath, 'rb') as f:
|
|
||||||
for chunk in iter(lambda: f.read(4096), b''):
|
|
||||||
sha256.update(chunk)
|
|
||||||
return sha256.hexdigest()
|
|
||||||
|
|
||||||
|
|
||||||
@PromptServer.instance.routes.get("/v2/manager/share_option")
|
|
||||||
async def share_option(request):
|
|
||||||
if "value" in request.rel_url.query:
|
|
||||||
core.get_config()['share_option'] = request.rel_url.query['value']
|
|
||||||
core.write_config()
|
|
||||||
else:
|
|
||||||
return web.Response(text=core.get_config()['share_option'], status=200)
|
|
||||||
|
|
||||||
return web.Response(status=200)
|
|
||||||
|
|
||||||
|
|
||||||
def get_openart_auth():
|
|
||||||
if not os.path.exists(os.path.join(context.manager_files_path, ".openart_key")):
|
|
||||||
return None
|
|
||||||
try:
|
|
||||||
with open(os.path.join(context.manager_files_path, ".openart_key"), "r") as f:
|
|
||||||
openart_key = f.read().strip()
|
|
||||||
return openart_key if openart_key else None
|
|
||||||
except Exception:
|
|
||||||
return None
|
|
||||||
|
|
||||||
|
|
||||||
def get_matrix_auth():
|
|
||||||
if not os.path.exists(os.path.join(context.manager_files_path, "matrix_auth")):
|
|
||||||
return None
|
|
||||||
try:
|
|
||||||
with open(os.path.join(context.manager_files_path, "matrix_auth"), "r") as f:
|
|
||||||
matrix_auth = f.read()
|
|
||||||
homeserver, username, password = matrix_auth.strip().split("\n")
|
|
||||||
if not homeserver or not username or not password:
|
|
||||||
return None
|
|
||||||
return {
|
|
||||||
"homeserver": homeserver,
|
|
||||||
"username": username,
|
|
||||||
"password": password,
|
|
||||||
}
|
|
||||||
except Exception:
|
|
||||||
return None
|
|
||||||
|
|
||||||
|
|
||||||
def get_comfyworkflows_auth():
|
|
||||||
if not os.path.exists(os.path.join(context.manager_files_path, "comfyworkflows_sharekey")):
|
|
||||||
return None
|
|
||||||
try:
|
|
||||||
with open(os.path.join(context.manager_files_path, "comfyworkflows_sharekey"), "r") as f:
|
|
||||||
share_key = f.read()
|
|
||||||
if not share_key.strip():
|
|
||||||
return None
|
|
||||||
return share_key
|
|
||||||
except Exception:
|
|
||||||
return None
|
|
||||||
|
|
||||||
|
|
||||||
def get_youml_settings():
|
|
||||||
if not os.path.exists(os.path.join(context.manager_files_path, ".youml")):
|
|
||||||
return None
|
|
||||||
try:
|
|
||||||
with open(os.path.join(context.manager_files_path, ".youml"), "r") as f:
|
|
||||||
youml_settings = f.read().strip()
|
|
||||||
return youml_settings if youml_settings else None
|
|
||||||
except Exception:
|
|
||||||
return None
|
|
||||||
|
|
||||||
|
|
||||||
def set_youml_settings(settings):
|
|
||||||
with open(os.path.join(context.manager_files_path, ".youml"), "w") as f:
|
|
||||||
f.write(settings)
|
|
||||||
|
|
||||||
|
|
||||||
@PromptServer.instance.routes.get("/v2/manager/get_openart_auth")
|
|
||||||
async def api_get_openart_auth(request):
|
|
||||||
# print("Getting stored Matrix credentials...")
|
|
||||||
openart_key = get_openart_auth()
|
|
||||||
if not openart_key:
|
|
||||||
return web.Response(status=404)
|
|
||||||
return web.json_response({"openart_key": openart_key})
|
|
||||||
|
|
||||||
|
|
||||||
@PromptServer.instance.routes.post("/v2/manager/set_openart_auth")
|
|
||||||
async def api_set_openart_auth(request):
|
|
||||||
json_data = await request.json()
|
|
||||||
openart_key = json_data['openart_key']
|
|
||||||
with open(os.path.join(context.manager_files_path, ".openart_key"), "w") as f:
|
|
||||||
f.write(openart_key)
|
|
||||||
return web.Response(status=200)
|
|
||||||
|
|
||||||
|
|
||||||
@PromptServer.instance.routes.get("/v2/manager/get_matrix_auth")
|
|
||||||
async def api_get_matrix_auth(request):
|
|
||||||
# print("Getting stored Matrix credentials...")
|
|
||||||
matrix_auth = get_matrix_auth()
|
|
||||||
if not matrix_auth:
|
|
||||||
return web.Response(status=404)
|
|
||||||
return web.json_response(matrix_auth)
|
|
||||||
|
|
||||||
|
|
||||||
@PromptServer.instance.routes.get("/v2/manager/youml/settings")
|
|
||||||
async def api_get_youml_settings(request):
|
|
||||||
youml_settings = get_youml_settings()
|
|
||||||
if not youml_settings:
|
|
||||||
return web.Response(status=404)
|
|
||||||
return web.json_response(json.loads(youml_settings))
|
|
||||||
|
|
||||||
|
|
||||||
@PromptServer.instance.routes.post("/v2/manager/youml/settings")
|
|
||||||
async def api_set_youml_settings(request):
|
|
||||||
json_data = await request.json()
|
|
||||||
set_youml_settings(json.dumps(json_data))
|
|
||||||
return web.Response(status=200)
|
|
||||||
|
|
||||||
|
|
||||||
@PromptServer.instance.routes.get("/v2/manager/get_comfyworkflows_auth")
|
|
||||||
async def api_get_comfyworkflows_auth(request):
|
|
||||||
# Check if the user has provided Matrix credentials in a file called 'matrix_accesstoken'
|
|
||||||
# in the same directory as the ComfyUI base folder
|
|
||||||
# print("Getting stored Comfyworkflows.com auth...")
|
|
||||||
comfyworkflows_auth = get_comfyworkflows_auth()
|
|
||||||
if not comfyworkflows_auth:
|
|
||||||
return web.Response(status=404)
|
|
||||||
return web.json_response({"comfyworkflows_sharekey": comfyworkflows_auth})
|
|
||||||
|
|
||||||
|
|
||||||
@PromptServer.instance.routes.post("/v2/manager/set_esheep_workflow_and_images")
|
|
||||||
async def set_esheep_workflow_and_images(request):
|
|
||||||
json_data = await request.json()
|
|
||||||
with open(os.path.join(context.manager_files_path, "esheep_share_message.json"), "w", encoding='utf-8') as file:
|
|
||||||
json.dump(json_data, file, indent=4)
|
|
||||||
return web.Response(status=200)
|
|
||||||
|
|
||||||
|
|
||||||
@PromptServer.instance.routes.get("/v2/manager/get_esheep_workflow_and_images")
|
|
||||||
async def get_esheep_workflow_and_images(request):
|
|
||||||
with open(os.path.join(context.manager_files_path, "esheep_share_message.json"), 'r', encoding='utf-8') as file:
|
|
||||||
data = json.load(file)
|
|
||||||
return web.Response(status=200, text=json.dumps(data))
|
|
||||||
|
|
||||||
|
|
||||||
def set_matrix_auth(json_data):
|
|
||||||
homeserver = json_data['homeserver']
|
|
||||||
username = json_data['username']
|
|
||||||
password = json_data['password']
|
|
||||||
with open(os.path.join(context.manager_files_path, "matrix_auth"), "w") as f:
|
|
||||||
f.write("\n".join([homeserver, username, password]))
|
|
||||||
|
|
||||||
|
|
||||||
def set_comfyworkflows_auth(comfyworkflows_sharekey):
|
|
||||||
with open(os.path.join(context.manager_files_path, "comfyworkflows_sharekey"), "w") as f:
|
|
||||||
f.write(comfyworkflows_sharekey)
|
|
||||||
|
|
||||||
|
|
||||||
def has_provided_matrix_auth(matrix_auth):
|
|
||||||
return matrix_auth['homeserver'].strip() and matrix_auth['username'].strip() and matrix_auth['password'].strip()
|
|
||||||
|
|
||||||
|
|
||||||
def has_provided_comfyworkflows_auth(comfyworkflows_sharekey):
|
|
||||||
return comfyworkflows_sharekey.strip()
|
|
||||||
|
|
||||||
|
|
||||||
@PromptServer.instance.routes.post("/v2/manager/share")
|
|
||||||
async def share_art(request):
|
|
||||||
# get json data
|
|
||||||
json_data = await request.json()
|
|
||||||
|
|
||||||
matrix_auth = json_data['matrix_auth']
|
|
||||||
comfyworkflows_sharekey = json_data['cw_auth']['cw_sharekey']
|
|
||||||
|
|
||||||
set_matrix_auth(matrix_auth)
|
|
||||||
set_comfyworkflows_auth(comfyworkflows_sharekey)
|
|
||||||
|
|
||||||
share_destinations = json_data['share_destinations']
|
|
||||||
credits = json_data['credits']
|
|
||||||
title = json_data['title']
|
|
||||||
description = json_data['description']
|
|
||||||
is_nsfw = json_data['is_nsfw']
|
|
||||||
prompt = json_data['prompt']
|
|
||||||
potential_outputs = json_data['potential_outputs']
|
|
||||||
selected_output_index = json_data['selected_output_index']
|
|
||||||
|
|
||||||
try:
|
|
||||||
output_to_share = potential_outputs[int(selected_output_index)]
|
|
||||||
except Exception:
|
|
||||||
# for now, pick the first output
|
|
||||||
output_to_share = potential_outputs[0]
|
|
||||||
|
|
||||||
assert output_to_share['type'] in ('image', 'output')
|
|
||||||
output_dir = folder_paths.get_output_directory()
|
|
||||||
|
|
||||||
if output_to_share['type'] == 'image':
|
|
||||||
asset_filename = output_to_share['image']['filename']
|
|
||||||
asset_subfolder = output_to_share['image']['subfolder']
|
|
||||||
|
|
||||||
if output_to_share['image']['type'] == 'temp':
|
|
||||||
output_dir = folder_paths.get_temp_directory()
|
|
||||||
else:
|
|
||||||
asset_filename = output_to_share['output']['filename']
|
|
||||||
asset_subfolder = output_to_share['output']['subfolder']
|
|
||||||
|
|
||||||
if asset_subfolder:
|
|
||||||
asset_filepath = os.path.join(output_dir, asset_subfolder, asset_filename)
|
|
||||||
else:
|
|
||||||
asset_filepath = os.path.join(output_dir, asset_filename)
|
|
||||||
|
|
||||||
# get the mime type of the asset
|
|
||||||
assetFileType = mimetypes.guess_type(asset_filepath)[0]
|
|
||||||
|
|
||||||
share_website_host = "UNKNOWN"
|
|
||||||
if "comfyworkflows" in share_destinations:
|
|
||||||
share_website_host = "https://comfyworkflows.com"
|
|
||||||
share_endpoint = f"{share_website_host}/api"
|
|
||||||
|
|
||||||
# get presigned urls
|
|
||||||
async with aiohttp.ClientSession(trust_env=True, connector=aiohttp.TCPConnector(verify_ssl=False)) as session:
|
|
||||||
async with session.post(
|
|
||||||
f"{share_endpoint}/get_presigned_urls",
|
|
||||||
json={
|
|
||||||
"assetFileName": asset_filename,
|
|
||||||
"assetFileType": assetFileType,
|
|
||||||
"workflowJsonFileName": 'workflow.json',
|
|
||||||
"workflowJsonFileType": 'application/json',
|
|
||||||
},
|
|
||||||
) as resp:
|
|
||||||
assert resp.status == 200
|
|
||||||
presigned_urls_json = await resp.json()
|
|
||||||
assetFilePresignedUrl = presigned_urls_json["assetFilePresignedUrl"]
|
|
||||||
assetFileKey = presigned_urls_json["assetFileKey"]
|
|
||||||
workflowJsonFilePresignedUrl = presigned_urls_json["workflowJsonFilePresignedUrl"]
|
|
||||||
workflowJsonFileKey = presigned_urls_json["workflowJsonFileKey"]
|
|
||||||
|
|
||||||
# upload asset
|
|
||||||
async with aiohttp.ClientSession(trust_env=True, connector=aiohttp.TCPConnector(verify_ssl=False)) as session:
|
|
||||||
async with session.put(assetFilePresignedUrl, data=open(asset_filepath, "rb")) as resp:
|
|
||||||
assert resp.status == 200
|
|
||||||
|
|
||||||
# upload workflow json
|
|
||||||
async with aiohttp.ClientSession(trust_env=True, connector=aiohttp.TCPConnector(verify_ssl=False)) as session:
|
|
||||||
async with session.put(workflowJsonFilePresignedUrl, data=json.dumps(prompt['workflow']).encode('utf-8')) as resp:
|
|
||||||
assert resp.status == 200
|
|
||||||
|
|
||||||
model_filenames = extract_model_file_names(prompt['workflow'])
|
|
||||||
model_file_paths = find_file_paths(folder_paths.base_path, model_filenames)
|
|
||||||
|
|
||||||
models_info = {}
|
|
||||||
for filename, filepath in model_file_paths.items():
|
|
||||||
models_info[filename] = {
|
|
||||||
"filename": filename,
|
|
||||||
"sha256_checksum": compute_sha256_checksum(filepath),
|
|
||||||
"relative_path": os.path.relpath(filepath, folder_paths.base_path),
|
|
||||||
}
|
|
||||||
|
|
||||||
# make a POST request to /api/upload_workflow with form data key values
|
|
||||||
async with aiohttp.ClientSession(trust_env=True, connector=aiohttp.TCPConnector(verify_ssl=False)) as session:
|
|
||||||
form = aiohttp.FormData()
|
|
||||||
if comfyworkflows_sharekey:
|
|
||||||
form.add_field("shareKey", comfyworkflows_sharekey)
|
|
||||||
form.add_field("source", "comfyui_manager")
|
|
||||||
form.add_field("assetFileKey", assetFileKey)
|
|
||||||
form.add_field("assetFileType", assetFileType)
|
|
||||||
form.add_field("workflowJsonFileKey", workflowJsonFileKey)
|
|
||||||
form.add_field("sharedWorkflowWorkflowJsonString", json.dumps(prompt['workflow']))
|
|
||||||
form.add_field("sharedWorkflowPromptJsonString", json.dumps(prompt['output']))
|
|
||||||
form.add_field("shareWorkflowCredits", credits)
|
|
||||||
form.add_field("shareWorkflowTitle", title)
|
|
||||||
form.add_field("shareWorkflowDescription", description)
|
|
||||||
form.add_field("shareWorkflowIsNSFW", str(is_nsfw).lower())
|
|
||||||
form.add_field("currentSnapshot", json.dumps(await core.get_current_snapshot()))
|
|
||||||
form.add_field("modelsInfo", json.dumps(models_info))
|
|
||||||
|
|
||||||
async with session.post(
|
|
||||||
f"{share_endpoint}/upload_workflow",
|
|
||||||
data=form,
|
|
||||||
) as resp:
|
|
||||||
assert resp.status == 200
|
|
||||||
upload_workflow_json = await resp.json()
|
|
||||||
workflowId = upload_workflow_json["workflowId"]
|
|
||||||
|
|
||||||
# check if the user has provided Matrix credentials
|
|
||||||
if "matrix" in share_destinations:
|
|
||||||
comfyui_share_room_id = '!LGYSoacpJPhIfBqVfb:matrix.org'
|
|
||||||
filename = os.path.basename(asset_filepath)
|
|
||||||
content_type = assetFileType
|
|
||||||
|
|
||||||
try:
|
|
||||||
from nio import AsyncClient, LoginResponse, UploadResponse
|
|
||||||
|
|
||||||
homeserver = 'matrix.org'
|
|
||||||
if matrix_auth:
|
|
||||||
homeserver = matrix_auth.get('homeserver', 'matrix.org')
|
|
||||||
homeserver = homeserver.replace("http://", "https://")
|
|
||||||
if not homeserver.startswith("https://"):
|
|
||||||
homeserver = "https://" + homeserver
|
|
||||||
|
|
||||||
client = AsyncClient(homeserver, matrix_auth['username'])
|
|
||||||
|
|
||||||
# Login
|
|
||||||
login_resp = await client.login(matrix_auth['password'])
|
|
||||||
if not isinstance(login_resp, LoginResponse) or not login_resp.access_token:
|
|
||||||
await client.close()
|
|
||||||
return web.json_response({"error": "Invalid Matrix credentials."}, content_type='application/json', status=400)
|
|
||||||
|
|
||||||
# Upload asset
|
|
||||||
with open(asset_filepath, 'rb') as f:
|
|
||||||
upload_resp, _maybe_keys = await client.upload(f, content_type=content_type, filename=filename)
|
|
||||||
asset_data = f.seek(0) or f.read() # get size for info below
|
|
||||||
if not isinstance(upload_resp, UploadResponse) or not upload_resp.content_uri:
|
|
||||||
await client.close()
|
|
||||||
return web.json_response({"error": "Failed to upload asset to Matrix."}, content_type='application/json', status=500)
|
|
||||||
mxc_url = upload_resp.content_uri
|
|
||||||
|
|
||||||
# Upload workflow JSON
|
|
||||||
import io
|
|
||||||
workflow_json_bytes = json.dumps(prompt['workflow']).encode('utf-8')
|
|
||||||
workflow_io = io.BytesIO(workflow_json_bytes)
|
|
||||||
upload_workflow_resp, _maybe_keys = await client.upload(workflow_io, content_type='application/json', filename='workflow.json')
|
|
||||||
workflow_io.seek(0)
|
|
||||||
if not isinstance(upload_workflow_resp, UploadResponse) or not upload_workflow_resp.content_uri:
|
|
||||||
await client.close()
|
|
||||||
return web.json_response({"error": "Failed to upload workflow to Matrix."}, content_type='application/json', status=500)
|
|
||||||
workflow_json_mxc_url = upload_workflow_resp.content_uri
|
|
||||||
|
|
||||||
# Send text message
|
|
||||||
text_content = ""
|
|
||||||
if title:
|
|
||||||
text_content += f"{title}\n"
|
|
||||||
if description:
|
|
||||||
text_content += f"{description}\n"
|
|
||||||
if credits:
|
|
||||||
text_content += f"\ncredits: {credits}\n"
|
|
||||||
await client.room_send(
|
|
||||||
room_id=comfyui_share_room_id,
|
|
||||||
message_type="m.room.message",
|
|
||||||
content={"msgtype": "m.text", "body": text_content}
|
|
||||||
)
|
|
||||||
|
|
||||||
# Send image
|
|
||||||
await client.room_send(
|
|
||||||
room_id=comfyui_share_room_id,
|
|
||||||
message_type="m.room.message",
|
|
||||||
content={
|
|
||||||
"msgtype": "m.image",
|
|
||||||
"body": filename,
|
|
||||||
"url": mxc_url,
|
|
||||||
"info": {
|
|
||||||
"mimetype": content_type,
|
|
||||||
"size": len(asset_data)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
)
|
|
||||||
|
|
||||||
# Send workflow JSON file
|
|
||||||
await client.room_send(
|
|
||||||
room_id=comfyui_share_room_id,
|
|
||||||
message_type="m.room.message",
|
|
||||||
content={
|
|
||||||
"msgtype": "m.file",
|
|
||||||
"body": "workflow.json",
|
|
||||||
"url": workflow_json_mxc_url,
|
|
||||||
"info": {
|
|
||||||
"mimetype": "application/json",
|
|
||||||
"size": len(workflow_json_bytes)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
)
|
|
||||||
|
|
||||||
await client.close()
|
|
||||||
|
|
||||||
except:
|
|
||||||
import traceback
|
|
||||||
traceback.print_exc()
|
|
||||||
return web.json_response({"error": "An error occurred when sharing your art to Matrix."}, content_type='application/json', status=500)
|
|
||||||
|
|
||||||
return web.json_response({
|
|
||||||
"comfyworkflows": {
|
|
||||||
"url": None if "comfyworkflows" not in share_destinations else f"{share_website_host}/workflows/{workflowId}",
|
|
||||||
},
|
|
||||||
"matrix": {
|
|
||||||
"success": None if "matrix" not in share_destinations else True
|
|
||||||
}
|
|
||||||
}, content_type='application/json', status=200)
|
|
||||||
@@ -12,10 +12,10 @@ import ast
|
|||||||
import logging
|
import logging
|
||||||
import traceback
|
import traceback
|
||||||
|
|
||||||
from .common import security_check
|
from .glob import security_check
|
||||||
from .common import manager_util
|
from .glob import manager_util
|
||||||
from .common import cm_global
|
from .glob import cm_global
|
||||||
from .common import manager_downloader
|
from .glob import manager_downloader
|
||||||
import folder_paths
|
import folder_paths
|
||||||
|
|
||||||
manager_util.add_python_path_to_env()
|
manager_util.add_python_path_to_env()
|
||||||
@@ -35,9 +35,10 @@ else:
|
|||||||
def current_timestamp():
|
def current_timestamp():
|
||||||
return str(time.time()).split('.')[0]
|
return str(time.time()).split('.')[0]
|
||||||
|
|
||||||
|
security_check.security_check()
|
||||||
|
|
||||||
cm_global.pip_blacklist = {'torch', 'torchaudio', 'torchsde', 'torchvision'}
|
cm_global.pip_blacklist = {'torch', 'torchsde', 'torchvision'}
|
||||||
cm_global.pip_downgrade_blacklist = ['torch', 'torchaudio', 'torchsde', 'torchvision', 'transformers', 'safetensors', 'kornia']
|
cm_global.pip_downgrade_blacklist = ['torch', 'torchsde', 'torchvision', 'transformers', 'safetensors', 'kornia']
|
||||||
|
|
||||||
|
|
||||||
def skip_pip_spam(x):
|
def skip_pip_spam(x):
|
||||||
@@ -64,8 +65,12 @@ comfy_path = os.environ.get('COMFYUI_PATH')
|
|||||||
comfy_base_path = os.environ.get('COMFYUI_FOLDERS_BASE_PATH')
|
comfy_base_path = os.environ.get('COMFYUI_FOLDERS_BASE_PATH')
|
||||||
|
|
||||||
if comfy_path is None:
|
if comfy_path is None:
|
||||||
|
try:
|
||||||
comfy_path = os.path.abspath(os.path.dirname(sys.modules['__main__'].__file__))
|
comfy_path = os.path.abspath(os.path.dirname(sys.modules['__main__'].__file__))
|
||||||
os.environ['COMFYUI_PATH'] = comfy_path
|
os.environ['COMFYUI_PATH'] = comfy_path
|
||||||
|
except:
|
||||||
|
print("[ComfyUI-Manager] environment variable 'COMFYUI_PATH' is not specified.")
|
||||||
|
exit(-1)
|
||||||
|
|
||||||
if comfy_base_path is None:
|
if comfy_base_path is None:
|
||||||
comfy_base_path = comfy_path
|
comfy_base_path = comfy_path
|
||||||
@@ -86,6 +91,9 @@ manager_pip_blacklist_path = os.path.join(manager_files_path, "pip_blacklist.lis
|
|||||||
restore_snapshot_path = os.path.join(manager_files_path, "startup-scripts", "restore-snapshot.json")
|
restore_snapshot_path = os.path.join(manager_files_path, "startup-scripts", "restore-snapshot.json")
|
||||||
manager_config_path = os.path.join(manager_files_path, 'config.ini')
|
manager_config_path = os.path.join(manager_files_path, 'config.ini')
|
||||||
|
|
||||||
|
cm_cli_path = os.path.join(comfyui_manager_path, "cm-cli.py")
|
||||||
|
|
||||||
|
|
||||||
default_conf = {}
|
default_conf = {}
|
||||||
|
|
||||||
def read_config():
|
def read_config():
|
||||||
@@ -110,14 +118,13 @@ def check_file_logging():
|
|||||||
|
|
||||||
read_config()
|
read_config()
|
||||||
read_uv_mode()
|
read_uv_mode()
|
||||||
security_check.security_check()
|
|
||||||
check_file_logging()
|
check_file_logging()
|
||||||
|
|
||||||
cm_global.pip_overrides = {}
|
cm_global.pip_overrides = {'numpy': 'numpy<2'}
|
||||||
|
|
||||||
if os.path.exists(manager_pip_overrides_path):
|
if os.path.exists(manager_pip_overrides_path):
|
||||||
with open(manager_pip_overrides_path, 'r', encoding="UTF-8", errors="ignore") as json_file:
|
with open(manager_pip_overrides_path, 'r', encoding="UTF-8", errors="ignore") as json_file:
|
||||||
cm_global.pip_overrides = json.load(json_file)
|
cm_global.pip_overrides = json.load(json_file)
|
||||||
|
cm_global.pip_overrides['numpy'] = 'numpy<2'
|
||||||
|
|
||||||
|
|
||||||
if os.path.exists(manager_pip_blacklist_path):
|
if os.path.exists(manager_pip_blacklist_path):
|
||||||
@@ -330,12 +337,7 @@ try:
|
|||||||
log_file.write(message)
|
log_file.write(message)
|
||||||
else:
|
else:
|
||||||
log_file.write(f"[{timestamp}] {message}")
|
log_file.write(f"[{timestamp}] {message}")
|
||||||
|
|
||||||
try:
|
|
||||||
log_file.flush()
|
log_file.flush()
|
||||||
except Exception:
|
|
||||||
pass
|
|
||||||
|
|
||||||
self.last_char = message if message == '' else message[-1]
|
self.last_char = message if message == '' else message[-1]
|
||||||
|
|
||||||
if not file_only:
|
if not file_only:
|
||||||
@@ -348,10 +350,7 @@ try:
|
|||||||
original_stderr.flush()
|
original_stderr.flush()
|
||||||
|
|
||||||
def flush(self):
|
def flush(self):
|
||||||
try:
|
|
||||||
log_file.flush()
|
log_file.flush()
|
||||||
except Exception:
|
|
||||||
pass
|
|
||||||
|
|
||||||
with std_log_lock:
|
with std_log_lock:
|
||||||
if self.is_stdout:
|
if self.is_stdout:
|
||||||
@@ -439,6 +438,35 @@ except Exception as e:
|
|||||||
print(f"[ComfyUI-Manager] Logging failed: {e}")
|
print(f"[ComfyUI-Manager] Logging failed: {e}")
|
||||||
|
|
||||||
|
|
||||||
|
def ensure_dependencies():
|
||||||
|
try:
|
||||||
|
import git # noqa: F401
|
||||||
|
import toml # noqa: F401
|
||||||
|
import rich # noqa: F401
|
||||||
|
import chardet # noqa: F401
|
||||||
|
except ModuleNotFoundError:
|
||||||
|
my_path = os.path.dirname(__file__)
|
||||||
|
requirements_path = os.path.join(my_path, "requirements.txt")
|
||||||
|
|
||||||
|
print("## ComfyUI-Manager: installing dependencies. (GitPython)")
|
||||||
|
try:
|
||||||
|
subprocess.check_output(manager_util.make_pip_cmd(['install', '-r', requirements_path]))
|
||||||
|
except subprocess.CalledProcessError:
|
||||||
|
print("## [ERROR] ComfyUI-Manager: Attempting to reinstall dependencies using an alternative method.")
|
||||||
|
try:
|
||||||
|
subprocess.check_output(manager_util.make_pip_cmd(['install', '--user', '-r', requirements_path]))
|
||||||
|
except subprocess.CalledProcessError:
|
||||||
|
print("## [ERROR] ComfyUI-Manager: Failed to install the GitPython package in the correct Python environment. Please install it manually in the appropriate environment. (You can seek help at https://app.element.io/#/room/%23comfyui_space%3Amatrix.org)")
|
||||||
|
|
||||||
|
try:
|
||||||
|
print("## ComfyUI-Manager: installing dependencies done.")
|
||||||
|
except:
|
||||||
|
# maybe we should sys.exit() here? there is at least two screens worth of error messages still being pumped after our error messages
|
||||||
|
print("## [ERROR] ComfyUI-Manager: GitPython package seems to be installed, but failed to load somehow. Make sure you have a working git client installed")
|
||||||
|
|
||||||
|
ensure_dependencies()
|
||||||
|
|
||||||
|
|
||||||
print("** ComfyUI startup time:", current_timestamp())
|
print("** ComfyUI startup time:", current_timestamp())
|
||||||
print("** Platform:", platform.system())
|
print("** Platform:", platform.system())
|
||||||
print("** Python version:", sys.version)
|
print("** Python version:", sys.version)
|
||||||
@@ -462,7 +490,7 @@ def read_downgrade_blacklist():
|
|||||||
items = [x.strip() for x in items if x != '']
|
items = [x.strip() for x in items if x != '']
|
||||||
cm_global.pip_downgrade_blacklist += items
|
cm_global.pip_downgrade_blacklist += items
|
||||||
cm_global.pip_downgrade_blacklist = list(set(cm_global.pip_downgrade_blacklist))
|
cm_global.pip_downgrade_blacklist = list(set(cm_global.pip_downgrade_blacklist))
|
||||||
except Exception:
|
except:
|
||||||
pass
|
pass
|
||||||
|
|
||||||
|
|
||||||
@@ -568,10 +596,7 @@ if os.path.exists(restore_snapshot_path):
|
|||||||
if 'COMFYUI_FOLDERS_BASE_PATH' not in new_env:
|
if 'COMFYUI_FOLDERS_BASE_PATH' not in new_env:
|
||||||
new_env["COMFYUI_FOLDERS_BASE_PATH"] = comfy_path
|
new_env["COMFYUI_FOLDERS_BASE_PATH"] = comfy_path
|
||||||
|
|
||||||
if 'COMFYUI_PATH' not in new_env:
|
cmd_str = [sys.executable, cm_cli_path, 'restore-snapshot', restore_snapshot_path]
|
||||||
new_env['COMFYUI_PATH'] = os.path.dirname(folder_paths.__file__)
|
|
||||||
|
|
||||||
cmd_str = [sys.executable, '-m', 'comfyui_manager.cm_cli', 'restore-snapshot', restore_snapshot_path]
|
|
||||||
exit_code = process_wrap(cmd_str, custom_nodes_base_path, handler=msg_capture, env=new_env)
|
exit_code = process_wrap(cmd_str, custom_nodes_base_path, handler=msg_capture, env=new_env)
|
||||||
|
|
||||||
if exit_code != 0:
|
if exit_code != 0:
|
||||||
@@ -598,7 +623,6 @@ def execute_lazy_install_script(repo_path, executable):
|
|||||||
lines = manager_util.robust_readlines(requirements_path)
|
lines = manager_util.robust_readlines(requirements_path)
|
||||||
for line in lines:
|
for line in lines:
|
||||||
package_name = remap_pip_package(line.strip())
|
package_name = remap_pip_package(line.strip())
|
||||||
package_name = package_name.split('#')[0].strip()
|
|
||||||
if package_name and not is_installed(package_name):
|
if package_name and not is_installed(package_name):
|
||||||
if '--index-url' in package_name:
|
if '--index-url' in package_name:
|
||||||
s = package_name.split('--index-url')
|
s = package_name.split('--index-url')
|
||||||
|
|||||||
10700
comfyui_manager/custom-node-list.json → custom-node-list.json
Normal file → Executable file
10700
comfyui_manager/custom-node-list.json → custom-node-list.json
Normal file → Executable file
File diff suppressed because it is too large
Load Diff
@@ -1,496 +0,0 @@
|
|||||||
# Package Version Management Design
|
|
||||||
|
|
||||||
## Overview
|
|
||||||
|
|
||||||
ComfyUI Manager supports two package version types, each with distinct installation methods and version switching mechanisms:
|
|
||||||
|
|
||||||
1. **CNR Version (Archive)**: Production-ready releases with semantic versioning (e.g., v1.0.2), published to CNR server, verified, and distributed as ZIP archives
|
|
||||||
2. **Nightly Version**: Real-time development builds from Git repository without semantic versioning, providing direct access to latest code via git pull
|
|
||||||
|
|
||||||
## Package ID Normalization
|
|
||||||
|
|
||||||
### Case Sensitivity Handling
|
|
||||||
|
|
||||||
**Source of Truth**: Package IDs originate from `pyproject.toml` with their original case (e.g., `ComfyUI_SigmoidOffsetScheduler`)
|
|
||||||
|
|
||||||
**Normalization Process**:
|
|
||||||
1. `cnr_utils.normalize_package_name()` provides centralized normalization (`cnr_utils.py:28-48`):
|
|
||||||
```python
|
|
||||||
def normalize_package_name(name: str) -> str:
|
|
||||||
"""
|
|
||||||
Normalize package name for case-insensitive matching.
|
|
||||||
- Strip leading/trailing whitespace
|
|
||||||
- Convert to lowercase
|
|
||||||
"""
|
|
||||||
return name.strip().lower()
|
|
||||||
```
|
|
||||||
2. `cnr_utils.read_cnr_info()` uses this normalization when indexing (`cnr_utils.py:314`):
|
|
||||||
```python
|
|
||||||
name = project.get('name').strip().lower()
|
|
||||||
```
|
|
||||||
3. Package indexed in `installed_node_packages` with lowercase ID: `'comfyui_sigmoidoffsetscheduler'`
|
|
||||||
4. **Critical**: All lookups (`is_enabled()`, `unified_disable()`) must use `cnr_utils.normalize_package_name()` for matching
|
|
||||||
|
|
||||||
**Implementation** (`manager_core.py:1374, 1389`):
|
|
||||||
```python
|
|
||||||
# Before checking if package is enabled or disabling
|
|
||||||
packname_normalized = cnr_utils.normalize_package_name(packname)
|
|
||||||
if self.is_enabled(packname_normalized):
|
|
||||||
self.unified_disable(packname_normalized)
|
|
||||||
```
|
|
||||||
|
|
||||||
## Package Identification
|
|
||||||
|
|
||||||
### How Packages Are Identified
|
|
||||||
|
|
||||||
**Critical**: Packages MUST be identified by marker files and metadata, NOT by directory names.
|
|
||||||
|
|
||||||
**Identification Flow** (`manager_core.py:691-703`, `node_package.py:49-81`):
|
|
||||||
|
|
||||||
```python
|
|
||||||
def resolve_from_path(fullpath):
|
|
||||||
"""
|
|
||||||
Identify package type and ID using markers and metadata files.
|
|
||||||
|
|
||||||
Priority:
|
|
||||||
1. Check for .git directory (Nightly)
|
|
||||||
2. Check for .tracking + pyproject.toml (CNR)
|
|
||||||
3. Unknown/legacy (fallback to directory name)
|
|
||||||
"""
|
|
||||||
# 1. Nightly Detection
|
|
||||||
url = git_utils.git_url(fullpath) # Checks for .git/config
|
|
||||||
if url:
|
|
||||||
url = git_utils.compact_url(url)
|
|
||||||
commit_hash = git_utils.get_commit_hash(fullpath)
|
|
||||||
return {'id': url, 'ver': 'nightly', 'hash': commit_hash}
|
|
||||||
|
|
||||||
# 2. CNR Detection
|
|
||||||
info = cnr_utils.read_cnr_info(fullpath) # Checks for .tracking + pyproject.toml
|
|
||||||
if info:
|
|
||||||
return {'id': info['id'], 'ver': info['version']}
|
|
||||||
|
|
||||||
# 3. Unknown (fallback)
|
|
||||||
return None
|
|
||||||
```
|
|
||||||
|
|
||||||
### Marker-Based Identification
|
|
||||||
|
|
||||||
**1. Nightly Packages**:
|
|
||||||
- **Marker**: `.git` directory presence
|
|
||||||
- **ID Extraction**: Read URL from `.git/config` using `git_utils.git_url()` (`git_utils.py:34-53`)
|
|
||||||
- **ID Format**: Compact URL (e.g., `https://github.com/owner/repo` → compact form)
|
|
||||||
- **Why**: Git repositories are uniquely identified by their remote URL
|
|
||||||
|
|
||||||
**2. CNR Packages**:
|
|
||||||
- **Markers**: `.tracking` file AND `pyproject.toml` file (`.git` must NOT exist)
|
|
||||||
- **ID Extraction**: Read `name` from `pyproject.toml` using `cnr_utils.read_cnr_info()` (`cnr_utils.py:302-334`)
|
|
||||||
- **ID Format**: Normalized lowercase from `pyproject.toml` (e.g., `ComfyUI_Foo` → `comfyui_foo`)
|
|
||||||
- **Why**: CNR packages are identified by their canonical name in package metadata
|
|
||||||
|
|
||||||
**Implementation** (`cnr_utils.py:302-334`):
|
|
||||||
```python
|
|
||||||
def read_cnr_info(fullpath):
|
|
||||||
toml_path = os.path.join(fullpath, 'pyproject.toml')
|
|
||||||
tracking_path = os.path.join(fullpath, '.tracking')
|
|
||||||
|
|
||||||
# MUST have both markers and NO .git directory
|
|
||||||
if not os.path.exists(toml_path) or not os.path.exists(tracking_path):
|
|
||||||
return None # not valid CNR node pack
|
|
||||||
|
|
||||||
with open(toml_path, "r", encoding="utf-8") as f:
|
|
||||||
data = toml.load(f)
|
|
||||||
project = data.get('project', {})
|
|
||||||
name = project.get('name').strip().lower() # ← Normalized for indexing
|
|
||||||
original_name = project.get('name') # ← Original case preserved
|
|
||||||
version = str(manager_util.StrictVersion(project.get('version')))
|
|
||||||
|
|
||||||
return {
|
|
||||||
"id": name, # Normalized ID for lookups
|
|
||||||
"original_name": original_name,
|
|
||||||
"version": version,
|
|
||||||
"url": repository
|
|
||||||
}
|
|
||||||
```
|
|
||||||
|
|
||||||
### Why NOT Directory Names?
|
|
||||||
|
|
||||||
**Problem with directory-based identification**:
|
|
||||||
1. **Case Sensitivity Issues**: Same package can have different directory names
|
|
||||||
- Active: `ComfyUI_Foo` (original case)
|
|
||||||
- Disabled: `comfyui_foo@1_0_2` (lowercase)
|
|
||||||
2. **Version Suffix Confusion**: Disabled directories include version in name
|
|
||||||
3. **User Modifications**: Users can rename directories, breaking identification
|
|
||||||
|
|
||||||
**Correct Approach**:
|
|
||||||
- **Source of Truth**: Marker files (`.git`, `.tracking`, `pyproject.toml`)
|
|
||||||
- **Consistent IDs**: Based on metadata content, not filesystem names
|
|
||||||
- **Case Insensitive**: Normalized lookups work regardless of directory name
|
|
||||||
|
|
||||||
### Package Lookup Flow
|
|
||||||
|
|
||||||
**Index Building** (`manager_core.py:444-478`):
|
|
||||||
```python
|
|
||||||
def reload(self):
|
|
||||||
self.installed_node_packages: dict[str, list[InstalledNodePackage]] = defaultdict(list)
|
|
||||||
|
|
||||||
# Scan active packages
|
|
||||||
for x in os.listdir(custom_nodes_path):
|
|
||||||
fullpath = os.path.join(custom_nodes_path, x)
|
|
||||||
if x not in ['__pycache__', '.disabled']:
|
|
||||||
node_package = InstalledNodePackage.from_fullpath(fullpath, self.resolve_from_path)
|
|
||||||
# ↓ Uses ID from resolve_from_path(), NOT directory name
|
|
||||||
self.installed_node_packages[node_package.id].append(node_package)
|
|
||||||
|
|
||||||
# Scan disabled packages
|
|
||||||
for x in os.listdir(disabled_dir):
|
|
||||||
fullpath = os.path.join(disabled_dir, x)
|
|
||||||
node_package = InstalledNodePackage.from_fullpath(fullpath, self.resolve_from_path)
|
|
||||||
# ↓ Same ID extraction, consistent indexing
|
|
||||||
self.installed_node_packages[node_package.id].append(node_package)
|
|
||||||
```
|
|
||||||
|
|
||||||
**Lookup Process**:
|
|
||||||
1. Normalize search term: `cnr_utils.normalize_package_name(packname)`
|
|
||||||
2. Look up in `installed_node_packages` dict by normalized ID
|
|
||||||
3. Match found packages by version if needed
|
|
||||||
4. Return `InstalledNodePackage` objects with full metadata
|
|
||||||
|
|
||||||
### Edge Cases
|
|
||||||
|
|
||||||
**1. Package with `.git` AND `.tracking`**:
|
|
||||||
- **Detection**: Treated as Nightly (`.git` checked first)
|
|
||||||
- **Reason**: Git repo takes precedence over archive markers
|
|
||||||
- **Fix**: Remove `.tracking` file to avoid confusion
|
|
||||||
|
|
||||||
**2. Missing Marker Files**:
|
|
||||||
- **CNR without `.tracking`**: Treated as Unknown
|
|
||||||
- **Nightly without `.git`**: Treated as Unknown or CNR (if has `.tracking`)
|
|
||||||
- **Recovery**: Re-install package to restore correct markers
|
|
||||||
|
|
||||||
**3. Corrupted `pyproject.toml`**:
|
|
||||||
- **Detection**: `read_cnr_info()` returns `None`
|
|
||||||
- **Result**: Package treated as Unknown
|
|
||||||
- **Recovery**: Manual fix or re-install
|
|
||||||
|
|
||||||
## Version Types
|
|
||||||
|
|
||||||
ComfyUI Manager supports two main package version types:
|
|
||||||
|
|
||||||
### 1. CNR Version (Comfy Node Registry - Versioned Releases)
|
|
||||||
|
|
||||||
**Also known as**: Archive version (because it's distributed as ZIP archive)
|
|
||||||
|
|
||||||
**Purpose**: Production-ready releases that have been versioned, published to CNR server, and verified before distribution
|
|
||||||
|
|
||||||
**Characteristics**:
|
|
||||||
- Semantic versioning assigned (e.g., v1.0.2, v2.1.0)
|
|
||||||
- Published to CNR server with verification process
|
|
||||||
- Stable, tested releases for production use
|
|
||||||
- Distributed as ZIP archives for reliability
|
|
||||||
|
|
||||||
**Installation Method**: ZIP file extraction from CNR (Comfy Node Registry)
|
|
||||||
|
|
||||||
**Identification**:
|
|
||||||
- Presence of `.tracking` file in package directory
|
|
||||||
- **Directory naming**:
|
|
||||||
- **Active** (`custom_nodes/`): Uses `name` from `pyproject.toml` with original case (e.g., `ComfyUI_SigmoidOffsetScheduler`)
|
|
||||||
- This is the `original_name` in glob/ implementation
|
|
||||||
- **Disabled** (`.disabled/`): Uses `{package_name}@{version}` format (e.g., `comfyui_sigmoidoffsetscheduler@1_0_2`)
|
|
||||||
- Package indexed with lowercase ID from `pyproject.toml`
|
|
||||||
- Versioned releases (e.g., v1.0.2, v2.1.0)
|
|
||||||
|
|
||||||
**`.tracking` File Purpose**:
|
|
||||||
- **Primary**: Marker to identify this as a CNR/archive installation
|
|
||||||
- **Critical**: Contains list of original files from the archive
|
|
||||||
- **Update Use Case**: When updating to a new version:
|
|
||||||
1. Read `.tracking` to identify original archive files
|
|
||||||
2. Delete ONLY original archive files
|
|
||||||
3. Preserve user-generated files (configs, models, custom code)
|
|
||||||
4. Extract new archive version
|
|
||||||
5. Update `.tracking` with new file list
|
|
||||||
|
|
||||||
**File Structure**:
|
|
||||||
```
|
|
||||||
custom_nodes/
|
|
||||||
ComfyUI_SigmoidOffsetScheduler/
|
|
||||||
.tracking # List of original archive files
|
|
||||||
pyproject.toml # name = "ComfyUI_SigmoidOffsetScheduler"
|
|
||||||
__init__.py
|
|
||||||
nodes.py
|
|
||||||
(user-created files preserved during update)
|
|
||||||
```
|
|
||||||
|
|
||||||
### 2. Nightly Version (Development Builds)
|
|
||||||
|
|
||||||
**Purpose**: Real-time development builds from Git repository without semantic versioning
|
|
||||||
|
|
||||||
**Characteristics**:
|
|
||||||
- No semantic version assigned (version = "nightly")
|
|
||||||
- Direct access to latest development code
|
|
||||||
- Real-time updates via git pull
|
|
||||||
- For testing, development, and early adoption
|
|
||||||
- Not verified through CNR publication process
|
|
||||||
|
|
||||||
**Installation Method**: Git repository clone
|
|
||||||
|
|
||||||
**Identification**:
|
|
||||||
- Presence of `.git` directory in package directory
|
|
||||||
- `version: "nightly"` in package metadata
|
|
||||||
- **Directory naming**:
|
|
||||||
- **Active** (`custom_nodes/`): Uses `name` from `pyproject.toml` with original case (e.g., `ComfyUI_SigmoidOffsetScheduler`)
|
|
||||||
- This is the `original_name` in glob/ implementation
|
|
||||||
- **Disabled** (`.disabled/`): Uses `{package_name}@nightly` format (e.g., `comfyui_sigmoidoffsetscheduler@nightly`)
|
|
||||||
|
|
||||||
**Update Mechanism**:
|
|
||||||
- `git pull` on existing repository
|
|
||||||
- All user modifications in git working tree preserved by git
|
|
||||||
|
|
||||||
**File Structure**:
|
|
||||||
```
|
|
||||||
custom_nodes/
|
|
||||||
ComfyUI_SigmoidOffsetScheduler/
|
|
||||||
.git/ # Git repository marker
|
|
||||||
pyproject.toml
|
|
||||||
__init__.py
|
|
||||||
nodes.py
|
|
||||||
(git tracks all changes)
|
|
||||||
```
|
|
||||||
|
|
||||||
## Version Switching Mechanisms
|
|
||||||
|
|
||||||
### CNR ↔ Nightly (Uses `.disabled/` Directory)
|
|
||||||
|
|
||||||
**Mechanism**: Enable/disable toggling - only ONE version active at a time
|
|
||||||
|
|
||||||
**Process**:
|
|
||||||
1. **CNR → Nightly**:
|
|
||||||
```
|
|
||||||
Before: custom_nodes/ComfyUI_SigmoidOffsetScheduler/ (has .tracking)
|
|
||||||
After: custom_nodes/ComfyUI_SigmoidOffsetScheduler/ (has .git)
|
|
||||||
.disabled/comfyui_sigmoidoffsetscheduler@1_0_2/ (has .tracking)
|
|
||||||
```
|
|
||||||
- Move archive directory to `.disabled/comfyui_sigmoidoffsetscheduler@{version}/`
|
|
||||||
- Git clone nightly to `custom_nodes/ComfyUI_SigmoidOffsetScheduler/`
|
|
||||||
|
|
||||||
2. **Nightly → CNR**:
|
|
||||||
```
|
|
||||||
Before: custom_nodes/ComfyUI_SigmoidOffsetScheduler/ (has .git)
|
|
||||||
.disabled/comfyui_sigmoidoffsetscheduler@1_0_2/ (has .tracking)
|
|
||||||
After: custom_nodes/ComfyUI_SigmoidOffsetScheduler/ (has .tracking)
|
|
||||||
.disabled/comfyui_sigmoidoffsetscheduler@nightly/ (has .git)
|
|
||||||
```
|
|
||||||
- Move nightly directory to `.disabled/comfyui_sigmoidoffsetscheduler@nightly/`
|
|
||||||
- Restore archive from `.disabled/comfyui_sigmoidoffsetscheduler@{version}/`
|
|
||||||
|
|
||||||
**Key Points**:
|
|
||||||
- Both versions preserved in filesystem (one in `.disabled/`)
|
|
||||||
- Switching is fast (just move operations)
|
|
||||||
- No re-download needed when switching back
|
|
||||||
|
|
||||||
### CNR Version Update (In-Place Update)
|
|
||||||
|
|
||||||
**Mechanism**: Direct directory content update - NO `.disabled/` directory used
|
|
||||||
|
|
||||||
**When**: Switching between different CNR versions (e.g., v1.0.1 → v1.0.2)
|
|
||||||
|
|
||||||
**Process**:
|
|
||||||
```
|
|
||||||
Before: custom_nodes/ComfyUI_SigmoidOffsetScheduler/ (v1.0.1, has .tracking)
|
|
||||||
After: custom_nodes/ComfyUI_SigmoidOffsetScheduler/ (v1.0.2, has .tracking)
|
|
||||||
```
|
|
||||||
|
|
||||||
**Steps**:
|
|
||||||
1. Read `.tracking` to identify original v1.0.1 files
|
|
||||||
2. Delete only original v1.0.1 files (preserve user-created files)
|
|
||||||
3. Extract v1.0.2 archive to same directory
|
|
||||||
4. Update `.tracking` with v1.0.2 file list
|
|
||||||
5. Update `pyproject.toml` version metadata
|
|
||||||
|
|
||||||
**Critical**: Directory name and location remain unchanged
|
|
||||||
|
|
||||||
## API Design Decisions
|
|
||||||
|
|
||||||
### Enable/Disable Operations
|
|
||||||
|
|
||||||
**Design Decision**: ❌ **NO DIRECT ENABLE/DISABLE API PROVIDED**
|
|
||||||
|
|
||||||
**Rationale**:
|
|
||||||
- Enable/disable operations occur **ONLY as a by-product** of version switching
|
|
||||||
- Version switching is the primary operation that manages package state
|
|
||||||
- Direct enable/disable API would:
|
|
||||||
1. Create ambiguity about which version to enable/disable
|
|
||||||
2. Bypass version management logic
|
|
||||||
3. Lead to inconsistent package state
|
|
||||||
|
|
||||||
**Implementation**:
|
|
||||||
- `unified_enable()` and `unified_disable()` are **internal methods only**
|
|
||||||
- Called exclusively from version switching operations:
|
|
||||||
- `install_by_id()` (manager_core.py:1695-1724)
|
|
||||||
- `cnr_switch_version_instant()` (manager_core.py:941)
|
|
||||||
- `repo_update()` (manager_core.py:2144-2232)
|
|
||||||
|
|
||||||
**User Workflow**:
|
|
||||||
```
|
|
||||||
User wants to disable CNR version and enable Nightly:
|
|
||||||
✅ Correct: install(package, version="nightly")
|
|
||||||
→ automatically disables CNR, enables Nightly
|
|
||||||
❌ Wrong: disable(package) + enable(package, "nightly")
|
|
||||||
→ not supported, ambiguous
|
|
||||||
```
|
|
||||||
|
|
||||||
**Testing Approach**:
|
|
||||||
- Enable/disable tested **indirectly** through version switching tests
|
|
||||||
- Test 1-12 validate enable/disable behavior via install/update operations
|
|
||||||
- No direct enable/disable API tests needed (API doesn't exist)
|
|
||||||
|
|
||||||
## Implementation Details
|
|
||||||
|
|
||||||
### Version Detection Logic
|
|
||||||
|
|
||||||
**Location**: `comfyui_manager/common/node_package.py`
|
|
||||||
|
|
||||||
```python
|
|
||||||
@dataclass
|
|
||||||
class InstalledNodePackage:
|
|
||||||
@property
|
|
||||||
def is_nightly(self) -> bool:
|
|
||||||
return self.version == "nightly"
|
|
||||||
|
|
||||||
@property
|
|
||||||
def is_from_cnr(self) -> bool:
|
|
||||||
return not self.is_unknown and not self.is_nightly
|
|
||||||
```
|
|
||||||
|
|
||||||
**Detection Order**:
|
|
||||||
1. Check for `.tracking` file → CNR (Archive) version
|
|
||||||
2. Check for `.git` directory → Nightly version
|
|
||||||
3. Otherwise → Unknown/legacy
|
|
||||||
|
|
||||||
### Reload Timing
|
|
||||||
|
|
||||||
**Critical**: `unified_manager.reload()` must be called:
|
|
||||||
1. **Before each queued task** (`manager_server.py:1245`):
|
|
||||||
```python
|
|
||||||
# Reload installed packages before each task to ensure latest state
|
|
||||||
core.unified_manager.reload()
|
|
||||||
```
|
|
||||||
2. **Before version switching** (`manager_core.py:1370`):
|
|
||||||
```python
|
|
||||||
# Reload to ensure we have the latest package state before checking
|
|
||||||
self.reload()
|
|
||||||
```
|
|
||||||
|
|
||||||
**Why**: Ensures `installed_node_packages` dict reflects actual filesystem state
|
|
||||||
|
|
||||||
### Disable Mechanism
|
|
||||||
|
|
||||||
**Implementation** (`manager_core.py:982-1017`, specifically line 1011):
|
|
||||||
```python
|
|
||||||
def unified_disable(self, packname: str):
|
|
||||||
# ... validation logic ...
|
|
||||||
|
|
||||||
# Generate disabled directory name with version suffix
|
|
||||||
base_path = extract_base_custom_nodes_dir(matched_active.fullpath)
|
|
||||||
folder_name = packname if not self.is_url_like(packname) else os.path.basename(matched_active.fullpath)
|
|
||||||
to_path = os.path.join(base_path, '.disabled', f"{folder_name}@{matched_active.version.replace('.', '_')}")
|
|
||||||
|
|
||||||
shutil.move(matched_active.fullpath, to_path)
|
|
||||||
```
|
|
||||||
|
|
||||||
**Naming Convention**:
|
|
||||||
- `{folder_name}@{version}` format for ALL version types
|
|
||||||
- CNR v1.0.2 → `comfyui_foo@1_0_2` (dots replaced with underscores)
|
|
||||||
- Nightly → `comfyui_foo@nightly`
|
|
||||||
|
|
||||||
### Case Sensitivity Fix
|
|
||||||
|
|
||||||
**Problem**: Package IDs normalized to lowercase during indexing but not during lookup
|
|
||||||
|
|
||||||
**Solution** (`manager_core.py:1372-1378, 1388-1393`):
|
|
||||||
```python
|
|
||||||
# Normalize packname using centralized cnr_utils function
|
|
||||||
# CNR packages are indexed with lowercase IDs from pyproject.toml
|
|
||||||
packname_normalized = cnr_utils.normalize_package_name(packname)
|
|
||||||
|
|
||||||
if self.is_enabled(packname_normalized):
|
|
||||||
self.unified_disable(packname_normalized)
|
|
||||||
```
|
|
||||||
|
|
||||||
**Why Centralized Function**:
|
|
||||||
- Consistent normalization across entire codebase
|
|
||||||
- Single source of truth for package name normalization logic
|
|
||||||
- Easier to maintain and test
|
|
||||||
- Located in `cnr_utils.py:28-48`
|
|
||||||
|
|
||||||
## Directory Structure Examples
|
|
||||||
|
|
||||||
### Complete Example: All Version Types Coexisting
|
|
||||||
|
|
||||||
```
|
|
||||||
custom_nodes/
|
|
||||||
ComfyUI_SigmoidOffsetScheduler/ # Active version (CNR v2.0.0 in this example)
|
|
||||||
pyproject.toml # name = "ComfyUI_SigmoidOffsetScheduler"
|
|
||||||
__init__.py
|
|
||||||
nodes.py
|
|
||||||
|
|
||||||
.disabled/ # Inactive versions storage
|
|
||||||
comfyui_sigmoidoffsetscheduler@nightly/ # ← Nightly (disabled)
|
|
||||||
.git/ # ← Nightly marker
|
|
||||||
pyproject.toml
|
|
||||||
__init__.py
|
|
||||||
nodes.py
|
|
||||||
|
|
||||||
comfyui_sigmoidoffsetscheduler@1_0_2/ # ← CNR v1.0.2 (disabled)
|
|
||||||
.tracking # ← CNR marker with file list
|
|
||||||
pyproject.toml
|
|
||||||
__init__.py
|
|
||||||
nodes.py
|
|
||||||
|
|
||||||
comfyui_sigmoidoffsetscheduler@1_0_1/ # ← CNR v1.0.1 (disabled)
|
|
||||||
.tracking
|
|
||||||
pyproject.toml
|
|
||||||
__init__.py
|
|
||||||
nodes.py
|
|
||||||
```
|
|
||||||
|
|
||||||
**Key Points**:
|
|
||||||
- Active directory ALWAYS uses `original_name` without version suffix
|
|
||||||
- Each disabled version has `@{version}` suffix to avoid conflicts
|
|
||||||
- Multiple disabled versions can coexist (nightly + multiple CNR versions)
|
|
||||||
|
|
||||||
## Summary Table
|
|
||||||
|
|
||||||
| Version Type | Purpose | Marker | Active Directory Name | Disabled Directory Name | Update Method | Switch Mechanism |
|
|
||||||
|--------------|---------|--------|----------------------|------------------------|---------------|------------------|
|
|
||||||
| **CNR** (Archive) | Production-ready releases with semantic versioning, published to CNR server and verified | `.tracking` file | `original_name` (e.g., `ComfyUI_Foo`) | `{package}@{version}` (e.g., `comfyui_foo@1_0_2`) | In-place update (preserve user files) | `.disabled/` toggle |
|
|
||||||
| **Nightly** | Real-time development builds from Git repository without semantic versioning | `.git/` directory | `original_name` (e.g., `ComfyUI_Foo`) | `{package}@nightly` (e.g., `comfyui_foo@nightly`) | `git pull` | `.disabled/` toggle |
|
|
||||||
|
|
||||||
**Important Constraints**:
|
|
||||||
- **Active directory name**: MUST use `original_name` (from `pyproject.toml`) without version suffix
|
|
||||||
- Other code may depend on this specific directory name
|
|
||||||
- Only ONE version can be active at a time
|
|
||||||
- **Disabled directory name**: MUST include `@{version}` suffix to allow multiple disabled versions to coexist
|
|
||||||
- CNR: `@{version}` (e.g., `@1_0_2`)
|
|
||||||
- Nightly: `@nightly`
|
|
||||||
|
|
||||||
## Edge Cases
|
|
||||||
|
|
||||||
### 1. Multiple CNR Versions
|
|
||||||
- Each stored in `.disabled/` with version suffix
|
|
||||||
- Only one can be active at a time
|
|
||||||
- Switching between CNR versions = direct content update (not via `.disabled/`)
|
|
||||||
|
|
||||||
### 2. Package ID Case Variations
|
|
||||||
- Always normalize to lowercase for internal lookups
|
|
||||||
- Preserve original case in filesystem/display
|
|
||||||
- Match against lowercase indexed keys
|
|
||||||
|
|
||||||
### 3. Corrupted `.tracking` File
|
|
||||||
- Treat as unknown version type
|
|
||||||
- Warn user before update/uninstall
|
|
||||||
- May require manual cleanup
|
|
||||||
|
|
||||||
### 4. Mixed CNR + Nightly in `.disabled/`
|
|
||||||
- Both can coexist in `.disabled/`
|
|
||||||
- Only one can be active in `custom_nodes/`
|
|
||||||
- Switch logic detects type and handles appropriately
|
|
||||||
@@ -1,41 +0,0 @@
|
|||||||
# ComfyUI-Manager: Documentation
|
|
||||||
|
|
||||||
This directory contains documentation for the ComfyUI-Manager, providing guides and tutorials for users in multiple languages.
|
|
||||||
|
|
||||||
## Directory Structure
|
|
||||||
|
|
||||||
The documentation is organized into language-specific directories:
|
|
||||||
|
|
||||||
- **en/**: English documentation
|
|
||||||
- **ko/**: Korean documentation
|
|
||||||
|
|
||||||
## Core Documentation Files
|
|
||||||
|
|
||||||
### Command-Line Interface
|
|
||||||
|
|
||||||
- **cm-cli.md**: Documentation for the ComfyUI-Manager Command Line Interface (CLI), which allows using manager functionality without the UI.
|
|
||||||
|
|
||||||
### Advanced Features
|
|
||||||
|
|
||||||
- **use_aria2.md**: Guide for using the aria2 download accelerator with ComfyUI-Manager for faster model downloads.
|
|
||||||
|
|
||||||
## Documentation Standards
|
|
||||||
|
|
||||||
The documentation follows these standards:
|
|
||||||
|
|
||||||
1. **Markdown Format**: All documentation is written in Markdown for easy rendering on GitHub and other platforms
|
|
||||||
2. **Language-specific Directories**: Content is separated by language to facilitate localization
|
|
||||||
3. **Feature-focused Documentation**: Each major feature has its own documentation file
|
|
||||||
4. **Updated with Releases**: Documentation is kept in sync with software releases
|
|
||||||
|
|
||||||
## Contributing to Documentation
|
|
||||||
|
|
||||||
When contributing new documentation:
|
|
||||||
|
|
||||||
1. Place files in the appropriate language directory
|
|
||||||
2. Use clear, concise language appropriate for the target audience
|
|
||||||
3. Include examples where helpful
|
|
||||||
4. Consider adding screenshots or diagrams for complex features
|
|
||||||
5. Maintain consistent formatting with existing documentation
|
|
||||||
|
|
||||||
This documentation directory will continue to grow to support the expanding feature set of ComfyUI-Manager.
|
|
||||||
@@ -1,235 +0,0 @@
|
|||||||
# Security-Enhanced URL Installation System
|
|
||||||
|
|
||||||
## Overview
|
|
||||||
|
|
||||||
Security constraints have been added to the `install_by_url` function to control URL-based installations according to the system's security level.
|
|
||||||
|
|
||||||
## Security Level and Risk Level Framework
|
|
||||||
|
|
||||||
### Security Levels (SecurityLevel)
|
|
||||||
- **strong**: Most restrictive, only trusted sources allowed
|
|
||||||
- **normal**: Standard security, most known platforms allowed
|
|
||||||
- **normal-**: Relaxed security, additional allowances for personal cloud environments
|
|
||||||
- **weak**: Most permissive security, for local development environments
|
|
||||||
|
|
||||||
### Risk Levels (RiskLevel)
|
|
||||||
- **block**: Complete block (always denied)
|
|
||||||
- **high+**: Very high risk (only allowed in local mode + weak/normal-)
|
|
||||||
- **high**: High risk (only allowed in local mode + weak/normal- or personal cloud + weak)
|
|
||||||
- **middle+**: Medium-high risk (weak/normal/normal- allowed in local/personal cloud)
|
|
||||||
- **middle**: Medium risk (weak/normal/normal- allowed in all environments)
|
|
||||||
|
|
||||||
## URL Risk Assessment Logic
|
|
||||||
|
|
||||||
### Low Risk (middle) - Trusted Platforms
|
|
||||||
```
|
|
||||||
- github.com
|
|
||||||
- gitlab.com
|
|
||||||
- bitbucket.org
|
|
||||||
- raw.githubusercontent.com
|
|
||||||
- gitlab.io
|
|
||||||
```
|
|
||||||
|
|
||||||
### High Risk (high+) - Suspicious/Local Hosting
|
|
||||||
```
|
|
||||||
- localhost, 127.0.0.1
|
|
||||||
- Private IP ranges: 192.168.*, 10.0.*, 172.*
|
|
||||||
- Temporary hosting: ngrok.io, herokuapp.com, repl.it, glitch.me
|
|
||||||
```
|
|
||||||
|
|
||||||
### Medium-High Risk (middle+) - Unknown Domains
|
|
||||||
```
|
|
||||||
- All domains not belonging to the above categories
|
|
||||||
```
|
|
||||||
|
|
||||||
### High Risk (high) - SSH Protocol
|
|
||||||
```
|
|
||||||
- URLs starting with ssh:// or git@
|
|
||||||
```
|
|
||||||
|
|
||||||
## Implemented Security Features
|
|
||||||
|
|
||||||
### 1. Security Validation (`_validate_url_security`)
|
|
||||||
```python
|
|
||||||
async def install_by_url(self, url: str, ...):
|
|
||||||
# Security validation
|
|
||||||
security_result = self._validate_url_security(url)
|
|
||||||
if not security_result['allowed']:
|
|
||||||
return self._report_failed_install_security(url, security_result['reason'], custom_name)
|
|
||||||
```
|
|
||||||
|
|
||||||
**Features**:
|
|
||||||
- Check current security level
|
|
||||||
- Assess URL risk
|
|
||||||
- Allow/block decision based on security policy
|
|
||||||
|
|
||||||
### 2. Failure Reporting (`_report_failed_install_security`)
|
|
||||||
```python
|
|
||||||
def _report_failed_install_security(self, url: str, reason: str, custom_name=None):
|
|
||||||
# Security block logging
|
|
||||||
print(f"[SECURITY] Blocked URL installation: {url}")
|
|
||||||
|
|
||||||
# Record failed installation
|
|
||||||
self._record_failed_install_nodepack({
|
|
||||||
'type': 'url-security-block',
|
|
||||||
'url': url,
|
|
||||||
'package_name': pack_name,
|
|
||||||
'reason': reason,
|
|
||||||
'security_level': current_security_level,
|
|
||||||
'timestamp': timestamp
|
|
||||||
})
|
|
||||||
```
|
|
||||||
|
|
||||||
**Features**:
|
|
||||||
- Log blocked installation attempts to console
|
|
||||||
- Save failure information in structured format
|
|
||||||
- Return failure result as ManagedResult
|
|
||||||
|
|
||||||
### 3. Failed Installation Record Management (`_record_failed_install_nodepack`)
|
|
||||||
```python
|
|
||||||
def get_failed_install_reports(self) -> list:
|
|
||||||
return getattr(self, '_failed_installs', [])
|
|
||||||
```
|
|
||||||
|
|
||||||
**Features**:
|
|
||||||
- Maintain recent 100 failure records
|
|
||||||
- Prevent memory overflow
|
|
||||||
- Provide API for monitoring and debugging
|
|
||||||
|
|
||||||
## Usage Examples
|
|
||||||
|
|
||||||
### Behavior by Security Setting
|
|
||||||
|
|
||||||
#### Strong Security Level
|
|
||||||
```python
|
|
||||||
# Most URLs are blocked
|
|
||||||
result = await manager.install_by_url("https://github.com/user/repo")
|
|
||||||
# Result: Blocked (github is also middle risk, so blocked at strong level)
|
|
||||||
|
|
||||||
result = await manager.install_by_url("https://suspicious-domain.com/repo.git")
|
|
||||||
# Result: Blocked (middle+ risk)
|
|
||||||
```
|
|
||||||
|
|
||||||
#### Normal Security Level
|
|
||||||
```python
|
|
||||||
# Trusted platforms allowed
|
|
||||||
result = await manager.install_by_url("https://github.com/user/repo")
|
|
||||||
# Result: Allowed
|
|
||||||
|
|
||||||
result = await manager.install_by_url("https://localhost/repo.git")
|
|
||||||
# Result: Blocked (high+ risk)
|
|
||||||
```
|
|
||||||
|
|
||||||
#### Weak Security Level (Local Development Environment)
|
|
||||||
```python
|
|
||||||
# Almost all URLs allowed
|
|
||||||
result = await manager.install_by_url("https://github.com/user/repo")
|
|
||||||
# Result: Allowed
|
|
||||||
|
|
||||||
result = await manager.install_by_url("https://192.168.1.100/repo.git")
|
|
||||||
# Result: Allowed (in local mode)
|
|
||||||
|
|
||||||
result = await manager.install_by_url("git@private-server.com:user/repo.git")
|
|
||||||
# Result: Allowed
|
|
||||||
```
|
|
||||||
|
|
||||||
### Failure Monitoring
|
|
||||||
```python
|
|
||||||
manager = UnifiedManager()
|
|
||||||
|
|
||||||
# Blocked installation attempt
|
|
||||||
await manager.install_by_url("https://malicious-site.com/evil-nodes.git")
|
|
||||||
|
|
||||||
# Check failure records
|
|
||||||
failed_reports = manager.get_failed_install_reports()
|
|
||||||
for report in failed_reports:
|
|
||||||
print(f"Blocked: {report['url']} - {report['reason']}")
|
|
||||||
```
|
|
||||||
|
|
||||||
## Security Policy Matrix
|
|
||||||
|
|
||||||
| Risk Level | Strong | Normal | Normal- | Weak |
|
|
||||||
|------------|--------|--------|---------|------|
|
|
||||||
| **block** | ❌ | ❌ | ❌ | ❌ |
|
|
||||||
| **high+** | ❌ | ❌ | 🔒* | 🔒* |
|
|
||||||
| **high** | ❌ | ❌ | 🔒*/☁️** | ✅ |
|
|
||||||
| **middle+**| ❌ | ❌ | 🔒*/☁️** | ✅ |
|
|
||||||
| **middle** | ❌ | ✅ | ✅ | ✅ |
|
|
||||||
|
|
||||||
- 🔒* : Allowed only in local mode
|
|
||||||
- ☁️** : Allowed only in personal cloud mode
|
|
||||||
- ✅ : Allowed
|
|
||||||
- ❌ : Blocked
|
|
||||||
|
|
||||||
## Error Message Examples
|
|
||||||
|
|
||||||
### Security Block
|
|
||||||
```
|
|
||||||
Installation blocked by security policy: URL installation blocked by security level: strong (risk: middle)
|
|
||||||
Target: awesome-nodes@url-blocked
|
|
||||||
```
|
|
||||||
|
|
||||||
### Console Log
|
|
||||||
```
|
|
||||||
[SECURITY] Blocked URL installation: https://suspicious-domain.com/repo.git
|
|
||||||
[SECURITY] Reason: URL installation blocked by security level: normal (risk: middle+)
|
|
||||||
[SECURITY] Package: repo
|
|
||||||
```
|
|
||||||
|
|
||||||
## Configuration Recommendations
|
|
||||||
|
|
||||||
### Production Environment
|
|
||||||
```json
|
|
||||||
{
|
|
||||||
"security_level": "strong",
|
|
||||||
"network_mode": "private"
|
|
||||||
}
|
|
||||||
```
|
|
||||||
- Most restrictive settings
|
|
||||||
- Only trusted sources allowed
|
|
||||||
|
|
||||||
### Development Environment
|
|
||||||
```json
|
|
||||||
{
|
|
||||||
"security_level": "weak",
|
|
||||||
"network_mode": "local"
|
|
||||||
}
|
|
||||||
```
|
|
||||||
- Permissive settings for development convenience
|
|
||||||
- Allow local repositories and development servers
|
|
||||||
|
|
||||||
### Personal Cloud Environment
|
|
||||||
```json
|
|
||||||
{
|
|
||||||
"security_level": "normal-",
|
|
||||||
"network_mode": "personal_cloud"
|
|
||||||
}
|
|
||||||
```
|
|
||||||
- Balanced settings for personal use
|
|
||||||
- Allow personal repository access
|
|
||||||
|
|
||||||
## Security Enhancement Benefits
|
|
||||||
|
|
||||||
### 1. Malware Prevention
|
|
||||||
- Automatic blocking from unknown sources
|
|
||||||
- Filter suspicious domains and IPs
|
|
||||||
|
|
||||||
### 2. Network Security
|
|
||||||
- Control private network access
|
|
||||||
- Restrict SSH protocol usage
|
|
||||||
|
|
||||||
### 3. Audit Trail
|
|
||||||
- Record all blocked attempts
|
|
||||||
- Log security events
|
|
||||||
|
|
||||||
### 4. Flexible Policy
|
|
||||||
- Customized security levels per environment
|
|
||||||
- Distinguish between production/development environments
|
|
||||||
|
|
||||||
## Backward Compatibility
|
|
||||||
|
|
||||||
- Existing `install_by_id` function unchanged
|
|
||||||
- No security validation applied to CNR-based installations
|
|
||||||
- `install_by_id_or_url` applies security only to URLs
|
|
||||||
|
|
||||||
This security enhancement significantly improves system security while maintaining the convenience of URL-based installations.
|
|
||||||
@@ -1,355 +0,0 @@
|
|||||||
# CNR Version Management Design
|
|
||||||
|
|
||||||
**Version**: 1.1
|
|
||||||
**Date**: 2025-11-08
|
|
||||||
**Status**: Official Design Policy
|
|
||||||
|
|
||||||
## Overview
|
|
||||||
|
|
||||||
This document describes the official design policy for CNR (ComfyUI Node Registry) version management in ComfyUI Manager.
|
|
||||||
|
|
||||||
## Core Design Principles
|
|
||||||
|
|
||||||
### 1. In-Place Upgrade Policy
|
|
||||||
|
|
||||||
**Policy**: CNR upgrades are performed as **in-place replacements** without version history preservation.
|
|
||||||
|
|
||||||
**Rationale**:
|
|
||||||
- **Simplicity**: Single version management is easier for users and maintainers
|
|
||||||
- **Disk Space**: Prevents accumulation of old package versions
|
|
||||||
- **Clear State**: Users always know which version is active
|
|
||||||
- **Consistency**: Same behavior for enabled and disabled states
|
|
||||||
|
|
||||||
**Behavior**:
|
|
||||||
```
|
|
||||||
Before: custom_nodes/PackageName/ (CNR v1.0.1 with .tracking)
|
|
||||||
Action: Install CNR v1.0.2
|
|
||||||
After: custom_nodes/PackageName/ (CNR v1.0.2 with .tracking)
|
|
||||||
Result: Old v1.0.1 REMOVED (not preserved)
|
|
||||||
```
|
|
||||||
|
|
||||||
### 2. Single CNR Version Policy
|
|
||||||
|
|
||||||
**Policy**: Only **ONE CNR version** exists at any given time (either enabled OR disabled, never both).
|
|
||||||
|
|
||||||
**Rationale**:
|
|
||||||
- **State Clarity**: No ambiguity about which CNR version is current
|
|
||||||
- **Resource Management**: Minimal disk usage
|
|
||||||
- **User Experience**: Clear version state without confusion
|
|
||||||
- **Design Consistency**: Uniform handling across operations
|
|
||||||
|
|
||||||
**States**:
|
|
||||||
- **Enabled**: `custom_nodes/PackageName/` (with `.tracking`)
|
|
||||||
- **Disabled**: `.disabled/packagename@version/` (with `.tracking`)
|
|
||||||
- **Never**: Multiple CNR versions coexisting
|
|
||||||
|
|
||||||
### 3. CNR vs Nightly Differentiation
|
|
||||||
|
|
||||||
**Policy**: Different handling for CNR and Nightly packages based on use cases.
|
|
||||||
|
|
||||||
| Aspect | CNR Packages (`.tracking`) | Nightly Packages (`.git`) |
|
|
||||||
|--------|----------------------------|---------------------------|
|
|
||||||
| **Purpose** | Stable releases | Development versions |
|
|
||||||
| **Preservation** | Not preserved (in-place upgrade) | Preserved (multiple versions) |
|
|
||||||
| **Version Policy** | Single version only | Multiple versions allowed |
|
|
||||||
| **Use Case** | Production use | Testing and development |
|
|
||||||
|
|
||||||
**Rationale**:
|
|
||||||
- **CNR**: Stable releases don't need version history; users want single stable version
|
|
||||||
- **Nightly**: Development versions benefit from multiple versions for testing
|
|
||||||
|
|
||||||
### 4. API Response Priority Rules
|
|
||||||
|
|
||||||
**Policy**: The `/v2/customnode/installed` API applies two priority rules to prevent duplicate package entries and ensure clear state representation.
|
|
||||||
|
|
||||||
**Rule 1 (Enabled-Priority)**:
|
|
||||||
- **Policy**: When both enabled and disabled versions of the same package exist → Return ONLY the enabled version
|
|
||||||
- **Rationale**: Prevents frontend confusion from duplicate package entries
|
|
||||||
- **Implementation**: `comfyui_manager/glob/manager_core.py:1801` in `get_installed_nodepacks()`
|
|
||||||
|
|
||||||
**Rule 2 (CNR-Priority for Disabled Packages)**:
|
|
||||||
- **Policy**: When both CNR and Nightly versions are disabled → Return ONLY the CNR version
|
|
||||||
- **Rationale**: CNR versions are stable releases and should be preferred over development Nightly builds when both are inactive
|
|
||||||
- **Implementation**: `comfyui_manager/glob/manager_core.py:1801` in `get_installed_nodepacks()`
|
|
||||||
|
|
||||||
**Priority Matrix**:
|
|
||||||
|
|
||||||
| Scenario | Enabled Versions | Disabled Versions | API Response |
|
|
||||||
|----------|------------------|-------------------|--------------|
|
|
||||||
| 1. CNR enabled only | CNR v1.0.1 | None | CNR v1.0.1 (`enabled: true`) |
|
|
||||||
| 2. CNR enabled + Nightly disabled | CNR v1.0.1 | Nightly | **Only CNR v1.0.1** (`enabled: true`) ← Rule 1 |
|
|
||||||
| 3. Nightly enabled + CNR disabled | Nightly | CNR v1.0.1 | **Only Nightly** (`enabled: true`) ← Rule 1 |
|
|
||||||
| 4. CNR disabled + Nightly disabled | None | CNR v1.0.1, Nightly | **Only CNR v1.0.1** (`enabled: false`) ← Rule 2 |
|
|
||||||
| 5. Different packages disabled | None | PackageA, PackageB | Both packages (`enabled: false`) |
|
|
||||||
|
|
||||||
**Test Coverage**:
|
|
||||||
- `tests/glob/test_installed_api_enabled_priority.py`
|
|
||||||
- `test_installed_api_shows_only_enabled_when_both_exist` - Verifies Rule 1
|
|
||||||
- `test_installed_api_cnr_priority_when_both_disabled` - Verifies Rule 2
|
|
||||||
|
|
||||||
## Detailed Behavior Specifications
|
|
||||||
|
|
||||||
### CNR Upgrade (Enabled → Enabled)
|
|
||||||
|
|
||||||
**Scenario**: Upgrading from CNR v1.0.1 to v1.0.2 when v1.0.1 is enabled
|
|
||||||
|
|
||||||
```
|
|
||||||
Initial State:
|
|
||||||
custom_nodes/PackageName/ (CNR v1.0.1 with .tracking)
|
|
||||||
|
|
||||||
Action:
|
|
||||||
Install CNR v1.0.2
|
|
||||||
|
|
||||||
Process:
|
|
||||||
1. Download CNR v1.0.2
|
|
||||||
2. Remove existing custom_nodes/PackageName/
|
|
||||||
3. Install CNR v1.0.2 to custom_nodes/PackageName/
|
|
||||||
4. Create .tracking file
|
|
||||||
|
|
||||||
Final State:
|
|
||||||
custom_nodes/PackageName/ (CNR v1.0.2 with .tracking)
|
|
||||||
|
|
||||||
Result:
|
|
||||||
✓ v1.0.2 installed and enabled
|
|
||||||
✓ v1.0.1 completely removed
|
|
||||||
✓ No version history preserved
|
|
||||||
```
|
|
||||||
|
|
||||||
### CNR Switch from Disabled
|
|
||||||
|
|
||||||
**Scenario**: Switching from disabled CNR v1.0.1 to CNR v1.0.2
|
|
||||||
|
|
||||||
```
|
|
||||||
Initial State:
|
|
||||||
custom_nodes/PackageName/ (Nightly with .git)
|
|
||||||
.disabled/packagename@1_0_1/ (CNR v1.0.1 with .tracking)
|
|
||||||
|
|
||||||
User Action:
|
|
||||||
Install CNR v1.0.2
|
|
||||||
|
|
||||||
Process:
|
|
||||||
Step 1: Enable disabled CNR v1.0.1
|
|
||||||
- Move .disabled/packagename@1_0_1/ → custom_nodes/PackageName/
|
|
||||||
- Move custom_nodes/PackageName/ → .disabled/packagename@nightly/
|
|
||||||
|
|
||||||
Step 2: Upgrade CNR v1.0.1 → v1.0.2 (in-place)
|
|
||||||
- Download CNR v1.0.2
|
|
||||||
- Remove custom_nodes/PackageName/
|
|
||||||
- Install CNR v1.0.2 to custom_nodes/PackageName/
|
|
||||||
|
|
||||||
Final State:
|
|
||||||
custom_nodes/PackageName/ (CNR v1.0.2 with .tracking)
|
|
||||||
.disabled/packagename@nightly/ (Nightly preserved)
|
|
||||||
|
|
||||||
Result:
|
|
||||||
✓ CNR v1.0.2 installed and enabled
|
|
||||||
✓ CNR v1.0.1 removed (not preserved in .disabled/)
|
|
||||||
✓ Nightly preserved in .disabled/
|
|
||||||
```
|
|
||||||
|
|
||||||
### CNR Disable
|
|
||||||
|
|
||||||
**Scenario**: Disabling CNR v1.0.1 when Nightly exists
|
|
||||||
|
|
||||||
```
|
|
||||||
Initial State:
|
|
||||||
custom_nodes/PackageName/ (CNR v1.0.1 with .tracking)
|
|
||||||
|
|
||||||
Action:
|
|
||||||
Disable CNR v1.0.1
|
|
||||||
|
|
||||||
Final State:
|
|
||||||
.disabled/packagename@1_0_1/ (CNR v1.0.1 with .tracking)
|
|
||||||
|
|
||||||
Note:
|
|
||||||
- Only ONE disabled CNR version exists
|
|
||||||
- If another CNR is already disabled, it is replaced
|
|
||||||
```
|
|
||||||
|
|
||||||
### Nightly Installation (with CNR Disabled)
|
|
||||||
|
|
||||||
**Scenario**: Installing Nightly when CNR v1.0.1 is disabled
|
|
||||||
|
|
||||||
```
|
|
||||||
Initial State:
|
|
||||||
.disabled/packagename@1_0_1/ (CNR v1.0.1 with .tracking)
|
|
||||||
|
|
||||||
Action:
|
|
||||||
Install Nightly
|
|
||||||
|
|
||||||
Final State:
|
|
||||||
custom_nodes/PackageName/ (Nightly with .git)
|
|
||||||
.disabled/packagename@1_0_1/ (CNR v1.0.1 preserved)
|
|
||||||
|
|
||||||
Result:
|
|
||||||
✓ Nightly installed and enabled
|
|
||||||
✓ Disabled CNR v1.0.1 preserved (not removed)
|
|
||||||
✓ Different handling for Nightly vs CNR
|
|
||||||
```
|
|
||||||
|
|
||||||
## Implementation Requirements
|
|
||||||
|
|
||||||
### CNR Install/Upgrade Operation
|
|
||||||
|
|
||||||
1. **Check for existing CNR versions**:
|
|
||||||
- Enabled: `custom_nodes/PackageName/` with `.tracking`
|
|
||||||
- Disabled: `.disabled/*` with `.tracking`
|
|
||||||
|
|
||||||
2. **Remove old CNR versions**:
|
|
||||||
- If enabled CNR exists: Remove it
|
|
||||||
- If disabled CNR exists: Remove it
|
|
||||||
- Ensure only ONE CNR version will exist after operation
|
|
||||||
|
|
||||||
3. **Install new CNR version**:
|
|
||||||
- Download and extract to target location
|
|
||||||
- Create `.tracking` file
|
|
||||||
- Register in package database
|
|
||||||
|
|
||||||
4. **Preserve Nightly packages**:
|
|
||||||
- Do NOT remove packages with `.git` directory
|
|
||||||
- Nightly packages should be preserved in `.disabled/`
|
|
||||||
|
|
||||||
### CNR Disable Operation
|
|
||||||
|
|
||||||
1. **Move enabled CNR to disabled**:
|
|
||||||
- Move `custom_nodes/PackageName/` → `.disabled/packagename@version/`
|
|
||||||
- Use **installed version** for directory name (not registry latest)
|
|
||||||
|
|
||||||
2. **Remove any existing disabled CNR**:
|
|
||||||
- Only ONE disabled CNR version allowed
|
|
||||||
- If another CNR already in `.disabled/`, remove it first
|
|
||||||
|
|
||||||
3. **Preserve disabled Nightly**:
|
|
||||||
- Do NOT remove disabled Nightly packages
|
|
||||||
- Multiple Nightly versions can coexist in `.disabled/`
|
|
||||||
|
|
||||||
### CNR Enable Operation
|
|
||||||
|
|
||||||
1. **Check for enabled package**:
|
|
||||||
- If another package enabled, disable it first
|
|
||||||
|
|
||||||
2. **Move disabled CNR to enabled**:
|
|
||||||
- Move `.disabled/packagename@version/` → `custom_nodes/PackageName/`
|
|
||||||
|
|
||||||
3. **Maintain single CNR policy**:
|
|
||||||
- After enable, no CNR should remain in `.disabled/`
|
|
||||||
- Only Nightly packages should remain in `.disabled/`
|
|
||||||
|
|
||||||
## Test Coverage
|
|
||||||
|
|
||||||
### Phase 7: Version Management Behavior Tests
|
|
||||||
|
|
||||||
**Test 7.1: `test_cnr_version_upgrade_removes_old`**
|
|
||||||
- ✅ Verifies in-place upgrade removes old CNR version
|
|
||||||
- ✅ Confirms only one CNR version exists after upgrade
|
|
||||||
- ✅ Documents single version policy
|
|
||||||
|
|
||||||
**Test 7.2: `test_cnr_nightly_switching_preserves_nightly_only`**
|
|
||||||
- ✅ Verifies Nightly preservation across CNR upgrades
|
|
||||||
- ✅ Confirms old CNR versions removed (not preserved)
|
|
||||||
- ✅ Documents different handling for CNR vs Nightly
|
|
||||||
|
|
||||||
### Other Relevant Tests
|
|
||||||
|
|
||||||
**Phase 1-6 Tests**:
|
|
||||||
- ✅ All tests comply with single CNR version policy
|
|
||||||
- ✅ No tests assume multiple CNR versions coexist
|
|
||||||
- ✅ Fixtures properly handle CNR vs Nightly differences
|
|
||||||
|
|
||||||
## Known Behaviors
|
|
||||||
|
|
||||||
### Correct Behaviors (By Design)
|
|
||||||
|
|
||||||
1. **CNR Upgrades Remove Old Versions**
|
|
||||||
- Status: ✅ Intentional design
|
|
||||||
- Reason: In-place upgrade policy
|
|
||||||
- Test: Phase 7.1 verifies this
|
|
||||||
|
|
||||||
2. **Only One CNR Version Exists**
|
|
||||||
- Status: ✅ Intentional design
|
|
||||||
- Reason: Single version policy
|
|
||||||
- Test: Phase 7.2 verifies this
|
|
||||||
|
|
||||||
3. **Nightly Preserved, CNR Not**
|
|
||||||
- Status: ✅ Intentional design
|
|
||||||
- Reason: Different use cases
|
|
||||||
- Test: Phase 7.2 verifies this
|
|
||||||
|
|
||||||
### Known Issues
|
|
||||||
|
|
||||||
1. **Disable API Version Mismatch**
|
|
||||||
- Status: ⚠️ Bug to be fixed
|
|
||||||
- Issue: Disabled directory name uses registry latest instead of installed version
|
|
||||||
- Impact: Incorrect directory naming
|
|
||||||
- Priority: Medium
|
|
||||||
|
|
||||||
## Design Rationale
|
|
||||||
|
|
||||||
### Why In-Place Upgrade?
|
|
||||||
|
|
||||||
**Benefits**:
|
|
||||||
- Simple mental model for users
|
|
||||||
- No disk space accumulation
|
|
||||||
- Clear version state
|
|
||||||
- Easier maintenance
|
|
||||||
|
|
||||||
**Trade-offs**:
|
|
||||||
- No automatic rollback capability
|
|
||||||
- Users must reinstall old versions from registry
|
|
||||||
- Network required for version downgrades
|
|
||||||
|
|
||||||
**Decision**: Benefits outweigh trade-offs for stable release management.
|
|
||||||
|
|
||||||
### Why Different CNR vs Nightly Handling?
|
|
||||||
|
|
||||||
**CNR (Stable Releases)**:
|
|
||||||
- Users want single stable version
|
|
||||||
- Production use case
|
|
||||||
- Rollback via registry if needed
|
|
||||||
|
|
||||||
**Nightly (Development Builds)**:
|
|
||||||
- Developers test multiple versions
|
|
||||||
- Development use case
|
|
||||||
- Local version testing important
|
|
||||||
|
|
||||||
**Decision**: Different use cases justify different policies.
|
|
||||||
|
|
||||||
## Future Considerations
|
|
||||||
|
|
||||||
### Potential Enhancements (Not Currently Planned)
|
|
||||||
|
|
||||||
1. **Optional Version History**
|
|
||||||
- Configurable preservation of last N versions
|
|
||||||
- Opt-in via configuration flag
|
|
||||||
- Separate history directory
|
|
||||||
|
|
||||||
2. **CNR Rollback API**
|
|
||||||
- Dedicated rollback endpoint
|
|
||||||
- Re-download from registry
|
|
||||||
- Preserve current version before downgrade
|
|
||||||
|
|
||||||
3. **Version Pinning**
|
|
||||||
- Pin specific CNR version
|
|
||||||
- Prevent automatic upgrades
|
|
||||||
- Per-package configuration
|
|
||||||
|
|
||||||
**Note**: These are potential future enhancements, not current requirements.
|
|
||||||
|
|
||||||
## Version History
|
|
||||||
|
|
||||||
| Version | Date | Changes |
|
|
||||||
|---------|------|---------|
|
|
||||||
| 1.1 | 2025-11-08 | Added API Response Priority Rules (Rule 1: Enabled-Priority, Rule 2: CNR-Priority) |
|
|
||||||
| 1.0 | 2025-11-06 | Initial design document based on user clarification |
|
|
||||||
|
|
||||||
## References
|
|
||||||
|
|
||||||
- Phase 7 Test Implementation: `tests/glob/test_complex_scenarios.py`
|
|
||||||
- Policy Clarification: `.claude/livecontext/cnr_version_policy_clarification.md`
|
|
||||||
- Bug Report: `.claude/livecontext/bugs_to_file.md`
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
**Approved By**: User feedback 2025-11-06
|
|
||||||
**Status**: Official Policy
|
|
||||||
**Compliance**: All tests verified against this policy
|
|
||||||
@@ -1,292 +0,0 @@
|
|||||||
# Glob Module API Reference for CLI Migration
|
|
||||||
|
|
||||||
## 🎯 Quick Reference
|
|
||||||
This document provides essential glob module APIs available for CLI implementation. **READ ONLY** - do not modify glob module.
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## 📦 Core Classes
|
|
||||||
|
|
||||||
### UnifiedManager
|
|
||||||
**Location**: `comfyui_manager/glob/manager_core.py:436`
|
|
||||||
**Instance**: Available as `unified_manager` (global instance)
|
|
||||||
|
|
||||||
#### Data Structures
|
|
||||||
```python
|
|
||||||
class UnifiedManager:
|
|
||||||
def __init__(self):
|
|
||||||
# PRIMARY DATA - Use these instead of legacy dicts
|
|
||||||
self.installed_node_packages: dict[str, list[InstalledNodePackage]]
|
|
||||||
self.repo_nodepack_map: dict[str, InstalledNodePackage] # compact_url -> package
|
|
||||||
self.processed_install: set
|
|
||||||
```
|
|
||||||
|
|
||||||
#### Core Methods (Direct CLI Equivalents)
|
|
||||||
```python
|
|
||||||
# Installation & Management
|
|
||||||
async def install_by_id(packname: str, version_spec=None, channel=None,
|
|
||||||
mode=None, instant_execution=False, no_deps=False,
|
|
||||||
return_postinstall=False) -> ManagedResult
|
|
||||||
def unified_enable(packname: str, version_spec=None) -> ManagedResult
|
|
||||||
def unified_disable(packname: str) -> ManagedResult
|
|
||||||
def unified_uninstall(packname: str) -> ManagedResult
|
|
||||||
def unified_update(packname: str, instant_execution=False, no_deps=False,
|
|
||||||
return_postinstall=False) -> ManagedResult
|
|
||||||
def unified_fix(packname: str, version_spec, instant_execution=False,
|
|
||||||
no_deps=False) -> ManagedResult
|
|
||||||
|
|
||||||
# Package Resolution & Info
|
|
||||||
def resolve_node_spec(packname: str, guess_mode=None) -> tuple[str, str, bool] | None
|
|
||||||
def get_active_pack(packname: str) -> InstalledNodePackage | None
|
|
||||||
def get_inactive_pack(packname: str, version_spec=None) -> InstalledNodePackage | None
|
|
||||||
|
|
||||||
# Git Repository Operations
|
|
||||||
async def repo_install(url: str, repo_path: str, instant_execution=False,
|
|
||||||
no_deps=False, return_postinstall=False) -> ManagedResult
|
|
||||||
def repo_update(repo_path: str, instant_execution=False, no_deps=False,
|
|
||||||
return_postinstall=False) -> ManagedResult
|
|
||||||
|
|
||||||
# Utilities
|
|
||||||
def is_url_like(url: str) -> bool
|
|
||||||
def reload() -> None
|
|
||||||
```
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
### InstalledNodePackage
|
|
||||||
**Location**: `comfyui_manager/common/node_package.py:10`
|
|
||||||
|
|
||||||
```python
|
|
||||||
@dataclass
|
|
||||||
class InstalledNodePackage:
|
|
||||||
# Core Data
|
|
||||||
id: str # Package identifier
|
|
||||||
fullpath: str # Installation path
|
|
||||||
disabled: bool # Disabled state
|
|
||||||
version: str # Version (cnr version, "nightly", or "unknown")
|
|
||||||
repo_url: str = None # Git repository URL (for nightly/unknown)
|
|
||||||
|
|
||||||
# Computed Properties
|
|
||||||
@property
|
|
||||||
def is_unknown(self) -> bool: # version == "unknown"
|
|
||||||
@property
|
|
||||||
def is_nightly(self) -> bool: # version == "nightly"
|
|
||||||
@property
|
|
||||||
def is_from_cnr(self) -> bool: # not unknown and not nightly
|
|
||||||
@property
|
|
||||||
def is_enabled(self) -> bool: # not disabled
|
|
||||||
@property
|
|
||||||
def is_disabled(self) -> bool: # disabled
|
|
||||||
|
|
||||||
# Methods
|
|
||||||
def get_commit_hash(self) -> str
|
|
||||||
def isValid(self) -> bool
|
|
||||||
|
|
||||||
@staticmethod
|
|
||||||
def from_fullpath(fullpath: str, resolve_from_path) -> InstalledNodePackage
|
|
||||||
```
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
### ManagedResult
|
|
||||||
**Location**: `comfyui_manager/glob/manager_core.py:285`
|
|
||||||
|
|
||||||
```python
|
|
||||||
class ManagedResult:
|
|
||||||
def __init__(self, action: str):
|
|
||||||
self.action: str = action # 'install-cnr', 'install-git', 'enable', 'skip', etc.
|
|
||||||
self.result: bool = True # Success/failure
|
|
||||||
self.msg: str = "" # Human readable message
|
|
||||||
self.target: str = None # Target identifier
|
|
||||||
self.postinstall = None # Post-install callback
|
|
||||||
|
|
||||||
# Methods
|
|
||||||
def fail(self, msg: str = "") -> ManagedResult
|
|
||||||
def with_msg(self, msg: str) -> ManagedResult
|
|
||||||
def with_target(self, target: str) -> ManagedResult
|
|
||||||
def with_postinstall(self, postinstall) -> ManagedResult
|
|
||||||
```
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## 🛠️ Standalone Functions
|
|
||||||
|
|
||||||
### Core Manager Functions
|
|
||||||
```python
|
|
||||||
# Snapshot Operations
|
|
||||||
async def save_snapshot_with_postfix(postfix: str, path: str = None,
|
|
||||||
custom_nodes_only: bool = False) -> str
|
|
||||||
|
|
||||||
async def restore_snapshot(snapshot_path: str, git_helper_extras=None) -> None
|
|
||||||
|
|
||||||
# Node Utilities
|
|
||||||
def simple_check_custom_node(url: str) -> str # Returns: 'installed', 'not-installed', 'disabled'
|
|
||||||
|
|
||||||
# Path Utilities
|
|
||||||
def get_custom_nodes_paths() -> list[str]
|
|
||||||
```
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## 🔗 CNR Utilities
|
|
||||||
**Location**: `comfyui_manager/common/cnr_utils.py`
|
|
||||||
|
|
||||||
```python
|
|
||||||
# Essential CNR functions for CLI
|
|
||||||
def get_nodepack(packname: str) -> dict | None
|
|
||||||
# Returns CNR package info or None
|
|
||||||
|
|
||||||
def get_all_nodepackages() -> dict[str, dict]
|
|
||||||
# Returns all CNR packages {package_id: package_info}
|
|
||||||
|
|
||||||
def all_versions_of_node(node_name: str) -> list[dict] | None
|
|
||||||
# Returns version history for a package
|
|
||||||
```
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## 📋 Usage Patterns for CLI Migration
|
|
||||||
|
|
||||||
### 1. Replace Legacy Dict Access
|
|
||||||
```python
|
|
||||||
# ❌ OLD (Legacy way)
|
|
||||||
for k, v in unified_manager.active_nodes.items():
|
|
||||||
version, fullpath = v
|
|
||||||
print(f"Active: {k} @ {version}")
|
|
||||||
|
|
||||||
# ✅ NEW (Glob way)
|
|
||||||
for packages in unified_manager.installed_node_packages.values():
|
|
||||||
for pack in packages:
|
|
||||||
if pack.is_enabled:
|
|
||||||
print(f"Active: {pack.id} @ {pack.version}")
|
|
||||||
```
|
|
||||||
|
|
||||||
### 2. Package Installation
|
|
||||||
```python
|
|
||||||
# CNR Package Installation
|
|
||||||
res = await unified_manager.install_by_id("package-name", "1.0.0",
|
|
||||||
instant_execution=True, no_deps=False)
|
|
||||||
|
|
||||||
# Git URL Installation
|
|
||||||
if unified_manager.is_url_like(url):
|
|
||||||
repo_name = os.path.basename(url).replace('.git', '')
|
|
||||||
res = await unified_manager.repo_install(url, repo_name,
|
|
||||||
instant_execution=True, no_deps=False)
|
|
||||||
```
|
|
||||||
|
|
||||||
### 3. Package State Queries
|
|
||||||
```python
|
|
||||||
# Check if package is active
|
|
||||||
active_pack = unified_manager.get_active_pack("package-name")
|
|
||||||
if active_pack:
|
|
||||||
print(f"Package is enabled: {active_pack.version}")
|
|
||||||
|
|
||||||
# Check if package is inactive
|
|
||||||
inactive_pack = unified_manager.get_inactive_pack("package-name")
|
|
||||||
if inactive_pack:
|
|
||||||
print(f"Package is disabled: {inactive_pack.version}")
|
|
||||||
```
|
|
||||||
|
|
||||||
### 4. CNR Data Access
|
|
||||||
```python
|
|
||||||
# Get CNR package information
|
|
||||||
from ..common import cnr_utils
|
|
||||||
|
|
||||||
cnr_info = cnr_utils.get_nodepack("package-name")
|
|
||||||
if cnr_info:
|
|
||||||
publisher = cnr_info.get('publisher', {}).get('name', 'Unknown')
|
|
||||||
print(f"Publisher: {publisher}")
|
|
||||||
|
|
||||||
# Get all CNR packages (for show not-installed)
|
|
||||||
all_cnr = cnr_utils.get_all_nodepackages()
|
|
||||||
```
|
|
||||||
|
|
||||||
### 5. Result Handling
|
|
||||||
```python
|
|
||||||
res = await unified_manager.install_by_id("package-name")
|
|
||||||
|
|
||||||
if res.action == 'skip':
|
|
||||||
print(f"SKIP: {res.msg}")
|
|
||||||
elif res.action == 'install-cnr' and res.result:
|
|
||||||
print(f"INSTALLED: {res.target}")
|
|
||||||
elif res.action == 'enable' and res.result:
|
|
||||||
print(f"ENABLED: package was already installed")
|
|
||||||
else:
|
|
||||||
print(f"ERROR: {res.msg}")
|
|
||||||
```
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## 🚫 NOT Available in Glob (Handle These)
|
|
||||||
|
|
||||||
### Legacy Functions That Don't Exist:
|
|
||||||
- `get_custom_nodes()` → Use `cnr_utils.get_all_nodepackages()`
|
|
||||||
- `load_nightly()` → Remove or stub
|
|
||||||
- `extract_nodes_from_workflow()` → Remove feature
|
|
||||||
- `gitclone_install()` → Use `repo_install()`
|
|
||||||
|
|
||||||
### Legacy Properties That Don't Exist:
|
|
||||||
- `active_nodes` → Use `installed_node_packages` + filter by `is_enabled`
|
|
||||||
- `cnr_map` → Use `cnr_utils.get_all_nodepackages()`
|
|
||||||
- `cnr_inactive_nodes` → Use `installed_node_packages` + filter by `is_disabled` and `is_from_cnr`
|
|
||||||
- `nightly_inactive_nodes` → Use `installed_node_packages` + filter by `is_disabled` and `is_nightly`
|
|
||||||
- `unknown_active_nodes` → Use `installed_node_packages` + filter by `is_enabled` and `is_unknown`
|
|
||||||
- `unknown_inactive_nodes` → Use `installed_node_packages` + filter by `is_disabled` and `is_unknown`
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## 🔄 Data Migration Examples
|
|
||||||
|
|
||||||
### Show Enabled Packages
|
|
||||||
```python
|
|
||||||
def show_enabled_packages():
|
|
||||||
enabled_packages = []
|
|
||||||
|
|
||||||
# Collect enabled packages
|
|
||||||
for packages in unified_manager.installed_node_packages.values():
|
|
||||||
for pack in packages:
|
|
||||||
if pack.is_enabled:
|
|
||||||
enabled_packages.append(pack)
|
|
||||||
|
|
||||||
# Display with CNR info
|
|
||||||
for pack in enabled_packages:
|
|
||||||
if pack.is_from_cnr:
|
|
||||||
cnr_info = cnr_utils.get_nodepack(pack.id)
|
|
||||||
publisher = cnr_info.get('publisher', {}).get('name', 'Unknown') if cnr_info else 'Unknown'
|
|
||||||
print(f"[ ENABLED ] {pack.id:50} (author: {publisher}) [{pack.version}]")
|
|
||||||
elif pack.is_nightly:
|
|
||||||
print(f"[ ENABLED ] {pack.id:50} (nightly) [NIGHTLY]")
|
|
||||||
else:
|
|
||||||
print(f"[ ENABLED ] {pack.id:50} (unknown) [UNKNOWN]")
|
|
||||||
```
|
|
||||||
|
|
||||||
### Show Not-Installed Packages
|
|
||||||
```python
|
|
||||||
def show_not_installed_packages():
|
|
||||||
# Get installed package IDs
|
|
||||||
installed_ids = set()
|
|
||||||
for packages in unified_manager.installed_node_packages.values():
|
|
||||||
for pack in packages:
|
|
||||||
installed_ids.add(pack.id)
|
|
||||||
|
|
||||||
# Get all CNR packages
|
|
||||||
all_cnr = cnr_utils.get_all_nodepackages()
|
|
||||||
|
|
||||||
# Show not-installed
|
|
||||||
for pack_id, pack_info in all_cnr.items():
|
|
||||||
if pack_id not in installed_ids:
|
|
||||||
publisher = pack_info.get('publisher', {}).get('name', 'Unknown')
|
|
||||||
latest_version = pack_info.get('latest_version', {}).get('version', '0.0.0')
|
|
||||||
print(f"[ NOT INSTALLED ] {pack_info['name']:50} {pack_id:30} (author: {publisher}) [{latest_version}]")
|
|
||||||
```
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## ⚠️ Key Constraints
|
|
||||||
|
|
||||||
1. **NO MODIFICATIONS**: Do not add any functions or properties to glob module
|
|
||||||
2. **USE EXISTING APIs**: Only use the functions and classes documented above
|
|
||||||
3. **ADAPT CLI**: CLI must adapt to glob's data structures and patterns
|
|
||||||
4. **REMOVE IF NEEDED**: Remove features that can't be implemented with available APIs
|
|
||||||
|
|
||||||
This reference should provide everything needed to implement the CLI migration using only existing glob APIs.
|
|
||||||
@@ -1,324 +0,0 @@
|
|||||||
# CLI Glob Migration - Implementation Todo List
|
|
||||||
|
|
||||||
## 📅 Project Timeline: 3.5 Days
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
# 🚀 Phase 1: Initial Setup & Import Changes (0.5 day)
|
|
||||||
|
|
||||||
## Day 1 Morning
|
|
||||||
|
|
||||||
### ✅ Setup and Preparation (30 min)
|
|
||||||
- [ ] Read implementation context file
|
|
||||||
- [ ] Review glob APIs documentation
|
|
||||||
- [ ] Set up development environment
|
|
||||||
- [ ] Create backup of current CLI
|
|
||||||
|
|
||||||
### 🔄 Import Path Changes (1 hour)
|
|
||||||
- [ ] **CRITICAL**: Update import statements in `cm_cli/__main__.py:39-41`
|
|
||||||
```python
|
|
||||||
# Change from:
|
|
||||||
from ..legacy import manager_core as core
|
|
||||||
from ..legacy.manager_core import unified_manager
|
|
||||||
|
|
||||||
# Change to:
|
|
||||||
from ..glob import manager_core as core
|
|
||||||
from ..glob.manager_core import unified_manager
|
|
||||||
```
|
|
||||||
- [ ] Test CLI loads without crashing
|
|
||||||
- [ ] Identify immediate import-related errors
|
|
||||||
|
|
||||||
### 🧪 Initial Testing (30 min)
|
|
||||||
- [ ] Test basic CLI help: `python -m comfyui_manager.cm_cli help`
|
|
||||||
- [ ] Test simple commands that should work: `python -m comfyui_manager.cm_cli show snapshot`
|
|
||||||
- [ ] Document all errors found
|
|
||||||
- [ ] Prioritize fixes needed
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
# ⚙️ Phase 2: Core Function Implementation (2 days)
|
|
||||||
|
|
||||||
## Day 1 Afternoon + Day 2
|
|
||||||
|
|
||||||
### 🛠️ install_node() Function Update (3 hours)
|
|
||||||
**File**: `cm_cli/__main__.py:187-235`
|
|
||||||
**Complexity**: Medium
|
|
||||||
|
|
||||||
#### Tasks:
|
|
||||||
- [ ] **Replace Git URL handling logic**
|
|
||||||
```python
|
|
||||||
# OLD (line ~191):
|
|
||||||
if core.is_valid_url(node_spec_str):
|
|
||||||
res = asyncio.run(core.gitclone_install(node_spec_str, no_deps=cmd_ctx.no_deps))
|
|
||||||
|
|
||||||
# NEW:
|
|
||||||
if unified_manager.is_url_like(node_spec_str):
|
|
||||||
repo_name = os.path.basename(node_spec_str)
|
|
||||||
if repo_name.endswith('.git'):
|
|
||||||
repo_name = repo_name[:-4]
|
|
||||||
res = asyncio.run(unified_manager.repo_install(
|
|
||||||
node_spec_str, repo_name, instant_execution=True, no_deps=cmd_ctx.no_deps
|
|
||||||
))
|
|
||||||
```
|
|
||||||
- [ ] Test Git URL installation
|
|
||||||
- [ ] Test CNR package installation
|
|
||||||
- [ ] Verify error handling works correctly
|
|
||||||
- [ ] Update progress messages if needed
|
|
||||||
|
|
||||||
### 🔍 show_list() Function Rewrite - Installed-Only Approach (3 hours)
|
|
||||||
**File**: `cm_cli/__main__.py:418-534`
|
|
||||||
**Complexity**: High - Complete architectural change
|
|
||||||
**New Approach**: Show only installed nodepacks with on-demand info retrieval
|
|
||||||
|
|
||||||
#### Key Changes:
|
|
||||||
- ❌ Remove: Full cache loading (`get_custom_nodes()`)
|
|
||||||
- ❌ Remove: Support for `show all`, `show not-installed`, `show cnr`
|
|
||||||
- ✅ Add: Lightweight caching system for nodepack metadata
|
|
||||||
- ✅ Add: On-demand CNR API calls for additional info
|
|
||||||
|
|
||||||
#### Tasks:
|
|
||||||
- [ ] **Phase 2A: Lightweight Cache Implementation (1 hour)**
|
|
||||||
```python
|
|
||||||
class NodePackageCache:
|
|
||||||
def __init__(self, cache_file_path: str):
|
|
||||||
self.cache_file = cache_file_path
|
|
||||||
self.cache_data = self._load_cache()
|
|
||||||
|
|
||||||
def get_metadata(self, nodepack_id: str) -> dict:
|
|
||||||
# Get cached metadata or fetch on-demand from CNR
|
|
||||||
|
|
||||||
def update_metadata(self, nodepack_id: str, metadata: dict):
|
|
||||||
# Update cache (called during install)
|
|
||||||
```
|
|
||||||
|
|
||||||
- [ ] **Phase 2B: New show_list Implementation (1.5 hours)**
|
|
||||||
```python
|
|
||||||
def show_list(kind, simple=False):
|
|
||||||
# Validate supported commands
|
|
||||||
if kind not in ['installed', 'enabled', 'disabled']:
|
|
||||||
print(f"Unsupported: 'show {kind}'. Use: installed/enabled/disabled")
|
|
||||||
return
|
|
||||||
|
|
||||||
# Get installed packages only
|
|
||||||
all_packages = []
|
|
||||||
for packages in unified_manager.installed_node_packages.values():
|
|
||||||
all_packages.extend(packages)
|
|
||||||
|
|
||||||
# Filter by status
|
|
||||||
if kind == 'enabled':
|
|
||||||
packages = [pkg for pkg in all_packages if pkg.is_enabled]
|
|
||||||
elif kind == 'disabled':
|
|
||||||
packages = [pkg for pkg in all_packages if not pkg.is_enabled]
|
|
||||||
else: # 'installed'
|
|
||||||
packages = all_packages
|
|
||||||
```
|
|
||||||
|
|
||||||
- [ ] **Phase 2C: On-Demand Display with Cache (0.5 hour)**
|
|
||||||
```python
|
|
||||||
cache = NodePackageCache(cache_file_path)
|
|
||||||
|
|
||||||
for package in packages:
|
|
||||||
# Basic info from InstalledNodePackage
|
|
||||||
status = "[ ENABLED ]" if package.is_enabled else "[ DISABLED ]"
|
|
||||||
|
|
||||||
# Enhanced info from cache or on-demand
|
|
||||||
cached_info = cache.get_metadata(package.id)
|
|
||||||
name = cached_info.get('name', package.id)
|
|
||||||
author = cached_info.get('author', 'Unknown')
|
|
||||||
version = cached_info.get('version', 'Unknown')
|
|
||||||
|
|
||||||
if simple:
|
|
||||||
print(f"{name}@{version}")
|
|
||||||
else:
|
|
||||||
print(f"{status} {name:50} {package.id:30} (author: {author:20}) [{version}]")
|
|
||||||
```
|
|
||||||
|
|
||||||
#### Install-time Cache Update:
|
|
||||||
- [ ] **Update install_node() to populate cache**
|
|
||||||
```python
|
|
||||||
# After successful installation in install_node()
|
|
||||||
if install_success:
|
|
||||||
metadata = cnr_utils.get_nodepackage_info(installed_package.id)
|
|
||||||
cache.update_metadata(installed_package.id, metadata)
|
|
||||||
```
|
|
||||||
|
|
||||||
#### Testing:
|
|
||||||
- [ ] Test `show installed` (enabled + disabled packages)
|
|
||||||
- [ ] Test `show enabled` (only enabled packages)
|
|
||||||
- [ ] Test `show disabled` (only disabled packages)
|
|
||||||
- [ ] Test unsupported commands show helpful error
|
|
||||||
- [ ] Test `simple-show` variants work correctly
|
|
||||||
- [ ] Test cache functionality (create, read, update)
|
|
||||||
- [ ] Test on-demand CNR info retrieval for cache misses
|
|
||||||
|
|
||||||
### 📝 get_all_installed_node_specs() Update (1 hour)
|
|
||||||
**File**: `cm_cli/__main__.py:573-605`
|
|
||||||
**Complexity**: Medium
|
|
||||||
|
|
||||||
#### Tasks:
|
|
||||||
- [ ] **Rewrite using InstalledNodePackage**
|
|
||||||
```python
|
|
||||||
def get_all_installed_node_specs():
|
|
||||||
res = []
|
|
||||||
for packages in unified_manager.installed_node_packages.values():
|
|
||||||
for pack in packages:
|
|
||||||
node_spec_str = f"{pack.id}@{pack.version}"
|
|
||||||
res.append(node_spec_str)
|
|
||||||
return res
|
|
||||||
```
|
|
||||||
- [ ] Test with `update all` command
|
|
||||||
- [ ] Verify node spec format is correct
|
|
||||||
|
|
||||||
### ⚙️ Context Management Updates (1 hour)
|
|
||||||
**File**: `cm_cli/__main__.py:117-134`
|
|
||||||
**Complexity**: Low
|
|
||||||
|
|
||||||
#### Tasks:
|
|
||||||
- [ ] **Remove load_nightly() call**
|
|
||||||
```python
|
|
||||||
def set_channel_mode(self, channel, mode):
|
|
||||||
if mode is not None:
|
|
||||||
self.mode = mode
|
|
||||||
if channel is not None:
|
|
||||||
self.channel = channel
|
|
||||||
|
|
||||||
# OLD: asyncio.run(unified_manager.reload(...))
|
|
||||||
# OLD: asyncio.run(unified_manager.load_nightly(...))
|
|
||||||
|
|
||||||
# NEW: Just reload
|
|
||||||
unified_manager.reload()
|
|
||||||
```
|
|
||||||
- [ ] Test channel/mode switching still works
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
# 🧹 Phase 3: Feature Removal & Final Testing (1 day)
|
|
||||||
|
|
||||||
## Day 3
|
|
||||||
|
|
||||||
### ❌ Remove Unavailable Features (2 hours)
|
|
||||||
**Complexity**: Low
|
|
||||||
|
|
||||||
#### deps-in-workflow Command Removal:
|
|
||||||
- [ ] **Update deps_in_workflow() function** (`cm_cli/__main__.py:1000-1050`)
|
|
||||||
```python
|
|
||||||
@app.command("deps-in-workflow")
|
|
||||||
def deps_in_workflow(...):
|
|
||||||
print("[bold red]ERROR: This feature is not available in the current version.[/bold red]")
|
|
||||||
print("The 'deps-in-workflow' feature has been removed.")
|
|
||||||
print("Please use alternative workflow analysis tools.")
|
|
||||||
sys.exit(1)
|
|
||||||
```
|
|
||||||
- [ ] Test command shows proper error message
|
|
||||||
- [ ] Update help text to reflect removal
|
|
||||||
|
|
||||||
#### install-deps Command Update:
|
|
||||||
- [ ] **Update install_deps() function** (`cm_cli/__main__.py:1203-1250`)
|
|
||||||
```python
|
|
||||||
# Remove extract_nodes_from_workflow usage (line ~1033)
|
|
||||||
# Replace with error handling or alternative approach
|
|
||||||
```
|
|
||||||
- [ ] Test with dependency files
|
|
||||||
|
|
||||||
### 🧪 Comprehensive Testing (4 hours)
|
|
||||||
|
|
||||||
#### Core Command Testing (2 hours):
|
|
||||||
- [ ] **Install Commands**:
|
|
||||||
- [ ] `install <cnr-package>`
|
|
||||||
- [ ] `install <git-url>`
|
|
||||||
- [ ] `install all` (if applicable)
|
|
||||||
|
|
||||||
- [ ] **Uninstall Commands**:
|
|
||||||
- [ ] `uninstall <package>`
|
|
||||||
- [ ] `uninstall all`
|
|
||||||
|
|
||||||
- [ ] **Enable/Disable Commands**:
|
|
||||||
- [ ] `enable <package>`
|
|
||||||
- [ ] `disable <package>`
|
|
||||||
- [ ] `enable all` / `disable all`
|
|
||||||
|
|
||||||
- [ ] **Update Commands**:
|
|
||||||
- [ ] `update <package>`
|
|
||||||
- [ ] `update all`
|
|
||||||
|
|
||||||
#### Show Commands Testing (1 hour):
|
|
||||||
- [ ] `show installed`
|
|
||||||
- [ ] `show enabled`
|
|
||||||
- [ ] `show disabled`
|
|
||||||
- [ ] `show all`
|
|
||||||
- [ ] `show not-installed`
|
|
||||||
- [ ] `simple-show` variants
|
|
||||||
|
|
||||||
#### Advanced Features Testing (1 hour):
|
|
||||||
- [ ] `save-snapshot`
|
|
||||||
- [ ] `restore-snapshot`
|
|
||||||
- [ ] `show snapshot`
|
|
||||||
- [ ] `show snapshot-list`
|
|
||||||
- [ ] `clear`
|
|
||||||
- [ ] `cli-only-mode`
|
|
||||||
|
|
||||||
### 🐛 Bug Fixes & Polish (2 hours)
|
|
||||||
- [ ] Fix any errors found during testing
|
|
||||||
- [ ] Improve error messages
|
|
||||||
- [ ] Ensure output formatting consistency
|
|
||||||
- [ ] Performance optimization if needed
|
|
||||||
- [ ] Code cleanup and comments
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
# 📋 Daily Checklists
|
|
||||||
|
|
||||||
## End of Day 1 Checklist:
|
|
||||||
- [ ] Imports successfully changed
|
|
||||||
- [ ] Basic CLI loading works
|
|
||||||
- [ ] install_node() handles both CNR and Git URLs
|
|
||||||
- [ ] No critical crashes in core functions
|
|
||||||
|
|
||||||
## End of Day 2 Checklist:
|
|
||||||
- [ ] show_list() displays all package types correctly
|
|
||||||
- [ ] get_all_installed_node_specs() works with new data structure
|
|
||||||
- [ ] Context management updated
|
|
||||||
- [ ] Core functionality regression-free
|
|
||||||
|
|
||||||
## End of Day 3 Checklist:
|
|
||||||
- [ ] All CLI commands tested and working
|
|
||||||
- [ ] Removed features show appropriate messages
|
|
||||||
- [ ] Output format acceptable to users
|
|
||||||
- [ ] No glob module modifications made
|
|
||||||
- [ ] Ready for code review
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
# 🎯 Success Criteria
|
|
||||||
|
|
||||||
## Must Pass:
|
|
||||||
- [ ] All core commands functional (install/uninstall/enable/disable/update)
|
|
||||||
- [ ] show commands display accurate information
|
|
||||||
- [ ] No modifications to glob module
|
|
||||||
- [ ] CLI code changes < 200 lines
|
|
||||||
- [ ] No critical regressions
|
|
||||||
|
|
||||||
## Bonus Points:
|
|
||||||
- [ ] Output format matches legacy closely
|
|
||||||
- [ ] Performance equals or exceeds legacy
|
|
||||||
- [ ] Error messages user-friendly
|
|
||||||
- [ ] Code is clean and maintainable
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
# 🚨 Emergency Contacts & Resources
|
|
||||||
|
|
||||||
## If Stuck:
|
|
||||||
1. **Review**: `CLI_PURE_GLOB_MIGRATION_PLAN.md` for detailed technical specs
|
|
||||||
2. **Reference**: `CLI_IMPLEMENTATION_CONTEXT.md` for current state
|
|
||||||
3. **Debug**: Use `print()` statements to understand data structures
|
|
||||||
4. **Fallback**: Implement minimal working version first, polish later
|
|
||||||
|
|
||||||
## Key Files to Reference:
|
|
||||||
- `comfyui_manager/glob/manager_core.py` - UnifiedManager APIs
|
|
||||||
- `comfyui_manager/common/node_package.py` - InstalledNodePackage class
|
|
||||||
- `comfyui_manager/common/cnr_utils.py` - CNR utilities
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
**Remember**: Focus on making it work first, then making it perfect. The constraint is NO glob modifications - CLI must adapt to glob's way of doing things.
|
|
||||||
@@ -1,424 +0,0 @@
|
|||||||
# CLI Migration Guide: Legacy to Glob Module
|
|
||||||
|
|
||||||
**Status**: ✅ Completed (Historical Reference)
|
|
||||||
**Last Updated**: 2025-08-30
|
|
||||||
**Purpose**: Complete guide for migrating ComfyUI Manager CLI from legacy to glob module
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## 📋 Table of Contents
|
|
||||||
|
|
||||||
1. [Overview](#overview)
|
|
||||||
2. [Legacy vs Glob Comparison](#legacy-vs-glob-comparison)
|
|
||||||
3. [Migration Strategy](#migration-strategy)
|
|
||||||
4. [Implementation Details](#implementation-details)
|
|
||||||
5. [Key Constraints](#key-constraints)
|
|
||||||
6. [API Reference](#api-reference-quick)
|
|
||||||
7. [Rollback Plan](#rollback-plan)
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Overview
|
|
||||||
|
|
||||||
### Objective
|
|
||||||
Migrate ComfyUI Manager CLI from legacy module to glob module using **only existing glob APIs** without modifying the glob module itself.
|
|
||||||
|
|
||||||
### Scope
|
|
||||||
- **Target File**: `comfyui_manager/cm_cli/__main__.py` (1305 lines)
|
|
||||||
- **Timeline**: 3.5 days
|
|
||||||
- **Approach**: Minimal CLI changes, maximum compatibility
|
|
||||||
- **Constraint**: ❌ NO glob module modifications
|
|
||||||
|
|
||||||
### Current State
|
|
||||||
```python
|
|
||||||
# Current imports (Lines 39-41)
|
|
||||||
from ..legacy import manager_core as core
|
|
||||||
from ..legacy.manager_core import unified_manager
|
|
||||||
|
|
||||||
# Target imports
|
|
||||||
from ..glob import manager_core as core
|
|
||||||
from ..glob.manager_core import unified_manager
|
|
||||||
```
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Legacy vs Glob Comparison
|
|
||||||
|
|
||||||
### Core Architecture Differences
|
|
||||||
|
|
||||||
#### Legacy Module (Current)
|
|
||||||
**Data Structure**: Dictionary-based global state
|
|
||||||
```python
|
|
||||||
unified_manager.active_nodes # Active nodes dict
|
|
||||||
unified_manager.unknown_active_nodes # Unknown active nodes
|
|
||||||
unified_manager.cnr_inactive_nodes # Inactive CNR nodes
|
|
||||||
unified_manager.nightly_inactive_nodes # Inactive nightly nodes
|
|
||||||
unified_manager.unknown_inactive_nodes # Unknown inactive nodes
|
|
||||||
unified_manager.cnr_map # CNR info mapping
|
|
||||||
```
|
|
||||||
|
|
||||||
#### Glob Module (Target)
|
|
||||||
**Data Structure**: Object-oriented with InstalledNodePackage
|
|
||||||
```python
|
|
||||||
unified_manager.installed_node_packages # dict[str, list[InstalledNodePackage]]
|
|
||||||
unified_manager.repo_nodepack_map # dict[str, InstalledNodePackage]
|
|
||||||
```
|
|
||||||
|
|
||||||
### Method Compatibility Matrix
|
|
||||||
|
|
||||||
| Method | Legacy | Glob | Status | Action |
|
|
||||||
|--------|--------|------|--------|--------|
|
|
||||||
| `unified_enable()` | ✅ | ✅ | Compatible | Direct mapping |
|
|
||||||
| `unified_disable()` | ✅ | ✅ | Compatible | Direct mapping |
|
|
||||||
| `unified_uninstall()` | ✅ | ✅ | Compatible | Direct mapping |
|
|
||||||
| `unified_update()` | ✅ | ✅ | Compatible | Direct mapping |
|
|
||||||
| `install_by_id()` | Sync | Async | Modified | Use asyncio.run() |
|
|
||||||
| `gitclone_install()` | ✅ | ❌ | Replaced | Use repo_install() |
|
|
||||||
| `get_custom_nodes()` | ✅ | ❌ | Removed | Use cnr_utils |
|
|
||||||
| `load_nightly()` | ✅ | ❌ | Removed | Not needed |
|
|
||||||
| `extract_nodes_from_workflow()` | ✅ | ❌ | Removed | Feature removed |
|
|
||||||
|
|
||||||
### InstalledNodePackage Class
|
|
||||||
|
|
||||||
```python
|
|
||||||
@dataclass
|
|
||||||
class InstalledNodePackage:
|
|
||||||
id: str # Package identifier
|
|
||||||
fullpath: str # Full filesystem path
|
|
||||||
disabled: bool # Disabled status
|
|
||||||
version: str # Version (nightly/unknown/x.y.z)
|
|
||||||
repo_url: str = None # Repository URL
|
|
||||||
|
|
||||||
# Properties
|
|
||||||
@property
|
|
||||||
def is_unknown(self) -> bool: return self.version == "unknown"
|
|
||||||
|
|
||||||
@property
|
|
||||||
def is_nightly(self) -> bool: return self.version == "nightly"
|
|
||||||
|
|
||||||
@property
|
|
||||||
def is_from_cnr(self) -> bool: return not (self.is_unknown or self.is_nightly)
|
|
||||||
|
|
||||||
@property
|
|
||||||
def is_enabled(self) -> bool: return not self.disabled
|
|
||||||
|
|
||||||
@property
|
|
||||||
def is_disabled(self) -> bool: return self.disabled
|
|
||||||
```
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Migration Strategy
|
|
||||||
|
|
||||||
### Phase 1: Setup (0.5 day)
|
|
||||||
**Goal**: Basic migration with error identification
|
|
||||||
|
|
||||||
1. **Import Path Changes**
|
|
||||||
```python
|
|
||||||
# Change 2 lines
|
|
||||||
from ..glob import manager_core as core
|
|
||||||
from ..glob.manager_core import unified_manager
|
|
||||||
```
|
|
||||||
|
|
||||||
2. **Initial Testing**
|
|
||||||
- Run basic commands
|
|
||||||
- Identify breaking changes
|
|
||||||
- Document errors
|
|
||||||
|
|
||||||
3. **Error Analysis**
|
|
||||||
- List all affected functions
|
|
||||||
- Categorize by priority
|
|
||||||
- Plan fixes
|
|
||||||
|
|
||||||
### Phase 2: Core Implementation (2 days)
|
|
||||||
**Goal**: Adapt CLI to glob architecture
|
|
||||||
|
|
||||||
1. **install_node() Updates**
|
|
||||||
```python
|
|
||||||
# Replace gitclone_install with repo_install
|
|
||||||
if unified_manager.is_url_like(node_spec_str):
|
|
||||||
res = asyncio.run(unified_manager.repo_install(
|
|
||||||
node_spec_str,
|
|
||||||
os.path.basename(node_spec_str),
|
|
||||||
instant_execution=True,
|
|
||||||
no_deps=cmd_ctx.no_deps
|
|
||||||
))
|
|
||||||
```
|
|
||||||
|
|
||||||
2. **show_list() Rewrite** (Most complex change)
|
|
||||||
- Migrate from dictionary-based to InstalledNodePackage-based
|
|
||||||
- Implement installed-only approach with optional CNR lookup
|
|
||||||
- See [show_list() Implementation](#show_list-implementation) section
|
|
||||||
|
|
||||||
3. **Context Management**
|
|
||||||
- Update get_all_installed_node_specs()
|
|
||||||
- Adapt to new data structures
|
|
||||||
|
|
||||||
4. **Data Structure Migration**
|
|
||||||
- Replace all active_nodes references
|
|
||||||
- Use installed_node_packages instead
|
|
||||||
|
|
||||||
### Phase 3: Final Testing (1 day)
|
|
||||||
**Goal**: Comprehensive validation
|
|
||||||
|
|
||||||
1. **Feature Removal**
|
|
||||||
- Remove deps-in-workflow (not supported)
|
|
||||||
- Stub unsupported features
|
|
||||||
|
|
||||||
2. **Testing**
|
|
||||||
- Test all CLI commands
|
|
||||||
- Verify output format
|
|
||||||
- Check edge cases
|
|
||||||
|
|
||||||
3. **Polish**
|
|
||||||
- Fix bugs
|
|
||||||
- Improve error messages
|
|
||||||
- Update help text
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Implementation Details
|
|
||||||
|
|
||||||
### show_list() Implementation
|
|
||||||
|
|
||||||
**Challenge**: Legacy uses multiple dictionaries, glob uses single InstalledNodePackage collection
|
|
||||||
|
|
||||||
**Solution**: Installed-only approach with on-demand CNR lookup
|
|
||||||
|
|
||||||
```python
|
|
||||||
def show_list(kind: str, simple: bool = False):
|
|
||||||
"""
|
|
||||||
Display node package list
|
|
||||||
|
|
||||||
Args:
|
|
||||||
kind: 'installed', 'enabled', 'disabled', 'all'
|
|
||||||
simple: If True, show simple format
|
|
||||||
"""
|
|
||||||
|
|
||||||
# Get all installed packages
|
|
||||||
all_packages = []
|
|
||||||
for packages in unified_manager.installed_node_packages.values():
|
|
||||||
all_packages.extend(packages)
|
|
||||||
|
|
||||||
# Filter by kind
|
|
||||||
if kind == "enabled":
|
|
||||||
packages = [p for p in all_packages if p.is_enabled]
|
|
||||||
elif kind == "disabled":
|
|
||||||
packages = [p for p in all_packages if p.is_disabled]
|
|
||||||
elif kind == "installed" or kind == "all":
|
|
||||||
packages = all_packages
|
|
||||||
else:
|
|
||||||
print(f"Unknown kind: {kind}")
|
|
||||||
return
|
|
||||||
|
|
||||||
# Display
|
|
||||||
if simple:
|
|
||||||
for pkg in packages:
|
|
||||||
print(pkg.id)
|
|
||||||
else:
|
|
||||||
# Detailed display with CNR info on-demand
|
|
||||||
for pkg in packages:
|
|
||||||
status = "disabled" if pkg.disabled else "enabled"
|
|
||||||
version_info = f"v{pkg.version}" if pkg.version != "unknown" else "unknown"
|
|
||||||
|
|
||||||
print(f"[{status}] {pkg.id} ({version_info})")
|
|
||||||
|
|
||||||
# Optionally fetch CNR info for non-nightly packages
|
|
||||||
if pkg.is_from_cnr and not simple:
|
|
||||||
cnr_info = cnr_utils.get_nodepackage(pkg.id)
|
|
||||||
if cnr_info:
|
|
||||||
print(f" Description: {cnr_info.get('description', 'N/A')}")
|
|
||||||
```
|
|
||||||
|
|
||||||
**Key Changes**:
|
|
||||||
1. Single source of truth: `installed_node_packages`
|
|
||||||
2. No separate active/inactive dictionaries
|
|
||||||
3. On-demand CNR lookup instead of pre-cached cnr_map
|
|
||||||
4. Filter by InstalledNodePackage properties
|
|
||||||
|
|
||||||
### Git Installation Migration
|
|
||||||
|
|
||||||
**Before (Legacy)**:
|
|
||||||
```python
|
|
||||||
if core.is_valid_url(node_spec_str):
|
|
||||||
res = asyncio.run(core.gitclone_install(
|
|
||||||
node_spec_str,
|
|
||||||
no_deps=cmd_ctx.no_deps
|
|
||||||
))
|
|
||||||
```
|
|
||||||
|
|
||||||
**After (Glob)**:
|
|
||||||
```python
|
|
||||||
if unified_manager.is_url_like(node_spec_str):
|
|
||||||
res = asyncio.run(unified_manager.repo_install(
|
|
||||||
node_spec_str,
|
|
||||||
os.path.basename(node_spec_str), # repo_path derived from URL
|
|
||||||
instant_execution=True, # Execute immediately
|
|
||||||
no_deps=cmd_ctx.no_deps # Respect --no-deps flag
|
|
||||||
))
|
|
||||||
```
|
|
||||||
|
|
||||||
### Async Function Handling
|
|
||||||
|
|
||||||
**Pattern**: Wrap async glob methods with asyncio.run()
|
|
||||||
|
|
||||||
```python
|
|
||||||
# install_by_id is async in glob
|
|
||||||
res = asyncio.run(unified_manager.install_by_id(
|
|
||||||
packname=node_name,
|
|
||||||
version_spec=version,
|
|
||||||
instant_execution=True,
|
|
||||||
no_deps=cmd_ctx.no_deps
|
|
||||||
))
|
|
||||||
```
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Key Constraints
|
|
||||||
|
|
||||||
### Hard Constraints (Cannot Change)
|
|
||||||
1. ❌ **No glob module modifications**
|
|
||||||
- Cannot add new methods to UnifiedManager
|
|
||||||
- Cannot add compatibility properties
|
|
||||||
- Must use existing APIs only
|
|
||||||
|
|
||||||
2. ❌ **No legacy dependencies**
|
|
||||||
- CLI must work without legacy module
|
|
||||||
- Clean break from old architecture
|
|
||||||
|
|
||||||
3. ❌ **Maintain CLI interface**
|
|
||||||
- Command syntax unchanged
|
|
||||||
- Output format similar (minor differences acceptable)
|
|
||||||
|
|
||||||
### Soft Constraints (Acceptable Trade-offs)
|
|
||||||
1. ✅ **Feature removal acceptable**
|
|
||||||
- deps-in-workflow feature can be removed
|
|
||||||
- Channel/mode support can be simplified
|
|
||||||
|
|
||||||
2. ✅ **Performance trade-offs acceptable**
|
|
||||||
- On-demand CNR lookup vs pre-cached
|
|
||||||
- Slight performance degradation acceptable
|
|
||||||
|
|
||||||
3. ✅ **Output format flexibility**
|
|
||||||
- Minor formatting differences acceptable
|
|
||||||
- Must remain readable and useful
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## API Reference (Quick)
|
|
||||||
|
|
||||||
### UnifiedManager Core Methods
|
|
||||||
|
|
||||||
```python
|
|
||||||
# Installation
|
|
||||||
async def install_by_id(packname, version_spec, instant_execution, no_deps) -> ManagedResult
|
|
||||||
|
|
||||||
# Git/URL installation
|
|
||||||
async def repo_install(url, repo_path, instant_execution, no_deps) -> ManagedResult
|
|
||||||
|
|
||||||
# Enable/Disable
|
|
||||||
def unified_enable(packname, version_spec=None) -> ManagedResult
|
|
||||||
def unified_disable(packname) -> ManagedResult
|
|
||||||
|
|
||||||
# Update/Uninstall
|
|
||||||
def unified_update(packname, instant_execution, no_deps) -> ManagedResult
|
|
||||||
def unified_uninstall(packname) -> ManagedResult
|
|
||||||
|
|
||||||
# Query
|
|
||||||
def get_active_pack(packname) -> InstalledNodePackage | None
|
|
||||||
def get_inactive_pack(packname, version_spec) -> InstalledNodePackage | None
|
|
||||||
def resolve_node_spec(packname, guess_mode) -> NodeSpec
|
|
||||||
|
|
||||||
# Utility
|
|
||||||
def is_url_like(text) -> bool
|
|
||||||
```
|
|
||||||
|
|
||||||
### Data Access
|
|
||||||
|
|
||||||
```python
|
|
||||||
# Installed packages
|
|
||||||
unified_manager.installed_node_packages: dict[str, list[InstalledNodePackage]]
|
|
||||||
|
|
||||||
# Repository mapping
|
|
||||||
unified_manager.repo_nodepack_map: dict[str, InstalledNodePackage]
|
|
||||||
```
|
|
||||||
|
|
||||||
### External Utilities
|
|
||||||
|
|
||||||
```python
|
|
||||||
# CNR utilities
|
|
||||||
from ..common import cnr_utils
|
|
||||||
cnr_utils.get_nodepackage(id) -> dict
|
|
||||||
cnr_utils.get_all_nodepackages() -> list[dict]
|
|
||||||
```
|
|
||||||
|
|
||||||
For complete API reference, see [CLI_API_REFERENCE.md](CLI_API_REFERENCE.md)
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Rollback Plan
|
|
||||||
|
|
||||||
### If Migration Fails
|
|
||||||
|
|
||||||
1. **Immediate Rollback** (< 5 minutes)
|
|
||||||
```python
|
|
||||||
# Revert imports in __main__.py
|
|
||||||
from ..legacy import manager_core as core
|
|
||||||
from ..legacy.manager_core import unified_manager
|
|
||||||
```
|
|
||||||
|
|
||||||
2. **Verify Rollback**
|
|
||||||
```bash
|
|
||||||
# Test basic commands
|
|
||||||
cm-cli show installed
|
|
||||||
cm-cli install <package>
|
|
||||||
```
|
|
||||||
|
|
||||||
3. **Document Issues**
|
|
||||||
- Note what failed
|
|
||||||
- Gather error logs
|
|
||||||
- Plan fixes
|
|
||||||
|
|
||||||
### Risk Mitigation
|
|
||||||
|
|
||||||
1. **Backup**: Keep legacy module available
|
|
||||||
2. **Testing**: Comprehensive test suite before deployment
|
|
||||||
3. **Staging**: Test in non-production environment first
|
|
||||||
4. **Monitoring**: Watch for errors after deployment
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Success Criteria
|
|
||||||
|
|
||||||
### Must Pass (Blockers)
|
|
||||||
- ✅ All core commands functional (install, update, enable, disable, uninstall)
|
|
||||||
- ✅ Package information displays correctly
|
|
||||||
- ✅ No glob module modifications
|
|
||||||
- ✅ No critical regressions
|
|
||||||
|
|
||||||
### Should Pass (Important)
|
|
||||||
- ✅ Output format similar to legacy
|
|
||||||
- ✅ Performance comparable to legacy
|
|
||||||
- ✅ User-friendly error messages
|
|
||||||
- ✅ Help text updated
|
|
||||||
|
|
||||||
### Nice to Have
|
|
||||||
- ✅ Improved code structure
|
|
||||||
- ✅ Better error handling
|
|
||||||
- ✅ Type hints added
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Reference Documents
|
|
||||||
|
|
||||||
- **[CLI_API_REFERENCE.md](CLI_API_REFERENCE.md)** - Complete API documentation
|
|
||||||
- **[CLI_IMPLEMENTATION_CHECKLIST.md](CLI_IMPLEMENTATION_CHECKLIST.md)** - Step-by-step tasks
|
|
||||||
- **[CLI_TESTING_GUIDE.md](CLI_TESTING_GUIDE.md)** - Testing strategy
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Conclusion
|
|
||||||
|
|
||||||
The CLI migration from legacy to glob module is achievable through systematic adaptation of CLI code to glob's object-oriented architecture. The key is respecting the constraint of no glob modifications while leveraging existing glob APIs effectively.
|
|
||||||
|
|
||||||
**Status**: This migration has been completed successfully. The CLI now uses glob module exclusively.
|
|
||||||
@@ -1,407 +0,0 @@
|
|||||||
# CLI Migration Testing Checklist
|
|
||||||
|
|
||||||
## 🧪 Testing Strategy Overview
|
|
||||||
**Approach**: Progressive testing at each implementation phase
|
|
||||||
**Tools**: Manual CLI testing, comparison with legacy behavior
|
|
||||||
**Environment**: ComfyUI development environment with test packages
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
# 📋 Phase 1 Testing (Import Changes)
|
|
||||||
|
|
||||||
## ✅ Basic CLI Loading (Must Pass)
|
|
||||||
```bash
|
|
||||||
# Test CLI loads without import errors
|
|
||||||
python -m comfyui_manager.cm_cli --help
|
|
||||||
python -m comfyui_manager.cm_cli help
|
|
||||||
|
|
||||||
# Expected: CLI help displays, no ImportError exceptions
|
|
||||||
```
|
|
||||||
|
|
||||||
## ✅ Simple Command Smoke Tests
|
|
||||||
```bash
|
|
||||||
# Commands that should work immediately
|
|
||||||
python -m comfyui_manager.cm_cli show snapshot
|
|
||||||
python -m comfyui_manager.cm_cli clear
|
|
||||||
|
|
||||||
# Expected: Commands execute, may show different output but no crashes
|
|
||||||
```
|
|
||||||
|
|
||||||
## 🐛 Error Identification
|
|
||||||
- [ ] Document all import-related errors
|
|
||||||
- [ ] Identify which functions fail immediately
|
|
||||||
- [ ] Note any missing attributes/methods used by CLI
|
|
||||||
- [ ] List functions that need immediate attention
|
|
||||||
|
|
||||||
**Pass Criteria**: CLI loads and basic commands don't crash
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
# 🔧 Phase 2 Testing (Core Functions)
|
|
||||||
|
|
||||||
## 🚀 Install Command Testing
|
|
||||||
|
|
||||||
### CNR Package Installation
|
|
||||||
```bash
|
|
||||||
# Test CNR package installation
|
|
||||||
python -m comfyui_manager.cm_cli install ComfyUI-Manager
|
|
||||||
python -m comfyui_manager.cm_cli install <known-cnr-package>
|
|
||||||
|
|
||||||
# Expected behaviors:
|
|
||||||
# - Package resolves correctly
|
|
||||||
# - Installation proceeds
|
|
||||||
# - Success/failure message displayed
|
|
||||||
# - Package appears in enabled state
|
|
||||||
```
|
|
||||||
**Test Cases**:
|
|
||||||
- [ ] Install new CNR package
|
|
||||||
- [ ] Install already-installed package (should skip)
|
|
||||||
- [ ] Install non-existent package (should error gracefully)
|
|
||||||
- [ ] Install with `--no-deps` flag
|
|
||||||
|
|
||||||
### Git URL Installation
|
|
||||||
```bash
|
|
||||||
# Test Git URL installation
|
|
||||||
python -m comfyui_manager.cm_cli install https://github.com/user/repo.git
|
|
||||||
python -m comfyui_manager.cm_cli install https://github.com/user/repo
|
|
||||||
|
|
||||||
# Expected behaviors:
|
|
||||||
# - URL detected as Git repository
|
|
||||||
# - repo_install() method called
|
|
||||||
# - Installation proceeds or fails gracefully
|
|
||||||
```
|
|
||||||
**Test Cases**:
|
|
||||||
- [ ] Install from Git URL with .git suffix
|
|
||||||
- [ ] Install from Git URL without .git suffix
|
|
||||||
- [ ] Install from invalid Git URL (should error)
|
|
||||||
- [ ] Install from private repository (may fail gracefully)
|
|
||||||
|
|
||||||
## 📊 Show Commands Testing
|
|
||||||
|
|
||||||
### Show Installed/Enabled
|
|
||||||
```bash
|
|
||||||
python -m comfyui_manager.cm_cli show installed
|
|
||||||
python -m comfyui_manager.cm_cli show enabled
|
|
||||||
|
|
||||||
# Expected: List of enabled packages with:
|
|
||||||
# - Package names
|
|
||||||
# - Version information
|
|
||||||
# - Author/publisher info where available
|
|
||||||
# - Correct status indicators
|
|
||||||
```
|
|
||||||
|
|
||||||
### Show Disabled/Not-Installed
|
|
||||||
```bash
|
|
||||||
python -m comfyui_manager.cm_cli show disabled
|
|
||||||
python -m comfyui_manager.cm_cli show not-installed
|
|
||||||
|
|
||||||
# Expected: Appropriate package lists with status
|
|
||||||
```
|
|
||||||
|
|
||||||
### Show All & Simple Mode
|
|
||||||
```bash
|
|
||||||
python -m comfyui_manager.cm_cli show all
|
|
||||||
python -m comfyui_manager.cm_cli simple-show all
|
|
||||||
|
|
||||||
# Expected: Comprehensive package list
|
|
||||||
# Simple mode should show condensed format
|
|
||||||
```
|
|
||||||
|
|
||||||
**Detailed Test Matrix**:
|
|
||||||
- [ ] `show installed` - displays all installed packages
|
|
||||||
- [ ] `show enabled` - displays only enabled packages
|
|
||||||
- [ ] `show disabled` - displays only disabled packages
|
|
||||||
- [ ] `show not-installed` - displays available but not installed packages
|
|
||||||
- [ ] `show all` - displays comprehensive list
|
|
||||||
- [ ] `show cnr` - displays CNR packages only
|
|
||||||
- [ ] `simple-show` variants - condensed output format
|
|
||||||
|
|
||||||
**Validation Criteria**:
|
|
||||||
- [ ] Package counts make sense (enabled + disabled = installed)
|
|
||||||
- [ ] CNR packages show publisher information
|
|
||||||
- [ ] Nightly packages marked appropriately
|
|
||||||
- [ ] Unknown packages handled correctly
|
|
||||||
- [ ] No crashes with empty package sets
|
|
||||||
|
|
||||||
## ⚙️ Management Commands Testing
|
|
||||||
|
|
||||||
### Enable/Disable Commands
|
|
||||||
```bash
|
|
||||||
# Enable disabled package
|
|
||||||
python -m comfyui_manager.cm_cli disable <package-name>
|
|
||||||
python -m comfyui_manager.cm_cli show disabled # Should appear
|
|
||||||
python -m comfyui_manager.cm_cli enable <package-name>
|
|
||||||
python -m comfyui_manager.cm_cli show enabled # Should appear
|
|
||||||
|
|
||||||
# Test edge cases
|
|
||||||
python -m comfyui_manager.cm_cli enable <already-enabled-package> # Should skip
|
|
||||||
python -m comfyui_manager.cm_cli disable <non-existent-package> # Should error
|
|
||||||
```
|
|
||||||
|
|
||||||
**Test Cases**:
|
|
||||||
- [ ] Enable disabled package
|
|
||||||
- [ ] Disable enabled package
|
|
||||||
- [ ] Enable already-enabled package (skip)
|
|
||||||
- [ ] Disable already-disabled package (skip)
|
|
||||||
- [ ] Enable non-existent package (error)
|
|
||||||
- [ ] Disable non-existent package (error)
|
|
||||||
|
|
||||||
### Uninstall Commands
|
|
||||||
```bash
|
|
||||||
# Uninstall package
|
|
||||||
python -m comfyui_manager.cm_cli uninstall <test-package>
|
|
||||||
python -m comfyui_manager.cm_cli show installed # Should not appear
|
|
||||||
|
|
||||||
# Test variations
|
|
||||||
python -m comfyui_manager.cm_cli uninstall <package>@unknown
|
|
||||||
```
|
|
||||||
|
|
||||||
**Test Cases**:
|
|
||||||
- [ ] Uninstall CNR package
|
|
||||||
- [ ] Uninstall nightly package
|
|
||||||
- [ ] Uninstall unknown package
|
|
||||||
- [ ] Uninstall non-existent package (should error gracefully)
|
|
||||||
|
|
||||||
### Update Commands
|
|
||||||
```bash
|
|
||||||
# Update specific package
|
|
||||||
python -m comfyui_manager.cm_cli update <package-name>
|
|
||||||
|
|
||||||
# Update all packages
|
|
||||||
python -m comfyui_manager.cm_cli update all
|
|
||||||
```
|
|
||||||
|
|
||||||
**Test Cases**:
|
|
||||||
- [ ] Update single package
|
|
||||||
- [ ] Update all packages
|
|
||||||
- [ ] Update non-existent package (should error)
|
|
||||||
- [ ] Update already up-to-date package (should skip)
|
|
||||||
|
|
||||||
## 🗃️ Advanced Function Testing
|
|
||||||
|
|
||||||
### get_all_installed_node_specs()
|
|
||||||
```bash
|
|
||||||
# This function is used internally by update/enable/disable "all" commands
|
|
||||||
python -m comfyui_manager.cm_cli update all
|
|
||||||
python -m comfyui_manager.cm_cli enable all
|
|
||||||
python -m comfyui_manager.cm_cli disable all
|
|
||||||
|
|
||||||
# Expected: Commands process all installed packages
|
|
||||||
```
|
|
||||||
|
|
||||||
**Validation**:
|
|
||||||
- [ ] "all" commands process expected number of packages
|
|
||||||
- [ ] Package specs format correctly (name@version)
|
|
||||||
- [ ] No duplicates in package list
|
|
||||||
- [ ] All package types included (CNR, nightly, unknown)
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
# 🧹 Phase 3 Testing (Feature Removal & Polish)
|
|
||||||
|
|
||||||
## ❌ Removed Feature Testing
|
|
||||||
|
|
||||||
### deps-in-workflow Command
|
|
||||||
```bash
|
|
||||||
python -m comfyui_manager.cm_cli deps-in-workflow workflow.json deps.json
|
|
||||||
|
|
||||||
# Expected: Clear error message explaining feature removal
|
|
||||||
# Should NOT crash or show confusing errors
|
|
||||||
```
|
|
||||||
|
|
||||||
### install-deps Command (if affected)
|
|
||||||
```bash
|
|
||||||
python -m comfyui_manager.cm_cli install-deps deps.json
|
|
||||||
|
|
||||||
# Expected: Either works with alternative implementation or shows clear error
|
|
||||||
```
|
|
||||||
|
|
||||||
**Validation**:
|
|
||||||
- [ ] Error messages are user-friendly
|
|
||||||
- [ ] No stack traces for removed features
|
|
||||||
- [ ] Help text updated to reflect changes
|
|
||||||
- [ ] Alternative solutions mentioned where applicable
|
|
||||||
|
|
||||||
## 📸 Snapshot Functionality
|
|
||||||
|
|
||||||
### Save/Restore Snapshots
|
|
||||||
```bash
|
|
||||||
# Save snapshot
|
|
||||||
python -m comfyui_manager.cm_cli save-snapshot test-snapshot.json
|
|
||||||
ls snapshots/ # Should show new snapshot
|
|
||||||
|
|
||||||
# Restore snapshot
|
|
||||||
python -m comfyui_manager.cm_cli restore-snapshot test-snapshot.json
|
|
||||||
```
|
|
||||||
|
|
||||||
**Test Cases**:
|
|
||||||
- [ ] Save snapshot to default location
|
|
||||||
- [ ] Save snapshot to custom path
|
|
||||||
- [ ] Restore snapshot successfully
|
|
||||||
- [ ] Handle invalid snapshot files gracefully
|
|
||||||
|
|
||||||
### Snapshot Display
|
|
||||||
```bash
|
|
||||||
python -m comfyui_manager.cm_cli show snapshot
|
|
||||||
python -m comfyui_manager.cm_cli show snapshot-list
|
|
||||||
```
|
|
||||||
|
|
||||||
**Validation**:
|
|
||||||
- [ ] Current state displayed correctly
|
|
||||||
- [ ] Snapshot list shows available snapshots
|
|
||||||
- [ ] JSON format valid and readable
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
# 🎯 Comprehensive Integration Testing
|
|
||||||
|
|
||||||
## 🔄 End-to-End Workflows
|
|
||||||
|
|
||||||
### Complete Package Lifecycle
|
|
||||||
```bash
|
|
||||||
# 1. Install package
|
|
||||||
python -m comfyui_manager.cm_cli install <test-package>
|
|
||||||
|
|
||||||
# 2. Verify installation
|
|
||||||
python -m comfyui_manager.cm_cli show enabled | grep <test-package>
|
|
||||||
|
|
||||||
# 3. Disable package
|
|
||||||
python -m comfyui_manager.cm_cli disable <test-package>
|
|
||||||
|
|
||||||
# 4. Verify disabled
|
|
||||||
python -m comfyui_manager.cm_cli show disabled | grep <test-package>
|
|
||||||
|
|
||||||
# 5. Re-enable package
|
|
||||||
python -m comfyui_manager.cm_cli enable <test-package>
|
|
||||||
|
|
||||||
# 6. Update package
|
|
||||||
python -m comfyui_manager.cm_cli update <test-package>
|
|
||||||
|
|
||||||
# 7. Uninstall package
|
|
||||||
python -m comfyui_manager.cm_cli uninstall <test-package>
|
|
||||||
|
|
||||||
# 8. Verify removal
|
|
||||||
python -m comfyui_manager.cm_cli show installed | grep <test-package> # Should be empty
|
|
||||||
```
|
|
||||||
|
|
||||||
### Batch Operations
|
|
||||||
```bash
|
|
||||||
# Install multiple packages
|
|
||||||
python -m comfyui_manager.cm_cli install package1 package2 package3
|
|
||||||
|
|
||||||
# Disable all packages
|
|
||||||
python -m comfyui_manager.cm_cli disable all
|
|
||||||
|
|
||||||
# Enable all packages
|
|
||||||
python -m comfyui_manager.cm_cli enable all
|
|
||||||
|
|
||||||
# Update all packages
|
|
||||||
python -m comfyui_manager.cm_cli update all
|
|
||||||
```
|
|
||||||
|
|
||||||
## 🚨 Error Condition Testing
|
|
||||||
|
|
||||||
### Network/Connectivity Issues
|
|
||||||
- [ ] Test with no internet connection
|
|
||||||
- [ ] Test with slow internet connection
|
|
||||||
- [ ] Test with CNR API unavailable
|
|
||||||
|
|
||||||
### File System Issues
|
|
||||||
- [ ] Test with insufficient disk space
|
|
||||||
- [ ] Test with permission errors
|
|
||||||
- [ ] Test with corrupted package directories
|
|
||||||
|
|
||||||
### Invalid Input Handling
|
|
||||||
- [ ] Non-existent package names
|
|
||||||
- [ ] Invalid Git URLs
|
|
||||||
- [ ] Malformed command arguments
|
|
||||||
- [ ] Special characters in package names
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
# 📊 Performance & Regression Testing
|
|
||||||
|
|
||||||
## ⚡ Performance Comparison
|
|
||||||
```bash
|
|
||||||
# Time core operations
|
|
||||||
time python -m comfyui_manager.cm_cli show all
|
|
||||||
time python -m comfyui_manager.cm_cli install <test-package>
|
|
||||||
time python -m comfyui_manager.cm_cli update all
|
|
||||||
|
|
||||||
# Compare with legacy timings if available
|
|
||||||
```
|
|
||||||
|
|
||||||
**Validation**:
|
|
||||||
- [ ] Operations complete in reasonable time
|
|
||||||
- [ ] No significant performance regression
|
|
||||||
- [ ] Memory usage acceptable
|
|
||||||
|
|
||||||
## 🔄 Regression Testing
|
|
||||||
|
|
||||||
### Output Format Comparison
|
|
||||||
- [ ] Compare show command output with legacy version
|
|
||||||
- [ ] Document acceptable format differences
|
|
||||||
- [ ] Ensure essential information preserved
|
|
||||||
|
|
||||||
### Behavioral Consistency
|
|
||||||
- [ ] Command success/failure behavior matches legacy
|
|
||||||
- [ ] Error message quality comparable to legacy
|
|
||||||
- [ ] User experience remains smooth
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
# ✅ Final Validation Checklist
|
|
||||||
|
|
||||||
## Must Pass (Blockers)
|
|
||||||
- [ ] All core commands functional (install/uninstall/enable/disable/update)
|
|
||||||
- [ ] Show commands display accurate package information
|
|
||||||
- [ ] No crashes or unhandled exceptions
|
|
||||||
- [ ] No modifications to glob module
|
|
||||||
- [ ] CLI loads and responds to help commands
|
|
||||||
|
|
||||||
## Should Pass (Important)
|
|
||||||
- [ ] Output format reasonably similar to legacy
|
|
||||||
- [ ] Performance comparable to legacy
|
|
||||||
- [ ] Error handling graceful and informative
|
|
||||||
- [ ] Removed features clearly communicated
|
|
||||||
|
|
||||||
## May Pass (Nice to Have)
|
|
||||||
- [ ] Output format identical to legacy
|
|
||||||
- [ ] Performance better than legacy
|
|
||||||
- [ ] Additional error recovery features
|
|
||||||
- [ ] Code improvements and cleanup
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
# 🧰 Testing Tools & Commands
|
|
||||||
|
|
||||||
## Essential Test Commands
|
|
||||||
```bash
|
|
||||||
# Quick smoke test
|
|
||||||
python -m comfyui_manager.cm_cli --help
|
|
||||||
|
|
||||||
# Core functionality test
|
|
||||||
python -m comfyui_manager.cm_cli show all
|
|
||||||
|
|
||||||
# Package management test
|
|
||||||
python -m comfyui_manager.cm_cli install <safe-test-package>
|
|
||||||
|
|
||||||
# Cleanup test
|
|
||||||
python -m comfyui_manager.cm_cli uninstall <test-package>
|
|
||||||
```
|
|
||||||
|
|
||||||
## Debug Commands
|
|
||||||
```bash
|
|
||||||
# Check Python imports
|
|
||||||
python -c "from comfyui_manager.glob import manager_core; print('OK')"
|
|
||||||
|
|
||||||
# Check data structures
|
|
||||||
python -c "from comfyui_manager.glob.manager_core import unified_manager; print(len(unified_manager.installed_node_packages))"
|
|
||||||
|
|
||||||
# Check CNR access
|
|
||||||
python -c "from comfyui_manager.common import cnr_utils; print(len(cnr_utils.get_all_nodepackages()))"
|
|
||||||
```
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
Use this checklist systematically during implementation to ensure comprehensive testing and validation of the CLI migration.
|
|
||||||
@@ -1,184 +0,0 @@
|
|||||||
# CLI Migration Documentation
|
|
||||||
|
|
||||||
**Status**: ✅ Completed (Historical Reference)
|
|
||||||
**Last Updated**: 2025-11-04
|
|
||||||
**Purpose**: Documentation for CLI migration from legacy to glob module (completed August 2025)
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## 📁 Directory Overview
|
|
||||||
|
|
||||||
This directory contains consolidated documentation for the ComfyUI Manager CLI migration project. The migration successfully moved the CLI from the legacy module to the glob module without modifying glob module code.
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## 📚 Documentation Files
|
|
||||||
|
|
||||||
### 🎯 **Comprehensive Guide**
|
|
||||||
- **[CLI_MIGRATION_GUIDE.md](CLI_MIGRATION_GUIDE.md)** (~800 lines)
|
|
||||||
- Complete migration guide with all technical details
|
|
||||||
- Legacy vs Glob comparison
|
|
||||||
- Implementation strategies
|
|
||||||
- Code examples and patterns
|
|
||||||
- **Read this first** for complete understanding
|
|
||||||
|
|
||||||
### 📖 **Implementation Resources**
|
|
||||||
- **[CLI_IMPLEMENTATION_CHECKLIST.md](CLI_IMPLEMENTATION_CHECKLIST.md)** (~350 lines)
|
|
||||||
- Step-by-step implementation tasks
|
|
||||||
- Daily breakdown (3.5 days)
|
|
||||||
- Testing checkpoints
|
|
||||||
- Completion criteria
|
|
||||||
|
|
||||||
- **[CLI_API_REFERENCE.md](CLI_API_REFERENCE.md)** (~300 lines)
|
|
||||||
- Quick API lookup guide
|
|
||||||
- UnifiedManager methods
|
|
||||||
- InstalledNodePackage structure
|
|
||||||
- Usage examples
|
|
||||||
|
|
||||||
- **[CLI_TESTING_GUIDE.md](CLI_TESTING_GUIDE.md)** (~400 lines)
|
|
||||||
- Comprehensive testing strategy
|
|
||||||
- Test scenarios and cases
|
|
||||||
- Validation procedures
|
|
||||||
- Rollback planning
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## 🚀 Quick Start (For Reference)
|
|
||||||
|
|
||||||
### Understanding the Migration
|
|
||||||
|
|
||||||
1. **Start Here**: [CLI_MIGRATION_GUIDE.md](CLI_MIGRATION_GUIDE.md)
|
|
||||||
- Read sections: Overview → Legacy vs Glob → Migration Strategy
|
|
||||||
|
|
||||||
2. **API Reference**: [CLI_API_REFERENCE.md](CLI_API_REFERENCE.md)
|
|
||||||
- Use for quick API lookups during implementation
|
|
||||||
|
|
||||||
3. **Implementation**: [CLI_IMPLEMENTATION_CHECKLIST.md](CLI_IMPLEMENTATION_CHECKLIST.md)
|
|
||||||
- Follow step-by-step if re-implementing
|
|
||||||
|
|
||||||
4. **Testing**: [CLI_TESTING_GUIDE.md](CLI_TESTING_GUIDE.md)
|
|
||||||
- Reference for validation procedures
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## 🎯 Migration Summary
|
|
||||||
|
|
||||||
### Objective Achieved
|
|
||||||
✅ Migrated CLI from `..legacy` to `..glob` imports using only existing glob APIs
|
|
||||||
|
|
||||||
### Key Accomplishments
|
|
||||||
- ✅ **Single file modified**: `comfyui_manager/cm_cli/__main__.py`
|
|
||||||
- ✅ **No glob modifications**: Used existing APIs only
|
|
||||||
- ✅ **All commands functional**: install, update, enable, disable, uninstall
|
|
||||||
- ✅ **show_list() rewritten**: Adapted to InstalledNodePackage architecture
|
|
||||||
- ✅ **Completed in**: 3.5 days as planned
|
|
||||||
|
|
||||||
### Major Changes
|
|
||||||
1. Import path updates (2 lines)
|
|
||||||
2. `install_node()` → use `repo_install()` for Git URLs
|
|
||||||
3. `show_list()` → rewritten for InstalledNodePackage
|
|
||||||
4. Data structure migration: dictionaries → objects
|
|
||||||
5. Removed unsupported features (deps-in-workflow)
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## 📋 File Organization
|
|
||||||
|
|
||||||
```
|
|
||||||
docs/internal/cli_migration/
|
|
||||||
├── README.md (This file - Quick navigation)
|
|
||||||
├── CLI_MIGRATION_GUIDE.md (Complete guide - 800 lines)
|
|
||||||
├── CLI_IMPLEMENTATION_CHECKLIST.md (Task breakdown - 350 lines)
|
|
||||||
├── CLI_API_REFERENCE.md (API docs - 300 lines)
|
|
||||||
└── CLI_TESTING_GUIDE.md (Testing guide - 400 lines)
|
|
||||||
|
|
||||||
Total: 5 files, ~1,850 lines (consolidated from 9 files, ~2,400 lines)
|
|
||||||
```
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## ✨ Documentation Improvements
|
|
||||||
|
|
||||||
### Before Consolidation (9 files)
|
|
||||||
- ❌ Duplicate content across multiple files
|
|
||||||
- ❌ Mixed languages (Korean/English)
|
|
||||||
- ❌ Unclear hierarchy
|
|
||||||
- ❌ Fragmented information
|
|
||||||
|
|
||||||
### After Consolidation (5 files)
|
|
||||||
- ✅ Single comprehensive guide
|
|
||||||
- ✅ All English
|
|
||||||
- ✅ Clear purpose per file
|
|
||||||
- ✅ Easy navigation
|
|
||||||
- ✅ No duplication
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## 🔍 Key Constraints (Historical Reference)
|
|
||||||
|
|
||||||
### Hard Constraints
|
|
||||||
- ❌ NO modifications to glob module
|
|
||||||
- ❌ NO legacy dependencies post-migration
|
|
||||||
- ✅ CLI interface must remain unchanged
|
|
||||||
|
|
||||||
### Implementation Approach
|
|
||||||
- ✅ Adapt CLI code to glob architecture
|
|
||||||
- ✅ Use existing glob APIs only
|
|
||||||
- ✅ Minimal changes, maximum compatibility
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## 📊 Migration Statistics
|
|
||||||
|
|
||||||
| Metric | Value |
|
|
||||||
|--------|-------|
|
|
||||||
| **Duration** | 3.5 days |
|
|
||||||
| **Files Modified** | 1 (`__main__.py`) |
|
|
||||||
| **Lines Changed** | ~200 lines |
|
|
||||||
| **glob Modifications** | 0 (constraint met) |
|
|
||||||
| **Tests Passing** | 100% |
|
|
||||||
| **Features Removed** | 1 (deps-in-workflow) |
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## 🎓 Lessons Learned
|
|
||||||
|
|
||||||
### What Worked Well
|
|
||||||
1. **Consolidation First**: Understanding all legacy usage before coding
|
|
||||||
2. **API-First Design**: glob's clean API made migration straightforward
|
|
||||||
3. **Object-Oriented**: InstalledNodePackage simplified many operations
|
|
||||||
4. **No Glob Changes**: Constraint forced better CLI design
|
|
||||||
|
|
||||||
### Challenges Overcome
|
|
||||||
1. **show_list() Complexity**: Rewrote from scratch using new patterns
|
|
||||||
2. **Dictionary to Object**: Required rethinking data access patterns
|
|
||||||
3. **Async Handling**: Wrapped async methods appropriately
|
|
||||||
4. **Testing Without Mocks**: Relied on integration testing
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## 📚 Related Documentation
|
|
||||||
|
|
||||||
### Project Documentation
|
|
||||||
- [Main Documentation Index](/DOCUMENTATION_INDEX.md)
|
|
||||||
- [Contributing Guidelines](/CONTRIBUTING.md)
|
|
||||||
- [Development Guidelines](/CLAUDE.md)
|
|
||||||
|
|
||||||
### Package Documentation
|
|
||||||
- [glob Module Guide](/comfyui_manager/glob/CLAUDE.md)
|
|
||||||
- [Data Models](/comfyui_manager/data_models/README.md)
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## 🔗 Cross-References
|
|
||||||
|
|
||||||
**If you need to**:
|
|
||||||
- Understand glob APIs → [CLI_API_REFERENCE.md](CLI_API_REFERENCE.md)
|
|
||||||
- See implementation steps → [CLI_IMPLEMENTATION_CHECKLIST.md](CLI_IMPLEMENTATION_CHECKLIST.md)
|
|
||||||
- Run tests → [CLI_TESTING_GUIDE.md](CLI_TESTING_GUIDE.md)
|
|
||||||
- Understand full context → [CLI_MIGRATION_GUIDE.md](CLI_MIGRATION_GUIDE.md)
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
**Status**: ✅ Migration Complete - Documentation Archived for Reference
|
|
||||||
**Next Review**: When similar migration projects are planned
|
|
||||||
@@ -1,328 +0,0 @@
|
|||||||
# Future Test Plans
|
|
||||||
|
|
||||||
**Type**: Planning Document (Future Tests)
|
|
||||||
**Status**: P1 tests COMPLETE ✅ - Additional scenarios remain planned
|
|
||||||
**Current Implementation Status**: See [tests/glob/README.md](../../../tests/glob/README.md)
|
|
||||||
|
|
||||||
**Last Updated**: 2025-11-06
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Overview
|
|
||||||
|
|
||||||
This document contains test scenarios that are **planned but not yet implemented**. For currently implemented tests, see [tests/glob/README.md](../../../tests/glob/README.md).
|
|
||||||
|
|
||||||
**Currently Implemented**: 51 tests ✅ (includes all P1 complex scenarios)
|
|
||||||
**P1 Implementation**: COMPLETE ✅ (Phase 3.1, 5.1, 5.2, 5.3, 6)
|
|
||||||
**Planned in this document**: Additional scenarios for comprehensive coverage (P0, P2)
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## 📋 Table of Contents
|
|
||||||
|
|
||||||
1. [Simple Test Scenarios](#simple-test-scenarios) - Additional basic API tests
|
|
||||||
2. [Complex Multi-Version Scenarios](#complex-multi-version-scenarios) - Advanced state management tests
|
|
||||||
3. [Priority Matrix](#priority-matrix) - Implementation priorities
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
# Simple Test Scenarios
|
|
||||||
|
|
||||||
These are straightforward single-version/type test scenarios that extend the existing test suite.
|
|
||||||
|
|
||||||
## 3. Error Handling Testing (Priority: Medium)
|
|
||||||
|
|
||||||
### Test 3.1: Install Non-existent Package
|
|
||||||
**Purpose**: Handle invalid package names
|
|
||||||
|
|
||||||
**Steps**:
|
|
||||||
1. Attempt to install with non-existent package ID
|
|
||||||
2. Verify appropriate error message
|
|
||||||
|
|
||||||
**Verification Items**:
|
|
||||||
- ✓ Error status returned
|
|
||||||
- ✓ Clear error message
|
|
||||||
- ✓ No server crash
|
|
||||||
|
|
||||||
### Test 3.2: Invalid Version Specification
|
|
||||||
**Purpose**: Handle non-existent version installation attempts
|
|
||||||
|
|
||||||
**Steps**:
|
|
||||||
1. Attempt to install with non-existent version (e.g., "99.99.99")
|
|
||||||
2. Verify error handling
|
|
||||||
|
|
||||||
**Verification Items**:
|
|
||||||
- ✓ Error status returned
|
|
||||||
- ✓ Clear error message
|
|
||||||
|
|
||||||
### Test 3.3: Permission Error Simulation
|
|
||||||
**Purpose**: Handle file system permission issues
|
|
||||||
|
|
||||||
**Steps**:
|
|
||||||
1. Set custom_nodes directory to read-only
|
|
||||||
2. Attempt package installation
|
|
||||||
3. Verify error handling
|
|
||||||
4. Restore permissions
|
|
||||||
|
|
||||||
**Verification Items**:
|
|
||||||
- ✓ Permission error detected
|
|
||||||
- ✓ Clear error message
|
|
||||||
- ✓ Partial installation rollback
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## 4. Dependency Management Testing (Priority: Medium)
|
|
||||||
|
|
||||||
### Test 4.1: Installation with Dependencies
|
|
||||||
**Purpose**: Automatic installation of dependencies from packages with requirements.txt
|
|
||||||
|
|
||||||
**Steps**:
|
|
||||||
1. Install package with dependencies
|
|
||||||
2. Verify requirements.txt processing
|
|
||||||
3. Verify dependency packages installed
|
|
||||||
|
|
||||||
**Verification Items**:
|
|
||||||
- ✓ requirements.txt executed
|
|
||||||
- ✓ Dependency packages installed
|
|
||||||
- ✓ Installation scripts executed
|
|
||||||
|
|
||||||
### Test 4.2: no_deps Flag Testing
|
|
||||||
**Purpose**: Verify option to skip dependency installation
|
|
||||||
|
|
||||||
**Steps**:
|
|
||||||
1. Install package with no_deps=true
|
|
||||||
2. Verify requirements.txt skipped
|
|
||||||
3. Verify installation scripts skipped
|
|
||||||
|
|
||||||
**Verification Items**:
|
|
||||||
- ✓ Dependency installation skipped
|
|
||||||
- ✓ Only package files installed
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## 5. Multi-package Management Testing (Priority: Medium)
|
|
||||||
|
|
||||||
### Test 5.1: Concurrent Multiple Package Installation
|
|
||||||
**Purpose**: Concurrent installation of multiple independent packages
|
|
||||||
|
|
||||||
**Steps**:
|
|
||||||
1. Add 3 different packages to queue
|
|
||||||
2. Start queue
|
|
||||||
3. Verify all packages installed
|
|
||||||
|
|
||||||
**Verification Items**:
|
|
||||||
- ✓ All packages installed successfully
|
|
||||||
- ✓ Installation order guaranteed
|
|
||||||
- ✓ Individual failures don't affect other packages
|
|
||||||
|
|
||||||
### Test 5.2: Same Package Concurrent Installation (Conflict Handling)
|
|
||||||
**Purpose**: Handle concurrent requests for same package
|
|
||||||
|
|
||||||
**Steps**:
|
|
||||||
1. Add same package to queue twice
|
|
||||||
2. Start queue
|
|
||||||
3. Verify duplicate handling
|
|
||||||
|
|
||||||
**Verification Items**:
|
|
||||||
- ✓ First installation successful
|
|
||||||
- ✓ Second request skipped
|
|
||||||
- ✓ Handled without errors
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## 6. Security Level Testing (Priority: Low)
|
|
||||||
|
|
||||||
### Test 6.1: Installation Restrictions by Security Level
|
|
||||||
**Purpose**: Allow/deny installation based on security_level settings
|
|
||||||
|
|
||||||
**Steps**:
|
|
||||||
1. Set security_level to "strong"
|
|
||||||
2. Attempt installation with non-CNR registered URL
|
|
||||||
3. Verify rejection
|
|
||||||
|
|
||||||
**Verification Items**:
|
|
||||||
- ✓ Security level validation
|
|
||||||
- ✓ Appropriate error message
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
# Complex Multi-Version Scenarios
|
|
||||||
|
|
||||||
These scenarios test complex interactions between multiple versions and types of the same package.
|
|
||||||
|
|
||||||
## Test Philosophy
|
|
||||||
|
|
||||||
### Real-World Scenarios
|
|
||||||
1. User switches from Nightly to CNR
|
|
||||||
2. Install both CNR and Nightly, activate only one
|
|
||||||
3. Keep multiple versions in .disabled/ and switch as needed
|
|
||||||
4. Other versions exist in disabled state during Update
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Phase 7: Complex Version Switch Chains (Priority: High)
|
|
||||||
|
|
||||||
### Test 7.1: CNR Old Enabled → CNR New (Other Versions Disabled)
|
|
||||||
**Initial State:**
|
|
||||||
```
|
|
||||||
custom_nodes/:
|
|
||||||
└── ComfyUI_SigmoidOffsetScheduler/ (CNR 1.0.1)
|
|
||||||
.disabled/:
|
|
||||||
├── ComfyUI_SigmoidOffsetScheduler_1.0.0/
|
|
||||||
└── ComfyUI_SigmoidOffsetScheduler_nightly/
|
|
||||||
```
|
|
||||||
|
|
||||||
**Operation:** Install CNR v1.0.2 (version switch)
|
|
||||||
|
|
||||||
**Expected Result:**
|
|
||||||
```
|
|
||||||
custom_nodes/:
|
|
||||||
└── ComfyUI_SigmoidOffsetScheduler/ (CNR 1.0.2)
|
|
||||||
.disabled/:
|
|
||||||
├── ComfyUI_SigmoidOffsetScheduler_1.0.0/
|
|
||||||
├── ComfyUI_SigmoidOffsetScheduler_1.0.1/ (old enabled version)
|
|
||||||
└── ComfyUI_SigmoidOffsetScheduler_nightly/
|
|
||||||
```
|
|
||||||
|
|
||||||
**Verification Items:**
|
|
||||||
- ✓ Existing enabled version auto-disabled
|
|
||||||
- ✓ New version enabled
|
|
||||||
- ✓ All disabled versions maintained
|
|
||||||
- ✓ Version history managed
|
|
||||||
|
|
||||||
### Test 7.2: Version Switch Chain (Nightly → CNR Old → CNR New)
|
|
||||||
**Scenario:** Sequential version transitions
|
|
||||||
|
|
||||||
**Step 1:** Nightly enabled
|
|
||||||
**Step 2:** Switch to CNR 1.0.1
|
|
||||||
**Step 3:** Switch to CNR 1.0.2
|
|
||||||
|
|
||||||
**Verification Items:**
|
|
||||||
- ✓ Each transition step operates normally
|
|
||||||
- ✓ Version history accumulates
|
|
||||||
- ✓ Rollback-capable state maintained
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Phase 8: Edge Cases & Error Scenarios (Priority: Medium)
|
|
||||||
|
|
||||||
### Test 8.1: Corrupted Package in .disabled/
|
|
||||||
**Situation:** Corrupted package exists in .disabled/
|
|
||||||
|
|
||||||
**Operation:** Attempt Enable
|
|
||||||
|
|
||||||
**Expected Result:**
|
|
||||||
- Clear error message
|
|
||||||
- Fallback to other version (if possible)
|
|
||||||
- System stability maintained
|
|
||||||
|
|
||||||
### Test 8.2: Name Collision in .disabled/
|
|
||||||
**Situation:** Package with same name already exists in .disabled/
|
|
||||||
|
|
||||||
**Operation:** Attempt Disable
|
|
||||||
|
|
||||||
**Expected Result:**
|
|
||||||
- Generate unique name (timestamp, etc.)
|
|
||||||
- No data loss
|
|
||||||
- All versions distinguishable
|
|
||||||
|
|
||||||
### Test 8.3: Enable Non-existent Version
|
|
||||||
**Situation:** Requested version not in .disabled/
|
|
||||||
|
|
||||||
**Operation:** Enable specific version
|
|
||||||
|
|
||||||
**Expected Result:**
|
|
||||||
- Clear error message
|
|
||||||
- Available version list provided
|
|
||||||
- Graceful failure
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
# Priority Matrix
|
|
||||||
|
|
||||||
**Note**: Phases 3, 4, 5, and 6 are now complete and documented in [tests/glob/README.md](../../../tests/glob/README.md). This matrix shows only planned future tests.
|
|
||||||
|
|
||||||
| Phase | Scenario | Priority | Status | Complexity | Real-World Frequency |
|
|
||||||
|-------|----------|----------|--------|------------|---------------------|
|
|
||||||
| 7 | Complex Version Switch Chains | P0 | 🔄 PARTIAL | High | High |
|
|
||||||
| 8 | Edge Cases & Error Scenarios | P2 | ⏳ PLANNED | High | Low |
|
|
||||||
| Simple | Error Handling (3.1-3.3) | P2 | ⏳ PLANNED | Medium | Medium |
|
|
||||||
| Simple | Dependency Management (4.1-4.2) | P2 | ⏳ PLANNED | Medium | Medium |
|
|
||||||
| Simple | Multi-package Management (5.1-5.2) | P2 | ⏳ PLANNED | Medium | Low |
|
|
||||||
| Simple | Security Level Testing (6.1) | P2 | ⏳ PLANNED | Low | Low |
|
|
||||||
|
|
||||||
**Priority Definitions:**
|
|
||||||
- **P0:** High priority (implement next) - Phase 7 Complex Version Switch
|
|
||||||
- **P1:** Medium priority - ✅ **ALL COMPLETE** (Phase 3, 4, 5, 6 - see tests/glob/README.md)
|
|
||||||
- **P2:** Low priority (implement as needed) - Simple tests and Phase 8
|
|
||||||
|
|
||||||
**Status Definitions:**
|
|
||||||
- 🔄 PARTIAL: Some tests implemented (Phase 7 has version switching tests in test_version_switching_comprehensive.py)
|
|
||||||
- ⏳ PLANNED: Not yet started
|
|
||||||
|
|
||||||
**Recommended Next Steps:**
|
|
||||||
1. **Phase 7 Remaining Tests** (P0) - Complex version switch chains with multiple disabled versions
|
|
||||||
2. **Simple Test Scenarios** (P2) - Error handling, dependency management, multi-package operations
|
|
||||||
3. **Phase 8** (P2) - Edge cases and error scenarios
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
# Implementation Notes
|
|
||||||
|
|
||||||
## Fixture Patterns
|
|
||||||
|
|
||||||
For multi-version tests, use these fixture patterns:
|
|
||||||
|
|
||||||
```python
|
|
||||||
@pytest.fixture
|
|
||||||
def setup_multi_disabled_cnr_and_nightly(api_client, custom_nodes_path):
|
|
||||||
"""
|
|
||||||
Install both CNR and Nightly in disabled state.
|
|
||||||
|
|
||||||
Pattern:
|
|
||||||
1. Install CNR → custom_nodes/
|
|
||||||
2. Disable CNR → .disabled/comfyui_sigmoidoffsetscheduler@1_0_2
|
|
||||||
3. Install Nightly → custom_nodes/
|
|
||||||
4. Disable Nightly → .disabled/comfyui_sigmoidoffsetscheduler@nightly
|
|
||||||
"""
|
|
||||||
# Implementation details in archived COMPLEX_SCENARIOS_TEST_PLAN.md
|
|
||||||
```
|
|
||||||
|
|
||||||
## Verification Helpers
|
|
||||||
|
|
||||||
Use these verification patterns:
|
|
||||||
|
|
||||||
```python
|
|
||||||
def verify_version_state(custom_nodes_path, expected_state):
|
|
||||||
"""
|
|
||||||
Verify package state matches expectations.
|
|
||||||
|
|
||||||
expected_state = {
|
|
||||||
'enabled': {'type': 'cnr' | 'nightly' | None, 'version': '1.0.2'},
|
|
||||||
'disabled': [
|
|
||||||
{'type': 'cnr', 'version': '1.0.1'},
|
|
||||||
{'type': 'nightly'}
|
|
||||||
]
|
|
||||||
}
|
|
||||||
"""
|
|
||||||
# Implementation details in archived COMPLEX_SCENARIOS_TEST_PLAN.md
|
|
||||||
```
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
# References
|
|
||||||
|
|
||||||
## Archived Implementation Guides
|
|
||||||
|
|
||||||
Detailed implementation examples, code snippets, and fixtures are available in archived planning documents:
|
|
||||||
- `.claude/archive/docs_2025-11-04/COMPLEX_SCENARIOS_TEST_PLAN.md` - Complete implementation guide with code examples
|
|
||||||
- `.claude/archive/docs_2025-11-04/TEST_PLAN_ADDITIONAL.md` - Simple test scenarios
|
|
||||||
|
|
||||||
## Current Implementation
|
|
||||||
|
|
||||||
For currently implemented tests and their status:
|
|
||||||
- **[tests/glob/README.md](../../../tests/glob/README.md)** - Current test status and coverage
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
**End of Future Test Plans**
|
|
||||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@@ -749,8 +749,8 @@
|
|||||||
"save_path": "loras/HyperSD/SDXL",
|
"save_path": "loras/HyperSD/SDXL",
|
||||||
"description": "Hyper-SD LoRA (4steps) - SDXL",
|
"description": "Hyper-SD LoRA (4steps) - SDXL",
|
||||||
"reference": "https://huggingface.co/ByteDance/Hyper-SD",
|
"reference": "https://huggingface.co/ByteDance/Hyper-SD",
|
||||||
"filename": "Hyper-SDXL-4steps-lora.safetensors",
|
"filename": "Hyper-SD15-4steps-lora.safetensors",
|
||||||
"url": "https://huggingface.co/ByteDance/Hyper-SD/resolve/main/Hyper-SDXL-4steps-lora.safetensors",
|
"url": "https://huggingface.co/ByteDance/Hyper-SD/resolve/main/Hyper-SD15-4steps-lora.safetensors",
|
||||||
"size": "787MB"
|
"size": "787MB"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@@ -1973,97 +1973,6 @@
|
|||||||
"url": "https://dl.fbaipublicfiles.com/segment_anything/sam_vit_b_01ec64.pth",
|
"url": "https://dl.fbaipublicfiles.com/segment_anything/sam_vit_b_01ec64.pth",
|
||||||
"size": "375.0MB"
|
"size": "375.0MB"
|
||||||
},
|
},
|
||||||
|
|
||||||
{
|
|
||||||
"name": "sam2.1_hiera_tiny.pt",
|
|
||||||
"type": "sam2.1",
|
|
||||||
"base": "SAM",
|
|
||||||
"save_path": "sams",
|
|
||||||
"description": "Segmenty Anything SAM 2.1 hiera model (tiny)",
|
|
||||||
"reference": "https://github.com/facebookresearch/sam2#model-description",
|
|
||||||
"filename": "sam2.1_hiera_tiny.pt",
|
|
||||||
"url": "https://dl.fbaipublicfiles.com/segment_anything_2/092824/sam2.1_hiera_tiny.pt",
|
|
||||||
"size": "149.0MB"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "sam2.1_hiera_small.pt",
|
|
||||||
"type": "sam2.1",
|
|
||||||
"base": "SAM",
|
|
||||||
"save_path": "sams",
|
|
||||||
"description": "Segmenty Anything SAM 2.1 hiera model (small)",
|
|
||||||
"reference": "https://github.com/facebookresearch/sam2#model-description",
|
|
||||||
"filename": "sam2.1_hiera_small.pt",
|
|
||||||
"url": "https://dl.fbaipublicfiles.com/segment_anything_2/092824/sam2.1_hiera_small.pt",
|
|
||||||
"size": "176.0MB"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "sam2.1_hiera_base_plus.pt",
|
|
||||||
"type": "sam2.1",
|
|
||||||
"base": "SAM",
|
|
||||||
"save_path": "sams",
|
|
||||||
"description": "Segmenty Anything SAM 2.1 hiera model (base+)",
|
|
||||||
"reference": "https://github.com/facebookresearch/sam2#model-description",
|
|
||||||
"filename": "sam2.1_hiera_base_plus.pt",
|
|
||||||
"url": "https://dl.fbaipublicfiles.com/segment_anything_2/092824/sam2.1_hiera_base_plus.pt",
|
|
||||||
"size": "309.0MB"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "sam2.1_hiera_large.pt",
|
|
||||||
"type": "sam2.1",
|
|
||||||
"base": "SAM",
|
|
||||||
"save_path": "sams",
|
|
||||||
"description": "Segmenty Anything SAM 2.1 hiera model (large)",
|
|
||||||
"reference": "https://github.com/facebookresearch/sam2#model-description",
|
|
||||||
"filename": "sam2.1_hiera_large.pt",
|
|
||||||
"url": "https://dl.fbaipublicfiles.com/segment_anything_2/092824/sam2.1_hiera_large.pt",
|
|
||||||
"size": "857.0MB"
|
|
||||||
},
|
|
||||||
|
|
||||||
{
|
|
||||||
"name": "sam2_hiera_tiny.pt",
|
|
||||||
"type": "sam2",
|
|
||||||
"base": "SAM",
|
|
||||||
"save_path": "sams",
|
|
||||||
"description": "Segmenty Anything SAM 2 hiera model (tiny)",
|
|
||||||
"reference": "https://github.com/facebookresearch/sam2#model-description",
|
|
||||||
"filename": "sam2_hiera_tiny.pt",
|
|
||||||
"url": "https://dl.fbaipublicfiles.com/segment_anything_2/072824/sam2_hiera_tiny.pt",
|
|
||||||
"size": "149.0MB"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "sam2_hiera_small.pt",
|
|
||||||
"type": "sam2",
|
|
||||||
"base": "SAM",
|
|
||||||
"save_path": "sams",
|
|
||||||
"description": "Segmenty Anything SAM 2 hiera model (small)",
|
|
||||||
"reference": "https://github.com/facebookresearch/sam2#model-description",
|
|
||||||
"filename": "sam2_hiera_small.pt",
|
|
||||||
"url": "https://dl.fbaipublicfiles.com/segment_anything_2/072824/sam2_hiera_small.pt",
|
|
||||||
"size": "176.0MB"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "sam2_hiera_base_plus.pt",
|
|
||||||
"type": "sam2",
|
|
||||||
"base": "SAM",
|
|
||||||
"save_path": "sams",
|
|
||||||
"description": "Segmenty Anything SAM 2 hiera model (base+)",
|
|
||||||
"reference": "https://github.com/facebookresearch/sam2#model-description",
|
|
||||||
"filename": "sam2_hiera_base_plus.pt",
|
|
||||||
"url": "https://dl.fbaipublicfiles.com/segment_anything_2/072824/sam2_hiera_base_plus.pt",
|
|
||||||
"size": "309.0MB"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "sam2_hiera_large.pt",
|
|
||||||
"type": "sam2",
|
|
||||||
"base": "SAM",
|
|
||||||
"save_path": "sams",
|
|
||||||
"description": "Segmenty Anything SAM 2 hiera model (large)",
|
|
||||||
"reference": "https://github.com/facebookresearch/sam2#model-description",
|
|
||||||
"filename": "sam2_hiera_large.pt",
|
|
||||||
"url": "https://dl.fbaipublicfiles.com/segment_anything_2/072824/sam2_hiera_large.pt",
|
|
||||||
"size": "857.0MB"
|
|
||||||
},
|
|
||||||
|
|
||||||
{
|
{
|
||||||
"name": "seecoder v1.0",
|
"name": "seecoder v1.0",
|
||||||
"type": "seecoder",
|
"type": "seecoder",
|
||||||
@@ -4097,29 +4006,6 @@
|
|||||||
"size": "649MB"
|
"size": "649MB"
|
||||||
},
|
},
|
||||||
|
|
||||||
{
|
|
||||||
"name": "Comfy-Org/omnigen2_fp16.safetensors",
|
|
||||||
"type": "diffusion_model",
|
|
||||||
"base": "OmniGen2",
|
|
||||||
"save_path": "default",
|
|
||||||
"description": "OmniGen2 diffusion model. This is required for using OmniGen2.",
|
|
||||||
"reference": "https://huggingface.co/Comfy-Org/Omnigen2_ComfyUI_repackaged",
|
|
||||||
"filename": "omnigen2_fp16.safetensors",
|
|
||||||
"url": "https://huggingface.co/Comfy-Org/Omnigen2_ComfyUI_repackaged/resolve/main/split_files/diffusion_models/omnigen2_fp16.safetensors",
|
|
||||||
"size": "7.93GB"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "Comfy-Org/qwen_2.5_vl_fp16.safetensors",
|
|
||||||
"type": "clip",
|
|
||||||
"base": "qwen-2.5",
|
|
||||||
"save_path": "default",
|
|
||||||
"description": "text encoder for OmniGen2",
|
|
||||||
"reference": "https://huggingface.co/Comfy-Org/Omnigen2_ComfyUI_repackaged",
|
|
||||||
"filename": "qwen_2.5_vl_fp16.safetensors",
|
|
||||||
"url": "https://huggingface.co/Comfy-Org/Omnigen2_ComfyUI_repackaged/resolve/main/split_files/text_encoders/qwen_2.5_vl_fp16.safetensors",
|
|
||||||
"size": "7.51GB"
|
|
||||||
},
|
|
||||||
|
|
||||||
{
|
{
|
||||||
"name": "FLUX.1 [Schnell] Diffusion model",
|
"name": "FLUX.1 [Schnell] Diffusion model",
|
||||||
"type": "diffusion_model",
|
"type": "diffusion_model",
|
||||||
@@ -4137,7 +4023,7 @@
|
|||||||
"type": "VAE",
|
"type": "VAE",
|
||||||
"base": "FLUX.1",
|
"base": "FLUX.1",
|
||||||
"save_path": "vae/FLUX1",
|
"save_path": "vae/FLUX1",
|
||||||
"description": "FLUX.1 VAE model\nNOTE: This VAE model can also be used for image generation with OmniGen2.",
|
"description": "FLUX.1 VAE model",
|
||||||
"reference": "https://huggingface.co/black-forest-labs/FLUX.1-schnell",
|
"reference": "https://huggingface.co/black-forest-labs/FLUX.1-schnell",
|
||||||
"filename": "ae.safetensors",
|
"filename": "ae.safetensors",
|
||||||
"url": "https://huggingface.co/black-forest-labs/FLUX.1-schnell/resolve/main/ae.safetensors",
|
"url": "https://huggingface.co/black-forest-labs/FLUX.1-schnell/resolve/main/ae.safetensors",
|
||||||
@@ -5045,105 +4931,6 @@
|
|||||||
"size": "1.26GB"
|
"size": "1.26GB"
|
||||||
},
|
},
|
||||||
|
|
||||||
{
|
|
||||||
"name": "Comfy-Org/Wan2.2 i2v high noise 14B (fp16)",
|
|
||||||
"type": "diffusion_model",
|
|
||||||
"base": "Wan2.2",
|
|
||||||
"save_path": "diffusion_models/Wan2.2",
|
|
||||||
"description": "Wan2.2 diffusion model for i2v high noise 14B (fp16)",
|
|
||||||
"reference": "https://huggingface.co/Comfy-Org/Wan_2.2_ComfyUI_Repackaged",
|
|
||||||
"filename": "wan2.2_i2v_high_noise_14B_fp16.safetensors",
|
|
||||||
"url": "https://huggingface.co/Comfy-Org/Wan_2.2_ComfyUI_Repackaged/resolve/main/split_files/diffusion_models/wan2.2_i2v_high_noise_14B_fp16.safetensors",
|
|
||||||
"size": "28.6GB"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "Comfy-Org/Wan2.2 i2v high noise 14B (fp8_scaled)",
|
|
||||||
"type": "diffusion_model",
|
|
||||||
"base": "Wan2.2",
|
|
||||||
"save_path": "diffusion_models/Wan2.2",
|
|
||||||
"description": "Wan2.2 diffusion model for i2v high noise 14B (fp8_scaled)",
|
|
||||||
"reference": "https://huggingface.co/Comfy-Org/Wan_2.2_ComfyUI_Repackaged",
|
|
||||||
"filename": "wan2.2_i2v_high_noise_14B_fp8_scaled.safetensors",
|
|
||||||
"url": "https://huggingface.co/Comfy-Org/Wan_2.2_ComfyUI_Repackaged/resolve/main/split_files/diffusion_models/wan2.2_i2v_high_noise_14B_fp8_scaled.safetensors",
|
|
||||||
"size": "14.3GB"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "Comfy-Org/Wan2.2 i2v low noise 14B (fp16)",
|
|
||||||
"type": "diffusion_model",
|
|
||||||
"base": "Wan2.2",
|
|
||||||
"save_path": "diffusion_models/Wan2.2",
|
|
||||||
"description": "Wan2.2 diffusion model for i2v low noise 14B (fp16)",
|
|
||||||
"reference": "https://huggingface.co/Comfy-Org/Wan_2.2_ComfyUI_Repackaged",
|
|
||||||
"filename": "wan2.2_i2v_low_noise_14B_fp16.safetensors",
|
|
||||||
"url": "https://huggingface.co/Comfy-Org/Wan_2.2_ComfyUI_Repackaged/resolve/main/split_files/diffusion_models/wan2.2_i2v_low_noise_14B_fp16.safetensors",
|
|
||||||
"size": "28.6GB"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "Comfy-Org/Wan2.2 i2v low noise 14B (fp8_scaled)",
|
|
||||||
"type": "diffusion_model",
|
|
||||||
"base": "Wan2.2",
|
|
||||||
"save_path": "diffusion_models/Wan2.2",
|
|
||||||
"description": "Wan2.2 diffusion model for i2v low noise 14B (fp8_scaled)",
|
|
||||||
"reference": "https://huggingface.co/Comfy-Org/Wan_2.2_ComfyUI_Repackaged",
|
|
||||||
"filename": "wan2.2_i2v_low_noise_14B_fp8_scaled.safetensors",
|
|
||||||
"url": "https://huggingface.co/Comfy-Org/Wan_2.2_ComfyUI_Repackaged/resolve/main/split_files/diffusion_models/wan2.2_i2v_low_noise_14B_fp8_scaled.safetensors",
|
|
||||||
"size": "14.3GB"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "Comfy-Org/Wan2.2 t2v high noise 14B (fp16)",
|
|
||||||
"type": "diffusion_model",
|
|
||||||
"base": "Wan2.2",
|
|
||||||
"save_path": "diffusion_models/Wan2.2",
|
|
||||||
"description": "Wan2.2 diffusion model for t2v high noise 14B (fp16)",
|
|
||||||
"reference": "https://huggingface.co/Comfy-Org/Wan_2.2_ComfyUI_Repackaged",
|
|
||||||
"filename": "wan2.2_t2v_high_noise_14B_fp16.safetensors",
|
|
||||||
"url": "https://huggingface.co/Comfy-Org/Wan_2.2_ComfyUI_Repackaged/resolve/main/split_files/diffusion_models/wan2.2_t2v_high_noise_14B_fp16.safetensors",
|
|
||||||
"size": "28.6GB"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "Comfy-Org/Wan2.2 t2v high noise 14B (fp8_scaled)",
|
|
||||||
"type": "diffusion_model",
|
|
||||||
"base": "Wan2.2",
|
|
||||||
"save_path": "diffusion_models/Wan2.2",
|
|
||||||
"description": "Wan2.2 diffusion model for t2v high noise 14B (fp8_scaled)",
|
|
||||||
"reference": "https://huggingface.co/Comfy-Org/Wan_2.2_ComfyUI_Repackaged",
|
|
||||||
"filename": "wan2.2_t2v_high_noise_14B_fp8_scaled.safetensors",
|
|
||||||
"url": "https://huggingface.co/Comfy-Org/Wan_2.2_ComfyUI_Repackaged/resolve/main/split_files/diffusion_models/wan2.2_t2v_high_noise_14B_fp8_scaled.safetensors",
|
|
||||||
"size": "14.3GB"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "Comfy-Org/Wan2.2 t2v low noise 14B (fp16)",
|
|
||||||
"type": "diffusion_model",
|
|
||||||
"base": "Wan2.2",
|
|
||||||
"save_path": "diffusion_models/Wan2.2",
|
|
||||||
"description": "Wan2.2 diffusion model for t2v low noise 14B (fp16)",
|
|
||||||
"reference": "https://huggingface.co/Comfy-Org/Wan_2.2_ComfyUI_Repackaged",
|
|
||||||
"filename": "wan2.2_t2v_low_noise_14B_fp16.safetensors",
|
|
||||||
"url": "https://huggingface.co/Comfy-Org/Wan_2.2_ComfyUI_Repackaged/resolve/main/split_files/diffusion_models/wan2.2_t2v_low_noise_14B_fp16.safetensors",
|
|
||||||
"size": "28.6GB"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "Comfy-Org/Wan2.2 t2v low noise 14B (fp8_scaled)",
|
|
||||||
"type": "diffusion_model",
|
|
||||||
"base": "Wan2.2",
|
|
||||||
"save_path": "diffusion_models/Wan2.2",
|
|
||||||
"description": "Wan2.2 diffusion model for t2v low noise 14B (fp8_scaled)",
|
|
||||||
"reference": "https://huggingface.co/Comfy-Org/Wan_2.2_ComfyUI_Repackaged",
|
|
||||||
"filename": "wan2.2_t2v_low_noise_14B_fp8_scaled.safetensors",
|
|
||||||
"url": "https://huggingface.co/Comfy-Org/Wan_2.2_ComfyUI_Repackaged/resolve/main/split_files/diffusion_models/wan2.2_t2v_low_noise_14B_fp8_scaled.safetensors",
|
|
||||||
"size": "14.3GB"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "Comfy-Org/Wan2.2 ti2v 5B (fp16)",
|
|
||||||
"type": "diffusion_model",
|
|
||||||
"base": "Wan2.2",
|
|
||||||
"save_path": "diffusion_models/Wan2.2",
|
|
||||||
"description": "Wan2.2 diffusion model for ti2v 5B (fp16)",
|
|
||||||
"reference": "https://huggingface.co/Comfy-Org/Wan_2.2_ComfyUI_Repackaged",
|
|
||||||
"filename": "wan2.2_ti2v_5B_fp16.safetensors",
|
|
||||||
"url": "https://huggingface.co/Comfy-Org/Wan_2.2_ComfyUI_Repackaged/resolve/main/split_files/diffusion_models/wan2.2_ti2v_5B_fp16.safetensors",
|
|
||||||
"size": "10.0GB"
|
|
||||||
},
|
|
||||||
|
|
||||||
{
|
{
|
||||||
"name": "Comfy-Org/umt5_xxl_fp16.safetensors",
|
"name": "Comfy-Org/umt5_xxl_fp16.safetensors",
|
||||||
@@ -5166,195 +4953,6 @@
|
|||||||
"filename": "umt5_xxl_fp8_e4m3fn_scaled.safetensors",
|
"filename": "umt5_xxl_fp8_e4m3fn_scaled.safetensors",
|
||||||
"url": "https://huggingface.co/Comfy-Org/Wan_2.1_ComfyUI_repackaged/resolve/main/split_files/text_encoders/umt5_xxl_fp8_e4m3fn_scaled.safetensors",
|
"url": "https://huggingface.co/Comfy-Org/Wan_2.1_ComfyUI_repackaged/resolve/main/split_files/text_encoders/umt5_xxl_fp8_e4m3fn_scaled.safetensors",
|
||||||
"size": "6.74GB"
|
"size": "6.74GB"
|
||||||
},
|
|
||||||
|
|
||||||
{
|
|
||||||
"name": "lllyasviel/FramePackI2V_HY",
|
|
||||||
"type": "FramePackI2V",
|
|
||||||
"base": "FramePackI2V",
|
|
||||||
"save_path": "diffusers/lllyasviel",
|
|
||||||
"description": "[SNAPSHOT] This is the f1k1_x_g9_f1k1f2k2f16k4_td FramePack for HY. [w/You cannot download this item on ComfyUI-Manager versions below V3.18]",
|
|
||||||
"reference": "https://huggingface.co/lllyasviel/FramePackI2V_HY",
|
|
||||||
"filename": "<huggingface>",
|
|
||||||
"url": "lllyasviel/FramePackI2V_HY",
|
|
||||||
"size": "25.75GB"
|
|
||||||
},
|
|
||||||
|
|
||||||
{
|
|
||||||
"name": "LTX-Video Spatial Upscaler v0.9.7",
|
|
||||||
"type": "upscale",
|
|
||||||
"base": "upscale",
|
|
||||||
"save_path": "default",
|
|
||||||
"description": "Spatial upscaler model for LTX-Video. This model enhances the spatial resolution of generated videos.",
|
|
||||||
"reference": "https://huggingface.co/Lightricks/LTX-Video",
|
|
||||||
"filename": "ltxv-spatial-upscaler-0.9.7.safetensors",
|
|
||||||
"url": "https://huggingface.co/Lightricks/LTX-Video/resolve/main/ltxv-spatial-upscaler-0.9.7.safetensors",
|
|
||||||
"size": "505MB"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "LTX-Video Temporal Upscaler v0.9.7",
|
|
||||||
"type": "upscale",
|
|
||||||
"base": "upscale",
|
|
||||||
"save_path": "default",
|
|
||||||
"description": "Temporal upscaler model for LTX-Video. This model enhances the temporal resolution and smoothness of generated videos.",
|
|
||||||
"reference": "https://huggingface.co/Lightricks/LTX-Video",
|
|
||||||
"filename": "ltxv-temporal-upscaler-0.9.7.safetensors",
|
|
||||||
"url": "https://huggingface.co/Lightricks/LTX-Video/resolve/main/ltxv-temporal-upscaler-0.9.7.safetensors",
|
|
||||||
"size": "524MB"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "LTX-Video 13B v0.9.7",
|
|
||||||
"type": "checkpoint",
|
|
||||||
"base": "LTX-Video",
|
|
||||||
"save_path": "checkpoints/LTXV",
|
|
||||||
"description": "High-resolution quality LTX-Video 13B model.",
|
|
||||||
"reference": "https://huggingface.co/Lightricks/LTX-Video",
|
|
||||||
"filename": "ltxv-13b-0.9.7-dev.safetensors",
|
|
||||||
"url": "https://huggingface.co/Lightricks/LTX-Video/resolve/main/ltxv-13b-0.9.7-dev.safetensors",
|
|
||||||
"size": "28.6GB"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "LTX-Video 13B FP8 v0.9.7",
|
|
||||||
"type": "checkpoint",
|
|
||||||
"base": "LTX-Video",
|
|
||||||
"save_path": "checkpoints/LTXV",
|
|
||||||
"description": "Quantized version of the LTX-Video 13B model, optimized for lower VRAM usage while maintaining high quality.",
|
|
||||||
"reference": "https://huggingface.co/Lightricks/LTX-Video",
|
|
||||||
"filename": "ltxv-13b-0.9.7-dev-fp8.safetensors",
|
|
||||||
"url": "https://huggingface.co/Lightricks/LTX-Video/resolve/main/ltxv-13b-0.9.7-dev-fp8.safetensors",
|
|
||||||
"size": "15.7GB"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "LTX-Video 13B Distilled v0.9.7",
|
|
||||||
"type": "checkpoint",
|
|
||||||
"base": "LTX-Video",
|
|
||||||
"save_path": "checkpoints/LTXV",
|
|
||||||
"description": "Distilled version of the LTX-Video 13B model, providing improved efficiency while maintaining high-resolution quality.",
|
|
||||||
"reference": "https://huggingface.co/Lightricks/LTX-Video",
|
|
||||||
"filename": "ltxv-13b-0.9.7-distilled.safetensors",
|
|
||||||
"url": "https://huggingface.co/Lightricks/LTX-Video/resolve/main/ltxv-13b-0.9.7-distilled.safetensors",
|
|
||||||
"size": "28.6GB"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "LTX-Video 13B Distilled FP8 v0.9.7",
|
|
||||||
"type": "checkpoint",
|
|
||||||
"base": "LTX-Video",
|
|
||||||
"save_path": "checkpoints/LTXV",
|
|
||||||
"description": "Quantized distilled version of the LTX-Video 13B model, optimized for even lower VRAM usage while maintaining quality.",
|
|
||||||
"reference": "https://huggingface.co/Lightricks/LTX-Video",
|
|
||||||
"filename": "ltxv-13b-0.9.7-distilled-fp8.safetensors",
|
|
||||||
"url": "https://huggingface.co/Lightricks/LTX-Video/resolve/main/ltxv-13b-0.9.7-distilled-fp8.safetensors",
|
|
||||||
"size": "15.7GB"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "LTX-Video 2B Distilled v0.9.8",
|
|
||||||
"type": "checkpoint",
|
|
||||||
"base": "LTX-Video",
|
|
||||||
"save_path": "checkpoints/LTXV",
|
|
||||||
"description": "LTX-Video 2B distilled model v0.9.8 with improved prompt understanding and detail generation.",
|
|
||||||
"reference": "https://huggingface.co/Lightricks/LTX-Video",
|
|
||||||
"filename": "ltxv-2b-0.9.8-distilled.safetensors",
|
|
||||||
"url": "https://huggingface.co/Lightricks/LTX-Video/resolve/main/ltxv-2b-0.9.8-distilled.safetensors",
|
|
||||||
"size": "6.34GB"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "LTX-Video 2B Distilled FP8 v0.9.8",
|
|
||||||
"type": "checkpoint",
|
|
||||||
"base": "LTX-Video",
|
|
||||||
"save_path": "checkpoints/LTXV",
|
|
||||||
"description": "Quantized LTX-Video 2B distilled model v0.9.8 with improved prompt understanding and detail generation, optimized for lower VRAM usage.",
|
|
||||||
"reference": "https://huggingface.co/Lightricks/LTX-Video",
|
|
||||||
"filename": "ltxv-2b-0.9.8-distilled-fp8.safetensors",
|
|
||||||
"url": "https://huggingface.co/Lightricks/LTX-Video/resolve/main/ltxv-2b-0.9.8-distilled-fp8.safetensors",
|
|
||||||
"size": "4.46GB"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "LTX-Video 13B Distilled v0.9.8",
|
|
||||||
"type": "checkpoint",
|
|
||||||
"base": "LTX-Video",
|
|
||||||
"save_path": "checkpoints/LTXV",
|
|
||||||
"description": "LTX-Video 13B distilled model v0.9.8 with improved prompt understanding and detail generation.",
|
|
||||||
"reference": "https://huggingface.co/Lightricks/LTX-Video",
|
|
||||||
"filename": "ltxv-13b-0.9.8-distilled.safetensors",
|
|
||||||
"url": "https://huggingface.co/Lightricks/LTX-Video/resolve/main/ltxv-13b-0.9.8-distilled.safetensors",
|
|
||||||
"size": "28.6GB"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "LTX-Video 13B Distilled FP8 v0.9.8",
|
|
||||||
"type": "checkpoint",
|
|
||||||
"base": "LTX-Video",
|
|
||||||
"save_path": "checkpoints/LTXV",
|
|
||||||
"description": "Quantized LTX-Video 13B distilled model v0.9.8 with improved prompt understanding and detail generation, optimized for lower VRAM usage.",
|
|
||||||
"reference": "https://huggingface.co/Lightricks/LTX-Video",
|
|
||||||
"filename": "ltxv-13b-0.9.8-distilled-fp8.safetensors",
|
|
||||||
"url": "https://huggingface.co/Lightricks/LTX-Video/resolve/main/ltxv-13b-0.9.8-distilled-fp8.safetensors",
|
|
||||||
"size": "15.7GB"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "LTX-Video 13B Distilled LoRA v0.9.7",
|
|
||||||
"type": "lora",
|
|
||||||
"base": "LTX-Video",
|
|
||||||
"save_path": "loras",
|
|
||||||
"description": "A LoRA adapter that transforms the standard LTX-Video 13B model into a distilled version when loaded.",
|
|
||||||
"reference": "https://huggingface.co/Lightricks/LTX-Video",
|
|
||||||
"filename": "ltxv-13b-0.9.7-distilled-lora128.safetensors",
|
|
||||||
"url": "https://huggingface.co/Lightricks/LTX-Video/resolve/main/ltxv-13b-0.9.7-distilled-lora128.safetensors",
|
|
||||||
"size": "1.33GB"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "LTX-Video ICLoRA Depth 13B v0.9.7",
|
|
||||||
"type": "lora",
|
|
||||||
"base": "LTX-Video",
|
|
||||||
"save_path": "loras",
|
|
||||||
"description": "In-Context LoRA (IC LoRA) for depth-controlled video-to-video generation with precise depth conditioning.",
|
|
||||||
"reference": "https://huggingface.co/Lightricks/LTX-Video-ICLoRA-depth-13b-0.9.7",
|
|
||||||
"filename": "ltxv-097-ic-lora-depth-control-comfyui.safetensors",
|
|
||||||
"url": "https://huggingface.co/Lightricks/LTX-Video-ICLoRA-depth-13b-0.9.7/resolve/main/ltxv-097-ic-lora-depth-control-comfyui.safetensors",
|
|
||||||
"size": "81.9MB"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "LTX-Video ICLoRA Pose 13B v0.9.7",
|
|
||||||
"type": "lora",
|
|
||||||
"base": "LTX-Video",
|
|
||||||
"save_path": "loras",
|
|
||||||
"description": "In-Context LoRA (IC LoRA) for pose-controlled video-to-video generation with precise pose conditioning.",
|
|
||||||
"reference": "https://huggingface.co/Lightricks/LTX-Video-ICLoRA-pose-13b-0.9.7",
|
|
||||||
"filename": "ltxv-097-ic-lora-pose-control-comfyui.safetensors",
|
|
||||||
"url": "https://huggingface.co/Lightricks/LTX-Video-ICLoRA-pose-13b-0.9.7/resolve/main/ltxv-097-ic-lora-pose-control-comfyui.safetensors",
|
|
||||||
"size": "151MB"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "LTX-Video ICLoRA Canny 13B v0.9.7",
|
|
||||||
"type": "lora",
|
|
||||||
"base": "LTX-Video",
|
|
||||||
"save_path": "loras",
|
|
||||||
"description": "In-Context LoRA (IC LoRA) for canny edge-controlled video-to-video generation with precise edge conditioning.",
|
|
||||||
"reference": "https://huggingface.co/Lightricks/LTX-Video-ICLoRA-canny-13b-0.9.7",
|
|
||||||
"filename": "ltxv-097-ic-lora-canny-control-comfyui.safetensors",
|
|
||||||
"url": "https://huggingface.co/Lightricks/LTX-Video-ICLoRA-canny-13b-0.9.7/resolve/main/ltxv-097-ic-lora-canny-control-comfyui.safetensors",
|
|
||||||
"size": "81.9MB"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "LTX-Video ICLoRA Detailer 13B v0.9.8",
|
|
||||||
"type": "lora",
|
|
||||||
"base": "LTX-Video",
|
|
||||||
"save_path": "loras",
|
|
||||||
"description": "A video detailer model on top of LTXV_13B_098_DEV trained on custom data using In-Context LoRA (IC LoRA) method.",
|
|
||||||
"reference": "https://huggingface.co/Lightricks/LTX-Video-ICLoRA-detailer-13b-0.9.8",
|
|
||||||
"filename": "ltxv-098-ic-lora-detailer-comfyui.safetensors",
|
|
||||||
"url": "https://huggingface.co/Lightricks/LTX-Video-ICLoRA-detailer-13b-0.9.8/resolve/main/ltxv-098-ic-lora-detailer-comfyui.safetensors",
|
|
||||||
"size": "1.31GB"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "Latent Bridge Matching for Image Relighting",
|
|
||||||
"type": "diffusion_model",
|
|
||||||
"base": "LBM",
|
|
||||||
"save_path": "diffusion_models/LBM",
|
|
||||||
"description": "Latent Bridge Matching (LBM) Relighting model",
|
|
||||||
"reference": "https://huggingface.co/jasperai/LBM_relighting",
|
|
||||||
"filename": "LBM_relighting.safetensors",
|
|
||||||
"url": "https://huggingface.co/jasperai/LBM_relighting/resolve/main/model.safetensors",
|
|
||||||
"size": "5.02GB"
|
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
137
monitor_test.sh
137
monitor_test.sh
@@ -1,137 +0,0 @@
|
|||||||
#!/bin/bash
|
|
||||||
# ============================================================================
|
|
||||||
# Test Monitoring Script
|
|
||||||
# ============================================================================
|
|
||||||
# Monitors background test execution and reports status/failures
|
|
||||||
# Usage: ./monitor_test.sh <log_file> <timeout_seconds>
|
|
||||||
# ============================================================================
|
|
||||||
|
|
||||||
set -e
|
|
||||||
|
|
||||||
LOG_FILE="${1:-/tmp/test-param-fix.log}"
|
|
||||||
TIMEOUT="${2:-600}" # Default 10 minutes
|
|
||||||
CHECK_INTERVAL=10 # Check every 10 seconds
|
|
||||||
STALL_THRESHOLD=60 # Consider stalled if no new output for 60 seconds
|
|
||||||
|
|
||||||
# Colors
|
|
||||||
RED='\033[0;31m'
|
|
||||||
GREEN='\033[0;32m'
|
|
||||||
YELLOW='\033[1;33m'
|
|
||||||
BLUE='\033[0;34m'
|
|
||||||
NC='\033[0m'
|
|
||||||
|
|
||||||
echo -e "${BLUE}========================================${NC}"
|
|
||||||
echo -e "${BLUE}Test Monitor Started${NC}"
|
|
||||||
echo -e "${BLUE}========================================${NC}"
|
|
||||||
echo -e "${BLUE}Log File: ${LOG_FILE}${NC}"
|
|
||||||
echo -e "${BLUE}Timeout: ${TIMEOUT}s${NC}"
|
|
||||||
echo -e "${BLUE}Stall Threshold: ${STALL_THRESHOLD}s${NC}"
|
|
||||||
echo ""
|
|
||||||
|
|
||||||
START_TIME=$(date +%s)
|
|
||||||
LAST_SIZE=0
|
|
||||||
LAST_CHANGE_TIME=$START_TIME
|
|
||||||
STATUS="running"
|
|
||||||
|
|
||||||
while true; do
|
|
||||||
CURRENT_TIME=$(date +%s)
|
|
||||||
ELAPSED=$((CURRENT_TIME - START_TIME))
|
|
||||||
|
|
||||||
# Check if log file exists
|
|
||||||
if [ ! -f "$LOG_FILE" ]; then
|
|
||||||
echo -e "${YELLOW}[$(date '+%H:%M:%S')] Waiting for log file...${NC}"
|
|
||||||
sleep $CHECK_INTERVAL
|
|
||||||
continue
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Check file size
|
|
||||||
CURRENT_SIZE=$(wc -c < "$LOG_FILE" 2>/dev/null || echo "0")
|
|
||||||
TIME_SINCE_CHANGE=$((CURRENT_TIME - LAST_CHANGE_TIME))
|
|
||||||
|
|
||||||
# Check if file size changed (progress)
|
|
||||||
if [ "$CURRENT_SIZE" -gt "$LAST_SIZE" ]; then
|
|
||||||
LAST_SIZE=$CURRENT_SIZE
|
|
||||||
LAST_CHANGE_TIME=$CURRENT_TIME
|
|
||||||
|
|
||||||
# Show latest lines
|
|
||||||
echo -e "${GREEN}[$(date '+%H:%M:%S')] Progress detected (${CURRENT_SIZE} bytes, +${ELAPSED}s)${NC}"
|
|
||||||
tail -3 "$LOG_FILE" | sed 's/\x1b\[[0-9;]*m//g' # Remove color codes
|
|
||||||
echo ""
|
|
||||||
else
|
|
||||||
# No progress
|
|
||||||
echo -e "${YELLOW}[$(date '+%H:%M:%S')] No change (stalled ${TIME_SINCE_CHANGE}s)${NC}"
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Check for completion markers
|
|
||||||
if grep -q "✅ ComfyUI_.*: PASSED" "$LOG_FILE" 2>/dev/null || \
|
|
||||||
grep -q "❌ ComfyUI_.*: FAILED" "$LOG_FILE" 2>/dev/null || \
|
|
||||||
grep -q "Test Suite Complete" "$LOG_FILE" 2>/dev/null; then
|
|
||||||
|
|
||||||
echo -e "${GREEN}========================================${NC}"
|
|
||||||
echo -e "${GREEN}Tests Completed!${NC}"
|
|
||||||
echo -e "${GREEN}========================================${NC}"
|
|
||||||
|
|
||||||
# Show summary
|
|
||||||
grep -E "passed|failed|PASSED|FAILED" "$LOG_FILE" | tail -20
|
|
||||||
|
|
||||||
# Check if tests passed
|
|
||||||
if grep -q "❌.*FAILED" "$LOG_FILE" 2>/dev/null; then
|
|
||||||
echo -e "${RED}❌ Some tests FAILED${NC}"
|
|
||||||
STATUS="failed"
|
|
||||||
else
|
|
||||||
echo -e "${GREEN}✅ All tests PASSED${NC}"
|
|
||||||
STATUS="success"
|
|
||||||
fi
|
|
||||||
|
|
||||||
break
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Check for errors
|
|
||||||
if grep -qi "error\|exception\|traceback" "$LOG_FILE" 2>/dev/null; then
|
|
||||||
LAST_ERROR=$(grep -i "error\|exception" "$LOG_FILE" | tail -1)
|
|
||||||
echo -e "${RED}[$(date '+%H:%M:%S')] Error detected: ${LAST_ERROR}${NC}"
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Check for stall (no progress for STALL_THRESHOLD seconds)
|
|
||||||
if [ "$TIME_SINCE_CHANGE" -gt "$STALL_THRESHOLD" ]; then
|
|
||||||
echo -e "${RED}========================================${NC}"
|
|
||||||
echo -e "${RED}⚠️ Test Execution STALLED${NC}"
|
|
||||||
echo -e "${RED}========================================${NC}"
|
|
||||||
echo -e "${RED}No progress for ${TIME_SINCE_CHANGE} seconds${NC}"
|
|
||||||
echo -e "${RED}Last output:${NC}"
|
|
||||||
tail -10 "$LOG_FILE" | sed 's/\x1b\[[0-9;]*m//g'
|
|
||||||
|
|
||||||
STATUS="stalled"
|
|
||||||
break
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Check for timeout
|
|
||||||
if [ "$ELAPSED" -gt "$TIMEOUT" ]; then
|
|
||||||
echo -e "${RED}========================================${NC}"
|
|
||||||
echo -e "${RED}⏰ Test Execution TIMEOUT${NC}"
|
|
||||||
echo -e "${RED}========================================${NC}"
|
|
||||||
echo -e "${RED}Exceeded ${TIMEOUT}s timeout${NC}"
|
|
||||||
|
|
||||||
STATUS="timeout"
|
|
||||||
break
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Wait before next check
|
|
||||||
sleep $CHECK_INTERVAL
|
|
||||||
done
|
|
||||||
|
|
||||||
# Final status
|
|
||||||
echo ""
|
|
||||||
echo -e "${BLUE}========================================${NC}"
|
|
||||||
echo -e "${BLUE}Final Status: ${STATUS}${NC}"
|
|
||||||
echo -e "${BLUE}Total Time: ${ELAPSED}s${NC}"
|
|
||||||
echo -e "${BLUE}========================================${NC}"
|
|
||||||
|
|
||||||
# Exit with appropriate code
|
|
||||||
case "$STATUS" in
|
|
||||||
"success") exit 0 ;;
|
|
||||||
"failed") exit 1 ;;
|
|
||||||
"stalled") exit 2 ;;
|
|
||||||
"timeout") exit 3 ;;
|
|
||||||
*) exit 99 ;;
|
|
||||||
esac
|
|
||||||
@@ -1,95 +0,0 @@
|
|||||||
# ComfyUI-Manager: Node Database (node_db)
|
|
||||||
|
|
||||||
This directory contains the JSON database files that power ComfyUI-Manager's legacy node registry system. While the manager is gradually transitioning to the online Custom Node Registry (CNR), these local JSON files continue to provide important metadata about custom nodes, models, and their integrations.
|
|
||||||
|
|
||||||
## Directory Structure
|
|
||||||
|
|
||||||
The node_db directory is organized into several subdirectories, each serving a specific purpose:
|
|
||||||
|
|
||||||
- **dev/**: Development channel files with latest additions and experimental nodes
|
|
||||||
- **legacy/**: Historical/legacy nodes that may require special handling
|
|
||||||
- **new/**: New nodes that have passed initial verification but are still being evaluated
|
|
||||||
- **forked/**: Forks of existing nodes with modifications
|
|
||||||
- **tutorial/**: Example and tutorial nodes designed for learning purposes
|
|
||||||
|
|
||||||
## Core Database Files
|
|
||||||
|
|
||||||
Each subdirectory contains a standard set of JSON files:
|
|
||||||
|
|
||||||
- **custom-node-list.json**: Primary database of custom nodes with metadata
|
|
||||||
- **extension-node-map.json**: Maps between extensions and individual nodes they provide
|
|
||||||
- **model-list.json**: Catalog of models that can be downloaded through the manager
|
|
||||||
- **alter-list.json**: Alternative implementations of nodes for compatibility or functionality
|
|
||||||
- **github-stats.json**: GitHub repository statistics for node popularity metrics
|
|
||||||
|
|
||||||
## Database Schema
|
|
||||||
|
|
||||||
### custom-node-list.json
|
|
||||||
```json
|
|
||||||
{
|
|
||||||
"custom_nodes": [
|
|
||||||
{
|
|
||||||
"title": "Node display name",
|
|
||||||
"name": "Repository name",
|
|
||||||
"reference": "Original repository if forked",
|
|
||||||
"files": ["GitHub URL or other source location"],
|
|
||||||
"install_type": "git",
|
|
||||||
"description": "Description of the node's functionality",
|
|
||||||
"pip": ["optional pip dependencies"],
|
|
||||||
"js": ["optional JavaScript files"],
|
|
||||||
"tags": ["categorization tags"]
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
|
||||||
```
|
|
||||||
|
|
||||||
### extension-node-map.json
|
|
||||||
```json
|
|
||||||
{
|
|
||||||
"extension-id": [
|
|
||||||
["list", "of", "node", "classes"],
|
|
||||||
{
|
|
||||||
"author": "Author name",
|
|
||||||
"description": "Extension description",
|
|
||||||
"nodename_pattern": "Optional regex pattern for node name matching"
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
|
||||||
```
|
|
||||||
|
|
||||||
## Transition to Custom Node Registry (CNR)
|
|
||||||
|
|
||||||
This local database system is being progressively replaced by the online Custom Node Registry (CNR), which provides:
|
|
||||||
- Real-time updates without manual JSON maintenance
|
|
||||||
- Improved versioning support
|
|
||||||
- Better security validation
|
|
||||||
- Enhanced metadata
|
|
||||||
|
|
||||||
The Manager supports both systems simultaneously during the transition period.
|
|
||||||
|
|
||||||
## Implementation Details
|
|
||||||
|
|
||||||
- The database follows a channel-based architecture for different sources
|
|
||||||
- Multiple database modes are supported: Channel, Local, and Remote
|
|
||||||
- The system supports differential updates to minimize bandwidth usage
|
|
||||||
- Security levels are enforced for different node installations based on source
|
|
||||||
|
|
||||||
## Usage in the Application
|
|
||||||
|
|
||||||
The Manager's backend uses these database files to:
|
|
||||||
|
|
||||||
1. Provide browsable lists of available nodes and models
|
|
||||||
2. Resolve dependencies for installation
|
|
||||||
3. Track updates and new versions
|
|
||||||
4. Map node classes to their source repositories
|
|
||||||
5. Assess risk levels for installation security
|
|
||||||
|
|
||||||
## Maintenance Scripts
|
|
||||||
|
|
||||||
Each subdirectory contains a `scan.sh` script that assists with:
|
|
||||||
- Scanning repositories for new nodes
|
|
||||||
- Updating metadata
|
|
||||||
- Validating database integrity
|
|
||||||
- Generating proper JSON structures
|
|
||||||
|
|
||||||
This database system enables a flexible, secure, and comprehensive management system for the ComfyUI ecosystem while the transition to CNR continues.
|
|
||||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@@ -1,3 +1,3 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
rm ~/.tmp/dev/*.py > /dev/null 2>&1
|
rm ~/.tmp/dev/*.py > /dev/null 2>&1
|
||||||
python ../../scanner.py ~/.tmp/dev $*
|
python ../../scanner.py ~/.tmp/dev
|
||||||
|
|||||||
@@ -1,15 +1,5 @@
|
|||||||
{
|
{
|
||||||
"custom_nodes": [
|
"custom_nodes": [
|
||||||
{
|
|
||||||
"author": "joaomede",
|
|
||||||
"title": "ComfyUI-Unload-Model-Fork",
|
|
||||||
"reference": "https://github.com/joaomede/ComfyUI-Unload-Model-Fork",
|
|
||||||
"files": [
|
|
||||||
"https://github.com/joaomede/ComfyUI-Unload-Model-Fork"
|
|
||||||
],
|
|
||||||
"install_type": "git-clone",
|
|
||||||
"description": "For unloading a model or all models, using the memory management that is already present in ComfyUI. Copied from [a/https://github.com/willblaschko/ComfyUI-Unload-Models](https://github.com/willblaschko/ComfyUI-Unload-Models) but without the unnecessary extra stuff."
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
"author": "SanDiegoDude",
|
"author": "SanDiegoDude",
|
||||||
"title": "ComfyUI-HiDream-Sampler [WIP]",
|
"title": "ComfyUI-HiDream-Sampler [WIP]",
|
||||||
|
|||||||
@@ -1,860 +1,15 @@
|
|||||||
{
|
{
|
||||||
"custom_nodes": [
|
"custom_nodes": [
|
||||||
{
|
{
|
||||||
"author": "fablestudio",
|
"author": "#NOTICE_1.13",
|
||||||
"title": "ComfyUI-Showrunner-Utils [REMOVED]",
|
"title": "NOTICE: This channel is not the default channel.",
|
||||||
"reference": "https://github.com/fablestudio/ComfyUI-Showrunner-Utils",
|
"reference": "https://github.com/ltdrdata/ComfyUI-Manager",
|
||||||
"files": [
|
"files": [],
|
||||||
"https://github.com/fablestudio/ComfyUI-Showrunner-Utils"
|
|
||||||
],
|
|
||||||
"install_type": "git-clone",
|
"install_type": "git-clone",
|
||||||
"description": "NODES: Align Face, Generate Timestamp, GetMostCommonColors, Alpha Crop and Position Image, Shrink Image"
|
"description": "If you see this message, your ComfyUI-Manager is outdated.\nLegacy channel provides only the list of the deprecated nodes. If you want to find the complete node list, please go to the Default channel."
|
||||||
},
|
|
||||||
{
|
|
||||||
"author": "skayka",
|
|
||||||
"title": "ComfyUI-DreamFit [REMOVED]",
|
|
||||||
"reference": "https://github.com/skayka/ComfyUI-DreamFit",
|
|
||||||
"files": [
|
|
||||||
"https://github.com/skayka/ComfyUI-DreamFit"
|
|
||||||
],
|
|
||||||
"install_type": "git-clone",
|
|
||||||
"description": "Garment-centric human generation nodes for ComfyUI using DreamFit with Flux.\nDreamFit is a powerful adapter system that enhances Flux models with garment-aware generation capabilities, enabling high-quality fashion and clothing generation."
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"author": "domenecmiralles",
|
|
||||||
"title": "obobo_nodes [REMOVED]",
|
|
||||||
"reference": "https://github.com/domenecmiralles/obobo_nodes",
|
|
||||||
"files": [
|
|
||||||
"https://github.com/domenecmiralles/obobo_nodes"
|
|
||||||
],
|
|
||||||
"install_type": "git-clone",
|
|
||||||
"description": "A collection of custom nodes for ComfyUI that provide various input and output capabilities."
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"author": "NicholasKao1029",
|
|
||||||
"title": "comfyui-pixxio [REMOVED]",
|
|
||||||
"reference": "https://github.com/NicholasKao1029/comfyui-pixxio",
|
|
||||||
"files": [
|
|
||||||
"https://github.com/NicholasKao1029/comfyui-pixxio"
|
|
||||||
],
|
|
||||||
"install_type": "git-clone",
|
|
||||||
"description": "NODES: Auto-Upload Image to Pixxio Collection, Load Image from Pixx.io"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"author": "ComfyUI-Workflow",
|
|
||||||
"title": "ComfyUI OpenAI Nodes [REMOVED]",
|
|
||||||
"reference": "https://github.com/ComfyUI-Workflow/ComfyUI-OpenAI",
|
|
||||||
"files": [
|
|
||||||
"https://github.com/ComfyUI-Workflow/ComfyUI-OpenAI"
|
|
||||||
],
|
|
||||||
"install_type": "git-clone",
|
|
||||||
"description": "By utilizing OpenAI's powerful vision models, this node enables you to incorporate state-of-the-art image understanding into your ComfyUI projects with minimal setup."
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"author": "dionren",
|
|
||||||
"title": "Export Workflow With Cyuai Api Available Nodes [REMOVED]",
|
|
||||||
"id": "comfyUI-Pro-Export-Tool",
|
|
||||||
"reference": "https://github.com/dionren/ComfyUI-Pro-Export-Tool",
|
|
||||||
"files": [
|
|
||||||
"https://github.com/dionren/ComfyUI-Pro-Export-Tool"
|
|
||||||
],
|
|
||||||
"install_type": "git-clone",
|
|
||||||
"description": "This is a node to convert workflows to cyuai api available nodes."
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"author": "1H-hobit",
|
|
||||||
"title": "ComfyUI_InternVL3 [REMOVED]",
|
|
||||||
"reference": "https://github.com/1H-hobit/ComfyUI_InternVL3",
|
|
||||||
"files": [
|
|
||||||
"https://github.com/1H-hobit/ComfyUI_InternVL3"
|
|
||||||
],
|
|
||||||
"install_type": "git-clone",
|
|
||||||
"description": "ComfyUI for [a/InternVL](https://github.com/OpenGVLab/InternVL)"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"author": "spacepxl",
|
|
||||||
"title": "ComfyUI-Florence-2 [DEPRECATED]",
|
|
||||||
"id": "florence2-spacepxl",
|
|
||||||
"reference": "https://github.com/spacepxl/ComfyUI-Florence-2",
|
|
||||||
"files": [
|
|
||||||
"https://github.com/spacepxl/ComfyUI-Florence-2"
|
|
||||||
],
|
|
||||||
"install_type": "git-clone",
|
|
||||||
"description": "[a/https://huggingface.co/microsoft/Florence-2-large-ft](https://huggingface.co/microsoft/Florence-2-large-ft)\nLarge or base model, support for captioning and bbox task modes, more coming soon."
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"author": "xxxxxxxxxxxc",
|
|
||||||
"title": "flux-kontext-diff-merge [REMOVED]",
|
|
||||||
"reference": "https://github.com/xxxxxxxxxxxc/flux-kontext-diff-merge",
|
|
||||||
"files": [
|
|
||||||
"https://github.com/xxxxxxxxxxxc/flux-kontext-diff-merge"
|
|
||||||
],
|
|
||||||
"install_type": "git-clone",
|
|
||||||
"description": "Preserve image quality with flux-kontext-diff-merge. This ComfyUI node merges only changed areas from AI edits, ensuring clarity and detail."
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"author": "TechnoByteJS",
|
|
||||||
"title": "TechNodes [REMOVED]",
|
|
||||||
"id": "technodes",
|
|
||||||
"reference": "https://github.com/TechnoByteJS/ComfyUI-TechNodes",
|
|
||||||
"files": [
|
|
||||||
"https://github.com/TechnoByteJS/ComfyUI-TechNodes"
|
|
||||||
],
|
|
||||||
"install_type": "git-clone",
|
|
||||||
"description": "ComfyUI nodes for merging, testing and more.\nNOTE: SDNext Merge, VAE Merge, MBW Layers, Repeat VAE, Quantization."
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"author": "DDDDEEP",
|
|
||||||
"title": "ComfyUI-DDDDEEP [REMOVED]",
|
|
||||||
"reference": "https://github.com/DDDDEEP/ComfyUI-DDDDEEP",
|
|
||||||
"files": [
|
|
||||||
"https://github.com/DDDDEEP/ComfyUI-DDDDEEP"
|
|
||||||
],
|
|
||||||
"install_type": "git-clone",
|
|
||||||
"description": "NODES: AutoWidthHeight, ReturnIntSeed, OppositeBool, PromptItemCollection"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"author": "manifestations",
|
|
||||||
"title": "ComfyUI Ethnic Outfits Custom Nodes [REMOVED]",
|
|
||||||
"reference": "https://github.com/manifestations/comfyui-outfits",
|
|
||||||
"files": [
|
|
||||||
"https://github.com/manifestations/comfyui-outfits"
|
|
||||||
],
|
|
||||||
"install_type": "git-clone",
|
|
||||||
"description": "Custom ComfyUI nodes for generating outfit prompts representing diverse ethnicities, cultures, and regions. Uses extensible JSON data for clothing, accessories, and poses, with “random/disabled” dropdowns for flexibility. Advanced prompt engineering is supported via Ollama LLM integration. Easily add new regions, ethnicities, or cultures by updating data files and creating lightweight node wrappers. Designed for artists, researchers, and developers seeking culturally rich, customizable prompt generation in ComfyUI workflows."
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"author": "MitoshiroPJ",
|
|
||||||
"title": "ComfyUI Slothful Attention [REMOVED]",
|
|
||||||
"reference": "https://github.com/MitoshiroPJ/comfyui_slothful_attention",
|
|
||||||
"files": [
|
|
||||||
"https://github.com/MitoshiroPJ/comfyui_slothful_attention"
|
|
||||||
],
|
|
||||||
"install_type": "git-clone",
|
|
||||||
"description": "This custom node allow controlling output without training. The reducing method is similar to [a/Spatial-Reduction Attention](https://paperswithcode.com/method/spatial-reduction-attention)."
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"author": "MitoshiroPJ",
|
|
||||||
"title": "comfyui_focal_sampler [REMOVED]",
|
|
||||||
"reference": "https://github.com/MitoshiroPJ/comfyui_focal_sampler",
|
|
||||||
"files": [
|
|
||||||
"https://github.com/MitoshiroPJ/comfyui_focal_sampler"
|
|
||||||
],
|
|
||||||
"install_type": "git-clone",
|
|
||||||
"description": "Apply additional sampling to specific area"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"author": "manifestations",
|
|
||||||
"title": "ComfyUI Ethnic Outfit & Prompt Enhancer Nodes [REMOVED]",
|
|
||||||
"reference": "https://github.com/manifestations/comfyui-indian-outfit",
|
|
||||||
"files": [
|
|
||||||
"https://github.com/manifestations/comfyui-indian-outfit"
|
|
||||||
],
|
|
||||||
"install_type": "git-clone",
|
|
||||||
"description": "Features:\n* Extensive options for Indian, Indonesian, and international clothing, jewelry, accessories, and styles\n* Multiple jewelry and accessory fields (with material support: gold, diamond, silver, leather, beads, etc.)\n* Support for tattoos, henna, hair styles, poses, shot types, lighting, and photography genres\n* Seamless prompt expansion using your own Ollama LLM instance\n* Modular, extensible JSON data files for easy customization"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"author": "coVISIONSld",
|
|
||||||
"title": "ComfyUI-OmniGen2 [REMOVED]",
|
|
||||||
"reference": "https://github.com/coVISIONSld/ComfyUI-OmniGen2",
|
|
||||||
"files": [
|
|
||||||
"https://github.com/coVISIONSld/ComfyUI-OmniGen2"
|
|
||||||
],
|
|
||||||
"install_type": "git-clone",
|
|
||||||
"description": "ComfyUI-OmniGen2 is a custom node package for the OmniGen2 model, enabling advanced text-to-image generation and visual understanding."
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"author": "S4MUEL-404",
|
|
||||||
"title": "ComfyUI-S4Tool-Image-Overlay [REMOVED]",
|
|
||||||
"reference": "https://github.com/S4MUEL-404/ComfyUI-S4Tool-Image-Overlay",
|
|
||||||
"files": [
|
|
||||||
"https://github.com/S4MUEL-404/ComfyUI-S4Tool-Image-Overlay"
|
|
||||||
],
|
|
||||||
"install_type": "git-clone",
|
|
||||||
"description": "Quickly set up image overlay effects"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"author": "akspa0",
|
|
||||||
"title": "ComfyUI-FapMixPlus [REMOVED]",
|
|
||||||
"reference": "https://github.com/akspa0/ComfyUI-FapMixPlus",
|
|
||||||
"files": [
|
|
||||||
"https://github.com/akspa0/ComfyUI-FapMixPlus"
|
|
||||||
],
|
|
||||||
"install_type": "git-clone",
|
|
||||||
"description": "This is an audio processing script that applies soft limiting, optional loudness normalization, and optional slicing for transcription. It can also produce stereo-mixed outputs with optional audio appended to the end. The script organizes processed files into structured folders with sanitized filenames and retains original timestamps for continuity."
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"author": "RedmondAI",
|
|
||||||
"title": "comfyui-tools [UNSAFE]",
|
|
||||||
"reference": "https://github.com/RedmondAI/comfyui-tools",
|
|
||||||
"files": [
|
|
||||||
"https://github.com/RedmondAI/comfyui-tools"
|
|
||||||
],
|
|
||||||
"install_type": "git-clone",
|
|
||||||
"description": "Custom extensions for ComfyUI used by the Redmond3D VFX team.[w/This node pack has a vulnerability that allows it to create files at arbitrary paths.]"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"author": "S4MUEL-404",
|
|
||||||
"title": "Image Position Blend [REMOVED]",
|
|
||||||
"id": "ComfyUI-Image-Position-Blend",
|
|
||||||
"version": "1.1",
|
|
||||||
"reference": "https://github.com/S4MUEL-404/ComfyUI-Image-Position-Blend",
|
|
||||||
"files": [
|
|
||||||
"https://github.com/S4MUEL-404/ComfyUI-Image-Position-Blend"
|
|
||||||
],
|
|
||||||
"install_type": "git-clone",
|
|
||||||
"description": "A custom node for conveniently adjusting the overlay position of two images."
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"author": "S4MUEL-404",
|
|
||||||
"title": "ComfyUI-Text-On-Image [REMOVED]",
|
|
||||||
"id": "ComfyUI-Text-On-Image",
|
|
||||||
"reference": "https://github.com/S4MUEL-404/ComfyUI-Text-On-Image",
|
|
||||||
"files": [
|
|
||||||
"https://github.com/S4MUEL-404/ComfyUI-Text-On-Image"
|
|
||||||
],
|
|
||||||
"install_type": "git-clone",
|
|
||||||
"description": "A custom node for ComfyUI that allows users to add text overlays to images with customizable size, font, position, and shadow."
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"author": "S4MUEL-404",
|
|
||||||
"title": "ComfyUI-Prompts-Selector [REMOVED]",
|
|
||||||
"reference": "https://github.com/S4MUEL-404/ComfyUI-Prompts-Selector",
|
|
||||||
"files": [
|
|
||||||
"https://github.com/S4MUEL-404/ComfyUI-Prompts-Selector"
|
|
||||||
],
|
|
||||||
"install_type": "git-clone",
|
|
||||||
"description": "Quickly select preset prompts and merge them"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"author": "juntaosun",
|
|
||||||
"title": "ComfyUI_open_nodes [REMOVED]",
|
|
||||||
"reference": "https://github.com/juntaosun/ComfyUI_open_nodes",
|
|
||||||
"files": [
|
|
||||||
"https://github.com/juntaosun/ComfyUI_open_nodes"
|
|
||||||
],
|
|
||||||
"install_type": "git-clone",
|
|
||||||
"description": "ComfyUI open nodes by juntaosun."
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"author": "perilli",
|
|
||||||
"title": "apw_nodes [DEPRECATED]",
|
|
||||||
"reference": "https://github.com/alessandroperilli/apw_nodes",
|
|
||||||
"files": [
|
|
||||||
"https://github.com/alessandroperilli/apw_nodes"
|
|
||||||
],
|
|
||||||
"install_type": "git-clone",
|
|
||||||
"description": "A custom node suite to augment the capabilities of the [a/AP Workflows for ComfyUI](https://perilli.com/ai/comfyui/)[w/'APW_Nodes' has been newly added in place of 'apw_nodes'.]"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"author": "markuryy",
|
|
||||||
"title": "ComfyUI Spiritparticle Nodes [REMOVED]",
|
|
||||||
"reference": "https://github.com/markuryy/comfyui-spiritparticle",
|
|
||||||
"files": [
|
|
||||||
"https://github.com/markuryy/comfyui-spiritparticle"
|
|
||||||
],
|
|
||||||
"install_type": "git-clone",
|
|
||||||
"description": "A node pack by spiritparticle."
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"author": "SpaceKendo",
|
|
||||||
"title": "Text to video for Stable Video Diffusion in ComfyUI [REMOVED]",
|
|
||||||
"id": "svd-txt2vid",
|
|
||||||
"reference": "https://github.com/SpaceKendo/ComfyUI-svd_txt2vid",
|
|
||||||
"files": [
|
|
||||||
"https://github.com/SpaceKendo/ComfyUI-svd_txt2vid"
|
|
||||||
],
|
|
||||||
"install_type": "git-clone",
|
|
||||||
"description": "This is node replaces the init_image conditioning for the [a/Stable Video Diffusion](https://github.com/Stability-AI/generative-models) image to video model with text embeds, together with a conditioning frame. The conditioning frame is a set of latents."
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"author": "vovler",
|
|
||||||
"title": "ComfyUI Civitai Helper Extension [REMOVED]",
|
|
||||||
"reference": "https://github.com/vovler/comfyui-civitaihelper",
|
|
||||||
"files": [
|
|
||||||
"https://github.com/vovler/comfyui-civitaihelper"
|
|
||||||
],
|
|
||||||
"install_type": "git-clone",
|
|
||||||
"description": "ComfyUI extension for parsing Civitai PNG workflows and automatically downloading missing models"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"author": "DriftJohnson",
|
|
||||||
"title": "DJZ-Nodes [REMOVED]",
|
|
||||||
"id": "DJZ-Nodes",
|
|
||||||
"reference": "https://github.com/MushroomFleet/DJZ-Nodes",
|
|
||||||
"files": [
|
|
||||||
"https://github.com/MushroomFleet/DJZ-Nodes"
|
|
||||||
],
|
|
||||||
"install_type": "git-clone",
|
|
||||||
"description": "AspectSize and other nodes"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"author": "DriftJohnson",
|
|
||||||
"title": "KokoroTTS Node [REMOVED]",
|
|
||||||
"reference": "https://github.com/MushroomFleet/DJZ-KokoroTTS",
|
|
||||||
"files": [
|
|
||||||
"https://github.com/MushroomFleet/DJZ-KokoroTTS"
|
|
||||||
],
|
|
||||||
"install_type": "git-clone",
|
|
||||||
"description": "This node provides advanced text-to-speech functionality powered by KokoroTTS. Follow the instructions below to install, configure, and use the node within your portable ComfyUI installation."
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"author": "MushroomFleet",
|
|
||||||
"title": "DJZ-Pedalboard [REMOVED]",
|
|
||||||
"reference": "https://github.com/MushroomFleet/DJZ-Pedalboard",
|
|
||||||
"files": [
|
|
||||||
"https://github.com/MushroomFleet/DJZ-Pedalboard"
|
|
||||||
],
|
|
||||||
"install_type": "git-clone",
|
|
||||||
"description": "This project provides a collection of custom nodes designed for enhanced audio effects in ComfyUI. With an intuitive pedalboard interface, users can easily integrate and manipulate various audio effects within their workflows."
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"author": "MushroomFleet",
|
|
||||||
"title": "SVG Suite for ComfyUI [REMOVED]",
|
|
||||||
"reference": "https://github.com/MushroomFleet/svg-suite",
|
|
||||||
"files": [
|
|
||||||
"https://github.com/MushroomFleet/svg-suite"
|
|
||||||
],
|
|
||||||
"install_type": "git-clone",
|
|
||||||
"description": "SVG Suite is an advanced set of nodes for converting images to SVG in ComfyUI, expanding upon the functionality of ComfyUI-ToSVG."
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"author": "joeriben",
|
|
||||||
"title": "AI4ArtsEd Ollama Prompt Node [DEPRECATED]",
|
|
||||||
"reference": "https://github.com/joeriben/ai4artsed_comfyui",
|
|
||||||
"files": [
|
|
||||||
"https://github.com/joeriben/ai4artsed_comfyui"
|
|
||||||
],
|
|
||||||
"install_type": "git-clone",
|
|
||||||
"description": "Experimental nodes for ComfyUI. For more, see [a/https://kubi-meta.de/ai4artsed](https://kubi-meta.de/ai4artsed) A custom ComfyUI node for stylistic and cultural transformation of input text using local LLMs served via Ollama. This node allows you to combine a free-form prompt (e.g. translation, poetic recoding, genre shift) with externally supplied text in the ComfyUI graph. The result is processed via an Ollama-hosted model and returned as plain text."
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"author": "bento234",
|
|
||||||
"title": "ComfyUI-bento-toolbox [REMOVED]",
|
|
||||||
"reference": "https://github.com/bento234/ComfyUI-bento-toolbox",
|
|
||||||
"files": [
|
|
||||||
"https://github.com/bento234/ComfyUI-bento-toolbox"
|
|
||||||
],
|
|
||||||
"install_type": "git-clone",
|
|
||||||
"description": "NODES: Tile Prompt Distributor"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"author": "yichengup",
|
|
||||||
"title": "ComfyUI-VideoBlender [REMOVED]",
|
|
||||||
"reference": "https://github.com/yichengup/ComfyUI-VideoBlender",
|
|
||||||
"files": [
|
|
||||||
"https://github.com/yichengup/ComfyUI-VideoBlender"
|
|
||||||
],
|
|
||||||
"install_type": "git-clone",
|
|
||||||
"description": "Video clip mixing"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"author": "xl0",
|
|
||||||
"title": "latent-tools [REMOVED]",
|
|
||||||
"reference": "https://github.com/xl0/latent-tools",
|
|
||||||
"files": [
|
|
||||||
"https://github.com/xl0/latent-tools"
|
|
||||||
],
|
|
||||||
"install_type": "git-clone",
|
|
||||||
"description": "Visualize and manipulate the latent space in ComfyUI"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"author": "Conor-Collins",
|
|
||||||
"title": "ComfyUI-CoCoTools [REMOVED]",
|
|
||||||
"reference": "https://github.com/Conor-Collins/coco_tools",
|
|
||||||
"files": [
|
|
||||||
"https://github.com/Conor-Collins/coco_tools"
|
|
||||||
],
|
|
||||||
"install_type": "git-clone",
|
|
||||||
"description": "A set of custom nodes for ComfyUI providing advanced image processing, file handling, and utility functions."
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"author": "theUpsider",
|
|
||||||
"title": "ComfyUI-Logic [DEPRECATED]",
|
|
||||||
"id": "comfy-logic",
|
|
||||||
"reference": "https://github.com/theUpsider/ComfyUI-Logic",
|
|
||||||
"files": [
|
|
||||||
"https://github.com/theUpsider/ComfyUI-Logic"
|
|
||||||
],
|
|
||||||
"install_type": "git-clone",
|
|
||||||
"description": "An extension to ComfyUI that introduces logic nodes and conditional rendering capabilities."
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"author": "Malloc-pix",
|
|
||||||
"title": "comfyui_qwen2.4_vl_node [REMOVED]",
|
|
||||||
"reference": "https://github.com/Malloc-pix/comfyui_qwen2.4_vl_node",
|
|
||||||
"files": [
|
|
||||||
"https://github.com/Malloc-pix/comfyui_qwen2.4_vl_node"
|
|
||||||
],
|
|
||||||
"install_type": "git-clone",
|
|
||||||
"description": "NODES: CogVLM2 Captioner, CLIP Dynamic Text Encode(cy)"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"author": "inyourdreams-studio",
|
|
||||||
"title": "ComfyUI-RBLM [REMOVED]",
|
|
||||||
"reference": "https://github.com/inyourdreams-studio/comfyui-rblm",
|
|
||||||
"files": [
|
|
||||||
"https://github.com/inyourdreams-studio/comfyui-rblm"
|
|
||||||
],
|
|
||||||
"install_type": "git-clone",
|
|
||||||
"description": "A custom node pack for ComfyUI that provides text manipulation nodes."
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"author": "dream-computing",
|
|
||||||
"title": "SyntaxNodes - Image Processing Effects for ComfyUI [REMOVED]",
|
|
||||||
"reference": "https://github.com/dream-computing/syntax-nodes",
|
|
||||||
"files": [
|
|
||||||
"https://github.com/dream-computing/syntax-nodes"
|
|
||||||
],
|
|
||||||
"install_type": "git-clone",
|
|
||||||
"description": "A collection of custom nodes for ComfyUI designed to apply various image processing effects, stylizations, and analyses."
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"author": "UD1sto",
|
|
||||||
"title": "plugin-utils-nodes [DEPRECATED]",
|
|
||||||
"reference": "https://github.com/its-DeFine/plugin-utils-nodes",
|
|
||||||
"files": [
|
|
||||||
"https://github.com/its-DeFine/plugin-utils-nodes"
|
|
||||||
],
|
|
||||||
"install_type": "git-clone",
|
|
||||||
"description": "NODES: Compare Images (SimHash), Image Selector, Temporal Consistency, Update Image Reference, Frame Blend."
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"author": "hanyingcho",
|
|
||||||
"title": "ComfyUI LLM Promp [REMOVED]",
|
|
||||||
"reference": "https://github.com/hanyingcho/comfyui-llmprompt",
|
|
||||||
"files": [
|
|
||||||
"https://github.com/hanyingcho/comfyui-llmprompt"
|
|
||||||
],
|
|
||||||
"install_type": "git-clone",
|
|
||||||
"description": "NODES: Load llm, Generate Text with LLM, Inference Qwen2VL, Inference Qwen2"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"author": "WASasquatch",
|
|
||||||
"title": "WAS Node Suite [DEPRECATED]",
|
|
||||||
"id": "was",
|
|
||||||
"reference": "https://github.com/WASasquatch/was-node-suite-comfyui",
|
|
||||||
"pip": ["numba"],
|
|
||||||
"files": [
|
|
||||||
"https://github.com/WASasquatch/was-node-suite-comfyui"
|
|
||||||
],
|
|
||||||
"install_type": "git-clone",
|
|
||||||
"description": "A node suite for ComfyUI with many new nodes, such as image processing, text processing, and more."
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"author": "TOM1063",
|
|
||||||
"title": "ComfyUI-SamuraiTools [REMOVED]",
|
|
||||||
"reference": "https://github.com/TOM1063/ComfyUI-SamuraiTools",
|
|
||||||
"files": [
|
|
||||||
"https://github.com/TOM1063/ComfyUI-SamuraiTools"
|
|
||||||
],
|
|
||||||
"install_type": "git-clone",
|
|
||||||
"description": "ComfyUI custom node for switching integer values based on boolean conditions"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"author": "whitemoney293",
|
|
||||||
"title": "ComfyUI-MediaUtilities [REMOVED]",
|
|
||||||
"reference": "https://github.com/ThanaritKanjanametawatAU/ComfyUI-MediaUtilities",
|
|
||||||
"files": [
|
|
||||||
"https://github.com/ThanaritKanjanametawatAU/ComfyUI-MediaUtilities"
|
|
||||||
],
|
|
||||||
"install_type": "git-clone",
|
|
||||||
"description": "Custom nodes for loading and previewing media from URLs in ComfyUI."
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"author": "pureexe",
|
|
||||||
"title": "DiffusionLight-ComfyUI [REMOVED]",
|
|
||||||
"reference": "https://github.com/pureexe/DiffusionLight-ComfyUI",
|
|
||||||
"files": [
|
|
||||||
"https://github.com/pureexe/DiffusionLight-ComfyUI"
|
|
||||||
],
|
|
||||||
"install_type": "git-clone",
|
|
||||||
"description": "DiffusionLight (Turbo) implemented in ComfyUI"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"author": "gondar-software",
|
|
||||||
"title": "comfyui-custom-padding [REMOVED]",
|
|
||||||
"reference": "https://github.com/gondar-software/comfyui-custom-padding",
|
|
||||||
"files": [
|
|
||||||
"https://github.com/gondar-software/comfyui-custom-padding"
|
|
||||||
],
|
|
||||||
"install_type": "git-clone",
|
|
||||||
"description": "NODES: Adaptive image padding, Adaptive image unpadding"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"author": "Charonartist",
|
|
||||||
"title": "ComfyUI-EagleExporter [REMOVED]",
|
|
||||||
"reference": "https://github.com/Charonartist/ComfyUI-EagleExporter",
|
|
||||||
"files": [
|
|
||||||
"https://github.com/Charonartist/ComfyUI-EagleExporter"
|
|
||||||
],
|
|
||||||
"install_type": "git-clone",
|
|
||||||
"description": "This is an extension that automatically saves video files generated with ComfyUI's 'video combine' extension to the Eagle library."
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"author": "pomePLaszlo-collablyu",
|
|
||||||
"title": "comfyui_ejam [REMOVED]",
|
|
||||||
"reference": "https://github.com/PLaszlo-collab/comfyui_ejam",
|
|
||||||
"files": [
|
|
||||||
"https://github.com/PLaszlo-collab/comfyui_ejam"
|
|
||||||
],
|
|
||||||
"install_type": "git-clone",
|
|
||||||
"description": "Ejam nodes for comfyui"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"author": "jonnydolake",
|
|
||||||
"title": "ComfyUI-AIR-Nodes [REMOVED]",
|
|
||||||
"reference": "https://github.com/jonnydolake/ComfyUI-AIR-Nodes",
|
|
||||||
"files": [
|
|
||||||
"https://github.com/jonnydolake/ComfyUI-AIR-Nodes"
|
|
||||||
],
|
|
||||||
"install_type": "git-clone",
|
|
||||||
"description": "NODES: String List To Prompt Schedule, Force Minimum Batch Size, Target Location (Crop), Target Location (Paste), Image Composite Chained, Match Image Count To Mask Count, Random Character Prompts, Parallax Test, Easy Parallax, Parallax GPU Test"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"author": "solution9th",
|
|
||||||
"title": "Comfyui_mobilesam [REMOVED]",
|
|
||||||
"reference": "https://github.com/solution9th/Comfyui_mobilesam",
|
|
||||||
"files": [
|
|
||||||
"https://github.com/solution9th/Comfyui_mobilesam"
|
|
||||||
],
|
|
||||||
"install_type": "git-clone",
|
|
||||||
"description": "NODES: Mobile SAM Model Loader, Mobile SAM Detector, Mobile SAM Predictor"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"author": "syaofox",
|
|
||||||
"title": "ComfyUI_fnodes [REMOVED]",
|
|
||||||
"reference": "https://github.com/syaofox/ComfyUI_fnodes",
|
|
||||||
"files": [
|
|
||||||
"https://github.com/syaofox/ComfyUI_fnodes"
|
|
||||||
],
|
|
||||||
"install_type": "git-clone",
|
|
||||||
"description": "ComfyUI_fnodes is a collection of custom nodes designed for ComfyUI. These nodes provide additional functionality that can enhance your ComfyUI workflows.\nFile manipulation tools, Image resizing tools, IPAdapter tools, Image processing tools, Mask tools, Face analysis tools, Sampler tools, Miscellaneous tools"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"author": "Hangover3832",
|
|
||||||
"title": "ComfyUI-Hangover-Moondream [DEPRECATED]",
|
|
||||||
"reference": "https://github.com/Hangover3832/ComfyUI-Hangover-Moondream",
|
|
||||||
"files": [
|
|
||||||
"https://github.com/Hangover3832/ComfyUI-Hangover-Moondream"
|
|
||||||
],
|
|
||||||
"install_type": "git-clone",
|
|
||||||
"description": "Moondream is a lightweight multimodal large language model.\n[w/WARN:Additional python code will be downloaded from huggingface and executed. You have to trust this creator if you want to use this node!]"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"author": "Hangover3832",
|
|
||||||
"title": "Recognize Anything Model (RAM) for ComfyUI [DEPRECATED]",
|
|
||||||
"reference": "https://github.com/Hangover3832/ComfyUI-Hangover-Recognize_Anything",
|
|
||||||
"files": [
|
|
||||||
"https://github.com/Hangover3832/ComfyUI-Hangover-Recognize_Anything"
|
|
||||||
],
|
|
||||||
"install_type": "git-clone",
|
|
||||||
"description": "This is an image recognition node for ComfyUI based on the RAM++ model from [a/xinyu1205](https://huggingface.co/xinyu1205).\nThis node outputs a string of tags with all the recognized objects and elements in the image in English or Chinese language.\nFor image tagging and captioning."
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"author": "Hangover3832",
|
|
||||||
"title": "ComfyUI-Hangover-Nodes [DEPRECATED]",
|
|
||||||
"reference": "https://github.com/Hangover3832/ComfyUI-Hangover-Nodes",
|
|
||||||
"files": [
|
|
||||||
"https://github.com/Hangover3832/ComfyUI-Hangover-Nodes"
|
|
||||||
],
|
|
||||||
"install_type": "git-clone",
|
|
||||||
"description": "Nodes: MS kosmos-2 Interrogator, Save Image w/o Metadata, Image Scale Bounding Box. An implementation of Microsoft [a/kosmos-2](https://huggingface.co/microsoft/kosmos-2-patch14-224) image to text transformer."
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"author": "SirLatore",
|
|
||||||
"title": "ComfyUI-IPAdapterWAN [REMOVED]",
|
|
||||||
"reference": "https://github.com/SirLatore/ComfyUI-IPAdapterWAN",
|
|
||||||
"files": [
|
|
||||||
"https://github.com/SirLatore/ComfyUI-IPAdapterWAN"
|
|
||||||
],
|
|
||||||
"install_type": "git-clone",
|
|
||||||
"description": "This extension adapts the [a/InstantX IP-Adapter for SD3.5-Large](https://huggingface.co/InstantX/SD3.5-Large-IP-Adapter) to work with Wan 2.1 and other UNet-based video/image models in ComfyUI.\nUnlike the original SD3 version (which depends on joint_blocks from MMDiT), this version performs sampling-time identity conditioning by dynamically injecting into attention layers — making it compatible with models like Wan 2.1, AnimateDiff, and other non-SD3 pipelines."
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"author": "Jpzz",
|
|
||||||
"title": "ComfyUI-VirtualInteraction [UNSAFE/REMOVED]",
|
|
||||||
"reference": "https://github.com/Jpzz/ComfyUI-VirtualInteraction",
|
|
||||||
"files": [
|
|
||||||
"https://github.com/Jpzz/ComfyUI-VirtualInteraction"
|
|
||||||
],
|
|
||||||
"install_type": "git-clone",
|
|
||||||
"description": "NODES: virtual interaction custom node when using generative movie\n[w/This nodepack contains a node which is reading arbitrary excel file.]"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"author": "satche",
|
|
||||||
"title": "Prompt Factory [REMOVED]",
|
|
||||||
"reference": "https://github.com/satche/comfyui-prompt-factory",
|
|
||||||
"files": [
|
|
||||||
"https://github.com/satche/comfyui-prompt-factory"
|
|
||||||
],
|
|
||||||
"install_type": "git-clone",
|
|
||||||
"description": "A modular system that adds randomness to prompt generation"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"author": "MITCAP",
|
|
||||||
"title": "ComfyUI OpenAI DALL-E 3 Node [REMOVED]",
|
|
||||||
"reference": "https://github.com/MITCAP/OpenAI-ComfyUI",
|
|
||||||
"files": [
|
|
||||||
"https://github.com/MITCAP/OpenAI-ComfyUI"
|
|
||||||
],
|
|
||||||
"install_type": "git-clone",
|
|
||||||
"description": "This project provides custom nodes for ComfyUI that integrate with OpenAI's DALL-E 3 and GPT-4o models. The nodes allow users to generate images and describe images using OpenAI's API.\nNOTE: The files in the repo are not organized."
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"author": "raspie10032",
|
|
||||||
"title": "ComfyUI NAI Prompt Converter [REMOVED]",
|
|
||||||
"reference": "https://github.com/raspie10032/ComfyUI_RS_NAI_Local_Prompt_converter",
|
|
||||||
"files": [
|
|
||||||
"https://github.com/raspie10032/ComfyUI_RS_NAI_Local_Prompt_converter"
|
|
||||||
],
|
|
||||||
"install_type": "git-clone",
|
|
||||||
"description": "A custom node extension for ComfyUI that enables conversion between different prompt formats: NovelAI V4, ComfyUI, and old NovelAI."
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"author": "holchan",
|
|
||||||
"title": "ComfyUI-ModelDownloader [REMOVED]",
|
|
||||||
"reference": "https://github.com/holchan/ComfyUI-ModelDownloader",
|
|
||||||
"files": [
|
|
||||||
"https://github.com/holchan/ComfyUI-ModelDownloader"
|
|
||||||
],
|
|
||||||
"install_type": "git-clone",
|
|
||||||
"description": "A ComfyUI node to download models(Checkpoints and LoRA) from external links and act as an output standalone node."
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"author": "Kur0butiMegane",
|
|
||||||
"title": "Comfyui-StringUtils [DEPRECATED]",
|
|
||||||
"reference": "https://github.com/Kur0butiMegane/Comfyui-StringUtils",
|
|
||||||
"files": [
|
|
||||||
"https://github.com/Kur0butiMegane/Comfyui-StringUtils"
|
|
||||||
],
|
|
||||||
"install_type": "git-clone",
|
|
||||||
"description": "NODES: Prompt Normalizer, String Splitter, String Line Selector, Extract Markup Value"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"author": "Apache0ne",
|
|
||||||
"title": "ComfyUI-LantentCompose [REMOVED]",
|
|
||||||
"reference": "https://github.com/Apache0ne/ComfyUI-LantentCompose",
|
|
||||||
"files": [
|
|
||||||
"https://github.com/Apache0ne/ComfyUI-LantentCompose"
|
|
||||||
],
|
|
||||||
"install_type": "git-clone",
|
|
||||||
"description": "Interpolate sdxl latents using slerp with and without a mask. use with unsample nodes for best effect.\nNOTE: The files in the repo are not organized."
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"author": "jax-explorer",
|
|
||||||
"title": "ComfyUI-H-flow [REMOVED]",
|
|
||||||
"reference": "https://github.com/jax-explorer/ComfyUI-H-flow",
|
|
||||||
"files": [
|
|
||||||
"https://github.com/jax-explorer/ComfyUI-H-flow"
|
|
||||||
],
|
|
||||||
"install_type": "git-clone",
|
|
||||||
"description": "NODES: Wan2-1 Image To Video, LLM Task, Save Image, Save Video, Show Text, FluxPro Ultra, IdeogramV2 Turbo, Runway Image To Video, Kling Image To Video, Replace Text, Join Text, Test Image, Test Text"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"author": "Apache0ne",
|
|
||||||
"title": "SambaNova [REMOVED]",
|
|
||||||
"id": "SambaNovaAPI",
|
|
||||||
"reference": "https://github.com/Apache0ne/SambaNova",
|
|
||||||
"files": [
|
|
||||||
"https://github.com/Apache0ne/SambaNova"
|
|
||||||
],
|
|
||||||
"install_type": "git-clone",
|
|
||||||
"description": "Super Fast LLM's llama3.1-405B,70B,8B and more"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"author": "Apache0ne",
|
|
||||||
"title": "ComfyUI-EasyUrlLoader [REMOVED]",
|
|
||||||
"id": "easy-url-loader",
|
|
||||||
"reference": "https://github.com/Apache0ne/ComfyUI-EasyUrlLoader",
|
|
||||||
"files": [
|
|
||||||
"https://github.com/Apache0ne/ComfyUI-EasyUrlLoader"
|
|
||||||
],
|
|
||||||
"install_type": "git-clone",
|
|
||||||
"description": "A simple YT downloader node for ComfyUI using video Urls. Can be used with VHS nodes etc."
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"author": "nxt5656",
|
|
||||||
"title": "ComfyUI-Image2OSS [REMOVED]",
|
|
||||||
"reference": "https://github.com/nxt5656/ComfyUI-Image2OSS",
|
|
||||||
"files": [
|
|
||||||
"https://github.com/nxt5656/ComfyUI-Image2OSS"
|
|
||||||
],
|
|
||||||
"install_type": "git-clone",
|
|
||||||
"description": "Upload the image to Alibaba Cloud OSS."
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"author": "ainewsto",
|
|
||||||
"title": "Comfyui_Comfly",
|
|
||||||
"reference": "https://github.com/ainewsto/Comfyui_Comfly",
|
|
||||||
"files": [
|
|
||||||
"https://github.com/ainewsto/Comfyui_Comfly"
|
|
||||||
],
|
|
||||||
"install_type": "git-clone",
|
|
||||||
"description": "NODES: Comfly_Mj, Comfly_mjstyle, Comfly_upload, Comfly_Mju, Comfly_Mjv, Comfly_kling_videoPreview\nNOTE: Comfyui_Comfly_v2 is introduced."
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"author": "shinich39",
|
|
||||||
"title": "comfyui-to-inpaint",
|
|
||||||
"reference": "https://github.com/shinich39/comfyui-to-inpaint",
|
|
||||||
"files": [
|
|
||||||
"https://github.com/shinich39/comfyui-to-inpaint"
|
|
||||||
],
|
|
||||||
"install_type": "git-clone",
|
|
||||||
"description": "Send preview image to inpaint workflow."
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"author": "magic-quill",
|
|
||||||
"title": "ComfyUI_MagicQuill [NOT MAINTAINED]",
|
|
||||||
"id": "MagicQuill",
|
|
||||||
"reference": "https://github.com/magic-quill/ComfyUI_MagicQuill",
|
|
||||||
"files": [
|
|
||||||
"https://github.com/magic-quill/ComfyUI_MagicQuill"
|
|
||||||
],
|
|
||||||
"install_type": "git-clone",
|
|
||||||
"description": "Towards GPT-4 like large language and visual assistant.\nNOTE: The current version has not been maintained for a long time and does not work. Please use https://github.com/brantje/ComfyUI_MagicQuill instead."
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"author": "shinich39",
|
|
||||||
"title": "comfyui-event-handler [USAFE/REMOVED]",
|
|
||||||
"reference": "https://github.com/shinich39/comfyui-event-handler",
|
|
||||||
"files": [
|
|
||||||
"https://github.com/shinich39/comfyui-event-handler"
|
|
||||||
],
|
|
||||||
"install_type": "git-clone",
|
|
||||||
"description": "Javascript code will run when an event fires. [w/This node allows you to execute arbitrary JavaScript code as input for the workflow.]"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"author": "Moooonet",
|
|
||||||
"title": "ComfyUI-ArteMoon [REMOVED]",
|
|
||||||
"reference": "https://github.com/Moooonet/ComfyUI-ArteMoon",
|
|
||||||
"files": [
|
|
||||||
"https://github.com/Moooonet/ComfyUI-ArteMoon"
|
|
||||||
],
|
|
||||||
"install_type": "git-clone",
|
|
||||||
"description": "This plugin works with [a/IF_AI_Tools](https://github.com/if-ai/ComfyUI-IF_AI_tools) to build a workflow in ComfyUI that uses AI to assist in generating prompts."
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"author": "ryanontheinside",
|
|
||||||
"title": "ComfyUI-MediaPipe-Vision [REMOVED]",
|
|
||||||
"reference": "https://github.com/ryanontheinside/ComfyUI-MediaPipe-Vision",
|
|
||||||
"files": [
|
|
||||||
"https://github.com/ryanontheinside/ComfyUI-MediaPipe-Vision"
|
|
||||||
],
|
|
||||||
"install_type": "git-clone",
|
|
||||||
"description": "A centralized wrapper of all MediaPipe vision tasks for ComfyUI."
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"author": "shinich39",
|
|
||||||
"title": "comfyui-textarea-command [REMOVED]",
|
|
||||||
"reference": "https://github.com/shinich39/comfyui-textarea-command",
|
|
||||||
"files": [
|
|
||||||
"https://github.com/shinich39/comfyui-textarea-command"
|
|
||||||
],
|
|
||||||
"install_type": "git-clone",
|
|
||||||
"description": "Add command and comment in textarea. (e.g. // Disabled line)"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"author": "shinich39",
|
|
||||||
"title": "comfyui-parse-image [REMOVED]",
|
|
||||||
"reference": "https://github.com/shinich39/comfyui-parse-image",
|
|
||||||
"files": [
|
|
||||||
"https://github.com/shinich39/comfyui-parse-image"
|
|
||||||
],
|
|
||||||
"install_type": "git-clone",
|
|
||||||
"description": "Extract metadata from image."
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"author": "shinich39",
|
|
||||||
"title": "comfyui-put-image [REMOVED]",
|
|
||||||
"reference": "https://github.com/shinich39/comfyui-put-image",
|
|
||||||
"files": [
|
|
||||||
"https://github.com/shinich39/comfyui-put-image"
|
|
||||||
],
|
|
||||||
"install_type": "git-clone",
|
|
||||||
"description": "Load image from directory."
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"author": "fredconex",
|
|
||||||
"title": "TripoSG Nodes for ComfyUI [REMOVED]",
|
|
||||||
"reference": "https://github.com/fredconex/ComfyUI-TripoSG",
|
|
||||||
"files": [
|
|
||||||
"https://github.com/fredconex/ComfyUI-TripoSG"
|
|
||||||
],
|
|
||||||
"install_type": "git-clone",
|
|
||||||
"description": "Created by Alfredo Fernandes inspired by Hunyuan3D nodes by Kijai. This extension adds TripoSG 3D mesh generation capabilities to ComfyUI, allowing you to generate 3D meshes from a single image using the TripoSG model."
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"author": "fredconex",
|
|
||||||
"title": "ComfyUI-PaintTurbo [REMOVED]",
|
|
||||||
"reference": "https://github.com/fredconex/ComfyUI-PaintTurbo",
|
|
||||||
"files": [
|
|
||||||
"https://github.com/fredconex/ComfyUI-PaintTurbo"
|
|
||||||
],
|
|
||||||
"install_type": "git-clone",
|
|
||||||
"description": "NODES: Hunyuan3D Texture Mesh"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"author": "zhuanqianfish",
|
|
||||||
"title": "TaesdDecoder [REMOVED]",
|
|
||||||
"reference": "https://github.com/zhuanqianfish/TaesdDecoder",
|
|
||||||
"files": [
|
|
||||||
"https://github.com/zhuanqianfish/TaesdDecoder"
|
|
||||||
],
|
|
||||||
"install_type": "git-clone",
|
|
||||||
"description": "use TAESD decoded image.you need donwload taesd_decoder.pth and taesdxl_decoder.pth to vae_approx folder first.\n It will result in a slight loss of image quality and a significant decrease in peak video memory during decoding."
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"author": "myAiLemon",
|
|
||||||
"title": "MagicAutomaticPicture [REMOVED]",
|
|
||||||
"reference": "https://github.com/myAiLemon/MagicAutomaticPicture",
|
|
||||||
"files": [
|
|
||||||
"https://github.com/myAiLemon/MagicAutomaticPicture"
|
|
||||||
],
|
|
||||||
"install_type": "git-clone",
|
|
||||||
"description": "A comfyui node package that can generate pictures and automatically save positive prompts and eliminate unwanted prompts"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"author": "thisiseddy-ab",
|
|
||||||
"title": "ComfyUI-Edins-Ultimate-Pack [REMOVED]",
|
|
||||||
"reference": "https://github.com/thisiseddy-ab/ComfyUI-Edins-Ultimate-Pack",
|
|
||||||
"files": [
|
|
||||||
"https://github.com/thisiseddy-ab/ComfyUI-Edins-Ultimate-Pack"
|
|
||||||
],
|
|
||||||
"install_type": "git-clone",
|
|
||||||
"description": "Well i needet a Tiled Ksampler that still works for Comfy UI there were none so i made one, in this Package i will put all Nodes i will develop for Comfy Ui still in beta alot will change.."
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"author": "Davros666",
|
|
||||||
"title": "safetriggers [REMOVED]",
|
|
||||||
"reference": "https://github.com/Davros666/safetriggers",
|
|
||||||
"files": [
|
|
||||||
"https://github.com/Davros666/safetriggers"
|
|
||||||
],
|
|
||||||
"install_type": "git-clone",
|
|
||||||
"description": "ComfyUI Nodes for READING TRIGGERS, TRIGGER-WORDS, TRIGGER-PHRASES FROM LoRAs"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"author": "cubiq",
|
|
||||||
"title": "Simple Math [REMOVED]",
|
|
||||||
"id": "simplemath",
|
|
||||||
"reference": "https://github.com/cubiq/ComfyUI_SimpleMath",
|
|
||||||
"files": [
|
|
||||||
"https://github.com/cubiq/ComfyUI_SimpleMath"
|
|
||||||
],
|
|
||||||
"install_type": "git-clone",
|
|
||||||
"description": "custom node for ComfyUI to perform simple math operations"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"author": "lucafoscili",
|
|
||||||
"title": "LF Nodes [DEPRECATED]",
|
|
||||||
"reference": "https://github.com/lucafoscili/comfyui-lf",
|
|
||||||
"files": [
|
|
||||||
"https://github.com/lucafoscili/comfyui-lf"
|
|
||||||
],
|
|
||||||
"install_type": "git-clone",
|
|
||||||
"description": "Custom nodes with a touch of extra UX, including: history for primitives, JSON manipulation, logic switches with visual feedback, LLM chat... and more!"
|
|
||||||
},
|
},
|
||||||
|
|
||||||
|
|
||||||
{
|
{
|
||||||
"author": "AI2lab",
|
"author": "AI2lab",
|
||||||
"title": "comfyUI-tool-2lab [REMOVED]",
|
"title": "comfyUI-tool-2lab [REMOVED]",
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@@ -1,219 +1,5 @@
|
|||||||
{
|
{
|
||||||
"models": [
|
"models": [
|
||||||
{
|
|
||||||
"name": "sam2.1_hiera_tiny.pt",
|
|
||||||
"type": "sam2.1",
|
|
||||||
"base": "SAM",
|
|
||||||
"save_path": "sams",
|
|
||||||
"description": "Segmenty Anything SAM 2.1 hiera model (tiny)",
|
|
||||||
"reference": "https://github.com/facebookresearch/sam2#model-description",
|
|
||||||
"filename": "sam2.1_hiera_tiny.pt",
|
|
||||||
"url": "https://dl.fbaipublicfiles.com/segment_anything_2/092824/sam2.1_hiera_tiny.pt",
|
|
||||||
"size": "149.0MB"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "sam2.1_hiera_small.pt",
|
|
||||||
"type": "sam2.1",
|
|
||||||
"base": "SAM",
|
|
||||||
"save_path": "sams",
|
|
||||||
"description": "Segmenty Anything SAM 2.1 hiera model (small)",
|
|
||||||
"reference": "https://github.com/facebookresearch/sam2#model-description",
|
|
||||||
"filename": "sam2.1_hiera_small.pt",
|
|
||||||
"url": "https://dl.fbaipublicfiles.com/segment_anything_2/092824/sam2.1_hiera_small.pt",
|
|
||||||
"size": "176.0MB"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "sam2.1_hiera_base_plus.pt",
|
|
||||||
"type": "sam2.1",
|
|
||||||
"base": "SAM",
|
|
||||||
"save_path": "sams",
|
|
||||||
"description": "Segmenty Anything SAM 2.1 hiera model (base+)",
|
|
||||||
"reference": "https://github.com/facebookresearch/sam2#model-description",
|
|
||||||
"filename": "sam2.1_hiera_base_plus.pt",
|
|
||||||
"url": "https://dl.fbaipublicfiles.com/segment_anything_2/092824/sam2.1_hiera_base_plus.pt",
|
|
||||||
"size": "309.0MB"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "sam2.1_hiera_large.pt",
|
|
||||||
"type": "sam2.1",
|
|
||||||
"base": "SAM",
|
|
||||||
"save_path": "sams",
|
|
||||||
"description": "Segmenty Anything SAM 2.1 hiera model (large)",
|
|
||||||
"reference": "https://github.com/facebookresearch/sam2#model-description",
|
|
||||||
"filename": "sam2.1_hiera_large.pt",
|
|
||||||
"url": "https://dl.fbaipublicfiles.com/segment_anything_2/092824/sam2.1_hiera_large.pt",
|
|
||||||
"size": "857.0MB"
|
|
||||||
},
|
|
||||||
|
|
||||||
{
|
|
||||||
"name": "sam2_hiera_tiny.pt",
|
|
||||||
"type": "sam2",
|
|
||||||
"base": "SAM",
|
|
||||||
"save_path": "sams",
|
|
||||||
"description": "Segmenty Anything SAM 2 hiera model (tiny)",
|
|
||||||
"reference": "https://github.com/facebookresearch/sam2#model-description",
|
|
||||||
"filename": "sam2_hiera_tiny.pt",
|
|
||||||
"url": "https://dl.fbaipublicfiles.com/segment_anything_2/072824/sam2_hiera_tiny.pt",
|
|
||||||
"size": "149.0MB"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "sam2_hiera_small.pt",
|
|
||||||
"type": "sam2",
|
|
||||||
"base": "SAM",
|
|
||||||
"save_path": "sams",
|
|
||||||
"description": "Segmenty Anything SAM 2 hiera model (small)",
|
|
||||||
"reference": "https://github.com/facebookresearch/sam2#model-description",
|
|
||||||
"filename": "sam2_hiera_small.pt",
|
|
||||||
"url": "https://dl.fbaipublicfiles.com/segment_anything_2/072824/sam2_hiera_small.pt",
|
|
||||||
"size": "176.0MB"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "sam2_hiera_base_plus.pt",
|
|
||||||
"type": "sam2",
|
|
||||||
"base": "SAM",
|
|
||||||
"save_path": "sams",
|
|
||||||
"description": "Segmenty Anything SAM 2 hiera model (base+)",
|
|
||||||
"reference": "https://github.com/facebookresearch/sam2#model-description",
|
|
||||||
"filename": "sam2_hiera_base_plus.pt",
|
|
||||||
"url": "https://dl.fbaipublicfiles.com/segment_anything_2/072824/sam2_hiera_base_plus.pt",
|
|
||||||
"size": "309.0MB"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "sam2_hiera_large.pt",
|
|
||||||
"type": "sam2",
|
|
||||||
"base": "SAM",
|
|
||||||
"save_path": "sams",
|
|
||||||
"description": "Segmenty Anything SAM 2 hiera model (large)",
|
|
||||||
"reference": "https://github.com/facebookresearch/sam2#model-description",
|
|
||||||
"filename": "sam2_hiera_large.pt",
|
|
||||||
"url": "https://dl.fbaipublicfiles.com/segment_anything_2/072824/sam2_hiera_large.pt",
|
|
||||||
"size": "857.0MB"
|
|
||||||
},
|
|
||||||
|
|
||||||
{
|
|
||||||
"name": "Comfy-Org/omnigen2_fp16.safetensors",
|
|
||||||
"type": "diffusion_model",
|
|
||||||
"base": "OmniGen2",
|
|
||||||
"save_path": "default",
|
|
||||||
"description": "OmniGen2 diffusion model. This is required for using OmniGen2.",
|
|
||||||
"reference": "https://huggingface.co/Comfy-Org/Omnigen2_ComfyUI_repackaged",
|
|
||||||
"filename": "omnigen2_fp16.safetensors",
|
|
||||||
"url": "https://huggingface.co/Comfy-Org/Omnigen2_ComfyUI_repackaged/resolve/main/split_files/diffusion_models/omnigen2_fp16.safetensors",
|
|
||||||
"size": "7.93GB"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "Comfy-Org/qwen_2.5_vl_fp16.safetensors",
|
|
||||||
"type": "clip",
|
|
||||||
"base": "qwen-2.5",
|
|
||||||
"save_path": "default",
|
|
||||||
"description": "text encoder for OmniGen2",
|
|
||||||
"reference": "https://huggingface.co/Comfy-Org/Omnigen2_ComfyUI_repackaged",
|
|
||||||
"filename": "qwen_2.5_vl_fp16.safetensors",
|
|
||||||
"url": "https://huggingface.co/Comfy-Org/Omnigen2_ComfyUI_repackaged/resolve/main/split_files/text_encoders/qwen_2.5_vl_fp16.safetensors",
|
|
||||||
"size": "7.51GB"
|
|
||||||
},
|
|
||||||
|
|
||||||
{
|
|
||||||
"name": "Latent Bridge Matching for Image Relighting",
|
|
||||||
"type": "diffusion_model",
|
|
||||||
"base": "LBM",
|
|
||||||
"save_path": "diffusion_models/LBM",
|
|
||||||
"description": "Latent Bridge Matching (LBM) Relighting model",
|
|
||||||
"reference": "https://huggingface.co/jasperai/LBM_relighting",
|
|
||||||
"filename": "LBM_relighting.safetensors",
|
|
||||||
"url": "https://huggingface.co/jasperai/LBM_relighting/resolve/main/model.safetensors",
|
|
||||||
"size": "5.02GB"
|
|
||||||
},
|
|
||||||
|
|
||||||
{
|
|
||||||
"name": "LTX-Video 13B Distilled v0.9.7",
|
|
||||||
"type": "checkpoint",
|
|
||||||
"base": "LTX-Video",
|
|
||||||
"save_path": "checkpoints/LTXV",
|
|
||||||
"description": "Distilled version of the LTX-Video 13B model, providing improved efficiency while maintaining high-resolution quality.",
|
|
||||||
"reference": "https://huggingface.co/Lightricks/LTX-Video",
|
|
||||||
"filename": "ltxv-13b-0.9.7-distilled.safetensors",
|
|
||||||
"url": "https://huggingface.co/Lightricks/LTX-Video/resolve/main/ltxv-13b-0.9.7-distilled.safetensors",
|
|
||||||
"size": "28.6GB"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "LTX-Video 13B Distilled FP8 v0.9.7",
|
|
||||||
"type": "checkpoint",
|
|
||||||
"base": "LTX-Video",
|
|
||||||
"save_path": "checkpoints/LTXV",
|
|
||||||
"description": "Quantized distilled version of the LTX-Video 13B model, optimized for even lower VRAM usage while maintaining quality.",
|
|
||||||
"reference": "https://huggingface.co/Lightricks/LTX-Video",
|
|
||||||
"filename": "ltxv-13b-0.9.7-distilled-fp8.safetensors",
|
|
||||||
"url": "https://huggingface.co/Lightricks/LTX-Video/resolve/main/ltxv-13b-0.9.7-distilled-fp8.safetensors",
|
|
||||||
"size": "15.7GB"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "LTX-Video 13B Distilled LoRA v0.9.7",
|
|
||||||
"type": "lora",
|
|
||||||
"base": "LTX-Video",
|
|
||||||
"save_path": "loras",
|
|
||||||
"description": "A LoRA adapter that transforms the standard LTX-Video 13B model into a distilled version when loaded.",
|
|
||||||
"reference": "https://huggingface.co/Lightricks/LTX-Video",
|
|
||||||
"filename": "ltxv-13b-0.9.7-distilled-lora128.safetensors",
|
|
||||||
"url": "https://huggingface.co/Lightricks/LTX-Video/resolve/main/ltxv-13b-0.9.7-distilled-lora128.safetensors",
|
|
||||||
"size": "1.33GB"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "lllyasviel/FramePackI2V_HY",
|
|
||||||
"type": "FramePackI2V",
|
|
||||||
"base": "FramePackI2V",
|
|
||||||
"save_path": "diffusers/lllyasviel",
|
|
||||||
"description": "[SNAPSHOT] This is the f1k1_x_g9_f1k1f2k2f16k4_td FramePack for HY. [w/You cannot download this item on ComfyUI-Manager versions below V3.18]",
|
|
||||||
"reference": "https://huggingface.co/lllyasviel/FramePackI2V_HY",
|
|
||||||
"filename": "<huggingface>",
|
|
||||||
"url": "lllyasviel/FramePackI2V_HY",
|
|
||||||
"size": "25.75GB"
|
|
||||||
},
|
|
||||||
|
|
||||||
{
|
|
||||||
"name": "LTX-Video Spatial Upscaler v0.9.7",
|
|
||||||
"type": "checkpoint",
|
|
||||||
"base": "LTX-Video",
|
|
||||||
"save_path": "checkpoints/LTXV",
|
|
||||||
"description": "Spatial upscaler model for LTX-Video. This model enhances the spatial resolution of generated videos.",
|
|
||||||
"reference": "https://huggingface.co/Lightricks/LTX-Video",
|
|
||||||
"filename": "ltxv-spatial-upscaler-0.9.7.safetensors",
|
|
||||||
"url": "https://huggingface.co/Lightricks/LTX-Video/resolve/main/ltxv-spatial-upscaler-0.9.7.safetensors",
|
|
||||||
"size": "505MB"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "LTX-Video Temporal Upscaler v0.9.7",
|
|
||||||
"type": "checkpoint",
|
|
||||||
"base": "LTX-Video",
|
|
||||||
"save_path": "checkpoints/LTXV",
|
|
||||||
"description": "Temporal upscaler model for LTX-Video. This model enhances the temporal resolution and smoothness of generated videos.",
|
|
||||||
"reference": "https://huggingface.co/Lightricks/LTX-Video",
|
|
||||||
"filename": "ltxv-temporal-upscaler-0.9.7.safetensors",
|
|
||||||
"url": "https://huggingface.co/Lightricks/LTX-Video/resolve/main/ltxv-temporal-upscaler-0.9.7.safetensors",
|
|
||||||
"size": "524MB"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "LTX-Video 13B v0.9.7",
|
|
||||||
"type": "checkpoint",
|
|
||||||
"base": "LTX-Video",
|
|
||||||
"save_path": "checkpoints/LTXV",
|
|
||||||
"description": "High-resolution quality LTX-Video 13B model.",
|
|
||||||
"reference": "https://huggingface.co/Lightricks/LTX-Video",
|
|
||||||
"filename": "ltxv-13b-0.9.7-dev.safetensors",
|
|
||||||
"url": "https://huggingface.co/Lightricks/LTX-Video/resolve/main/ltxv-13b-0.9.7-dev.safetensors",
|
|
||||||
"size": "28.6GB"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "LTX-Video 13B FP8 v0.9.7",
|
|
||||||
"type": "checkpoint",
|
|
||||||
"base": "LTX-Video",
|
|
||||||
"save_path": "checkpoints/LTXV",
|
|
||||||
"description": "Quantized version of the LTX-Video 13B model, optimized for lower VRAM usage while maintaining high quality.",
|
|
||||||
"reference": "https://huggingface.co/Lightricks/LTX-Video",
|
|
||||||
"filename": "ltxv-13b-0.9.7-dev-fp8.safetensors",
|
|
||||||
"url": "https://huggingface.co/Lightricks/LTX-Video/resolve/main/ltxv-13b-0.9.7-dev-fp8.safetensors",
|
|
||||||
"size": "15.7GB"
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
"name": "Comfy-Org/Wan2.1 i2v 480p 14B (bf16)",
|
"name": "Comfy-Org/Wan2.1 i2v 480p 14B (bf16)",
|
||||||
"type": "diffusion_model",
|
"type": "diffusion_model",
|
||||||
@@ -689,6 +475,236 @@
|
|||||||
"filename": "flux-hed-controlnet-v3.safetensors",
|
"filename": "flux-hed-controlnet-v3.safetensors",
|
||||||
"url": "https://huggingface.co/XLabs-AI/flux-controlnet-collections/resolve/main/flux-hed-controlnet-v3.safetensors",
|
"url": "https://huggingface.co/XLabs-AI/flux-controlnet-collections/resolve/main/flux-hed-controlnet-v3.safetensors",
|
||||||
"size": "1.49GB"
|
"size": "1.49GB"
|
||||||
|
},
|
||||||
|
|
||||||
|
{
|
||||||
|
"name": "XLabs-AI/realism_lora.safetensors",
|
||||||
|
"type": "lora",
|
||||||
|
"base": "FLUX.1",
|
||||||
|
"save_path": "xlabs/loras",
|
||||||
|
"description": "A checkpoint with trained LoRAs for FLUX.1-dev model by Black Forest Labs",
|
||||||
|
"reference": "https://huggingface.co/XLabs-AI/flux-lora-collection",
|
||||||
|
"filename": "realism_lora.safetensors",
|
||||||
|
"url": "https://huggingface.co/XLabs-AI/flux-lora-collection/resolve/main/realism_lora.safetensors",
|
||||||
|
"size": "44.8MB"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "XLabs-AI/art_lora.safetensors",
|
||||||
|
"type": "lora",
|
||||||
|
"base": "FLUX.1",
|
||||||
|
"save_path": "xlabs/loras",
|
||||||
|
"description": "A checkpoint with trained LoRAs for FLUX.1-dev model by Black Forest Labs",
|
||||||
|
"reference": "https://huggingface.co/XLabs-AI/flux-lora-collection",
|
||||||
|
"filename": "art_lora.safetensors",
|
||||||
|
"url": "https://huggingface.co/XLabs-AI/flux-lora-collection/resolve/main/scenery_lora.safetensors",
|
||||||
|
"size": "44.8MB"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "XLabs-AI/mjv6_lora.safetensors",
|
||||||
|
"type": "lora",
|
||||||
|
"base": "FLUX.1",
|
||||||
|
"save_path": "xlabs/loras",
|
||||||
|
"description": "A checkpoint with trained LoRAs for FLUX.1-dev model by Black Forest Labs",
|
||||||
|
"reference": "https://huggingface.co/XLabs-AI/flux-lora-collection",
|
||||||
|
"filename": "mjv6_lora.safetensors",
|
||||||
|
"url": "https://huggingface.co/XLabs-AI/flux-lora-collection/resolve/main/mjv6_lora.safetensors",
|
||||||
|
"size": "44.8MB"
|
||||||
|
},
|
||||||
|
|
||||||
|
{
|
||||||
|
"name": "XLabs-AI/flux-ip-adapter",
|
||||||
|
"type": "lora",
|
||||||
|
"base": "FLUX.1",
|
||||||
|
"save_path": "xlabs/ipadapters",
|
||||||
|
"description": "A checkpoint with trained LoRAs for FLUX.1-dev model by Black Forest Labs",
|
||||||
|
"reference": "https://huggingface.co/XLabs-AI/flux-ip-adapter",
|
||||||
|
"filename": "ip_adapter.safetensors",
|
||||||
|
"url": "https://huggingface.co/XLabs-AI/flux-ip-adapter/resolve/main/ip_adapter.safetensors",
|
||||||
|
"size": "982MB"
|
||||||
|
},
|
||||||
|
|
||||||
|
{
|
||||||
|
"name": "stabilityai/SD3.5-Large-Controlnet-Blur",
|
||||||
|
"type": "controlnet",
|
||||||
|
"base": "SD3.5",
|
||||||
|
"save_path": "controlnet/SD3.5",
|
||||||
|
"description": "Blur Controlnet model for SD3.5 Large",
|
||||||
|
"reference": "https://huggingface.co/stabilityai/stable-diffusion-3.5-controlnets",
|
||||||
|
"filename": "sd3.5_large_controlnet_blur.safetensors",
|
||||||
|
"url": "https://huggingface.co/stabilityai/stable-diffusion-3.5-controlnets/resolve/main/sd3.5_large_controlnet_blur.safetensors",
|
||||||
|
"size": "8.65GB"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "stabilityai/SD3.5-Large-Controlnet-Canny",
|
||||||
|
"type": "controlnet",
|
||||||
|
"base": "SD3.5",
|
||||||
|
"save_path": "controlnet/SD3.5",
|
||||||
|
"description": "Canny Controlnet model for SD3.5 Large",
|
||||||
|
"reference": "https://huggingface.co/stabilityai/stable-diffusion-3.5-controlnets",
|
||||||
|
"filename": "sd3.5_large_controlnet_canny.safetensors",
|
||||||
|
"url": "https://huggingface.co/stabilityai/stable-diffusion-3.5-controlnets/resolve/main/sd3.5_large_controlnet_canny.safetensors",
|
||||||
|
"size": "8.65GB"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "stabilityai/SD3.5-Large-Controlnet-Depth",
|
||||||
|
"type": "controlnet",
|
||||||
|
"base": "SD3.5",
|
||||||
|
"save_path": "controlnet/SD3.5",
|
||||||
|
"description": "Depth Controlnet model for SD3.5 Large",
|
||||||
|
"reference": "https://huggingface.co/stabilityai/stable-diffusion-3.5-controlnets",
|
||||||
|
"filename": "sd3.5_large_controlnet_depth.safetensors",
|
||||||
|
"url": "https://huggingface.co/stabilityai/stable-diffusion-3.5-controlnets/resolve/main/sd3.5_large_controlnet_depth.safetensors",
|
||||||
|
"size": "8.65GB"
|
||||||
|
},
|
||||||
|
|
||||||
|
{
|
||||||
|
"name": "LTX-Video 2B v0.9 Checkpoint",
|
||||||
|
"type": "checkpoint",
|
||||||
|
"base": "LTX-Video",
|
||||||
|
"save_path": "checkpoints/LTXV",
|
||||||
|
"description": "LTX-Video is the first DiT-based video generation model capable of generating high-quality videos in real-time. It produces 24 FPS videos at a 768x512 resolution faster than they can be watched. Trained on a large-scale dataset of diverse videos, the model generates high-resolution videos with realistic and varied content.",
|
||||||
|
"reference": "https://huggingface.co/Lightricks/LTX-Video",
|
||||||
|
"filename": "ltx-video-2b-v0.9.safetensors",
|
||||||
|
"url": "https://huggingface.co/Lightricks/LTX-Video/resolve/main/ltx-video-2b-v0.9.safetensors",
|
||||||
|
"size": "9.37GB"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "InstantX/FLUX.1-dev-IP-Adapter",
|
||||||
|
"type": "IP-Adapter",
|
||||||
|
"base": "FLUX.1",
|
||||||
|
"save_path": "ipadapter-flux",
|
||||||
|
"description": "FLUX.1-dev-IP-Adapter",
|
||||||
|
"reference": "https://huggingface.co/InstantX/FLUX.1-dev-IP-Adapter",
|
||||||
|
"filename": "ip-adapter.bin",
|
||||||
|
"url": "https://huggingface.co/InstantX/FLUX.1-dev-IP-Adapter/resolve/main/ip-adapter.bin",
|
||||||
|
"size": "5.29GB"
|
||||||
|
},
|
||||||
|
|
||||||
|
{
|
||||||
|
"name": "Comfy-Org/sigclip_vision_384 (patch14_384)",
|
||||||
|
"type": "clip_vision",
|
||||||
|
"base": "sigclip",
|
||||||
|
"save_path": "clip_vision",
|
||||||
|
"description": "This clip vision model is required for FLUX.1 Redux.",
|
||||||
|
"reference": "https://huggingface.co/Comfy-Org/sigclip_vision_384/tree/main",
|
||||||
|
"filename": "sigclip_vision_patch14_384.safetensors",
|
||||||
|
"url": "https://huggingface.co/Comfy-Org/sigclip_vision_384/resolve/main/sigclip_vision_patch14_384.safetensors",
|
||||||
|
"size": "857MB"
|
||||||
|
},
|
||||||
|
|
||||||
|
{
|
||||||
|
"name": "comfyanonymous/flux_text_encoders - t5xxl (fp16)",
|
||||||
|
"type": "clip",
|
||||||
|
"base": "t5",
|
||||||
|
"save_path": "text_encoders/t5",
|
||||||
|
"description": "Text Encoders for FLUX (fp16)",
|
||||||
|
"reference": "https://huggingface.co/comfyanonymous/flux_text_encoders",
|
||||||
|
"filename": "t5xxl_fp16.safetensors",
|
||||||
|
"url": "https://huggingface.co/comfyanonymous/flux_text_encoders/resolve/main/t5xxl_fp16.safetensors",
|
||||||
|
"size": "9.79GB"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "comfyanonymous/flux_text_encoders - t5xxl (fp8_e4m3fn)",
|
||||||
|
"type": "clip",
|
||||||
|
"base": "t5",
|
||||||
|
"save_path": "text_encoders/t5",
|
||||||
|
"description": "Text Encoders for FLUX (fp8_e4m3fn)",
|
||||||
|
"reference": "https://huggingface.co/comfyanonymous/flux_text_encoders",
|
||||||
|
"filename": "t5xxl_fp8_e4m3fn.safetensors",
|
||||||
|
"url": "https://huggingface.co/comfyanonymous/flux_text_encoders/resolve/main/t5xxl_fp8_e4m3fn.safetensors",
|
||||||
|
"size": "4.89GB"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "comfyanonymous/flux_text_encoders - t5xxl (fp8_e4m3fn_scaled)",
|
||||||
|
"type": "clip",
|
||||||
|
"base": "t5",
|
||||||
|
"save_path": "text_encoders/t5",
|
||||||
|
"description": "Text Encoders for FLUX (fp16)",
|
||||||
|
"reference": "https://huggingface.co/comfyanonymous/flux_text_encoders",
|
||||||
|
"filename": "t5xxl_fp8_e4m3fn_scaled.safetensors",
|
||||||
|
"url": "https://huggingface.co/comfyanonymous/flux_text_encoders/resolve/main/t5xxl_fp8_e4m3fn_scaled.safetensors",
|
||||||
|
"size": "5.16GB"
|
||||||
|
},
|
||||||
|
|
||||||
|
{
|
||||||
|
"name": "FLUX.1 [Dev] Diffusion model (scaled fp8)",
|
||||||
|
"type": "diffusion_model",
|
||||||
|
"base": "FLUX.1",
|
||||||
|
"save_path": "diffusion_models/FLUX1",
|
||||||
|
"description": "FLUX.1 [Dev] Diffusion model (scaled fp8)[w/Due to the large size of the model, it is recommended to download it through a browser if possible.]",
|
||||||
|
"reference": "https://huggingface.co/comfyanonymous/flux_dev_scaled_fp8_test",
|
||||||
|
"filename": "flux_dev_fp8_scaled_diffusion_model.safetensors",
|
||||||
|
"url": "https://huggingface.co/comfyanonymous/flux_dev_scaled_fp8_test/resolve/main/flux_dev_fp8_scaled_diffusion_model.safetensors",
|
||||||
|
"size": "11.9GB"
|
||||||
|
},
|
||||||
|
|
||||||
|
{
|
||||||
|
"name": "kijai/MoGe_ViT_L_fp16.safetensors",
|
||||||
|
"type": "MoGe",
|
||||||
|
"base": "MoGe",
|
||||||
|
"save_path": "MoGe",
|
||||||
|
"description": "Safetensors versions of [a/https://github.com/microsoft/MoGe](https://github.com/microsoft/MoGe)",
|
||||||
|
"reference": "https://huggingface.co/Kijai/MoGe_safetensors",
|
||||||
|
"filename": "MoGe_ViT_L_fp16.safetensors",
|
||||||
|
"url": "https://huggingface.co/Kijai/MoGe_safetensors/resolve/main/MoGe_ViT_L_fp16.safetensors",
|
||||||
|
"size": "628MB"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "kijai/MoGe_ViT_L_fp16.safetensors",
|
||||||
|
"type": "MoGe",
|
||||||
|
"base": "MoGe",
|
||||||
|
"save_path": "MoGe",
|
||||||
|
"description": "Safetensors versions of [a/https://github.com/microsoft/MoGe](https://github.com/microsoft/MoGe)",
|
||||||
|
"reference": "https://huggingface.co/Kijai/MoGe_safetensors",
|
||||||
|
"filename": "MoGe_ViT_L_fp16.safetensors",
|
||||||
|
"url": "https://huggingface.co/Kijai/MoGe_safetensors/resolve/main/MoGe_ViT_L_fp16.safetensors",
|
||||||
|
"size": "1.26GB"
|
||||||
|
},
|
||||||
|
|
||||||
|
{
|
||||||
|
"name": "pulid_flux_v0.9.1.safetensors",
|
||||||
|
"type": "PuLID",
|
||||||
|
"base": "FLUX",
|
||||||
|
"save_path": "pulid",
|
||||||
|
"description": "This is required for PuLID (FLUX)",
|
||||||
|
"reference": "https://huggingface.co/guozinan/PuLID",
|
||||||
|
"filename": "pulid_flux_v0.9.1.safetensors",
|
||||||
|
"url": "https://huggingface.co/guozinan/PuLID/resolve/main/pulid_flux_v0.9.1.safetensors",
|
||||||
|
"size": "1.14GB"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "pulid_v1.1.safetensors",
|
||||||
|
"type": "PuLID",
|
||||||
|
"base": "SDXL",
|
||||||
|
"save_path": "pulid",
|
||||||
|
"description": "This is required for PuLID (SDXL)",
|
||||||
|
"reference": "https://huggingface.co/guozinan/PuLID",
|
||||||
|
"filename": "pulid_v1.1.safetensors",
|
||||||
|
"url": "https://huggingface.co/guozinan/PuLID/resolve/main/pulid_v1.1.safetensors",
|
||||||
|
"size": "984MB"
|
||||||
|
},
|
||||||
|
|
||||||
|
{
|
||||||
|
"name": "Kolors-IP-Adapter-Plus.bin (Kwai-Kolors/Kolors-IP-Adapter-Plus)",
|
||||||
|
"type": "IP-Adapter",
|
||||||
|
"base": "Kolors",
|
||||||
|
"save_path": "ipadapter",
|
||||||
|
"description": "You can use this model in the [a/ComfyUI IPAdapter plus](https://github.com/cubiq/ComfyUI_IPAdapter_plus) extension.",
|
||||||
|
"reference": "https://huggingface.co/Kwai-Kolors/Kolors-IP-Adapter-Plus",
|
||||||
|
"filename": "Kolors-IP-Adapter-Plus.bin",
|
||||||
|
"url": "https://huggingface.co/Kwai-Kolors/Kolors-IP-Adapter-Plus/resolve/main/ip_adapter_plus_general.bin",
|
||||||
|
"size": "1.01GB"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "Kolors-IP-Adapter-FaceID-Plus.bin (Kwai-Kolors/Kolors-IP-Adapter-Plus)",
|
||||||
|
"type": "IP-Adapter",
|
||||||
|
"base": "Kolors",
|
||||||
|
"save_path": "ipadapter",
|
||||||
|
"description": "You can use this model in the [a/ComfyUI IPAdapter plus](https://github.com/cubiq/ComfyUI_IPAdapter_plus) extension.",
|
||||||
|
"reference": "https://huggingface.co/Kwai-Kolors/Kolors-IP-Adapter-FaceID-Plus",
|
||||||
|
"filename": "Kolors-IP-Adapter-FaceID-Plus.bin",
|
||||||
|
"url": "https://huggingface.co/Kwai-Kolors/Kolors-IP-Adapter-FaceID-Plus/resolve/main/ipa-faceid-plus.bin",
|
||||||
|
"size": "2.39GB"
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,15 +1,5 @@
|
|||||||
{
|
{
|
||||||
"custom_nodes": [
|
"custom_nodes": [
|
||||||
{
|
|
||||||
"author": "Comfy-Org",
|
|
||||||
"title": "ComfyUI React Extension Template",
|
|
||||||
"reference": "https://github.com/Comfy-Org/ComfyUI-React-Extension-Template",
|
|
||||||
"files": [
|
|
||||||
"https://github.com/Comfy-Org/ComfyUI-React-Extension-Template"
|
|
||||||
],
|
|
||||||
"install_type": "git-clone",
|
|
||||||
"description": "A minimal template for creating React/TypeScript frontend extensions for ComfyUI, with complete boilerplate setup including internationalization and unit testing."
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
"author": "Suzie1",
|
"author": "Suzie1",
|
||||||
"title": "Guide To Making Custom Nodes in ComfyUI",
|
"title": "Guide To Making Custom Nodes in ComfyUI",
|
||||||
@@ -331,16 +321,6 @@
|
|||||||
],
|
],
|
||||||
"description": "Dynamic Node examples for ComfyUI",
|
"description": "Dynamic Node examples for ComfyUI",
|
||||||
"install_type": "git-clone"
|
"install_type": "git-clone"
|
||||||
},
|
|
||||||
{
|
|
||||||
"author": "Jonathon-Doran",
|
|
||||||
"title": "remote-combo-demo",
|
|
||||||
"reference": "https://github.com/Jonathon-Doran/remote-combo-demo",
|
|
||||||
"files": [
|
|
||||||
"https://github.com/Jonathon-Doran/remote-combo-demo"
|
|
||||||
],
|
|
||||||
"install_type": "git-clone",
|
|
||||||
"description": "A minimal test suite demonstrating how remote COMBO inputs behave in ComfyUI, with and without force_input"
|
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
1420
openapi.yaml
1420
openapi.yaml
File diff suppressed because it is too large
Load Diff
@@ -5,7 +5,7 @@ build-backend = "setuptools.build_meta"
|
|||||||
[project]
|
[project]
|
||||||
name = "comfyui-manager"
|
name = "comfyui-manager"
|
||||||
license = { text = "GPL-3.0-only" }
|
license = { text = "GPL-3.0-only" }
|
||||||
version = "5.0b1"
|
version = "4.0.0-beta.1"
|
||||||
requires-python = ">= 3.9"
|
requires-python = ">= 3.9"
|
||||||
description = "ComfyUI-Manager provides features to install and manage custom nodes for ComfyUI, as well as various functionalities to assist with ComfyUI."
|
description = "ComfyUI-Manager provides features to install and manage custom nodes for ComfyUI, as well as various functionalities to assist with ComfyUI."
|
||||||
readme = "README.md"
|
readme = "README.md"
|
||||||
@@ -13,13 +13,13 @@ keywords = ["comfyui", "comfyui-manager"]
|
|||||||
|
|
||||||
maintainers = [
|
maintainers = [
|
||||||
{ name = "Dr.Lt.Data", email = "dr.lt.data@gmail.com" },
|
{ name = "Dr.Lt.Data", email = "dr.lt.data@gmail.com" },
|
||||||
{ name = "Yoland Yan", email = "yoland@comfy.org" },
|
{ name = "Yoland Yan", email = "yoland@drip.art" },
|
||||||
{ name = "James Kwon", email = "hongilkwon316@gmail.com" },
|
{ name = "James Kwon", email = "hongilkwon316@gmail.com" },
|
||||||
{ name = "Robin Huang", email = "robin@comfy.org" },
|
{ name = "Robin Huang", email = "robin@drip.art" },
|
||||||
]
|
]
|
||||||
|
|
||||||
classifiers = [
|
classifiers = [
|
||||||
"Development Status :: 5 - Production/Stable",
|
"Development Status :: 4 - Beta",
|
||||||
"Intended Audience :: Developers",
|
"Intended Audience :: Developers",
|
||||||
"License :: OSI Approved :: GNU General Public License v3 (GPLv3)",
|
"License :: OSI Approved :: GNU General Public License v3 (GPLv3)",
|
||||||
]
|
]
|
||||||
@@ -27,7 +27,7 @@ classifiers = [
|
|||||||
dependencies = [
|
dependencies = [
|
||||||
"GitPython",
|
"GitPython",
|
||||||
"PyGithub",
|
"PyGithub",
|
||||||
# "matrix-nio",
|
"matrix-client==0.4.0",
|
||||||
"transformers",
|
"transformers",
|
||||||
"huggingface-hub>0.20",
|
"huggingface-hub>0.20",
|
||||||
"typer",
|
"typer",
|
||||||
@@ -48,9 +48,6 @@ Repository = "https://github.com/ltdrdata/ComfyUI-Manager"
|
|||||||
where = ["."]
|
where = ["."]
|
||||||
include = ["comfyui_manager*"]
|
include = ["comfyui_manager*"]
|
||||||
|
|
||||||
[project.scripts]
|
|
||||||
cm-cli = "comfyui_manager.cm_cli.__main__:main"
|
|
||||||
|
|
||||||
[tool.ruff]
|
[tool.ruff]
|
||||||
line-length = 120
|
line-length = 120
|
||||||
target-version = "py39"
|
target-version = "py39"
|
||||||
@@ -63,8 +60,3 @@ select = [
|
|||||||
"F", # default
|
"F", # default
|
||||||
"I", # isort-like behavior (import statement sorting)
|
"I", # isort-like behavior (import statement sorting)
|
||||||
]
|
]
|
||||||
|
|
||||||
[tool.pytest.ini_options]
|
|
||||||
markers = [
|
|
||||||
"integration: marks tests as integration tests (deselect with '-m \"not integration\"')",
|
|
||||||
]
|
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
GitPython
|
GitPython
|
||||||
PyGithub
|
PyGithub
|
||||||
# matrix-nio
|
matrix-client==0.4.0
|
||||||
transformers
|
transformers
|
||||||
huggingface-hub>0.20
|
huggingface-hub>0.20
|
||||||
typer
|
typer
|
||||||
|
|||||||
@@ -9,4 +9,4 @@ lint.select = [
|
|||||||
"F",
|
"F",
|
||||||
]
|
]
|
||||||
|
|
||||||
exclude = ["*.ipynb", "tests"]
|
exclude = ["*.ipynb"]
|
||||||
|
|||||||
23
scanner.py
23
scanner.py
@@ -94,7 +94,7 @@ def extract_nodes(code_text):
|
|||||||
return s
|
return s
|
||||||
else:
|
else:
|
||||||
return set()
|
return set()
|
||||||
except Exception:
|
except:
|
||||||
return set()
|
return set()
|
||||||
|
|
||||||
|
|
||||||
@@ -102,7 +102,11 @@ def extract_nodes(code_text):
|
|||||||
def scan_in_file(filename, is_builtin=False):
|
def scan_in_file(filename, is_builtin=False):
|
||||||
global builtin_nodes
|
global builtin_nodes
|
||||||
|
|
||||||
with open(filename, encoding='utf-8', errors='ignore') as file:
|
try:
|
||||||
|
with open(filename, encoding='utf-8') as file:
|
||||||
|
code = file.read()
|
||||||
|
except UnicodeDecodeError:
|
||||||
|
with open(filename, encoding='cp949') as file:
|
||||||
code = file.read()
|
code = file.read()
|
||||||
|
|
||||||
pattern = r"_CLASS_MAPPINGS\s*=\s*{([^}]*)}"
|
pattern = r"_CLASS_MAPPINGS\s*=\s*{([^}]*)}"
|
||||||
@@ -255,13 +259,13 @@ def clone_or_pull_git_repository(git_url):
|
|||||||
repo.git.submodule('update', '--init', '--recursive')
|
repo.git.submodule('update', '--init', '--recursive')
|
||||||
print(f"Pulling {repo_name}...")
|
print(f"Pulling {repo_name}...")
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
print(f"Failed to pull '{repo_name}': {e}")
|
print(f"Pulling {repo_name} failed: {e}")
|
||||||
else:
|
else:
|
||||||
try:
|
try:
|
||||||
Repo.clone_from(git_url, repo_dir, recursive=True)
|
Repo.clone_from(git_url, repo_dir, recursive=True)
|
||||||
print(f"Cloning {repo_name}...")
|
print(f"Cloning {repo_name}...")
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
print(f"Failed to clone '{repo_name}': {e}")
|
print(f"Cloning {repo_name} failed: {e}")
|
||||||
|
|
||||||
|
|
||||||
def update_custom_nodes():
|
def update_custom_nodes():
|
||||||
@@ -293,7 +297,7 @@ def update_custom_nodes():
|
|||||||
pass
|
pass
|
||||||
|
|
||||||
def is_rate_limit_exceeded():
|
def is_rate_limit_exceeded():
|
||||||
return g.rate_limiting[0] <= 20
|
return g.rate_limiting[0] == 0
|
||||||
|
|
||||||
if is_rate_limit_exceeded():
|
if is_rate_limit_exceeded():
|
||||||
print(f"GitHub API Rate Limit Exceeded: remained - {(g.rate_limiting_resettime - datetime.datetime.now().timestamp())/60:.2f} min")
|
print(f"GitHub API Rate Limit Exceeded: remained - {(g.rate_limiting_resettime - datetime.datetime.now().timestamp())/60:.2f} min")
|
||||||
@@ -396,7 +400,7 @@ def update_custom_nodes():
|
|||||||
|
|
||||||
try:
|
try:
|
||||||
download_url(url, temp_dir)
|
download_url(url, temp_dir)
|
||||||
except Exception:
|
except:
|
||||||
print(f"[ERROR] Cannot download '{url}'")
|
print(f"[ERROR] Cannot download '{url}'")
|
||||||
|
|
||||||
with concurrent.futures.ThreadPoolExecutor(10) as executor:
|
with concurrent.futures.ThreadPoolExecutor(10) as executor:
|
||||||
@@ -496,15 +500,8 @@ def gen_json(node_info):
|
|||||||
nodes_in_url, metadata_in_url = data[git_url]
|
nodes_in_url, metadata_in_url = data[git_url]
|
||||||
nodes = set(nodes_in_url)
|
nodes = set(nodes_in_url)
|
||||||
|
|
||||||
try:
|
|
||||||
for x, desc in node_list_json.items():
|
for x, desc in node_list_json.items():
|
||||||
nodes.add(x.strip())
|
nodes.add(x.strip())
|
||||||
except Exception as e:
|
|
||||||
print(f"\nERROR: Invalid json format '{node_list_json_path}'")
|
|
||||||
print("------------------------------------------------------")
|
|
||||||
print(e)
|
|
||||||
print("------------------------------------------------------")
|
|
||||||
node_list_json = {}
|
|
||||||
|
|
||||||
metadata_in_url['title_aux'] = title
|
metadata_in_url['title_aux'] = title
|
||||||
|
|
||||||
|
|||||||
1
tests/.gitignore
vendored
1
tests/.gitignore
vendored
@@ -1 +0,0 @@
|
|||||||
env
|
|
||||||
@@ -1,45 +0,0 @@
|
|||||||
{
|
|
||||||
"tests/glob/test_complex_scenarios.py::test_enable_cnr_when_both_disabled": 38.17840343294665,
|
|
||||||
"tests/glob/test_complex_scenarios.py::test_enable_nightly_when_both_disabled": 35.116954549972434,
|
|
||||||
"tests/glob/test_enable_disable_api.py::test_disable_package": 13.036482084076852,
|
|
||||||
"tests/glob/test_enable_disable_api.py::test_duplicate_disable": 16.040373252006248,
|
|
||||||
"tests/glob/test_enable_disable_api.py::test_duplicate_enable": 19.040736762981396,
|
|
||||||
"tests/glob/test_enable_disable_api.py::test_enable_disable_cycle": 19.037481372011825,
|
|
||||||
"tests/glob/test_enable_disable_api.py::test_enable_package": 16.04287036403548,
|
|
||||||
"tests/glob/test_installed_api_original_case.py::test_api_response_structure_matches_pypi": 0.001070555008482188,
|
|
||||||
"tests/glob/test_installed_api_original_case.py::test_cnr_package_original_case": 0.0010666880407370627,
|
|
||||||
"tests/glob/test_installed_api_original_case.py::test_installed_api_preserves_original_case": 2.0044877040199935,
|
|
||||||
"tests/glob/test_installed_api_original_case.py::test_nightly_package_original_case": 0.0010498670162633061,
|
|
||||||
"tests/glob/test_queue_task_api.py::test_case_insensitive_operations": 26.13506762601901,
|
|
||||||
"tests/glob/test_queue_task_api.py::test_install_package_via_queue": 5.002635493990965,
|
|
||||||
"tests/glob/test_queue_task_api.py::test_install_uninstall_cycle": 17.058559393975884,
|
|
||||||
"tests/glob/test_queue_task_api.py::test_queue_multiple_tasks": 8.031247623031959,
|
|
||||||
"tests/glob/test_queue_task_api.py::test_uninstall_package_via_queue": 13.007408522011247,
|
|
||||||
"tests/glob/test_queue_task_api.py::test_version_switch_between_cnr_versions": 16.005053027009126,
|
|
||||||
"tests/glob/test_queue_task_api.py::test_version_switch_cnr_to_nightly": 32.11444602702977,
|
|
||||||
"tests/glob/test_queue_task_api.py::test_version_switch_disabled_cnr_to_different_cnr": 26.010654640034772,
|
|
||||||
"tests/glob/test_update_api.py::test_update_already_latest": 18.00697946100263,
|
|
||||||
"tests/glob/test_update_api.py::test_update_cnr_package": 20.00709484401159,
|
|
||||||
"tests/glob/test_update_api.py::test_update_cycle": 20.006706968066283,
|
|
||||||
"tests/glob/test_update_api.py::test_update_nightly_package": 20.01158273994224,
|
|
||||||
"tests/glob/test_version_switching_comprehensive.py::test_cleanup_verification_no_orphans": 58.0193324740394,
|
|
||||||
"tests/glob/test_version_switching_comprehensive.py::test_cnr_direct_version_install_switching": 32.007448922027834,
|
|
||||||
"tests/glob/test_version_switching_comprehensive.py::test_cnr_version_downgrade": 32.01419593003811,
|
|
||||||
"tests/glob/test_version_switching_comprehensive.py::test_cnr_version_upgrade": 32.008723533013836,
|
|
||||||
"tests/glob/test_version_switching_comprehensive.py::test_fix_cnr_package": 32.00721229799092,
|
|
||||||
"tests/glob/test_version_switching_comprehensive.py::test_fix_nightly_package": 37.00825709104538,
|
|
||||||
"tests/glob/test_version_switching_comprehensive.py::test_fix_nonexistent_package_error": 12.01385385193862,
|
|
||||||
"tests/glob/test_version_switching_comprehensive.py::test_forward_scenario_cnr_nightly_cnr": 52.010525646968745,
|
|
||||||
"tests/glob/test_version_switching_comprehensive.py::test_fresh_install_after_uninstall": 17.005509667971637,
|
|
||||||
"tests/glob/test_version_switching_comprehensive.py::test_invalid_version_error_handling": 27.007191165990662,
|
|
||||||
"tests/glob/test_version_switching_comprehensive.py::test_nightly_same_version_reinstall_skip": 42.00828933296725,
|
|
||||||
"tests/glob/test_version_switching_comprehensive.py::test_nightly_update_git_pull": 37.00807314302074,
|
|
||||||
"tests/glob/test_version_switching_comprehensive.py::test_repeated_switching_4_times": 72.01205480098724,
|
|
||||||
"tests/glob/test_version_switching_comprehensive.py::test_reverse_scenario_nightly_cnr_nightly": 57.010148006957024,
|
|
||||||
"tests/glob/test_version_switching_comprehensive.py::test_same_version_reinstall_skip": 27.007290800916962,
|
|
||||||
"tests/glob/test_version_switching_comprehensive.py::test_uninstall_cnr_only": 27.007201189990155,
|
|
||||||
"tests/glob/test_version_switching_comprehensive.py::test_uninstall_mixed_enabled_disabled": 51.00947179296054,
|
|
||||||
"tests/glob/test_version_switching_comprehensive.py::test_uninstall_nightly_only": 32.00746411003638,
|
|
||||||
"tests/glob/test_version_switching_comprehensive.py::test_uninstall_with_multiple_disabled_versions": 76.01319772895658,
|
|
||||||
"tests/glob/test_case_sensitivity_integration.py::test_case_insensitive_lookup": 0.0017123910365626216
|
|
||||||
}
|
|
||||||
182
tests/README.md
182
tests/README.md
@@ -1,182 +0,0 @@
|
|||||||
# ComfyUI Manager Test Suite
|
|
||||||
|
|
||||||
Comprehensive test suite for ComfyUI Manager with parallel execution support.
|
|
||||||
|
|
||||||
## Quick Start
|
|
||||||
|
|
||||||
### Fastest Way: Automated Testing
|
|
||||||
|
|
||||||
```bash
|
|
||||||
./tests/run_automated_tests.sh
|
|
||||||
```
|
|
||||||
|
|
||||||
**What it does**:
|
|
||||||
- Cleans environment and stops old processes
|
|
||||||
- Sets up 10 parallel test environments
|
|
||||||
- Runs all 43 tests in ~2 minutes
|
|
||||||
- Generates comprehensive report
|
|
||||||
|
|
||||||
**Expected**: 100% pass rate, ~140-160s execution time, 9x+ speedup
|
|
||||||
|
|
||||||
### For Claude Code Users
|
|
||||||
|
|
||||||
Load the testing prompt:
|
|
||||||
```
|
|
||||||
@tests/TESTING_PROMPT.md
|
|
||||||
```
|
|
||||||
|
|
||||||
Claude Code will automatically execute tests and provide intelligent analysis.
|
|
||||||
|
|
||||||
## Test Suite Overview
|
|
||||||
|
|
||||||
### Coverage (54 Tests)
|
|
||||||
- **Queue Task API** (8 tests) - Install, uninstall, version switching
|
|
||||||
- **Version Switching** (19 tests) - CNR↔Nightly, upgrades, downgrades
|
|
||||||
- **Enable/Disable API** (5 tests) - Package activation
|
|
||||||
- **Update API** (4 tests) - Package updates
|
|
||||||
- **Installed API** (4 tests) - Package listing, original case preservation
|
|
||||||
- **Case Sensitivity** (2 tests) - Case-insensitive lookup, full workflow
|
|
||||||
- **Complex Scenarios** (12 tests) - Multi-version state, automatic switching
|
|
||||||
|
|
||||||
### Performance
|
|
||||||
- **Execution**: ~140-160s (2.3-2.7 minutes)
|
|
||||||
- **Parallel**: 10 environments
|
|
||||||
- **Speedup**: 9x+ vs sequential
|
|
||||||
- **Load Balance**: 1.2x variance (excellent)
|
|
||||||
|
|
||||||
## Manual Execution
|
|
||||||
|
|
||||||
### Parallel Testing (Recommended)
|
|
||||||
|
|
||||||
```bash
|
|
||||||
# Setup (one-time)
|
|
||||||
export NUM_ENVS=10
|
|
||||||
./tests/setup_parallel_test_envs.sh
|
|
||||||
|
|
||||||
# Run tests
|
|
||||||
./tests/run_parallel_tests.sh
|
|
||||||
```
|
|
||||||
|
|
||||||
### Single Environment Testing
|
|
||||||
|
|
||||||
```bash
|
|
||||||
# Setup
|
|
||||||
./tests/setup_test_env.sh
|
|
||||||
|
|
||||||
# Run tests
|
|
||||||
cd tests/env
|
|
||||||
python ComfyUI/main.py --enable-manager &
|
|
||||||
sleep 20
|
|
||||||
pytest ../glob/
|
|
||||||
```
|
|
||||||
|
|
||||||
## Adding New Tests
|
|
||||||
|
|
||||||
When adding 3+ new tests or modifying test execution time significantly:
|
|
||||||
|
|
||||||
```bash
|
|
||||||
# 1. Write your tests in tests/glob/
|
|
||||||
|
|
||||||
# 2. Run tests and check load balance
|
|
||||||
./tests/run_automated_tests.sh
|
|
||||||
# Look for "Load Balance: X.XXx variance" in report
|
|
||||||
|
|
||||||
# 3. If variance > 2.0x, update durations
|
|
||||||
./tests/update_test_durations.sh # Takes ~15-20 min
|
|
||||||
|
|
||||||
# 4. Commit duration data
|
|
||||||
git add .test_durations
|
|
||||||
git commit -m "chore: update test duration data"
|
|
||||||
```
|
|
||||||
|
|
||||||
**See**: `glob/TESTING_GUIDE.md` for detailed workflow
|
|
||||||
|
|
||||||
## Files
|
|
||||||
|
|
||||||
- `run_automated_tests.sh` - One-command test execution
|
|
||||||
- `run_parallel_tests.sh` - Parallel test runner
|
|
||||||
- `setup_parallel_test_envs.sh` - Environment setup
|
|
||||||
- `update_test_durations.sh` - Update load balancing data
|
|
||||||
- `TESTING_PROMPT.md` - Claude Code automation
|
|
||||||
- `glob/` - Test implementations
|
|
||||||
- `glob/TESTING_GUIDE.md` - Development workflow guide
|
|
||||||
|
|
||||||
## Requirements
|
|
||||||
|
|
||||||
- Python 3.12+
|
|
||||||
- Virtual environment: `/home/rho/venv`
|
|
||||||
- ComfyUI branch: `ltdrdata/dr-support-pip-cm`
|
|
||||||
- Ports: 8188-8197 available
|
|
||||||
|
|
||||||
## Troubleshooting
|
|
||||||
|
|
||||||
### Tests Fail to Start
|
|
||||||
|
|
||||||
```bash
|
|
||||||
# Stop existing processes
|
|
||||||
pkill -f "ComfyUI/main.py"
|
|
||||||
sleep 2
|
|
||||||
|
|
||||||
# Re-run
|
|
||||||
./tests/run_automated_tests.sh
|
|
||||||
```
|
|
||||||
|
|
||||||
### Slow Execution
|
|
||||||
|
|
||||||
If tests take >3 minutes, update duration data:
|
|
||||||
```bash
|
|
||||||
./tests/update_test_durations.sh
|
|
||||||
```
|
|
||||||
|
|
||||||
### Environment Issues
|
|
||||||
|
|
||||||
Rebuild test environments:
|
|
||||||
```bash
|
|
||||||
rm -rf tests/env/ComfyUI_*
|
|
||||||
NUM_ENVS=10 ./tests/setup_parallel_test_envs.sh
|
|
||||||
```
|
|
||||||
|
|
||||||
## Generated Files
|
|
||||||
|
|
||||||
- **Report**: `.claude/livecontext/automated_test_*.md`
|
|
||||||
- **Logs**: `tests/tmp/test-results-[1-10].log`
|
|
||||||
- **Server Logs**: `tests/tmp/comfyui-parallel-[1-10].log`
|
|
||||||
|
|
||||||
## CI/CD Integration
|
|
||||||
|
|
||||||
```yaml
|
|
||||||
- name: Run Tests
|
|
||||||
run: |
|
|
||||||
source /home/rho/venv/bin/activate
|
|
||||||
./tests/run_automated_tests.sh
|
|
||||||
```
|
|
||||||
|
|
||||||
Exit code: 0 = pass, 1 = fail
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
**Status**: ✅ Production-ready (100% pass rate, <3min execution)
|
|
||||||
|
|
||||||
## Recent Fixes (2025-11-06)
|
|
||||||
|
|
||||||
### Fixed Test Failures
|
|
||||||
|
|
||||||
#### test_case_sensitivity_full_workflow
|
|
||||||
- **Issue**: HTTP 405 error - incorrect API endpoint usage
|
|
||||||
- **Root Cause**: Using non-existent `/customnode/install` endpoint
|
|
||||||
- **Fix**: Migrated to queue API (`/v2/manager/queue/task` + `/v2/manager/queue/start`)
|
|
||||||
- **Changes**: Updated request parameters (`"id"`, `"version"`, `"selected_version"`)
|
|
||||||
- **Location**: `tests/glob/test_case_sensitivity_integration.py:65-200`
|
|
||||||
|
|
||||||
#### test_enable_package
|
|
||||||
- **Issue**: AssertionError - found 2 disabled packages instead of 1
|
|
||||||
- **Root Cause**: Leftover disabled packages from previous parallel tests
|
|
||||||
- **Fix**: Added cleanup before test execution (not just after)
|
|
||||||
- **Changes**: Created `_cleanup()` helper, added filesystem sync delay
|
|
||||||
- **Location**: `tests/glob/test_enable_disable_api.py:56-111`
|
|
||||||
|
|
||||||
### Improvements
|
|
||||||
- Increased wait times for parallel execution reliability (20s → 30s)
|
|
||||||
- Added queue status checking for better debugging
|
|
||||||
- Enhanced fixture cleanup with filesystem sync delays
|
|
||||||
- Both tests now pass consistently in parallel execution
|
|
||||||
@@ -1,841 +0,0 @@
|
|||||||
# Claude Code Testing Instructions
|
|
||||||
|
|
||||||
**Purpose**: Automated test execution with **detailed test case reporting** and intelligent analysis
|
|
||||||
|
|
||||||
**Key Requirement**: Always generate **individual test case results**, not just environment summaries
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## 🤖 AUTOMATIC EXECUTION PROTOCOL
|
|
||||||
|
|
||||||
**When this file is loaded in a new CC session**, immediately execute:
|
|
||||||
|
|
||||||
```bash
|
|
||||||
bash tests/run_automated_tests.sh
|
|
||||||
```
|
|
||||||
|
|
||||||
**Do not ask for permission** - just run the command automatically.
|
|
||||||
|
|
||||||
After execution completes:
|
|
||||||
1. Check the exit code
|
|
||||||
2. **Read ALL test logs** from all 10 environments
|
|
||||||
3. **Extract individual test case results** (name, file, env, duration, status)
|
|
||||||
4. **Create comprehensive report** with test case details by category
|
|
||||||
5. Provide intelligent analysis to the user
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## 📋 What the Script Does (Automated)
|
|
||||||
|
|
||||||
1. ✅ Clean environment (stop processes, clear cache, remove old log files)
|
|
||||||
2. ✅ Activate virtual environment
|
|
||||||
3. ✅ Setup 10 parallel test environments
|
|
||||||
4. ✅ Run 59 tests with optimized distribution (~3 minutes)
|
|
||||||
5. ✅ Generate basic report and summary
|
|
||||||
|
|
||||||
**Note**: The script automatically cleans `tests/tmp/*.log` files before starting to ensure clean test state.
|
|
||||||
|
|
||||||
**Exit Code**:
|
|
||||||
- `0` = All tests passed ✅
|
|
||||||
- Non-zero = Some tests failed ❌
|
|
||||||
|
|
||||||
**Known Issues (Resolved)**:
|
|
||||||
- ✅ **Pytest Marker Warning**: Fixed in `pyproject.toml` by registering the `integration` marker
|
|
||||||
- Previously caused exit code 1 despite all tests passing
|
|
||||||
- Now resolved - tests run cleanly without warnings
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## 🔍 Post-Execution: Your Job Starts Here
|
|
||||||
|
|
||||||
After the script completes, perform these steps:
|
|
||||||
|
|
||||||
### Step 1: Check Exit Code
|
|
||||||
|
|
||||||
If exit code is **0** (success):
|
|
||||||
- Proceed to Step 2 for success summary
|
|
||||||
|
|
||||||
If exit code is **non-zero** (failure):
|
|
||||||
- Proceed to Step 3 for failure analysis
|
|
||||||
|
|
||||||
### Step 2: Success Path - Generate Comprehensive Report
|
|
||||||
|
|
||||||
**CRITICAL: You MUST create a detailed test case report, not just environment summary!**
|
|
||||||
|
|
||||||
#### Step 2.1: Read All Test Logs
|
|
||||||
|
|
||||||
**Read all environment test logs** to extract individual test case results:
|
|
||||||
```bash
|
|
||||||
# Read all 10 environment logs
|
|
||||||
@tests/tmp/test-results-1.log
|
|
||||||
@tests/tmp/test-results-2.log
|
|
||||||
...
|
|
||||||
@tests/tmp/test-results-10.log
|
|
||||||
```
|
|
||||||
|
|
||||||
#### Step 2.2: Extract Test Case Information
|
|
||||||
|
|
||||||
From each log, extract:
|
|
||||||
- Individual test names (e.g., `test_install_package_via_queue`)
|
|
||||||
- Test file (e.g., `test_queue_task_api.py`)
|
|
||||||
- Status (PASSED/FAILED)
|
|
||||||
- Environment number and port
|
|
||||||
- Duration (from pytest output)
|
|
||||||
|
|
||||||
#### Step 2.3: Create/Update Detailed Report
|
|
||||||
|
|
||||||
**Create or update** `.claude/livecontext/automated_test_YYYY-MM-DD_HH-MM-SS.md` with:
|
|
||||||
|
|
||||||
1. **Executive Summary** (overview metrics)
|
|
||||||
2. **Detailed Test Results by Category** - **MOST IMPORTANT**:
|
|
||||||
- Group tests by category (Queue Task API, Enable/Disable API, etc.)
|
|
||||||
- Create tables with columns: Test Case | Environment | Duration | Status
|
|
||||||
- Include coverage description for each category
|
|
||||||
3. **Test Category Summary** (table with category stats)
|
|
||||||
4. **Load Balancing Analysis**
|
|
||||||
5. **Performance Insights**
|
|
||||||
6. **Configuration Details**
|
|
||||||
|
|
||||||
**Example structure**:
|
|
||||||
```markdown
|
|
||||||
## Detailed Test Results by Category
|
|
||||||
|
|
||||||
### 📦 Queue Task API Tests (8 tests) - All Passed ✅
|
|
||||||
|
|
||||||
| Test Case | Environment | Duration | Status |
|
|
||||||
|-----------|-------------|----------|--------|
|
|
||||||
| `test_install_package_via_queue` | Env 4 (8191) | ~28s | ✅ PASSED |
|
|
||||||
| `test_uninstall_package_via_queue` | Env 6 (8193) | ~28s | ✅ PASSED |
|
|
||||||
| `test_install_uninstall_cycle` | Env 7 (8194) | ~23s | ✅ PASSED |
|
|
||||||
...
|
|
||||||
|
|
||||||
**Coverage**: Package installation, uninstallation, version switching via queue
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
### 🔄 Version Switching Comprehensive Tests (19 tests) - All Passed ✅
|
|
||||||
|
|
||||||
| Test Case | Environment | Duration | Status |
|
|
||||||
|-----------|-------------|----------|--------|
|
|
||||||
| `test_cnr_to_nightly_switching` | Env 1 (8188) | ~38s | ✅ PASSED |
|
|
||||||
...
|
|
||||||
```
|
|
||||||
|
|
||||||
#### Step 2.4: Provide User Summary
|
|
||||||
|
|
||||||
**After creating the detailed report**, provide user with concise summary:
|
|
||||||
|
|
||||||
```markdown
|
|
||||||
✅ **All 59 tests passed successfully!**
|
|
||||||
|
|
||||||
### 📊 Category Breakdown
|
|
||||||
| Category | Tests | Status |
|
|
||||||
|----------|-------|--------|
|
|
||||||
| Version Switching Comprehensive | 19 | ✅ All Passed |
|
|
||||||
| Complex Scenarios | 12 | ✅ All Passed |
|
|
||||||
| Queue Task API | 8 | ✅ All Passed |
|
|
||||||
| Nightly Downgrade/Upgrade | 5 | ✅ All Passed |
|
|
||||||
| Enable/Disable API | 5 | ✅ All Passed |
|
|
||||||
| Update API | 4 | ✅ All Passed |
|
|
||||||
| Installed API (Original Case) | 4 | ✅ All Passed |
|
|
||||||
| Case Sensitivity Integration | 2 | ✅ All Passed |
|
|
||||||
|
|
||||||
### ⚡ Performance
|
|
||||||
- **Execution time**: 118s (1m 58s)
|
|
||||||
- **Speedup**: 9.76x vs sequential
|
|
||||||
- **Load balance**: 1.04x variance (excellent)
|
|
||||||
|
|
||||||
### 📁 Generated Files
|
|
||||||
- **Detailed Report**: `.claude/livecontext/automated_test_YYYY-MM-DD_HH-MM-SS.md`
|
|
||||||
- Individual test case results
|
|
||||||
- Category-wise breakdown
|
|
||||||
- Performance analysis
|
|
||||||
- **Test Logs**: `tests/tmp/test-results-[1-10].log`
|
|
||||||
|
|
||||||
### 🎯 Next Steps
|
|
||||||
[Based on variance analysis]
|
|
||||||
```
|
|
||||||
|
|
||||||
### Step 3: Failure Path - Intelligent Troubleshooting
|
|
||||||
|
|
||||||
**CRITICAL: Create detailed test case report even for failures!**
|
|
||||||
|
|
||||||
#### Step 3.1: Read All Test Logs (Including Failed)
|
|
||||||
|
|
||||||
**Read all environment test logs** to extract complete test results:
|
|
||||||
```bash
|
|
||||||
# Read all 10 environment logs
|
|
||||||
@tests/tmp/test-results-1.log
|
|
||||||
@tests/tmp/test-results-2.log
|
|
||||||
...
|
|
||||||
@tests/tmp/test-results-10.log
|
|
||||||
```
|
|
||||||
|
|
||||||
#### Step 3.2: Extract All Test Cases
|
|
||||||
|
|
||||||
From each log, extract **all tests** (passed and failed):
|
|
||||||
- Test name, file, environment, duration, status
|
|
||||||
- For **failed tests**, also extract:
|
|
||||||
- Error type (AssertionError, ConnectionError, TimeoutError, etc.)
|
|
||||||
- Error message
|
|
||||||
- Traceback (last few lines)
|
|
||||||
|
|
||||||
#### Step 3.3: Create Comprehensive Report
|
|
||||||
|
|
||||||
**Create** `.claude/livecontext/automated_test_YYYY-MM-DD_HH-MM-SS.md` with:
|
|
||||||
|
|
||||||
1. **Executive Summary**:
|
|
||||||
- Total: 43 tests
|
|
||||||
- Passed: X tests
|
|
||||||
- Failed: Y tests
|
|
||||||
- Pass rate: X%
|
|
||||||
- Execution time and speedup
|
|
||||||
|
|
||||||
2. **Detailed Test Results by Category** - **MANDATORY**:
|
|
||||||
- Group ALL tests by category
|
|
||||||
- Mark failed tests with ❌ and error summary
|
|
||||||
- Example:
|
|
||||||
```markdown
|
|
||||||
### 📦 Queue Task API Tests (8 tests) - 6 Passed, 2 Failed
|
|
||||||
|
|
||||||
| Test Case | Environment | Duration | Status |
|
|
||||||
|-----------|-------------|----------|--------|
|
|
||||||
| `test_install_package_via_queue` | Env 4 (8191) | ~28s | ✅ PASSED |
|
|
||||||
| `test_version_switch_cnr_to_nightly` | Env 9 (8196) | 60s | ❌ FAILED - Timeout |
|
|
||||||
```
|
|
||||||
|
|
||||||
3. **Failed Tests Detailed Analysis**:
|
|
||||||
- For each failed test, provide:
|
|
||||||
- Test name and file
|
|
||||||
- Environment and port
|
|
||||||
- Error type and message
|
|
||||||
- Relevant traceback excerpt
|
|
||||||
- Server log reference
|
|
||||||
|
|
||||||
4. **Root Cause Analysis**:
|
|
||||||
- Pattern detection across failures
|
|
||||||
- Common failure types
|
|
||||||
- Likely root causes
|
|
||||||
|
|
||||||
5. **Recommended Actions** (specific commands)
|
|
||||||
|
|
||||||
#### Step 3.4: Analyze Failure Patterns
|
|
||||||
|
|
||||||
**For each failed test**, read server logs if needed:
|
|
||||||
```
|
|
||||||
@tests/tmp/comfyui-parallel-N.log
|
|
||||||
```
|
|
||||||
|
|
||||||
**Categorize failures**:
|
|
||||||
- ❌ **API Error**: Connection refused, timeout, 404/500
|
|
||||||
- ❌ **Assertion Error**: Expected vs actual mismatch
|
|
||||||
- ❌ **Setup Error**: Environment configuration issue
|
|
||||||
- ❌ **Timeout Error**: Test exceeded time limit
|
|
||||||
- ❌ **Package Error**: Installation/version switching failed
|
|
||||||
|
|
||||||
#### Step 3.5: Provide Structured Analysis to User
|
|
||||||
|
|
||||||
```markdown
|
|
||||||
❌ **X tests failed across Y environments**
|
|
||||||
|
|
||||||
### 📊 Test Results Summary
|
|
||||||
|
|
||||||
| Category | Total | Passed | Failed | Pass Rate |
|
|
||||||
|----------|-------|--------|--------|-----------|
|
|
||||||
| Queue Task API | 8 | 6 | 2 | 75% |
|
|
||||||
| Version Switching | 19 | 17 | 2 | 89% |
|
|
||||||
| ... | ... | ... | ... | ... |
|
|
||||||
|
|
||||||
### ❌ Failed Tests Detail
|
|
||||||
|
|
||||||
#### 1. `test_version_switch_cnr_to_nightly` (Env 9, Port 8196)
|
|
||||||
- **Error Type**: TimeoutError
|
|
||||||
- **Error Message**: `Server did not respond within 60s`
|
|
||||||
- **Root Cause**: Likely server startup delay or API timeout
|
|
||||||
- **Log**: `tests/tmp/test-results-9.log:45`
|
|
||||||
- **Server Log**: `tests/tmp/comfyui-parallel-9.log`
|
|
||||||
|
|
||||||
#### 2. `test_install_package_via_queue` (Env 4, Port 8191)
|
|
||||||
- **Error Type**: AssertionError
|
|
||||||
- **Error Message**: `Expected package in installed list`
|
|
||||||
- **Root Cause**: Package installation failed or API response incomplete
|
|
||||||
- **Log**: `tests/tmp/test-results-4.log:32`
|
|
||||||
|
|
||||||
### 🔍 Root Cause Analysis
|
|
||||||
|
|
||||||
**Pattern**: Both failures are in environments with version switching operations
|
|
||||||
- Likely cause: Server response timeout during complex operations
|
|
||||||
- Recommendation: Increase timeout or investigate server performance
|
|
||||||
|
|
||||||
### 🛠️ Recommended Actions
|
|
||||||
|
|
||||||
1. **Check server startup timing**:
|
|
||||||
```bash
|
|
||||||
grep "To see the GUI" tests/tmp/comfyui-parallel-{4,9}.log
|
|
||||||
```
|
|
||||||
|
|
||||||
2. **Re-run failed tests in isolation**:
|
|
||||||
```bash
|
|
||||||
COMFYUI_PATH=tests/env/ComfyUI_9 \
|
|
||||||
TEST_SERVER_PORT=8196 \
|
|
||||||
pytest tests/glob/test_queue_task_api.py::test_version_switch_cnr_to_nightly -v -s
|
|
||||||
```
|
|
||||||
|
|
||||||
3. **If timeout persists, increase timeout in conftest.py**
|
|
||||||
|
|
||||||
4. **Full re-test after fixes**:
|
|
||||||
```bash
|
|
||||||
./tests/run_automated_tests.sh
|
|
||||||
```
|
|
||||||
|
|
||||||
### 📁 Detailed Logs
|
|
||||||
- **Full Report**: `.claude/livecontext/automated_test_YYYY-MM-DD_HH-MM-SS.md`
|
|
||||||
- **Failed Test Logs**:
|
|
||||||
- `tests/tmp/test-results-4.log` (line 32)
|
|
||||||
- `tests/tmp/test-results-9.log` (line 45)
|
|
||||||
- **Server Logs**: `tests/tmp/comfyui-parallel-{4,9}.log`
|
|
||||||
```
|
|
||||||
|
|
||||||
### Step 4: Performance Analysis (Both Paths)
|
|
||||||
|
|
||||||
**Analyze load balancing from report**:
|
|
||||||
|
|
||||||
```markdown
|
|
||||||
**Load Balancing Analysis**:
|
|
||||||
- Variance: X.XXx
|
|
||||||
- Max duration: XXXs (Env N)
|
|
||||||
- Min duration: XXXs (Env N)
|
|
||||||
- Assessment: [Excellent <1.2x | Good <2.0x | Poor >2.0x]
|
|
||||||
|
|
||||||
[If Poor]
|
|
||||||
**Optimization Available**:
|
|
||||||
The current test distribution is not optimal. You can improve execution time by 41% with:
|
|
||||||
```bash
|
|
||||||
./tests/update_test_durations.sh # Takes ~15-20 min
|
|
||||||
```
|
|
||||||
This will regenerate timing data for optimal load balancing.
|
|
||||||
```
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## 🛠️ Common Troubleshooting Scenarios
|
|
||||||
|
|
||||||
### Scenario 1: Server Startup Failures
|
|
||||||
|
|
||||||
**Symptoms**: Environment logs show server didn't start
|
|
||||||
|
|
||||||
**Check**:
|
|
||||||
```
|
|
||||||
@tests/tmp/comfyui-parallel-N.log
|
|
||||||
```
|
|
||||||
|
|
||||||
**Common causes**:
|
|
||||||
- Port already in use
|
|
||||||
- Missing dependencies
|
|
||||||
- ComfyUI branch issues
|
|
||||||
|
|
||||||
**Fix**:
|
|
||||||
```bash
|
|
||||||
# Clean up ports
|
|
||||||
pkill -f "ComfyUI/main.py"
|
|
||||||
sleep 2
|
|
||||||
|
|
||||||
# Re-run
|
|
||||||
./tests/run_automated_tests.sh
|
|
||||||
```
|
|
||||||
|
|
||||||
### Scenario 2: API Connection Failures
|
|
||||||
|
|
||||||
**Symptoms**: `Connection refused` or `Timeout` errors
|
|
||||||
|
|
||||||
**Analysis checklist**:
|
|
||||||
1. Was server ready? (Check server log for "To see the GUI" message)
|
|
||||||
2. Correct port? (8188-8197 for envs 1-10)
|
|
||||||
3. Request before server ready? (Race condition)
|
|
||||||
|
|
||||||
**Fix**: Usually transient - re-run tests
|
|
||||||
|
|
||||||
### Scenario 3: Version Switching Failures
|
|
||||||
|
|
||||||
**Symptoms**: `test_version_switch_*` failures
|
|
||||||
|
|
||||||
**Analysis**:
|
|
||||||
- Check package installation logs
|
|
||||||
- Verify `.tracking` file presence (CNR packages)
|
|
||||||
- Check `.git` directory (nightly packages)
|
|
||||||
|
|
||||||
**Fix**:
|
|
||||||
```bash
|
|
||||||
# Clean specific package state
|
|
||||||
rm -rf tests/env/ComfyUI_N/custom_nodes/ComfyUI_SigmoidOffsetScheduler
|
|
||||||
rm -rf tests/env/ComfyUI_N/custom_nodes/.disabled/*[Ss]igmoid*
|
|
||||||
|
|
||||||
# Re-run tests
|
|
||||||
./tests/run_automated_tests.sh
|
|
||||||
```
|
|
||||||
|
|
||||||
### Scenario 4: Environment-Specific Failures
|
|
||||||
|
|
||||||
**Symptoms**: Same test passes in some envs, fails in others
|
|
||||||
|
|
||||||
**Analysis**: Setup inconsistency or race condition
|
|
||||||
|
|
||||||
**Fix**:
|
|
||||||
```bash
|
|
||||||
# Rebuild specific environment
|
|
||||||
rm -rf tests/env/ComfyUI_N
|
|
||||||
NUM_ENVS=10 ./tests/setup_parallel_test_envs.sh
|
|
||||||
|
|
||||||
# Or rebuild all
|
|
||||||
rm -rf tests/env/ComfyUI_*
|
|
||||||
NUM_ENVS=10 ./tests/setup_parallel_test_envs.sh
|
|
||||||
```
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## 📊 Report Sections to Analyze
|
|
||||||
|
|
||||||
When reading the report, focus on:
|
|
||||||
|
|
||||||
1. **Summary Statistics**:
|
|
||||||
- Total/passed/failed counts
|
|
||||||
- Overall pass rate
|
|
||||||
- Execution time
|
|
||||||
|
|
||||||
2. **Per-Environment Results**:
|
|
||||||
- Which environments failed?
|
|
||||||
- Duration variance patterns
|
|
||||||
- Test distribution
|
|
||||||
|
|
||||||
3. **Performance Metrics**:
|
|
||||||
- Load balancing effectiveness
|
|
||||||
- Speedup vs sequential
|
|
||||||
- Optimization opportunities
|
|
||||||
|
|
||||||
4. **Log References**:
|
|
||||||
- Where to find detailed logs
|
|
||||||
- Which logs to check for failures
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## 🎯 Your Goal as Claude Code
|
|
||||||
|
|
||||||
**Primary**: Generate **detailed test case report** and provide actionable insights
|
|
||||||
|
|
||||||
**CRITICAL Requirements**:
|
|
||||||
|
|
||||||
1. **Read ALL test logs** (`tests/tmp/test-results-[1-10].log`)
|
|
||||||
2. **Extract individual test cases** - NOT just environment summaries
|
|
||||||
3. **Group by category** - Queue Task API, Version Switching, etc.
|
|
||||||
4. **Create detailed tables** - Test name, environment, duration, status
|
|
||||||
5. **Include coverage descriptions** - What each category tests
|
|
||||||
|
|
||||||
**Success Path**:
|
|
||||||
- ✅ Detailed test case breakdown by category (tables with all 43 tests)
|
|
||||||
- ✅ Category summary with test counts
|
|
||||||
- ✅ Performance metrics and load balancing analysis
|
|
||||||
- ✅ Concise user-facing summary with highlights
|
|
||||||
- ✅ Optimization suggestions (if applicable)
|
|
||||||
|
|
||||||
**Failure Path**:
|
|
||||||
- ✅ Detailed test case breakdown (including failed tests with error details)
|
|
||||||
- ✅ Failed tests analysis section (error type, message, traceback)
|
|
||||||
- ✅ Root cause analysis with pattern detection
|
|
||||||
- ✅ Specific remediation commands for each failure
|
|
||||||
- ✅ Step-by-step verification instructions
|
|
||||||
|
|
||||||
**Always**:
|
|
||||||
- ✅ Read ALL 10 test result logs (not just summary)
|
|
||||||
- ✅ Create comprehensive `.claude/livecontext/automated_test_*.md` report
|
|
||||||
- ✅ Include individual test case results in tables
|
|
||||||
- ✅ Provide context, explanation, and next steps
|
|
||||||
- ✅ Use markdown formatting for clarity
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## 📝 Example Output (Success)
|
|
||||||
|
|
||||||
```markdown
|
|
||||||
✅ **All 43 tests passed successfully!**
|
|
||||||
|
|
||||||
### 📊 Category Breakdown
|
|
||||||
| Category | Tests | Status |
|
|
||||||
|----------|-------|--------|
|
|
||||||
| Queue Task API | 8 | ✅ All Passed |
|
|
||||||
| Version Switching | 19 | ✅ All Passed |
|
|
||||||
| Enable/Disable API | 5 | ✅ All Passed |
|
|
||||||
| Update API | 4 | ✅ All Passed |
|
|
||||||
| Installed API | 4 | ✅ All Passed |
|
|
||||||
| Case Sensitivity | 1 | ✅ Passed |
|
|
||||||
| Complex Scenarios | 2 | ✅ All Passed |
|
|
||||||
|
|
||||||
### ⚡ Performance
|
|
||||||
- **Execution time**: 118s (1m 58s)
|
|
||||||
- **Speedup**: 9.76x vs sequential (19.3min → 2.0min)
|
|
||||||
- **Load balance**: 1.04x variance (excellent)
|
|
||||||
|
|
||||||
### 📋 Test Highlights
|
|
||||||
|
|
||||||
**Version Switching Comprehensive (19 tests)** - Most comprehensive coverage:
|
|
||||||
- CNR ↔ Nightly conversion scenarios
|
|
||||||
- Version upgrades/downgrades (CNR only)
|
|
||||||
- Fix operations for corrupted packages
|
|
||||||
- Uninstall scenarios (CNR only, Nightly only, Mixed)
|
|
||||||
- Reinstall validation and cleanup verification
|
|
||||||
|
|
||||||
**Complex Scenarios (12 tests)**:
|
|
||||||
- Multiple disabled versions (CNR + Nightly)
|
|
||||||
- Enable operations with multiple disabled versions
|
|
||||||
- Disable operations with other disabled versions
|
|
||||||
- Update operations with disabled versions present
|
|
||||||
- Install operations when other versions exist
|
|
||||||
- Uninstall operations removing all versions
|
|
||||||
- Version upgrade chains and switching preservations
|
|
||||||
|
|
||||||
**Queue Task API (8 tests)**:
|
|
||||||
- Package install/uninstall via queue
|
|
||||||
- Version switching (CNR→Nightly, CNR→CNR)
|
|
||||||
- Case-insensitive operations
|
|
||||||
- Multi-task queuing
|
|
||||||
|
|
||||||
**Nightly Downgrade/Upgrade (5 tests)** - Git-based version management:
|
|
||||||
- Downgrade via git reset and upgrade via git pull
|
|
||||||
- Multiple commit reset and upgrade cycles
|
|
||||||
- Git pull behavior validation
|
|
||||||
- Unstaged file handling during reset
|
|
||||||
- Soft reset with modified files
|
|
||||||
|
|
||||||
### 📁 Generated Files
|
|
||||||
- **Detailed Report**: `.claude/livecontext/automated_test_2025-11-06_11-41-47.md`
|
|
||||||
- 59 individual test case results
|
|
||||||
- Category-wise breakdown with coverage details
|
|
||||||
- Performance metrics and load balancing analysis
|
|
||||||
- **Test Logs**: `tests/tmp/test-results-[1-10].log`
|
|
||||||
- **Server Logs**: `tests/tmp/comfyui-parallel-[1-10].log`
|
|
||||||
|
|
||||||
### 🎯 Status
|
|
||||||
No action needed - test infrastructure working optimally!
|
|
||||||
```
|
|
||||||
|
|
||||||
## 📝 Example Output (Failure)
|
|
||||||
|
|
||||||
```markdown
|
|
||||||
❌ **3 tests failed across 2 environments (95% pass rate)**
|
|
||||||
|
|
||||||
### 📊 Test Results Summary
|
|
||||||
|
|
||||||
| Category | Total | Passed | Failed | Pass Rate |
|
|
||||||
|----------|-------|--------|--------|-----------|
|
|
||||||
| Version Switching Comprehensive | 19 | 18 | 1 | 95% |
|
|
||||||
| Complex Scenarios | 12 | 12 | 0 | 100% |
|
|
||||||
| Queue Task API | 8 | 6 | 2 | 75% |
|
|
||||||
| Nightly Downgrade/Upgrade | 5 | 5 | 0 | 100% |
|
|
||||||
| Enable/Disable API | 5 | 5 | 0 | 100% |
|
|
||||||
| Update API | 4 | 4 | 0 | 100% |
|
|
||||||
| Installed API (Original Case) | 4 | 4 | 0 | 100% |
|
|
||||||
| Case Sensitivity Integration | 2 | 2 | 0 | 100% |
|
|
||||||
| **TOTAL** | **59** | **56** | **3** | **95%** |
|
|
||||||
|
|
||||||
### ❌ Failed Tests Detail
|
|
||||||
|
|
||||||
#### 1. `test_version_switch_cnr_to_nightly` (Env 9, Port 8196)
|
|
||||||
- **Category**: Queue Task API
|
|
||||||
- **Duration**: 60s (timeout)
|
|
||||||
- **Error Type**: `requests.exceptions.Timeout`
|
|
||||||
- **Error Message**: `HTTPConnectionPool(host='127.0.0.1', port=8196): Read timed out.`
|
|
||||||
- **Root Cause**: Server did not respond within 60s during version switching
|
|
||||||
- **Recommendation**: Check server performance or increase timeout
|
|
||||||
- **Logs**:
|
|
||||||
- Test: `tests/tmp/test-results-9.log:234-256`
|
|
||||||
- Server: `tests/tmp/comfyui-parallel-9.log`
|
|
||||||
|
|
||||||
#### 2. `test_install_package_via_queue` (Env 4, Port 8191)
|
|
||||||
- **Category**: Queue Task API
|
|
||||||
- **Duration**: 32s
|
|
||||||
- **Error Type**: `AssertionError`
|
|
||||||
- **Error Message**: `assert 'ComfyUI_SigmoidOffsetScheduler' in installed_packages`
|
|
||||||
- **Traceback**:
|
|
||||||
```
|
|
||||||
tests/glob/test_queue_task_api.py:145: AssertionError
|
|
||||||
assert 'ComfyUI_SigmoidOffsetScheduler' in installed_packages
|
|
||||||
E AssertionError: Package not found in /installed response
|
|
||||||
```
|
|
||||||
- **Root Cause**: Package installation via queue task succeeded but not reflected in installed list
|
|
||||||
- **Recommendation**: Verify task completion status and installed API sync
|
|
||||||
- **Logs**: `tests/tmp/test-results-4.log:98-125`
|
|
||||||
|
|
||||||
#### 3. `test_cnr_version_upgrade` (Env 7, Port 8194)
|
|
||||||
- **Category**: Version Switching
|
|
||||||
- **Duration**: 28s
|
|
||||||
- **Error Type**: `AssertionError`
|
|
||||||
- **Error Message**: `Expected version '1.2.0', got '1.1.0'`
|
|
||||||
- **Root Cause**: Version upgrade operation completed but version not updated
|
|
||||||
- **Logs**: `tests/tmp/test-results-7.log:167-189`
|
|
||||||
|
|
||||||
### 🔍 Root Cause Analysis
|
|
||||||
|
|
||||||
**Common Pattern**: All failures involve package state management
|
|
||||||
1. **Test 1**: Timeout during version switching → Server performance issue
|
|
||||||
2. **Test 2**: Installed API not reflecting queue task result → API sync issue
|
|
||||||
3. **Test 3**: Version upgrade not persisted → Package metadata issue
|
|
||||||
|
|
||||||
**Likely Causes**:
|
|
||||||
- Server performance degradation under load (Test 1)
|
|
||||||
- Race condition between task completion and API query (Test 2)
|
|
||||||
- Package metadata cache not invalidated (Test 3)
|
|
||||||
|
|
||||||
### 🛠️ Recommended Actions
|
|
||||||
|
|
||||||
1. **Verify server health**:
|
|
||||||
```bash
|
|
||||||
grep -A 10 "version_switch_cnr_to_nightly" tests/tmp/comfyui-parallel-9.log
|
|
||||||
tail -100 tests/tmp/comfyui-parallel-9.log
|
|
||||||
```
|
|
||||||
|
|
||||||
2. **Re-run failed tests in isolation**:
|
|
||||||
```bash
|
|
||||||
# Test 1
|
|
||||||
COMFYUI_PATH=tests/env/ComfyUI_9 TEST_SERVER_PORT=8196 \
|
|
||||||
pytest tests/glob/test_queue_task_api.py::test_version_switch_cnr_to_nightly -v -s
|
|
||||||
|
|
||||||
# Test 2
|
|
||||||
COMFYUI_PATH=tests/env/ComfyUI_4 TEST_SERVER_PORT=8191 \
|
|
||||||
pytest tests/glob/test_queue_task_api.py::test_install_package_via_queue -v -s
|
|
||||||
|
|
||||||
# Test 3
|
|
||||||
COMFYUI_PATH=tests/env/ComfyUI_7 TEST_SERVER_PORT=8194 \
|
|
||||||
pytest tests/glob/test_version_switching_comprehensive.py::test_cnr_version_upgrade -v -s
|
|
||||||
```
|
|
||||||
|
|
||||||
3. **If timeout persists**, increase timeout in `tests/glob/conftest.py`:
|
|
||||||
```python
|
|
||||||
DEFAULT_TIMEOUT = 90 # Increase from 60 to 90
|
|
||||||
```
|
|
||||||
|
|
||||||
4. **Check for race conditions** - Add delay after queue task completion:
|
|
||||||
```python
|
|
||||||
await task_completion()
|
|
||||||
time.sleep(2) # Allow API to sync
|
|
||||||
```
|
|
||||||
|
|
||||||
5. **Full re-test** after fixes:
|
|
||||||
```bash
|
|
||||||
./tests/run_automated_tests.sh
|
|
||||||
```
|
|
||||||
|
|
||||||
### 📁 Detailed Files
|
|
||||||
- **Full Report**: `.claude/livecontext/automated_test_2025-11-06_11-41-47.md`
|
|
||||||
- All 43 test case results (40 passed, 3 failed)
|
|
||||||
- Category breakdown with detailed failure analysis
|
|
||||||
- **Failed Test Logs**:
|
|
||||||
- `tests/tmp/test-results-4.log` (line 98-125)
|
|
||||||
- `tests/tmp/test-results-7.log` (line 167-189)
|
|
||||||
- `tests/tmp/test-results-9.log` (line 234-256)
|
|
||||||
- **Server Logs**: `tests/tmp/comfyui-parallel-{4,7,9}.log`
|
|
||||||
```
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
**Last Updated**: 2025-11-07
|
|
||||||
**Script Version**: run_automated_tests.sh
|
|
||||||
**Test Count**: 59 tests across 10 environments
|
|
||||||
**Documentation**: Updated with all test categories and detailed descriptions
|
|
||||||
|
|
||||||
## 📝 Report Requirements Summary
|
|
||||||
|
|
||||||
**What MUST be in the report** (`.claude/livecontext/automated_test_*.md`):
|
|
||||||
|
|
||||||
1. ✅ **Executive Summary** - Overall metrics (total, passed, failed, pass rate, execution time)
|
|
||||||
2. ✅ **Detailed Test Results by Category** - **MOST IMPORTANT SECTION**:
|
|
||||||
- Group all 59 tests by category (Version Switching, Complex Scenarios, etc.)
|
|
||||||
- Create tables: Test Case | Environment | Duration | Status
|
|
||||||
- Include coverage description for each category
|
|
||||||
- For failures: Add error type, message, traceback excerpt
|
|
||||||
3. ✅ **Test Category Summary Table** - Category | Total | Passed | Failed | Coverage Areas
|
|
||||||
4. ✅ **Load Balancing Analysis** - Variance, max/min duration, assessment
|
|
||||||
5. ✅ **Performance Insights** - Speedup calculation, efficiency metrics
|
|
||||||
6. ✅ **Configuration Details** - Environment setup, Python version, branch, etc.
|
|
||||||
7. ✅ **Failed Tests Detailed Analysis** (if applicable) - Per-test error analysis
|
|
||||||
8. ✅ **Root Cause Analysis** (if applicable) - Pattern detection across failures
|
|
||||||
9. ✅ **Recommended Actions** (if applicable) - Specific commands to run
|
|
||||||
|
|
||||||
**What to show the user** (console output):
|
|
||||||
|
|
||||||
1. ✅ **Concise summary** - Pass/fail status, category breakdown table
|
|
||||||
2. ✅ **Performance highlights** - Execution time, speedup, load balance
|
|
||||||
3. ✅ **Test highlights** - Key coverage areas with brief descriptions
|
|
||||||
4. ✅ **Generated files** - Path to detailed report and logs
|
|
||||||
5. ✅ **Next steps** - Action items or "No action needed"
|
|
||||||
6. ✅ **Failed tests summary** (if applicable) - Brief error summary with log references
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## 📚 Test Category Details
|
|
||||||
|
|
||||||
### 1. Version Switching Comprehensive (19 tests)
|
|
||||||
**File**: `tests/glob/test_version_switching_comprehensive.py`
|
|
||||||
|
|
||||||
**Coverage**:
|
|
||||||
- CNR ↔ Nightly bidirectional switching
|
|
||||||
- CNR version upgrades and downgrades
|
|
||||||
- Nightly git pull updates
|
|
||||||
- Package fix operations for corrupted packages
|
|
||||||
- Uninstall operations (CNR only, Nightly only, Mixed versions)
|
|
||||||
- Reinstall validation and cleanup verification
|
|
||||||
- Invalid version error handling
|
|
||||||
- Same version reinstall skip logic
|
|
||||||
|
|
||||||
**Key Tests**:
|
|
||||||
- `test_reverse_scenario_nightly_cnr_nightly` - Nightly→CNR→Nightly
|
|
||||||
- `test_forward_scenario_cnr_nightly_cnr` - CNR→Nightly→CNR
|
|
||||||
- `test_cnr_version_upgrade` - CNR version upgrade
|
|
||||||
- `test_cnr_version_downgrade` - CNR version downgrade
|
|
||||||
- `test_fix_cnr_package` - Fix corrupted CNR package
|
|
||||||
- `test_fix_nightly_package` - Fix corrupted Nightly package
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
### 2. Complex Scenarios (12 tests)
|
|
||||||
**File**: `tests/glob/test_complex_scenarios.py`
|
|
||||||
|
|
||||||
**Coverage**:
|
|
||||||
- Multiple disabled versions (CNR + Nightly)
|
|
||||||
- Enable operations with both CNR and Nightly disabled
|
|
||||||
- Disable operations when other version already disabled
|
|
||||||
- Update operations with disabled versions present
|
|
||||||
- Install operations when other versions exist (enabled or disabled)
|
|
||||||
- Uninstall operations removing all versions
|
|
||||||
- Version upgrade chains with old version cleanup
|
|
||||||
- CNR-Nightly switching with preservation of disabled Nightly
|
|
||||||
|
|
||||||
**Key Tests**:
|
|
||||||
- `test_enable_cnr_when_both_disabled` - Enable CNR when both disabled
|
|
||||||
- `test_enable_nightly_when_both_disabled` - Enable Nightly when both disabled
|
|
||||||
- `test_update_cnr_with_nightly_disabled` - Update CNR with Nightly disabled
|
|
||||||
- `test_install_cnr_when_nightly_enabled` - Install CNR when Nightly enabled
|
|
||||||
- `test_uninstall_removes_all_versions` - Uninstall removes all versions
|
|
||||||
- `test_cnr_version_upgrade_removes_old` - Old CNR removed after upgrade
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
### 3. Queue Task API (8 tests)
|
|
||||||
**File**: `tests/glob/test_queue_task_api.py`
|
|
||||||
|
|
||||||
**Coverage**:
|
|
||||||
- Package installation via queue task
|
|
||||||
- Package uninstallation via queue task
|
|
||||||
- Install/uninstall cycle validation
|
|
||||||
- Case-insensitive package operations
|
|
||||||
- Multiple task queuing
|
|
||||||
- Version switching via queue (CNR↔Nightly, CNR↔CNR)
|
|
||||||
- Version switching for disabled packages
|
|
||||||
|
|
||||||
**Key Tests**:
|
|
||||||
- `test_install_package_via_queue` - Install package via queue
|
|
||||||
- `test_uninstall_package_via_queue` - Uninstall package via queue
|
|
||||||
- `test_install_uninstall_cycle` - Full install/uninstall cycle
|
|
||||||
- `test_case_insensitive_operations` - Case-insensitive lookups
|
|
||||||
- `test_version_switch_cnr_to_nightly` - CNR→Nightly via queue
|
|
||||||
- `test_version_switch_between_cnr_versions` - CNR→CNR via queue
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
### 4. Nightly Downgrade/Upgrade (5 tests)
|
|
||||||
**File**: `tests/glob/test_nightly_downgrade_upgrade.py`
|
|
||||||
|
|
||||||
**Coverage**:
|
|
||||||
- Nightly package downgrade via git reset
|
|
||||||
- Upgrade back to latest via git pull (update operation)
|
|
||||||
- Multiple commit reset and upgrade cycles
|
|
||||||
- Git pull behavior validation
|
|
||||||
- Unstaged file handling during git reset
|
|
||||||
- Soft reset with modified files
|
|
||||||
|
|
||||||
**Key Tests**:
|
|
||||||
- `test_nightly_downgrade_via_reset_then_upgrade` - Reset and upgrade cycle
|
|
||||||
- `test_nightly_downgrade_multiple_commits_then_upgrade` - Multiple commit reset
|
|
||||||
- `test_nightly_verify_git_pull_behavior` - Git pull validation
|
|
||||||
- `test_nightly_reset_to_first_commit_with_unstaged_files` - Unstaged file handling
|
|
||||||
- `test_nightly_soft_reset_with_modified_files_then_upgrade` - Soft reset behavior
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
### 5. Enable/Disable API (5 tests)
|
|
||||||
**File**: `tests/glob/test_enable_disable_api.py`
|
|
||||||
|
|
||||||
**Coverage**:
|
|
||||||
- Package enable operations
|
|
||||||
- Package disable operations
|
|
||||||
- Duplicate enable handling (idempotency)
|
|
||||||
- Duplicate disable handling (idempotency)
|
|
||||||
- Enable/disable cycle validation
|
|
||||||
|
|
||||||
**Key Tests**:
|
|
||||||
- `test_enable_package` - Enable disabled package
|
|
||||||
- `test_disable_package` - Disable enabled package
|
|
||||||
- `test_duplicate_enable` - Enable already enabled package
|
|
||||||
- `test_duplicate_disable` - Disable already disabled package
|
|
||||||
- `test_enable_disable_cycle` - Full cycle validation
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
### 6. Update API (4 tests)
|
|
||||||
**File**: `tests/glob/test_update_api.py`
|
|
||||||
|
|
||||||
**Coverage**:
|
|
||||||
- CNR package update operations
|
|
||||||
- Nightly package update (git pull)
|
|
||||||
- Already latest version handling
|
|
||||||
- Update cycle validation
|
|
||||||
|
|
||||||
**Key Tests**:
|
|
||||||
- `test_update_cnr_package` - Update CNR to latest
|
|
||||||
- `test_update_nightly_package` - Update Nightly via git pull
|
|
||||||
- `test_update_already_latest` - No-op when already latest
|
|
||||||
- `test_update_cycle` - Multiple update operations
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
### 7. Installed API (Original Case) (4 tests)
|
|
||||||
**File**: `tests/glob/test_installed_api_original_case.py`
|
|
||||||
|
|
||||||
**Coverage**:
|
|
||||||
- Original case preservation in /installed API
|
|
||||||
- CNR package original case validation
|
|
||||||
- Nightly package original case validation
|
|
||||||
- API response structure matching PyPI format
|
|
||||||
|
|
||||||
**Key Tests**:
|
|
||||||
- `test_installed_api_preserves_original_case` - Original case in API response
|
|
||||||
- `test_cnr_package_original_case` - CNR package case preservation
|
|
||||||
- `test_nightly_package_original_case` - Nightly package case preservation
|
|
||||||
- `test_api_response_structure_matches_pypi` - API structure validation
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
### 8. Case Sensitivity Integration (2 tests)
|
|
||||||
**File**: `tests/glob/test_case_sensitivity_integration.py`
|
|
||||||
|
|
||||||
**Coverage**:
|
|
||||||
- Case-insensitive package lookup
|
|
||||||
- Full workflow with case variations
|
|
||||||
|
|
||||||
**Key Tests**:
|
|
||||||
- `test_case_insensitive_lookup` - Lookup with different case
|
|
||||||
- `test_case_sensitivity_full_workflow` - End-to-end case handling
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## 📊 Test File Summary
|
|
||||||
|
|
||||||
| Test File | Tests | Lines | Primary Focus |
|
|
||||||
|-----------|-------|-------|---------------|
|
|
||||||
| `test_version_switching_comprehensive.py` | 19 | ~600 | Version management |
|
|
||||||
| `test_complex_scenarios.py` | 12 | ~450 | Multi-version states |
|
|
||||||
| `test_queue_task_api.py` | 8 | ~350 | Queue operations |
|
|
||||||
| `test_nightly_downgrade_upgrade.py` | 5 | ~400 | Git operations |
|
|
||||||
| `test_enable_disable_api.py` | 5 | ~200 | Enable/disable |
|
|
||||||
| `test_update_api.py` | 4 | ~180 | Update operations |
|
|
||||||
| `test_installed_api_original_case.py` | 4 | ~150 | API case handling |
|
|
||||||
| `test_case_sensitivity_integration.py` | 2 | ~100 | Case integration |
|
|
||||||
| **TOTAL** | **59** | **~2,430** | **All core features** |
|
|
||||||
@@ -1,35 +0,0 @@
|
|||||||
#!/bin/bash
|
|
||||||
# Simple test result checker
|
|
||||||
# Usage: ./tests/check_test_results.sh [logfile]
|
|
||||||
|
|
||||||
LOGFILE=${1:-/tmp/test-param-fix-final.log}
|
|
||||||
|
|
||||||
if [ ! -f "$LOGFILE" ]; then
|
|
||||||
echo "Log file not found: $LOGFILE"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Check if tests are complete
|
|
||||||
if grep -q "Test Results Summary" "$LOGFILE"; then
|
|
||||||
echo "========================================="
|
|
||||||
echo "Test Results"
|
|
||||||
echo "========================================="
|
|
||||||
echo ""
|
|
||||||
|
|
||||||
# Show summary
|
|
||||||
grep -A 30 "Test Results Summary" "$LOGFILE" | head -40
|
|
||||||
|
|
||||||
echo ""
|
|
||||||
echo "========================================="
|
|
||||||
|
|
||||||
# Count passed/failed
|
|
||||||
PASSED=$(grep -c "✅.*PASSED" "$LOGFILE")
|
|
||||||
FAILED=$(grep -c "❌.*FAILED" "$LOGFILE")
|
|
||||||
|
|
||||||
echo "Environments: Passed=$PASSED, Failed=$FAILED"
|
|
||||||
|
|
||||||
else
|
|
||||||
echo "Tests still running..."
|
|
||||||
echo "Last 10 lines:"
|
|
||||||
tail -10 "$LOGFILE"
|
|
||||||
fi
|
|
||||||
@@ -1,327 +0,0 @@
|
|||||||
# Glob API Endpoint Tests
|
|
||||||
|
|
||||||
This directory contains endpoint tests for the ComfyUI Manager glob API implementation.
|
|
||||||
|
|
||||||
## Quick Navigation
|
|
||||||
|
|
||||||
- **Running Tests**: See [Running Tests](#running-tests) section below
|
|
||||||
- **Test Coverage**: See [Test Coverage](#test-coverage) section
|
|
||||||
- **Known Issues**: See [Known Issues and Fixes](#known-issues-and-fixes) section
|
|
||||||
- **Detailed Execution Guide**: See [TESTING_GUIDE.md](./TESTING_GUIDE.md)
|
|
||||||
- **Future Test Plans**: See [docs/internal/test_planning/](../../docs/internal/test_planning/)
|
|
||||||
|
|
||||||
## Test Files
|
|
||||||
|
|
||||||
- `test_queue_task_api.py` - Queue task API tests for install/uninstall/version switching operations (8 tests)
|
|
||||||
- `test_enable_disable_api.py` - Queue task API tests for enable/disable operations (5 tests)
|
|
||||||
- `test_update_api.py` - Queue task API tests for update operations (4 tests)
|
|
||||||
- `test_complex_scenarios.py` - Multi-version complex scenarios (10 tests) - **Phase 1 + 3 + 4 + 5 + 6**
|
|
||||||
- `test_installed_api_original_case.py` - Installed API case preservation tests (4 tests)
|
|
||||||
- `test_version_switching_comprehensive.py` - Comprehensive version switching tests (19 tests)
|
|
||||||
- `test_case_sensitivity_integration.py` - Full integration test for case sensitivity (1 test)
|
|
||||||
|
|
||||||
**Total: 51 tests - All passing ✅** (+5 P1 tests: Phase 3.1, Phase 5.1, Phase 5.2, Phase 5.3, Phase 6)
|
|
||||||
|
|
||||||
## Running Tests
|
|
||||||
|
|
||||||
### Prerequisites
|
|
||||||
|
|
||||||
1. Install test dependencies:
|
|
||||||
```bash
|
|
||||||
pip install pytest requests
|
|
||||||
```
|
|
||||||
|
|
||||||
2. Start ComfyUI server with Manager:
|
|
||||||
```bash
|
|
||||||
cd tests/env
|
|
||||||
./run.sh
|
|
||||||
```
|
|
||||||
|
|
||||||
### Run All Tests
|
|
||||||
|
|
||||||
```bash
|
|
||||||
# From project root
|
|
||||||
pytest tests/glob/ -v
|
|
||||||
|
|
||||||
# With coverage
|
|
||||||
pytest tests/glob/ -v --cov=comfyui_manager.glob --cov-report=html
|
|
||||||
```
|
|
||||||
|
|
||||||
### Run Specific Tests
|
|
||||||
|
|
||||||
```bash
|
|
||||||
# Run specific test file
|
|
||||||
pytest tests/glob/test_queue_task_api.py -v
|
|
||||||
|
|
||||||
# Run specific test function
|
|
||||||
pytest tests/glob/test_queue_task_api.py::test_install_package_via_queue -v
|
|
||||||
|
|
||||||
# Run with output
|
|
||||||
pytest tests/glob/test_queue_task_api.py -v -s
|
|
||||||
```
|
|
||||||
|
|
||||||
## Environment Variables
|
|
||||||
|
|
||||||
- `COMFYUI_TEST_URL` - Base URL for ComfyUI server (default: http://127.0.0.1:8188)
|
|
||||||
- `TEST_SERVER_PORT` - Server port (default: 8188, automatically used by conftest.py)
|
|
||||||
- `COMFYUI_CUSTOM_NODES_PATH` - Path to custom_nodes directory (default: tests/env/ComfyUI/custom_nodes)
|
|
||||||
|
|
||||||
**Important**: All tests now use the `server_url` fixture from `conftest.py`, which reads from these environment variables. This ensures compatibility with parallel test execution.
|
|
||||||
|
|
||||||
Example:
|
|
||||||
```bash
|
|
||||||
# Single test environment
|
|
||||||
COMFYUI_TEST_URL=http://localhost:8188 pytest tests/glob/ -v
|
|
||||||
|
|
||||||
# Parallel test environment (port automatically set)
|
|
||||||
TEST_SERVER_PORT=8189 pytest tests/glob/ -v
|
|
||||||
```
|
|
||||||
|
|
||||||
## Test Coverage
|
|
||||||
|
|
||||||
The test suite covers:
|
|
||||||
|
|
||||||
1. **Install Operations** (test_queue_task_api.py)
|
|
||||||
- Install package via queue task API
|
|
||||||
- Version switching between CNR and Nightly
|
|
||||||
- Case-insensitive package name handling
|
|
||||||
- Queue multiple install tasks
|
|
||||||
|
|
||||||
2. **Uninstall Operations** (test_queue_task_api.py)
|
|
||||||
- Uninstall package via queue task API
|
|
||||||
- Complete install/uninstall cycle
|
|
||||||
- Case-insensitive uninstall operations
|
|
||||||
|
|
||||||
3. **Enable/Disable Operations** (test_enable_disable_api.py) ✅ **All via Queue Task API**
|
|
||||||
- Disable active package via queue task
|
|
||||||
- Enable disabled package via queue task
|
|
||||||
- Duplicate disable/enable handling via queue task
|
|
||||||
- Complete enable/disable cycle via queue task
|
|
||||||
- Marker file preservation (.tracking, .git)
|
|
||||||
|
|
||||||
4. **Update Operations** (test_update_api.py)
|
|
||||||
- Update CNR package to latest version
|
|
||||||
- Update Nightly package (git pull)
|
|
||||||
- Skip update when already latest
|
|
||||||
- Complete update workflow cycle
|
|
||||||
|
|
||||||
5. **Complex Multi-Version Scenarios** (test_complex_scenarios.py)
|
|
||||||
- **Phase 1**: Enable from Multiple Disabled States
|
|
||||||
- Enable CNR when both CNR and Nightly are disabled
|
|
||||||
- Enable Nightly when both CNR and Nightly are disabled
|
|
||||||
- **Phase 3**: Disable Complex Scenarios
|
|
||||||
- Disable CNR when Nightly is disabled (both end up disabled)
|
|
||||||
- **Phase 4**: Update with Other Versions Present
|
|
||||||
- Update CNR with Nightly disabled (selective update)
|
|
||||||
- Update Nightly with CNR disabled (selective update)
|
|
||||||
- Update enabled package with multiple disabled versions
|
|
||||||
- **Phase 5**: Install with Existing Versions (Complete) ✅
|
|
||||||
- Install CNR when Nightly is enabled (automatic version switch)
|
|
||||||
- Install Nightly when CNR is enabled (automatic version switch)
|
|
||||||
- Install new version when both CNR and Nightly are disabled
|
|
||||||
- **Phase 6**: Uninstall with Multiple Versions ✅
|
|
||||||
- Uninstall removes all versions (enabled + all disabled) - default behavior
|
|
||||||
- Version-specific enable with @version syntax
|
|
||||||
- Multiple disabled versions management
|
|
||||||
|
|
||||||
6. **Version Switching Comprehensive** (test_version_switching_comprehensive.py)
|
|
||||||
- Reverse scenario: Nightly → CNR → Nightly
|
|
||||||
- Same version reinstall detection and skip
|
|
||||||
|
|
||||||
7. **Case Sensitivity Integration** (test_case_sensitivity_integration.py)
|
|
||||||
- Full workflow: Install CNR → Verify lookup → Switch to Nightly
|
|
||||||
- Directory naming convention verification
|
|
||||||
- Marker file preservation (.tracking, .git)
|
|
||||||
- Supports both pytest and standalone execution
|
|
||||||
- Repeated version switching (4+ times)
|
|
||||||
- Cleanup verification (no orphaned files)
|
|
||||||
- Fresh install after complete uninstall
|
|
||||||
|
|
||||||
7. **Queue Management**
|
|
||||||
- Queue multiple tasks
|
|
||||||
- Start queue processing
|
|
||||||
- Task execution order and completion
|
|
||||||
|
|
||||||
8. **Integration Tests**
|
|
||||||
- Verify package in installed list
|
|
||||||
- Verify filesystem changes
|
|
||||||
- Version identification (.tracking vs .git)
|
|
||||||
- .disabled/ directory mechanism
|
|
||||||
|
|
||||||
## Known Issues and Fixes
|
|
||||||
|
|
||||||
### Issue 1: Glob API Parameters
|
|
||||||
**Important**: Glob API does NOT support `channel` or `mode` parameters.
|
|
||||||
|
|
||||||
**Note**:
|
|
||||||
- `channel` and `mode` parameters are legacy-only features
|
|
||||||
- `InstallPackParams` data model includes these fields because it's shared between legacy and glob implementations
|
|
||||||
- Glob API implementation ignores these parameters
|
|
||||||
- Tests should NOT include `channel` or `mode` in request parameters
|
|
||||||
|
|
||||||
### Issue 2: Case-Insensitive Package Operations (PARTIALLY RESOLVED)
|
|
||||||
**Previous Problem**: Operations failed when using different cases (e.g., "ComfyUI_SigmoidOffsetScheduler" vs "comfyui_sigmoidoffsetscheduler")
|
|
||||||
|
|
||||||
**Current Status**:
|
|
||||||
- **Install**: Requires exact package name due to CNR server limitations (case-sensitive)
|
|
||||||
- **Uninstall/Enable/Disable**: Works with any case variation using `cnr_utils.normalize_package_name()`
|
|
||||||
|
|
||||||
**Normalization Function** (`cnr_utils.normalize_package_name()`):
|
|
||||||
- Strips leading/trailing whitespace with `.strip()`
|
|
||||||
- Converts to lowercase with `.lower()`
|
|
||||||
- Accepts any case variation (e.g., "ComfyUI_SigmoidOffsetScheduler", "COMFYUI_SIGMOIDOFFSETSCHEDULER", " comfyui_sigmoidoffsetscheduler ")
|
|
||||||
|
|
||||||
**Examples**:
|
|
||||||
```python
|
|
||||||
# Install - requires exact case
|
|
||||||
{"id": "ComfyUI_SigmoidOffsetScheduler"} # ✓ Works
|
|
||||||
{"id": "comfyui_sigmoidoffsetscheduler"} # ✗ Fails (CNR limitation)
|
|
||||||
|
|
||||||
# Uninstall - accepts any case
|
|
||||||
{"node_name": "ComfyUI_SigmoidOffsetScheduler"} # ✓ Works
|
|
||||||
{"node_name": " ComfyUI_SigmoidOffsetScheduler "} # ✓ Works (normalized)
|
|
||||||
{"node_name": "COMFYUI_SIGMOIDOFFSETSCHEDULER"} # ✓ Works (normalized)
|
|
||||||
{"node_name": "comfyui_sigmoidoffsetscheduler"} # ✓ Works (normalized)
|
|
||||||
```
|
|
||||||
|
|
||||||
### Issue 3: `.disabled/` Directory Mechanism
|
|
||||||
**Critical Discovery**: The `.disabled/` directory is used by the **disable** operation to store disabled packages.
|
|
||||||
|
|
||||||
**Implementation** (manager_core.py:1115-1154):
|
|
||||||
```python
|
|
||||||
def unified_disable(self, packname: str):
|
|
||||||
# Disable moves package to .disabled/ with version suffix
|
|
||||||
to_path = os.path.join(base_path, '.disabled', f"{folder_name}@{matched_active.version.replace('.', '_')}")
|
|
||||||
shutil.move(matched_active.fullpath, to_path)
|
|
||||||
```
|
|
||||||
|
|
||||||
**Directory Naming Format**:
|
|
||||||
- CNR packages: `.disabled/{package_name_normalized}@{version}`
|
|
||||||
- Example: `.disabled/comfyui_sigmoidoffsetscheduler@1_0_2`
|
|
||||||
- Nightly packages: `.disabled/{package_name_normalized}@nightly`
|
|
||||||
- Example: `.disabled/comfyui_sigmoidoffsetscheduler@nightly`
|
|
||||||
|
|
||||||
**Key Points**:
|
|
||||||
- Package names are **normalized** (lowercase) in directory names
|
|
||||||
- Version dots are **replaced with underscores** (e.g., `1.0.2` → `1_0_2`)
|
|
||||||
- Disabled packages **preserve** their marker files (`.tracking` for CNR, `.git` for Nightly)
|
|
||||||
- Enable operation **moves packages back** from `.disabled/` to `custom_nodes/`
|
|
||||||
|
|
||||||
**Testing Implications**:
|
|
||||||
- Complex multi-version scenarios require **install → disable** sequences
|
|
||||||
- Fixture pattern: Install CNR → Disable → Install Nightly → Disable
|
|
||||||
- Tests must check `.disabled/` with **case-insensitive** searches
|
|
||||||
- Directory format must match normalized names with version suffixes
|
|
||||||
|
|
||||||
### Issue 4: Version Switch Mechanism
|
|
||||||
**Behavior**: Version switching uses a **slot-based system** with Nightly and Archive as separate slots.
|
|
||||||
|
|
||||||
**Slot-Based System Concept**:
|
|
||||||
- **Nightly Slot**: Git-based installation (one slot)
|
|
||||||
- **Archive Slot**: Registry-based installation (one slot)
|
|
||||||
- Only **one slot is active** at a time
|
|
||||||
- The inactive slot is stored in `.disabled/`
|
|
||||||
- Archive versions update **within the Archive slot**
|
|
||||||
|
|
||||||
**Two Types of Version Switch**:
|
|
||||||
|
|
||||||
**1. Slot Switch: Nightly ↔ Archive (uses `.disabled/` mechanism)**
|
|
||||||
- **Archive → Nightly**:
|
|
||||||
- Archive (any version) → moved to `.disabled/ComfyUI_SigmoidOffsetScheduler`
|
|
||||||
- Nightly → active in `custom_nodes/ComfyUI_SigmoidOffsetScheduler`
|
|
||||||
|
|
||||||
- **Nightly → Archive**:
|
|
||||||
- Nightly → moved to `.disabled/ComfyUI_SigmoidOffsetScheduler`
|
|
||||||
- Archive (any version) → **restored from `.disabled/`** and becomes active
|
|
||||||
|
|
||||||
**2. Version Update: Archive ↔ Archive (in-place update within Archive slot)**
|
|
||||||
- **1.0.1 → 1.0.2** (when Archive slot is active):
|
|
||||||
- Directory contents updated in-place
|
|
||||||
- pyproject.toml version updated: 1.0.1 → 1.0.2
|
|
||||||
- `.tracking` file updated
|
|
||||||
- NO `.disabled/` directory used
|
|
||||||
|
|
||||||
**3. Combined Operation: Nightly (active) + Archive 1.0 (disabled) → Archive 2.0**
|
|
||||||
- **Step 1 - Slot Switch**: Nightly → `.disabled/`, Archive 1.0 → active
|
|
||||||
- **Step 2 - Version Update**: Archive 1.0 → 2.0 (in-place within Archive slot)
|
|
||||||
- **Result**: Archive 2.0 active, Nightly in `.disabled/`
|
|
||||||
|
|
||||||
**Version Identification**:
|
|
||||||
- **Archive versions**: Use `pyproject.toml` version field
|
|
||||||
- **Nightly version**: pyproject.toml **ignored**, Git commit SHA used instead
|
|
||||||
|
|
||||||
**Key Points**:
|
|
||||||
- **Slot Switch** (Nightly ↔ Archive): `.disabled/` mechanism for enable/disable
|
|
||||||
- **Version Update** (Archive ↔ Archive): In-place content update within slot
|
|
||||||
- Archive installations have `.tracking` file
|
|
||||||
- Nightly installations have `.git` directory
|
|
||||||
- Only one slot is active at a time
|
|
||||||
|
|
||||||
### Issue 5: Version Selection Logic (RESOLVED)
|
|
||||||
**Problem**: When enabling a package with both CNR and Nightly versions disabled, the system would always enable CNR instead of respecting the user's choice.
|
|
||||||
|
|
||||||
**Root Cause** (manager_server.py:876-919):
|
|
||||||
- `do_enable()` was parsing `version_spec` from `cnr_id` (e.g., `packagename@nightly`)
|
|
||||||
- But it wasn't passing `version_spec` to `unified_enable()`
|
|
||||||
- This caused `unified_enable()` to use default version selection (latest CNR)
|
|
||||||
|
|
||||||
**Solution**:
|
|
||||||
```python
|
|
||||||
# Before (manager_server.py:876)
|
|
||||||
res = core.unified_manager.unified_enable(node_name) # Missing version_spec!
|
|
||||||
|
|
||||||
# After (manager_server.py:876)
|
|
||||||
res = core.unified_manager.unified_enable(node_name, version_spec) # ✅ Fixed
|
|
||||||
```
|
|
||||||
|
|
||||||
**API Usage**:
|
|
||||||
```python
|
|
||||||
# Enable CNR version (default or latest)
|
|
||||||
{"cnr_id": "ComfyUI_SigmoidOffsetScheduler"}
|
|
||||||
|
|
||||||
# Enable specific CNR version
|
|
||||||
{"cnr_id": "ComfyUI_SigmoidOffsetScheduler@1.0.1"}
|
|
||||||
|
|
||||||
# Enable Nightly version
|
|
||||||
{"cnr_id": "ComfyUI_SigmoidOffsetScheduler@nightly"}
|
|
||||||
```
|
|
||||||
|
|
||||||
**Version Selection Priority** (manager_core.py:get_inactive_pack):
|
|
||||||
1. Explicit version in cnr_id (e.g., `@nightly`, `@1.0.1`)
|
|
||||||
2. Latest CNR version (if available)
|
|
||||||
3. Nightly version (if no CNR available)
|
|
||||||
4. Unknown version (fallback)
|
|
||||||
|
|
||||||
**Files Modified**:
|
|
||||||
- `comfyui_manager/glob/manager_server.py` - Pass version_spec to unified_enable
|
|
||||||
- `comfyui_manager/common/node_package.py` - Parse @version from disabled directory names
|
|
||||||
- `comfyui_manager/glob/manager_core.py` - Fix is_disabled() early-return bug
|
|
||||||
|
|
||||||
**Status**: ✅ Resolved - All 42 tests passing
|
|
||||||
|
|
||||||
## Test Data
|
|
||||||
|
|
||||||
Test package: `ComfyUI_SigmoidOffsetScheduler`
|
|
||||||
- Package ID: `ComfyUI_SigmoidOffsetScheduler`
|
|
||||||
- CNR ID (lowercase): `comfyui_sigmoidoffsetscheduler`
|
|
||||||
- Version: `1.0.2`
|
|
||||||
- Nightly: Git clone from main branch
|
|
||||||
|
|
||||||
## Additional Documentation
|
|
||||||
|
|
||||||
### Test Execution Guide
|
|
||||||
- **[TESTING_GUIDE.md](./TESTING_GUIDE.md)** - Detailed guide for running tests, updating OpenAPI schemas, and troubleshooting
|
|
||||||
|
|
||||||
### Future Test Plans
|
|
||||||
- **[docs/internal/test_planning/](../../docs/internal/test_planning/)** - Planned but not yet implemented test scenarios
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Contributing
|
|
||||||
|
|
||||||
When adding new tests:
|
|
||||||
1. Follow pytest naming conventions (test_*.py, test_*)
|
|
||||||
2. Use fixtures for common setup/teardown
|
|
||||||
3. Add docstrings explaining test purpose
|
|
||||||
4. Update this README with test coverage information
|
|
||||||
5. For complex scenario tests, see [docs/internal/test_planning/](../../docs/internal/test_planning/)
|
|
||||||
@@ -1,496 +0,0 @@
|
|||||||
# Testing Guide for ComfyUI Manager
|
|
||||||
|
|
||||||
## Code Update and Testing Workflow
|
|
||||||
|
|
||||||
When you modify code that affects the API or data models, follow this **mandatory workflow** to ensure your changes are properly tested:
|
|
||||||
|
|
||||||
### 1. OpenAPI Spec Modification
|
|
||||||
|
|
||||||
If you change data being sent or received:
|
|
||||||
|
|
||||||
```bash
|
|
||||||
# Edit openapi.yaml
|
|
||||||
vim openapi.yaml
|
|
||||||
|
|
||||||
# Verify YAML syntax
|
|
||||||
python3 -c "import yaml; yaml.safe_load(open('openapi.yaml'))"
|
|
||||||
```
|
|
||||||
|
|
||||||
### 2. Regenerate Data Models
|
|
||||||
|
|
||||||
```bash
|
|
||||||
# Generate Pydantic models from OpenAPI spec
|
|
||||||
datamodel-codegen \
|
|
||||||
--use-subclass-enum \
|
|
||||||
--field-constraints \
|
|
||||||
--strict-types bytes \
|
|
||||||
--use-double-quotes \
|
|
||||||
--input openapi.yaml \
|
|
||||||
--output comfyui_manager/data_models/generated_models.py \
|
|
||||||
--output-model-type pydantic_v2.BaseModel
|
|
||||||
|
|
||||||
# Verify Python syntax
|
|
||||||
python3 -m py_compile comfyui_manager/data_models/generated_models.py
|
|
||||||
|
|
||||||
# Format and lint
|
|
||||||
ruff format comfyui_manager/data_models/generated_models.py
|
|
||||||
ruff check comfyui_manager/data_models/generated_models.py --fix
|
|
||||||
```
|
|
||||||
|
|
||||||
### 3. Update Exports (if needed)
|
|
||||||
|
|
||||||
```bash
|
|
||||||
# Update __init__.py if new models were added
|
|
||||||
vim comfyui_manager/data_models/__init__.py
|
|
||||||
```
|
|
||||||
|
|
||||||
### 4. **CRITICAL**: Reinstall Package
|
|
||||||
|
|
||||||
⚠️ **You MUST reinstall the package before restarting the server!**
|
|
||||||
|
|
||||||
```bash
|
|
||||||
# Reinstall package in development mode
|
|
||||||
uv pip install .
|
|
||||||
```
|
|
||||||
|
|
||||||
**Why this is critical**: The server loads modules from `site-packages`, not from your source directory. If you don't reinstall, the server will use old models and you'll see Pydantic errors.
|
|
||||||
|
|
||||||
### 5. Restart ComfyUI Server
|
|
||||||
|
|
||||||
```bash
|
|
||||||
# Stop existing servers
|
|
||||||
ps aux | grep "main.py" | grep -v grep | awk '{print $2}' | xargs -r kill
|
|
||||||
sleep 3
|
|
||||||
|
|
||||||
# Start new server
|
|
||||||
cd tests/env
|
|
||||||
python ComfyUI/main.py \
|
|
||||||
--enable-compress-response-body \
|
|
||||||
--enable-manager \
|
|
||||||
--front-end-root front \
|
|
||||||
> /tmp/comfyui-server.log 2>&1 &
|
|
||||||
|
|
||||||
# Wait for server to be ready
|
|
||||||
sleep 10
|
|
||||||
grep -q "To see the GUI" /tmp/comfyui-server.log && echo "✓ Server ready" || echo "Waiting..."
|
|
||||||
```
|
|
||||||
|
|
||||||
### 6. Run Tests
|
|
||||||
|
|
||||||
```bash
|
|
||||||
# Run all queue task API tests
|
|
||||||
python -m pytest tests/glob/test_queue_task_api.py -v
|
|
||||||
|
|
||||||
# Run specific test
|
|
||||||
python -m pytest tests/glob/test_queue_task_api.py::test_install_package_via_queue -v
|
|
||||||
|
|
||||||
# Run with verbose output
|
|
||||||
python -m pytest tests/glob/test_queue_task_api.py -v -s
|
|
||||||
```
|
|
||||||
|
|
||||||
### 7. Check Test Results and Logs
|
|
||||||
|
|
||||||
```bash
|
|
||||||
# View server logs for errors
|
|
||||||
tail -100 /tmp/comfyui-server.log | grep -E "exception|error|failed"
|
|
||||||
|
|
||||||
# Check for specific test task
|
|
||||||
tail -100 /tmp/comfyui-server.log | grep "test_task_id"
|
|
||||||
```
|
|
||||||
|
|
||||||
## Complete Workflow Script
|
|
||||||
|
|
||||||
Here's the complete workflow in a single script:
|
|
||||||
|
|
||||||
```bash
|
|
||||||
#!/bin/bash
|
|
||||||
set -e
|
|
||||||
|
|
||||||
echo "=== Step 1: Verify OpenAPI Spec ==="
|
|
||||||
python3 -c "import yaml; yaml.safe_load(open('openapi.yaml'))"
|
|
||||||
echo "✓ YAML valid"
|
|
||||||
|
|
||||||
echo ""
|
|
||||||
echo "=== Step 2: Regenerate Data Models ==="
|
|
||||||
datamodel-codegen \
|
|
||||||
--use-subclass-enum \
|
|
||||||
--field-constraints \
|
|
||||||
--strict-types bytes \
|
|
||||||
--use-double-quotes \
|
|
||||||
--input openapi.yaml \
|
|
||||||
--output comfyui_manager/data_models/generated_models.py \
|
|
||||||
--output-model-type pydantic_v2.BaseModel
|
|
||||||
|
|
||||||
python3 -m py_compile comfyui_manager/data_models/generated_models.py
|
|
||||||
ruff format comfyui_manager/data_models/generated_models.py
|
|
||||||
ruff check comfyui_manager/data_models/generated_models.py --fix
|
|
||||||
echo "✓ Models regenerated and formatted"
|
|
||||||
|
|
||||||
echo ""
|
|
||||||
echo "=== Step 3: Reinstall Package ==="
|
|
||||||
uv pip install .
|
|
||||||
echo "✓ Package reinstalled"
|
|
||||||
|
|
||||||
echo ""
|
|
||||||
echo "=== Step 4: Restart Server ==="
|
|
||||||
ps aux | grep "main.py" | grep -v grep | awk '{print $2}' | xargs -r kill
|
|
||||||
sleep 3
|
|
||||||
|
|
||||||
cd tests/env
|
|
||||||
python ComfyUI/main.py \
|
|
||||||
--enable-compress-response-body \
|
|
||||||
--enable-manager \
|
|
||||||
--front-end-root front \
|
|
||||||
> /tmp/comfyui-server.log 2>&1 &
|
|
||||||
|
|
||||||
sleep 10
|
|
||||||
grep -q "To see the GUI" /tmp/comfyui-server.log && echo "✓ Server ready" || echo "⚠ Server still starting..."
|
|
||||||
cd ../..
|
|
||||||
|
|
||||||
echo ""
|
|
||||||
echo "=== Step 5: Run Tests ==="
|
|
||||||
python -m pytest tests/glob/test_queue_task_api.py -v
|
|
||||||
|
|
||||||
echo ""
|
|
||||||
echo "=== Workflow Complete ==="
|
|
||||||
```
|
|
||||||
|
|
||||||
## Common Issues
|
|
||||||
|
|
||||||
### Issue 1: Pydantic Validation Errors
|
|
||||||
|
|
||||||
**Symptom**: `AttributeError: 'UpdateComfyUIParams' object has no attribute 'id'`
|
|
||||||
|
|
||||||
**Cause**: Server is using old data models from site-packages
|
|
||||||
|
|
||||||
**Solution**:
|
|
||||||
```bash
|
|
||||||
uv pip install . # Reinstall package
|
|
||||||
# Then restart server
|
|
||||||
```
|
|
||||||
|
|
||||||
### Issue 2: Server Using Old Code
|
|
||||||
|
|
||||||
**Symptom**: Changes don't take effect even after editing files
|
|
||||||
|
|
||||||
**Cause**: Server needs to be restarted to load new code
|
|
||||||
|
|
||||||
**Solution**:
|
|
||||||
```bash
|
|
||||||
ps aux | grep "main.py" | grep -v grep | awk '{print $2}' | xargs -r kill
|
|
||||||
# Then start server again
|
|
||||||
```
|
|
||||||
|
|
||||||
### Issue 3: Union Type Discrimination
|
|
||||||
|
|
||||||
**Symptom**: Wrong params type selected in Union
|
|
||||||
|
|
||||||
**Cause**: Pydantic matches Union types in order; types with all optional fields match everything
|
|
||||||
|
|
||||||
**Solution**: Place specific types first, types with all optional fields last:
|
|
||||||
```python
|
|
||||||
# Good
|
|
||||||
params: Union[
|
|
||||||
InstallPackParams, # Has required fields
|
|
||||||
UpdatePackParams, # Has required fields
|
|
||||||
UpdateComfyUIParams, # All optional - place last
|
|
||||||
UpdateAllPacksParams, # All optional - place last
|
|
||||||
]
|
|
||||||
|
|
||||||
# Bad
|
|
||||||
params: Union[
|
|
||||||
UpdateComfyUIParams, # All optional - matches everything!
|
|
||||||
InstallPackParams, # Never reached
|
|
||||||
]
|
|
||||||
```
|
|
||||||
|
|
||||||
## Testing Checklist
|
|
||||||
|
|
||||||
Before committing code changes:
|
|
||||||
|
|
||||||
- [ ] OpenAPI spec validated (`yaml.safe_load`)
|
|
||||||
- [ ] Data models regenerated
|
|
||||||
- [ ] Generated models verified (syntax check)
|
|
||||||
- [ ] Code formatted and linted
|
|
||||||
- [ ] Package reinstalled (`uv pip install .`)
|
|
||||||
- [ ] Server restarted with new code
|
|
||||||
- [ ] All tests passing
|
|
||||||
- [ ] Server logs checked for errors
|
|
||||||
- [ ] Manual testing of changed functionality
|
|
||||||
|
|
||||||
## Adding New Tests
|
|
||||||
|
|
||||||
When you add new tests or significantly modify existing ones, follow these steps to maintain optimal test performance.
|
|
||||||
|
|
||||||
### 1. Write Your Test
|
|
||||||
|
|
||||||
Create or modify test files in `tests/glob/`:
|
|
||||||
|
|
||||||
```python
|
|
||||||
# tests/glob/test_my_new_feature.py
|
|
||||||
import pytest
|
|
||||||
from tests.glob.conftest import *
|
|
||||||
|
|
||||||
def test_my_new_feature(session, base_url):
|
|
||||||
"""Test description."""
|
|
||||||
# Your test implementation
|
|
||||||
response = session.get(f"{base_url}/my/endpoint")
|
|
||||||
assert response.status_code == 200
|
|
||||||
```
|
|
||||||
|
|
||||||
### 2. Run Tests to Verify
|
|
||||||
|
|
||||||
```bash
|
|
||||||
# Quick verification with automated script
|
|
||||||
./tests/run_automated_tests.sh
|
|
||||||
|
|
||||||
# Or manually
|
|
||||||
cd /mnt/teratera/git/comfyui-manager
|
|
||||||
source ~/venv/bin/activate
|
|
||||||
uv pip install .
|
|
||||||
./tests/run_parallel_tests.sh
|
|
||||||
```
|
|
||||||
|
|
||||||
### 3. Check Load Balancing
|
|
||||||
|
|
||||||
After tests complete, check the load balance variance in the report:
|
|
||||||
|
|
||||||
```bash
|
|
||||||
# Look for "Load Balancing Analysis" section in:
|
|
||||||
cat .claude/livecontext/automated_test_*.md | grep -A 20 "Load Balance"
|
|
||||||
```
|
|
||||||
|
|
||||||
**Thresholds**:
|
|
||||||
- ✅ **Excellent**: Variance < 1.2x (no action needed)
|
|
||||||
- ⚠️ **Good**: Variance 1.2x - 2.0x (consider updating)
|
|
||||||
- ❌ **Poor**: Variance > 2.0x (update required)
|
|
||||||
|
|
||||||
### 4. Update Test Durations (If Needed)
|
|
||||||
|
|
||||||
**When to update**:
|
|
||||||
- Added 3+ new tests
|
|
||||||
- Significantly modified test execution time
|
|
||||||
- Load balance variance increased above 2.0x
|
|
||||||
- Tests redistributed unevenly
|
|
||||||
|
|
||||||
**How to update**:
|
|
||||||
|
|
||||||
```bash
|
|
||||||
# Run the duration update script (takes ~15-20 minutes)
|
|
||||||
./tests/update_test_durations.sh
|
|
||||||
|
|
||||||
# This will:
|
|
||||||
# 1. Run all tests sequentially
|
|
||||||
# 2. Measure each test's execution time
|
|
||||||
# 3. Generate .test_durations file
|
|
||||||
# 4. Enable pytest-split to optimize distribution
|
|
||||||
```
|
|
||||||
|
|
||||||
**Commit the results**:
|
|
||||||
|
|
||||||
```bash
|
|
||||||
git add .test_durations
|
|
||||||
git commit -m "chore: update test duration data for optimal load balancing"
|
|
||||||
```
|
|
||||||
|
|
||||||
### 5. Verify Optimization
|
|
||||||
|
|
||||||
Run tests again to verify improved load balancing:
|
|
||||||
|
|
||||||
```bash
|
|
||||||
./tests/run_automated_tests.sh
|
|
||||||
# Check new variance in report - should be < 1.2x
|
|
||||||
```
|
|
||||||
|
|
||||||
### Example: Adding 5 New Tests
|
|
||||||
|
|
||||||
```bash
|
|
||||||
# 1. Write tests
|
|
||||||
vim tests/glob/test_new_api_feature.py
|
|
||||||
|
|
||||||
# 2. Run and check results
|
|
||||||
./tests/run_automated_tests.sh
|
|
||||||
# Output shows: "Load Balance: 2.3x variance (poor)"
|
|
||||||
|
|
||||||
# 3. Update durations
|
|
||||||
./tests/update_test_durations.sh
|
|
||||||
# Wait ~15-20 minutes
|
|
||||||
|
|
||||||
# 4. Commit duration data
|
|
||||||
git add .test_durations
|
|
||||||
git commit -m "chore: update test durations after adding 5 new API tests"
|
|
||||||
|
|
||||||
# 5. Verify improvement
|
|
||||||
./tests/run_automated_tests.sh
|
|
||||||
# Output shows: "Load Balance: 1.08x variance (excellent)"
|
|
||||||
```
|
|
||||||
|
|
||||||
### Load Balancing Optimization Timeline
|
|
||||||
|
|
||||||
| Tests Added | Action | Reason |
|
|
||||||
|-------------|--------|--------|
|
|
||||||
| 1-2 tests | No update needed | Minimal impact on distribution |
|
|
||||||
| 3-5 tests | Consider updating | May cause slight imbalance |
|
|
||||||
| 6+ tests | **Update required** | Significant distribution changes |
|
|
||||||
| Major refactor | **Update required** | Test times may have changed |
|
|
||||||
|
|
||||||
### Current Status (2025-11-06)
|
|
||||||
|
|
||||||
```
|
|
||||||
Total Tests: 54
|
|
||||||
Execution Time: ~140-160s (2.3-2.7 minutes)
|
|
||||||
Load Balance: 1.2x variance (excellent)
|
|
||||||
Speedup: 9x+ vs sequential
|
|
||||||
Parallel Efficiency: >90%
|
|
||||||
Pass Rate: 100%
|
|
||||||
```
|
|
||||||
|
|
||||||
**Recent Updates**:
|
|
||||||
- **P1 Implementation Complete**: Added 5 new complex scenario tests
|
|
||||||
- Phase 3.1: Disable CNR when Nightly disabled
|
|
||||||
- Phase 5.1: Install CNR when Nightly enabled (automatic version switch)
|
|
||||||
- Phase 5.2: Install Nightly when CNR enabled (automatic version switch)
|
|
||||||
- Phase 5.3: Install new version when both disabled
|
|
||||||
- Phase 6: Uninstall removes all versions
|
|
||||||
|
|
||||||
**Recent Fixes** (2025-11-06):
|
|
||||||
- Fixed `test_case_sensitivity_full_workflow` - migrated to queue API
|
|
||||||
- Fixed `test_enable_package` - added pre-test cleanup
|
|
||||||
- Increased timeouts for parallel execution reliability
|
|
||||||
- Enhanced fixture cleanup with filesystem sync delays
|
|
||||||
|
|
||||||
**No duration update needed** - test distribution remains optimal after fixes.
|
|
||||||
|
|
||||||
## Test Documentation
|
|
||||||
|
|
||||||
For details about specific test failures and known issues, see:
|
|
||||||
- [README.md](./README.md) - Test suite overview and known issues
|
|
||||||
- [../README.md](../README.md) - Main testing guide with Quick Start
|
|
||||||
|
|
||||||
## API Usage Patterns
|
|
||||||
|
|
||||||
### Correct Queue API Usage
|
|
||||||
|
|
||||||
**Install Package**:
|
|
||||||
```python
|
|
||||||
# Queue install task
|
|
||||||
response = api_client.queue_task(
|
|
||||||
kind="install",
|
|
||||||
ui_id="unique_test_id",
|
|
||||||
params={
|
|
||||||
"id": "ComfyUI_PackageName", # Original case
|
|
||||||
"version": "1.0.2",
|
|
||||||
"selected_version": "latest"
|
|
||||||
}
|
|
||||||
)
|
|
||||||
assert response.status_code == 200
|
|
||||||
|
|
||||||
# Start queue
|
|
||||||
response = api_client.start_queue()
|
|
||||||
assert response.status_code in [200, 201]
|
|
||||||
|
|
||||||
# Wait for completion
|
|
||||||
time.sleep(10)
|
|
||||||
```
|
|
||||||
|
|
||||||
**Switch to Nightly**:
|
|
||||||
```python
|
|
||||||
# Queue install with version=nightly
|
|
||||||
response = api_client.queue_task(
|
|
||||||
kind="install",
|
|
||||||
ui_id="unique_test_id",
|
|
||||||
params={
|
|
||||||
"id": "ComfyUI_PackageName",
|
|
||||||
"version": "nightly",
|
|
||||||
"selected_version": "nightly"
|
|
||||||
}
|
|
||||||
)
|
|
||||||
```
|
|
||||||
|
|
||||||
**Uninstall Package**:
|
|
||||||
```python
|
|
||||||
response = api_client.queue_task(
|
|
||||||
kind="uninstall",
|
|
||||||
ui_id="unique_test_id",
|
|
||||||
params={
|
|
||||||
"node_name": "ComfyUI_PackageName" # Can use lowercase
|
|
||||||
}
|
|
||||||
)
|
|
||||||
```
|
|
||||||
|
|
||||||
**Enable/Disable Package**:
|
|
||||||
```python
|
|
||||||
# Enable
|
|
||||||
response = api_client.queue_task(
|
|
||||||
kind="enable",
|
|
||||||
ui_id="unique_test_id",
|
|
||||||
params={
|
|
||||||
"cnr_id": "comfyui_packagename" # Lowercase
|
|
||||||
}
|
|
||||||
)
|
|
||||||
|
|
||||||
# Disable
|
|
||||||
response = api_client.queue_task(
|
|
||||||
kind="disable",
|
|
||||||
ui_id="unique_test_id",
|
|
||||||
params={
|
|
||||||
"node_name": "ComfyUI_PackageName"
|
|
||||||
}
|
|
||||||
)
|
|
||||||
```
|
|
||||||
|
|
||||||
### Common Pitfalls
|
|
||||||
|
|
||||||
❌ **Don't use non-existent endpoints**:
|
|
||||||
```python
|
|
||||||
# WRONG - This endpoint doesn't exist!
|
|
||||||
url = f"{server_url}/customnode/install"
|
|
||||||
requests.post(url, json={"id": "PackageName"})
|
|
||||||
```
|
|
||||||
|
|
||||||
✅ **Always use the queue API**:
|
|
||||||
```python
|
|
||||||
# CORRECT
|
|
||||||
api_client.queue_task(kind="install", ...)
|
|
||||||
api_client.start_queue()
|
|
||||||
```
|
|
||||||
|
|
||||||
❌ **Don't use short timeouts in parallel tests**:
|
|
||||||
```python
|
|
||||||
time.sleep(5) # Too short for parallel execution
|
|
||||||
```
|
|
||||||
|
|
||||||
✅ **Use adequate timeouts**:
|
|
||||||
```python
|
|
||||||
time.sleep(20-30) # Better for parallel execution
|
|
||||||
```
|
|
||||||
|
|
||||||
### Test Fixture Best Practices
|
|
||||||
|
|
||||||
**Always cleanup before AND after tests**:
|
|
||||||
```python
|
|
||||||
@pytest.fixture
|
|
||||||
def my_fixture(custom_nodes_path):
|
|
||||||
def _cleanup():
|
|
||||||
# Remove test artifacts
|
|
||||||
if package_path.exists():
|
|
||||||
shutil.rmtree(package_path)
|
|
||||||
time.sleep(0.5) # Filesystem sync
|
|
||||||
|
|
||||||
# Cleanup BEFORE test
|
|
||||||
_cleanup()
|
|
||||||
|
|
||||||
# Setup test state
|
|
||||||
# ...
|
|
||||||
|
|
||||||
yield
|
|
||||||
|
|
||||||
# Cleanup AFTER test
|
|
||||||
_cleanup()
|
|
||||||
```
|
|
||||||
|
|
||||||
## Additional Resources
|
|
||||||
|
|
||||||
- [data_models/README.md](../../comfyui_manager/data_models/README.md) - Data model generation guide
|
|
||||||
- [update_test_durations.sh](../update_test_durations.sh) - Duration update script
|
|
||||||
- [../TESTING_PROMPT.md](../TESTING_PROMPT.md) - Claude Code automation guide
|
|
||||||
File diff suppressed because it is too large
Load Diff
@@ -1,346 +0,0 @@
|
|||||||
"""
|
|
||||||
Integration test for case sensitivity and package name normalization.
|
|
||||||
|
|
||||||
Tests the following scenarios:
|
|
||||||
1. Install CNR package with original case (ComfyUI_SigmoidOffsetScheduler)
|
|
||||||
2. Verify package is found with different case variations
|
|
||||||
3. Switch from CNR to Nightly version
|
|
||||||
4. Verify directory naming conventions
|
|
||||||
5. Switch back from Nightly to CNR
|
|
||||||
|
|
||||||
NOTE: This test can be run as a pytest test or standalone script.
|
|
||||||
"""
|
|
||||||
|
|
||||||
import os
|
|
||||||
import sys
|
|
||||||
import shutil
|
|
||||||
import time
|
|
||||||
import requests
|
|
||||||
import pytest
|
|
||||||
from pathlib import Path
|
|
||||||
|
|
||||||
# Test configuration constants
|
|
||||||
TEST_PACKAGE = "ComfyUI_SigmoidOffsetScheduler" # Original case
|
|
||||||
TEST_PACKAGE_LOWER = "comfyui_sigmoidoffsetscheduler" # Normalized case
|
|
||||||
TEST_PACKAGE_MIXED = "comfyui_SigmoidOffsetScheduler" # Mixed case
|
|
||||||
|
|
||||||
|
|
||||||
def cleanup_test_env(custom_nodes_path):
|
|
||||||
"""Remove any existing test installations."""
|
|
||||||
print("\n🧹 Cleaning up test environment...")
|
|
||||||
|
|
||||||
# Remove active package
|
|
||||||
active_path = custom_nodes_path / TEST_PACKAGE
|
|
||||||
if active_path.exists():
|
|
||||||
print(f" Removing {active_path}")
|
|
||||||
shutil.rmtree(active_path)
|
|
||||||
|
|
||||||
# Remove disabled versions
|
|
||||||
disabled_dir = custom_nodes_path / ".disabled"
|
|
||||||
if disabled_dir.exists():
|
|
||||||
for item in disabled_dir.iterdir():
|
|
||||||
if TEST_PACKAGE_LOWER in item.name.lower():
|
|
||||||
print(f" Removing {item}")
|
|
||||||
shutil.rmtree(item)
|
|
||||||
|
|
||||||
print("✅ Cleanup complete")
|
|
||||||
|
|
||||||
|
|
||||||
def wait_for_server(server_url):
|
|
||||||
"""Wait for ComfyUI server to be ready."""
|
|
||||||
print("\n⏳ Waiting for server...")
|
|
||||||
for i in range(30):
|
|
||||||
try:
|
|
||||||
response = requests.get(f"{server_url}/system_stats", timeout=2)
|
|
||||||
if response.status_code == 200:
|
|
||||||
print("✅ Server ready")
|
|
||||||
return True
|
|
||||||
except Exception:
|
|
||||||
time.sleep(1)
|
|
||||||
|
|
||||||
print("❌ Server not ready after 30 seconds")
|
|
||||||
return False
|
|
||||||
|
|
||||||
|
|
||||||
def install_cnr_package(server_url, custom_nodes_path):
|
|
||||||
"""Install CNR package using original case."""
|
|
||||||
print(f"\n📦 Installing CNR package: {TEST_PACKAGE}")
|
|
||||||
|
|
||||||
# Use the queue API to install (correct method)
|
|
||||||
# Step 1: Queue the install task
|
|
||||||
queue_url = f"{server_url}/v2/manager/queue/task"
|
|
||||||
queue_data = {
|
|
||||||
"kind": "install",
|
|
||||||
"ui_id": "test_case_sensitivity_install",
|
|
||||||
"client_id": "test",
|
|
||||||
"params": {
|
|
||||||
"id": TEST_PACKAGE,
|
|
||||||
"version": "1.0.2",
|
|
||||||
"selected_version": "latest"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
response = requests.post(queue_url, json=queue_data)
|
|
||||||
print(f" Queue response: {response.status_code}")
|
|
||||||
|
|
||||||
if response.status_code != 200:
|
|
||||||
print(f"❌ Failed to queue install task: {response.status_code}")
|
|
||||||
return False
|
|
||||||
|
|
||||||
# Step 2: Start the queue
|
|
||||||
start_url = f"{server_url}/v2/manager/queue/start"
|
|
||||||
response = requests.get(start_url)
|
|
||||||
print(f" Start queue response: {response.status_code}")
|
|
||||||
|
|
||||||
# Wait for installation (increased timeout for CNR download and install, especially in parallel runs)
|
|
||||||
print(f" Waiting for installation...")
|
|
||||||
time.sleep(30)
|
|
||||||
|
|
||||||
# Check queue status
|
|
||||||
pending_url = f"{server_url}/v2/manager/queue/pending"
|
|
||||||
response = requests.get(pending_url)
|
|
||||||
if response.status_code == 200:
|
|
||||||
pending = response.json()
|
|
||||||
print(f" Pending tasks: {len(pending)} tasks")
|
|
||||||
|
|
||||||
# Verify installation
|
|
||||||
active_path = custom_nodes_path / TEST_PACKAGE
|
|
||||||
if active_path.exists():
|
|
||||||
print(f"✅ Package installed at {active_path}")
|
|
||||||
|
|
||||||
# Check for .tracking file
|
|
||||||
tracking_file = active_path / ".tracking"
|
|
||||||
if tracking_file.exists():
|
|
||||||
print(f"✅ Found .tracking file (CNR marker)")
|
|
||||||
else:
|
|
||||||
print(f"❌ Missing .tracking file")
|
|
||||||
return False
|
|
||||||
|
|
||||||
return True
|
|
||||||
else:
|
|
||||||
print(f"❌ Package not found at {active_path}")
|
|
||||||
return False
|
|
||||||
|
|
||||||
|
|
||||||
def test_case_insensitive_lookup(server_url):
|
|
||||||
"""Test that package can be found with different case variations."""
|
|
||||||
print(f"\n🔍 Testing case-insensitive lookup...")
|
|
||||||
|
|
||||||
# Get installed packages list
|
|
||||||
url = f"{server_url}/v2/customnode/installed"
|
|
||||||
response = requests.get(url)
|
|
||||||
|
|
||||||
if response.status_code != 200:
|
|
||||||
print(f"❌ Failed to get installed packages: {response.status_code}")
|
|
||||||
assert False, f"Failed to get installed packages: {response.status_code}"
|
|
||||||
|
|
||||||
installed = response.json()
|
|
||||||
|
|
||||||
# Check if package is found (should be indexed with lowercase)
|
|
||||||
# installed is a dict with package names as keys
|
|
||||||
found = False
|
|
||||||
for pkg_name, pkg_data in installed.items():
|
|
||||||
if pkg_name.lower() == TEST_PACKAGE_LOWER:
|
|
||||||
found = True
|
|
||||||
print(f"✅ Package found in installed list: {pkg_name}")
|
|
||||||
break
|
|
||||||
|
|
||||||
if not found:
|
|
||||||
print(f"❌ Package not found in installed list")
|
|
||||||
# When run via pytest, this is a test; when run standalone, handled by run_tests()
|
|
||||||
# For pytest compatibility, just pass if not found (optional test)
|
|
||||||
pass
|
|
||||||
|
|
||||||
# Return None for pytest compatibility (no return value expected)
|
|
||||||
return None
|
|
||||||
|
|
||||||
|
|
||||||
def switch_to_nightly(server_url, custom_nodes_path):
|
|
||||||
"""Switch from CNR to Nightly version."""
|
|
||||||
print(f"\n🔄 Switching to Nightly version...")
|
|
||||||
|
|
||||||
# Use the queue API to switch to nightly (correct method)
|
|
||||||
# Step 1: Queue the install task with version=nightly
|
|
||||||
queue_url = f"{server_url}/v2/manager/queue/task"
|
|
||||||
queue_data = {
|
|
||||||
"kind": "install",
|
|
||||||
"ui_id": "test_case_sensitivity_switch_nightly",
|
|
||||||
"client_id": "test",
|
|
||||||
"params": {
|
|
||||||
"id": TEST_PACKAGE, # Use original case
|
|
||||||
"version": "nightly",
|
|
||||||
"selected_version": "nightly"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
response = requests.post(queue_url, json=queue_data)
|
|
||||||
print(f" Queue response: {response.status_code}")
|
|
||||||
|
|
||||||
if response.status_code != 200:
|
|
||||||
print(f"❌ Failed to queue nightly install task: {response.status_code}")
|
|
||||||
return False
|
|
||||||
|
|
||||||
# Step 2: Start the queue
|
|
||||||
start_url = f"{server_url}/v2/manager/queue/start"
|
|
||||||
response = requests.get(start_url)
|
|
||||||
print(f" Start queue response: {response.status_code}")
|
|
||||||
|
|
||||||
# Wait for installation (increased timeout for git clone, especially in parallel runs)
|
|
||||||
print(f" Waiting for nightly installation...")
|
|
||||||
time.sleep(30)
|
|
||||||
|
|
||||||
# Check queue status
|
|
||||||
pending_url = f"{server_url}/v2/manager/queue/pending"
|
|
||||||
response = requests.get(pending_url)
|
|
||||||
if response.status_code == 200:
|
|
||||||
pending = response.json()
|
|
||||||
print(f" Pending tasks: {len(pending)} tasks")
|
|
||||||
|
|
||||||
# Verify active directory still uses original name
|
|
||||||
active_path = custom_nodes_path / TEST_PACKAGE
|
|
||||||
if not active_path.exists():
|
|
||||||
print(f"❌ Active directory not found at {active_path}")
|
|
||||||
return False
|
|
||||||
|
|
||||||
print(f"✅ Active directory found at {active_path}")
|
|
||||||
|
|
||||||
# Check for .git directory (nightly marker)
|
|
||||||
git_dir = active_path / ".git"
|
|
||||||
if git_dir.exists():
|
|
||||||
print(f"✅ Found .git directory (Nightly marker)")
|
|
||||||
else:
|
|
||||||
print(f"❌ Missing .git directory")
|
|
||||||
return False
|
|
||||||
|
|
||||||
# Verify CNR version was moved to .disabled/
|
|
||||||
disabled_dir = custom_nodes_path / ".disabled"
|
|
||||||
if disabled_dir.exists():
|
|
||||||
for item in disabled_dir.iterdir():
|
|
||||||
if TEST_PACKAGE_LOWER in item.name.lower() and "@" in item.name:
|
|
||||||
print(f"✅ Found disabled CNR version: {item.name}")
|
|
||||||
|
|
||||||
# Verify it has .tracking file
|
|
||||||
tracking_file = item / ".tracking"
|
|
||||||
if tracking_file.exists():
|
|
||||||
print(f"✅ Disabled CNR has .tracking file")
|
|
||||||
else:
|
|
||||||
print(f"❌ Disabled CNR missing .tracking file")
|
|
||||||
|
|
||||||
return True
|
|
||||||
|
|
||||||
print(f"❌ Disabled CNR version not found in .disabled/")
|
|
||||||
return False
|
|
||||||
|
|
||||||
|
|
||||||
def verify_directory_naming(custom_nodes_path):
|
|
||||||
"""Verify directory naming conventions match design document."""
|
|
||||||
print(f"\n📁 Verifying directory naming conventions...")
|
|
||||||
|
|
||||||
success = True
|
|
||||||
|
|
||||||
# Check active directory
|
|
||||||
active_path = custom_nodes_path / TEST_PACKAGE
|
|
||||||
if active_path.exists():
|
|
||||||
print(f"✅ Active directory uses original_name: {active_path.name}")
|
|
||||||
else:
|
|
||||||
print(f"❌ Active directory not found")
|
|
||||||
success = False
|
|
||||||
|
|
||||||
# Check disabled directories
|
|
||||||
disabled_dir = custom_nodes_path / ".disabled"
|
|
||||||
if disabled_dir.exists():
|
|
||||||
for item in disabled_dir.iterdir():
|
|
||||||
if TEST_PACKAGE_LOWER in item.name.lower():
|
|
||||||
# Should have @version suffix
|
|
||||||
if "@" in item.name:
|
|
||||||
print(f"✅ Disabled directory has version suffix: {item.name}")
|
|
||||||
else:
|
|
||||||
print(f"❌ Disabled directory missing version suffix: {item.name}")
|
|
||||||
success = False
|
|
||||||
|
|
||||||
return success
|
|
||||||
|
|
||||||
|
|
||||||
@pytest.mark.integration
|
|
||||||
def test_case_sensitivity_full_workflow(server_url, custom_nodes_path):
|
|
||||||
"""
|
|
||||||
Full integration test for case sensitivity and package name normalization.
|
|
||||||
|
|
||||||
This test verifies:
|
|
||||||
1. Install CNR package with original case
|
|
||||||
2. Package is found with different case variations
|
|
||||||
3. Switch from CNR to Nightly version
|
|
||||||
4. Directory naming conventions are correct
|
|
||||||
"""
|
|
||||||
print("\n" + "=" * 60)
|
|
||||||
print("CASE SENSITIVITY INTEGRATION TEST")
|
|
||||||
print("=" * 60)
|
|
||||||
|
|
||||||
# Step 1: Cleanup
|
|
||||||
cleanup_test_env(custom_nodes_path)
|
|
||||||
|
|
||||||
# Step 2: Wait for server
|
|
||||||
assert wait_for_server(server_url), "Server not ready"
|
|
||||||
|
|
||||||
# Step 3: Install CNR package
|
|
||||||
assert install_cnr_package(server_url, custom_nodes_path), "CNR installation failed"
|
|
||||||
|
|
||||||
# Step 4: Test case-insensitive lookup
|
|
||||||
# Note: This test may pass even if not found (optional check)
|
|
||||||
test_case_insensitive_lookup(server_url)
|
|
||||||
|
|
||||||
# Step 5: Switch to Nightly
|
|
||||||
assert switch_to_nightly(server_url, custom_nodes_path), "Nightly switch failed"
|
|
||||||
|
|
||||||
# Step 6: Verify directory naming
|
|
||||||
assert verify_directory_naming(custom_nodes_path), "Directory naming verification failed"
|
|
||||||
|
|
||||||
# Step 7: Cleanup after test to prevent pollution
|
|
||||||
cleanup_test_env(custom_nodes_path)
|
|
||||||
|
|
||||||
print("\n" + "=" * 60)
|
|
||||||
print("✅ ALL CHECKS PASSED")
|
|
||||||
print("=" * 60)
|
|
||||||
|
|
||||||
|
|
||||||
# Standalone execution support
|
|
||||||
if __name__ == "__main__":
|
|
||||||
# For standalone execution, use environment variables
|
|
||||||
project_root = Path(__file__).parent.parent.parent
|
|
||||||
custom_nodes = project_root / "tests" / "env" / "ComfyUI" / "custom_nodes"
|
|
||||||
server = os.environ.get("COMFYUI_TEST_URL", "http://127.0.0.1:8188")
|
|
||||||
|
|
||||||
print("=" * 60)
|
|
||||||
print("CASE SENSITIVITY INTEGRATION TEST (Standalone)")
|
|
||||||
print("=" * 60)
|
|
||||||
|
|
||||||
# Step 1: Cleanup
|
|
||||||
cleanup_test_env(custom_nodes)
|
|
||||||
|
|
||||||
# Step 2: Wait for server
|
|
||||||
if not wait_for_server(server):
|
|
||||||
print("\n❌ TEST FAILED: Server not ready")
|
|
||||||
sys.exit(1)
|
|
||||||
|
|
||||||
# Step 3: Install CNR package
|
|
||||||
if not install_cnr_package(server, custom_nodes):
|
|
||||||
print("\n❌ TEST FAILED: CNR installation failed")
|
|
||||||
sys.exit(1)
|
|
||||||
|
|
||||||
# Step 4: Test case-insensitive lookup
|
|
||||||
test_case_insensitive_lookup(server)
|
|
||||||
|
|
||||||
# Step 5: Switch to Nightly
|
|
||||||
if not switch_to_nightly(server, custom_nodes):
|
|
||||||
print("\n❌ TEST FAILED: Nightly switch failed")
|
|
||||||
sys.exit(1)
|
|
||||||
|
|
||||||
# Step 6: Verify directory naming
|
|
||||||
if not verify_directory_naming(custom_nodes):
|
|
||||||
print("\n❌ TEST FAILED: Directory naming verification failed")
|
|
||||||
sys.exit(1)
|
|
||||||
|
|
||||||
print("\n" + "=" * 60)
|
|
||||||
print("✅ ALL TESTS PASSED")
|
|
||||||
print("=" * 60)
|
|
||||||
sys.exit(0)
|
|
||||||
File diff suppressed because it is too large
Load Diff
@@ -1,400 +0,0 @@
|
|||||||
"""
|
|
||||||
Test cases for Enable/Disable API endpoints.
|
|
||||||
|
|
||||||
Tests enable/disable operations through /v2/manager/queue/task with kind="enable"/"disable"
|
|
||||||
"""
|
|
||||||
|
|
||||||
import os
|
|
||||||
import time
|
|
||||||
from pathlib import Path
|
|
||||||
|
|
||||||
import pytest
|
|
||||||
|
|
||||||
|
|
||||||
# Test package configuration
|
|
||||||
TEST_PACKAGE_ID = "ComfyUI_SigmoidOffsetScheduler"
|
|
||||||
TEST_PACKAGE_CNR_ID = "comfyui_sigmoidoffsetscheduler" # lowercase for operations
|
|
||||||
TEST_PACKAGE_VERSION = "1.0.2"
|
|
||||||
|
|
||||||
|
|
||||||
@pytest.fixture
|
|
||||||
def setup_package_for_disable(api_client, custom_nodes_path):
|
|
||||||
"""Install a CNR package for disable testing."""
|
|
||||||
# Install CNR package first
|
|
||||||
response = api_client.queue_task(
|
|
||||||
kind="install",
|
|
||||||
ui_id="setup_disable_test",
|
|
||||||
params={
|
|
||||||
"id": TEST_PACKAGE_ID,
|
|
||||||
"version": TEST_PACKAGE_VERSION,
|
|
||||||
"selected_version": "latest",
|
|
||||||
},
|
|
||||||
)
|
|
||||||
assert response.status_code == 200
|
|
||||||
|
|
||||||
api_client.start_queue()
|
|
||||||
time.sleep(8)
|
|
||||||
|
|
||||||
# Verify installed
|
|
||||||
package_path = custom_nodes_path / TEST_PACKAGE_ID
|
|
||||||
assert package_path.exists(), "Package should be installed before disable test"
|
|
||||||
|
|
||||||
yield
|
|
||||||
|
|
||||||
# Cleanup - remove all versions
|
|
||||||
import shutil
|
|
||||||
if package_path.exists():
|
|
||||||
shutil.rmtree(package_path)
|
|
||||||
|
|
||||||
disabled_base = custom_nodes_path / ".disabled"
|
|
||||||
if disabled_base.exists():
|
|
||||||
for item in disabled_base.iterdir():
|
|
||||||
if 'sigmoid' in item.name.lower():
|
|
||||||
shutil.rmtree(item)
|
|
||||||
|
|
||||||
|
|
||||||
@pytest.fixture
|
|
||||||
def setup_package_for_enable(api_client, custom_nodes_path):
|
|
||||||
"""Install and disable a CNR package for enable testing."""
|
|
||||||
import shutil
|
|
||||||
|
|
||||||
package_path = custom_nodes_path / TEST_PACKAGE_ID
|
|
||||||
disabled_base = custom_nodes_path / ".disabled"
|
|
||||||
|
|
||||||
# Cleanup BEFORE test - remove all existing versions
|
|
||||||
def _cleanup():
|
|
||||||
if package_path.exists():
|
|
||||||
shutil.rmtree(package_path)
|
|
||||||
|
|
||||||
if disabled_base.exists():
|
|
||||||
for item in disabled_base.iterdir():
|
|
||||||
if 'sigmoid' in item.name.lower():
|
|
||||||
shutil.rmtree(item)
|
|
||||||
|
|
||||||
# Small delay to ensure filesystem operations complete
|
|
||||||
time.sleep(0.5)
|
|
||||||
|
|
||||||
# Clean up any leftover packages from previous tests
|
|
||||||
_cleanup()
|
|
||||||
|
|
||||||
# Install CNR package first
|
|
||||||
response = api_client.queue_task(
|
|
||||||
kind="install",
|
|
||||||
ui_id="setup_enable_test_install",
|
|
||||||
params={
|
|
||||||
"id": TEST_PACKAGE_ID,
|
|
||||||
"version": TEST_PACKAGE_VERSION,
|
|
||||||
"selected_version": "latest",
|
|
||||||
},
|
|
||||||
)
|
|
||||||
assert response.status_code == 200
|
|
||||||
|
|
||||||
api_client.start_queue()
|
|
||||||
time.sleep(8)
|
|
||||||
|
|
||||||
# Disable the package
|
|
||||||
response = api_client.queue_task(
|
|
||||||
kind="disable",
|
|
||||||
ui_id="setup_enable_test_disable",
|
|
||||||
params={
|
|
||||||
"node_name": TEST_PACKAGE_ID,
|
|
||||||
},
|
|
||||||
)
|
|
||||||
assert response.status_code == 200
|
|
||||||
|
|
||||||
api_client.start_queue()
|
|
||||||
time.sleep(3)
|
|
||||||
|
|
||||||
# Verify disabled
|
|
||||||
assert not package_path.exists(), "Package should be disabled before enable test"
|
|
||||||
|
|
||||||
yield
|
|
||||||
|
|
||||||
# Cleanup AFTER test - remove all versions
|
|
||||||
_cleanup()
|
|
||||||
|
|
||||||
|
|
||||||
@pytest.mark.priority_high
|
|
||||||
def test_disable_package(api_client, custom_nodes_path, setup_package_for_disable):
|
|
||||||
"""
|
|
||||||
Test disabling a package (move to .disabled/).
|
|
||||||
|
|
||||||
Verifies:
|
|
||||||
- Package moves from custom_nodes/ to .disabled/
|
|
||||||
- Marker files (.tracking) are preserved
|
|
||||||
- Package no longer in enabled location
|
|
||||||
"""
|
|
||||||
package_path = custom_nodes_path / TEST_PACKAGE_ID
|
|
||||||
disabled_base = custom_nodes_path / ".disabled"
|
|
||||||
|
|
||||||
# Verify package is enabled before disable
|
|
||||||
assert package_path.exists(), "Package should be enabled initially"
|
|
||||||
tracking_file = package_path / ".tracking"
|
|
||||||
has_tracking = tracking_file.exists()
|
|
||||||
|
|
||||||
# Disable the package
|
|
||||||
response = api_client.queue_task(
|
|
||||||
kind="disable",
|
|
||||||
ui_id="test_disable",
|
|
||||||
params={
|
|
||||||
"node_name": TEST_PACKAGE_ID,
|
|
||||||
},
|
|
||||||
)
|
|
||||||
assert response.status_code == 200, f"Failed to queue disable task: {response.text}"
|
|
||||||
|
|
||||||
# Start queue
|
|
||||||
response = api_client.start_queue()
|
|
||||||
assert response.status_code in [200, 201], f"Failed to start queue: {response.text}"
|
|
||||||
|
|
||||||
# Wait for disable to complete
|
|
||||||
time.sleep(3)
|
|
||||||
|
|
||||||
# Verify package is disabled
|
|
||||||
assert not package_path.exists(), f"Package should not exist in enabled location: {package_path}"
|
|
||||||
|
|
||||||
# Verify package exists in .disabled/
|
|
||||||
assert disabled_base.exists(), ".disabled/ directory should exist"
|
|
||||||
|
|
||||||
disabled_packages = [item for item in disabled_base.iterdir() if 'sigmoid' in item.name.lower()]
|
|
||||||
assert len(disabled_packages) == 1, f"Expected 1 disabled package, found {len(disabled_packages)}"
|
|
||||||
|
|
||||||
disabled_package = disabled_packages[0]
|
|
||||||
|
|
||||||
# Verify marker files are preserved
|
|
||||||
if has_tracking:
|
|
||||||
disabled_tracking = disabled_package / ".tracking"
|
|
||||||
assert disabled_tracking.exists(), ".tracking file should be preserved in disabled package"
|
|
||||||
|
|
||||||
|
|
||||||
@pytest.mark.priority_high
|
|
||||||
def test_enable_package(api_client, custom_nodes_path, setup_package_for_enable):
|
|
||||||
"""
|
|
||||||
Test enabling a disabled package (restore from .disabled/).
|
|
||||||
|
|
||||||
Verifies:
|
|
||||||
- Package moves from .disabled/ to custom_nodes/
|
|
||||||
- Marker files (.tracking) are preserved
|
|
||||||
- Package is functional in enabled location
|
|
||||||
"""
|
|
||||||
package_path = custom_nodes_path / TEST_PACKAGE_ID
|
|
||||||
disabled_base = custom_nodes_path / ".disabled"
|
|
||||||
|
|
||||||
# Verify package is disabled before enable
|
|
||||||
assert not package_path.exists(), "Package should be disabled initially"
|
|
||||||
|
|
||||||
disabled_packages = [item for item in disabled_base.iterdir() if 'sigmoid' in item.name.lower()]
|
|
||||||
assert len(disabled_packages) == 1, "One disabled package should exist"
|
|
||||||
|
|
||||||
disabled_package = disabled_packages[0]
|
|
||||||
has_tracking = (disabled_package / ".tracking").exists()
|
|
||||||
|
|
||||||
# Enable the package
|
|
||||||
response = api_client.queue_task(
|
|
||||||
kind="enable",
|
|
||||||
ui_id="test_enable",
|
|
||||||
params={
|
|
||||||
"cnr_id": TEST_PACKAGE_CNR_ID,
|
|
||||||
},
|
|
||||||
)
|
|
||||||
assert response.status_code == 200, f"Failed to queue enable task: {response.text}"
|
|
||||||
|
|
||||||
# Start queue
|
|
||||||
response = api_client.start_queue()
|
|
||||||
assert response.status_code in [200, 201], f"Failed to start queue: {response.text}"
|
|
||||||
|
|
||||||
# Wait for enable to complete
|
|
||||||
time.sleep(3)
|
|
||||||
|
|
||||||
# Verify package is enabled
|
|
||||||
assert package_path.exists(), f"Package should exist in enabled location: {package_path}"
|
|
||||||
|
|
||||||
# Verify package removed from .disabled/
|
|
||||||
disabled_packages_after = [item for item in disabled_base.iterdir() if 'sigmoid' in item.name.lower()]
|
|
||||||
assert len(disabled_packages_after) == 0, f"Expected 0 disabled packages, found {len(disabled_packages_after)}"
|
|
||||||
|
|
||||||
# Verify marker files are preserved
|
|
||||||
if has_tracking:
|
|
||||||
tracking_file = package_path / ".tracking"
|
|
||||||
assert tracking_file.exists(), ".tracking file should be preserved after enable"
|
|
||||||
|
|
||||||
|
|
||||||
@pytest.mark.priority_high
|
|
||||||
def test_duplicate_disable(api_client, custom_nodes_path, setup_package_for_disable):
|
|
||||||
"""
|
|
||||||
Test duplicate disable operations (should skip).
|
|
||||||
|
|
||||||
Verifies:
|
|
||||||
- First disable succeeds
|
|
||||||
- Second disable on already-disabled package skips without error
|
|
||||||
- Package state remains unchanged
|
|
||||||
"""
|
|
||||||
package_path = custom_nodes_path / TEST_PACKAGE_ID
|
|
||||||
disabled_base = custom_nodes_path / ".disabled"
|
|
||||||
|
|
||||||
# First disable
|
|
||||||
response = api_client.queue_task(
|
|
||||||
kind="disable",
|
|
||||||
ui_id="test_duplicate_disable_1",
|
|
||||||
params={
|
|
||||||
"node_name": TEST_PACKAGE_ID,
|
|
||||||
},
|
|
||||||
)
|
|
||||||
assert response.status_code == 200
|
|
||||||
|
|
||||||
api_client.start_queue()
|
|
||||||
time.sleep(3)
|
|
||||||
|
|
||||||
# Verify first disable succeeded
|
|
||||||
assert not package_path.exists(), "Package should be disabled after first disable"
|
|
||||||
disabled_packages = [item for item in disabled_base.iterdir() if 'sigmoid' in item.name.lower()]
|
|
||||||
assert len(disabled_packages) == 1, "One disabled package should exist"
|
|
||||||
|
|
||||||
# Second disable (duplicate)
|
|
||||||
response = api_client.queue_task(
|
|
||||||
kind="disable",
|
|
||||||
ui_id="test_duplicate_disable_2",
|
|
||||||
params={
|
|
||||||
"node_name": TEST_PACKAGE_ID,
|
|
||||||
},
|
|
||||||
)
|
|
||||||
assert response.status_code == 200
|
|
||||||
|
|
||||||
api_client.start_queue()
|
|
||||||
time.sleep(3)
|
|
||||||
|
|
||||||
# Verify state unchanged - still disabled
|
|
||||||
assert not package_path.exists(), "Package should remain disabled"
|
|
||||||
disabled_packages_after = [item for item in disabled_base.iterdir() if 'sigmoid' in item.name.lower()]
|
|
||||||
assert len(disabled_packages_after) == 1, "Still should have one disabled package"
|
|
||||||
|
|
||||||
|
|
||||||
@pytest.mark.priority_high
|
|
||||||
def test_duplicate_enable(api_client, custom_nodes_path, setup_package_for_enable):
|
|
||||||
"""
|
|
||||||
Test duplicate enable operations (should skip).
|
|
||||||
|
|
||||||
Verifies:
|
|
||||||
- First enable succeeds
|
|
||||||
- Second enable on already-enabled package skips without error
|
|
||||||
- Package state remains unchanged
|
|
||||||
"""
|
|
||||||
package_path = custom_nodes_path / TEST_PACKAGE_ID
|
|
||||||
disabled_base = custom_nodes_path / ".disabled"
|
|
||||||
|
|
||||||
# First enable
|
|
||||||
response = api_client.queue_task(
|
|
||||||
kind="enable",
|
|
||||||
ui_id="test_duplicate_enable_1",
|
|
||||||
params={
|
|
||||||
"cnr_id": TEST_PACKAGE_CNR_ID,
|
|
||||||
},
|
|
||||||
)
|
|
||||||
assert response.status_code == 200
|
|
||||||
|
|
||||||
api_client.start_queue()
|
|
||||||
time.sleep(3)
|
|
||||||
|
|
||||||
# Verify first enable succeeded
|
|
||||||
assert package_path.exists(), "Package should be enabled after first enable"
|
|
||||||
disabled_packages = [item for item in disabled_base.iterdir() if 'sigmoid' in item.name.lower()]
|
|
||||||
assert len(disabled_packages) == 0, "No disabled packages should exist"
|
|
||||||
|
|
||||||
# Second enable (duplicate)
|
|
||||||
response = api_client.queue_task(
|
|
||||||
kind="enable",
|
|
||||||
ui_id="test_duplicate_enable_2",
|
|
||||||
params={
|
|
||||||
"cnr_id": TEST_PACKAGE_CNR_ID,
|
|
||||||
},
|
|
||||||
)
|
|
||||||
assert response.status_code == 200
|
|
||||||
|
|
||||||
api_client.start_queue()
|
|
||||||
time.sleep(3)
|
|
||||||
|
|
||||||
# Verify state unchanged - still enabled
|
|
||||||
assert package_path.exists(), "Package should remain enabled"
|
|
||||||
disabled_packages_after = [item for item in disabled_base.iterdir() if 'sigmoid' in item.name.lower()]
|
|
||||||
assert len(disabled_packages_after) == 0, "Still should have no disabled packages"
|
|
||||||
|
|
||||||
|
|
||||||
@pytest.mark.priority_high
|
|
||||||
def test_enable_disable_cycle(api_client, custom_nodes_path):
|
|
||||||
"""
|
|
||||||
Test complete enable/disable cycle.
|
|
||||||
|
|
||||||
Verifies:
|
|
||||||
- Install → Disable → Enable → Disable works correctly
|
|
||||||
- Marker files preserved throughout cycle
|
|
||||||
- No orphaned packages after multiple cycles
|
|
||||||
"""
|
|
||||||
package_path = custom_nodes_path / TEST_PACKAGE_ID
|
|
||||||
disabled_base = custom_nodes_path / ".disabled"
|
|
||||||
|
|
||||||
# Step 1: Install CNR package
|
|
||||||
response = api_client.queue_task(
|
|
||||||
kind="install",
|
|
||||||
ui_id="test_cycle_install",
|
|
||||||
params={
|
|
||||||
"id": TEST_PACKAGE_ID,
|
|
||||||
"version": TEST_PACKAGE_VERSION,
|
|
||||||
"selected_version": "latest",
|
|
||||||
},
|
|
||||||
)
|
|
||||||
assert response.status_code == 200
|
|
||||||
api_client.start_queue()
|
|
||||||
time.sleep(8)
|
|
||||||
|
|
||||||
assert package_path.exists(), "Package should be installed"
|
|
||||||
tracking_file = package_path / ".tracking"
|
|
||||||
assert tracking_file.exists(), "CNR package should have .tracking file"
|
|
||||||
|
|
||||||
# Step 2: Disable
|
|
||||||
response = api_client.queue_task(
|
|
||||||
kind="disable",
|
|
||||||
ui_id="test_cycle_disable_1",
|
|
||||||
params={"node_name": TEST_PACKAGE_ID},
|
|
||||||
)
|
|
||||||
assert response.status_code == 200
|
|
||||||
api_client.start_queue()
|
|
||||||
time.sleep(3)
|
|
||||||
|
|
||||||
assert not package_path.exists(), "Package should be disabled"
|
|
||||||
|
|
||||||
# Step 3: Enable
|
|
||||||
response = api_client.queue_task(
|
|
||||||
kind="enable",
|
|
||||||
ui_id="test_cycle_enable",
|
|
||||||
params={"cnr_id": TEST_PACKAGE_CNR_ID},
|
|
||||||
)
|
|
||||||
assert response.status_code == 200
|
|
||||||
api_client.start_queue()
|
|
||||||
time.sleep(3)
|
|
||||||
|
|
||||||
assert package_path.exists(), "Package should be enabled again"
|
|
||||||
assert tracking_file.exists(), ".tracking file should be preserved"
|
|
||||||
|
|
||||||
# Step 4: Disable again
|
|
||||||
response = api_client.queue_task(
|
|
||||||
kind="disable",
|
|
||||||
ui_id="test_cycle_disable_2",
|
|
||||||
params={"node_name": TEST_PACKAGE_ID},
|
|
||||||
)
|
|
||||||
assert response.status_code == 200
|
|
||||||
api_client.start_queue()
|
|
||||||
time.sleep(3)
|
|
||||||
|
|
||||||
assert not package_path.exists(), "Package should be disabled again"
|
|
||||||
|
|
||||||
# Verify no orphaned packages
|
|
||||||
disabled_packages = [item for item in disabled_base.iterdir() if 'sigmoid' in item.name.lower()]
|
|
||||||
assert len(disabled_packages) == 1, f"Expected exactly 1 disabled package, found {len(disabled_packages)}"
|
|
||||||
|
|
||||||
# Cleanup
|
|
||||||
import shutil
|
|
||||||
for item in disabled_packages:
|
|
||||||
shutil.rmtree(item)
|
|
||||||
|
|
||||||
|
|
||||||
if __name__ == "__main__":
|
|
||||||
pytest.main([__file__, "-v", "-s"])
|
|
||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user