Compare commits
2 Commits
manager-v4
...
docs/docs-
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
f367d0b12d | ||
|
|
b7f60c8c26 |
@@ -1 +0,0 @@
|
|||||||
PYPI_TOKEN=your-pypi-token
|
|
||||||
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
|
|
||||||
58
.github/workflows/publish-to-pypi.yml
vendored
58
.github/workflows/publish-to-pypi.yml
vendored
@@ -1,58 +0,0 @@
|
|||||||
name: Publish to PyPI
|
|
||||||
|
|
||||||
on:
|
|
||||||
workflow_dispatch:
|
|
||||||
push:
|
|
||||||
branches:
|
|
||||||
- manager-v4
|
|
||||||
paths:
|
|
||||||
- "pyproject.toml"
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
build-and-publish:
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
if: ${{ github.repository_owner == 'ltdrdata' || github.repository_owner == 'Comfy-Org' }}
|
|
||||||
steps:
|
|
||||||
- name: Checkout code
|
|
||||||
uses: actions/checkout@v4
|
|
||||||
with:
|
|
||||||
fetch-depth: 0
|
|
||||||
|
|
||||||
- name: Set up Python
|
|
||||||
uses: actions/setup-python@v4
|
|
||||||
with:
|
|
||||||
python-version: '3.x'
|
|
||||||
|
|
||||||
- name: Install build dependencies
|
|
||||||
run: |
|
|
||||||
python -m pip install --upgrade pip
|
|
||||||
python -m pip install build twine
|
|
||||||
|
|
||||||
- name: Get current version
|
|
||||||
id: current_version
|
|
||||||
run: |
|
|
||||||
CURRENT_VERSION=$(grep -oP '^version = "\K[^"]+' pyproject.toml)
|
|
||||||
echo "version=$CURRENT_VERSION" >> $GITHUB_OUTPUT
|
|
||||||
echo "Current version: $CURRENT_VERSION"
|
|
||||||
|
|
||||||
- name: Build package
|
|
||||||
run: python -m build
|
|
||||||
|
|
||||||
# - name: Create GitHub Release
|
|
||||||
# id: create_release
|
|
||||||
# uses: softprops/action-gh-release@v2
|
|
||||||
# env:
|
|
||||||
# GITHUB_TOKEN: ${{ github.token }}
|
|
||||||
# with:
|
|
||||||
# files: dist/*
|
|
||||||
# tag_name: v${{ steps.current_version.outputs.version }}
|
|
||||||
# draft: false
|
|
||||||
# prerelease: false
|
|
||||||
# generate_release_notes: true
|
|
||||||
|
|
||||||
- name: Publish to PyPI
|
|
||||||
uses: pypa/gh-action-pypi-publish@76f52bc884231f62b9a034ebfe128415bbaabdfc
|
|
||||||
with:
|
|
||||||
password: ${{ secrets.PYPI_TOKEN }}
|
|
||||||
skip-existing: true
|
|
||||||
verbose: 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' }}
|
||||||
|
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 }}
|
||||||
4
.gitignore
vendored
4
.gitignore
vendored
@@ -18,7 +18,3 @@ pip_overrides.json
|
|||||||
*.json
|
*.json
|
||||||
check2.sh
|
check2.sh
|
||||||
/venv/
|
/venv/
|
||||||
build
|
|
||||||
dist
|
|
||||||
*.egg-info
|
|
||||||
.env
|
|
||||||
@@ -1,47 +0,0 @@
|
|||||||
## Testing Changes
|
|
||||||
|
|
||||||
1. Activate the ComfyUI environment.
|
|
||||||
|
|
||||||
2. Build package locally after making changes.
|
|
||||||
|
|
||||||
```bash
|
|
||||||
# from inside the ComfyUI-Manager directory, with the ComfyUI environment activated
|
|
||||||
python -m build
|
|
||||||
```
|
|
||||||
|
|
||||||
3. Install the package locally in the ComfyUI environment.
|
|
||||||
|
|
||||||
```bash
|
|
||||||
# Uninstall existing package
|
|
||||||
pip uninstall comfyui-manager
|
|
||||||
|
|
||||||
# Install the locale package
|
|
||||||
pip install dist/comfyui-manager-*.whl
|
|
||||||
```
|
|
||||||
|
|
||||||
4. Start ComfyUI.
|
|
||||||
|
|
||||||
```bash
|
|
||||||
# after navigating to the ComfyUI directory
|
|
||||||
python main.py
|
|
||||||
```
|
|
||||||
|
|
||||||
## Manually Publish Test Version to PyPi
|
|
||||||
|
|
||||||
1. Set the `PYPI_TOKEN` environment variable in env file.
|
|
||||||
|
|
||||||
2. If manually publishing, you likely want to use a release candidate version, so set the version in [pyproject.toml](pyproject.toml) to something like `0.0.1rc1`.
|
|
||||||
|
|
||||||
3. Build the package.
|
|
||||||
|
|
||||||
```bash
|
|
||||||
python -m build
|
|
||||||
```
|
|
||||||
|
|
||||||
4. Upload the package to PyPi.
|
|
||||||
|
|
||||||
```bash
|
|
||||||
python -m twine upload dist/* --username __token__ --password $PYPI_TOKEN
|
|
||||||
```
|
|
||||||
|
|
||||||
5. View at https://pypi.org/project/comfyui-manager/
|
|
||||||
14
MANIFEST.in
14
MANIFEST.in
@@ -1,14 +0,0 @@
|
|||||||
include comfyui_manager/js/*
|
|
||||||
include comfyui_manager/*.json
|
|
||||||
include comfyui_manager/glob/*
|
|
||||||
include LICENSE.txt
|
|
||||||
include README.md
|
|
||||||
include requirements.txt
|
|
||||||
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
|
|
||||||
176
README.md
176
README.md
@@ -5,35 +5,86 @@
|
|||||||

|

|
||||||
|
|
||||||
## NOTICE
|
## NOTICE
|
||||||
* V4.0: Modify the structure to be installable via pip instead of using git clone.
|
|
||||||
* 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
|
||||||
|
|
||||||
* When installing the latest ComfyUI, it will be automatically installed as a dependency, so manual installation is no longer necessary.
|
### Installation[method1] (General installation method: ComfyUI-Manager only)
|
||||||
|
|
||||||
* Manual installation of the nightly version:
|
To install ComfyUI-Manager in addition to an existing installation of ComfyUI, you can follow the following steps:
|
||||||
* Clone to a temporary directory (**Note:** Do **not** clone into `ComfyUI/custom_nodes`.)
|
|
||||||
```
|
|
||||||
git clone https://github.com/Comfy-Org/ComfyUI-Manager
|
|
||||||
```
|
|
||||||
* Install via pip
|
|
||||||
```
|
|
||||||
cd ComfyUI-Manager
|
|
||||||
pip install .
|
|
||||||
```
|
|
||||||
|
|
||||||
|
1. goto `ComfyUI/custom_nodes` dir in terminal(cmd)
|
||||||
|
2. `git clone https://github.com/ltdrdata/ComfyUI-Manager comfyui-manager`
|
||||||
|
3. Restart ComfyUI
|
||||||
|
|
||||||
|
|
||||||
|
### Installation[method2] (Installation for portable ComfyUI version: ComfyUI-Manager only)
|
||||||
|
1. install git
|
||||||
|
- https://git-scm.com/download/win
|
||||||
|
- standalone version
|
||||||
|
- select option: use windows default console window
|
||||||
|
2. Download [scripts/install-manager-for-portable-version.bat](https://github.com/ltdrdata/ComfyUI-Manager/raw/main/scripts/install-manager-for-portable-version.bat) into installed `"ComfyUI_windows_portable"` directory
|
||||||
|
- Don't click. Right click the link and use save as...
|
||||||
|
3. double click `install-manager-for-portable-version.bat` batch file
|
||||||
|
|
||||||
|

|
||||||
|
|
||||||
|
|
||||||
|
### Installation[method3] (Installation through comfy-cli: install ComfyUI and ComfyUI-Manager at once.)
|
||||||
|
> RECOMMENDED: comfy-cli provides various features to manage ComfyUI from the CLI.
|
||||||
|
|
||||||
|
* **prerequisite: python 3, git**
|
||||||
|
|
||||||
|
Windows:
|
||||||
|
```commandline
|
||||||
|
python -m venv venv
|
||||||
|
venv\Scripts\activate
|
||||||
|
pip install comfy-cli
|
||||||
|
comfy install
|
||||||
|
```
|
||||||
|
|
||||||
|
Linux/OSX:
|
||||||
|
```commandline
|
||||||
|
python -m venv venv
|
||||||
|
. venv/bin/activate
|
||||||
|
pip install comfy-cli
|
||||||
|
comfy install
|
||||||
|
```
|
||||||
* See also: https://github.com/Comfy-Org/comfy-cli
|
* See also: https://github.com/Comfy-Org/comfy-cli
|
||||||
|
|
||||||
|
|
||||||
## Front-end
|
### Installation[method4] (Installation for linux+venv: ComfyUI + ComfyUI-Manager)
|
||||||
|
|
||||||
* The built-in front-end of ComfyUI-Manager is the legacy front-end. The front-end for ComfyUI-Manager is now provided via [ComfyUI Frontend](https://github.com/Comfy-Org/ComfyUI_frontend).
|
To install ComfyUI with ComfyUI-Manager on Linux using a venv environment, you can follow these steps:
|
||||||
* To enable the legacy front-end, set the environment variable `ENABLE_LEGACY_COMFYUI_MANAGER_FRONT` to `true` before running.
|
* **prerequisite: python-is-python3, python3-venv, git**
|
||||||
|
|
||||||
|
1. Download [scripts/install-comfyui-venv-linux.sh](https://github.com/ltdrdata/ComfyUI-Manager/raw/main/scripts/install-comfyui-venv-linux.sh) into empty install directory
|
||||||
|
- Don't click. Right click the link and use save as...
|
||||||
|
- ComfyUI will be installed in the subdirectory of the specified directory, and the directory will contain the generated executable script.
|
||||||
|
2. `chmod +x install-comfyui-venv-linux.sh`
|
||||||
|
3. `./install-comfyui-venv-linux.sh`
|
||||||
|
|
||||||
|
### Installation Precautions
|
||||||
|
* **DO**: `ComfyUI-Manager` files must be accurately located in the path `ComfyUI/custom_nodes/comfyui-manager`
|
||||||
|
* Installing in a compressed file format is not recommended.
|
||||||
|
* **DON'T**: Decompress directly into the `ComfyUI/custom_nodes` location, resulting in the Manager contents like `__init__.py` being placed directly in that directory.
|
||||||
|
* You have to remove all ComfyUI-Manager files from `ComfyUI/custom_nodes`
|
||||||
|
* **DON'T**: In a form where decompression occurs in a path such as `ComfyUI/custom_nodes/ComfyUI-Manager/ComfyUI-Manager`.
|
||||||
|
* **DON'T**: In a form where decompression occurs in a path such as `ComfyUI/custom_nodes/ComfyUI-Manager-main`.
|
||||||
|
* In such cases, `ComfyUI-Manager` may operate, but it won't be recognized within `ComfyUI-Manager`, and updates cannot be performed. It also poses the risk of duplicate installations. Remove it and install properly via `git clone` method.
|
||||||
|
|
||||||
|
|
||||||
|
You can execute ComfyUI by running either `./run_gpu.sh` or `./run_cpu.sh` depending on your system configuration.
|
||||||
|
|
||||||
|
## Colab Notebook
|
||||||
|
This repository provides Colab notebooks that allow you to install and use ComfyUI, including ComfyUI-Manager. To use ComfyUI, [click on this link](https://colab.research.google.com/github/ltdrdata/ComfyUI-Manager/blob/main/notebooks/comfyui_colab_with_manager.ipynb).
|
||||||
|
* Support for installing ComfyUI
|
||||||
|
* Support for basic installation of ComfyUI-Manager
|
||||||
|
* Support for automatically installing dependencies of custom nodes upon restarting Colab notebooks.
|
||||||
|
|
||||||
|
|
||||||
## How To Use
|
## How To Use
|
||||||
@@ -89,20 +140,20 @@
|
|||||||
|
|
||||||
|
|
||||||
## Paths
|
## Paths
|
||||||
In `ComfyUI-Manager` V4.0.3b4 and later, configuration files and dynamically generated files are located under `<USER_DIRECTORY>/__manager/`.
|
In `ComfyUI-Manager` V3.0 and later, configuration files and dynamically generated files are located under `<USER_DIRECTORY>/default/ComfyUI-Manager/`.
|
||||||
|
|
||||||
* <USER_DIRECTORY>
|
* <USER_DIRECTORY>
|
||||||
* If executed without any options, the path defaults to ComfyUI/user.
|
* If executed without any options, the path defaults to ComfyUI/user.
|
||||||
* It can be set using --user-directory <USER_DIRECTORY>.
|
* It can be set using --user-directory <USER_DIRECTORY>.
|
||||||
|
|
||||||
* Basic config files: `<USER_DIRECTORY>/__manager/config.ini`
|
* Basic config files: `<USER_DIRECTORY>/default/ComfyUI-Manager/config.ini`
|
||||||
* Configurable channel lists: `<USER_DIRECTORY>/__manager/channels.ini`
|
* Configurable channel lists: `<USER_DIRECTORY>/default/ComfyUI-Manager/channels.ini`
|
||||||
* Configurable pip overrides: `<USER_DIRECTORY>/__manager/pip_overrides.json`
|
* Configurable pip overrides: `<USER_DIRECTORY>/default/ComfyUI-Manager/pip_overrides.json`
|
||||||
* Configurable pip blacklist: `<USER_DIRECTORY>/__manager/pip_blacklist.list`
|
* Configurable pip blacklist: `<USER_DIRECTORY>/default/ComfyUI-Manager/pip_blacklist.list`
|
||||||
* Configurable pip auto fix: `<USER_DIRECTORY>/__manager/pip_auto_fix.list`
|
* Configurable pip auto fix: `<USER_DIRECTORY>/default/ComfyUI-Manager/pip_auto_fix.list`
|
||||||
* Saved snapshot files: `<USER_DIRECTORY>/__manager/snapshots`
|
* Saved snapshot files: `<USER_DIRECTORY>/default/ComfyUI-Manager/snapshots`
|
||||||
* Startup script files: `<USER_DIRECTORY>/__manager/startup-scripts`
|
* Startup script files: `<USER_DIRECTORY>/default/ComfyUI-Manager/startup-scripts`
|
||||||
* Component files: `<USER_DIRECTORY>/__manager/components`
|
* Component files: `<USER_DIRECTORY>/default/ComfyUI-Manager/components`
|
||||||
|
|
||||||
|
|
||||||
## `extra_model_paths.yaml` Configuration
|
## `extra_model_paths.yaml` Configuration
|
||||||
@@ -115,17 +166,17 @@ The following settings are applied based on the section marked as `is_default`.
|
|||||||
|
|
||||||
## Snapshot-Manager
|
## Snapshot-Manager
|
||||||
* When you press `Save snapshot` or use `Update All` on `Manager Menu`, the current installation status snapshot is saved.
|
* When you press `Save snapshot` or use `Update All` on `Manager Menu`, the current installation status snapshot is saved.
|
||||||
* Snapshot file dir: `<USER_DIRECTORY>/__manager/snapshots`
|
* Snapshot file dir: `<USER_DIRECTORY>/default/ComfyUI-Manager/snapshots`
|
||||||
* You can rename snapshot file.
|
* You can rename snapshot file.
|
||||||
* Press the "Restore" button to revert to the installation status of the respective snapshot.
|
* Press the "Restore" button to revert to the installation status of the respective snapshot.
|
||||||
* However, for custom nodes not managed by Git, snapshot support is incomplete.
|
* However, for custom nodes not managed by Git, snapshot support is incomplete.
|
||||||
* When you press `Restore`, it will take effect on the next ComfyUI startup.
|
* When you press `Restore`, it will take effect on the next ComfyUI startup.
|
||||||
* The selected snapshot file is saved in `<USER_DIRECTORY>/__manager/startup-scripts/restore-snapshot.json`, and upon restarting ComfyUI, the snapshot is applied and then deleted.
|
* The selected snapshot file is saved in `<USER_DIRECTORY>/default/ComfyUI-Manager/startup-scripts/restore-snapshot.json`, and upon restarting ComfyUI, the snapshot is applied and then deleted.
|
||||||
|
|
||||||

|

|
||||||
|
|
||||||
|
|
||||||
## cm-cli: command line tools for power users
|
## cm-cli: command line tools for power user
|
||||||
* A tool is provided that allows you to use the features of ComfyUI-Manager without running ComfyUI.
|
* A tool is provided that allows you to use the features of ComfyUI-Manager without running ComfyUI.
|
||||||
* For more details, please refer to the [cm-cli documentation](docs/en/cm-cli.md).
|
* For more details, please refer to the [cm-cli documentation](docs/en/cm-cli.md).
|
||||||
|
|
||||||
@@ -169,12 +220,12 @@ The following settings are applied based on the section marked as `is_default`.
|
|||||||
}
|
}
|
||||||
```
|
```
|
||||||
* `<current timestamp>` Ensure that the timestamp is always unique.
|
* `<current timestamp>` Ensure that the timestamp is always unique.
|
||||||
* "components" should have the same structure as the content of the file stored in `<USER_DIRECTORY>/__manager/components`.
|
* "components" should have the same structure as the content of the file stored in `<USER_DIRECTORY>/default/ComfyUI-Manager/components`.
|
||||||
* `<component name>`: The name should be in the format `<prefix>::<node name>`.
|
* `<component name>`: The name should be in the format `<prefix>::<node name>`.
|
||||||
* `<component node data>`: In the node data of the group node.
|
* `<compnent nodeata>`: In the nodedata of the group node.
|
||||||
* `<version>`: Only two formats are allowed: `major.minor.patch` or `major.minor`. (e.g. `1.0`, `2.2.1`)
|
* `<version>`: Only two formats are allowed: `major.minor.patch` or `major.minor`. (e.g. `1.0`, `2.2.1`)
|
||||||
* `<datetime>`: Saved time
|
* `<datetime>`: Saved time
|
||||||
* `<packname>`: If the packname is not empty, the category becomes packname/workflow, and it is saved in the <packname>.pack file in `<USER_DIRECTORY>/__manager/components`.
|
* `<packname>`: If the packname is not empty, the category becomes packname/workflow, and it is saved in the <packname>.pack file in `<USER_DIRECTORY>/default/ComfyUI-Manager/components`.
|
||||||
* `<category>`: If there is neither a category nor a packname, it is saved in the components category.
|
* `<category>`: If there is neither a category nor a packname, it is saved in the components category.
|
||||||
```
|
```
|
||||||
"version":"1.0",
|
"version":"1.0",
|
||||||
@@ -189,7 +240,7 @@ The following settings are applied based on the section marked as `is_default`.
|
|||||||
* Dragging and dropping or pasting a single component will add a node. However, when adding multiple components, nodes will not be added.
|
* Dragging and dropping or pasting a single component will add a node. However, when adding multiple components, nodes will not be added.
|
||||||
|
|
||||||
|
|
||||||
## Support for installing missing nodes
|
## Support of missing nodes installation
|
||||||
|
|
||||||

|

|
||||||
|
|
||||||
@@ -215,24 +266,23 @@ 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
|
||||||
* Logging to file feature
|
* Logging to file feature
|
||||||
* This feature is enabled by default and can be disabled by setting `file_logging = False` in the `config.ini`.
|
* This feature is enabled by default and can be disabled by setting `file_logging = False` in the `config.ini`.
|
||||||
|
|
||||||
* Fix node (recreate): When right-clicking on a node and selecting `Fix node (recreate)`, you can recreate the node. The widget's values are reset, while the connections maintain those with the same names.
|
* Fix node(recreate): When right-clicking on a node and selecting `Fix node (recreate)`, you can recreate the node. The widget's values are reset, while the connections maintain those with the same names.
|
||||||
* It is used to correct errors in nodes of old workflows created before, which are incompatible with the version changes of custom nodes.
|
* It is used to correct errors in nodes of old workflows created before, which are incompatible with the version changes of custom nodes.
|
||||||
|
|
||||||
* Double-Click Node Title: You can set the double-click behavior of nodes in the ComfyUI-Manager menu.
|
* Double-Click Node Title: You can set the double click behavior of nodes in the ComfyUI-Manager menu.
|
||||||
* `Copy All Connections`, `Copy Input Connections`: Double-clicking a node copies the connections of the nearest node.
|
* `Copy All Connections`, `Copy Input Connections`: Double-clicking a node copies the connections of the nearest node.
|
||||||
* This action targets the nearest node within a straight-line distance of 1000 pixels from the center of the node.
|
* This action targets the nearest node within a straight-line distance of 1000 pixels from the center of the node.
|
||||||
* In the case of `Copy All Connections`, it duplicates existing outputs, but since it does not allow duplicate connections, the existing output connections of the original node are disconnected.
|
* In the case of `Copy All Connections`, it duplicates existing outputs, but since it does not allow duplicate connections, the existing output connections of the original node are disconnected.
|
||||||
@@ -298,48 +348,46 @@ When you run the `scan.sh` script:
|
|||||||
|
|
||||||
* It updates the `github-stats.json`.
|
* It updates the `github-stats.json`.
|
||||||
* This uses the GitHub API, so set your token with `export GITHUB_TOKEN=your_token_here` to avoid quickly reaching the rate limit and malfunctioning.
|
* This uses the GitHub API, so set your token with `export GITHUB_TOKEN=your_token_here` to avoid quickly reaching the rate limit and malfunctioning.
|
||||||
* To skip this step, add the `--skip-stat-update` option.
|
* To skip this step, add the `--skip-update-stat` option.
|
||||||
|
|
||||||
* The `--skip-all` option applies both `--skip-update` and `--skip-stat-update`.
|
* The `--skip-all` option applies both `--skip-update` and `--skip-stat-update`.
|
||||||
|
|
||||||
|
|
||||||
## Troubleshooting
|
## Troubleshooting
|
||||||
* If your `git.exe` is installed in a specific location other than system git, please install ComfyUI-Manager and run ComfyUI. Then, specify the path including the file name in `git_exe = ` in the `<USER_DIRECTORY>/__manager/config.ini` file that is generated.
|
* If your `git.exe` is installed in a specific location other than system git, please install ComfyUI-Manager and run ComfyUI. Then, specify the path including the file name in `git_exe = ` in the `<USER_DIRECTORY>/default/ComfyUI-Manager/config.ini` file that is generated.
|
||||||
* If updating ComfyUI-Manager itself fails, please go to the **ComfyUI-Manager** directory and execute the command `git update-ref refs/remotes/origin/main a361cc1 && git fetch --all && git pull`.
|
* If updating ComfyUI-Manager itself fails, please go to the **ComfyUI-Manager** directory and execute the command `git update-ref refs/remotes/origin/main a361cc1 && git fetch --all && git pull`.
|
||||||
* If you encounter the error message `Overlapped Object has pending operation at deallocation on ComfyUI Manager load` under Windows
|
* If you encounter the error message `Overlapped Object has pending operation at deallocation on Comfyui Manager load` under Windows
|
||||||
* Edit `config.ini` file: add `windows_selector_event_loop_policy = True`
|
* Edit `config.ini` file: add `windows_selector_event_loop_policy = True`
|
||||||
* If the `SSL: CERTIFICATE_VERIFY_FAILED` error occurs.
|
* if `SSL: CERTIFICATE_VERIFY_FAILED` error is occured.
|
||||||
* Edit `config.ini` file: add `bypass_ssl = True`
|
* Edit `config.ini` file: add `bypass_ssl = True`
|
||||||
|
|
||||||
|
|
||||||
## 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
|
||||||
|
|||||||
25
__init__.py
Normal file
25
__init__.py
Normal file
@@ -0,0 +1,25 @@
|
|||||||
|
"""
|
||||||
|
This file is the entry point for the ComfyUI-Manager package, handling CLI-only mode and initial setup.
|
||||||
|
"""
|
||||||
|
|
||||||
|
import os
|
||||||
|
import sys
|
||||||
|
|
||||||
|
cli_mode_flag = os.path.join(os.path.dirname(__file__), '.enable-cli-only-mode')
|
||||||
|
|
||||||
|
if not os.path.exists(cli_mode_flag):
|
||||||
|
sys.path.append(os.path.join(os.path.dirname(__file__), "glob"))
|
||||||
|
import manager_server # noqa: F401
|
||||||
|
import share_3rdparty # noqa: F401
|
||||||
|
import cm_global
|
||||||
|
|
||||||
|
if not cm_global.disable_front and not 'DISABLE_COMFYUI_MANAGER_FRONT' in os.environ:
|
||||||
|
WEB_DIRECTORY = "js"
|
||||||
|
else:
|
||||||
|
print("\n[ComfyUI-Manager] !! cli-only-mode is enabled !!\n")
|
||||||
|
|
||||||
|
NODE_CLASS_MAPPINGS = {}
|
||||||
|
__all__ = ['NODE_CLASS_MAPPINGS']
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
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
|
||||||
4
check.sh
4
check.sh
@@ -37,7 +37,7 @@ find ~/.tmp/default -name "*.py" -print0 | xargs -0 grep -E "crypto|^_A="
|
|||||||
|
|
||||||
echo
|
echo
|
||||||
echo CHECK3
|
echo CHECK3
|
||||||
find ~/.tmp/default -name "requirements.txt" | xargs grep "^\s*[^#]*https\?:"
|
find ~/.tmp/default -name "requirements.txt" | xargs grep "^\s*https\\?:"
|
||||||
find ~/.tmp/default -name "requirements.txt" | xargs grep "^\s*[^#].*\.whl"
|
find ~/.tmp/default -name "requirements.txt" | xargs grep "\.whl"
|
||||||
|
|
||||||
echo
|
echo
|
||||||
|
|||||||
@@ -15,38 +15,41 @@ import git
|
|||||||
import importlib
|
import importlib
|
||||||
|
|
||||||
|
|
||||||
from ..common import manager_util
|
sys.path.append(os.path.dirname(__file__))
|
||||||
|
sys.path.append(os.path.join(os.path.dirname(__file__), "glob"))
|
||||||
|
|
||||||
|
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
|
||||||
# `comfy_path` should be resolved before importing manager_core
|
# `comfy_path` should be resolved before importing manager_core
|
||||||
|
|
||||||
comfy_path = os.environ.get('COMFYUI_PATH')
|
comfy_path = os.environ.get('COMFYUI_PATH')
|
||||||
|
|
||||||
if comfy_path is None:
|
if comfy_path is None:
|
||||||
print("[bold red]cm-cli: environment variable 'COMFYUI_PATH' is not specified.[/bold red]")
|
try:
|
||||||
exit(-1)
|
import folder_paths
|
||||||
|
comfy_path = os.path.join(os.path.dirname(folder_paths.__file__))
|
||||||
|
except:
|
||||||
|
print("\n[bold yellow]WARN: The `COMFYUI_PATH` environment variable is not set. Assuming `custom_nodes/ComfyUI-Manager/../../` as the ComfyUI path.[/bold yellow]", file=sys.stderr)
|
||||||
|
comfy_path = os.path.abspath(os.path.join(manager_util.comfyui_manager_path, '..', '..'))
|
||||||
|
|
||||||
|
# This should be placed here
|
||||||
sys.path.append(comfy_path)
|
sys.path.append(comfy_path)
|
||||||
|
|
||||||
if not os.path.exists(os.path.join(comfy_path, 'folder_paths.py')):
|
|
||||||
print("[bold red]cm-cli: '{comfy_path}' is not a valid 'COMFYUI_PATH' location.[/bold red]")
|
|
||||||
exit(-1)
|
|
||||||
|
|
||||||
|
|
||||||
import utils.extra_config
|
import utils.extra_config
|
||||||
from ..common import cm_global
|
import cm_global
|
||||||
from ..legacy import manager_core as core
|
import manager_core as core
|
||||||
from ..common import context
|
from manager_core import unified_manager
|
||||||
from ..legacy.manager_core import unified_manager
|
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', 'torchaudio', 'torchsde', 'torchvision'}
|
||||||
cm_global.pip_downgrade_blacklist = ['torch', 'torchaudio', 'torchsde', 'torchvision', 'transformers', 'safetensors', 'kornia']
|
cm_global.pip_downgrade_blacklist = ['torch', 'torchaudio', 'torchsde', 'torchvision', 'transformers', 'safetensors', 'kornia']
|
||||||
|
|
||||||
cm_global.pip_overrides = {}
|
if sys.version_info < (3, 13):
|
||||||
|
cm_global.pip_overrides = {'numpy': 'numpy<2'}
|
||||||
|
else:
|
||||||
|
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 +69,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 +85,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 +93,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 +108,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:
|
||||||
@@ -143,14 +146,17 @@ 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)
|
||||||
|
|
||||||
if os.path.exists(context.manager_pip_blacklist_path):
|
if sys.version_info < (3, 13):
|
||||||
with open(context.manager_pip_blacklist_path, 'r', encoding="UTF-8", errors="ignore") as f:
|
cm_global.pip_overrides = {'numpy': 'numpy<2'}
|
||||||
|
|
||||||
|
if os.path.exists(core.manager_pip_blacklist_path):
|
||||||
|
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 != '':
|
||||||
@@ -163,15 +169,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():
|
||||||
@@ -438,11 +444,8 @@ def show_list(kind, simple=False):
|
|||||||
flag = kind in ['all', 'cnr', 'installed', 'enabled']
|
flag = kind in ['all', 'cnr', 'installed', 'enabled']
|
||||||
for k, v in unified_manager.active_nodes.items():
|
for k, v in unified_manager.active_nodes.items():
|
||||||
if flag:
|
if flag:
|
||||||
cnr = unified_manager.cnr_map.get(k)
|
cnr = unified_manager.cnr_map[k]
|
||||||
if cnr:
|
processed[k] = "[ ENABLED ] ", cnr['name'], k, cnr['publisher']['name'], v[0]
|
||||||
processed[k] = "[ ENABLED ] ", cnr['name'], k, cnr['publisher']['name'], v[0]
|
|
||||||
else:
|
|
||||||
processed[k] = None
|
|
||||||
else:
|
else:
|
||||||
processed[k] = None
|
processed[k] = None
|
||||||
|
|
||||||
@@ -462,11 +465,8 @@ def show_list(kind, simple=False):
|
|||||||
continue
|
continue
|
||||||
|
|
||||||
if flag:
|
if flag:
|
||||||
cnr = unified_manager.cnr_map.get(k) # NOTE: can this be None if removed from CNR after installed
|
cnr = unified_manager.cnr_map[k]
|
||||||
if cnr:
|
processed[k] = "[ DISABLED ] ", cnr['name'], k, cnr['publisher']['name'], ", ".join(list(v.keys()))
|
||||||
processed[k] = "[ DISABLED ] ", cnr['name'], k, cnr['publisher']['name'], ", ".join(list(v.keys()))
|
|
||||||
else:
|
|
||||||
processed[k] = None
|
|
||||||
else:
|
else:
|
||||||
processed[k] = None
|
processed[k] = None
|
||||||
|
|
||||||
@@ -475,11 +475,8 @@ def show_list(kind, simple=False):
|
|||||||
continue
|
continue
|
||||||
|
|
||||||
if flag:
|
if flag:
|
||||||
cnr = unified_manager.cnr_map.get(k)
|
cnr = unified_manager.cnr_map[k]
|
||||||
if cnr:
|
processed[k] = "[ DISABLED ] ", cnr['name'], k, cnr['publisher']['name'], 'nightly'
|
||||||
processed[k] = "[ DISABLED ] ", cnr['name'], k, cnr['publisher']['name'], 'nightly'
|
|
||||||
else:
|
|
||||||
processed[k] = None
|
|
||||||
else:
|
else:
|
||||||
processed[k] = None
|
processed[k] = None
|
||||||
|
|
||||||
@@ -499,12 +496,9 @@ def show_list(kind, simple=False):
|
|||||||
continue
|
continue
|
||||||
|
|
||||||
if flag:
|
if flag:
|
||||||
cnr = unified_manager.cnr_map.get(k)
|
cnr = unified_manager.cnr_map[k]
|
||||||
if cnr:
|
ver_spec = v['latest_version']['version'] if 'latest_version' in v else '0.0.0'
|
||||||
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
|
||||||
processed[k] = "[ NOT INSTALLED ] ", cnr['name'], k, cnr['publisher']['name'], ver_spec
|
|
||||||
else:
|
|
||||||
processed[k] = None
|
|
||||||
else:
|
else:
|
||||||
processed[k] = None
|
processed[k] = None
|
||||||
|
|
||||||
@@ -670,7 +664,7 @@ def install(
|
|||||||
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, exit_on_fail=exit_on_fail)
|
||||||
pip_fixer.fix_broken()
|
pip_fixer.fix_broken()
|
||||||
|
|
||||||
@@ -708,7 +702,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()
|
||||||
|
|
||||||
@@ -762,7 +756,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']:
|
||||||
@@ -863,7 +857,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()
|
||||||
|
|
||||||
@@ -1140,7 +1134,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:
|
||||||
@@ -1172,7 +1166,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}")
|
||||||
@@ -1191,7 +1185,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()
|
||||||
|
|
||||||
@@ -1231,11 +1225,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':
|
||||||
@@ -1292,10 +1286,6 @@ def export_custom_node_ids(
|
|||||||
print(f"{x['id']}@unknown", file=output_file)
|
print(f"{x['id']}@unknown", file=output_file)
|
||||||
|
|
||||||
|
|
||||||
def main():
|
|
||||||
app()
|
|
||||||
|
|
||||||
|
|
||||||
if __name__ == '__main__':
|
if __name__ == '__main__':
|
||||||
sys.argv[0] = re.sub(r'(-script\.pyw|\.exe)?$', '', sys.argv[0])
|
sys.argv[0] = re.sub(r'(-script\.pyw|\.exe)?$', '', sys.argv[0])
|
||||||
sys.exit(app())
|
sys.exit(app())
|
||||||
@@ -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,104 +0,0 @@
|
|||||||
import os
|
|
||||||
import logging
|
|
||||||
from aiohttp import web
|
|
||||||
from .common.manager_security import HANDLER_POLICY
|
|
||||||
from .common import manager_security
|
|
||||||
from comfy.cli_args import args
|
|
||||||
|
|
||||||
|
|
||||||
def prestartup():
|
|
||||||
from . import prestartup_script # noqa: F401
|
|
||||||
logging.info('[PRE] ComfyUI-Manager')
|
|
||||||
|
|
||||||
|
|
||||||
def start():
|
|
||||||
logging.info('[START] ComfyUI-Manager')
|
|
||||||
from .common import cm_global # noqa: F401
|
|
||||||
|
|
||||||
if args.enable_manager:
|
|
||||||
if args.enable_manager_legacy_ui:
|
|
||||||
try:
|
|
||||||
from .legacy import manager_server # noqa: F401
|
|
||||||
from .legacy import share_3rdparty # noqa: F401
|
|
||||||
from .legacy import manager_core as core
|
|
||||||
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')
|
|
||||||
except Exception as 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:
|
|
||||||
"""
|
|
||||||
1. Disables the legacy ComfyUI-Manager.
|
|
||||||
2. The blocklist can be expanded later based on policies.
|
|
||||||
"""
|
|
||||||
if args.enable_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.
|
|
||||||
# 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()
|
|
||||||
if 'comfyui-manager' in dir_name:
|
|
||||||
return True
|
|
||||||
|
|
||||||
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
|
|
||||||
@@ -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(manager_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 = manager_dir
|
|
||||||
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_system_user_directory("manager"))
|
|
||||||
|
|
||||||
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,18 +0,0 @@
|
|||||||
import enum
|
|
||||||
|
|
||||||
class NetworkMode(enum.Enum):
|
|
||||||
PUBLIC = "public"
|
|
||||||
PRIVATE = "private"
|
|
||||||
OFFLINE = "offline"
|
|
||||||
PERSONAL_CLOUD = "personal_cloud"
|
|
||||||
|
|
||||||
class SecurityLevel(enum.Enum):
|
|
||||||
STRONG = "strong"
|
|
||||||
NORMAL = "normal"
|
|
||||||
NORMAL_MINUS = "normal-minus"
|
|
||||||
WEAK = "weak"
|
|
||||||
|
|
||||||
class DBMode(enum.Enum):
|
|
||||||
LOCAL = "local"
|
|
||||||
CACHE = "cache"
|
|
||||||
REMOTE = "remote"
|
|
||||||
@@ -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,137 +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,
|
|
||||||
)
|
|
||||||
|
|
||||||
__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",
|
|
||||||
]
|
|
||||||
@@ -1,561 +0,0 @@
|
|||||||
# generated by datamodel-codegen:
|
|
||||||
# filename: openapi.yaml
|
|
||||||
# timestamp: 2025-07-31T04:52:26+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"
|
|
||||||
)
|
|
||||||
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 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: ManagerDatabaseSource
|
|
||||||
channel: ManagerChannel
|
|
||||||
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[str] = Field(
|
|
||||||
None, description="Network mode (online, offline, private)"
|
|
||||||
)
|
|
||||||
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,
|
|
||||||
UpdateAllPacksParams,
|
|
||||||
UpdateComfyUIParams,
|
|
||||||
FixPackParams,
|
|
||||||
UninstallPackParams,
|
|
||||||
DisablePackParams,
|
|
||||||
EnablePackParams,
|
|
||||||
ModelMetadata,
|
|
||||||
]
|
|
||||||
|
|
||||||
|
|
||||||
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
|
|
||||||
File diff suppressed because it is too large
Load Diff
@@ -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).
|
|
||||||
@@ -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",
|
|
||||||
]
|
|
||||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@@ -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,161 +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
|
|
||||||
|
|
||||||
def resolve_custom_node(save_path):
|
|
||||||
save_path = save_path[13:] # remove 'custom_nodes/'
|
|
||||||
|
|
||||||
# NOTE: Validate to prevent path traversal.
|
|
||||||
if save_path.startswith(os.path.sep) or ":" in save_path:
|
|
||||||
return None
|
|
||||||
|
|
||||||
repo_name = save_path.replace("\\", "/").split("/")[
|
|
||||||
0
|
|
||||||
] # get custom node repo name
|
|
||||||
|
|
||||||
# NOTE: The creation of files within the custom node path should be removed in the future.
|
|
||||||
repo_path = core.lookup_installed_custom_nodes_legacy(repo_name)
|
|
||||||
if repo_path is not None and repo_path[0]:
|
|
||||||
# Returns the retargeted path based on the actually installed repository
|
|
||||||
return os.path.join(os.path.dirname(repo_path[1]), save_path)
|
|
||||||
else:
|
|
||||||
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"):
|
|
||||||
base_model = resolve_custom_node(data["save_path"])
|
|
||||||
if base_model is None:
|
|
||||||
if show_log:
|
|
||||||
logging.info(
|
|
||||||
f"[ComfyUI-Manager] The target custom node for model download is not installed: {data['save_path']}"
|
|
||||||
)
|
|
||||||
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,65 +0,0 @@
|
|||||||
import concurrent.futures
|
|
||||||
|
|
||||||
from comfyui_manager.glob import manager_core as core
|
|
||||||
|
|
||||||
|
|
||||||
def check_state_of_git_node_pack(
|
|
||||||
node_packs, do_fetch=False, do_update_check=True, do_update=False
|
|
||||||
):
|
|
||||||
if do_fetch:
|
|
||||||
print("Start fetching...", end="")
|
|
||||||
elif do_update:
|
|
||||||
print("Start updating...", end="")
|
|
||||||
elif do_update_check:
|
|
||||||
print("Start update check...", end="")
|
|
||||||
|
|
||||||
def process_custom_node(item):
|
|
||||||
core.check_state_of_git_node_pack_single(
|
|
||||||
item, do_fetch, do_update_check, do_update
|
|
||||||
)
|
|
||||||
|
|
||||||
with concurrent.futures.ThreadPoolExecutor(4) as executor:
|
|
||||||
for k, v in node_packs.items():
|
|
||||||
if v.get("active_version") in ["unknown", "nightly"]:
|
|
||||||
executor.submit(process_custom_node, v)
|
|
||||||
|
|
||||||
if do_fetch:
|
|
||||||
print("\x1b[2K\rFetching done.")
|
|
||||||
elif do_update:
|
|
||||||
update_exists = any(
|
|
||||||
item.get("updatable", False) for item in node_packs.values()
|
|
||||||
)
|
|
||||||
if update_exists:
|
|
||||||
print("\x1b[2K\rUpdate done.")
|
|
||||||
else:
|
|
||||||
print("\x1b[2K\rAll extensions are already up-to-date.")
|
|
||||||
elif do_update_check:
|
|
||||||
print("\x1b[2K\rUpdate check done.")
|
|
||||||
|
|
||||||
|
|
||||||
def nickname_filter(json_obj):
|
|
||||||
preemptions_map = {}
|
|
||||||
|
|
||||||
for k, x in json_obj.items():
|
|
||||||
if "preemptions" in x[1]:
|
|
||||||
for y in x[1]["preemptions"]:
|
|
||||||
preemptions_map[y] = k
|
|
||||||
elif k.endswith("/ComfyUI"):
|
|
||||||
for y in x[0]:
|
|
||||||
preemptions_map[y] = k
|
|
||||||
|
|
||||||
updates = {}
|
|
||||||
for k, x in json_obj.items():
|
|
||||||
removes = set()
|
|
||||||
for y in x[0]:
|
|
||||||
k2 = preemptions_map.get(y)
|
|
||||||
if k2 is not None and k != k2:
|
|
||||||
removes.add(y)
|
|
||||||
|
|
||||||
if len(removes) > 0:
|
|
||||||
updates[k] = [y for y in x[0] if y not in removes]
|
|
||||||
|
|
||||||
for k, v in updates.items():
|
|
||||||
json_obj[k][0] = v
|
|
||||||
|
|
||||||
return json_obj
|
|
||||||
@@ -1,67 +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, ManagerDatabaseSource
|
|
||||||
|
|
||||||
|
|
||||||
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
|
|
||||||
|
|
||||||
|
|
||||||
async def get_risky_level(files, pip_packages):
|
|
||||||
json_data1 = await core.get_data_by_mode(ManagerDatabaseSource.local.value, "custom-node-list.json")
|
|
||||||
json_data2 = await core.get_data_by_mode(
|
|
||||||
ManagerDatabaseSource.cache.value,
|
|
||||||
"custom-node-list.json",
|
|
||||||
channel_url="https://raw.githubusercontent.com/ltdrdata/ComfyUI-Manager/main",
|
|
||||||
)
|
|
||||||
|
|
||||||
all_urls = set()
|
|
||||||
for x in json_data1["custom_nodes"] + json_data2["custom_nodes"]:
|
|
||||||
all_urls.update(x.get("files", []))
|
|
||||||
|
|
||||||
for x in files:
|
|
||||||
if x not in all_urls:
|
|
||||||
return RiskLevel.high_.value
|
|
||||||
|
|
||||||
all_pip_packages = set()
|
|
||||||
for x in json_data1["custom_nodes"] + json_data2["custom_nodes"]:
|
|
||||||
all_pip_packages.update(x.get("pip", []))
|
|
||||||
|
|
||||||
for p in pip_packages:
|
|
||||||
if p not in all_pip_packages:
|
|
||||||
return RiskLevel.block.value
|
|
||||||
|
|
||||||
return RiskLevel.middle_.value
|
|
||||||
@@ -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 Copus 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.
|
|
||||||
@@ -1,451 +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
|
|
||||||
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):
|
|
||||||
"""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))
|
|
||||||
|
|
||||||
|
|
||||||
@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):
|
|
||||||
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_nio_is_available and "matrix" in share_destinations:
|
|
||||||
comfyui_share_room_id = '!LGYSoacpJPhIfBqVfb:matrix.org'
|
|
||||||
filename = os.path.basename(asset_filepath)
|
|
||||||
content_type = assetFileType
|
|
||||||
|
|
||||||
try:
|
|
||||||
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)
|
|
||||||
12830
comfyui_manager/custom-node-list.json → custom-node-list.json
Normal file → Executable file
12830
comfyui_manager/custom-node-list.json → custom-node-list.json
Normal file → Executable file
File diff suppressed because it is too large
Load Diff
@@ -139,7 +139,7 @@ You can set whether to use ComfyUI-Manager solely via CLI.
|
|||||||
`restore-dependencies`
|
`restore-dependencies`
|
||||||
|
|
||||||
* This command can be used if custom nodes are installed under the `ComfyUI/custom_nodes` path but their dependencies are not installed.
|
* This command can be used if custom nodes are installed under the `ComfyUI/custom_nodes` path but their dependencies are not installed.
|
||||||
* It is useful when starting a new cloud instance, like Colab, where dependencies need to be reinstalled and installation scripts re-executed.
|
* It is useful when starting a new cloud instance, like colab, where dependencies need to be reinstalled and installation scripts re-executed.
|
||||||
* It can also be utilized if ComfyUI is reinstalled and only the custom_nodes path has been backed up and restored.
|
* It can also be utilized if ComfyUI is reinstalled and only the custom_nodes path has been backed up and restored.
|
||||||
|
|
||||||
### 7. Clear
|
### 7. Clear
|
||||||
|
|||||||
@@ -23,13 +23,13 @@ OPTIONS:
|
|||||||
## How To Use?
|
## How To Use?
|
||||||
* `python cm-cli.py` 를 통해서 실행 시킬 수 있습니다.
|
* `python cm-cli.py` 를 통해서 실행 시킬 수 있습니다.
|
||||||
* 예를 들어 custom node를 모두 업데이트 하고 싶다면
|
* 예를 들어 custom node를 모두 업데이트 하고 싶다면
|
||||||
* ComfyUI-Manager 경로에서 `python cm-cli.py update all` 명령을 실행할 수 있습니다.
|
* ComfyUI-Manager경로 에서 `python cm-cli.py update all` 를 command를 실행할 수 있습니다.
|
||||||
* ComfyUI 경로에서 실행한다면, `python custom_nodes/ComfyUI-Manager/cm-cli.py update all` 와 같이 cm-cli.py 의 경로를 지정할 수도 있습니다.
|
* ComfyUI 경로에서 실행한다면, `python custom_nodes/ComfyUI-Manager/cm-cli.py update all` 와 같이 cm-cli.py 의 경로를 지정할 수도 있습니다.
|
||||||
|
|
||||||
## Prerequisite
|
## Prerequisite
|
||||||
* ComfyUI 를 실행하는 python과 동일한 python 환경에서 실행해야 합니다.
|
* ComfyUI 를 실행하는 python과 동일한 python 환경에서 실행해야 합니다.
|
||||||
* venv를 사용할 경우 해당 venv를 activate 한 상태에서 실행해야 합니다.
|
* venv를 사용할 경우 해당 venv를 activate 한 상태에서 실행해야 합니다.
|
||||||
* portable 버전을 사용할 경우 run_nvidia_gpu.bat 파일이 있는 경로인 경우, 다음과 같은 방식으로 명령을 실행해야 합니다.
|
* portable 버전을 사용할 경우 run_nvidia_gpu.bat 파일이 있는 경로인 경우, 다음과 같은 방식으로 코맨드를 실행해야 합니다.
|
||||||
`.\python_embeded\python.exe ComfyUI\custom_nodes\ComfyUI-Manager\cm-cli.py update all`
|
`.\python_embeded\python.exe ComfyUI\custom_nodes\ComfyUI-Manager\cm-cli.py update all`
|
||||||
* ComfyUI 의 경로는 COMFYUI_PATH 환경 변수로 설정할 수 있습니다. 만약 생략할 경우 다음과 같은 경고 메시지가 나타나며, ComfyUI-Manager가 설치된 경로를 기준으로 상대 경로로 설정됩니다.
|
* ComfyUI 의 경로는 COMFYUI_PATH 환경 변수로 설정할 수 있습니다. 만약 생략할 경우 다음과 같은 경고 메시지가 나타나며, ComfyUI-Manager가 설치된 경로를 기준으로 상대 경로로 설정됩니다.
|
||||||
```
|
```
|
||||||
@@ -40,8 +40,8 @@ OPTIONS:
|
|||||||
|
|
||||||
### 1. --channel, --mode
|
### 1. --channel, --mode
|
||||||
* 정보 보기 기능과 커스텀 노드 관리 기능의 경우는 --channel과 --mode를 통해 정보 DB를 설정할 수 있습니다.
|
* 정보 보기 기능과 커스텀 노드 관리 기능의 경우는 --channel과 --mode를 통해 정보 DB를 설정할 수 있습니다.
|
||||||
* 예를 들어 `python cm-cli.py update all --channel recent --mode remote`와 같은 명령을 실행할 경우, 현재 ComfyUI-Manager repo에 내장된 로컬의 정보가 아닌 remote의 최신 정보를 기준으로 동작하며, recent channel에 있는 목록을 대상으로만 동작합니다.
|
* 예들 들어 `python cm-cli.py update all --channel recent --mode remote`와 같은 command를 실행할 경우, 현재 ComfyUI-Manager repo에 내장된 로컬의 정보가 아닌 remote의 최신 정보를 기준으로 동작하며, recent channel에 있는 목록을 대상으로만 동작합니다.
|
||||||
* --channel, --mode 는 `simple-show, show, install, uninstall, update, disable, enable, fix` 명령에서만 사용 가능합니다.
|
* --channel, --mode 는 `simple-show, show, install, uninstall, update, disable, enable, fix` command에서만 사용 가능합니다.
|
||||||
|
|
||||||
### 2. 관리 정보 보기
|
### 2. 관리 정보 보기
|
||||||
|
|
||||||
@@ -51,7 +51,7 @@ OPTIONS:
|
|||||||
* `[show|simple-show]` - `show`는 상세하게 정보를 보여주며, `simple-show`는 간단하게 정보를 보여줍니다.
|
* `[show|simple-show]` - `show`는 상세하게 정보를 보여주며, `simple-show`는 간단하게 정보를 보여줍니다.
|
||||||
|
|
||||||
|
|
||||||
`python cm-cli.py show installed` 와 같은 명령을 실행하면 설치된 커스텀 노드의 정보를 상세하게 보여줍니다.
|
`python cm-cli.py show installed` 와 같은 코맨드를 실행하면 설치된 커스텀 노드의 정보를 상세하게 보여줍니다.
|
||||||
```
|
```
|
||||||
-= ComfyUI-Manager CLI (V2.24) =-
|
-= ComfyUI-Manager CLI (V2.24) =-
|
||||||
|
|
||||||
@@ -67,7 +67,7 @@ FETCH DATA from: https://raw.githubusercontent.com/ltdrdata/ComfyUI-Manager/main
|
|||||||
[ DISABLED ] ComfyUI-Loopchain (author: Fannovel16)
|
[ DISABLED ] ComfyUI-Loopchain (author: Fannovel16)
|
||||||
```
|
```
|
||||||
|
|
||||||
`python cm-cli.py simple-show installed` 와 같은 명령을 이용해서 설치된 커스텀 노드의 정보를 간단하게 보여줍니다.
|
`python cm-cli.py simple-show installed` 와 같은 코맨드를 이용해서 설치된 커스텀 노드의 정보를 간단하게 보여줍니다.
|
||||||
|
|
||||||
```
|
```
|
||||||
-= ComfyUI-Manager CLI (V2.24) =-
|
-= ComfyUI-Manager CLI (V2.24) =-
|
||||||
@@ -89,7 +89,7 @@ ComfyUI-Loopchain
|
|||||||
* `installed`: enable, disable 여부와 상관없이 설치된 모든 노드를 보여줍니다
|
* `installed`: enable, disable 여부와 상관없이 설치된 모든 노드를 보여줍니다
|
||||||
* `not-installed`: 설치되지 않은 커스텀 노드의 목록을 보여줍니다.
|
* `not-installed`: 설치되지 않은 커스텀 노드의 목록을 보여줍니다.
|
||||||
* `all`: 모든 커스텀 노드의 목록을 보여줍니다.
|
* `all`: 모든 커스텀 노드의 목록을 보여줍니다.
|
||||||
* `snapshot`: 현재 설치된 커스텀 노드의 snapshot 정보를 보여줍니다. `show`를 통해서 볼 경우는 json 출력 형태로 보여주며, `simple-show`를 통해서 볼 경우는 간단하게, 커밋 해시와 함께 보여줍니다.
|
* `snapshot`: 현재 설치된 커스텀 노드의 snapshot 정보를 보여줍니다. `show`롤 통해서 볼 경우는 json 출력 형태로 보여주며, `simple-show`를 통해서 볼 경우는 간단하게, 커밋 해시와 함께 보여줍니다.
|
||||||
* `snapshot-list`: ComfyUI-Manager/snapshots 에 저장된 snapshot 파일의 목록을 보여줍니다.
|
* `snapshot-list`: ComfyUI-Manager/snapshots 에 저장된 snapshot 파일의 목록을 보여줍니다.
|
||||||
|
|
||||||
### 3. 커스텀 노드 관리 하기
|
### 3. 커스텀 노드 관리 하기
|
||||||
@@ -98,7 +98,7 @@ ComfyUI-Loopchain
|
|||||||
|
|
||||||
* `python cm-cli.py install ComfyUI-Impact-Pack ComfyUI-Inspire-Pack ComfyUI_experiments` 와 같이 커스텀 노드의 이름을 나열해서 관리 기능을 적용할 수 있습니다.
|
* `python cm-cli.py install ComfyUI-Impact-Pack ComfyUI-Inspire-Pack ComfyUI_experiments` 와 같이 커스텀 노드의 이름을 나열해서 관리 기능을 적용할 수 있습니다.
|
||||||
* 커스텀 노드의 이름은 `show`를 했을 때 보여주는 이름이며, git repository의 이름입니다.
|
* 커스텀 노드의 이름은 `show`를 했을 때 보여주는 이름이며, git repository의 이름입니다.
|
||||||
(추후 nickname을 사용 가능하도록 업데이트할 예정입니다.)
|
(추후 nickname 을 사용가능하돌고 업데이트 할 예정입니다.)
|
||||||
|
|
||||||
`[update|disable|enable|fix] all ?[--channel <channel name>] ?[--mode [remote|local|cache]]`
|
`[update|disable|enable|fix] all ?[--channel <channel name>] ?[--mode [remote|local|cache]]`
|
||||||
|
|
||||||
@@ -124,7 +124,7 @@ ComfyUI-Loopchain
|
|||||||
* `--pip-non-local-url`: web URL에 등록된 pip 패키지들에 대해서 복구를 수행
|
* `--pip-non-local-url`: web URL에 등록된 pip 패키지들에 대해서 복구를 수행
|
||||||
* `--pip-local-url`: local 경로를 지정하고 있는 pip 패키지들에 대해서 복구를 수행
|
* `--pip-local-url`: local 경로를 지정하고 있는 pip 패키지들에 대해서 복구를 수행
|
||||||
* `--user-directory`: 사용자 디렉토리 설정
|
* `--user-directory`: 사용자 디렉토리 설정
|
||||||
* `--restore-to`: 복구될 커스텀 노드가 설치될 경로. (이 옵션을 적용할 경우 오직 대상 경로에 설치된 custom nodes만 설치된 것으로 인식함.)
|
* `--restore-to`: 복구될 커스텀 노드가 설치될 경로. (이 옵션을 적용할 경우 오직 대상 경로에 설치된 custom nodes 만 설치된 것으로 인식함.)
|
||||||
|
|
||||||
### 5. CLI only mode
|
### 5. CLI only mode
|
||||||
|
|
||||||
@@ -133,7 +133,7 @@ ComfyUI-Manager를 CLI로만 사용할 것인지를 설정할 수 있습니다.
|
|||||||
`cli-only-mode [enable|disable]`
|
`cli-only-mode [enable|disable]`
|
||||||
|
|
||||||
* security 혹은 policy 의 이유로 GUI 를 통한 ComfyUI-Manager 사용을 제한하고 싶은 경우 이 모드를 사용할 수 있습니다.
|
* security 혹은 policy 의 이유로 GUI 를 통한 ComfyUI-Manager 사용을 제한하고 싶은 경우 이 모드를 사용할 수 있습니다.
|
||||||
* CLI only mode를 적용할 경우 ComfyUI-Manager 가 매우 제한된 상태로 로드되어, 내부적으로 제공하는 web API가 비활성화되며, 메인 메뉴에서도 Manager 버튼이 표시되지 않습니다.
|
* CLI only mode를 적용할 경우 ComfyUI-Manager 가 매우 제한된 상태로 로드되어, 내부적으로 제공하는 web API가 비활성화 되며, 메인 메뉴에서도 Manager 버튼이 표시되지 않습니다.
|
||||||
|
|
||||||
|
|
||||||
### 6. 의존성 설치
|
### 6. 의존성 설치
|
||||||
@@ -141,10 +141,10 @@ ComfyUI-Manager를 CLI로만 사용할 것인지를 설정할 수 있습니다.
|
|||||||
`restore-dependencies`
|
`restore-dependencies`
|
||||||
|
|
||||||
* `ComfyUI/custom_nodes` 하위 경로에 커스텀 노드들이 설치되어 있긴 하지만, 의존성이 설치되지 않은 경우 사용할 수 있습니다.
|
* `ComfyUI/custom_nodes` 하위 경로에 커스텀 노드들이 설치되어 있긴 하지만, 의존성이 설치되지 않은 경우 사용할 수 있습니다.
|
||||||
* Colab과 같이 cloud instance를 새로 시작하는 경우 의존성 재설치 및 설치 스크립트가 재실행되어야 하는 경우 사용합니다.
|
* colab 과 같이 cloud instance를 새로 시작하는 경우 의존성 재설치 및 설치 스크립트가 재실행 되어야 하는 경우 사용합니다.
|
||||||
* ComfyUI를 재설치할 경우, custom_nodes 경로만 백업했다가 재설치할 경우 활용 가능합니다.
|
* ComfyUI을 재설치할 경우, custom_nodes 경로만 백업했다가 재설치 할 경우 활용 가능합니다.
|
||||||
|
|
||||||
|
|
||||||
### 7. clear
|
### 7. clear
|
||||||
|
|
||||||
GUI에서 install, update를 하거나 snapshot을 restore하는 경우 예약을 통해서 다음번 ComfyUI를 실행할 경우 실행되는 구조입니다. `clear` 는 이런 예약 상태를 clear해서, 아무런 사전 실행이 적용되지 않도록 합니다.
|
GUI에서 install, update를 하거나 snapshot 을 restore하는 경우 예약을 통해서 다음번 ComfyUI를 실행할 경우 실행되는 구조입니다. `clear` 는 이런 예약 상태를 clear해서, 아무런 사전 실행이 적용되지 않도록 합니다.
|
||||||
File diff suppressed because it is too large
Load Diff
@@ -15,12 +15,9 @@ comfy_path = os.environ.get('COMFYUI_PATH')
|
|||||||
git_exe_path = os.environ.get('GIT_EXE_PATH')
|
git_exe_path = os.environ.get('GIT_EXE_PATH')
|
||||||
|
|
||||||
if comfy_path is None:
|
if comfy_path is None:
|
||||||
print("git_helper: environment variable 'COMFYUI_PATH' is not specified.")
|
print("\nWARN: The `COMFYUI_PATH` environment variable is not set. Assuming `custom_nodes/ComfyUI-Manager/../../` as the ComfyUI path.", file=sys.stderr)
|
||||||
exit(-1)
|
comfy_path = os.path.abspath(os.path.join(os.path.dirname(__file__), '..', '..'))
|
||||||
|
|
||||||
if not os.path.exists(os.path.join(comfy_path, 'folder_paths.py')):
|
|
||||||
print("git_helper: '{comfy_path}' is not a valid 'COMFYUI_PATH' location.")
|
|
||||||
exit(-1)
|
|
||||||
|
|
||||||
def download_url(url, dest_folder, filename=None):
|
def download_url(url, dest_folder, filename=None):
|
||||||
# Ensure the destination folder exists
|
# Ensure the destination folder exists
|
||||||
@@ -156,27 +153,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 +444,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 +453,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 +464,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 +475,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:
|
||||||
12247
github-stats.json
Normal file
12247
github-stats.json
Normal file
File diff suppressed because it is too large
Load Diff
@@ -6,12 +6,10 @@ import time
|
|||||||
from dataclasses import dataclass
|
from dataclasses import dataclass
|
||||||
from typing import List
|
from typing import List
|
||||||
|
|
||||||
from . import context
|
import manager_core
|
||||||
from . import manager_util
|
import manager_util
|
||||||
|
|
||||||
import requests
|
import requests
|
||||||
import toml
|
import toml
|
||||||
import logging
|
|
||||||
|
|
||||||
base_url = "https://api.comfy.org"
|
base_url = "https://api.comfy.org"
|
||||||
|
|
||||||
@@ -24,7 +22,7 @@ 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):
|
||||||
@@ -49,9 +47,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:
|
||||||
@@ -80,12 +78,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:
|
||||||
@@ -101,7 +99,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']
|
||||||
|
|
||||||
@@ -113,9 +111,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
|
||||||
@@ -181,7 +179,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())
|
||||||
@@ -192,7 +190,7 @@ def install_node(node_id, version=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:
|
||||||
@@ -212,7 +210,6 @@ def read_cnr_info(fullpath):
|
|||||||
|
|
||||||
project = data.get('project', {})
|
project = data.get('project', {})
|
||||||
name = project.get('name').strip().lower()
|
name = project.get('name').strip().lower()
|
||||||
original_name = project.get('name')
|
|
||||||
|
|
||||||
# normalize version
|
# normalize version
|
||||||
# for example: 2.5 -> 2.5.0
|
# for example: 2.5 -> 2.5.0
|
||||||
@@ -224,7 +221,6 @@ def read_cnr_info(fullpath):
|
|||||||
if name and version: # repository is optional
|
if name and version: # repository is optional
|
||||||
return {
|
return {
|
||||||
"id": name,
|
"id": name,
|
||||||
"original_name": original_name,
|
|
||||||
"version": version,
|
"version": version,
|
||||||
"url": repository
|
"url": repository
|
||||||
}
|
}
|
||||||
@@ -240,8 +236,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):
|
||||||
@@ -250,7 +246,7 @@ 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
|
||||||
@@ -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
|
||||||
@@ -23,6 +23,7 @@ import yaml
|
|||||||
import zipfile
|
import zipfile
|
||||||
import traceback
|
import traceback
|
||||||
from concurrent.futures import ThreadPoolExecutor, as_completed
|
from concurrent.futures import ThreadPoolExecutor, as_completed
|
||||||
|
import toml
|
||||||
|
|
||||||
orig_print = print
|
orig_print = print
|
||||||
|
|
||||||
@@ -31,22 +32,22 @@ from packaging import version
|
|||||||
|
|
||||||
import uuid
|
import uuid
|
||||||
|
|
||||||
from ..common import cm_global
|
glob_path = os.path.join(os.path.dirname(__file__)) # ComfyUI-Manager/glob
|
||||||
from ..common import cnr_utils
|
sys.path.append(glob_path)
|
||||||
from ..common import manager_util
|
|
||||||
from ..common import git_utils
|
import cm_global
|
||||||
from ..common import manager_downloader
|
import cnr_utils
|
||||||
from ..common.node_package import InstalledNodePackage
|
import manager_util
|
||||||
from ..common.enums import NetworkMode, SecurityLevel, DBMode
|
import git_utils
|
||||||
from ..common import context
|
import manager_downloader
|
||||||
|
from node_package import InstalledNodePackage
|
||||||
|
|
||||||
|
|
||||||
version_code = [4, 0, 3]
|
version_code = [3, 32, 3]
|
||||||
version_str = f"V{version_code[0]}.{version_code[1]}" + (f'.{version_code[2]}' if len(version_code) > 2 else '')
|
version_str = f"V{version_code[0]}.{version_code[1]}" + (f'.{version_code[2]}' if len(version_code) > 2 else '')
|
||||||
|
|
||||||
|
|
||||||
DEFAULT_CHANNEL = "https://raw.githubusercontent.com/Comfy-Org/ComfyUI-Manager/main"
|
DEFAULT_CHANNEL = "https://raw.githubusercontent.com/ltdrdata/ComfyUI-Manager/main"
|
||||||
DEFAULT_CHANNEL_LEGACY = "https://raw.githubusercontent.com/ltdrdata/ComfyUI-Manager/main"
|
|
||||||
|
|
||||||
|
|
||||||
default_custom_nodes_path = None
|
default_custom_nodes_path = None
|
||||||
@@ -57,14 +58,13 @@ class InvalidChannel(Exception):
|
|||||||
self.channel = channel
|
self.channel = channel
|
||||||
super().__init__(channel)
|
super().__init__(channel)
|
||||||
|
|
||||||
|
|
||||||
def get_default_custom_nodes_path():
|
def get_default_custom_nodes_path():
|
||||||
global default_custom_nodes_path
|
global default_custom_nodes_path
|
||||||
if default_custom_nodes_path is None:
|
if default_custom_nodes_path is None:
|
||||||
try:
|
try:
|
||||||
import folder_paths
|
import folder_paths
|
||||||
default_custom_nodes_path = folder_paths.get_folder_paths("custom_nodes")[0]
|
default_custom_nodes_path = folder_paths.get_folder_paths("custom_nodes")[0]
|
||||||
except Exception:
|
except:
|
||||||
default_custom_nodes_path = os.path.abspath(os.path.join(manager_util.comfyui_manager_path, '..'))
|
default_custom_nodes_path = os.path.abspath(os.path.join(manager_util.comfyui_manager_path, '..'))
|
||||||
|
|
||||||
return default_custom_nodes_path
|
return default_custom_nodes_path
|
||||||
@@ -74,11 +74,37 @@ def get_custom_nodes_paths():
|
|||||||
try:
|
try:
|
||||||
import folder_paths
|
import folder_paths
|
||||||
return folder_paths.get_folder_paths("custom_nodes")
|
return folder_paths.get_folder_paths("custom_nodes")
|
||||||
except Exception:
|
except:
|
||||||
custom_nodes_path = os.path.abspath(os.path.join(manager_util.comfyui_manager_path, '..'))
|
custom_nodes_path = os.path.abspath(os.path.join(manager_util.comfyui_manager_path, '..'))
|
||||||
return [custom_nodes_path]
|
return [custom_nodes_path]
|
||||||
|
|
||||||
|
|
||||||
|
def get_comfyui_tag():
|
||||||
|
try:
|
||||||
|
repo = git.Repo(comfy_path)
|
||||||
|
return repo.git.describe('--tags')
|
||||||
|
except:
|
||||||
|
return None
|
||||||
|
|
||||||
|
|
||||||
|
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:
|
||||||
|
return None
|
||||||
|
|
||||||
|
|
||||||
def get_script_env():
|
def get_script_env():
|
||||||
new_env = os.environ.copy()
|
new_env = os.environ.copy()
|
||||||
git_exe = get_config().get('git_exe')
|
git_exe = get_config().get('git_exe')
|
||||||
@@ -86,10 +112,10 @@ def get_script_env():
|
|||||||
new_env['GIT_EXE_PATH'] = git_exe
|
new_env['GIT_EXE_PATH'] = git_exe
|
||||||
|
|
||||||
if 'COMFYUI_PATH' not in new_env:
|
if 'COMFYUI_PATH' not in new_env:
|
||||||
new_env['COMFYUI_PATH'] = context.comfy_path
|
new_env['COMFYUI_PATH'] = comfy_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'] = context.comfy_path
|
new_env['COMFYUI_FOLDERS_BASE_PATH'] = comfy_path
|
||||||
|
|
||||||
return new_env
|
return new_env
|
||||||
|
|
||||||
@@ -111,12 +137,12 @@ def check_invalid_nodes():
|
|||||||
|
|
||||||
try:
|
try:
|
||||||
import folder_paths
|
import folder_paths
|
||||||
except Exception:
|
except:
|
||||||
try:
|
try:
|
||||||
sys.path.append(context.comfy_path)
|
sys.path.append(comfy_path)
|
||||||
import folder_paths
|
import folder_paths
|
||||||
except Exception:
|
except:
|
||||||
raise Exception(f"Invalid COMFYUI_FOLDERS_BASE_PATH: {context.comfy_path}")
|
raise Exception(f"Invalid COMFYUI_FOLDERS_BASE_PATH: {comfy_path}")
|
||||||
|
|
||||||
def check(root):
|
def check(root):
|
||||||
global invalid_nodes
|
global invalid_nodes
|
||||||
@@ -151,6 +177,75 @@ def check_invalid_nodes():
|
|||||||
print("\n---------------------------------------------------------------------------\n")
|
print("\n---------------------------------------------------------------------------\n")
|
||||||
|
|
||||||
|
|
||||||
|
# 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:
|
||||||
|
import folder_paths
|
||||||
|
comfy_path = os.path.join(os.path.dirname(folder_paths.__file__))
|
||||||
|
except:
|
||||||
|
comfy_path = os.path.abspath(os.path.join(manager_util.comfyui_manager_path, '..', '..'))
|
||||||
|
|
||||||
|
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
|
||||||
|
|
||||||
|
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
|
||||||
|
|
||||||
|
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")
|
||||||
|
|
||||||
|
if not os.path.exists(manager_util.cache_dir):
|
||||||
|
os.makedirs(manager_util.cache_dir)
|
||||||
|
|
||||||
|
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))
|
||||||
|
|
||||||
|
|
||||||
cached_config = None
|
cached_config = None
|
||||||
js_path = None
|
js_path = None
|
||||||
|
|
||||||
@@ -161,7 +256,7 @@ comfy_ui_revision = "Unknown"
|
|||||||
comfy_ui_commit_datetime = datetime(1900, 1, 1, 0, 0, 0)
|
comfy_ui_commit_datetime = datetime(1900, 1, 1, 0, 0, 0)
|
||||||
|
|
||||||
channel_dict = None
|
channel_dict = None
|
||||||
valid_channels = {'default', 'local', DEFAULT_CHANNEL, DEFAULT_CHANNEL_LEGACY}
|
valid_channels = {'default', 'local'}
|
||||||
channel_list = None
|
channel_list = None
|
||||||
|
|
||||||
|
|
||||||
@@ -305,86 +400,18 @@ class ManagedResult:
|
|||||||
return self
|
return self
|
||||||
|
|
||||||
|
|
||||||
class NormalizedKeyDict:
|
|
||||||
def __init__(self):
|
|
||||||
self._store = {}
|
|
||||||
self._key_map = {}
|
|
||||||
|
|
||||||
def _normalize_key(self, key):
|
|
||||||
if isinstance(key, str):
|
|
||||||
return key.strip().lower()
|
|
||||||
return key
|
|
||||||
|
|
||||||
def __setitem__(self, key, value):
|
|
||||||
norm_key = self._normalize_key(key)
|
|
||||||
self._key_map[norm_key] = key
|
|
||||||
self._store[key] = value
|
|
||||||
|
|
||||||
def __getitem__(self, key):
|
|
||||||
norm_key = self._normalize_key(key)
|
|
||||||
original_key = self._key_map[norm_key]
|
|
||||||
return self._store[original_key]
|
|
||||||
|
|
||||||
def __delitem__(self, key):
|
|
||||||
norm_key = self._normalize_key(key)
|
|
||||||
original_key = self._key_map.pop(norm_key)
|
|
||||||
del self._store[original_key]
|
|
||||||
|
|
||||||
def __contains__(self, key):
|
|
||||||
return self._normalize_key(key) in self._key_map
|
|
||||||
|
|
||||||
def get(self, key, default=None):
|
|
||||||
return self[key] if key in self else default
|
|
||||||
|
|
||||||
def setdefault(self, key, default=None):
|
|
||||||
if key in self:
|
|
||||||
return self[key]
|
|
||||||
self[key] = default
|
|
||||||
return default
|
|
||||||
|
|
||||||
def pop(self, key, default=None):
|
|
||||||
if key in self:
|
|
||||||
val = self[key]
|
|
||||||
del self[key]
|
|
||||||
return val
|
|
||||||
if default is not None:
|
|
||||||
return default
|
|
||||||
raise KeyError(key)
|
|
||||||
|
|
||||||
def keys(self):
|
|
||||||
return self._store.keys()
|
|
||||||
|
|
||||||
def values(self):
|
|
||||||
return self._store.values()
|
|
||||||
|
|
||||||
def items(self):
|
|
||||||
return self._store.items()
|
|
||||||
|
|
||||||
def __iter__(self):
|
|
||||||
return iter(self._store)
|
|
||||||
|
|
||||||
def __len__(self):
|
|
||||||
return len(self._store)
|
|
||||||
|
|
||||||
def __repr__(self):
|
|
||||||
return repr(self._store)
|
|
||||||
|
|
||||||
def to_dict(self):
|
|
||||||
return dict(self._store)
|
|
||||||
|
|
||||||
|
|
||||||
class UnifiedManager:
|
class UnifiedManager:
|
||||||
def __init__(self):
|
def __init__(self):
|
||||||
self.installed_node_packages: dict[str, InstalledNodePackage] = {}
|
self.installed_node_packages: dict[str, InstalledNodePackage] = {}
|
||||||
|
|
||||||
self.cnr_inactive_nodes = NormalizedKeyDict() # node_id -> node_version -> fullpath
|
self.cnr_inactive_nodes = {} # node_id -> node_version -> fullpath
|
||||||
self.nightly_inactive_nodes = NormalizedKeyDict() # node_id -> fullpath
|
self.nightly_inactive_nodes = {} # node_id -> fullpath
|
||||||
self.unknown_inactive_nodes = {} # node_id -> repo url * fullpath
|
self.unknown_inactive_nodes = {} # node_id -> repo url * fullpath
|
||||||
self.active_nodes = NormalizedKeyDict() # node_id -> node_version * fullpath
|
self.active_nodes = {} # node_id -> node_version * fullpath
|
||||||
self.unknown_active_nodes = {} # node_id -> repo url * fullpath
|
self.unknown_active_nodes = {} # node_id -> repo url * fullpath
|
||||||
self.cnr_map = NormalizedKeyDict() # node_id -> cnr info
|
self.cnr_map = {} # node_id -> cnr info
|
||||||
self.repo_cnr_map = {} # repo_url -> cnr info
|
self.repo_cnr_map = {} # repo_url -> cnr info
|
||||||
self.custom_node_map_cache = {} # (channel, mode) -> augmented custom node list json
|
self.custom_node_map_cache = {} # (channel, mode) -> augmented custom node list json
|
||||||
self.processed_install = set()
|
self.processed_install = set()
|
||||||
|
|
||||||
def get_module_name(self, x):
|
def get_module_name(self, x):
|
||||||
@@ -526,7 +553,7 @@ class UnifiedManager:
|
|||||||
ver = str(manager_util.StrictVersion(info['version']))
|
ver = str(manager_util.StrictVersion(info['version']))
|
||||||
return {'id': cnr['id'], 'cnr': cnr, 'ver': ver}
|
return {'id': cnr['id'], 'cnr': cnr, 'ver': ver}
|
||||||
else:
|
else:
|
||||||
return {'id': info['id'], 'ver': info['version']}
|
return None
|
||||||
else:
|
else:
|
||||||
return None
|
return None
|
||||||
|
|
||||||
@@ -702,9 +729,7 @@ class UnifiedManager:
|
|||||||
|
|
||||||
return latest
|
return latest
|
||||||
|
|
||||||
async def reload(self, cache_mode, dont_wait=True, update_cnr_map=True):
|
async def reload(self, cache_mode, dont_wait=True):
|
||||||
import folder_paths
|
|
||||||
|
|
||||||
self.custom_node_map_cache = {}
|
self.custom_node_map_cache = {}
|
||||||
self.cnr_inactive_nodes = {} # node_id -> node_version -> fullpath
|
self.cnr_inactive_nodes = {} # node_id -> node_version -> fullpath
|
||||||
self.nightly_inactive_nodes = {} # node_id -> fullpath
|
self.nightly_inactive_nodes = {} # node_id -> fullpath
|
||||||
@@ -712,18 +737,17 @@ class UnifiedManager:
|
|||||||
self.unknown_active_nodes = {} # node_id -> repo url * fullpath
|
self.unknown_active_nodes = {} # node_id -> repo url * fullpath
|
||||||
self.active_nodes = {} # node_id -> node_version * fullpath
|
self.active_nodes = {} # node_id -> node_version * fullpath
|
||||||
|
|
||||||
if get_config()['network_mode'] != 'public' or manager_util.is_manager_pip_package():
|
if get_config()['network_mode'] != 'public':
|
||||||
dont_wait = True
|
dont_wait = True
|
||||||
|
|
||||||
if update_cnr_map:
|
# reload 'cnr_map' and 'repo_cnr_map'
|
||||||
# reload 'cnr_map' and 'repo_cnr_map'
|
cnrs = await cnr_utils.get_cnr_data(cache_mode=cache_mode=='cache', dont_wait=dont_wait)
|
||||||
cnrs = await cnr_utils.get_cnr_data(cache_mode=cache_mode=='cache', dont_wait=dont_wait)
|
|
||||||
|
|
||||||
for x in cnrs:
|
for x in cnrs:
|
||||||
self.cnr_map[x['id']] = x
|
self.cnr_map[x['id']] = x
|
||||||
if 'repository' in x:
|
if 'repository' in x:
|
||||||
normalized_url = git_utils.normalize_url(x['repository'])
|
normalized_url = git_utils.normalize_url(x['repository'])
|
||||||
self.repo_cnr_map[normalized_url] = x
|
self.repo_cnr_map[normalized_url] = x
|
||||||
|
|
||||||
# reload node status info from custom_nodes/*
|
# reload node status info from custom_nodes/*
|
||||||
for custom_nodes_path in folder_paths.get_folder_paths('custom_nodes'):
|
for custom_nodes_path in folder_paths.get_folder_paths('custom_nodes'):
|
||||||
@@ -771,7 +795,7 @@ class UnifiedManager:
|
|||||||
if 'id' in x:
|
if 'id' in x:
|
||||||
if x['id'] not in res:
|
if x['id'] not in res:
|
||||||
res[x['id']] = (x, True)
|
res[x['id']] = (x, True)
|
||||||
except Exception:
|
except:
|
||||||
logging.error(f"[ComfyUI-Manager] broken item:{x}")
|
logging.error(f"[ComfyUI-Manager] broken item:{x}")
|
||||||
|
|
||||||
return res
|
return res
|
||||||
@@ -790,7 +814,7 @@ class UnifiedManager:
|
|||||||
channel = normalize_channel(channel)
|
channel = normalize_channel(channel)
|
||||||
nodes = await self.load_nightly(channel, mode)
|
nodes = await self.load_nightly(channel, mode)
|
||||||
|
|
||||||
res = NormalizedKeyDict()
|
res = {}
|
||||||
added_cnr = set()
|
added_cnr = set()
|
||||||
for v in nodes.values():
|
for v in nodes.values():
|
||||||
v = v[0]
|
v = v[0]
|
||||||
@@ -824,7 +848,7 @@ class UnifiedManager:
|
|||||||
def safe_version(ver_str):
|
def safe_version(ver_str):
|
||||||
try:
|
try:
|
||||||
return version.parse(ver_str)
|
return version.parse(ver_str)
|
||||||
except Exception:
|
except:
|
||||||
return version.parse("0.0.0")
|
return version.parse("0.0.0")
|
||||||
|
|
||||||
def execute_install_script(self, url, repo_path, instant_execution=False, lazy_mode=False, no_deps=False):
|
def execute_install_script(self, url, repo_path, instant_execution=False, lazy_mode=False, no_deps=False):
|
||||||
@@ -838,14 +862,15 @@ class UnifiedManager:
|
|||||||
else:
|
else:
|
||||||
if os.path.exists(requirements_path) and not no_deps:
|
if os.path.exists(requirements_path) and not no_deps:
|
||||||
print("Install: pip packages")
|
print("Install: pip packages")
|
||||||
pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages(), context.comfy_path, context.manager_files_path)
|
pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages(), comfy_path, manager_files_path)
|
||||||
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())
|
||||||
if package_name and not package_name.startswith('#') and package_name not in self.processed_install:
|
if package_name and not package_name.startswith('#') and package_name not in self.processed_install:
|
||||||
self.processed_install.add(package_name)
|
self.processed_install.add(package_name)
|
||||||
install_cmd = manager_util.make_pip_cmd(["install", package_name])
|
clean_package_name = package_name.split('#')[0].strip()
|
||||||
if package_name.strip() != "" and not package_name.startswith('#'):
|
install_cmd = manager_util.make_pip_cmd(["install", clean_package_name])
|
||||||
|
if clean_package_name != "" and not clean_package_name.startswith('#'):
|
||||||
res = res and try_install_script(url, repo_path, install_cmd, instant_execution=instant_execution)
|
res = res and try_install_script(url, repo_path, install_cmd, instant_execution=instant_execution)
|
||||||
|
|
||||||
pip_fixer.fix_broken()
|
pip_fixer.fix_broken()
|
||||||
@@ -859,7 +884,7 @@ class UnifiedManager:
|
|||||||
return res
|
return res
|
||||||
|
|
||||||
def reserve_cnr_switch(self, target, zip_url, from_path, to_path, no_deps):
|
def reserve_cnr_switch(self, target, zip_url, from_path, to_path, no_deps):
|
||||||
script_path = os.path.join(context.manager_startup_script_path, "install-scripts.txt")
|
script_path = os.path.join(manager_startup_script_path, "install-scripts.txt")
|
||||||
with open(script_path, "a") as file:
|
with open(script_path, "a") as file:
|
||||||
obj = [target, "#LAZY-CNR-SWITCH-SCRIPT", zip_url, from_path, to_path, no_deps, get_default_custom_nodes_path(), sys.executable]
|
obj = [target, "#LAZY-CNR-SWITCH-SCRIPT", zip_url, from_path, to_path, no_deps, get_default_custom_nodes_path(), sys.executable]
|
||||||
file.write(f"{obj}\n")
|
file.write(f"{obj}\n")
|
||||||
@@ -1265,7 +1290,7 @@ class UnifiedManager:
|
|||||||
print(f"Download: git clone '{clone_url}'")
|
print(f"Download: git clone '{clone_url}'")
|
||||||
|
|
||||||
if not instant_execution and platform.system() == 'Windows':
|
if not instant_execution and platform.system() == 'Windows':
|
||||||
res = manager_funcs.run_script([sys.executable, context.git_script_path, "--clone", get_default_custom_nodes_path(), clone_url, repo_path], cwd=get_default_custom_nodes_path())
|
res = manager_funcs.run_script([sys.executable, git_script_path, "--clone", get_default_custom_nodes_path(), clone_url, repo_path], cwd=get_default_custom_nodes_path())
|
||||||
if res != 0:
|
if res != 0:
|
||||||
return result.fail(f"Failed to clone repo: {clone_url}")
|
return result.fail(f"Failed to clone repo: {clone_url}")
|
||||||
else:
|
else:
|
||||||
@@ -1391,7 +1416,6 @@ class UnifiedManager:
|
|||||||
return ManagedResult('skip')
|
return ManagedResult('skip')
|
||||||
elif self.is_disabled(node_id):
|
elif self.is_disabled(node_id):
|
||||||
return self.unified_enable(node_id)
|
return self.unified_enable(node_id)
|
||||||
|
|
||||||
else:
|
else:
|
||||||
version_spec = self.resolve_unspecified_version(node_id)
|
version_spec = self.resolve_unspecified_version(node_id)
|
||||||
|
|
||||||
@@ -1418,20 +1442,12 @@ class UnifiedManager:
|
|||||||
return self.unified_enable(node_id, version_spec)
|
return self.unified_enable(node_id, version_spec)
|
||||||
|
|
||||||
elif version_spec == 'unknown' or version_spec == 'nightly':
|
elif version_spec == 'unknown' or version_spec == 'nightly':
|
||||||
to_path = os.path.abspath(os.path.join(get_default_custom_nodes_path(), node_id))
|
|
||||||
|
|
||||||
if version_spec == 'nightly':
|
if version_spec == 'nightly':
|
||||||
# disable cnr nodes
|
# disable cnr nodes
|
||||||
if self.is_enabled(node_id, 'cnr'):
|
if self.is_enabled(node_id, 'cnr'):
|
||||||
self.unified_disable(node_id, False)
|
self.unified_disable(node_id, False)
|
||||||
|
|
||||||
# use `repo name` as a dir name instead of `cnr id` if system added nodepack (i.e. publisher is null)
|
to_path = os.path.abspath(os.path.join(get_default_custom_nodes_path(), node_id))
|
||||||
cnr = self.cnr_map.get(node_id)
|
|
||||||
|
|
||||||
if cnr is not None and cnr.get('publisher') is None:
|
|
||||||
repo_name = os.path.basename(git_utils.normalize_url(repo_url))
|
|
||||||
to_path = os.path.abspath(os.path.join(get_default_custom_nodes_path(), repo_name))
|
|
||||||
|
|
||||||
res = self.repo_install(repo_url, to_path, instant_execution=instant_execution, no_deps=no_deps, return_postinstall=return_postinstall)
|
res = self.repo_install(repo_url, to_path, instant_execution=instant_execution, no_deps=no_deps, return_postinstall=return_postinstall)
|
||||||
if res.result:
|
if res.result:
|
||||||
if version_spec == 'unknown':
|
if version_spec == 'unknown':
|
||||||
@@ -1492,7 +1508,7 @@ def identify_node_pack_from_path(fullpath):
|
|||||||
if github_id is None:
|
if github_id is None:
|
||||||
try:
|
try:
|
||||||
github_id = os.path.basename(repo_url)
|
github_id = os.path.basename(repo_url)
|
||||||
except Exception:
|
except:
|
||||||
logging.warning(f"[ComfyUI-Manager] unexpected repo url: {repo_url}")
|
logging.warning(f"[ComfyUI-Manager] unexpected repo url: {repo_url}")
|
||||||
github_id = module_name
|
github_id = module_name
|
||||||
|
|
||||||
@@ -1547,10 +1563,10 @@ def get_channel_dict():
|
|||||||
if channel_dict is None:
|
if channel_dict is None:
|
||||||
channel_dict = {}
|
channel_dict = {}
|
||||||
|
|
||||||
if not os.path.exists(context.manager_channel_list_path):
|
if not os.path.exists(manager_channel_list_path):
|
||||||
shutil.copy(context.channel_list_template_path, context.manager_channel_list_path)
|
shutil.copy(channel_list_template_path, manager_channel_list_path)
|
||||||
|
|
||||||
with open(context.manager_channel_list_path, 'r') as file:
|
with open(manager_channel_list_path, 'r') as file:
|
||||||
channels = file.read()
|
channels = file.read()
|
||||||
for x in channels.split('\n'):
|
for x in channels.split('\n'):
|
||||||
channel_info = x.split("::")
|
channel_info = x.split("::")
|
||||||
@@ -1614,31 +1630,29 @@ def write_config():
|
|||||||
'db_mode': get_config()['db_mode'],
|
'db_mode': get_config()['db_mode'],
|
||||||
}
|
}
|
||||||
|
|
||||||
directory = os.path.dirname(context.manager_config_path)
|
directory = os.path.dirname(manager_config_path)
|
||||||
if not os.path.exists(directory):
|
if not os.path.exists(directory):
|
||||||
os.makedirs(directory)
|
os.makedirs(directory)
|
||||||
|
|
||||||
with open(context.manager_config_path, 'w') as configfile:
|
with open(manager_config_path, 'w') as configfile:
|
||||||
config.write(configfile)
|
config.write(configfile)
|
||||||
|
|
||||||
|
|
||||||
def read_config():
|
def read_config():
|
||||||
try:
|
try:
|
||||||
config = configparser.ConfigParser(strict=False)
|
config = configparser.ConfigParser(strict=False)
|
||||||
config.read(context.manager_config_path)
|
config.read(manager_config_path)
|
||||||
default_conf = config['default']
|
default_conf = config['default']
|
||||||
|
manager_util.use_uv = default_conf['use_uv'].lower() == 'true' if 'use_uv' in default_conf else False
|
||||||
|
|
||||||
def get_bool(key, default_value):
|
def get_bool(key, default_value):
|
||||||
return default_conf[key].lower() == 'true' if key in default_conf else False
|
return default_conf[key].lower() == 'true' if key in default_conf else False
|
||||||
|
|
||||||
manager_util.use_uv = default_conf['use_uv'].lower() == 'true' if 'use_uv' in default_conf else False
|
|
||||||
manager_util.bypass_ssl = get_bool('bypass_ssl', False)
|
|
||||||
|
|
||||||
return {
|
return {
|
||||||
'http_channel_enabled': get_bool('http_channel_enabled', False),
|
'http_channel_enabled': get_bool('http_channel_enabled', False),
|
||||||
'preview_method': default_conf.get('preview_method', manager_funcs.get_current_preview_method()).lower(),
|
'preview_method': default_conf.get('preview_method', manager_funcs.get_current_preview_method()).lower(),
|
||||||
'git_exe': default_conf.get('git_exe', ''),
|
'git_exe': default_conf.get('git_exe', ''),
|
||||||
'use_uv': get_bool('use_uv', True),
|
'use_uv': get_bool('use_uv', False),
|
||||||
'channel_url': default_conf.get('channel_url', DEFAULT_CHANNEL),
|
'channel_url': default_conf.get('channel_url', DEFAULT_CHANNEL),
|
||||||
'default_cache_as_channel_url': get_bool('default_cache_as_channel_url', False),
|
'default_cache_as_channel_url': get_bool('default_cache_as_channel_url', False),
|
||||||
'share_option': default_conf.get('share_option', 'all').lower(),
|
'share_option': default_conf.get('share_option', 'all').lower(),
|
||||||
@@ -1650,24 +1664,22 @@ def read_config():
|
|||||||
'model_download_by_agent': get_bool('model_download_by_agent', False),
|
'model_download_by_agent': get_bool('model_download_by_agent', False),
|
||||||
'downgrade_blacklist': default_conf.get('downgrade_blacklist', '').lower(),
|
'downgrade_blacklist': default_conf.get('downgrade_blacklist', '').lower(),
|
||||||
'always_lazy_install': get_bool('always_lazy_install', False),
|
'always_lazy_install': get_bool('always_lazy_install', False),
|
||||||
'network_mode': default_conf.get('network_mode', NetworkMode.PUBLIC.value).lower(),
|
'network_mode': default_conf.get('network_mode', 'public').lower(),
|
||||||
'security_level': default_conf.get('security_level', SecurityLevel.NORMAL.value).lower(),
|
'security_level': default_conf.get('security_level', 'normal').lower(),
|
||||||
'db_mode': default_conf.get('db_mode', DBMode.CACHE.value).lower(),
|
'db_mode': default_conf.get('db_mode', 'cache').lower(),
|
||||||
}
|
}
|
||||||
|
|
||||||
except Exception:
|
except Exception:
|
||||||
manager_util.use_uv = False
|
manager_util.use_uv = False
|
||||||
manager_util.bypass_ssl = False
|
|
||||||
|
|
||||||
return {
|
return {
|
||||||
'http_channel_enabled': False,
|
'http_channel_enabled': False,
|
||||||
'preview_method': manager_funcs.get_current_preview_method(),
|
'preview_method': manager_funcs.get_current_preview_method(),
|
||||||
'git_exe': '',
|
'git_exe': '',
|
||||||
'use_uv': True,
|
'use_uv': False,
|
||||||
'channel_url': DEFAULT_CHANNEL,
|
'channel_url': DEFAULT_CHANNEL,
|
||||||
'default_cache_as_channel_url': False,
|
'default_cache_as_channel_url': False,
|
||||||
'share_option': 'all',
|
'share_option': 'all',
|
||||||
'bypass_ssl': manager_util.bypass_ssl,
|
'bypass_ssl': False,
|
||||||
'file_logging': True,
|
'file_logging': True,
|
||||||
'component_policy': 'workflow',
|
'component_policy': 'workflow',
|
||||||
'update_policy': 'stable-comfyui',
|
'update_policy': 'stable-comfyui',
|
||||||
@@ -1675,9 +1687,9 @@ def read_config():
|
|||||||
'model_download_by_agent': False,
|
'model_download_by_agent': False,
|
||||||
'downgrade_blacklist': '',
|
'downgrade_blacklist': '',
|
||||||
'always_lazy_install': False,
|
'always_lazy_install': False,
|
||||||
'network_mode': NetworkMode.PUBLIC.value,
|
'network_mode': 'public', # public | private | offline
|
||||||
'security_level': SecurityLevel.NORMAL.value,
|
'security_level': 'normal', # strong | normal | normal- | weak
|
||||||
'db_mode': DBMode.CACHE.value,
|
'db_mode': 'cache', # local | cache | remote
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -1721,27 +1733,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")
|
||||||
@@ -1749,10 +1761,10 @@ def switch_to_default_branch(repo):
|
|||||||
|
|
||||||
|
|
||||||
def reserve_script(repo_path, install_cmds):
|
def reserve_script(repo_path, install_cmds):
|
||||||
if not os.path.exists(context.manager_startup_script_path):
|
if not os.path.exists(manager_startup_script_path):
|
||||||
os.makedirs(context.manager_startup_script_path)
|
os.makedirs(manager_startup_script_path)
|
||||||
|
|
||||||
script_path = os.path.join(context.manager_startup_script_path, "install-scripts.txt")
|
script_path = os.path.join(manager_startup_script_path, "install-scripts.txt")
|
||||||
with open(script_path, "a") as file:
|
with open(script_path, "a") as file:
|
||||||
obj = [repo_path] + install_cmds
|
obj = [repo_path] + install_cmds
|
||||||
file.write(f"{obj}\n")
|
file.write(f"{obj}\n")
|
||||||
@@ -1792,7 +1804,7 @@ def try_install_script(url, repo_path, install_cmd, instant_execution=False):
|
|||||||
print(f"[WARN] ComfyUI-Manager: Your ComfyUI version ({comfy_ui_revision})[{comfy_ui_commit_datetime.date()}] is too old. Please update to the latest version.")
|
print(f"[WARN] ComfyUI-Manager: Your ComfyUI version ({comfy_ui_revision})[{comfy_ui_commit_datetime.date()}] is too old. Please update to the latest version.")
|
||||||
print("[WARN] The extension installation feature may not work properly in the current installed ComfyUI version on Windows environment.")
|
print("[WARN] The extension installation feature may not work properly in the current installed ComfyUI version on Windows environment.")
|
||||||
print("###################################################################\n\n")
|
print("###################################################################\n\n")
|
||||||
except Exception:
|
except:
|
||||||
pass
|
pass
|
||||||
|
|
||||||
if code != 0:
|
if code != 0:
|
||||||
@@ -1807,11 +1819,11 @@ def try_install_script(url, repo_path, install_cmd, instant_execution=False):
|
|||||||
# use subprocess to avoid file system lock by git (Windows)
|
# use subprocess to avoid file system lock by git (Windows)
|
||||||
def __win_check_git_update(path, do_fetch=False, do_update=False):
|
def __win_check_git_update(path, do_fetch=False, do_update=False):
|
||||||
if do_fetch:
|
if do_fetch:
|
||||||
command = [sys.executable, context.git_script_path, "--fetch", path]
|
command = [sys.executable, git_script_path, "--fetch", path]
|
||||||
elif do_update:
|
elif do_update:
|
||||||
command = [sys.executable, context.git_script_path, "--pull", path]
|
command = [sys.executable, git_script_path, "--pull", path]
|
||||||
else:
|
else:
|
||||||
command = [sys.executable, context.git_script_path, "--check", path]
|
command = [sys.executable, git_script_path, "--check", path]
|
||||||
|
|
||||||
new_env = get_script_env()
|
new_env = get_script_env()
|
||||||
process = subprocess.Popen(command, stdout=subprocess.PIPE, stderr=subprocess.PIPE, cwd=get_default_custom_nodes_path(), env=new_env)
|
process = subprocess.Popen(command, stdout=subprocess.PIPE, stderr=subprocess.PIPE, cwd=get_default_custom_nodes_path(), env=new_env)
|
||||||
@@ -1865,7 +1877,7 @@ def __win_check_git_update(path, do_fetch=False, do_update=False):
|
|||||||
|
|
||||||
|
|
||||||
def __win_check_git_pull(path):
|
def __win_check_git_pull(path):
|
||||||
command = [sys.executable, context.git_script_path, "--pull", path]
|
command = [sys.executable, git_script_path, "--pull", path]
|
||||||
process = subprocess.Popen(command, env=get_script_env(), cwd=get_default_custom_nodes_path())
|
process = subprocess.Popen(command, env=get_script_env(), cwd=get_default_custom_nodes_path())
|
||||||
process.wait()
|
process.wait()
|
||||||
|
|
||||||
@@ -1881,7 +1893,7 @@ def execute_install_script(url, repo_path, lazy_mode=False, instant_execution=Fa
|
|||||||
else:
|
else:
|
||||||
if os.path.exists(requirements_path) and not no_deps:
|
if os.path.exists(requirements_path) and not no_deps:
|
||||||
print("Install: pip packages")
|
print("Install: pip packages")
|
||||||
pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages(), context.comfy_path, context.manager_files_path)
|
pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages(), comfy_path, manager_files_path)
|
||||||
with open(requirements_path, "r") as requirements_file:
|
with open(requirements_path, "r") as requirements_file:
|
||||||
for line in requirements_file:
|
for line in requirements_file:
|
||||||
#handle comments
|
#handle comments
|
||||||
@@ -1913,27 +1925,6 @@ def execute_install_script(url, repo_path, lazy_mode=False, instant_execution=Fa
|
|||||||
return True
|
return True
|
||||||
|
|
||||||
|
|
||||||
def install_manager_requirements(repo_path):
|
|
||||||
"""
|
|
||||||
Install packages from manager_requirements.txt if it exists.
|
|
||||||
This is specifically for ComfyUI's manager_requirements.txt.
|
|
||||||
"""
|
|
||||||
manager_requirements_path = os.path.join(repo_path, "manager_requirements.txt")
|
|
||||||
if not os.path.exists(manager_requirements_path):
|
|
||||||
return
|
|
||||||
|
|
||||||
logging.info("[ComfyUI-Manager] Installing manager_requirements.txt")
|
|
||||||
with open(manager_requirements_path, "r") as f:
|
|
||||||
for line in f:
|
|
||||||
line = line.strip()
|
|
||||||
if line and not line.startswith('#'):
|
|
||||||
if '#' in line:
|
|
||||||
line = line.split('#')[0].strip()
|
|
||||||
if line:
|
|
||||||
install_cmd = manager_util.make_pip_cmd(["install", line])
|
|
||||||
subprocess.run(install_cmd)
|
|
||||||
|
|
||||||
|
|
||||||
def git_repo_update_check_with(path, do_fetch=False, do_update=False, no_deps=False):
|
def git_repo_update_check_with(path, do_fetch=False, do_update=False, no_deps=False):
|
||||||
"""
|
"""
|
||||||
|
|
||||||
@@ -2082,6 +2073,13 @@ def is_valid_url(url):
|
|||||||
return False
|
return False
|
||||||
|
|
||||||
|
|
||||||
|
def extract_url_and_commit_id(s):
|
||||||
|
index = s.rfind('@')
|
||||||
|
if index == -1:
|
||||||
|
return (s, '')
|
||||||
|
else:
|
||||||
|
return (s[:index], s[index+1:])
|
||||||
|
|
||||||
async def gitclone_install(url, instant_execution=False, msg_prefix='', no_deps=False):
|
async def gitclone_install(url, instant_execution=False, msg_prefix='', no_deps=False):
|
||||||
await unified_manager.reload('cache')
|
await unified_manager.reload('cache')
|
||||||
await unified_manager.get_custom_nodes('default', 'cache')
|
await unified_manager.get_custom_nodes('default', 'cache')
|
||||||
@@ -2099,8 +2097,11 @@ async def gitclone_install(url, instant_execution=False, msg_prefix='', no_deps=
|
|||||||
cnr = unified_manager.get_cnr_by_repo(url)
|
cnr = unified_manager.get_cnr_by_repo(url)
|
||||||
if cnr:
|
if cnr:
|
||||||
cnr_id = cnr['id']
|
cnr_id = cnr['id']
|
||||||
return await unified_manager.install_by_id(cnr_id, version_spec='nightly', channel='default', mode='cache')
|
return await unified_manager.install_by_id(cnr_id, version_spec=None, channel='default', mode='cache')
|
||||||
else:
|
else:
|
||||||
|
new_url, commit_id = extract_url_and_commit_id(url)
|
||||||
|
if commit_id != "":
|
||||||
|
url = new_url
|
||||||
repo_name = os.path.splitext(os.path.basename(url))[0]
|
repo_name = os.path.splitext(os.path.basename(url))[0]
|
||||||
|
|
||||||
# NOTE: Keep original name as possible if unknown node
|
# NOTE: Keep original name as possible if unknown node
|
||||||
@@ -2128,11 +2129,15 @@ async def gitclone_install(url, instant_execution=False, msg_prefix='', no_deps=
|
|||||||
clone_url = git_utils.get_url_for_clone(url)
|
clone_url = git_utils.get_url_for_clone(url)
|
||||||
|
|
||||||
if not instant_execution and platform.system() == 'Windows':
|
if not instant_execution and platform.system() == 'Windows':
|
||||||
res = manager_funcs.run_script([sys.executable, context.git_script_path, "--clone", get_default_custom_nodes_path(), clone_url, repo_path], cwd=get_default_custom_nodes_path())
|
res = manager_funcs.run_script([sys.executable, git_script_path, "--clone", get_default_custom_nodes_path(), clone_url, repo_path], cwd=get_default_custom_nodes_path())
|
||||||
if res != 0:
|
if res != 0:
|
||||||
return result.fail(f"Failed to clone '{clone_url}' into '{repo_path}'")
|
return result.fail(f"Failed to clone '{clone_url}' into '{repo_path}'")
|
||||||
else:
|
else:
|
||||||
repo = git.Repo.clone_from(clone_url, repo_path, recursive=True, progress=GitProgress())
|
repo = git.Repo.clone_from(clone_url, repo_path, recursive=True, progress=GitProgress())
|
||||||
|
if commit_id!= "":
|
||||||
|
repo.git.checkout(commit_id)
|
||||||
|
repo.git.submodule('update', '--init', '--recursive')
|
||||||
|
|
||||||
repo.git.clear_cache()
|
repo.git.clear_cache()
|
||||||
repo.close()
|
repo.close()
|
||||||
|
|
||||||
@@ -2195,7 +2200,7 @@ async def get_data_by_mode(mode, filename, channel_url=None):
|
|||||||
cache_uri = str(manager_util.simple_hash(uri))+'_'+filename
|
cache_uri = str(manager_util.simple_hash(uri))+'_'+filename
|
||||||
cache_uri = os.path.join(manager_util.cache_dir, cache_uri)
|
cache_uri = os.path.join(manager_util.cache_dir, cache_uri)
|
||||||
|
|
||||||
if get_config()['network_mode'] == 'offline' or manager_util.is_manager_pip_package():
|
if get_config()['network_mode'] == 'offline':
|
||||||
# offline network mode
|
# offline network mode
|
||||||
if os.path.exists(cache_uri):
|
if os.path.exists(cache_uri):
|
||||||
json_obj = await manager_util.get_data(cache_uri)
|
json_obj = await manager_util.get_data(cache_uri)
|
||||||
@@ -2215,7 +2220,7 @@ async def get_data_by_mode(mode, filename, channel_url=None):
|
|||||||
with open(cache_uri, "w", encoding='utf-8') as file:
|
with open(cache_uri, "w", encoding='utf-8') as file:
|
||||||
json.dump(json_obj, file, indent=4, sort_keys=True)
|
json.dump(json_obj, file, indent=4, sort_keys=True)
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
print(f"[ComfyUI-Manager] Due to a network error, switching to local mode.\n=> {filename} @ {channel_url}/{mode}\n=> {e}")
|
print(f"[ComfyUI-Manager] Due to a network error, switching to local mode.\n=> {filename}\n=> {e}")
|
||||||
uri = os.path.join(manager_util.comfyui_manager_path, filename)
|
uri = os.path.join(manager_util.comfyui_manager_path, filename)
|
||||||
json_obj = await manager_util.get_data(uri)
|
json_obj = await manager_util.get_data(uri)
|
||||||
|
|
||||||
@@ -2286,7 +2291,7 @@ def gitclone_uninstall(files):
|
|||||||
url = url[:-1]
|
url = url[:-1]
|
||||||
try:
|
try:
|
||||||
for custom_nodes_dir in get_custom_nodes_paths():
|
for custom_nodes_dir in get_custom_nodes_paths():
|
||||||
dir_name:str = os.path.splitext(os.path.basename(url))[0].replace(".git", "")
|
dir_name = os.path.splitext(os.path.basename(url))[0].replace(".git", "")
|
||||||
dir_path = os.path.join(custom_nodes_dir, dir_name)
|
dir_path = os.path.join(custom_nodes_dir, dir_name)
|
||||||
|
|
||||||
# safety check
|
# safety check
|
||||||
@@ -2334,7 +2339,7 @@ def gitclone_set_active(files, is_disable):
|
|||||||
url = url[:-1]
|
url = url[:-1]
|
||||||
try:
|
try:
|
||||||
for custom_nodes_dir in get_custom_nodes_paths():
|
for custom_nodes_dir in get_custom_nodes_paths():
|
||||||
dir_name:str = os.path.splitext(os.path.basename(url))[0].replace(".git", "")
|
dir_name = os.path.splitext(os.path.basename(url))[0].replace(".git", "")
|
||||||
dir_path = os.path.join(custom_nodes_dir, dir_name)
|
dir_path = os.path.join(custom_nodes_dir, dir_name)
|
||||||
|
|
||||||
# safety check
|
# safety check
|
||||||
@@ -2431,7 +2436,7 @@ def update_to_stable_comfyui(repo_path):
|
|||||||
repo = git.Repo(repo_path)
|
repo = git.Repo(repo_path)
|
||||||
try:
|
try:
|
||||||
repo.git.checkout(repo.heads.master)
|
repo.git.checkout(repo.heads.master)
|
||||||
except Exception:
|
except:
|
||||||
logging.error(f"[ComfyUI-Manager] Failed to checkout 'master' branch.\nrepo_path={repo_path}\nAvailable branches:")
|
logging.error(f"[ComfyUI-Manager] Failed to checkout 'master' branch.\nrepo_path={repo_path}\nAvailable branches:")
|
||||||
for branch in repo.branches:
|
for branch in repo.branches:
|
||||||
logging.error('\t'+branch.name)
|
logging.error('\t'+branch.name)
|
||||||
@@ -2453,9 +2458,8 @@ def update_to_stable_comfyui(repo_path):
|
|||||||
else:
|
else:
|
||||||
logging.info(f"[ComfyUI-Manager] Updating ComfyUI: {current_tag} -> {latest_tag}")
|
logging.info(f"[ComfyUI-Manager] Updating ComfyUI: {current_tag} -> {latest_tag}")
|
||||||
repo.git.checkout(latest_tag)
|
repo.git.checkout(latest_tag)
|
||||||
execute_install_script("ComfyUI", repo_path, instant_execution=False, no_deps=False)
|
|
||||||
return 'updated', latest_tag
|
return 'updated', latest_tag
|
||||||
except Exception:
|
except:
|
||||||
traceback.print_exc()
|
traceback.print_exc()
|
||||||
return "fail", None
|
return "fail", None
|
||||||
|
|
||||||
@@ -2585,13 +2589,9 @@ def check_state_of_git_node_pack_single(item, do_fetch=False, do_update_check=Tr
|
|||||||
|
|
||||||
|
|
||||||
def get_installed_pip_packages():
|
def get_installed_pip_packages():
|
||||||
try:
|
# extract pip package infos
|
||||||
# extract pip package infos
|
cmd = manager_util.make_pip_cmd(['freeze'])
|
||||||
cmd = manager_util.make_pip_cmd(['freeze'])
|
pips = subprocess.check_output(cmd, text=True).split('\n')
|
||||||
pips = subprocess.check_output(cmd, text=True).split('\n')
|
|
||||||
except Exception as e:
|
|
||||||
logging.warning("[ComfyUI-Manager] Could not enumerate pip packages for snapshot: %s", e)
|
|
||||||
return {}
|
|
||||||
|
|
||||||
res = {}
|
res = {}
|
||||||
for x in pips:
|
for x in pips:
|
||||||
@@ -2612,7 +2612,7 @@ async def get_current_snapshot(custom_nodes_only = False):
|
|||||||
await unified_manager.get_custom_nodes('default', 'cache')
|
await unified_manager.get_custom_nodes('default', 'cache')
|
||||||
|
|
||||||
# Get ComfyUI hash
|
# Get ComfyUI hash
|
||||||
repo_path = context.comfy_path
|
repo_path = comfy_path
|
||||||
|
|
||||||
comfyui_commit_hash = None
|
comfyui_commit_hash = None
|
||||||
if not custom_nodes_only:
|
if not custom_nodes_only:
|
||||||
@@ -2657,7 +2657,7 @@ async def get_current_snapshot(custom_nodes_only = False):
|
|||||||
commit_hash = git_utils.get_commit_hash(fullpath)
|
commit_hash = git_utils.get_commit_hash(fullpath)
|
||||||
url = git_utils.git_url(fullpath)
|
url = git_utils.git_url(fullpath)
|
||||||
git_custom_nodes[url] = dict(hash=commit_hash, disabled=is_disabled)
|
git_custom_nodes[url] = dict(hash=commit_hash, disabled=is_disabled)
|
||||||
except Exception:
|
except:
|
||||||
print(f"Failed to extract snapshots for the custom node '{path}'.")
|
print(f"Failed to extract snapshots for the custom node '{path}'.")
|
||||||
|
|
||||||
elif path.endswith('.py'):
|
elif path.endswith('.py'):
|
||||||
@@ -2688,7 +2688,7 @@ async def save_snapshot_with_postfix(postfix, path=None, custom_nodes_only = Fal
|
|||||||
date_time_format = now.strftime("%Y-%m-%d_%H-%M-%S")
|
date_time_format = now.strftime("%Y-%m-%d_%H-%M-%S")
|
||||||
file_name = f"{date_time_format}_{postfix}"
|
file_name = f"{date_time_format}_{postfix}"
|
||||||
|
|
||||||
path = os.path.join(context.manager_snapshot_path, f"{file_name}.json")
|
path = os.path.join(manager_snapshot_path, f"{file_name}.json")
|
||||||
else:
|
else:
|
||||||
file_name = path.replace('\\', '/').split('/')[-1]
|
file_name = path.replace('\\', '/').split('/')[-1]
|
||||||
file_name = file_name.split('.')[-2]
|
file_name = file_name.split('.')[-2]
|
||||||
@@ -2715,7 +2715,7 @@ async def extract_nodes_from_workflow(filepath, mode='local', channel_url='defau
|
|||||||
with open(filepath, "r", encoding="UTF-8", errors="ignore") as json_file:
|
with open(filepath, "r", encoding="UTF-8", errors="ignore") as json_file:
|
||||||
try:
|
try:
|
||||||
workflow = json.load(json_file)
|
workflow = json.load(json_file)
|
||||||
except Exception:
|
except:
|
||||||
print(f"Invalid workflow file: {filepath}")
|
print(f"Invalid workflow file: {filepath}")
|
||||||
exit(-1)
|
exit(-1)
|
||||||
|
|
||||||
@@ -2728,7 +2728,7 @@ async def extract_nodes_from_workflow(filepath, mode='local', channel_url='defau
|
|||||||
else:
|
else:
|
||||||
try:
|
try:
|
||||||
workflow = json.loads(img.info['workflow'])
|
workflow = json.loads(img.info['workflow'])
|
||||||
except Exception:
|
except:
|
||||||
print(f"This is not a valid .png file containing a ComfyUI workflow: {filepath}")
|
print(f"This is not a valid .png file containing a ComfyUI workflow: {filepath}")
|
||||||
exit(-1)
|
exit(-1)
|
||||||
|
|
||||||
@@ -2876,7 +2876,7 @@ async def get_unified_total_nodes(channel, mode, regsitry_cache_mode='cache'):
|
|||||||
|
|
||||||
if cnr_id is not None:
|
if cnr_id is not None:
|
||||||
# cnr or nightly version
|
# cnr or nightly version
|
||||||
cnr_ids.discard(cnr_id)
|
cnr_ids.remove(cnr_id)
|
||||||
updatable = False
|
updatable = False
|
||||||
cnr = unified_manager.cnr_map[cnr_id]
|
cnr = unified_manager.cnr_map[cnr_id]
|
||||||
|
|
||||||
@@ -2999,7 +2999,7 @@ def populate_github_stats(node_packs, json_obj_github):
|
|||||||
v['stars'] = -1
|
v['stars'] = -1
|
||||||
v['last_update'] = -1
|
v['last_update'] = -1
|
||||||
v['trust'] = False
|
v['trust'] = False
|
||||||
except Exception:
|
except:
|
||||||
logging.error(f"[ComfyUI-Manager] DB item is broken:\n{v}")
|
logging.error(f"[ComfyUI-Manager] DB item is broken:\n{v}")
|
||||||
|
|
||||||
|
|
||||||
@@ -3040,11 +3040,6 @@ async def restore_snapshot(snapshot_path, git_helper_extras=None):
|
|||||||
info = yaml.load(snapshot_file, Loader=yaml.SafeLoader)
|
info = yaml.load(snapshot_file, Loader=yaml.SafeLoader)
|
||||||
info = info['custom_nodes']
|
info = info['custom_nodes']
|
||||||
|
|
||||||
if 'pips' in info and info['pips']:
|
|
||||||
pips = info['pips']
|
|
||||||
else:
|
|
||||||
pips = {}
|
|
||||||
|
|
||||||
# for cnr restore
|
# for cnr restore
|
||||||
cnr_info = info.get('cnr_custom_nodes')
|
cnr_info = info.get('cnr_custom_nodes')
|
||||||
if cnr_info is not None:
|
if cnr_info is not None:
|
||||||
@@ -3251,8 +3246,6 @@ async def restore_snapshot(snapshot_path, git_helper_extras=None):
|
|||||||
unified_manager.repo_install(repo_url, to_path, instant_execution=True, no_deps=False, return_postinstall=False)
|
unified_manager.repo_install(repo_url, to_path, instant_execution=True, no_deps=False, return_postinstall=False)
|
||||||
cloned_repos.append(repo_name)
|
cloned_repos.append(repo_name)
|
||||||
|
|
||||||
manager_util.restore_pip_snapshot(pips, git_helper_extras)
|
|
||||||
|
|
||||||
# print summary
|
# print summary
|
||||||
for x in cloned_repos:
|
for x in cloned_repos:
|
||||||
print(f"[ INSTALLED ] {x}")
|
print(f"[ INSTALLED ] {x}")
|
||||||
@@ -3277,12 +3270,12 @@ async def restore_snapshot(snapshot_path, git_helper_extras=None):
|
|||||||
|
|
||||||
def get_comfyui_versions(repo=None):
|
def get_comfyui_versions(repo=None):
|
||||||
if repo is None:
|
if repo is None:
|
||||||
repo = git.Repo(context.comfy_path)
|
repo = git.Repo(comfy_path)
|
||||||
|
|
||||||
try:
|
try:
|
||||||
remote = get_remote_name(repo)
|
remote = get_remote_name(repo)
|
||||||
repo.remotes[remote].fetch()
|
repo.remotes[remote].fetch()
|
||||||
except Exception:
|
except:
|
||||||
logging.error("[ComfyUI-Manager] Failed to fetch ComfyUI")
|
logging.error("[ComfyUI-Manager] Failed to fetch ComfyUI")
|
||||||
|
|
||||||
versions = [x.name for x in repo.tags if x.name.startswith('v')]
|
versions = [x.name for x in repo.tags if x.name.startswith('v')]
|
||||||
@@ -3311,7 +3304,7 @@ def get_comfyui_versions(repo=None):
|
|||||||
|
|
||||||
|
|
||||||
def switch_comfyui(tag):
|
def switch_comfyui(tag):
|
||||||
repo = git.Repo(context.comfy_path)
|
repo = git.Repo(comfy_path)
|
||||||
|
|
||||||
if tag == 'nightly':
|
if tag == 'nightly':
|
||||||
repo.git.checkout('master')
|
repo.git.checkout('master')
|
||||||
@@ -3351,5 +3344,5 @@ def repo_switch_commit(repo_path, commit_hash):
|
|||||||
|
|
||||||
repo.git.checkout(commit_hash)
|
repo.git.checkout(commit_hash)
|
||||||
return True
|
return True
|
||||||
except Exception:
|
except:
|
||||||
return None
|
return None
|
||||||
@@ -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,20 +15,16 @@ import re
|
|||||||
import logging
|
import logging
|
||||||
import platform
|
import platform
|
||||||
import shlex
|
import shlex
|
||||||
from functools import lru_cache
|
import cm_global
|
||||||
|
|
||||||
|
|
||||||
cache_lock = threading.Lock()
|
cache_lock = threading.Lock()
|
||||||
session_lock = threading.Lock()
|
|
||||||
|
|
||||||
comfyui_manager_path = os.path.abspath(os.path.join(os.path.dirname(__file__), '..'))
|
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():
|
|
||||||
return not os.path.exists(os.path.join(comfyui_manager_path, '..', 'custom_nodes'))
|
|
||||||
|
|
||||||
def add_python_path_to_env():
|
def add_python_path_to_env():
|
||||||
if platform.system() != "Windows":
|
if platform.system() != "Windows":
|
||||||
@@ -39,69 +35,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 +137,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',
|
||||||
@@ -377,32 +327,6 @@ torch_torchvision_torchaudio_version_map = {
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
def torch_rollback(prev):
|
|
||||||
spec = prev.split('+')
|
|
||||||
if len(spec) > 1:
|
|
||||||
platform = spec[1]
|
|
||||||
else:
|
|
||||||
cmd = make_pip_cmd(['install', '--force', 'torch', 'torchvision', 'torchaudio'])
|
|
||||||
subprocess.check_output(cmd, universal_newlines=True)
|
|
||||||
logging.error(cmd)
|
|
||||||
return
|
|
||||||
|
|
||||||
torch_ver = StrictVersion(spec[0])
|
|
||||||
torch_ver = f"{torch_ver.major}.{torch_ver.minor}.{torch_ver.patch}"
|
|
||||||
torch_torchvision_torchaudio_ver = torch_torchvision_torchaudio_version_map.get(torch_ver)
|
|
||||||
|
|
||||||
if torch_torchvision_torchaudio_ver is None:
|
|
||||||
cmd = make_pip_cmd(['install', '--pre', 'torch', 'torchvision', 'torchaudio',
|
|
||||||
'--index-url', f"https://download.pytorch.org/whl/nightly/{platform}"])
|
|
||||||
logging.info("[ComfyUI-Manager] restore PyTorch to nightly version")
|
|
||||||
else:
|
|
||||||
torchvision_ver, torchaudio_ver = torch_torchvision_torchaudio_ver
|
|
||||||
cmd = make_pip_cmd(['install', f'torch=={torch_ver}', f'torchvision=={torchvision_ver}', f"torchaudio=={torchaudio_ver}",
|
|
||||||
'--index-url', f"https://download.pytorch.org/whl/{platform}"])
|
|
||||||
logging.info(f"[ComfyUI-Manager] restore PyTorch to {torch_ver}+{platform}")
|
|
||||||
|
|
||||||
subprocess.check_output(cmd, universal_newlines=True)
|
|
||||||
|
|
||||||
|
|
||||||
class PIPFixer:
|
class PIPFixer:
|
||||||
def __init__(self, prev_pip_versions, comfyui_path, manager_files_path):
|
def __init__(self, prev_pip_versions, comfyui_path, manager_files_path):
|
||||||
@@ -410,6 +334,32 @@ class PIPFixer:
|
|||||||
self.comfyui_path = comfyui_path
|
self.comfyui_path = comfyui_path
|
||||||
self.manager_files_path = manager_files_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]
|
||||||
|
else:
|
||||||
|
cmd = make_pip_cmd(['install', '--force', 'torch', 'torchvision', 'torchaudio'])
|
||||||
|
subprocess.check_output(cmd, universal_newlines=True)
|
||||||
|
logging.error(cmd)
|
||||||
|
return
|
||||||
|
|
||||||
|
torch_ver = StrictVersion(spec[0])
|
||||||
|
torch_ver = f"{torch_ver.major}.{torch_ver.minor}.{torch_ver.patch}"
|
||||||
|
torch_torchvision_torchaudio_ver = torch_torchvision_torchaudio_version_map.get(torch_ver)
|
||||||
|
|
||||||
|
if torch_torchvision_torchaudio_ver is None:
|
||||||
|
cmd = make_pip_cmd(['install', '--pre', 'torch', 'torchvision', 'torchaudio',
|
||||||
|
'--index-url', f"https://download.pytorch.org/whl/nightly/{platform}"])
|
||||||
|
logging.info("[ComfyUI-Manager] restore PyTorch to nightly version")
|
||||||
|
else:
|
||||||
|
torchvision_ver, torchaudio_ver = torch_torchvision_torchaudio_ver
|
||||||
|
cmd = make_pip_cmd(['install', f'torch=={torch_ver}', f'torchvision=={torchvision_ver}', f"torchaudio=={torchaudio_ver}",
|
||||||
|
'--index-url', f"https://download.pytorch.org/whl/{platform}"])
|
||||||
|
logging.info(f"[ComfyUI-Manager] restore PyTorch to {torch_ver}+{platform}")
|
||||||
|
|
||||||
|
subprocess.check_output(cmd, universal_newlines=True)
|
||||||
|
|
||||||
def fix_broken(self):
|
def fix_broken(self):
|
||||||
new_pip_versions = get_installed_packages(True)
|
new_pip_versions = get_installed_packages(True)
|
||||||
|
|
||||||
@@ -431,7 +381,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,14 +412,32 @@ 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}"])
|
if sys.version_info < (3, 13):
|
||||||
subprocess.check_output(cmd, universal_newlines=True)
|
cmd = make_pip_cmd(['install', f"{x}=={versions[0].version_string}", "numpy<2"])
|
||||||
|
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}")
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
logging.error("[ComfyUI-Manager] Failed to restore opencv")
|
logging.error("[ComfyUI-Manager] Failed to restore opencv")
|
||||||
logging.error(e)
|
logging.error(e)
|
||||||
|
|
||||||
|
# fix numpy
|
||||||
|
if sys.version_info >= (3, 13):
|
||||||
|
logging.info("[ComfyUI-Manager] In Python 3.13 and above, PIP Fixer does not downgrade `numpy` below version 2.0. If you need to force a downgrade of `numpy`, please use `pip_auto_fix.list`.")
|
||||||
|
else:
|
||||||
|
try:
|
||||||
|
np = new_pip_versions.get('numpy')
|
||||||
|
if cm_global.pip_overrides.get('numpy') == 'numpy<2':
|
||||||
|
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 +476,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 +524,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 +537,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}")
|
|
||||||
@@ -3,7 +3,7 @@ from __future__ import annotations
|
|||||||
from dataclasses import dataclass
|
from dataclasses import dataclass
|
||||||
import os
|
import os
|
||||||
|
|
||||||
from .git_utils import get_commit_hash
|
from git_utils import get_commit_hash
|
||||||
|
|
||||||
|
|
||||||
@dataclass
|
@dataclass
|
||||||
@@ -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:
|
if "pycrypto" in anthropic_reqs:
|
||||||
anthropic_reqs = requires_lines[0].split(": ", 1)[1]
|
location = [x for x in anthropic_info.split('\n') if x.startswith("Location")][0].split(': ')[1]
|
||||||
if "pycrypto" in anthropic_reqs:
|
for fi in os.listdir(location):
|
||||||
location_lines = [x for x in anthropic_info.split('\n') if x.startswith("Location")]
|
if fi.startswith("anthropic"):
|
||||||
if location_lines:
|
guide["ComfyUI_LLMVISION"] = f"\n0.Remove {os.path.join(location, fi)}" + guide["ComfyUI_LLMVISION"]
|
||||||
location = location_lines[0].split(": ", 1)[1]
|
detected.add("ComfyUI_LLMVISION")
|
||||||
for fi in os.listdir(location):
|
|
||||||
if fi.startswith("anthropic"):
|
|
||||||
guide["ComfyUI_LLMVISION"] = (f"\n0.Remove {os.path.join(location, fi)}" + guide["ComfyUI_LLMVISION"])
|
|
||||||
detected.add("ComfyUI_LLMVISION")
|
|
||||||
|
|
||||||
except subprocess.CalledProcessError:
|
except subprocess.CalledProcessError:
|
||||||
pass
|
pass
|
||||||
|
|
||||||
@@ -1,7 +1,5 @@
|
|||||||
import mimetypes
|
import mimetypes
|
||||||
from ..common import context
|
import manager_core as core
|
||||||
from . import manager_core as core
|
|
||||||
|
|
||||||
import os
|
import os
|
||||||
from aiohttp import web
|
from aiohttp import web
|
||||||
import aiohttp
|
import aiohttp
|
||||||
@@ -10,16 +8,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):
|
||||||
@@ -65,7 +53,7 @@ def compute_sha256_checksum(filepath):
|
|||||||
return sha256.hexdigest()
|
return sha256.hexdigest()
|
||||||
|
|
||||||
|
|
||||||
@PromptServer.instance.routes.get("/v2/manager/share_option")
|
@PromptServer.instance.routes.get("/manager/share_option")
|
||||||
async def share_option(request):
|
async def share_option(request):
|
||||||
if "value" in request.rel_url.query:
|
if "value" in request.rel_url.query:
|
||||||
core.get_config()['share_option'] = request.rel_url.query['value']
|
core.get_config()['share_option'] = request.rel_url.query['value']
|
||||||
@@ -77,21 +65,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,40 +89,40 @@ 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)
|
||||||
|
|
||||||
|
|
||||||
@PromptServer.instance.routes.get("/v2/manager/get_openart_auth")
|
@PromptServer.instance.routes.get("/manager/get_openart_auth")
|
||||||
async def api_get_openart_auth(request):
|
async def api_get_openart_auth(request):
|
||||||
# print("Getting stored Matrix credentials...")
|
# print("Getting stored Matrix credentials...")
|
||||||
openart_key = get_openart_auth()
|
openart_key = get_openart_auth()
|
||||||
@@ -143,16 +131,16 @@ async def api_get_openart_auth(request):
|
|||||||
return web.json_response({"openart_key": openart_key})
|
return web.json_response({"openart_key": openart_key})
|
||||||
|
|
||||||
|
|
||||||
@PromptServer.instance.routes.post("/v2/manager/set_openart_auth")
|
@PromptServer.instance.routes.post("/manager/set_openart_auth")
|
||||||
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)
|
||||||
|
|
||||||
|
|
||||||
@PromptServer.instance.routes.get("/v2/manager/get_matrix_auth")
|
@PromptServer.instance.routes.get("/manager/get_matrix_auth")
|
||||||
async def api_get_matrix_auth(request):
|
async def api_get_matrix_auth(request):
|
||||||
# print("Getting stored Matrix credentials...")
|
# print("Getting stored Matrix credentials...")
|
||||||
matrix_auth = get_matrix_auth()
|
matrix_auth = get_matrix_auth()
|
||||||
@@ -161,7 +149,7 @@ async def api_get_matrix_auth(request):
|
|||||||
return web.json_response(matrix_auth)
|
return web.json_response(matrix_auth)
|
||||||
|
|
||||||
|
|
||||||
@PromptServer.instance.routes.get("/v2/manager/youml/settings")
|
@PromptServer.instance.routes.get("/manager/youml/settings")
|
||||||
async def api_get_youml_settings(request):
|
async def api_get_youml_settings(request):
|
||||||
youml_settings = get_youml_settings()
|
youml_settings = get_youml_settings()
|
||||||
if not youml_settings:
|
if not youml_settings:
|
||||||
@@ -169,14 +157,14 @@ async def api_get_youml_settings(request):
|
|||||||
return web.json_response(json.loads(youml_settings))
|
return web.json_response(json.loads(youml_settings))
|
||||||
|
|
||||||
|
|
||||||
@PromptServer.instance.routes.post("/v2/manager/youml/settings")
|
@PromptServer.instance.routes.post("/manager/youml/settings")
|
||||||
async def api_set_youml_settings(request):
|
async def api_set_youml_settings(request):
|
||||||
json_data = await request.json()
|
json_data = await request.json()
|
||||||
set_youml_settings(json.dumps(json_data))
|
set_youml_settings(json.dumps(json_data))
|
||||||
return web.Response(status=200)
|
return web.Response(status=200)
|
||||||
|
|
||||||
|
|
||||||
@PromptServer.instance.routes.get("/v2/manager/get_comfyworkflows_auth")
|
@PromptServer.instance.routes.get("/manager/get_comfyworkflows_auth")
|
||||||
async def api_get_comfyworkflows_auth(request):
|
async def api_get_comfyworkflows_auth(request):
|
||||||
# Check if the user has provided Matrix credentials in a file called 'matrix_accesstoken'
|
# Check if the user has provided Matrix credentials in a file called 'matrix_accesstoken'
|
||||||
# in the same directory as the ComfyUI base folder
|
# in the same directory as the ComfyUI base folder
|
||||||
@@ -187,39 +175,31 @@ async def api_get_comfyworkflows_auth(request):
|
|||||||
return web.json_response({"comfyworkflows_sharekey": comfyworkflows_auth})
|
return web.json_response({"comfyworkflows_sharekey": comfyworkflows_auth})
|
||||||
|
|
||||||
|
|
||||||
@PromptServer.instance.routes.post("/v2/manager/set_esheep_workflow_and_images")
|
@PromptServer.instance.routes.post("/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("/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)
|
||||||
|
|
||||||
|
|
||||||
@@ -231,7 +211,7 @@ def has_provided_comfyworkflows_auth(comfyworkflows_sharekey):
|
|||||||
return comfyworkflows_sharekey.strip()
|
return comfyworkflows_sharekey.strip()
|
||||||
|
|
||||||
|
|
||||||
@PromptServer.instance.routes.post("/v2/manager/share")
|
@PromptServer.instance.routes.post("/manager/share")
|
||||||
async def share_art(request):
|
async def share_art(request):
|
||||||
# get json data
|
# get json data
|
||||||
json_data = await request.json()
|
json_data = await request.json()
|
||||||
@@ -253,7 +233,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 +329,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 +345,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 +366,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()
|
||||||
@@ -25,7 +25,7 @@ async function tryInstallCustomNode(event) {
|
|||||||
const res = await customConfirm(msg);
|
const res = await customConfirm(msg);
|
||||||
if(res) {
|
if(res) {
|
||||||
if(event.detail.target.installed == 'Disabled') {
|
if(event.detail.target.installed == 'Disabled') {
|
||||||
const response = await api.fetchApi(`/v2/customnode/toggle_active`, {
|
const response = await api.fetchApi(`/customnode/toggle_active`, {
|
||||||
method: 'POST',
|
method: 'POST',
|
||||||
headers: { 'Content-Type': 'application/json' },
|
headers: { 'Content-Type': 'application/json' },
|
||||||
body: JSON.stringify(event.detail.target)
|
body: JSON.stringify(event.detail.target)
|
||||||
@@ -35,7 +35,7 @@ async function tryInstallCustomNode(event) {
|
|||||||
await sleep(300);
|
await sleep(300);
|
||||||
app.ui.dialog.show(`Installing... '${event.detail.target.title}'`);
|
app.ui.dialog.show(`Installing... '${event.detail.target.title}'`);
|
||||||
|
|
||||||
const response = await api.fetchApi(`/v2/customnode/install`, {
|
const response = await api.fetchApi(`/customnode/install`, {
|
||||||
method: 'POST',
|
method: 'POST',
|
||||||
headers: { 'Content-Type': 'application/json' },
|
headers: { 'Content-Type': 'application/json' },
|
||||||
body: JSON.stringify(event.detail.target)
|
body: JSON.stringify(event.detail.target)
|
||||||
@@ -52,7 +52,7 @@ async function tryInstallCustomNode(event) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
let response = await api.fetchApi("/v2/manager/reboot");
|
let response = await api.fetchApi("/manager/reboot");
|
||||||
if(response.status == 403) {
|
if(response.status == 403) {
|
||||||
show_message('This action is not allowed with this security level configuration.');
|
show_message('This action is not allowed with this security level configuration.');
|
||||||
return false;
|
return false;
|
||||||
@@ -14,9 +14,9 @@ import { OpenArtShareDialog } from "./comfyui-share-openart.js";
|
|||||||
import {
|
import {
|
||||||
free_models, install_pip, install_via_git_url, manager_instance,
|
free_models, install_pip, install_via_git_url, manager_instance,
|
||||||
rebootAPI, setManagerInstance, show_message, customAlert, customPrompt,
|
rebootAPI, setManagerInstance, show_message, customAlert, customPrompt,
|
||||||
infoToast, showTerminal, setNeedRestart, generateUUID
|
infoToast, showTerminal, setNeedRestart
|
||||||
} from "./common.js";
|
} from "./common.js";
|
||||||
import { ComponentBuilderDialog, load_components, set_component_policy } from "./components-manager.js";
|
import { ComponentBuilderDialog, getPureName, load_components, set_component_policy } from "./components-manager.js";
|
||||||
import { CustomNodesManager } from "./custom-nodes-manager.js";
|
import { CustomNodesManager } from "./custom-nodes-manager.js";
|
||||||
import { ModelManager } from "./model-manager.js";
|
import { ModelManager } from "./model-manager.js";
|
||||||
import { SnapshotManager } from "./snapshot.js";
|
import { SnapshotManager } from "./snapshot.js";
|
||||||
@@ -189,7 +189,8 @@ docStyle.innerHTML = `
|
|||||||
}
|
}
|
||||||
`;
|
`;
|
||||||
|
|
||||||
function isBeforeFrontendVersion(compareVersion) {
|
function is_legacy_front() {
|
||||||
|
let compareVersion = '1.2.49';
|
||||||
try {
|
try {
|
||||||
const frontendVersion = window['__COMFYUI_FRONTEND_VERSION__'];
|
const frontendVersion = window['__COMFYUI_FRONTEND_VERSION__'];
|
||||||
if (typeof frontendVersion !== 'string') {
|
if (typeof frontendVersion !== 'string') {
|
||||||
@@ -231,7 +232,7 @@ var restart_stop_button = null;
|
|||||||
var update_policy_combo = null;
|
var update_policy_combo = null;
|
||||||
|
|
||||||
let share_option = 'all';
|
let share_option = 'all';
|
||||||
var batch_id = null;
|
var is_updating = false;
|
||||||
|
|
||||||
|
|
||||||
// copied style from https://github.com/pythongosssss/ComfyUI-Custom-Scripts
|
// copied style from https://github.com/pythongosssss/ComfyUI-Custom-Scripts
|
||||||
@@ -414,7 +415,7 @@ const style = `
|
|||||||
`;
|
`;
|
||||||
|
|
||||||
async function init_share_option() {
|
async function init_share_option() {
|
||||||
api.fetchApi('/v2/manager/share_option')
|
api.fetchApi('/manager/share_option')
|
||||||
.then(response => response.text())
|
.then(response => response.text())
|
||||||
.then(data => {
|
.then(data => {
|
||||||
share_option = data || 'all';
|
share_option = data || 'all';
|
||||||
@@ -422,7 +423,7 @@ async function init_share_option() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
async function init_notice(notice) {
|
async function init_notice(notice) {
|
||||||
api.fetchApi('/v2/manager/notice')
|
api.fetchApi('/manager/notice')
|
||||||
.then(response => response.text())
|
.then(response => response.text())
|
||||||
.then(data => {
|
.then(data => {
|
||||||
notice.innerHTML = data;
|
notice.innerHTML = data;
|
||||||
@@ -473,19 +474,14 @@ async function updateComfyUI() {
|
|||||||
let prev_text = update_comfyui_button.innerText;
|
let prev_text = update_comfyui_button.innerText;
|
||||||
update_comfyui_button.innerText = "Updating ComfyUI...";
|
update_comfyui_button.innerText = "Updating ComfyUI...";
|
||||||
|
|
||||||
// set_inprogress_mode();
|
set_inprogress_mode();
|
||||||
|
|
||||||
|
const response = await api.fetchApi('/manager/queue/update_comfyui');
|
||||||
|
|
||||||
showTerminal();
|
showTerminal();
|
||||||
|
|
||||||
batch_id = generateUUID();
|
is_updating = true;
|
||||||
|
await api.fetchApi('/manager/queue/start');
|
||||||
let batch = {};
|
|
||||||
batch['batch_id'] = batch_id;
|
|
||||||
batch['update_comfyui'] = true;
|
|
||||||
|
|
||||||
const res = await api.fetchApi(`/v2/manager/queue/batch`, {
|
|
||||||
method: 'POST',
|
|
||||||
body: JSON.stringify(batch)
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function showVersionSelectorDialog(versions, current, onSelect) {
|
function showVersionSelectorDialog(versions, current, onSelect) {
|
||||||
@@ -616,7 +612,7 @@ async function switchComfyUI() {
|
|||||||
switch_comfyui_button.disabled = true;
|
switch_comfyui_button.disabled = true;
|
||||||
switch_comfyui_button.style.backgroundColor = "gray";
|
switch_comfyui_button.style.backgroundColor = "gray";
|
||||||
|
|
||||||
let res = await api.fetchApi(`/v2/comfyui_manager/comfyui_versions`, { cache: "no-store" });
|
let res = await api.fetchApi(`/comfyui_manager/comfyui_versions`, { cache: "no-store" });
|
||||||
|
|
||||||
switch_comfyui_button.disabled = false;
|
switch_comfyui_button.disabled = false;
|
||||||
switch_comfyui_button.style.backgroundColor = "";
|
switch_comfyui_button.style.backgroundColor = "";
|
||||||
@@ -635,14 +631,14 @@ async function switchComfyUI() {
|
|||||||
showVersionSelectorDialog(versions, obj.current, async (selected_version) => {
|
showVersionSelectorDialog(versions, obj.current, async (selected_version) => {
|
||||||
if(selected_version == 'nightly') {
|
if(selected_version == 'nightly') {
|
||||||
update_policy_combo.value = 'nightly-comfyui';
|
update_policy_combo.value = 'nightly-comfyui';
|
||||||
api.fetchApi('/v2/manager/policy/update?value=nightly-comfyui');
|
api.fetchApi('/manager/policy/update?value=nightly-comfyui');
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
update_policy_combo.value = 'stable-comfyui';
|
update_policy_combo.value = 'stable-comfyui';
|
||||||
api.fetchApi('/v2/manager/policy/update?value=stable-comfyui');
|
api.fetchApi('/manager/policy/update?value=stable-comfyui');
|
||||||
}
|
}
|
||||||
|
|
||||||
let response = await api.fetchApi(`/v2/comfyui_manager/comfyui_switch_version?ver=${selected_version}`, { cache: "no-store" });
|
let response = await api.fetchApi(`/comfyui_manager/comfyui_switch_version?ver=${selected_version}`, { cache: "no-store" });
|
||||||
if (response.status == 200) {
|
if (response.status == 200) {
|
||||||
infoToast(`ComfyUI version is switched to ${selected_version}`);
|
infoToast(`ComfyUI version is switched to ${selected_version}`);
|
||||||
}
|
}
|
||||||
@@ -660,17 +656,18 @@ async function onQueueStatus(event) {
|
|||||||
const isElectron = 'electronAPI' in window;
|
const isElectron = 'electronAPI' in window;
|
||||||
|
|
||||||
if(event.detail.status == 'in_progress') {
|
if(event.detail.status == 'in_progress') {
|
||||||
// set_inprogress_mode();
|
set_inprogress_mode();
|
||||||
update_all_button.innerText = `in progress.. (${event.detail.done_count}/${event.detail.total_count})`;
|
update_all_button.innerText = `in progress.. (${event.detail.done_count}/${event.detail.total_count})`;
|
||||||
}
|
}
|
||||||
else if(event.detail.status == 'all-done') {
|
else if(event.detail.status == 'done') {
|
||||||
reset_action_buttons();
|
reset_action_buttons();
|
||||||
}
|
|
||||||
else if(event.detail.status == 'batch-done') {
|
if(!is_updating) {
|
||||||
if(batch_id != event.detail.batch_id) {
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
is_updating = false;
|
||||||
|
|
||||||
let success_list = [];
|
let success_list = [];
|
||||||
let failed_list = [];
|
let failed_list = [];
|
||||||
let comfyui_state = null;
|
let comfyui_state = null;
|
||||||
@@ -770,28 +767,41 @@ api.addEventListener("cm-queue-status", onQueueStatus);
|
|||||||
async function updateAll(update_comfyui) {
|
async function updateAll(update_comfyui) {
|
||||||
update_all_button.innerText = "Updating...";
|
update_all_button.innerText = "Updating...";
|
||||||
|
|
||||||
// set_inprogress_mode();
|
set_inprogress_mode();
|
||||||
|
|
||||||
var mode = manager_instance.datasrc_combo.value;
|
var mode = manager_instance.datasrc_combo.value;
|
||||||
|
|
||||||
showTerminal();
|
showTerminal();
|
||||||
|
|
||||||
batch_id = generateUUID();
|
|
||||||
|
|
||||||
let batch = {};
|
|
||||||
if(update_comfyui) {
|
if(update_comfyui) {
|
||||||
update_all_button.innerText = "Updating ComfyUI...";
|
update_all_button.innerText = "Updating ComfyUI...";
|
||||||
batch['update_comfyui'] = true;
|
await api.fetchApi('/manager/queue/update_comfyui');
|
||||||
}
|
}
|
||||||
|
|
||||||
batch['update_all'] = mode;
|
const response = await api.fetchApi(`/manager/queue/update_all?mode=${mode}`);
|
||||||
|
|
||||||
const res = await api.fetchApi(`/v2/manager/queue/batch`, {
|
if (response.status == 401) {
|
||||||
method: 'POST',
|
customAlert('Another task is already in progress. Please stop the ongoing task first.');
|
||||||
body: JSON.stringify(batch)
|
}
|
||||||
});
|
else if(response.status == 200) {
|
||||||
|
is_updating = true;
|
||||||
|
await api.fetchApi('/manager/queue/start');
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function newDOMTokenList(initialTokens) {
|
||||||
|
const tmp = document.createElement(`div`);
|
||||||
|
|
||||||
|
const classList = tmp.classList;
|
||||||
|
if (initialTokens) {
|
||||||
|
initialTokens.forEach(token => {
|
||||||
|
classList.add(token);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
return classList;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Check whether the node is a potential output node (img, gif or video output)
|
* Check whether the node is a potential output node (img, gif or video output)
|
||||||
*/
|
*/
|
||||||
@@ -804,7 +814,7 @@ function restartOrStop() {
|
|||||||
rebootAPI();
|
rebootAPI();
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
api.fetchApi('/v2/manager/queue/reset');
|
api.fetchApi('/manager/queue/reset');
|
||||||
infoToast('Cancel', 'Remaining tasks will stop after completing the current task.');
|
infoToast('Cancel', 'Remaining tasks will stop after completing the current task.');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -952,12 +962,12 @@ class ManagerMenuDialog extends ComfyDialog {
|
|||||||
this.datasrc_combo.appendChild($el('option', { value: 'local', text: 'DB: Local' }, []));
|
this.datasrc_combo.appendChild($el('option', { value: 'local', text: 'DB: Local' }, []));
|
||||||
this.datasrc_combo.appendChild($el('option', { value: 'remote', text: 'DB: Channel (remote)' }, []));
|
this.datasrc_combo.appendChild($el('option', { value: 'remote', text: 'DB: Channel (remote)' }, []));
|
||||||
|
|
||||||
api.fetchApi('/v2/manager/db_mode')
|
api.fetchApi('/manager/db_mode')
|
||||||
.then(response => response.text())
|
.then(response => response.text())
|
||||||
.then(data => { this.datasrc_combo.value = data; });
|
.then(data => { this.datasrc_combo.value = data; });
|
||||||
|
|
||||||
this.datasrc_combo.addEventListener('change', function (event) {
|
this.datasrc_combo.addEventListener('change', function (event) {
|
||||||
api.fetchApi(`/v2/manager/db_mode?value=${event.target.value}`);
|
api.fetchApi(`/manager/db_mode?value=${event.target.value}`);
|
||||||
});
|
});
|
||||||
|
|
||||||
// preview method
|
// preview method
|
||||||
@@ -969,19 +979,19 @@ class ManagerMenuDialog extends ComfyDialog {
|
|||||||
preview_combo.appendChild($el('option', { value: 'latent2rgb', text: 'Preview method: Latent2RGB (fast)' }, []));
|
preview_combo.appendChild($el('option', { value: 'latent2rgb', text: 'Preview method: Latent2RGB (fast)' }, []));
|
||||||
preview_combo.appendChild($el('option', { value: 'none', text: 'Preview method: None (very fast)' }, []));
|
preview_combo.appendChild($el('option', { value: 'none', text: 'Preview method: None (very fast)' }, []));
|
||||||
|
|
||||||
api.fetchApi('/v2/manager/preview_method')
|
api.fetchApi('/manager/preview_method')
|
||||||
.then(response => response.text())
|
.then(response => response.text())
|
||||||
.then(data => { preview_combo.value = data; });
|
.then(data => { preview_combo.value = data; });
|
||||||
|
|
||||||
preview_combo.addEventListener('change', function (event) {
|
preview_combo.addEventListener('change', function (event) {
|
||||||
api.fetchApi(`/v2/manager/preview_method?value=${event.target.value}`);
|
api.fetchApi(`/manager/preview_method?value=${event.target.value}`);
|
||||||
});
|
});
|
||||||
|
|
||||||
// channel
|
// channel
|
||||||
let channel_combo = document.createElement("select");
|
let channel_combo = document.createElement("select");
|
||||||
channel_combo.setAttribute("title", "Configure the channel for retrieving data from the Custom Node list (including missing nodes) or the Model list.");
|
channel_combo.setAttribute("title", "Configure the channel for retrieving data from the Custom Node list (including missing nodes) or the Model list.");
|
||||||
channel_combo.className = "cm-menu-combo";
|
channel_combo.className = "cm-menu-combo";
|
||||||
api.fetchApi('/v2/manager/channel_url_list')
|
api.fetchApi('/manager/channel_url_list')
|
||||||
.then(response => response.json())
|
.then(response => response.json())
|
||||||
.then(async data => {
|
.then(async data => {
|
||||||
try {
|
try {
|
||||||
@@ -994,7 +1004,7 @@ class ManagerMenuDialog extends ComfyDialog {
|
|||||||
}
|
}
|
||||||
|
|
||||||
channel_combo.addEventListener('change', function (event) {
|
channel_combo.addEventListener('change', function (event) {
|
||||||
api.fetchApi(`/v2/manager/channel_url_list?value=${event.target.value}`);
|
api.fetchApi(`/manager/channel_url_list?value=${event.target.value}`);
|
||||||
});
|
});
|
||||||
|
|
||||||
channel_combo.value = data.selected;
|
channel_combo.value = data.selected;
|
||||||
@@ -1022,7 +1032,7 @@ class ManagerMenuDialog extends ComfyDialog {
|
|||||||
share_combo.appendChild($el('option', { value: option[0], text: `Share: ${option[1]}` }, []));
|
share_combo.appendChild($el('option', { value: option[0], text: `Share: ${option[1]}` }, []));
|
||||||
}
|
}
|
||||||
|
|
||||||
api.fetchApi('/v2/manager/share_option')
|
api.fetchApi('/manager/share_option')
|
||||||
.then(response => response.text())
|
.then(response => response.text())
|
||||||
.then(data => {
|
.then(data => {
|
||||||
share_combo.value = data || 'all';
|
share_combo.value = data || 'all';
|
||||||
@@ -1032,7 +1042,7 @@ class ManagerMenuDialog extends ComfyDialog {
|
|||||||
share_combo.addEventListener('change', function (event) {
|
share_combo.addEventListener('change', function (event) {
|
||||||
const value = event.target.value;
|
const value = event.target.value;
|
||||||
share_option = value;
|
share_option = value;
|
||||||
api.fetchApi(`/v2/manager/share_option?value=${value}`);
|
api.fetchApi(`/manager/share_option?value=${value}`);
|
||||||
const shareButton = document.getElementById("shareButton");
|
const shareButton = document.getElementById("shareButton");
|
||||||
if (value === 'none') {
|
if (value === 'none') {
|
||||||
shareButton.style.display = "none";
|
shareButton.style.display = "none";
|
||||||
@@ -1047,7 +1057,7 @@ class ManagerMenuDialog extends ComfyDialog {
|
|||||||
component_policy_combo.appendChild($el('option', { value: 'workflow', text: 'Component: Use workflow version' }, []));
|
component_policy_combo.appendChild($el('option', { value: 'workflow', text: 'Component: Use workflow version' }, []));
|
||||||
component_policy_combo.appendChild($el('option', { value: 'higher', text: 'Component: Use higher version' }, []));
|
component_policy_combo.appendChild($el('option', { value: 'higher', text: 'Component: Use higher version' }, []));
|
||||||
component_policy_combo.appendChild($el('option', { value: 'mine', text: 'Component: Use my version' }, []));
|
component_policy_combo.appendChild($el('option', { value: 'mine', text: 'Component: Use my version' }, []));
|
||||||
api.fetchApi('/v2/manager/policy/component')
|
api.fetchApi('/manager/policy/component')
|
||||||
.then(response => response.text())
|
.then(response => response.text())
|
||||||
.then(data => {
|
.then(data => {
|
||||||
component_policy_combo.value = data;
|
component_policy_combo.value = data;
|
||||||
@@ -1055,7 +1065,7 @@ class ManagerMenuDialog extends ComfyDialog {
|
|||||||
});
|
});
|
||||||
|
|
||||||
component_policy_combo.addEventListener('change', function (event) {
|
component_policy_combo.addEventListener('change', function (event) {
|
||||||
api.fetchApi(`/v2/manager/policy/component?value=${event.target.value}`);
|
api.fetchApi(`/manager/policy/component?value=${event.target.value}`);
|
||||||
set_component_policy(event.target.value);
|
set_component_policy(event.target.value);
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -1068,14 +1078,14 @@ class ManagerMenuDialog extends ComfyDialog {
|
|||||||
update_policy_combo.className = "cm-menu-combo";
|
update_policy_combo.className = "cm-menu-combo";
|
||||||
update_policy_combo.appendChild($el('option', { value: 'stable-comfyui', text: 'Update: ComfyUI Stable Version' }, []));
|
update_policy_combo.appendChild($el('option', { value: 'stable-comfyui', text: 'Update: ComfyUI Stable Version' }, []));
|
||||||
update_policy_combo.appendChild($el('option', { value: 'nightly-comfyui', text: 'Update: ComfyUI Nightly Version' }, []));
|
update_policy_combo.appendChild($el('option', { value: 'nightly-comfyui', text: 'Update: ComfyUI Nightly Version' }, []));
|
||||||
api.fetchApi('/v2/manager/policy/update')
|
api.fetchApi('/manager/policy/update')
|
||||||
.then(response => response.text())
|
.then(response => response.text())
|
||||||
.then(data => {
|
.then(data => {
|
||||||
update_policy_combo.value = data;
|
update_policy_combo.value = data;
|
||||||
});
|
});
|
||||||
|
|
||||||
update_policy_combo.addEventListener('change', function (event) {
|
update_policy_combo.addEventListener('change', function (event) {
|
||||||
api.fetchApi(`/v2/manager/policy/update?value=${event.target.value}`);
|
api.fetchApi(`/manager/policy/update?value=${event.target.value}`);
|
||||||
});
|
});
|
||||||
|
|
||||||
return [
|
return [
|
||||||
@@ -1378,12 +1388,12 @@ class ManagerMenuDialog extends ComfyDialog {
|
|||||||
}
|
}
|
||||||
|
|
||||||
async function getVersion() {
|
async function getVersion() {
|
||||||
let version = await api.fetchApi(`/v2/manager/version`);
|
let version = await api.fetchApi(`/manager/version`);
|
||||||
return await version.text();
|
return await version.text();
|
||||||
}
|
}
|
||||||
|
|
||||||
app.registerExtension({
|
app.registerExtension({
|
||||||
name: "Comfy.Legacy.ManagerMenu",
|
name: "Comfy.ManagerMenu",
|
||||||
|
|
||||||
aboutPageBadges: [
|
aboutPageBadges: [
|
||||||
{
|
{
|
||||||
@@ -1514,6 +1524,8 @@ app.registerExtension({
|
|||||||
tooltip: "Share"
|
tooltip: "Share"
|
||||||
}).element
|
}).element
|
||||||
);
|
);
|
||||||
|
|
||||||
|
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.');
|
||||||
@@ -172,7 +172,7 @@ export const shareToEsheep= () => {
|
|||||||
const nodes = app.graph._nodes
|
const nodes = app.graph._nodes
|
||||||
const { potential_outputs, potential_output_nodes } = getPotentialOutputsAndOutputNodes(nodes);
|
const { potential_outputs, potential_output_nodes } = getPotentialOutputsAndOutputNodes(nodes);
|
||||||
const workflow = prompt['workflow']
|
const workflow = prompt['workflow']
|
||||||
api.fetchApi(`/v2/manager/set_esheep_workflow_and_images`, {
|
api.fetchApi(`/manager/set_esheep_workflow_and_images`, {
|
||||||
method: 'POST',
|
method: 'POST',
|
||||||
headers: { 'Content-Type': 'application/json' },
|
headers: { 'Content-Type': 'application/json' },
|
||||||
body: JSON.stringify({
|
body: JSON.stringify({
|
||||||
@@ -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)";
|
||||||
@@ -826,7 +812,7 @@ export class ShareDialog extends ComfyDialog {
|
|||||||
// get the user's existing matrix auth and share key
|
// get the user's existing matrix auth and share key
|
||||||
ShareDialog.matrix_auth = { homeserver: "matrix.org", username: "", password: "" };
|
ShareDialog.matrix_auth = { homeserver: "matrix.org", username: "", password: "" };
|
||||||
try {
|
try {
|
||||||
api.fetchApi(`/v2/manager/get_matrix_auth`)
|
api.fetchApi(`/manager/get_matrix_auth`)
|
||||||
.then(response => response.json())
|
.then(response => response.json())
|
||||||
.then(data => {
|
.then(data => {
|
||||||
ShareDialog.matrix_auth = data;
|
ShareDialog.matrix_auth = data;
|
||||||
@@ -845,7 +831,7 @@ export class ShareDialog extends ComfyDialog {
|
|||||||
ShareDialog.cw_sharekey = "";
|
ShareDialog.cw_sharekey = "";
|
||||||
try {
|
try {
|
||||||
// console.log("Fetching comfyworkflows share key")
|
// console.log("Fetching comfyworkflows share key")
|
||||||
api.fetchApi(`/v2/manager/get_comfyworkflows_auth`)
|
api.fetchApi(`/manager/get_comfyworkflows_auth`)
|
||||||
.then(response => response.json())
|
.then(response => response.json())
|
||||||
.then(data => {
|
.then(data => {
|
||||||
ShareDialog.cw_sharekey = data.comfyworkflows_sharekey;
|
ShareDialog.cw_sharekey = data.comfyworkflows_sharekey;
|
||||||
@@ -905,7 +891,7 @@ export class ShareDialog extends ComfyDialog {
|
|||||||
// Change the text of the share button to "Sharing..." to indicate that the share process has started
|
// Change the text of the share button to "Sharing..." to indicate that the share process has started
|
||||||
this.share_button.textContent = "Sharing...";
|
this.share_button.textContent = "Sharing...";
|
||||||
|
|
||||||
const response = await api.fetchApi(`/v2/manager/share`, {
|
const response = await api.fetchApi(`/manager/share`, {
|
||||||
method: 'POST',
|
method: 'POST',
|
||||||
headers: { 'Content-Type': 'application/json' },
|
headers: { 'Content-Type': 'application/json' },
|
||||||
body: JSON.stringify({
|
body: JSON.stringify({
|
||||||
@@ -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(
|
||||||
$el("label", { style: labelStyle }, ["3️⃣ Title "]),
|
"div",
|
||||||
this.TitleInput,
|
{ style: { ...sectionStyle, } },
|
||||||
titleNumDom,
|
[
|
||||||
]);
|
$el("label", { style: labelStyle }, ["3️⃣ Title "]),
|
||||||
|
this.TitleInput,
|
||||||
|
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",
|
$el("span", { style: { marginLeft: "5px" } }, ["ON"]),
|
||||||
{
|
$el("span", { style: { marginLeft: "20px",marginRight:'10px' ,color:'#fff'} }, ["Price US$"]),
|
||||||
style: {
|
this.LockInput
|
||||||
marginLeft: "5px",
|
]),
|
||||||
display: "flex",
|
|
||||||
alignItems: "center",
|
|
||||||
position: "relative",
|
|
||||||
},
|
|
||||||
},
|
|
||||||
[
|
|
||||||
$el("span", { style: { marginLeft: "5px" } }, ["ON"]),
|
|
||||||
$el(
|
|
||||||
"span",
|
|
||||||
{
|
|
||||||
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) {
|
||||||
@@ -804,15 +628,8 @@ export class CopusShareDialog extends ComfyDialog {
|
|||||||
subTitle: this.SubTitleInput.value,
|
subTitle: this.SubTitleInput.value,
|
||||||
content: this.descriptionInput.value,
|
content: this.descriptionInput.value,
|
||||||
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) {
|
||||||
@@ -827,8 +644,8 @@ export class CopusShareDialog extends ComfyDialog {
|
|||||||
throw new Error("Title is required");
|
throw new Error("Title is required");
|
||||||
}
|
}
|
||||||
|
|
||||||
if (this.radioButtonsCheck_lock.checked) {
|
if(this.radioButtonsCheck_lock.checked){
|
||||||
if (!this.LockInput.value) {
|
if (!this.LockInput.value){
|
||||||
throw new Error("Price is required");
|
throw new Error("Price is required");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -878,23 +695,23 @@ export class CopusShareDialog extends ComfyDialog {
|
|||||||
"Uploading workflow..."
|
"Uploading workflow..."
|
||||||
);
|
);
|
||||||
|
|
||||||
if (res.status && res.data.status && res.data) {
|
if (res.status && res.data.status && res.data) {
|
||||||
localStorage.setItem("copus_token", this.keyInput.value);
|
localStorage.setItem("copus_token",this.keyInput.value);
|
||||||
const { data } = res.data;
|
const { data } = res.data;
|
||||||
if (data) {
|
if (data) {
|
||||||
const url = `${DEFAULT_HOMEPAGE_URL}/work/${data}`;
|
const url = `${DEFAULT_HOMEPAGE_URL}/work/${data}`;
|
||||||
this.message.innerHTML = `Workflow has been shared successfully. <a href="${url}" target="_blank">Click here to view it.</a>`;
|
this.message.innerHTML = `Workflow has been shared successfully. <a href="${url}" target="_blank">Click here to view it.</a>`;
|
||||||
this.previewImage.src = "";
|
this.previewImage.src = "";
|
||||||
this.previewImage.style.display = "none";
|
this.previewImage.style.display = "none";
|
||||||
this.uploadedImages = [];
|
this.uploadedImages = [];
|
||||||
this.allFilesImages = [];
|
this.allFilesImages = [];
|
||||||
this.allFiles = [];
|
this.allFiles = [];
|
||||||
this.TitleInput.value = "";
|
this.TitleInput.value = "";
|
||||||
this.SubTitleInput.value = "";
|
this.SubTitleInput.value = "";
|
||||||
this.descriptionInput.value = "";
|
this.descriptionInput.value = "";
|
||||||
this.selectedFile = null;
|
this.selectedFile = null;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
throw new Error("Error sharing workflow: " + e.message);
|
throw new Error("Error sharing workflow: " + e.message);
|
||||||
}
|
}
|
||||||
@@ -940,7 +757,7 @@ export class CopusShareDialog extends ComfyDialog {
|
|||||||
this.element.style.display = "block";
|
this.element.style.display = "block";
|
||||||
this.previewImage.src = "";
|
this.previewImage.src = "";
|
||||||
this.previewImage.style.display = "none";
|
this.previewImage.style.display = "none";
|
||||||
this.keyInput.value = apiToken != null ? apiToken : "";
|
this.keyInput.value = apiToken!=null?apiToken:"";
|
||||||
this.uploadedImages = [];
|
this.uploadedImages = [];
|
||||||
this.allFilesImages = [];
|
this.allFilesImages = [];
|
||||||
this.allFiles = [];
|
this.allFiles = [];
|
||||||
@@ -67,7 +67,7 @@ export class OpenArtShareDialog extends ComfyDialog {
|
|||||||
async readKey() {
|
async readKey() {
|
||||||
let key = ""
|
let key = ""
|
||||||
try {
|
try {
|
||||||
key = await api.fetchApi(`/v2/manager/get_openart_auth`)
|
key = await api.fetchApi(`/manager/get_openart_auth`)
|
||||||
.then(response => response.json())
|
.then(response => response.json())
|
||||||
.then(data => {
|
.then(data => {
|
||||||
return data.openart_key;
|
return data.openart_key;
|
||||||
@@ -82,7 +82,7 @@ export class OpenArtShareDialog extends ComfyDialog {
|
|||||||
}
|
}
|
||||||
|
|
||||||
async saveKey(value) {
|
async saveKey(value) {
|
||||||
await api.fetchApi(`/v2/manager/set_openart_auth`, {
|
await api.fetchApi(`/manager/set_openart_auth`, {
|
||||||
method: 'POST',
|
method: 'POST',
|
||||||
headers: {'Content-Type': 'application/json'},
|
headers: {'Content-Type': 'application/json'},
|
||||||
body: JSON.stringify({
|
body: JSON.stringify({
|
||||||
@@ -399,7 +399,7 @@ export class OpenArtShareDialog extends ComfyDialog {
|
|||||||
form.append("file", uploadFile);
|
form.append("file", uploadFile);
|
||||||
try {
|
try {
|
||||||
const res = await this.fetchApi(
|
const res = await this.fetchApi(
|
||||||
`/v2/workflows/upload_thumbnail`,
|
`/workflows/upload_thumbnail`,
|
||||||
{
|
{
|
||||||
method: "POST",
|
method: "POST",
|
||||||
body: form,
|
body: form,
|
||||||
@@ -459,7 +459,7 @@ export class OpenArtShareDialog extends ComfyDialog {
|
|||||||
throw new Error("Title is required");
|
throw new Error("Title is required");
|
||||||
}
|
}
|
||||||
|
|
||||||
const current_snapshot = await api.fetchApi(`/v2/snapshot/get_current`)
|
const current_snapshot = await api.fetchApi(`/snapshot/get_current`)
|
||||||
.then(response => response.json())
|
.then(response => response.json())
|
||||||
.catch(error => {
|
.catch(error => {
|
||||||
// console.log(error);
|
// console.log(error);
|
||||||
@@ -489,7 +489,7 @@ export class OpenArtShareDialog extends ComfyDialog {
|
|||||||
|
|
||||||
try {
|
try {
|
||||||
const response = await this.fetchApi(
|
const response = await this.fetchApi(
|
||||||
"/v2/workflows/publish",
|
"/workflows/publish",
|
||||||
{
|
{
|
||||||
method: "POST",
|
method: "POST",
|
||||||
headers: {"Content-Type": "application/json"},
|
headers: {"Content-Type": "application/json"},
|
||||||
@@ -179,7 +179,7 @@ export class YouMLShareDialog extends ComfyDialog {
|
|||||||
async loadToken() {
|
async loadToken() {
|
||||||
let key = ""
|
let key = ""
|
||||||
try {
|
try {
|
||||||
const response = await api.fetchApi(`/v2/manager/youml/settings`)
|
const response = await api.fetchApi(`/manager/youml/settings`)
|
||||||
const settings = await response.json()
|
const settings = await response.json()
|
||||||
return settings.token
|
return settings.token
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
@@ -188,7 +188,7 @@ export class YouMLShareDialog extends ComfyDialog {
|
|||||||
}
|
}
|
||||||
|
|
||||||
async saveToken(value) {
|
async saveToken(value) {
|
||||||
await api.fetchApi(`/v2/manager/youml/settings`, {
|
await api.fetchApi(`/manager/youml/settings`, {
|
||||||
method: 'POST',
|
method: 'POST',
|
||||||
headers: {'Content-Type': 'application/json'},
|
headers: {'Content-Type': 'application/json'},
|
||||||
body: JSON.stringify({
|
body: JSON.stringify({
|
||||||
@@ -380,7 +380,7 @@ export class YouMLShareDialog extends ComfyDialog {
|
|||||||
try {
|
try {
|
||||||
let snapshotData = null;
|
let snapshotData = null;
|
||||||
try {
|
try {
|
||||||
const snapshot = await api.fetchApi(`/v2/snapshot/get_current`)
|
const snapshot = await api.fetchApi(`/snapshot/get_current`)
|
||||||
snapshotData = await snapshot.json()
|
snapshotData = await snapshot.json()
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
console.error("Failed to get snapshot", e)
|
console.error("Failed to get snapshot", e)
|
||||||
@@ -172,7 +172,7 @@ export function rebootAPI() {
|
|||||||
customConfirm("Are you sure you'd like to reboot the server?").then((isConfirmed) => {
|
customConfirm("Are you sure you'd like to reboot the server?").then((isConfirmed) => {
|
||||||
if (isConfirmed) {
|
if (isConfirmed) {
|
||||||
try {
|
try {
|
||||||
api.fetchApi("/v2/manager/reboot");
|
api.fetchApi("/manager/reboot");
|
||||||
}
|
}
|
||||||
catch(exception) {}
|
catch(exception) {}
|
||||||
}
|
}
|
||||||
@@ -210,7 +210,7 @@ export async function install_pip(packages) {
|
|||||||
if(packages.includes('&'))
|
if(packages.includes('&'))
|
||||||
app.ui.dialog.show(`Invalid PIP package enumeration: '${packages}'`);
|
app.ui.dialog.show(`Invalid PIP package enumeration: '${packages}'`);
|
||||||
|
|
||||||
const res = await api.fetchApi("/v2/customnode/install/pip", {
|
const res = await api.fetchApi("/customnode/install/pip", {
|
||||||
method: "POST",
|
method: "POST",
|
||||||
body: packages,
|
body: packages,
|
||||||
});
|
});
|
||||||
@@ -245,7 +245,7 @@ export async function install_via_git_url(url, manager_dialog) {
|
|||||||
|
|
||||||
show_message(`Wait...<BR><BR>Installing '${url}'`);
|
show_message(`Wait...<BR><BR>Installing '${url}'`);
|
||||||
|
|
||||||
const res = await api.fetchApi("/v2/customnode/install/git_url", {
|
const res = await api.fetchApi("/customnode/install/git_url", {
|
||||||
method: "POST",
|
method: "POST",
|
||||||
body: url,
|
body: url,
|
||||||
});
|
});
|
||||||
@@ -630,14 +630,6 @@ export function showTooltip(target, text, className = 'cn-tooltip', styleMap = {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
export function generateUUID() {
|
|
||||||
return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function(c) {
|
|
||||||
const r = Math.random() * 16 | 0;
|
|
||||||
const v = c === 'x' ? r : (r & 0x3 | 0x8);
|
|
||||||
return v.toString(16);
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
function initTooltip () {
|
function initTooltip () {
|
||||||
const mouseenterHandler = (e) => {
|
const mouseenterHandler = (e) => {
|
||||||
const target = e.target;
|
const target = e.target;
|
||||||
@@ -64,7 +64,7 @@ function storeGroupNode(name, data, register=true) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
export async function load_components() {
|
export async function load_components() {
|
||||||
let data = await api.fetchApi('/v2/manager/component/loads', {method: "POST"});
|
let data = await api.fetchApi('/manager/component/loads', {method: "POST"});
|
||||||
let components = await data.json();
|
let components = await data.json();
|
||||||
|
|
||||||
let start_time = Date.now();
|
let start_time = Date.now();
|
||||||
@@ -222,7 +222,7 @@ async function save_as_component(node, version, author, prefix, nodename, packna
|
|||||||
pack_map[packname] = component_name;
|
pack_map[packname] = component_name;
|
||||||
rpack_map[component_name] = subgraph;
|
rpack_map[component_name] = subgraph;
|
||||||
|
|
||||||
const res = await api.fetchApi('/v2/manager/component/save', {
|
const res = await api.fetchApi('/manager/component/save', {
|
||||||
method: "POST",
|
method: "POST",
|
||||||
headers: {
|
headers: {
|
||||||
"Content-Type": "application/json",
|
"Content-Type": "application/json",
|
||||||
@@ -259,7 +259,7 @@ async function import_component(component_name, component, mode) {
|
|||||||
workflow: component
|
workflow: component
|
||||||
};
|
};
|
||||||
|
|
||||||
const res = await api.fetchApi('/v2/manager/component/save', {
|
const res = await api.fetchApi('/manager/component/save', {
|
||||||
method: "POST",
|
method: "POST",
|
||||||
headers: { "Content-Type": "application/json", },
|
headers: { "Content-Type": "application/json", },
|
||||||
body: JSON.stringify(body)
|
body: JSON.stringify(body)
|
||||||
@@ -709,7 +709,7 @@ app.handleFile = handleFile;
|
|||||||
|
|
||||||
let current_component_policy = 'workflow';
|
let current_component_policy = 'workflow';
|
||||||
try {
|
try {
|
||||||
api.fetchApi('/v2/manager/policy/component')
|
api.fetchApi('/manager/policy/component')
|
||||||
.then(response => response.text())
|
.then(response => response.text())
|
||||||
.then(data => { current_component_policy = data; });
|
.then(data => { current_component_policy = data; });
|
||||||
}
|
}
|
||||||
@@ -1,5 +1,5 @@
|
|||||||
.cn-manager {
|
.cn-manager {
|
||||||
--grid-font: -apple-system, BlinkMacSystemFont, "Segoe UI", "Noto Sans", Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji";
|
--grid-font: -apple-system, BlinkMacSystemFont, "Segue UI", "Noto Sans", Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji";
|
||||||
z-index: 1099;
|
z-index: 1099;
|
||||||
width: 80%;
|
width: 80%;
|
||||||
height: 80%;
|
height: 80%;
|
||||||
@@ -7,7 +7,7 @@ import {
|
|||||||
fetchData, md5, icons, show_message, customConfirm, customAlert, customPrompt,
|
fetchData, md5, icons, show_message, customConfirm, customAlert, customPrompt,
|
||||||
sanitizeHTML, infoToast, showTerminal, setNeedRestart,
|
sanitizeHTML, infoToast, showTerminal, setNeedRestart,
|
||||||
storeColumnWidth, restoreColumnWidth, getTimeAgo, copyText, loadCss,
|
storeColumnWidth, restoreColumnWidth, getTimeAgo, copyText, loadCss,
|
||||||
showPopover, hidePopover, generateUUID
|
showPopover, hidePopover
|
||||||
} from "./common.js";
|
} from "./common.js";
|
||||||
|
|
||||||
// https://cenfun.github.io/turbogrid/api.html
|
// https://cenfun.github.io/turbogrid/api.html
|
||||||
@@ -66,7 +66,7 @@ export class CustomNodesManager {
|
|||||||
this.id = "cn-manager";
|
this.id = "cn-manager";
|
||||||
|
|
||||||
app.registerExtension({
|
app.registerExtension({
|
||||||
name: "Comfy.Legacy.CustomNodesManager",
|
name: "Comfy.CustomNodesManager",
|
||||||
afterConfigureGraph: (missingNodeTypes) => {
|
afterConfigureGraph: (missingNodeTypes) => {
|
||||||
const item = this.getFilterItem(ShowMode.MISSING);
|
const item = this.getFilterItem(ShowMode.MISSING);
|
||||||
if (item) {
|
if (item) {
|
||||||
@@ -459,7 +459,7 @@ export class CustomNodesManager {
|
|||||||
|
|
||||||
".cn-manager-stop": {
|
".cn-manager-stop": {
|
||||||
click: () => {
|
click: () => {
|
||||||
api.fetchApi('/v2/manager/queue/reset');
|
api.fetchApi('/manager/queue/reset');
|
||||||
infoToast('Cancel', 'Remaining tasks will stop after completing the current task.');
|
infoToast('Cancel', 'Remaining tasks will stop after completing the current task.');
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
@@ -635,7 +635,7 @@ export class CustomNodesManager {
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
const response = await api.fetchApi(`/v2/customnode/import_fail_info`, {
|
const response = await api.fetchApi(`/customnode/import_fail_info`, {
|
||||||
method: 'POST',
|
method: 'POST',
|
||||||
headers: { 'Content-Type': 'application/json' },
|
headers: { 'Content-Type': 'application/json' },
|
||||||
body: JSON.stringify(info)
|
body: JSON.stringify(info)
|
||||||
@@ -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;
|
||||||
@@ -1244,7 +1243,7 @@ export class CustomNodesManager {
|
|||||||
async loadNodes(node_packs) {
|
async loadNodes(node_packs) {
|
||||||
const mode = manager_instance.datasrc_combo.value;
|
const mode = manager_instance.datasrc_combo.value;
|
||||||
this.showStatus(`Loading node mappings (${mode}) ...`);
|
this.showStatus(`Loading node mappings (${mode}) ...`);
|
||||||
const res = await fetchData(`/v2/customnode/getmappings?mode=${mode}`);
|
const res = await fetchData(`/customnode/getmappings?mode=${mode}`);
|
||||||
if (res.error) {
|
if (res.error) {
|
||||||
console.log(res.error);
|
console.log(res.error);
|
||||||
return;
|
return;
|
||||||
@@ -1396,10 +1395,10 @@ export class CustomNodesManager {
|
|||||||
this.showLoading();
|
this.showLoading();
|
||||||
let res;
|
let res;
|
||||||
if(is_enable) {
|
if(is_enable) {
|
||||||
res = await api.fetchApi(`/v2/customnode/disabled_versions/${node_id}`, { cache: "no-store" });
|
res = await api.fetchApi(`/customnode/disabled_versions/${node_id}`, { cache: "no-store" });
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
res = await api.fetchApi(`/v2/customnode/versions/${node_id}`, { cache: "no-store" });
|
res = await api.fetchApi(`/customnode/versions/${node_id}`, { cache: "no-store" });
|
||||||
}
|
}
|
||||||
this.hideLoading();
|
this.hideLoading();
|
||||||
|
|
||||||
@@ -1441,6 +1440,13 @@ export class CustomNodesManager {
|
|||||||
}
|
}
|
||||||
|
|
||||||
async installNodes(list, btn, title, selected_version) {
|
async installNodes(list, btn, title, selected_version) {
|
||||||
|
let stats = await api.fetchApi('/manager/queue/status');
|
||||||
|
stats = await stats.json();
|
||||||
|
if(stats.is_processing) {
|
||||||
|
customAlert(`[ComfyUI-Manager] There are already tasks in progress. Please try again after it is completed. (${stats.done_count}/${stats.total_count})`);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
const { target, label, mode} = btn;
|
const { target, label, mode} = btn;
|
||||||
|
|
||||||
if(mode === "uninstall") {
|
if(mode === "uninstall") {
|
||||||
@@ -1467,9 +1473,9 @@ export class CustomNodesManager {
|
|||||||
let needRestart = false;
|
let needRestart = false;
|
||||||
let errorMsg = "";
|
let errorMsg = "";
|
||||||
|
|
||||||
let target_items = [];
|
await api.fetchApi('/manager/queue/reset');
|
||||||
|
|
||||||
let batch = {};
|
let target_items = [];
|
||||||
|
|
||||||
for (const hash of list) {
|
for (const hash of list) {
|
||||||
const item = this.grid.getRowItemBy("hash", hash);
|
const item = this.grid.getRowItemBy("hash", hash);
|
||||||
@@ -1512,11 +1518,23 @@ export class CustomNodesManager {
|
|||||||
api_mode = 'reinstall';
|
api_mode = 'reinstall';
|
||||||
}
|
}
|
||||||
|
|
||||||
if(batch[api_mode]) {
|
const res = await api.fetchApi(`/manager/queue/${api_mode}`, {
|
||||||
batch[api_mode].push(data);
|
method: 'POST',
|
||||||
}
|
body: JSON.stringify(data)
|
||||||
else {
|
});
|
||||||
batch[api_mode] = [data];
|
|
||||||
|
if (res.status != 200) {
|
||||||
|
errorMsg = `'${item.title}': `;
|
||||||
|
|
||||||
|
if(res.status == 403) {
|
||||||
|
errorMsg += `This action is not allowed with this security level configuration.\n`;
|
||||||
|
} else if(res.status == 404) {
|
||||||
|
errorMsg += `With the current security level configuration, only custom nodes from the <B>"default channel"</B> can be installed.\n`;
|
||||||
|
} else {
|
||||||
|
errorMsg += await res.text() + '\n';
|
||||||
|
}
|
||||||
|
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1533,24 +1551,7 @@ export class CustomNodesManager {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
this.batch_id = generateUUID();
|
await api.fetchApi('/manager/queue/start');
|
||||||
batch['batch_id'] = this.batch_id;
|
|
||||||
|
|
||||||
const res = await api.fetchApi(`/v2/manager/queue/batch`, {
|
|
||||||
method: 'POST',
|
|
||||||
body: JSON.stringify(batch)
|
|
||||||
});
|
|
||||||
|
|
||||||
let failed = await res.json();
|
|
||||||
|
|
||||||
if(failed.length > 0) {
|
|
||||||
for(let k in failed) {
|
|
||||||
let hash = failed[k];
|
|
||||||
const item = this.grid.getRowItemBy("hash", hash);
|
|
||||||
errorMsg = `[FAIL] ${item.title}`;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
this.showStop();
|
this.showStop();
|
||||||
showTerminal();
|
showTerminal();
|
||||||
}
|
}
|
||||||
@@ -1558,9 +1559,6 @@ export class CustomNodesManager {
|
|||||||
|
|
||||||
async onQueueStatus(event) {
|
async onQueueStatus(event) {
|
||||||
let self = CustomNodesManager.instance;
|
let self = CustomNodesManager.instance;
|
||||||
// If legacy manager front is not open, return early (using new manager front)
|
|
||||||
if (self.element?.style.display === 'none') return
|
|
||||||
|
|
||||||
if(event.detail.status == 'in_progress' && event.detail.ui_target == 'nodepack_manager') {
|
if(event.detail.status == 'in_progress' && event.detail.ui_target == 'nodepack_manager') {
|
||||||
const hash = event.detail.target;
|
const hash = event.detail.target;
|
||||||
|
|
||||||
@@ -1571,7 +1569,7 @@ export class CustomNodesManager {
|
|||||||
self.grid.updateCell(item, "action");
|
self.grid.updateCell(item, "action");
|
||||||
self.grid.setRowSelected(item, false);
|
self.grid.setRowSelected(item, false);
|
||||||
}
|
}
|
||||||
else if(event.detail.status == 'batch-done' && event.detail.batch_id == self.batch_id) {
|
else if(event.detail.status == 'done') {
|
||||||
self.hideStop();
|
self.hideStop();
|
||||||
self.onQueueCompleted(event.detail);
|
self.onQueueCompleted(event.detail);
|
||||||
}
|
}
|
||||||
@@ -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) {
|
usedGroupNodes.add(node.type.slice(9));
|
||||||
let node = nodes[k];
|
continue;
|
||||||
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));
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
allUsedNodes[node.type] = node;
|
|
||||||
}
|
}
|
||||||
};
|
|
||||||
|
|
||||||
visitGraph(app.graph);
|
allUsedNodes[node.type] = node;
|
||||||
|
}
|
||||||
|
|
||||||
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;
|
||||||
@@ -1765,7 +1745,7 @@ export class CustomNodesManager {
|
|||||||
async getMissingNodesLegacy(hashMap, missing_nodes) {
|
async getMissingNodesLegacy(hashMap, missing_nodes) {
|
||||||
const mode = manager_instance.datasrc_combo.value;
|
const mode = manager_instance.datasrc_combo.value;
|
||||||
this.showStatus(`Loading missing nodes (${mode}) ...`);
|
this.showStatus(`Loading missing nodes (${mode}) ...`);
|
||||||
const res = await fetchData(`/v2/customnode/getmappings?mode=${mode}`);
|
const res = await fetchData(`/customnode/getmappings?mode=${mode}`);
|
||||||
if (res.error) {
|
if (res.error) {
|
||||||
this.showError(`Failed to get custom node mappings: ${res.error}`);
|
this.showError(`Failed to get custom node mappings: ${res.error}`);
|
||||||
return;
|
return;
|
||||||
@@ -1880,7 +1860,7 @@ export class CustomNodesManager {
|
|||||||
async getAlternatives() {
|
async getAlternatives() {
|
||||||
const mode = manager_instance.datasrc_combo.value;
|
const mode = manager_instance.datasrc_combo.value;
|
||||||
this.showStatus(`Loading alternatives (${mode}) ...`);
|
this.showStatus(`Loading alternatives (${mode}) ...`);
|
||||||
const res = await fetchData(`/v2/customnode/alternatives?mode=${mode}`);
|
const res = await fetchData(`/customnode/alternatives?mode=${mode}`);
|
||||||
if (res.error) {
|
if (res.error) {
|
||||||
this.showError(`Failed to get alternatives: ${res.error}`);
|
this.showError(`Failed to get alternatives: ${res.error}`);
|
||||||
return [];
|
return [];
|
||||||
@@ -1928,7 +1908,7 @@ export class CustomNodesManager {
|
|||||||
infoToast('Fetching updated information. This may take some time if many custom nodes are installed.');
|
infoToast('Fetching updated information. This may take some time if many custom nodes are installed.');
|
||||||
}
|
}
|
||||||
|
|
||||||
const res = await fetchData(`/v2/customnode/getlist?mode=${mode}${skip_update}`);
|
const res = await fetchData(`/customnode/getlist?mode=${mode}${skip_update}`);
|
||||||
if (res.error) {
|
if (res.error) {
|
||||||
this.showError("Failed to get custom node list.");
|
this.showError("Failed to get custom node list.");
|
||||||
this.hideLoading();
|
this.hideLoading();
|
||||||
@@ -3,7 +3,7 @@ import { $el } from "../../scripts/ui.js";
|
|||||||
import {
|
import {
|
||||||
manager_instance, rebootAPI,
|
manager_instance, rebootAPI,
|
||||||
fetchData, md5, icons, show_message, customAlert, infoToast, showTerminal,
|
fetchData, md5, icons, show_message, customAlert, infoToast, showTerminal,
|
||||||
storeColumnWidth, restoreColumnWidth, loadCss, generateUUID
|
storeColumnWidth, restoreColumnWidth, loadCss
|
||||||
} from "./common.js";
|
} from "./common.js";
|
||||||
import { api } from "../../scripts/api.js";
|
import { api } from "../../scripts/api.js";
|
||||||
|
|
||||||
@@ -175,7 +175,7 @@ export class ModelManager {
|
|||||||
|
|
||||||
".cmm-manager-stop": {
|
".cmm-manager-stop": {
|
||||||
click: () => {
|
click: () => {
|
||||||
api.fetchApi('/v2/manager/queue/reset');
|
api.fetchApi('/manager/queue/reset');
|
||||||
infoToast('Cancel', 'Remaining tasks will stop after completing the current task.');
|
infoToast('Cancel', 'Remaining tasks will stop after completing the current task.');
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
@@ -435,15 +435,23 @@ export class ModelManager {
|
|||||||
}
|
}
|
||||||
|
|
||||||
async installModels(list, btn) {
|
async installModels(list, btn) {
|
||||||
|
let stats = await api.fetchApi('/manager/queue/status');
|
||||||
|
|
||||||
|
stats = await stats.json();
|
||||||
|
if(stats.is_processing) {
|
||||||
|
customAlert(`[ComfyUI-Manager] There are already tasks in progress. Please try again after it is completed. (${stats.done_count}/${stats.total_count})`);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
btn.classList.add("cmm-btn-loading");
|
btn.classList.add("cmm-btn-loading");
|
||||||
this.showError("");
|
this.showError("");
|
||||||
|
|
||||||
let needRefresh = false;
|
let needRefresh = false;
|
||||||
let errorMsg = "";
|
let errorMsg = "";
|
||||||
|
|
||||||
let target_items = [];
|
await api.fetchApi('/manager/queue/reset');
|
||||||
|
|
||||||
let batch = {};
|
let target_items = [];
|
||||||
|
|
||||||
for (const item of list) {
|
for (const item of list) {
|
||||||
this.grid.scrollRowIntoView(item);
|
this.grid.scrollRowIntoView(item);
|
||||||
@@ -460,12 +468,21 @@ export class ModelManager {
|
|||||||
const data = item.originalData;
|
const data = item.originalData;
|
||||||
data.ui_id = item.hash;
|
data.ui_id = item.hash;
|
||||||
|
|
||||||
|
const res = await api.fetchApi(`/manager/queue/install_model`, {
|
||||||
|
method: 'POST',
|
||||||
|
body: JSON.stringify(data)
|
||||||
|
});
|
||||||
|
|
||||||
if(batch['install_model']) {
|
if (res.status != 200) {
|
||||||
batch['install_model'].push(data);
|
errorMsg = `'${item.name}': `;
|
||||||
}
|
|
||||||
else {
|
if(res.status == 403) {
|
||||||
batch['install_model'] = [data];
|
errorMsg += `This action is not allowed with this security level configuration.\n`;
|
||||||
|
} else {
|
||||||
|
errorMsg += await res.text() + '\n';
|
||||||
|
}
|
||||||
|
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -482,24 +499,7 @@ export class ModelManager {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
this.batch_id = generateUUID();
|
await api.fetchApi('/manager/queue/start');
|
||||||
batch['batch_id'] = this.batch_id;
|
|
||||||
|
|
||||||
const res = await api.fetchApi(`/v2/manager/queue/batch`, {
|
|
||||||
method: 'POST',
|
|
||||||
body: JSON.stringify(batch)
|
|
||||||
});
|
|
||||||
|
|
||||||
let failed = await res.json();
|
|
||||||
|
|
||||||
if(failed.length > 0) {
|
|
||||||
for(let k in failed) {
|
|
||||||
let hash = failed[k];
|
|
||||||
const item = self.grid.getRowItemBy("hash", hash);
|
|
||||||
errorMsg = `[FAIL] ${item.title}`;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
this.showStop();
|
this.showStop();
|
||||||
showTerminal();
|
showTerminal();
|
||||||
}
|
}
|
||||||
@@ -519,7 +519,7 @@ export class ModelManager {
|
|||||||
// self.grid.updateCell(item, "tg-column-select");
|
// self.grid.updateCell(item, "tg-column-select");
|
||||||
self.grid.updateRow(item);
|
self.grid.updateRow(item);
|
||||||
}
|
}
|
||||||
else if(event.detail.status == 'batch-done') {
|
else if(event.detail.status == 'done') {
|
||||||
self.hideStop();
|
self.hideStop();
|
||||||
self.onQueueCompleted(event.detail);
|
self.onQueueCompleted(event.detail);
|
||||||
}
|
}
|
||||||
@@ -645,7 +645,7 @@ export class ModelManager {
|
|||||||
|
|
||||||
const mode = manager_instance.datasrc_combo.value;
|
const mode = manager_instance.datasrc_combo.value;
|
||||||
|
|
||||||
const res = await fetchData(`/v2/externalmodel/getlist?mode=${mode}`);
|
const res = await fetchData(`/externalmodel/getlist?mode=${mode}`);
|
||||||
if (res.error) {
|
if (res.error) {
|
||||||
this.showError("Failed to get external model list.");
|
this.showError("Failed to get external model list.");
|
||||||
this.hideLoading();
|
this.hideLoading();
|
||||||
@@ -142,7 +142,7 @@ function node_info_copy(src, dest, connect_both, copy_shape) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
app.registerExtension({
|
app.registerExtension({
|
||||||
name: "Comfy.Legacy.Manager.NodeFixer",
|
name: "Comfy.Manager.NodeFixer",
|
||||||
beforeRegisterNodeDef(nodeType, nodeData, app) {
|
beforeRegisterNodeDef(nodeType, nodeData, app) {
|
||||||
addMenuHandler(nodeType, function (_, options) {
|
addMenuHandler(nodeType, function (_, options) {
|
||||||
options.push({
|
options.push({
|
||||||
@@ -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))
|
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
@@ -7,7 +7,7 @@ import { manager_instance, rebootAPI, show_message } from "./common.js";
|
|||||||
async function restore_snapshot(target) {
|
async function restore_snapshot(target) {
|
||||||
if(SnapshotManager.instance) {
|
if(SnapshotManager.instance) {
|
||||||
try {
|
try {
|
||||||
const response = await api.fetchApi(`/v2/snapshot/restore?target=${target}`, { cache: "no-store" });
|
const response = await api.fetchApi(`/snapshot/restore?target=${target}`, { cache: "no-store" });
|
||||||
|
|
||||||
if(response.status == 403) {
|
if(response.status == 403) {
|
||||||
show_message('This action is not allowed with this security level configuration.');
|
show_message('This action is not allowed with this security level configuration.');
|
||||||
@@ -35,7 +35,7 @@ async function restore_snapshot(target) {
|
|||||||
async function remove_snapshot(target) {
|
async function remove_snapshot(target) {
|
||||||
if(SnapshotManager.instance) {
|
if(SnapshotManager.instance) {
|
||||||
try {
|
try {
|
||||||
const response = await api.fetchApi(`/v2/snapshot/remove?target=${target}`, { cache: "no-store" });
|
const response = await api.fetchApi(`/snapshot/remove?target=${target}`, { cache: "no-store" });
|
||||||
|
|
||||||
if(response.status == 403) {
|
if(response.status == 403) {
|
||||||
show_message('This action is not allowed with this security level configuration.');
|
show_message('This action is not allowed with this security level configuration.');
|
||||||
@@ -61,7 +61,7 @@ async function remove_snapshot(target) {
|
|||||||
|
|
||||||
async function save_current_snapshot() {
|
async function save_current_snapshot() {
|
||||||
try {
|
try {
|
||||||
const response = await api.fetchApi('/v2/snapshot/save', { cache: "no-store" });
|
const response = await api.fetchApi('/snapshot/save', { cache: "no-store" });
|
||||||
app.ui.dialog.close();
|
app.ui.dialog.close();
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
@@ -76,7 +76,7 @@ async function save_current_snapshot() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
async function getSnapshotList() {
|
async function getSnapshotList() {
|
||||||
const response = await api.fetchApi(`/v2/snapshot/getlist`);
|
const response = await api.fetchApi(`/snapshot/getlist`);
|
||||||
const data = await response.json();
|
const data = await response.json();
|
||||||
return data;
|
return data;
|
||||||
}
|
}
|
||||||
@@ -38,7 +38,7 @@ class WorkflowMetadataExtension {
|
|||||||
* enabled is true if the node is enabled, false if it is disabled
|
* enabled is true if the node is enabled, false if it is disabled
|
||||||
*/
|
*/
|
||||||
async getInstalledNodes() {
|
async getInstalledNodes() {
|
||||||
const res = await api.fetchApi("/v2/customnode/installed");
|
const res = await api.fetchApi("/customnode/installed");
|
||||||
return await res.json();
|
return await res.json();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -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",
|
||||||
@@ -5246,50 +5033,6 @@
|
|||||||
"url": "https://huggingface.co/Lightricks/LTX-Video/resolve/main/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"
|
"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",
|
"name": "LTX-Video 13B Distilled LoRA v0.9.7",
|
||||||
"type": "lora",
|
"type": "lora",
|
||||||
@@ -5301,50 +5044,6 @@
|
|||||||
"url": "https://huggingface.co/Lightricks/LTX-Video/resolve/main/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"
|
"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",
|
"name": "Latent Bridge Matching for Image Relighting",
|
||||||
"type": "diffusion_model",
|
"type": "diffusion_model",
|
||||||
@@ -5355,317 +5054,6 @@
|
|||||||
"filename": "LBM_relighting.safetensors",
|
"filename": "LBM_relighting.safetensors",
|
||||||
"url": "https://huggingface.co/jasperai/LBM_relighting/resolve/main/model.safetensors",
|
"url": "https://huggingface.co/jasperai/LBM_relighting/resolve/main/model.safetensors",
|
||||||
"size": "5.02GB"
|
"size": "5.02GB"
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "Qwen-Image VAE",
|
|
||||||
"type": "VAE",
|
|
||||||
"base": "Qwen-Image",
|
|
||||||
"save_path": "vae/qwen-image",
|
|
||||||
"description": "VAE model for Qwen-Image",
|
|
||||||
"reference": "https://huggingface.co/Comfy-Org/Qwen-Image_ComfyUI",
|
|
||||||
"filename": "qwen_image_vae.safetensors",
|
|
||||||
"url": "https://huggingface.co/Comfy-Org/Qwen-Image_ComfyUI/resolve/main/split_files/vae/qwen_image_vae.safetensors",
|
|
||||||
"size": "335MB"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "Qwen 2.5 VL 7B Text Encoder (fp8_scaled)",
|
|
||||||
"type": "clip",
|
|
||||||
"base": "Qwen-2.5-VL",
|
|
||||||
"save_path": "text_encoders/qwen",
|
|
||||||
"description": "Qwen 2.5 VL 7B text encoder model (fp8_scaled)",
|
|
||||||
"reference": "https://huggingface.co/Comfy-Org/Qwen-Image_ComfyUI",
|
|
||||||
"filename": "qwen_2.5_vl_7b_fp8_scaled.safetensors",
|
|
||||||
"url": "https://huggingface.co/Comfy-Org/Qwen-Image_ComfyUI/resolve/main/split_files/text_encoders/qwen_2.5_vl_7b_fp8_scaled.safetensors",
|
|
||||||
"size": "3.75GB"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "Qwen 2.5 VL 7B Text Encoder",
|
|
||||||
"type": "clip",
|
|
||||||
"base": "Qwen-2.5-VL",
|
|
||||||
"save_path": "text_encoders/qwen",
|
|
||||||
"description": "Qwen 2.5 VL 7B text encoder model",
|
|
||||||
"reference": "https://huggingface.co/Comfy-Org/Qwen-Image_ComfyUI",
|
|
||||||
"filename": "qwen_2.5_vl_7b.safetensors",
|
|
||||||
"url": "https://huggingface.co/Comfy-Org/Qwen-Image_ComfyUI/resolve/main/split_files/text_encoders/qwen_2.5_vl_7b.safetensors",
|
|
||||||
"size": "7.51GB"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "Qwen-Image Diffusion Model (fp8_e4m3fn)",
|
|
||||||
"type": "diffusion_model",
|
|
||||||
"base": "Qwen-Image",
|
|
||||||
"save_path": "diffusion_models/qwen-image",
|
|
||||||
"description": "Qwen-Image diffusion model (fp8_e4m3fn)",
|
|
||||||
"reference": "https://huggingface.co/Comfy-Org/Qwen-Image_ComfyUI",
|
|
||||||
"filename": "qwen_image_fp8_e4m3fn.safetensors",
|
|
||||||
"url": "https://huggingface.co/Comfy-Org/Qwen-Image_ComfyUI/resolve/main/split_files/diffusion_models/qwen_image_fp8_e4m3fn.safetensors",
|
|
||||||
"size": "4.89GB"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "Qwen-Image Diffusion Model (bf16)",
|
|
||||||
"type": "diffusion_model",
|
|
||||||
"base": "Qwen-Image",
|
|
||||||
"save_path": "diffusion_models/qwen-image",
|
|
||||||
"description": "Qwen-Image diffusion model (bf16)",
|
|
||||||
"reference": "https://huggingface.co/Comfy-Org/Qwen-Image_ComfyUI",
|
|
||||||
"filename": "qwen_image_bf16.safetensors",
|
|
||||||
"url": "https://huggingface.co/Comfy-Org/Qwen-Image_ComfyUI/resolve/main/split_files/diffusion_models/qwen_image_bf16.safetensors",
|
|
||||||
"size": "9.78GB"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "Qwen-Image-Edit 2509 Diffusion Model (fp8_e4m3fn)",
|
|
||||||
"type": "diffusion_model",
|
|
||||||
"base": "Qwen-Image-Edit",
|
|
||||||
"save_path": "diffusion_models/qwen-image-edit",
|
|
||||||
"description": "Qwen-Image-Edit 2509 diffusion model (fp8_e4m3fn)",
|
|
||||||
"reference": "https://huggingface.co/Comfy-Org/Qwen-Image-Edit_ComfyUI",
|
|
||||||
"filename": "qwen_image_edit_2509_fp8_e4m3fn.safetensors",
|
|
||||||
"url": "https://huggingface.co/Comfy-Org/Qwen-Image-Edit_ComfyUI/resolve/main/split_files/diffusion_models/qwen_image_edit_2509_fp8_e4m3fn.safetensors",
|
|
||||||
"size": "4.89GB"
|
|
||||||
},
|
|
||||||
|
|
||||||
{
|
|
||||||
"name": "Qwen-Image-Edit 2509 Diffusion Model (bf16)",
|
|
||||||
"type": "diffusion_model",
|
|
||||||
"base": "Qwen-Image-Edit",
|
|
||||||
"save_path": "diffusion_models/qwen-image-edit",
|
|
||||||
"description": "Qwen-Image-Edit 2509 diffusion model (bf16)",
|
|
||||||
"reference": "https://huggingface.co/Comfy-Org/Qwen-Image-Edit_ComfyUI",
|
|
||||||
"filename": "qwen_image_edit_2509_bf16.safetensors",
|
|
||||||
"url": "https://huggingface.co/Comfy-Org/Qwen-Image-Edit_ComfyUI/resolve/main/split_files/diffusion_models/qwen_image_edit_2509_bf16.safetensors",
|
|
||||||
"size": "9.78GB"
|
|
||||||
},
|
|
||||||
|
|
||||||
{
|
|
||||||
"name": "Qwen-Image-Edit Diffusion Model (fp8_e4m3fn)",
|
|
||||||
"type": "diffusion_model",
|
|
||||||
"base": "Qwen-Image-Edit",
|
|
||||||
"save_path": "diffusion_models/qwen-image-edit",
|
|
||||||
"description": "Qwen-Image-Edit diffusion model (fp8_e4m3fn)",
|
|
||||||
"reference": "https://huggingface.co/Comfy-Org/Qwen-Image-Edit_ComfyUI",
|
|
||||||
"filename": "qwen_image_edit_fp8_e4m3fn.safetensors",
|
|
||||||
"url": "https://huggingface.co/Comfy-Org/Qwen-Image-Edit_ComfyUI/resolve/main/split_files/diffusion_models/qwen_image_edit_fp8_e4m3fn.safetensors",
|
|
||||||
"size": "4.89GB"
|
|
||||||
},
|
|
||||||
|
|
||||||
{
|
|
||||||
"name": "Qwen-Image-Edit Diffusion Model (bf16)",
|
|
||||||
"type": "diffusion_model",
|
|
||||||
"base": "Qwen-Image-Edit",
|
|
||||||
"save_path": "diffusion_models/qwen-image-edit",
|
|
||||||
"description": "Qwen-Image-Edit diffusion model (bf16)",
|
|
||||||
"reference": "https://huggingface.co/Comfy-Org/Qwen-Image-Edit_ComfyUI",
|
|
||||||
"filename": "qwen_image_edit_bf16.safetensors",
|
|
||||||
"url": "https://huggingface.co/Comfy-Org/Qwen-Image-Edit_ComfyUI/resolve/main/split_files/diffusion_models/qwen_image_edit_bf16.safetensors",
|
|
||||||
"size": "9.78GB"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "Qwen-Image-Lightning 8steps V1.0",
|
|
||||||
"type": "lora",
|
|
||||||
"base": "Qwen-Image",
|
|
||||||
"save_path": "loras/qwen-image-lightning",
|
|
||||||
"description": "Qwen-Image-Lightning 8-step LoRA model V1.0",
|
|
||||||
"reference": "https://huggingface.co/lightx2v/Qwen-Image-Lightning",
|
|
||||||
"filename": "Qwen-Image-Lightning-8steps-V1.0.safetensors",
|
|
||||||
"url": "https://huggingface.co/lightx2v/Qwen-Image-Lightning/resolve/main/Qwen-Image-Lightning-8steps-V1.0.safetensors",
|
|
||||||
"size": "9.78GB"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "Qwen-Image-Lightning 4steps V1.0",
|
|
||||||
"type": "lora",
|
|
||||||
"base": "Qwen-Image",
|
|
||||||
"save_path": "loras/qwen-image-lightning",
|
|
||||||
"description": "Qwen-Image-Lightning 4-step LoRA model V1.0",
|
|
||||||
"reference": "https://huggingface.co/lightx2v/Qwen-Image-Lightning",
|
|
||||||
"filename": "Qwen-Image-Lightning-4steps-V1.0.safetensors",
|
|
||||||
"url": "https://huggingface.co/lightx2v/Qwen-Image-Lightning/resolve/main/Qwen-Image-Lightning-4steps-V1.0.safetensors",
|
|
||||||
"size": "9.78GB"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "Qwen-Image-Lightning 4steps V1.0 (bf16)",
|
|
||||||
"type": "lora",
|
|
||||||
"base": "Qwen-Image",
|
|
||||||
"save_path": "loras/qwen-image-lightning",
|
|
||||||
"description": "Qwen-Image-Lightning 4-step LoRA model V1.0 (bf16)",
|
|
||||||
"reference": "https://huggingface.co/lightx2v/Qwen-Image-Lightning",
|
|
||||||
"filename": "Qwen-Image-Lightning-4steps-V1.0-bf16.safetensors",
|
|
||||||
"url": "https://huggingface.co/lightx2v/Qwen-Image-Lightning/resolve/main/Qwen-Image-Lightning-4steps-V1.0-bf16.safetensors",
|
|
||||||
"size": "19.6GB"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "Qwen-Image-Lightning 4steps V2.0",
|
|
||||||
"type": "lora",
|
|
||||||
"base": "Qwen-Image",
|
|
||||||
"save_path": "loras/qwen-image-lightning",
|
|
||||||
"description": "Qwen-Image-Lightning 4-step LoRA model V2.0",
|
|
||||||
"reference": "https://huggingface.co/lightx2v/Qwen-Image-Lightning",
|
|
||||||
"filename": "Qwen-Image-Lightning-4steps-V2.0.safetensors",
|
|
||||||
"url": "https://huggingface.co/lightx2v/Qwen-Image-Lightning/resolve/main/Qwen-Image-Lightning-4steps-V2.0.safetensors",
|
|
||||||
"size": "9.78GB"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "Qwen-Image-Lightning 4steps V2.0 (bf16)",
|
|
||||||
"type": "lora",
|
|
||||||
"base": "Qwen-Image",
|
|
||||||
"save_path": "loras/qwen-image-lightning",
|
|
||||||
"description": "Qwen-Image-Lightning 4-step LoRA model V2.0 (bf16)",
|
|
||||||
"reference": "https://huggingface.co/lightx2v/Qwen-Image-Lightning",
|
|
||||||
"filename": "Qwen-Image-Lightning-4steps-V2.0-bf16.safetensors",
|
|
||||||
"url": "https://huggingface.co/lightx2v/Qwen-Image-Lightning/resolve/main/Qwen-Image-Lightning-4steps-V2.0-bf16.safetensors",
|
|
||||||
"size": "19.6GB"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "Qwen-Image-Lightning 8steps V1.1",
|
|
||||||
"type": "lora",
|
|
||||||
"base": "Qwen-Image",
|
|
||||||
"save_path": "loras/qwen-image-lightning",
|
|
||||||
"description": "Qwen-Image-Lightning 8-step LoRA model V1.1",
|
|
||||||
"reference": "https://huggingface.co/lightx2v/Qwen-Image-Lightning",
|
|
||||||
"filename": "Qwen-Image-Lightning-8steps-V1.1.safetensors",
|
|
||||||
"url": "https://huggingface.co/lightx2v/Qwen-Image-Lightning/resolve/main/Qwen-Image-Lightning-8steps-V1.1.safetensors",
|
|
||||||
"size": "9.78GB"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "Qwen-Image-Lightning 8steps V1.1 (bf16)",
|
|
||||||
"type": "lora",
|
|
||||||
"base": "Qwen-Image",
|
|
||||||
"save_path": "loras/qwen-image-lightning",
|
|
||||||
"description": "Qwen-Image-Lightning 8-step LoRA model V1.1 (bf16)",
|
|
||||||
"reference": "https://huggingface.co/lightx2v/Qwen-Image-Lightning",
|
|
||||||
"filename": "Qwen-Image-Lightning-8steps-V1.1-bf16.safetensors",
|
|
||||||
"url": "https://huggingface.co/lightx2v/Qwen-Image-Lightning/resolve/main/Qwen-Image-Lightning-8steps-V1.1-bf16.safetensors",
|
|
||||||
"size": "19.6GB"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "Qwen-Image-Lightning 8steps V2.0",
|
|
||||||
"type": "lora",
|
|
||||||
"base": "Qwen-Image",
|
|
||||||
"save_path": "loras/qwen-image-lightning",
|
|
||||||
"description": "Qwen-Image-Lightning 8-step LoRA model V2.0",
|
|
||||||
"reference": "https://huggingface.co/lightx2v/Qwen-Image-Lightning",
|
|
||||||
"filename": "Qwen-Image-Lightning-8steps-V2.0.safetensors",
|
|
||||||
"url": "https://huggingface.co/lightx2v/Qwen-Image-Lightning/resolve/main/Qwen-Image-Lightning-8steps-V2.0.safetensors",
|
|
||||||
"size": "9.78GB"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "Qwen-Image-Lightning 8steps V2.0 (bf16)",
|
|
||||||
"type": "lora",
|
|
||||||
"base": "Qwen-Image",
|
|
||||||
"save_path": "loras/qwen-image-lightning",
|
|
||||||
"description": "Qwen-Image-Lightning 8-step LoRA model V2.0 (bf16)",
|
|
||||||
"reference": "https://huggingface.co/lightx2v/Qwen-Image-Lightning",
|
|
||||||
"filename": "Qwen-Image-Lightning-8steps-V2.0-bf16.safetensors",
|
|
||||||
"url": "https://huggingface.co/lightx2v/Qwen-Image-Lightning/resolve/main/Qwen-Image-Lightning-8steps-V2.0-bf16.safetensors",
|
|
||||||
"size": "19.6GB"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "Qwen-Image-Edit-Lightning 4steps V1.0",
|
|
||||||
"type": "lora",
|
|
||||||
"base": "Qwen-Image-Edit",
|
|
||||||
"save_path": "loras/qwen-image-edit-lightning",
|
|
||||||
"description": "Qwen-Image-Edit-Lightning 4-step LoRA model V1.0",
|
|
||||||
"reference": "https://huggingface.co/lightx2v/Qwen-Image-Lightning",
|
|
||||||
"filename": "Qwen-Image-Edit-Lightning-4steps-V1.0.safetensors",
|
|
||||||
"url": "https://huggingface.co/lightx2v/Qwen-Image-Lightning/resolve/main/Qwen-Image-Edit-Lightning-4steps-V1.0.safetensors",
|
|
||||||
"size": "9.78GB"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "Qwen-Image-Edit-Lightning 4steps V1.0 (bf16)",
|
|
||||||
"type": "lora",
|
|
||||||
"base": "Qwen-Image-Edit",
|
|
||||||
"save_path": "loras/qwen-image-edit-lightning",
|
|
||||||
"description": "Qwen-Image-Edit-Lightning 4-step LoRA model V1.0 (bf16)",
|
|
||||||
"reference": "https://huggingface.co/lightx2v/Qwen-Image-Lightning",
|
|
||||||
"filename": "Qwen-Image-Edit-Lightning-4steps-V1.0-bf16.safetensors",
|
|
||||||
"url": "https://huggingface.co/lightx2v/Qwen-Image-Lightning/resolve/main/Qwen-Image-Edit-Lightning-4steps-V1.0-bf16.safetensors",
|
|
||||||
"size": "19.6GB"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "Qwen-Image-Edit-Lightning 8steps V1.0",
|
|
||||||
"type": "lora",
|
|
||||||
"base": "Qwen-Image-Edit",
|
|
||||||
"save_path": "loras/qwen-image-edit-lightning",
|
|
||||||
"description": "Qwen-Image-Edit-Lightning 8-step LoRA model V1.0",
|
|
||||||
"reference": "https://huggingface.co/lightx2v/Qwen-Image-Lightning",
|
|
||||||
"filename": "Qwen-Image-Edit-Lightning-8steps-V1.0.safetensors",
|
|
||||||
"url": "https://huggingface.co/lightx2v/Qwen-Image-Lightning/resolve/main/Qwen-Image-Edit-Lightning-8steps-V1.0.safetensors",
|
|
||||||
"size": "9.78GB"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "Qwen-Image-Edit-Lightning 8steps V1.0 (bf16)",
|
|
||||||
"type": "lora",
|
|
||||||
"base": "Qwen-Image-Edit",
|
|
||||||
"save_path": "loras/qwen-image-edit-lightning",
|
|
||||||
"description": "Qwen-Image-Edit-Lightning 8-step LoRA model V1.0 (bf16)",
|
|
||||||
"reference": "https://huggingface.co/lightx2v/Qwen-Image-Lightning",
|
|
||||||
"filename": "Qwen-Image-Edit-Lightning-8steps-V1.0-bf16.safetensors",
|
|
||||||
"url": "https://huggingface.co/lightx2v/Qwen-Image-Lightning/resolve/main/Qwen-Image-Edit-Lightning-8steps-V1.0-bf16.safetensors",
|
|
||||||
"size": "19.6GB"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "Qwen-Image-Edit-2509-Lightning 4steps V1.0 (bf16)",
|
|
||||||
"type": "lora",
|
|
||||||
"base": "Qwen-Image-Edit",
|
|
||||||
"save_path": "loras/qwen-image-edit-lightning",
|
|
||||||
"description": "Qwen-Image-Edit-2509-Lightning 4-step LoRA model V1.0 (bf16)",
|
|
||||||
"reference": "https://huggingface.co/lightx2v/Qwen-Image-Lightning",
|
|
||||||
"filename": "Qwen-Image-Edit-2509-Lightning-4steps-V1.0-bf16.safetensors",
|
|
||||||
"url": "https://huggingface.co/lightx2v/Qwen-Image-Lightning/resolve/main/Qwen-Image-Edit-2509/Qwen-Image-Edit-2509-Lightning-4steps-V1.0-bf16.safetensors",
|
|
||||||
"size": "19.6GB"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "Qwen-Image-Edit-2509-Lightning 4steps V1.0 (fp32)",
|
|
||||||
"type": "lora",
|
|
||||||
"base": "Qwen-Image-Edit",
|
|
||||||
"save_path": "loras/qwen-image-edit-lightning",
|
|
||||||
"description": "Qwen-Image-Edit-2509-Lightning 4-step LoRA model V1.0 (fp32)",
|
|
||||||
"reference": "https://huggingface.co/lightx2v/Qwen-Image-Lightning",
|
|
||||||
"filename": "Qwen-Image-Edit-2509-Lightning-4steps-V1.0-fp32.safetensors",
|
|
||||||
"url": "https://huggingface.co/lightx2v/Qwen-Image-Lightning/resolve/main/Qwen-Image-Edit-2509/Qwen-Image-Edit-2509-Lightning-4steps-V1.0-fp32.safetensors",
|
|
||||||
"size": "39.1GB"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "Qwen-Image-Edit-2509-Lightning 8steps V1.0 (bf16)",
|
|
||||||
"type": "lora",
|
|
||||||
"base": "Qwen-Image-Edit",
|
|
||||||
"save_path": "loras/qwen-image-edit-lightning",
|
|
||||||
"description": "Qwen-Image-Edit-2509-Lightning 8-step LoRA model V1.0 (bf16)",
|
|
||||||
"reference": "https://huggingface.co/lightx2v/Qwen-Image-Lightning",
|
|
||||||
"filename": "Qwen-Image-Edit-2509-Lightning-8steps-V1.0-bf16.safetensors",
|
|
||||||
"url": "https://huggingface.co/lightx2v/Qwen-Image-Lightning/resolve/main/Qwen-Image-Edit-2509/Qwen-Image-Edit-2509-Lightning-8steps-V1.0-bf16.safetensors",
|
|
||||||
"size": "19.6GB"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "Qwen-Image-Edit-2509-Lightning 8steps V1.0 (fp32)",
|
|
||||||
"type": "lora",
|
|
||||||
"base": "Qwen-Image-Edit",
|
|
||||||
"save_path": "loras/qwen-image-edit-lightning",
|
|
||||||
"description": "Qwen-Image-Edit-2509-Lightning 8-step LoRA model V1.0 (fp32)",
|
|
||||||
"reference": "https://huggingface.co/lightx2v/Qwen-Image-Lightning",
|
|
||||||
"filename": "Qwen-Image-Edit-2509-Lightning-8steps-V1.0-fp32.safetensors",
|
|
||||||
"url": "https://huggingface.co/lightx2v/Qwen-Image-Lightning/resolve/main/Qwen-Image-Edit-2509/Qwen-Image-Edit-2509-Lightning-8steps-V1.0-fp32.safetensors",
|
|
||||||
"size": "39.1GB"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "Qwen-Image InstantX ControlNet Union",
|
|
||||||
"type": "controlnet",
|
|
||||||
"base": "Qwen-Image",
|
|
||||||
"save_path": "controlnet/qwen-image/instantx",
|
|
||||||
"description": "Qwen-Image InstantX ControlNet Union model",
|
|
||||||
"reference": "https://huggingface.co/Comfy-Org/Qwen-Image-InstantX-ControlNets",
|
|
||||||
"filename": "Qwen-Image-InstantX-ControlNet-Union.safetensors",
|
|
||||||
"url": "https://huggingface.co/Comfy-Org/Qwen-Image-InstantX-ControlNets/resolve/main/split_files/controlnet/Qwen-Image-InstantX-ControlNet-Union.safetensors",
|
|
||||||
"size": "2.54GB"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "Qwen-Image InstantX ControlNet Inpainting",
|
|
||||||
"type": "controlnet",
|
|
||||||
"base": "Qwen-Image",
|
|
||||||
"save_path": "controlnet/qwen-image/instantx",
|
|
||||||
"description": "Qwen-Image InstantX ControlNet Inpainting model",
|
|
||||||
"reference": "https://huggingface.co/Comfy-Org/Qwen-Image-InstantX-ControlNets",
|
|
||||||
"filename": "Qwen-Image-InstantX-ControlNet-Inpainting.safetensors",
|
|
||||||
"url": "https://huggingface.co/Comfy-Org/Qwen-Image-InstantX-ControlNets/resolve/main/split_files/controlnet/Qwen-Image-InstantX-ControlNet-Inpainting.safetensors",
|
|
||||||
"size": "2.54GB"
|
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
@@ -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,25 +1,5 @@
|
|||||||
{
|
{
|
||||||
"custom_nodes": [
|
"custom_nodes": [
|
||||||
{
|
|
||||||
"author": "synchronicity-labs",
|
|
||||||
"title": "ComfyUI Sync Lipsync Node",
|
|
||||||
"reference": "https://github.com/synchronicity-labs/sync-comfyui",
|
|
||||||
"files": [
|
|
||||||
"https://github.com/synchronicity-labs/sync-comfyui"
|
|
||||||
],
|
|
||||||
"install_type": "git-clone",
|
|
||||||
"description": "This custom node allows you to perform audio-video lip synchronization inside ComfyUI using a simple interface."
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"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]",
|
||||||
@@ -169,16 +149,6 @@
|
|||||||
],
|
],
|
||||||
"install_type": "git-clone",
|
"install_type": "git-clone",
|
||||||
"description": "A fork of KJNodes for ComfyUI.\nVarious quality of life -nodes for ComfyUI, mostly just visual stuff to improve usability"
|
"description": "A fork of KJNodes for ComfyUI.\nVarious quality of life -nodes for ComfyUI, mostly just visual stuff to improve usability"
|
||||||
},
|
|
||||||
{
|
|
||||||
"author": "huixingyun",
|
|
||||||
"title": "ComfyUI-SoundFlow",
|
|
||||||
"reference": "https://github.com/huixingyun/ComfyUI-SoundFlow",
|
|
||||||
"files": [
|
|
||||||
"https://github.com/huixingyun/ComfyUI-SoundFlow"
|
|
||||||
],
|
|
||||||
"install_type": "git-clone",
|
|
||||||
"description": "forked from https://github.com/fredconex/ComfyUI-SoundFlow (removed)"
|
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
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,219 +1,5 @@
|
|||||||
{
|
{
|
||||||
"models": [
|
"models": [
|
||||||
|
|
||||||
{
|
|
||||||
"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": "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",
|
"name": "Latent Bridge Matching for Image Relighting",
|
||||||
"type": "diffusion_model",
|
"type": "diffusion_model",
|
||||||
@@ -687,6 +473,224 @@
|
|||||||
"filename": "llava_llama3_fp16.safetensors",
|
"filename": "llava_llama3_fp16.safetensors",
|
||||||
"url": "https://huggingface.co/Comfy-Org/HunyuanVideo_repackaged/resolve/main/split_files/text_encoders/llava_llama3_fp16.safetensors",
|
"url": "https://huggingface.co/Comfy-Org/HunyuanVideo_repackaged/resolve/main/split_files/text_encoders/llava_llama3_fp16.safetensors",
|
||||||
"size": "16.1GB"
|
"size": "16.1GB"
|
||||||
|
},
|
||||||
|
|
||||||
|
{
|
||||||
|
"name": "PixArt-Sigma-XL-2-512-MS.safetensors (diffusion)",
|
||||||
|
"type": "diffusion_model",
|
||||||
|
"base": "pixart-sigma",
|
||||||
|
"save_path": "diffusion_models/PixArt-Sigma",
|
||||||
|
"description": "PixArt-Sigma Diffusion model",
|
||||||
|
"reference": "https://huggingface.co/PixArt-alpha/PixArt-Sigma-XL-2-512-MS",
|
||||||
|
"filename": "PixArt-Sigma-XL-2-512-MS.safetensors",
|
||||||
|
"url": "https://huggingface.co/PixArt-alpha/PixArt-Sigma-XL-2-512-MS/resolve/main/transformer/diffusion_pytorch_model.safetensors",
|
||||||
|
"size": "2.44GB"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "PixArt-Sigma-XL-2-1024-MS.safetensors (diffusion)",
|
||||||
|
"type": "diffusion_model",
|
||||||
|
"base": "pixart-sigma",
|
||||||
|
"save_path": "diffusion_models/PixArt-Sigma",
|
||||||
|
"description": "PixArt-Sigma Diffusion model",
|
||||||
|
"reference": "https://huggingface.co/PixArt-alpha/PixArt-Sigma-XL-2-1024-MS",
|
||||||
|
"filename": "PixArt-Sigma-XL-2-1024-MS.safetensors",
|
||||||
|
"url": "https://huggingface.co/PixArt-alpha/PixArt-Sigma-XL-2-1024-MS/resolve/main/transformer/diffusion_pytorch_model.safetensors",
|
||||||
|
"size": "2.44GB"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "PixArt-XL-2-1024-MS.safetensors (diffusion)",
|
||||||
|
"type": "diffusion_model",
|
||||||
|
"base": "pixart-alpha",
|
||||||
|
"save_path": "diffusion_models/PixArt-Alpha",
|
||||||
|
"description": "PixArt-Alpha Diffusion model",
|
||||||
|
"reference": "https://huggingface.co/PixArt-alpha/PixArt-XL-2-1024-MS",
|
||||||
|
"filename": "PixArt-XL-2-1024-MS.safetensors",
|
||||||
|
"url": "https://huggingface.co/PixArt-alpha/PixArt-XL-2-1024-MS/resolve/main/transformer/diffusion_pytorch_model.safetensors",
|
||||||
|
"size": "2.45GB"
|
||||||
|
},
|
||||||
|
|
||||||
|
{
|
||||||
|
"name": "Comfy-Org/hunyuan_video_t2v_720p_bf16.safetensors",
|
||||||
|
"type": "diffusion_model",
|
||||||
|
"base": "Hunyuan Video",
|
||||||
|
"save_path": "diffusion_models/hunyuan_video",
|
||||||
|
"description": "Huyuan Video diffusion model. repackaged version.",
|
||||||
|
"reference": "https://huggingface.co/Comfy-Org/HunyuanVideo_repackaged",
|
||||||
|
"filename": "hunyuan_video_t2v_720p_bf16.safetensors",
|
||||||
|
"url": "https://huggingface.co/Comfy-Org/HunyuanVideo_repackaged/resolve/main/split_files/diffusion_models/hunyuan_video_t2v_720p_bf16.safetensors",
|
||||||
|
"size": "25.6GB"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "Comfy-Org/hunyuan_video_vae_bf16.safetensors",
|
||||||
|
"type": "VAE",
|
||||||
|
"base": "Hunyuan Video",
|
||||||
|
"save_path": "VAE",
|
||||||
|
"description": "Huyuan Video VAE model. repackaged version.",
|
||||||
|
"reference": "https://huggingface.co/Comfy-Org/HunyuanVideo_repackaged",
|
||||||
|
"filename": "hunyuan_video_vae_bf16.safetensors",
|
||||||
|
"url": "https://huggingface.co/Comfy-Org/HunyuanVideo_repackaged/resolve/main/split_files/vae/hunyuan_video_vae_bf16.safetensors",
|
||||||
|
"size": "493MB"
|
||||||
|
},
|
||||||
|
|
||||||
|
{
|
||||||
|
"name": "LTX-Video 2B v0.9.1 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.1.safetensors",
|
||||||
|
"url": "https://huggingface.co/Lightricks/LTX-Video/resolve/main/ltx-video-2b-v0.9.1.safetensors",
|
||||||
|
"size": "5.72GB"
|
||||||
|
},
|
||||||
|
|
||||||
|
{
|
||||||
|
"name": "XLabs-AI/flux-canny-controlnet-v3.safetensors",
|
||||||
|
"type": "controlnet",
|
||||||
|
"base": "FLUX.1",
|
||||||
|
"save_path": "xlabs/controlnets",
|
||||||
|
"description": "ControlNet checkpoints for FLUX.1-dev model by Black Forest Labs.",
|
||||||
|
"reference": "https://huggingface.co/XLabs-AI/flux-controlnet-collections",
|
||||||
|
"filename": "flux-canny-controlnet-v3.safetensors",
|
||||||
|
"url": "https://huggingface.co/XLabs-AI/flux-controlnet-collections/resolve/main/flux-canny-controlnet-v3.safetensors",
|
||||||
|
"size": "1.49GB"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "XLabs-AI/flux-depth-controlnet-v3.safetensors",
|
||||||
|
"type": "controlnet",
|
||||||
|
"base": "FLUX.1",
|
||||||
|
"save_path": "xlabs/controlnets",
|
||||||
|
"description": "ControlNet checkpoints for FLUX.1-dev model by Black Forest Labs.",
|
||||||
|
"reference": "https://huggingface.co/XLabs-AI/flux-controlnet-collections",
|
||||||
|
"filename": "flux-depth-controlnet-v3.safetensors",
|
||||||
|
"url": "https://huggingface.co/XLabs-AI/flux-controlnet-collections/resolve/main/flux-depth-controlnet-v3.safetensors",
|
||||||
|
"size": "1.49GB"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "XLabs-AI/flux-hed-controlnet-v3.safetensors",
|
||||||
|
"type": "controlnet",
|
||||||
|
"base": "FLUX.1",
|
||||||
|
"save_path": "xlabs/controlnets",
|
||||||
|
"description": "ControlNet checkpoints for FLUX.1-dev model by Black Forest Labs.",
|
||||||
|
"reference": "https://huggingface.co/XLabs-AI/flux-controlnet-collections",
|
||||||
|
"filename": "flux-hed-controlnet-v3.safetensors",
|
||||||
|
"url": "https://huggingface.co/XLabs-AI/flux-controlnet-collections/resolve/main/flux-hed-controlnet-v3.safetensors",
|
||||||
|
"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"
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -10,16 +10,6 @@
|
|||||||
"install_type": "git-clone",
|
"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."
|
"description": "A minimal template for creating React/TypeScript frontend extensions for ComfyUI, with complete boilerplate setup including internationalization and unit testing."
|
||||||
},
|
},
|
||||||
{
|
|
||||||
"author": "comfyui-wiki",
|
|
||||||
"title": "ComfyUI-i18n-demo",
|
|
||||||
"reference": "https://github.com/comfyui-wiki/ComfyUI-i18n-demo",
|
|
||||||
"files": [
|
|
||||||
"https://github.com/comfyui-wiki/ComfyUI-i18n-demo"
|
|
||||||
],
|
|
||||||
"install_type": "git-clone",
|
|
||||||
"description": "ComfyUI custom node develop i18n support demo "
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
"author": "Suzie1",
|
"author": "Suzie1",
|
||||||
"title": "Guide To Making Custom Nodes in ComfyUI",
|
"title": "Guide To Making Custom Nodes in ComfyUI",
|
||||||
@@ -341,36 +331,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"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"author": "J1mB091",
|
|
||||||
"title": "ComfyUI-J1mB091 Custom Nodes",
|
|
||||||
"reference": "https://github.com/J1mB091/ComfyUI-J1mB091",
|
|
||||||
"files": [
|
|
||||||
"https://github.com/J1mB091/ComfyUI-J1mB091"
|
|
||||||
],
|
|
||||||
"install_type": "git-clone",
|
|
||||||
"description": "Vibe Coded ComfyUI Custom Nodes"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"author": "aiforhumans",
|
|
||||||
"title": "XDev Nodes - Complete Toolkit",
|
|
||||||
"reference": "https://github.com/aiforhumans/comfyui-xdev-nodes",
|
|
||||||
"files": [
|
|
||||||
"https://github.com/aiforhumans/comfyui-xdev-nodes"
|
|
||||||
],
|
|
||||||
"install_type": "git-clone",
|
|
||||||
"description": "Complete ComfyUI development toolkit with 8 professional nodes including VAE tools, universal type testing, and comprehensive debugging infrastructure."
|
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
373
notebooks/comfyui_colab_with_manager.ipynb
Normal file
373
notebooks/comfyui_colab_with_manager.ipynb
Normal file
@@ -0,0 +1,373 @@
|
|||||||
|
{
|
||||||
|
"cells": [
|
||||||
|
{
|
||||||
|
"cell_type": "markdown",
|
||||||
|
"metadata": {
|
||||||
|
"id": "aaaaaaaaaa"
|
||||||
|
},
|
||||||
|
"source": [
|
||||||
|
"Git clone the repo and install the requirements. (ignore the pip errors about protobuf)"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"cell_type": "code",
|
||||||
|
"execution_count": null,
|
||||||
|
"metadata": {
|
||||||
|
"id": "bbbbbbbbbb"
|
||||||
|
},
|
||||||
|
"outputs": [],
|
||||||
|
"source": [
|
||||||
|
"# #@title Environment Setup\n",
|
||||||
|
"\n",
|
||||||
|
"from pathlib import Path\n",
|
||||||
|
"\n",
|
||||||
|
"OPTIONS = {}\n",
|
||||||
|
"\n",
|
||||||
|
"USE_GOOGLE_DRIVE = True #@param {type:\"boolean\"}\n",
|
||||||
|
"UPDATE_COMFY_UI = True #@param {type:\"boolean\"}\n",
|
||||||
|
"USE_COMFYUI_MANAGER = True #@param {type:\"boolean\"}\n",
|
||||||
|
"INSTALL_CUSTOM_NODES_DEPENDENCIES = True #@param {type:\"boolean\"}\n",
|
||||||
|
"OPTIONS['USE_GOOGLE_DRIVE'] = USE_GOOGLE_DRIVE\n",
|
||||||
|
"OPTIONS['UPDATE_COMFY_UI'] = UPDATE_COMFY_UI\n",
|
||||||
|
"OPTIONS['USE_COMFYUI_MANAGER'] = USE_COMFYUI_MANAGER\n",
|
||||||
|
"OPTIONS['INSTALL_CUSTOM_NODES_DEPENDENCIES'] = INSTALL_CUSTOM_NODES_DEPENDENCIES\n",
|
||||||
|
"\n",
|
||||||
|
"current_dir = !pwd\n",
|
||||||
|
"WORKSPACE = f\"{current_dir[0]}/ComfyUI\"\n",
|
||||||
|
"\n",
|
||||||
|
"if OPTIONS['USE_GOOGLE_DRIVE']:\n",
|
||||||
|
" !echo \"Mounting Google Drive...\"\n",
|
||||||
|
" %cd /\n",
|
||||||
|
"\n",
|
||||||
|
" from google.colab import drive\n",
|
||||||
|
" drive.mount('/content/drive')\n",
|
||||||
|
"\n",
|
||||||
|
" WORKSPACE = \"/content/drive/MyDrive/ComfyUI\"\n",
|
||||||
|
" %cd /content/drive/MyDrive\n",
|
||||||
|
"\n",
|
||||||
|
"![ ! -d $WORKSPACE ] && echo -= Initial setup ComfyUI =- && git clone https://github.com/comfyanonymous/ComfyUI\n",
|
||||||
|
"%cd $WORKSPACE\n",
|
||||||
|
"\n",
|
||||||
|
"if OPTIONS['UPDATE_COMFY_UI']:\n",
|
||||||
|
" !echo -= Updating ComfyUI =-\n",
|
||||||
|
"\n",
|
||||||
|
" # Correction of the issue of permissions being deleted on Google Drive.\n",
|
||||||
|
" ![ -f \".ci/nightly/update_windows/update_comfyui_and_python_dependencies.bat\" ] && chmod 755 .ci/nightly/update_windows/update_comfyui_and_python_dependencies.bat\n",
|
||||||
|
" ![ -f \".ci/nightly/windows_base_files/run_nvidia_gpu.bat\" ] && chmod 755 .ci/nightly/windows_base_files/run_nvidia_gpu.bat\n",
|
||||||
|
" ![ -f \".ci/update_windows/update_comfyui_and_python_dependencies.bat\" ] && chmod 755 .ci/update_windows/update_comfyui_and_python_dependencies.bat\n",
|
||||||
|
" ![ -f \".ci/update_windows_cu118/update_comfyui_and_python_dependencies.bat\" ] && chmod 755 .ci/update_windows_cu118/update_comfyui_and_python_dependencies.bat\n",
|
||||||
|
" ![ -f \".ci/update_windows/update.py\" ] && chmod 755 .ci/update_windows/update.py\n",
|
||||||
|
" ![ -f \".ci/update_windows/update_comfyui.bat\" ] && chmod 755 .ci/update_windows/update_comfyui.bat\n",
|
||||||
|
" ![ -f \".ci/update_windows/README_VERY_IMPORTANT.txt\" ] && chmod 755 .ci/update_windows/README_VERY_IMPORTANT.txt\n",
|
||||||
|
" ![ -f \".ci/update_windows/run_cpu.bat\" ] && chmod 755 .ci/update_windows/run_cpu.bat\n",
|
||||||
|
" ![ -f \".ci/update_windows/run_nvidia_gpu.bat\" ] && chmod 755 .ci/update_windows/run_nvidia_gpu.bat\n",
|
||||||
|
"\n",
|
||||||
|
" !git pull\n",
|
||||||
|
"\n",
|
||||||
|
"!echo -= Install dependencies =-\n",
|
||||||
|
"!pip3 install accelerate\n",
|
||||||
|
"!pip3 install einops transformers>=4.28.1 safetensors>=0.4.2 aiohttp pyyaml Pillow scipy tqdm psutil tokenizers>=0.13.3\n",
|
||||||
|
"!pip3 install torch torchvision torchaudio --index-url https://download.pytorch.org/whl/cu121\n",
|
||||||
|
"!pip3 install torchsde\n",
|
||||||
|
"!pip3 install kornia>=0.7.1 spandrel soundfile sentencepiece\n",
|
||||||
|
"\n",
|
||||||
|
"if OPTIONS['USE_COMFYUI_MANAGER']:\n",
|
||||||
|
" %cd custom_nodes\n",
|
||||||
|
"\n",
|
||||||
|
" # Correction of the issue of permissions being deleted on Google Drive.\n",
|
||||||
|
" ![ -f \"ComfyUI-Manager/check.sh\" ] && chmod 755 ComfyUI-Manager/check.sh\n",
|
||||||
|
" ![ -f \"ComfyUI-Manager/scan.sh\" ] && chmod 755 ComfyUI-Manager/scan.sh\n",
|
||||||
|
" ![ -f \"ComfyUI-Manager/node_db/dev/scan.sh\" ] && chmod 755 ComfyUI-Manager/node_db/dev/scan.sh\n",
|
||||||
|
" ![ -f \"ComfyUI-Manager/node_db/tutorial/scan.sh\" ] && chmod 755 ComfyUI-Manager/node_db/tutorial/scan.sh\n",
|
||||||
|
" ![ -f \"ComfyUI-Manager/scripts/install-comfyui-venv-linux.sh\" ] && chmod 755 ComfyUI-Manager/scripts/install-comfyui-venv-linux.sh\n",
|
||||||
|
" ![ -f \"ComfyUI-Manager/scripts/install-comfyui-venv-win.bat\" ] && chmod 755 ComfyUI-Manager/scripts/install-comfyui-venv-win.bat\n",
|
||||||
|
"\n",
|
||||||
|
" ![ ! -d ComfyUI-Manager ] && echo -= Initial setup ComfyUI-Manager =- && git clone https://github.com/ltdrdata/ComfyUI-Manager\n",
|
||||||
|
" %cd ComfyUI-Manager\n",
|
||||||
|
" !git pull\n",
|
||||||
|
"\n",
|
||||||
|
"%cd $WORKSPACE\n",
|
||||||
|
"\n",
|
||||||
|
"if OPTIONS['INSTALL_CUSTOM_NODES_DEPENDENCIES']:\n",
|
||||||
|
" !echo -= Install custom nodes dependencies =-\n",
|
||||||
|
" !pip install GitPython\n",
|
||||||
|
" !python custom_nodes/ComfyUI-Manager/cm-cli.py restore-dependencies\n"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"cell_type": "markdown",
|
||||||
|
"metadata": {
|
||||||
|
"id": "cccccccccc"
|
||||||
|
},
|
||||||
|
"source": [
|
||||||
|
"Download some models/checkpoints/vae or custom comfyui nodes (uncomment the commands for the ones you want)"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"cell_type": "code",
|
||||||
|
"execution_count": null,
|
||||||
|
"metadata": {
|
||||||
|
"id": "dddddddddd"
|
||||||
|
},
|
||||||
|
"outputs": [],
|
||||||
|
"source": [
|
||||||
|
"# Checkpoints\n",
|
||||||
|
"\n",
|
||||||
|
"### SDXL\n",
|
||||||
|
"### I recommend these workflow examples: https://comfyanonymous.github.io/ComfyUI_examples/sdxl/\n",
|
||||||
|
"\n",
|
||||||
|
"#!wget -c https://huggingface.co/stabilityai/stable-diffusion-xl-base-1.0/resolve/main/sd_xl_base_1.0.safetensors -P ./models/checkpoints/\n",
|
||||||
|
"#!wget -c https://huggingface.co/stabilityai/stable-diffusion-xl-refiner-1.0/resolve/main/sd_xl_refiner_1.0.safetensors -P ./models/checkpoints/\n",
|
||||||
|
"\n",
|
||||||
|
"# SDXL ReVision\n",
|
||||||
|
"#!wget -c https://huggingface.co/comfyanonymous/clip_vision_g/resolve/main/clip_vision_g.safetensors -P ./models/clip_vision/\n",
|
||||||
|
"\n",
|
||||||
|
"# SD1.5\n",
|
||||||
|
"!wget -c https://huggingface.co/runwayml/stable-diffusion-v1-5/resolve/main/v1-5-pruned-emaonly.ckpt -P ./models/checkpoints/\n",
|
||||||
|
"\n",
|
||||||
|
"# SD2\n",
|
||||||
|
"#!wget -c https://huggingface.co/stabilityai/stable-diffusion-2-1-base/resolve/main/v2-1_512-ema-pruned.safetensors -P ./models/checkpoints/\n",
|
||||||
|
"#!wget -c https://huggingface.co/stabilityai/stable-diffusion-2-1/resolve/main/v2-1_768-ema-pruned.safetensors -P ./models/checkpoints/\n",
|
||||||
|
"\n",
|
||||||
|
"# Some SD1.5 anime style\n",
|
||||||
|
"#!wget -c https://huggingface.co/WarriorMama777/OrangeMixs/resolve/main/Models/AbyssOrangeMix2/AbyssOrangeMix2_hard.safetensors -P ./models/checkpoints/\n",
|
||||||
|
"#!wget -c https://huggingface.co/WarriorMama777/OrangeMixs/resolve/main/Models/AbyssOrangeMix3/AOM3A1_orangemixs.safetensors -P ./models/checkpoints/\n",
|
||||||
|
"#!wget -c https://huggingface.co/WarriorMama777/OrangeMixs/resolve/main/Models/AbyssOrangeMix3/AOM3A3_orangemixs.safetensors -P ./models/checkpoints/\n",
|
||||||
|
"#!wget -c https://huggingface.co/Linaqruf/anything-v3.0/resolve/main/anything-v3-fp16-pruned.safetensors -P ./models/checkpoints/\n",
|
||||||
|
"\n",
|
||||||
|
"# Waifu Diffusion 1.5 (anime style SD2.x 768-v)\n",
|
||||||
|
"#!wget -c https://huggingface.co/waifu-diffusion/wd-1-5-beta3/resolve/main/wd-illusion-fp16.safetensors -P ./models/checkpoints/\n",
|
||||||
|
"\n",
|
||||||
|
"\n",
|
||||||
|
"# unCLIP models\n",
|
||||||
|
"#!wget -c https://huggingface.co/comfyanonymous/illuminatiDiffusionV1_v11_unCLIP/resolve/main/illuminatiDiffusionV1_v11-unclip-h-fp16.safetensors -P ./models/checkpoints/\n",
|
||||||
|
"#!wget -c https://huggingface.co/comfyanonymous/wd-1.5-beta2_unCLIP/resolve/main/wd-1-5-beta2-aesthetic-unclip-h-fp16.safetensors -P ./models/checkpoints/\n",
|
||||||
|
"\n",
|
||||||
|
"\n",
|
||||||
|
"# VAE\n",
|
||||||
|
"!wget -c https://huggingface.co/stabilityai/sd-vae-ft-mse-original/resolve/main/vae-ft-mse-840000-ema-pruned.safetensors -P ./models/vae/\n",
|
||||||
|
"#!wget -c https://huggingface.co/WarriorMama777/OrangeMixs/resolve/main/VAEs/orangemix.vae.pt -P ./models/vae/\n",
|
||||||
|
"#!wget -c https://huggingface.co/hakurei/waifu-diffusion-v1-4/resolve/main/vae/kl-f8-anime2.ckpt -P ./models/vae/\n",
|
||||||
|
"\n",
|
||||||
|
"\n",
|
||||||
|
"# Loras\n",
|
||||||
|
"#!wget -c https://civitai.com/api/download/models/10350 -O ./models/loras/theovercomer8sContrastFix_sd21768.safetensors #theovercomer8sContrastFix SD2.x 768-v\n",
|
||||||
|
"#!wget -c https://civitai.com/api/download/models/10638 -O ./models/loras/theovercomer8sContrastFix_sd15.safetensors #theovercomer8sContrastFix SD1.x\n",
|
||||||
|
"#!wget -c https://huggingface.co/stabilityai/stable-diffusion-xl-base-1.0/resolve/main/sd_xl_offset_example-lora_1.0.safetensors -P ./models/loras/ #SDXL offset noise lora\n",
|
||||||
|
"\n",
|
||||||
|
"\n",
|
||||||
|
"# T2I-Adapter\n",
|
||||||
|
"#!wget -c https://huggingface.co/TencentARC/T2I-Adapter/resolve/main/models/t2iadapter_depth_sd14v1.pth -P ./models/controlnet/\n",
|
||||||
|
"#!wget -c https://huggingface.co/TencentARC/T2I-Adapter/resolve/main/models/t2iadapter_seg_sd14v1.pth -P ./models/controlnet/\n",
|
||||||
|
"#!wget -c https://huggingface.co/TencentARC/T2I-Adapter/resolve/main/models/t2iadapter_sketch_sd14v1.pth -P ./models/controlnet/\n",
|
||||||
|
"#!wget -c https://huggingface.co/TencentARC/T2I-Adapter/resolve/main/models/t2iadapter_keypose_sd14v1.pth -P ./models/controlnet/\n",
|
||||||
|
"#!wget -c https://huggingface.co/TencentARC/T2I-Adapter/resolve/main/models/t2iadapter_openpose_sd14v1.pth -P ./models/controlnet/\n",
|
||||||
|
"#!wget -c https://huggingface.co/TencentARC/T2I-Adapter/resolve/main/models/t2iadapter_color_sd14v1.pth -P ./models/controlnet/\n",
|
||||||
|
"#!wget -c https://huggingface.co/TencentARC/T2I-Adapter/resolve/main/models/t2iadapter_canny_sd14v1.pth -P ./models/controlnet/\n",
|
||||||
|
"\n",
|
||||||
|
"# T2I Styles Model\n",
|
||||||
|
"#!wget -c https://huggingface.co/TencentARC/T2I-Adapter/resolve/main/models/t2iadapter_style_sd14v1.pth -P ./models/style_models/\n",
|
||||||
|
"\n",
|
||||||
|
"# CLIPVision model (needed for styles model)\n",
|
||||||
|
"#!wget -c https://huggingface.co/openai/clip-vit-large-patch14/resolve/main/pytorch_model.bin -O ./models/clip_vision/clip_vit14.bin\n",
|
||||||
|
"\n",
|
||||||
|
"\n",
|
||||||
|
"# ControlNet\n",
|
||||||
|
"#!wget -c https://huggingface.co/comfyanonymous/ControlNet-v1-1_fp16_safetensors/resolve/main/control_v11e_sd15_ip2p_fp16.safetensors -P ./models/controlnet/\n",
|
||||||
|
"#!wget -c https://huggingface.co/comfyanonymous/ControlNet-v1-1_fp16_safetensors/resolve/main/control_v11e_sd15_shuffle_fp16.safetensors -P ./models/controlnet/\n",
|
||||||
|
"#!wget -c https://huggingface.co/comfyanonymous/ControlNet-v1-1_fp16_safetensors/resolve/main/control_v11p_sd15_canny_fp16.safetensors -P ./models/controlnet/\n",
|
||||||
|
"#!wget -c https://huggingface.co/comfyanonymous/ControlNet-v1-1_fp16_safetensors/resolve/main/control_v11f1p_sd15_depth_fp16.safetensors -P ./models/controlnet/\n",
|
||||||
|
"#!wget -c https://huggingface.co/comfyanonymous/ControlNet-v1-1_fp16_safetensors/resolve/main/control_v11p_sd15_inpaint_fp16.safetensors -P ./models/controlnet/\n",
|
||||||
|
"#!wget -c https://huggingface.co/comfyanonymous/ControlNet-v1-1_fp16_safetensors/resolve/main/control_v11p_sd15_lineart_fp16.safetensors -P ./models/controlnet/\n",
|
||||||
|
"#!wget -c https://huggingface.co/comfyanonymous/ControlNet-v1-1_fp16_safetensors/resolve/main/control_v11p_sd15_mlsd_fp16.safetensors -P ./models/controlnet/\n",
|
||||||
|
"#!wget -c https://huggingface.co/comfyanonymous/ControlNet-v1-1_fp16_safetensors/resolve/main/control_v11p_sd15_normalbae_fp16.safetensors -P ./models/controlnet/\n",
|
||||||
|
"#!wget -c https://huggingface.co/comfyanonymous/ControlNet-v1-1_fp16_safetensors/resolve/main/control_v11p_sd15_openpose_fp16.safetensors -P ./models/controlnet/\n",
|
||||||
|
"#!wget -c https://huggingface.co/comfyanonymous/ControlNet-v1-1_fp16_safetensors/resolve/main/control_v11p_sd15_scribble_fp16.safetensors -P ./models/controlnet/\n",
|
||||||
|
"#!wget -c https://huggingface.co/comfyanonymous/ControlNet-v1-1_fp16_safetensors/resolve/main/control_v11p_sd15_seg_fp16.safetensors -P ./models/controlnet/\n",
|
||||||
|
"#!wget -c https://huggingface.co/comfyanonymous/ControlNet-v1-1_fp16_safetensors/resolve/main/control_v11p_sd15_softedge_fp16.safetensors -P ./models/controlnet/\n",
|
||||||
|
"#!wget -c https://huggingface.co/comfyanonymous/ControlNet-v1-1_fp16_safetensors/resolve/main/control_v11p_sd15s2_lineart_anime_fp16.safetensors -P ./models/controlnet/\n",
|
||||||
|
"#!wget -c https://huggingface.co/comfyanonymous/ControlNet-v1-1_fp16_safetensors/resolve/main/control_v11u_sd15_tile_fp16.safetensors -P ./models/controlnet/\n",
|
||||||
|
"\n",
|
||||||
|
"# ControlNet SDXL\n",
|
||||||
|
"#!wget -c https://huggingface.co/stabilityai/control-lora/resolve/main/control-LoRAs-rank256/control-lora-canny-rank256.safetensors -P ./models/controlnet/\n",
|
||||||
|
"#!wget -c https://huggingface.co/stabilityai/control-lora/resolve/main/control-LoRAs-rank256/control-lora-depth-rank256.safetensors -P ./models/controlnet/\n",
|
||||||
|
"#!wget -c https://huggingface.co/stabilityai/control-lora/resolve/main/control-LoRAs-rank256/control-lora-recolor-rank256.safetensors -P ./models/controlnet/\n",
|
||||||
|
"#!wget -c https://huggingface.co/stabilityai/control-lora/resolve/main/control-LoRAs-rank256/control-lora-sketch-rank256.safetensors -P ./models/controlnet/\n",
|
||||||
|
"\n",
|
||||||
|
"# Controlnet Preprocessor nodes by Fannovel16\n",
|
||||||
|
"#!cd custom_nodes && git clone https://github.com/Fannovel16/comfy_controlnet_preprocessors; cd comfy_controlnet_preprocessors && python install.py\n",
|
||||||
|
"\n",
|
||||||
|
"\n",
|
||||||
|
"# GLIGEN\n",
|
||||||
|
"#!wget -c https://huggingface.co/comfyanonymous/GLIGEN_pruned_safetensors/resolve/main/gligen_sd14_textbox_pruned_fp16.safetensors -P ./models/gligen/\n",
|
||||||
|
"\n",
|
||||||
|
"\n",
|
||||||
|
"# ESRGAN upscale model\n",
|
||||||
|
"#!wget -c https://github.com/xinntao/Real-ESRGAN/releases/download/v0.1.0/RealESRGAN_x4plus.pth -P ./models/upscale_models/\n",
|
||||||
|
"#!wget -c https://huggingface.co/sberbank-ai/Real-ESRGAN/resolve/main/RealESRGAN_x2.pth -P ./models/upscale_models/\n",
|
||||||
|
"#!wget -c https://huggingface.co/sberbank-ai/Real-ESRGAN/resolve/main/RealESRGAN_x4.pth -P ./models/upscale_models/\n",
|
||||||
|
"\n",
|
||||||
|
"\n"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"cell_type": "markdown",
|
||||||
|
"metadata": {
|
||||||
|
"id": "kkkkkkkkkkkkkkk"
|
||||||
|
},
|
||||||
|
"source": [
|
||||||
|
"### Run ComfyUI with cloudflared (Recommended Way)\n",
|
||||||
|
"\n",
|
||||||
|
"\n"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"cell_type": "code",
|
||||||
|
"execution_count": null,
|
||||||
|
"metadata": {
|
||||||
|
"id": "jjjjjjjjjjjjjj"
|
||||||
|
},
|
||||||
|
"outputs": [],
|
||||||
|
"source": [
|
||||||
|
"!wget -P ~ https://github.com/cloudflare/cloudflared/releases/latest/download/cloudflared-linux-amd64.deb\n",
|
||||||
|
"!dpkg -i ~/cloudflared-linux-amd64.deb\n",
|
||||||
|
"\n",
|
||||||
|
"import subprocess\n",
|
||||||
|
"import threading\n",
|
||||||
|
"import time\n",
|
||||||
|
"import socket\n",
|
||||||
|
"import urllib.request\n",
|
||||||
|
"\n",
|
||||||
|
"def iframe_thread(port):\n",
|
||||||
|
" while True:\n",
|
||||||
|
" time.sleep(0.5)\n",
|
||||||
|
" sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)\n",
|
||||||
|
" result = sock.connect_ex(('127.0.0.1', port))\n",
|
||||||
|
" if result == 0:\n",
|
||||||
|
" break\n",
|
||||||
|
" sock.close()\n",
|
||||||
|
" print(\"\\nComfyUI finished loading, trying to launch cloudflared (if it gets stuck here cloudflared is having issues)\\n\")\n",
|
||||||
|
"\n",
|
||||||
|
" p = subprocess.Popen([\"cloudflared\", \"tunnel\", \"--url\", \"http://127.0.0.1:{}\".format(port)], stdout=subprocess.PIPE, stderr=subprocess.PIPE)\n",
|
||||||
|
" for line in p.stderr:\n",
|
||||||
|
" l = line.decode()\n",
|
||||||
|
" if \"trycloudflare.com \" in l:\n",
|
||||||
|
" print(\"This is the URL to access ComfyUI:\", l[l.find(\"http\"):], end='')\n",
|
||||||
|
" #print(l, end='')\n",
|
||||||
|
"\n",
|
||||||
|
"\n",
|
||||||
|
"threading.Thread(target=iframe_thread, daemon=True, args=(8188,)).start()\n",
|
||||||
|
"\n",
|
||||||
|
"!python main.py --dont-print-server"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"cell_type": "markdown",
|
||||||
|
"metadata": {
|
||||||
|
"id": "kkkkkkkkkkkkkk"
|
||||||
|
},
|
||||||
|
"source": [
|
||||||
|
"### Run ComfyUI with localtunnel\n",
|
||||||
|
"\n",
|
||||||
|
"\n"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"cell_type": "code",
|
||||||
|
"execution_count": null,
|
||||||
|
"metadata": {
|
||||||
|
"id": "jjjjjjjjjjjjj"
|
||||||
|
},
|
||||||
|
"outputs": [],
|
||||||
|
"source": [
|
||||||
|
"!npm install -g localtunnel\n",
|
||||||
|
"\n",
|
||||||
|
"import subprocess\n",
|
||||||
|
"import threading\n",
|
||||||
|
"import time\n",
|
||||||
|
"import socket\n",
|
||||||
|
"import urllib.request\n",
|
||||||
|
"\n",
|
||||||
|
"def iframe_thread(port):\n",
|
||||||
|
" while True:\n",
|
||||||
|
" time.sleep(0.5)\n",
|
||||||
|
" sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)\n",
|
||||||
|
" result = sock.connect_ex(('127.0.0.1', port))\n",
|
||||||
|
" if result == 0:\n",
|
||||||
|
" break\n",
|
||||||
|
" sock.close()\n",
|
||||||
|
" print(\"\\nComfyUI finished loading, trying to launch localtunnel (if it gets stuck here localtunnel is having issues)\\n\")\n",
|
||||||
|
"\n",
|
||||||
|
" print(\"The password/enpoint ip for localtunnel is:\", urllib.request.urlopen('https://ipv4.icanhazip.com').read().decode('utf8').strip(\"\\n\"))\n",
|
||||||
|
" p = subprocess.Popen([\"lt\", \"--port\", \"{}\".format(port)], stdout=subprocess.PIPE)\n",
|
||||||
|
" for line in p.stdout:\n",
|
||||||
|
" print(line.decode(), end='')\n",
|
||||||
|
"\n",
|
||||||
|
"\n",
|
||||||
|
"threading.Thread(target=iframe_thread, daemon=True, args=(8188,)).start()\n",
|
||||||
|
"\n",
|
||||||
|
"!python main.py --dont-print-server"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"cell_type": "markdown",
|
||||||
|
"metadata": {
|
||||||
|
"id": "gggggggggg"
|
||||||
|
},
|
||||||
|
"source": [
|
||||||
|
"### Run ComfyUI with colab iframe (use only in case the previous way with localtunnel doesn't work)\n",
|
||||||
|
"\n",
|
||||||
|
"You should see the ui appear in an iframe. If you get a 403 error, it's your firefox settings or an extension that's messing things up.\n",
|
||||||
|
"\n",
|
||||||
|
"If you want to open it in another window use the link.\n",
|
||||||
|
"\n",
|
||||||
|
"Note that some UI features like live image previews won't work because the colab iframe blocks websockets."
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"cell_type": "code",
|
||||||
|
"execution_count": null,
|
||||||
|
"metadata": {
|
||||||
|
"id": "hhhhhhhhhh"
|
||||||
|
},
|
||||||
|
"outputs": [],
|
||||||
|
"source": [
|
||||||
|
"import threading\n",
|
||||||
|
"import time\n",
|
||||||
|
"import socket\n",
|
||||||
|
"def iframe_thread(port):\n",
|
||||||
|
" while True:\n",
|
||||||
|
" time.sleep(0.5)\n",
|
||||||
|
" sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)\n",
|
||||||
|
" result = sock.connect_ex(('127.0.0.1', port))\n",
|
||||||
|
" if result == 0:\n",
|
||||||
|
" break\n",
|
||||||
|
" sock.close()\n",
|
||||||
|
" from google.colab import output\n",
|
||||||
|
" output.serve_kernel_port_as_iframe(port, height=1024)\n",
|
||||||
|
" print(\"to open it in a window you can open this link here:\")\n",
|
||||||
|
" output.serve_kernel_port_as_window(port)\n",
|
||||||
|
"\n",
|
||||||
|
"threading.Thread(target=iframe_thread, daemon=True, args=(8188,)).start()\n",
|
||||||
|
"\n",
|
||||||
|
"!python main.py --dont-print-server"
|
||||||
|
]
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"metadata": {
|
||||||
|
"accelerator": "GPU",
|
||||||
|
"colab": {
|
||||||
|
"provenance": []
|
||||||
|
},
|
||||||
|
"gpuClass": "standard",
|
||||||
|
"kernelspec": {
|
||||||
|
"display_name": "Python 3",
|
||||||
|
"name": "python3"
|
||||||
|
},
|
||||||
|
"language_info": {
|
||||||
|
"name": "python"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"nbformat": 4,
|
||||||
|
"nbformat_minor": 0
|
||||||
|
}
|
||||||
1414
openapi.yaml
1414
openapi.yaml
File diff suppressed because it is too large
Load Diff
@@ -12,10 +12,13 @@ import ast
|
|||||||
import logging
|
import logging
|
||||||
import traceback
|
import traceback
|
||||||
|
|
||||||
from .common import security_check
|
glob_path = os.path.join(os.path.dirname(__file__), "glob")
|
||||||
from .common import manager_util
|
sys.path.append(glob_path)
|
||||||
from .common import cm_global
|
|
||||||
from .common import manager_downloader
|
import security_check
|
||||||
|
import manager_util
|
||||||
|
import cm_global
|
||||||
|
import manager_downloader
|
||||||
import folder_paths
|
import folder_paths
|
||||||
|
|
||||||
manager_util.add_python_path_to_env()
|
manager_util.add_python_path_to_env()
|
||||||
@@ -35,6 +38,7 @@ 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', 'torchaudio', 'torchsde', 'torchvision'}
|
||||||
cm_global.pip_downgrade_blacklist = ['torch', 'torchaudio', 'torchsde', 'torchvision', 'transformers', 'safetensors', 'kornia']
|
cm_global.pip_downgrade_blacklist = ['torch', 'torchaudio', 'torchsde', 'torchvision', 'transformers', 'safetensors', 'kornia']
|
||||||
@@ -63,14 +67,16 @@ def is_import_failed_extension(name):
|
|||||||
comfy_path = os.environ.get('COMFYUI_PATH')
|
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:
|
||||||
|
# legacy env var
|
||||||
|
comfy_path = os.environ.get('COMFYUI_PATH')
|
||||||
|
|
||||||
if comfy_path is None:
|
if comfy_path is None:
|
||||||
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
|
|
||||||
|
|
||||||
if comfy_base_path is None:
|
if comfy_base_path is None:
|
||||||
comfy_base_path = comfy_path
|
comfy_base_path = comfy_path
|
||||||
|
|
||||||
|
|
||||||
sys.__comfyui_manager_register_message_collapse = register_message_collapse
|
sys.__comfyui_manager_register_message_collapse = register_message_collapse
|
||||||
sys.__comfyui_manager_is_import_failed_extension = is_import_failed_extension
|
sys.__comfyui_manager_is_import_failed_extension = is_import_failed_extension
|
||||||
cm_global.register_api('cm.register_message_collapse', register_message_collapse)
|
cm_global.register_api('cm.register_message_collapse', register_message_collapse)
|
||||||
@@ -80,12 +86,15 @@ cm_global.register_api('cm.is_import_failed_extension', is_import_failed_extensi
|
|||||||
comfyui_manager_path = os.path.abspath(os.path.dirname(__file__))
|
comfyui_manager_path = os.path.abspath(os.path.dirname(__file__))
|
||||||
|
|
||||||
custom_nodes_base_path = folder_paths.get_folder_paths('custom_nodes')[0]
|
custom_nodes_base_path = folder_paths.get_folder_paths('custom_nodes')[0]
|
||||||
manager_files_path = folder_paths.get_system_user_directory("manager")
|
manager_files_path = os.path.abspath(os.path.join(folder_paths.get_user_directory(), 'default', 'ComfyUI-Manager'))
|
||||||
manager_pip_overrides_path = os.path.join(manager_files_path, "pip_overrides.json")
|
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_pip_blacklist_path = os.path.join(manager_files_path, "pip_blacklist.list")
|
||||||
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,15 +119,20 @@ 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 = {}
|
if sys.version_info < (3, 13):
|
||||||
|
cm_global.pip_overrides = {'numpy': 'numpy<2'}
|
||||||
|
else:
|
||||||
|
cm_global.pip_overrides = {}
|
||||||
|
|
||||||
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)
|
||||||
|
|
||||||
|
if sys.version_info < (3, 13):
|
||||||
|
cm_global.pip_overrides['numpy'] = 'numpy<2'
|
||||||
|
|
||||||
|
|
||||||
if os.path.exists(manager_pip_blacklist_path):
|
if os.path.exists(manager_pip_blacklist_path):
|
||||||
with open(manager_pip_blacklist_path, 'r', encoding="UTF-8", errors="ignore") as f:
|
with open(manager_pip_blacklist_path, 'r', encoding="UTF-8", errors="ignore") as f:
|
||||||
@@ -330,12 +344,7 @@ try:
|
|||||||
log_file.write(message)
|
log_file.write(message)
|
||||||
else:
|
else:
|
||||||
log_file.write(f"[{timestamp}] {message}")
|
log_file.write(f"[{timestamp}] {message}")
|
||||||
|
log_file.flush()
|
||||||
try:
|
|
||||||
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 +357,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:
|
||||||
@@ -392,11 +398,7 @@ try:
|
|||||||
def emit(self, record):
|
def emit(self, record):
|
||||||
global is_start_mode
|
global is_start_mode
|
||||||
|
|
||||||
try:
|
message = record.getMessage()
|
||||||
message = record.getMessage()
|
|
||||||
except Exception as e:
|
|
||||||
message = f"<<logging error>>: {record} - {e}"
|
|
||||||
original_stderr.write(message)
|
|
||||||
|
|
||||||
if is_start_mode:
|
if is_start_mode:
|
||||||
match = re.search(pat_import_fail, message)
|
match = re.search(pat_import_fail, message)
|
||||||
@@ -439,6 +441,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 +493,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
|
||||||
|
|
||||||
|
|
||||||
@@ -483,7 +514,7 @@ check_bypass_ssl()
|
|||||||
|
|
||||||
# Perform install
|
# Perform install
|
||||||
processed_install = set()
|
processed_install = set()
|
||||||
script_list_path = os.path.join(manager_files_path, "startup-scripts", "install-scripts.txt")
|
script_list_path = os.path.join(folder_paths.user_directory, "default", "ComfyUI-Manager", "startup-scripts", "install-scripts.txt")
|
||||||
pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages(), comfy_path, manager_files_path)
|
pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages(), comfy_path, manager_files_path)
|
||||||
|
|
||||||
|
|
||||||
@@ -568,10 +599,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:
|
||||||
@@ -1,65 +1,15 @@
|
|||||||
[build-system]
|
|
||||||
requires = ["setuptools >= 61.0"]
|
|
||||||
build-backend = "setuptools.build_meta"
|
|
||||||
|
|
||||||
[project]
|
[project]
|
||||||
name = "comfyui-manager"
|
name = "comfyui-manager"
|
||||||
license = { text = "GPL-3.0-only" }
|
|
||||||
version = "4.0.3b4"
|
|
||||||
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"
|
version = "3.32.3"
|
||||||
keywords = ["comfyui", "comfyui-manager"]
|
license = { file = "LICENSE.txt" }
|
||||||
|
dependencies = ["GitPython", "PyGithub", "matrix-client==0.4.0", "transformers", "huggingface-hub>0.20", "typer", "rich", "typing-extensions", "toml", "uv", "chardet"]
|
||||||
maintainers = [
|
|
||||||
{ name = "Dr.Lt.Data", email = "dr.lt.data@gmail.com" },
|
|
||||||
{ name = "Yoland Yan", email = "yoland@comfy.org" },
|
|
||||||
{ name = "James Kwon", email = "hongilkwon316@gmail.com" },
|
|
||||||
{ name = "Robin Huang", email = "robin@comfy.org" },
|
|
||||||
]
|
|
||||||
|
|
||||||
classifiers = [
|
|
||||||
"Development Status :: 5 - Production/Stable",
|
|
||||||
"Intended Audience :: Developers",
|
|
||||||
"License :: OSI Approved :: GNU General Public License v3 (GPLv3)",
|
|
||||||
]
|
|
||||||
|
|
||||||
dependencies = [
|
|
||||||
"GitPython",
|
|
||||||
"PyGithub",
|
|
||||||
# "matrix-nio",
|
|
||||||
"transformers",
|
|
||||||
"huggingface-hub>0.20",
|
|
||||||
"typer",
|
|
||||||
"rich",
|
|
||||||
"typing-extensions",
|
|
||||||
"toml",
|
|
||||||
"uv",
|
|
||||||
"chardet"
|
|
||||||
]
|
|
||||||
|
|
||||||
[project.optional-dependencies]
|
|
||||||
dev = ["pre-commit", "pytest", "ruff", "pytest-cov"]
|
|
||||||
|
|
||||||
[project.urls]
|
[project.urls]
|
||||||
Repository = "https://github.com/ltdrdata/ComfyUI-Manager"
|
Repository = "https://github.com/ltdrdata/ComfyUI-Manager"
|
||||||
|
# Used by Comfy Registry https://comfyregistry.org
|
||||||
|
|
||||||
[tool.setuptools.packages.find]
|
[tool.comfy]
|
||||||
where = ["."]
|
PublisherId = "drltdata"
|
||||||
include = ["comfyui_manager*"]
|
DisplayName = "ComfyUI-Manager"
|
||||||
|
Icon = ""
|
||||||
[project.scripts]
|
|
||||||
cm-cli = "comfyui_manager.cm_cli.__main__:main"
|
|
||||||
|
|
||||||
[tool.ruff]
|
|
||||||
line-length = 120
|
|
||||||
target-version = "py39"
|
|
||||||
|
|
||||||
[tool.ruff.lint]
|
|
||||||
select = [
|
|
||||||
"E4", # default
|
|
||||||
"E7", # default
|
|
||||||
"E9", # default
|
|
||||||
"F", # default
|
|
||||||
"I", # isort-like behavior (import statement sorting)
|
|
||||||
]
|
|
||||||
|
|||||||
@@ -1,8 +1,8 @@
|
|||||||
GitPython
|
GitPython
|
||||||
PyGithub
|
PyGithub
|
||||||
# matrix-nio
|
matrix-client==0.4.0
|
||||||
transformers
|
transformers
|
||||||
huggingface-hub
|
huggingface-hub>0.20
|
||||||
typer
|
typer
|
||||||
rich
|
rich
|
||||||
typing-extensions
|
typing-extensions
|
||||||
|
|||||||
@@ -9,4 +9,4 @@ lint.select = [
|
|||||||
"F",
|
"F",
|
||||||
]
|
]
|
||||||
|
|
||||||
exclude = ["*.ipynb", "tests"]
|
exclude = ["*.ipynb"]
|
||||||
|
|||||||
429
scanner.py
429
scanner.py
@@ -7,15 +7,13 @@ import concurrent
|
|||||||
import datetime
|
import datetime
|
||||||
import concurrent.futures
|
import concurrent.futures
|
||||||
import requests
|
import requests
|
||||||
import warnings
|
|
||||||
import argparse
|
|
||||||
|
|
||||||
builtin_nodes = set()
|
builtin_nodes = set()
|
||||||
|
|
||||||
import sys
|
import sys
|
||||||
|
|
||||||
from urllib.parse import urlparse
|
from urllib.parse import urlparse
|
||||||
from github import Github, Auth
|
from github import Github
|
||||||
|
|
||||||
|
|
||||||
def download_url(url, dest_folder, filename=None):
|
def download_url(url, dest_folder, filename=None):
|
||||||
@@ -41,51 +39,26 @@ def download_url(url, dest_folder, filename=None):
|
|||||||
raise Exception(f"Failed to download file from {url}")
|
raise Exception(f"Failed to download file from {url}")
|
||||||
|
|
||||||
|
|
||||||
def parse_arguments():
|
# prepare temp dir
|
||||||
"""Parse command-line arguments"""
|
if len(sys.argv) > 1:
|
||||||
parser = argparse.ArgumentParser(
|
temp_dir = sys.argv[1]
|
||||||
description='ComfyUI Manager Node Scanner',
|
else:
|
||||||
formatter_class=argparse.RawDescriptionHelpFormatter,
|
temp_dir = os.path.join(os.getcwd(), ".tmp")
|
||||||
epilog='''
|
|
||||||
Examples:
|
|
||||||
# Standard mode
|
|
||||||
python3 scanner.py
|
|
||||||
python3 scanner.py --skip-update
|
|
||||||
|
|
||||||
# Scan-only mode
|
if not os.path.exists(temp_dir):
|
||||||
python3 scanner.py --scan-only temp-urls-clean.list
|
os.makedirs(temp_dir)
|
||||||
python3 scanner.py --scan-only urls.list --temp-dir /custom/temp
|
|
||||||
python3 scanner.py --scan-only urls.list --skip-update
|
|
||||||
'''
|
|
||||||
)
|
|
||||||
|
|
||||||
parser.add_argument('--scan-only', type=str, metavar='URL_LIST_FILE',
|
|
||||||
help='Scan-only mode: provide URL list file (one URL per line)')
|
|
||||||
parser.add_argument('--temp-dir', type=str, metavar='DIR',
|
|
||||||
help='Temporary directory for cloned repositories')
|
|
||||||
parser.add_argument('--skip-update', action='store_true',
|
|
||||||
help='Skip git clone/pull operations')
|
|
||||||
parser.add_argument('--skip-stat-update', action='store_true',
|
|
||||||
help='Skip GitHub stats collection')
|
|
||||||
parser.add_argument('--skip-all', action='store_true',
|
|
||||||
help='Skip all update operations')
|
|
||||||
|
|
||||||
# Backward compatibility: positional argument for temp_dir
|
|
||||||
parser.add_argument('temp_dir_positional', nargs='?', metavar='TEMP_DIR',
|
|
||||||
help='(Legacy) Temporary directory path')
|
|
||||||
|
|
||||||
args = parser.parse_args()
|
|
||||||
return args
|
|
||||||
|
|
||||||
|
|
||||||
# Module-level variables (will be set in main if running as script)
|
skip_update = '--skip-update' in sys.argv or '--skip-all' in sys.argv
|
||||||
args = None
|
skip_stat_update = '--skip-stat-update' in sys.argv or '--skip-all' in sys.argv
|
||||||
scan_only_mode = False
|
|
||||||
url_list_file = None
|
if not skip_stat_update:
|
||||||
temp_dir = None
|
g = Github(os.environ.get('GITHUB_TOKEN'))
|
||||||
skip_update = False
|
else:
|
||||||
skip_stat_update = True
|
g = None
|
||||||
g = None
|
|
||||||
|
|
||||||
|
print(f"TEMP DIR: {temp_dir}")
|
||||||
|
|
||||||
|
|
||||||
parse_cnt = 0
|
parse_cnt = 0
|
||||||
@@ -100,22 +73,12 @@ def extract_nodes(code_text):
|
|||||||
parse_cnt += 1
|
parse_cnt += 1
|
||||||
|
|
||||||
code_text = re.sub(r'\\[^"\']', '', code_text)
|
code_text = re.sub(r'\\[^"\']', '', code_text)
|
||||||
with warnings.catch_warnings():
|
parsed_code = ast.parse(code_text)
|
||||||
warnings.filterwarnings('ignore', category=SyntaxWarning)
|
|
||||||
warnings.filterwarnings('ignore', category=DeprecationWarning)
|
|
||||||
parsed_code = ast.parse(code_text)
|
|
||||||
|
|
||||||
# Support both ast.Assign and ast.AnnAssign (for type-annotated assignments)
|
assignments = (node for node in parsed_code.body if isinstance(node, ast.Assign))
|
||||||
assignments = (node for node in parsed_code.body if isinstance(node, (ast.Assign, ast.AnnAssign)))
|
|
||||||
|
|
||||||
for assignment in assignments:
|
for assignment in assignments:
|
||||||
# Handle ast.AnnAssign (e.g., NODE_CLASS_MAPPINGS: Type = {...})
|
if isinstance(assignment.targets[0], ast.Name) and assignment.targets[0].id in ['NODE_CONFIG', 'NODE_CLASS_MAPPINGS']:
|
||||||
if isinstance(assignment, ast.AnnAssign):
|
|
||||||
if isinstance(assignment.target, ast.Name) and assignment.target.id in ['NODE_CONFIG', 'NODE_CLASS_MAPPINGS']:
|
|
||||||
node_class_mappings = assignment.value
|
|
||||||
break
|
|
||||||
# Handle ast.Assign (e.g., NODE_CLASS_MAPPINGS = {...})
|
|
||||||
elif isinstance(assignment.targets[0], ast.Name) and assignment.targets[0].id in ['NODE_CONFIG', 'NODE_CLASS_MAPPINGS']:
|
|
||||||
node_class_mappings = assignment.value
|
node_class_mappings = assignment.value
|
||||||
break
|
break
|
||||||
else:
|
else:
|
||||||
@@ -131,122 +94,28 @@ def extract_nodes(code_text):
|
|||||||
return s
|
return s
|
||||||
else:
|
else:
|
||||||
return set()
|
return set()
|
||||||
except Exception:
|
except:
|
||||||
return set()
|
return set()
|
||||||
|
|
||||||
|
|
||||||
def has_comfy_node_base(class_node):
|
|
||||||
"""Check if class inherits from io.ComfyNode or ComfyNode"""
|
|
||||||
for base in class_node.bases:
|
|
||||||
# Case 1: ComfyNode
|
|
||||||
if isinstance(base, ast.Name) and base.id == 'ComfyNode':
|
|
||||||
return True
|
|
||||||
# Case 2: io.ComfyNode
|
|
||||||
elif isinstance(base, ast.Attribute):
|
|
||||||
if base.attr == 'ComfyNode':
|
|
||||||
return True
|
|
||||||
return False
|
|
||||||
|
|
||||||
|
|
||||||
def extract_keyword_value(call_node, keyword):
|
|
||||||
"""
|
|
||||||
Extract string value of keyword argument
|
|
||||||
Schema(node_id="MyNode") -> "MyNode"
|
|
||||||
"""
|
|
||||||
for kw in call_node.keywords:
|
|
||||||
if kw.arg == keyword:
|
|
||||||
# ast.Constant (Python 3.8+)
|
|
||||||
if isinstance(kw.value, ast.Constant):
|
|
||||||
if isinstance(kw.value.value, str):
|
|
||||||
return kw.value.value
|
|
||||||
# ast.Str (Python 3.7-) - suppress deprecation warning
|
|
||||||
else:
|
|
||||||
with warnings.catch_warnings():
|
|
||||||
warnings.filterwarnings('ignore', category=DeprecationWarning)
|
|
||||||
if hasattr(ast, 'Str') and isinstance(kw.value, ast.Str):
|
|
||||||
return kw.value.s
|
|
||||||
return None
|
|
||||||
|
|
||||||
|
|
||||||
def is_schema_call(call_node):
|
|
||||||
"""Check if ast.Call is io.Schema() or Schema()"""
|
|
||||||
func = call_node.func
|
|
||||||
if isinstance(func, ast.Name) and func.id == 'Schema':
|
|
||||||
return True
|
|
||||||
elif isinstance(func, ast.Attribute) and func.attr == 'Schema':
|
|
||||||
return True
|
|
||||||
return False
|
|
||||||
|
|
||||||
|
|
||||||
def extract_node_id_from_schema(class_node):
|
|
||||||
"""
|
|
||||||
Extract node_id from define_schema() method
|
|
||||||
"""
|
|
||||||
for item in class_node.body:
|
|
||||||
if isinstance(item, ast.FunctionDef) and item.name == 'define_schema':
|
|
||||||
# Walk through function body
|
|
||||||
for stmt in ast.walk(item):
|
|
||||||
if isinstance(stmt, ast.Call):
|
|
||||||
# Check if it's Schema() call
|
|
||||||
if is_schema_call(stmt):
|
|
||||||
node_id = extract_keyword_value(stmt, 'node_id')
|
|
||||||
if node_id:
|
|
||||||
return node_id
|
|
||||||
return None
|
|
||||||
|
|
||||||
|
|
||||||
def extract_v3_nodes(code_text):
|
|
||||||
"""
|
|
||||||
Extract V3 node IDs using AST parsing
|
|
||||||
Returns: set of node_id strings
|
|
||||||
"""
|
|
||||||
global parse_cnt
|
|
||||||
|
|
||||||
try:
|
|
||||||
if parse_cnt % 100 == 0:
|
|
||||||
print(".", end="", flush=True)
|
|
||||||
parse_cnt += 1
|
|
||||||
|
|
||||||
with warnings.catch_warnings():
|
|
||||||
warnings.filterwarnings('ignore', category=SyntaxWarning)
|
|
||||||
warnings.filterwarnings('ignore', category=DeprecationWarning)
|
|
||||||
tree = ast.parse(code_text)
|
|
||||||
except (SyntaxError, UnicodeDecodeError):
|
|
||||||
return set()
|
|
||||||
|
|
||||||
nodes = set()
|
|
||||||
|
|
||||||
# Find io.ComfyNode subclasses
|
|
||||||
for node in ast.walk(tree):
|
|
||||||
if isinstance(node, ast.ClassDef):
|
|
||||||
# Check if inherits from ComfyNode
|
|
||||||
if has_comfy_node_base(node):
|
|
||||||
node_id = extract_node_id_from_schema(node)
|
|
||||||
if node_id:
|
|
||||||
nodes.add(node_id)
|
|
||||||
|
|
||||||
return nodes
|
|
||||||
|
|
||||||
|
|
||||||
# scan
|
# scan
|
||||||
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:
|
||||||
code = file.read()
|
with open(filename, encoding='utf-8') as file:
|
||||||
|
code = file.read()
|
||||||
|
except UnicodeDecodeError:
|
||||||
|
with open(filename, encoding='cp949') as file:
|
||||||
|
code = file.read()
|
||||||
|
|
||||||
# Support type annotations (e.g., NODE_CLASS_MAPPINGS: Type = {...}) and line continuations (\)
|
pattern = r"_CLASS_MAPPINGS\s*=\s*{([^}]*)}"
|
||||||
pattern = r"_CLASS_MAPPINGS\s*(?::\s*\w+\s*)?=\s*(?:\\\s*)?{([^}]*)}"
|
|
||||||
regex = re.compile(pattern, re.MULTILINE | re.DOTALL)
|
regex = re.compile(pattern, re.MULTILINE | re.DOTALL)
|
||||||
|
|
||||||
nodes = set()
|
nodes = set()
|
||||||
class_dict = {}
|
class_dict = {}
|
||||||
|
|
||||||
# V1 nodes detection
|
|
||||||
nodes |= extract_nodes(code)
|
nodes |= extract_nodes(code)
|
||||||
|
|
||||||
# V3 nodes detection
|
|
||||||
nodes |= extract_v3_nodes(code)
|
|
||||||
code = re.sub(r'^#.*?$', '', code, flags=re.MULTILINE)
|
code = re.sub(r'^#.*?$', '', code, flags=re.MULTILINE)
|
||||||
|
|
||||||
def extract_keys(pattern, code):
|
def extract_keys(pattern, code):
|
||||||
@@ -343,53 +212,6 @@ def get_nodes(target_dir):
|
|||||||
return py_files, directories
|
return py_files, directories
|
||||||
|
|
||||||
|
|
||||||
def get_urls_from_list_file(list_file):
|
|
||||||
"""
|
|
||||||
Read URLs from list file for scan-only mode
|
|
||||||
|
|
||||||
Args:
|
|
||||||
list_file (str): Path to URL list file (one URL per line)
|
|
||||||
|
|
||||||
Returns:
|
|
||||||
list of tuples: [(url, "", None, None), ...]
|
|
||||||
Format: (url, title, preemptions, nodename_pattern)
|
|
||||||
- title: Empty string
|
|
||||||
- preemptions: None
|
|
||||||
- nodename_pattern: None
|
|
||||||
|
|
||||||
File format:
|
|
||||||
https://github.com/owner/repo1
|
|
||||||
https://github.com/owner/repo2
|
|
||||||
# Comments starting with # are ignored
|
|
||||||
|
|
||||||
Raises:
|
|
||||||
FileNotFoundError: If list_file does not exist
|
|
||||||
"""
|
|
||||||
if not os.path.exists(list_file):
|
|
||||||
raise FileNotFoundError(f"URL list file not found: {list_file}")
|
|
||||||
|
|
||||||
urls = []
|
|
||||||
with open(list_file, 'r', encoding='utf-8') as f:
|
|
||||||
for line_num, line in enumerate(f, 1):
|
|
||||||
line = line.strip()
|
|
||||||
|
|
||||||
# Skip empty lines and comments
|
|
||||||
if not line or line.startswith('#'):
|
|
||||||
continue
|
|
||||||
|
|
||||||
# Validate URL format (basic check)
|
|
||||||
if not (line.startswith('http://') or line.startswith('https://')):
|
|
||||||
print(f"WARNING: Line {line_num} is not a valid URL: {line}")
|
|
||||||
continue
|
|
||||||
|
|
||||||
# Add URL with empty metadata
|
|
||||||
# (url, title, preemptions, nodename_pattern)
|
|
||||||
urls.append((line, "", None, None))
|
|
||||||
|
|
||||||
print(f"Loaded {len(urls)} URLs from {list_file}")
|
|
||||||
return urls
|
|
||||||
|
|
||||||
|
|
||||||
def get_git_urls_from_json(json_file):
|
def get_git_urls_from_json(json_file):
|
||||||
with open(json_file, encoding='utf-8') as file:
|
with open(json_file, encoding='utf-8') as file:
|
||||||
data = json.load(file)
|
data = json.load(file)
|
||||||
@@ -437,52 +259,22 @@ 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(scan_only_mode=False, url_list_file=None):
|
def update_custom_nodes():
|
||||||
"""
|
|
||||||
Update custom nodes by cloning/pulling repositories
|
|
||||||
|
|
||||||
Args:
|
|
||||||
scan_only_mode (bool): If True, use URL list file instead of custom-node-list.json
|
|
||||||
url_list_file (str): Path to URL list file (required if scan_only_mode=True)
|
|
||||||
|
|
||||||
Returns:
|
|
||||||
dict: node_info mapping {repo_name: (url, title, preemptions, node_pattern)}
|
|
||||||
"""
|
|
||||||
if not os.path.exists(temp_dir):
|
if not os.path.exists(temp_dir):
|
||||||
os.makedirs(temp_dir)
|
os.makedirs(temp_dir)
|
||||||
|
|
||||||
node_info = {}
|
node_info = {}
|
||||||
|
|
||||||
# Select URL source based on mode
|
git_url_titles_preemptions = get_git_urls_from_json('custom-node-list.json')
|
||||||
if scan_only_mode:
|
|
||||||
if not url_list_file:
|
|
||||||
raise ValueError("url_list_file is required in scan-only mode")
|
|
||||||
|
|
||||||
git_url_titles_preemptions = get_urls_from_list_file(url_list_file)
|
|
||||||
print("\n[Scan-Only Mode]")
|
|
||||||
print(f" - URL source: {url_list_file}")
|
|
||||||
print(" - GitHub stats: DISABLED")
|
|
||||||
print(f" - Git clone/pull: {'ENABLED' if not skip_update else 'DISABLED'}")
|
|
||||||
print(" - Metadata: EMPTY")
|
|
||||||
else:
|
|
||||||
if not os.path.exists('custom-node-list.json'):
|
|
||||||
raise FileNotFoundError("custom-node-list.json not found")
|
|
||||||
|
|
||||||
git_url_titles_preemptions = get_git_urls_from_json('custom-node-list.json')
|
|
||||||
print("\n[Standard Mode]")
|
|
||||||
print(" - URL source: custom-node-list.json")
|
|
||||||
print(f" - GitHub stats: {'ENABLED' if not skip_stat_update else 'DISABLED'}")
|
|
||||||
print(f" - Git clone/pull: {'ENABLED' if not skip_update else 'DISABLED'}")
|
|
||||||
print(" - Metadata: FULL")
|
|
||||||
|
|
||||||
def process_git_url_title(url, title, preemptions, node_pattern):
|
def process_git_url_title(url, title, preemptions, node_pattern):
|
||||||
name = os.path.basename(url)
|
name = os.path.basename(url)
|
||||||
@@ -505,7 +297,7 @@ def update_custom_nodes(scan_only_mode=False, url_list_file=None):
|
|||||||
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")
|
||||||
@@ -594,48 +386,36 @@ def update_custom_nodes(scan_only_mode=False, url_list_file=None):
|
|||||||
if not skip_stat_update:
|
if not skip_stat_update:
|
||||||
process_git_stats(git_url_titles_preemptions)
|
process_git_stats(git_url_titles_preemptions)
|
||||||
|
|
||||||
# Git clone/pull for all repositories
|
|
||||||
with concurrent.futures.ThreadPoolExecutor(11) as executor:
|
with concurrent.futures.ThreadPoolExecutor(11) as executor:
|
||||||
for url, title, preemptions, node_pattern in git_url_titles_preemptions:
|
for url, title, preemptions, node_pattern in git_url_titles_preemptions:
|
||||||
executor.submit(process_git_url_title, url, title, preemptions, node_pattern)
|
executor.submit(process_git_url_title, url, title, preemptions, node_pattern)
|
||||||
|
|
||||||
# .py file download (skip in scan-only mode - only process git repos)
|
py_url_titles_and_pattern = get_py_urls_from_json('custom-node-list.json')
|
||||||
if not scan_only_mode:
|
|
||||||
py_url_titles_and_pattern = get_py_urls_from_json('custom-node-list.json')
|
|
||||||
|
|
||||||
def download_and_store_info(url_title_preemptions_and_pattern):
|
def download_and_store_info(url_title_preemptions_and_pattern):
|
||||||
url, title, preemptions, node_pattern = url_title_preemptions_and_pattern
|
url, title, preemptions, node_pattern = url_title_preemptions_and_pattern
|
||||||
name = os.path.basename(url)
|
name = os.path.basename(url)
|
||||||
if name.endswith(".py"):
|
if name.endswith(".py"):
|
||||||
node_info[name] = (url, title, preemptions, node_pattern)
|
node_info[name] = (url, title, preemptions, node_pattern)
|
||||||
|
|
||||||
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:
|
||||||
executor.map(download_and_store_info, py_url_titles_and_pattern)
|
executor.map(download_and_store_info, py_url_titles_and_pattern)
|
||||||
|
|
||||||
return node_info
|
return node_info
|
||||||
|
|
||||||
|
|
||||||
def gen_json(node_info, scan_only_mode=False):
|
def gen_json(node_info):
|
||||||
"""
|
|
||||||
Generate extension-node-map.json from scanned node information
|
|
||||||
|
|
||||||
Args:
|
|
||||||
node_info (dict): Repository metadata mapping
|
|
||||||
scan_only_mode (bool): If True, exclude metadata from output
|
|
||||||
"""
|
|
||||||
# scan from .py file
|
# scan from .py file
|
||||||
node_files, node_dirs = get_nodes(temp_dir)
|
node_files, node_dirs = get_nodes(temp_dir)
|
||||||
|
|
||||||
comfyui_path = os.path.abspath(os.path.join(temp_dir, "ComfyUI"))
|
comfyui_path = os.path.abspath(os.path.join(temp_dir, "ComfyUI"))
|
||||||
# Only reorder if ComfyUI exists in the list
|
node_dirs.remove(comfyui_path)
|
||||||
if comfyui_path in node_dirs:
|
node_dirs = [comfyui_path] + node_dirs
|
||||||
node_dirs.remove(comfyui_path)
|
|
||||||
node_dirs = [comfyui_path] + node_dirs
|
|
||||||
|
|
||||||
data = {}
|
data = {}
|
||||||
for dirname in node_dirs:
|
for dirname in node_dirs:
|
||||||
@@ -646,7 +426,6 @@ def gen_json(node_info, scan_only_mode=False):
|
|||||||
for py in py_files:
|
for py in py_files:
|
||||||
nodes_in_file, metadata_in_file = scan_in_file(py, dirname == "ComfyUI")
|
nodes_in_file, metadata_in_file = scan_in_file(py, dirname == "ComfyUI")
|
||||||
nodes.update(nodes_in_file)
|
nodes.update(nodes_in_file)
|
||||||
# Include metadata from .py files in both modes
|
|
||||||
metadata.update(metadata_in_file)
|
metadata.update(metadata_in_file)
|
||||||
|
|
||||||
dirname = os.path.basename(dirname)
|
dirname = os.path.basename(dirname)
|
||||||
@@ -661,28 +440,17 @@ def gen_json(node_info, scan_only_mode=False):
|
|||||||
if dirname in node_info:
|
if dirname in node_info:
|
||||||
git_url, title, preemptions, node_pattern = node_info[dirname]
|
git_url, title, preemptions, node_pattern = node_info[dirname]
|
||||||
|
|
||||||
# Conditionally add metadata based on mode
|
metadata['title_aux'] = title
|
||||||
if not scan_only_mode:
|
|
||||||
# Standard mode: include all metadata
|
|
||||||
metadata['title_aux'] = title
|
|
||||||
|
|
||||||
if preemptions is not None:
|
if preemptions is not None:
|
||||||
metadata['preemptions'] = preemptions
|
metadata['preemptions'] = preemptions
|
||||||
|
|
||||||
if node_pattern is not None:
|
if node_pattern is not None:
|
||||||
metadata['nodename_pattern'] = node_pattern
|
metadata['nodename_pattern'] = node_pattern
|
||||||
# Scan-only mode: metadata remains empty
|
|
||||||
|
|
||||||
data[git_url] = (nodes, metadata)
|
data[git_url] = (nodes, metadata)
|
||||||
else:
|
else:
|
||||||
# Scan-only mode: Repository not in node_info (expected behavior)
|
print(f"WARN: {dirname} is removed from custom-node-list.json")
|
||||||
# Construct URL from dirname (author_repo format)
|
|
||||||
if '_' in dirname:
|
|
||||||
parts = dirname.split('_', 1)
|
|
||||||
git_url = f"https://github.com/{parts[0]}/{parts[1]}"
|
|
||||||
data[git_url] = (nodes, metadata)
|
|
||||||
else:
|
|
||||||
print(f"WARN: {dirname} is removed from custom-node-list.json")
|
|
||||||
|
|
||||||
for file in node_files:
|
for file in node_files:
|
||||||
nodes, metadata = scan_in_file(file)
|
nodes, metadata = scan_in_file(file)
|
||||||
@@ -695,16 +463,13 @@ def gen_json(node_info, scan_only_mode=False):
|
|||||||
|
|
||||||
if file in node_info:
|
if file in node_info:
|
||||||
url, title, preemptions, node_pattern = node_info[file]
|
url, title, preemptions, node_pattern = node_info[file]
|
||||||
|
metadata['title_aux'] = title
|
||||||
|
|
||||||
# Conditionally add metadata based on mode
|
if preemptions is not None:
|
||||||
if not scan_only_mode:
|
metadata['preemptions'] = preemptions
|
||||||
metadata['title_aux'] = title
|
|
||||||
|
|
||||||
if preemptions is not None:
|
if node_pattern is not None:
|
||||||
metadata['preemptions'] = preemptions
|
metadata['nodename_pattern'] = node_pattern
|
||||||
|
|
||||||
if node_pattern is not None:
|
|
||||||
metadata['nodename_pattern'] = node_pattern
|
|
||||||
|
|
||||||
data[url] = (nodes, metadata)
|
data[url] = (nodes, metadata)
|
||||||
else:
|
else:
|
||||||
@@ -716,10 +481,6 @@ def gen_json(node_info, scan_only_mode=False):
|
|||||||
for extension in extensions:
|
for extension in extensions:
|
||||||
node_list_json_path = os.path.join(temp_dir, extension, 'node_list.json')
|
node_list_json_path = os.path.join(temp_dir, extension, 'node_list.json')
|
||||||
if os.path.exists(node_list_json_path):
|
if os.path.exists(node_list_json_path):
|
||||||
# Skip if extension not in node_info (scan-only mode with limited URLs)
|
|
||||||
if extension not in node_info:
|
|
||||||
continue
|
|
||||||
|
|
||||||
git_url, title, preemptions, node_pattern = node_info[extension]
|
git_url, title, preemptions, node_pattern = node_info[extension]
|
||||||
|
|
||||||
with open(node_list_json_path, 'r', encoding='utf-8') as f:
|
with open(node_list_json_path, 'r', encoding='utf-8') as f:
|
||||||
@@ -739,25 +500,16 @@ def gen_json(node_info, scan_only_mode=False):
|
|||||||
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 = {}
|
|
||||||
|
|
||||||
# Conditionally add metadata based on mode
|
metadata_in_url['title_aux'] = title
|
||||||
if not scan_only_mode:
|
|
||||||
metadata_in_url['title_aux'] = title
|
|
||||||
|
|
||||||
if preemptions is not None:
|
if preemptions is not None:
|
||||||
metadata_in_url['preemptions'] = preemptions
|
metadata['preemptions'] = preemptions
|
||||||
|
|
||||||
if node_pattern is not None:
|
if node_pattern is not None:
|
||||||
metadata_in_url['nodename_pattern'] = node_pattern
|
metadata_in_url['nodename_pattern'] = node_pattern
|
||||||
|
|
||||||
nodes = list(nodes)
|
nodes = list(nodes)
|
||||||
nodes.sort()
|
nodes.sort()
|
||||||
@@ -768,53 +520,12 @@ def gen_json(node_info, scan_only_mode=False):
|
|||||||
json.dump(data, file, indent=4, sort_keys=True)
|
json.dump(data, file, indent=4, sort_keys=True)
|
||||||
|
|
||||||
|
|
||||||
if __name__ == "__main__":
|
print("### ComfyUI Manager Node Scanner ###")
|
||||||
# Parse arguments
|
|
||||||
args = parse_arguments()
|
|
||||||
|
|
||||||
# Determine mode
|
print("\n# Updating extensions\n")
|
||||||
scan_only_mode = args.scan_only is not None
|
updated_node_info = update_custom_nodes()
|
||||||
url_list_file = args.scan_only if scan_only_mode else None
|
|
||||||
|
|
||||||
# Determine temp_dir
|
print("\n# 'extension-node-map.json' file is generated.\n")
|
||||||
if args.temp_dir:
|
gen_json(updated_node_info)
|
||||||
temp_dir = args.temp_dir
|
|
||||||
elif args.temp_dir_positional:
|
|
||||||
temp_dir = args.temp_dir_positional
|
|
||||||
else:
|
|
||||||
temp_dir = os.path.join(os.getcwd(), ".tmp")
|
|
||||||
|
|
||||||
if not os.path.exists(temp_dir):
|
print("\nDONE.\n")
|
||||||
os.makedirs(temp_dir)
|
|
||||||
|
|
||||||
# Determine skip flags
|
|
||||||
skip_update = args.skip_update or args.skip_all
|
|
||||||
skip_stat_update = args.skip_stat_update or args.skip_all or scan_only_mode
|
|
||||||
|
|
||||||
if not skip_stat_update:
|
|
||||||
auth = Auth.Token(os.environ.get('GITHUB_TOKEN'))
|
|
||||||
g = Github(auth=auth)
|
|
||||||
else:
|
|
||||||
g = None
|
|
||||||
|
|
||||||
print("### ComfyUI Manager Node Scanner ###")
|
|
||||||
|
|
||||||
if scan_only_mode:
|
|
||||||
print(f"\n# [Scan-Only Mode] Processing URL list: {url_list_file}\n")
|
|
||||||
else:
|
|
||||||
print("\n# [Standard Mode] Updating extensions\n")
|
|
||||||
|
|
||||||
# Update/clone repositories and collect node info
|
|
||||||
updated_node_info = update_custom_nodes(scan_only_mode, url_list_file)
|
|
||||||
|
|
||||||
print("\n# Generating 'extension-node-map.json'...\n")
|
|
||||||
|
|
||||||
# Generate extension-node-map.json
|
|
||||||
gen_json(updated_node_info, scan_only_mode)
|
|
||||||
|
|
||||||
print("\n✅ DONE.\n")
|
|
||||||
|
|
||||||
if scan_only_mode:
|
|
||||||
print("Output: extension-node-map.json (node mappings only)")
|
|
||||||
else:
|
|
||||||
print("Output: extension-node-map.json (full metadata)")
|
|
||||||
39
scripts/colab-dependencies.py
Normal file
39
scripts/colab-dependencies.py
Normal file
@@ -0,0 +1,39 @@
|
|||||||
|
import os
|
||||||
|
import subprocess
|
||||||
|
|
||||||
|
|
||||||
|
def get_enabled_subdirectories_with_files(base_directory):
|
||||||
|
subdirs_with_files = []
|
||||||
|
for subdir in os.listdir(base_directory):
|
||||||
|
try:
|
||||||
|
full_path = os.path.join(base_directory, subdir)
|
||||||
|
if os.path.isdir(full_path) and not subdir.endswith(".disabled") and not subdir.startswith('.') and subdir != '__pycache__':
|
||||||
|
print(f"## Install dependencies for '{subdir}'")
|
||||||
|
requirements_file = os.path.join(full_path, "requirements.txt")
|
||||||
|
install_script = os.path.join(full_path, "install.py")
|
||||||
|
|
||||||
|
if os.path.exists(requirements_file) or os.path.exists(install_script):
|
||||||
|
subdirs_with_files.append((full_path, requirements_file, install_script))
|
||||||
|
except Exception as e:
|
||||||
|
print(f"EXCEPTION During Dependencies INSTALL on '{subdir}':\n{e}")
|
||||||
|
|
||||||
|
return subdirs_with_files
|
||||||
|
|
||||||
|
|
||||||
|
def install_requirements(requirements_file_path):
|
||||||
|
if os.path.exists(requirements_file_path):
|
||||||
|
subprocess.run(["pip", "install", "-r", requirements_file_path])
|
||||||
|
|
||||||
|
|
||||||
|
def run_install_script(install_script_path):
|
||||||
|
if os.path.exists(install_script_path):
|
||||||
|
subprocess.run(["python", install_script_path])
|
||||||
|
|
||||||
|
|
||||||
|
custom_nodes_directory = "custom_nodes"
|
||||||
|
subdirs_with_files = get_enabled_subdirectories_with_files(custom_nodes_directory)
|
||||||
|
|
||||||
|
|
||||||
|
for subdir, requirements_file, install_script in subdirs_with_files:
|
||||||
|
install_requirements(requirements_file)
|
||||||
|
run_install_script(install_script)
|
||||||
21
scripts/install-comfyui-venv-linux.sh
Executable file
21
scripts/install-comfyui-venv-linux.sh
Executable file
@@ -0,0 +1,21 @@
|
|||||||
|
git clone https://github.com/comfyanonymous/ComfyUI
|
||||||
|
cd ComfyUI/custom_nodes
|
||||||
|
git clone https://github.com/ltdrdata/ComfyUI-Manager comfyui-manager
|
||||||
|
cd ..
|
||||||
|
python -m venv venv
|
||||||
|
source venv/bin/activate
|
||||||
|
python -m pip install torch torchvision torchaudio --extra-index-url https://download.pytorch.org/whl/cu121
|
||||||
|
python -m pip install -r requirements.txt
|
||||||
|
python -m pip install -r custom_nodes/comfyui-manager/requirements.txt
|
||||||
|
cd ..
|
||||||
|
echo "#!/bin/bash" > run_gpu.sh
|
||||||
|
echo "cd ComfyUI" >> run_gpu.sh
|
||||||
|
echo "source venv/bin/activate" >> run_gpu.sh
|
||||||
|
echo "python main.py --preview-method auto" >> run_gpu.sh
|
||||||
|
chmod +x run_gpu.sh
|
||||||
|
|
||||||
|
echo "#!/bin/bash" > run_cpu.sh
|
||||||
|
echo "cd ComfyUI" >> run_cpu.sh
|
||||||
|
echo "source venv/bin/activate" >> run_cpu.sh
|
||||||
|
echo "python main.py --preview-method auto --cpu" >> run_cpu.sh
|
||||||
|
chmod +x run_cpu.sh
|
||||||
17
scripts/install-comfyui-venv-win.bat
Executable file
17
scripts/install-comfyui-venv-win.bat
Executable file
@@ -0,0 +1,17 @@
|
|||||||
|
git clone https://github.com/comfyanonymous/ComfyUI
|
||||||
|
cd ComfyUI/custom_nodes
|
||||||
|
git clone https://github.com/ltdrdata/ComfyUI-Manager comfyui-manager
|
||||||
|
cd ..
|
||||||
|
python -m venv venv
|
||||||
|
call venv/Scripts/activate
|
||||||
|
python -m pip install torch torchvision torchaudio --extra-index-url https://download.pytorch.org/whl/cu121
|
||||||
|
python -m pip install -r requirements.txt
|
||||||
|
python -m pip install -r custom_nodes/comfyui-manager/requirements.txt
|
||||||
|
cd ..
|
||||||
|
echo "cd ComfyUI" >> run_gpu.bat
|
||||||
|
echo "call venv/Scripts/activate" >> run_gpu.bat
|
||||||
|
echo "python main.py" >> run_gpu.bat
|
||||||
|
|
||||||
|
echo "cd ComfyUI" >> run_cpu.bat
|
||||||
|
echo "call venv/Scripts/activate" >> run_cpu.bat
|
||||||
|
echo "python main.py --cpu" >> run_cpu.bat
|
||||||
3
scripts/install-manager-for-portable-version.bat
Normal file
3
scripts/install-manager-for-portable-version.bat
Normal file
@@ -0,0 +1,3 @@
|
|||||||
|
.\python_embeded\python.exe -s -m pip install gitpython
|
||||||
|
.\python_embeded\python.exe -c "import git; git.Repo.clone_from('https://github.com/ltdrdata/ComfyUI-Manager', './ComfyUI/custom_nodes/comfyui-manager')"
|
||||||
|
.\python_embeded\python.exe -m pip install -r ./ComfyUI/custom_nodes/comfyui-manager/requirements.txt
|
||||||
Reference in New Issue
Block a user