Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
 adachi
|
f31e15ec9f | ||
|
adachi
|
340fc54b49 | ||
|
adachi
|
3664cbf1d8 | ||
|
adachi
|
c132d1517b | ||
|
Adachi
|
c49cae39e2 | ||
|
adachi
|
cf70590406 | ||
|
adachi
|
a84b897d76 | ||
|
Adachi
|
40e05092d7 | ||
|
Adachi
|
3f2fc7e033 | ||
|
Codex
|
9a60d9e174 | ||
|
Codex
|
b678071646 |
@@ -0,0 +1,6 @@
|
||||
.github/
|
||||
preview/
|
||||
tests/
|
||||
registry/
|
||||
VERIFICATION.md
|
||||
ROLLBACK.md
|
||||
@@ -0,0 +1,34 @@
|
||||
name: Validate plugin
|
||||
|
||||
on:
|
||||
push:
|
||||
pull_request:
|
||||
workflow_dispatch:
|
||||
|
||||
permissions:
|
||||
contents: read
|
||||
|
||||
jobs:
|
||||
cpu-tests:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v7.0.1
|
||||
- uses: actions/setup-python@v7.0.0
|
||||
with:
|
||||
python-version: '3.12'
|
||||
- name: Install CPU test dependencies
|
||||
run: |
|
||||
python -m pip install torch --index-url https://download.pytorch.org/whl/cpu
|
||||
python -m pip install numpy Pillow
|
||||
- name: Run backend regression tests
|
||||
run: python -m unittest discover -s tests -v
|
||||
- name: Check frontend syntax and metadata
|
||||
run: |
|
||||
python - <<'PY'
|
||||
import pathlib, subprocess, tomllib
|
||||
config = tomllib.loads(pathlib.Path('pyproject.toml').read_text(encoding='utf-8'))
|
||||
assert config['project']['name'] == 'adachi-inpaint-workbench'
|
||||
assert config['tool']['comfy']['DisplayName'] == 'Adachi-Inpaint-Workbench'
|
||||
for source in pathlib.Path('web').glob('*.js'):
|
||||
subprocess.run(['node', '--input-type=module', '--check'], input=source.read_bytes(), check=True)
|
||||
PY
|
||||
@@ -0,0 +1,29 @@
|
||||
name: Publish to Comfy Registry
|
||||
|
||||
on:
|
||||
workflow_dispatch:
|
||||
|
||||
permissions:
|
||||
contents: read
|
||||
|
||||
jobs:
|
||||
publish:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v7.0.1
|
||||
- name: Verify publisher configuration
|
||||
env:
|
||||
REGISTRY_ACCESS_TOKEN: ${{ secrets.REGISTRY_ACCESS_TOKEN }}
|
||||
run: |
|
||||
python - <<'PY'
|
||||
import os, pathlib, tomllib
|
||||
config = tomllib.loads(pathlib.Path('pyproject.toml').read_text(encoding='utf-8'))
|
||||
if not config['tool']['comfy']['PublisherId'].strip():
|
||||
raise SystemExit('Set tool.comfy.PublisherId to your registered publisher ID before publishing.')
|
||||
if not os.environ.get('REGISTRY_ACCESS_TOKEN'):
|
||||
raise SystemExit('Add your Registry API key as the REGISTRY_ACCESS_TOKEN repository secret.')
|
||||
PY
|
||||
- name: Publish custom node
|
||||
uses: Comfy-Org/publish-node-action@main
|
||||
with:
|
||||
personal_access_token: ${{ secrets.REGISTRY_ACCESS_TOKEN }}
|
||||
@@ -0,0 +1,30 @@
|
||||
# Changelog
|
||||
|
||||
## 0.4.2
|
||||
|
||||
- Make every user-facing string English by default: node display names, category, descriptions, tooltips and the canvas/panel labels.
|
||||
- Keep node class IDs, parameter identifiers and enum values unchanged, so existing workflows stay compatible.
|
||||
- Add `locales/en` and `locales/zh` and follow the ComfyUI language setting, so a Chinese ComfyUI shows Chinese labels while English stays the built-in default. Any missing translation falls back to English.
|
||||
- Document how this pack differs from ComfyUI's built-in modal mask editor and `Painter` node.
|
||||
|
||||
## 0.4.1
|
||||
|
||||
- Rename the public node pack to **Adachi-Inpaint-Workbench**; keep existing node class IDs compatible with saved workflows.
|
||||
- Show an eraser cursor and a distinct dashed brush outline while Alt is held or the eraser tool is selected; restore the brush cursor on release.
|
||||
- Add Comfy Registry metadata, dependency declarations, a Manager registration entry, CPU CI and a manual Registry publishing workflow.
|
||||
|
||||
## 0.4.0
|
||||
|
||||
- Move the original live editor controls and sampling controls into the WebUI Inpaint node.
|
||||
- Keep the inline node focused on the image and a small upload button.
|
||||
- Move comparison controls below the picture and remove the top toolbar band.
|
||||
|
||||
## 0.3.0
|
||||
|
||||
- Add WebUI-style sliders, separate width/height rows and a source-size button.
|
||||
- Use result-left/original-right comparison and show the full result when the pointer leaves.
|
||||
- Route toolbar wheel events to the workflow and keep image wheel gestures separate.
|
||||
|
||||
## 0.2.0
|
||||
|
||||
- Add temporary Alt erase, image comparison and result adoption.
|
||||
@@ -1,99 +1,136 @@
|
||||
# 安达工作台 / Adachi Workbench
|
||||
# Adachi-Inpaint-Workbench
|
||||
|
||||
直接在 ComfyUI 工作流节点里载入原图、涂抹蒙版、局部重绘，无需另开遮罩编辑器喵。
|
||||
Load an image, paint a mask and inpaint **directly inside the workflow node** — no modal mask editor and no save/load round-trip on every stroke.
|
||||
|
||||
## 安装
|
||||
|
||||
|
||||
将整个 `ComfyUI-Adachi-Workbench` 文件夹复制到 `ComfyUI/custom_nodes/`，保留其中的 `web/`、`backend.py`、`__init__.py` 喵。
|
||||
重启 ComfyUI，然后在浏览器按 `Ctrl+F5` 刷新前端缓存喵。
|
||||
在节点搜索中输入 `Inline Mask` 或 `WebUI Inpaint`，分类是 **安达工作台 / Adachi Workbench** 喵。
|
||||
MIT licensed, by Adachi.
|
||||
Supports whole-image and masked-area sampling, an Alt temporary eraser, Ctrl+wheel brush size, image comparison and one-click adoption of a result as the next source image.
|
||||
|
||||
Windows 也可以从解压后的插件文件夹运行安装脚本，将参数改为自己的、包含 `main.py` 的 ComfyUI 目录喵。
|
||||
## How this differs from other nodes
|
||||
|
||||
| | ComfyUI's built-in mask editing | This node pack |
|
||||
|---|---|---|
|
||||
| Where you paint | A **modal editor** opens over the graph (`MaskEditor`); you close it to get back to the workflow | You paint **on the node's own canvas**, and the mask lives in the workflow |
|
||||
| Per-stroke cost | Commit the mask in the dialog, then re-run | Every stroke updates the mask in the browser and is stored with the workflow; no disk save/load per stroke |
|
||||
| Sampling | Left to the workflow you build | The connected **WebUI Inpaint** node carries the sampling controls (`area`, `width/height`, `padding`, `mask_blur`, `mask_grow`, fill mode, sampler, Refiner) |
|
||||
|
||||
The built-in `Painter` node draws an image and exposes a mask, but it stops there — it has no inpaint pipeline. The built-in `MaskEditor` edits masks in a modal dialog. `ComfyUI-Inpaint-CropAndStitch` does crop-and-stitch well but does not paint. This pack connects the whole loop in one place: **paint → sample → composite at original resolution → compare → adopt the result as the next source and keep painting.**
|
||||
|
||||
## Install
|
||||
|
||||
Copy the whole `Adachi-Inpaint-Workbench` folder into `ComfyUI/custom_nodes/`, keeping `web/`, `backend.py` and `__init__.py`.
|
||||
Restart ComfyUI, then hard-refresh the browser with `Ctrl+F5`.
|
||||
Search for `Inline Mask` or `WebUI Inpaint`; the category is **Adachi-Inpaint-Workbench**.
|
||||
The node pack follows the ComfyUI language setting: node names, sockets and tooltips come from `locales/`, and the canvas buttons and parameter panel from `web/i18n.js`, so a Chinese ComfyUI shows the Chinese labels. English is the built-in default, and any missing entry falls back to English.
|
||||
|
||||
On Windows you can instead run the installer from the unzipped plugin folder, pointing it at your ComfyUI directory (the one containing `main.py`).
|
||||
|
||||
```powershell
|
||||
powershell -ExecutionPolicy Bypass -File .\install.ps1 -ComfyUIPath "D:\ComfyUI_windows_portable\ComfyUI"
|
||||
```
|
||||
|
||||
脚本只复制本插件；更新时会把旧插件压缩备份到所选 ComfyUI 的 `user/adachi-workbench-backups/`，不会自动重启服务喵。
|
||||
插件使用 ComfyUI 已有的 PyTorch、NumPy、Pillow，不需要额外 pip/npm 安装喵。
|
||||
卸载时关闭 ComfyUI，再删除 `custom_nodes/ComfyUI-Adachi-Workbench` 即可喵。
|
||||
The installer only copies this plugin; on update it zips the previous installation into `user/adachi-workbench-backups/` and does not restart the server.
|
||||
The plugin uses ComfyUI's existing PyTorch, NumPy and Pillow — no extra pip or npm packages.
|
||||
To uninstall, close ComfyUI and delete `custom_nodes/Adachi-Inpaint-Workbench`.
|
||||
|
||||
## 最快上手
|
||||
### ComfyUI Manager and Comfy Registry
|
||||
|
||||
1. 将 `examples/01-inline-inpaint.json` 拖入 ComfyUI，选择自己的 checkpoint 喵。
|
||||
2. 在 **内联蒙版 / Inline Mask** 节点载入、拖放或粘贴图片，直接在画布上涂抹需要重绘的部分喵。
|
||||
3. 修改正负提示词，在 **WebUI 局部重绘 / WebUI Inpaint** 中选择 `area`、采样分辨率、采样器与重绘幅度，然后运行喵。
|
||||
4. `image` 输出回贴后的完整原图，`crop` 输出实际采样画布，`mask` 输出该采样画布对应的蒙版喵。
|
||||
Manager **Git URL** installation can use `https://github.com/adachi0130/Adachi-Inpaint-Workbench`, or clone it into `ComfyUI/custom_nodes`:
|
||||
|
||||
**白色蒙版重绘，黑色保护；画布中橙色代表绘制区域** 喵。
|
||||
当 `mask_mode=outside` 时会反相，重绘橙色之外的部分喵。
|
||||
`mask_blur`、`mask_grow`、额外羽化会改变有效蒙版边界，边界内的混合像素也会变化；有效蒙版为零的像素逐值保留喵。
|
||||
```bash
|
||||
git clone https://github.com/adachi0130/Adachi-Inpaint-Workbench.git
|
||||
```
|
||||
|
||||
## 两种重绘范围
|
||||
A Manager **listing** submission is open at [ComfyUI-Manager PR #3378](https://github.com/Comfy-Org/ComfyUI-Manager/pull/3378) and still needs the maintainer to merge it and refresh the index, so search visibility is not guaranteed yet. A Comfy Registry publisher is not configured; see [the publishing notes](registry/README.md).
|
||||
|
||||
| `area` | 对应操作 | 实际行为 |
|
||||
## Quick start
|
||||
|
||||
1. Drag `examples/01-inline-inpaint.json` into ComfyUI and pick your checkpoint.
|
||||
2. In **Inline Mask**, upload, drop or paste an image and paint the areas to repaint directly on the canvas.
|
||||
3. Edit the positive/negative prompts, then set the painting tools, sampling area, sampling resolution, sampler and denoise in the **WebUI Inpaint** node, and run.
|
||||
4. `image` outputs the full composited picture, `crop` outputs the actual sampling canvas, and `mask` outputs that canvas's mask.
|
||||
|
||||
**White repaints, black preserves; orange is the painted area on the canvas.**
|
||||
With `mask_mode=outside` this inverts and everything outside the painted area is repainted.
|
||||
`mask_blur`, `mask_grow` and extra feathering change the effective mask boundary, so blend pixels at that boundary change too; pixels where the effective mask is zero are preserved exactly.
|
||||
|
||||
## The two sampling areas
|
||||
|
||||
| `area` | What it does | Behaviour |
|
||||
|---|---|---|
|
||||
| `whole_image` | 以原图范围重绘 | 将整张图缩放到 `width × height` 采样，再按照蒙版回贴原图 |
|
||||
| `only_masked` | 以蒙版范围重绘 | 取蒙版包围框，加 `padding` 上下文，尽量扩展到目标比例，将局部放大到采样尺寸，生成后贴回原位置 |
|
||||
| `whole_image` | Repaint at the source extent | Scales the whole image to `width × height`, samples, then composites back through the mask |
|
||||
| `only_masked` | Repaint at the mask extent | Takes the mask bounding box, adds `padding` context, expands toward the target ratio, upscales that region to the sampling size, and pastes the result back in place |
|
||||
|
||||
`width/height` 指采样画布尺寸，须为 8 的倍数；两种模式的最终 `image` 都保持上传原图的分辨率喵。
|
||||
这一点与 WebUI 整图模式常以目标宽高输出的行为有区别；需要目标尺寸的图时，可取 `crop`，或在完整输出后连接缩放节点喵。
|
||||
`padding`、`mask_blur`、`mask_grow` 的单位都是原图像素喵。
|
||||
蒙版贴近图像边缘时，局部模式用保比例填充保住整块蒙版，不会为匹配比例切掉蒙版喵。
|
||||
`resize_mode` 的拉伸、居中裁剪、保比例填充作用于 `whole_image`；局部模式自动采用保留全部蒙版的变换喵。
|
||||
`width/height` are the sampling canvas size and must be multiples of 8; the final `image` keeps the uploaded image's resolution in both modes.
|
||||
That differs from the WebUI whole-image mode, which usually outputs at the target size — take `crop`, or add a resize node after the full output, if you want a target-size image.
|
||||
`padding`, `mask_blur` and `mask_grow` are all measured in source pixels.
|
||||
When the mask touches an image edge, masked-area mode uses aspect-preserving fill to keep the entire mask instead of cropping it to match the ratio.
|
||||
`resize_mode` (stretch, center crop, aspect fill) applies to `whole_image`; masked-area mode automatically uses the transform that keeps the whole mask.
|
||||
|
||||
## 画布操作
|
||||
## Canvas controls
|
||||
|
||||
| 操作 | 使用方式 |
|
||||
| Action | How |
|
||||
|---|---|
|
||||
| 画笔 / 橡皮 | 工具栏切换，`B` / `E`；按住 `Alt` 或鼠标右键临时擦除，松开恢复原工具 |
|
||||
| 矩形 / 自由套索 | `R` / `L`，拖动画出要重绘的区域 |
|
||||
| 笔径 / 硬度 / 笔触 | 分别控制原图像素笔径、边缘硬度、绘制不透明度 |
|
||||
| 橙色叠加 | 仅调节显示透明度，不改变真实蒙版 |
|
||||
| 撤销 / 重做 | `Ctrl+Z` / `Ctrl+Shift+Z`，或 `Ctrl+Y` |
|
||||
| 缩放 / 移动 | 滚轮缩放；空格拖动、鼠标中键或 `H` 移动；「适应」复位 |
|
||||
| 笔径快捷键 | `[` / `]` |
|
||||
| 快速调整笔径 | 鼠标放在画布上，按住 `Ctrl` 向上滚轮增大、向下滚轮减小；普通滚轮仍缩放图片 |
|
||||
| 编辑器高度 | 拖动编辑器底部 `↕` 条上下拉伸；尺寸随工作流保存 |
|
||||
| 反转 / 全选 / 清空 | 作用于当前绘制蒙版，可撤销 |
|
||||
| 导入 / 导出蒙版 | 原始分辨率 PNG；黑白图按亮度导入，带透明度的图按 alpha 导入 |
|
||||
| 原图 / 蒙版 / 叠加 | 切换预览，不改变输出 |
|
||||
| Brush / eraser | Toolbar toggle, `B` / `E`; hold `Alt` or use the right mouse button to erase temporarily and release to restore the previous tool; the eraser cursor and a pale pink dashed outline show the erase mode |
|
||||
| Rectangle / freehand lasso | `R` / `L`, drag out the region to repaint |
|
||||
| Brush size / hardness / brush opacity | Source-pixel brush size, edge hardness and painting opacity |
|
||||
| Orange overlay | Display opacity only; it never changes the real mask |
|
||||
| Undo / redo | `Ctrl+Z` / `Ctrl+Shift+Z`, or `Ctrl+Y` |
|
||||
| Zoom / pan | Wheel to zoom; drag with Space, the middle button or `H` to pan; **Fit** to reset |
|
||||
| Brush size keys | `[` / `]` |
|
||||
| Fast brush size | With the pointer over the canvas, hold `Ctrl` and wheel up/down; the plain wheel still zooms the image |
|
||||
| Editor height | Drag the `↕` bar at the bottom of the editor; the size is saved with the workflow |
|
||||
| Invert / fill / clear | Act on the current painted mask and are undoable |
|
||||
| Import / export mask | Full-resolution PNG; greyscale images import by brightness, images with alpha import by alpha |
|
||||
| Image / mask / overlay | Preview toggles only; they do not change the output |
|
||||
|
||||
支持画笔压力和软笔刷；鼠标使用固定压力喵。
|
||||
笔径、硬度、笔触和叠加四个滑条位于图片编辑区下方喵。
|
||||
图片上传一次，之后每笔在浏览器内更新蒙版，并在工作流及运行参数中保存 PNG 数据，无需每画一笔都保存、重新加载磁盘文件喵。
|
||||
超大图仍会消耗浏览器内存，PNG 编码耗时取决于分辨率和设备，不能保证所有图像都瞬间完成喵。
|
||||
Brush pressure and soft brushes are supported; the mouse uses a fixed pressure.
|
||||
Inline Mask keeps only the image editing area and a small **Load image** button in the corner, and adjusts the canvas height to the image ratio after loading to reduce empty margins.
|
||||
The brush, eraser, rectangle, lasso, pan, four brush sliders, undo/redo, mask actions, view toggles, fit and the embed option all live in the connected **WebUI Inpaint** node and drive that same inline canvas.
|
||||
You upload the image once; every stroke then updates the mask in the browser and is stored as PNG data in the workflow and in the executed parameters, so there is no saving and reloading of files per stroke.
|
||||
Wheel events over the picture zoom it; over the toolbar, buttons, sliders or the parameter panel they follow ComfyUI's canvas navigation settings.
|
||||
A continuous wheel gesture that starts on the ComfyUI canvas keeps navigating the outer canvas when it moves over the picture; scrolling inside the picture again after stopping zooms the image.
|
||||
Very large images still use browser memory, and PNG encoding time depends on resolution and hardware, so instant completion is not guaranteed for every image.
|
||||
|
||||
## 图像对比与连续重绘
|
||||
## Painting tools and inpainting parameters
|
||||
|
||||
添加 **图像对比 / Image Compare** 节点，将内联蒙版的 `image` 接到 `original`，最终完整重绘图 `image` 接到 `result`，运行后即可对比喵。
|
||||
鼠标移动时，竖线左边显示原图、右边显示重绘结果，普通滚轮缩放图片；批量结果可在上方选择喵。
|
||||
满意后点击 **采用此结果**，插件会把当前选中的结果上传为新的原图，回填到上游内联蒙版，并清空旧蒙版，随后可以继续涂抹下一处喵。
|
||||
原图连接经过中间 IMAGE 节点时会向上寻找内联蒙版；若存在多个目标，可以在“回填到”中明确选择喵。
|
||||
回填只在点击按钮时发生，不会自动开始下一轮生成；`image` 输出仍传递整个结果批次，可接保存图像喵。
|
||||
对比预览保存在 ComfyUI 临时目录，清理或重启后可能需要重新运行；点击采用后的原图保存在 `input/adachi-inpaint/`，不依赖临时预览文件喵。
|
||||
Once Inline Mask is connected to the `image` input of **WebUI Inpaint**, the original painting controls appear in that inpaint node, and the parameter panel below drives the node's real sampling parameters.
|
||||
Width and height each get their own row with both a slider and a number field; denoise is a slider too, and **Use source size** fills in the source dimensions, rounded to the nearest multiple of 8 the sampler requires.
|
||||
Mask mode, fill, sampling area, sampler, scheduler, steps, CFG and seed are shown directly; mask processing, batch and Refiner switching live under **Mask, batch and advanced settings**.
|
||||
If one inline source feeds several inpaint nodes, the painting controls go to the first WebUI Inpaint node and each node keeps its own parameter panel; disconnecting or deleting that node moves the tools to the next available one.
|
||||
Parameters driven by an external link disable the matching panel control; a modular workflow puts the painting tools in **Inpaint Prepare** and keeps the sampling parameters in the separate sampler node.
|
||||
|
||||
## 填充、批量与 Refiner
|
||||
## Comparison and chained inpainting
|
||||
|
||||
| `fill` | 行为 |
|
||||
Add an **Image Compare** node and connect Inline Mask's `image` to `original` and the final full-size generated `image` to `result`, then run.
|
||||
With the pointer over the picture, the thin divider shows the generated result on the left and the original on the right; leaving the picture hides the divider and shows the full result, and the plain wheel zooms. Batch selection, dimensions and the fit button sit below the picture.
|
||||
When you are happy, click **Adopt this result**: the plugin uploads the selected result as the new source image, writes it back into the upstream inline editor and clears the old mask, so you can paint the next area straight away.
|
||||
If the original is routed through intermediate IMAGE nodes the plugin walks upstream to find the inline editor; when several candidates exist you can pick one explicitly under **Adopt into**.
|
||||
Adoption only happens when you click the button and never starts the next generation automatically; the `image` output still passes the whole result batch, so you can feed a Save Image node.
|
||||
Comparison previews live in ComfyUI's temp directory and may need a re-run after cleanup or restart; an adopted source image is stored in `input/adachi-inpaint/` and does not depend on temp previews.
|
||||
|
||||
## Fill, batch and Refiner
|
||||
|
||||
| `fill` | Behaviour |
|
||||
|---|---|
|
||||
| `original` | 使用原图像素编码 latent |
|
||||
| `fill` | 按蒙版周围颜色进行多尺度填充，再编码 latent |
|
||||
| `latent_noise` | 在 masked latent 内填入与 seed 相关的噪声 |
|
||||
| `latent_nothing` | 将 masked latent 置零 |
|
||||
| `original` | Encode the source pixels into the latent |
|
||||
| `fill` | Multi-scale fill from the colours surrounding the mask, then encode |
|
||||
| `latent_noise` | Fill the masked latent with seed-dependent noise |
|
||||
| `latent_nothing` | Zero the masked latent |
|
||||
|
||||
后两种 latent 填充由 **WebUI 局部重绘** 一体节点实现；独立 **重绘预处理** 只处理像素与蒙版，使用标准节点组合时请选择 `original` 或 `fill` 喵。
|
||||
`denoise=0` 与空蒙版会直接返回原图，跳过 VAE 和采样；`batch_size` 为每张输入图的变体数，使用相同 seed 可重现同一批次喵。
|
||||
多次批量运行可使用 ComfyUI 的队列数量以及 seed 的生成后控制；`batch_size` 控制单次运行数量喵。
|
||||
普通 SD/SDXL checkpoint 保持 `inpaint_model=false`；专用 inpainting 模型才开启，届时调用 ComfyUI 原生 `InpaintModelConditioning` 喵。
|
||||
The two latent fills are implemented by the all-in-one **WebUI Inpaint** node; standalone **Inpaint Prepare** only handles pixels and masks, so choose `original` or `fill` in a standard-node pipeline.
|
||||
`denoise=0` and an empty mask return the source image directly and skip VAE and sampling; `batch_size` is the number of variants per input image, and the same seed reproduces the same batch.
|
||||
For repeated batches use ComfyUI's queue count together with the seed's after-generate control; `batch_size` controls a single run.
|
||||
Keep `inpaint_model=false` for ordinary SD/SDXL checkpoints; enable it only for dedicated inpainting models, which switches to ComfyUI's native `InpaintModelConditioning`.
|
||||
|
||||
可选接入兼容的 `refiner_model`，用 `refiner_switch` 指定 base 采样步骤占比；`0.8` 表示约前 80% 步骤由 base 执行喵。
|
||||
建议用 Refiner 自身的 CLIP 编码并接入 `refiner_positive/refiner_negative`，未接入则沿用原条件，VAE 仍使用 base 侧的 VAE 喵。
|
||||
`refiner_switch=1` 只用 base，`0` 只用 Refiner；已知 latent 格式不兼容时会报错喵。
|
||||
You can optionally attach a compatible `refiner_model` and use `refiner_switch` for the share of base sampling steps; `0.8` means roughly the first 80% of steps run on the base model.
|
||||
Encoding with the Refiner's own CLIP and wiring `refiner_positive`/`refiner_negative` is recommended; if left unconnected the original conditioning is reused and the VAE still comes from the base side.
|
||||
`refiner_switch=1` uses only the base model and `0` uses only the Refiner; a known-incompatible latent format raises an error.
|
||||
|
||||
## 使用标准采样工作流
|
||||
## Using a standard sampling workflow
|
||||
|
||||
`examples/02-modular-inpaint.json` 展示可自由更换采样器的连接方式喵。
|
||||
`examples/02-modular-inpaint.json` shows a wiring you can swap samplers into.
|
||||
|
||||
```text
|
||||
Inline Mask ── image/mask ──> Inpaint Prepare
|
||||
@@ -106,50 +143,42 @@ Inline Mask ── image/mask ──> Inpaint Prepare
|
||||
Save Image
|
||||
```
|
||||
|
||||
务必将 `Prepare.context` 接回 **原图回贴 / Inpaint Composite**，这样局部结果会回到原图坐标和尺寸喵。
|
||||
标准示例针对普通 checkpoint；专用 inpainting checkpoint 应改用其需要的 conditioning 节点，或直接使用一体节点喵。
|
||||
多个输入图各生成多个变体时，Composite 需要变体按原图分组，例如 `A,A,B,B`；一体节点已按此排列，外部重复 latent 节点如果输出 `A,B,A,B`，需先调整批次顺序喵。
|
||||
Always wire `Prepare.context` back into **Inpaint Composite** so the local result returns to the source coordinates and size.
|
||||
The modular example targets ordinary checkpoints; a dedicated inpainting checkpoint should use the conditioning nodes it needs, or the all-in-one node directly.
|
||||
When several input images each produce several variants, Composite needs the variants grouped per source image (for example `A,A,B,B`); the all-in-one node already orders them that way, while an external latent-repeat node that outputs `A,B,A,B` needs its batch order adjusted first.
|
||||
|
||||
## 分享与兼容性
|
||||
## Sharing and compatibility
|
||||
|
||||
绘制蒙版自动写入工作流；默认原图只保存 ComfyUI `input/` 内的相对路径喵。
|
||||
要让别人直接打开同一张图，勾选画布下方 **原图嵌入工作流** 后再保存工作流 JSON；对方安装本插件并选择自己的模型即可继续编辑喵。
|
||||
不嵌入时，需要一并提供原图，并保持 `input/` 下的相对路径一致喵。
|
||||
嵌入会增大工作流文件，原图和蒙版也会随工作流分享，因此分享前请确认图片内容喵。
|
||||
The painted mask is written into the workflow automatically; by default only a relative path inside ComfyUI's `input/` is stored for the source image.
|
||||
To hand someone a workflow that opens on the same picture, tick **Embed source in workflow** below the canvas before saving the JSON; they install this plugin, pick their own model and can keep editing.
|
||||
Without embedding you have to supply the source image as well and keep the same relative path under `input/`.
|
||||
Embedding grows the workflow file, and the source and mask then travel with the shared workflow, so check the picture content before sharing.
|
||||
|
||||
这是原创实现的 WebUI 风格工作流，不承诺与 AUTOMATIC1111/Forge 的结果逐像素一致喵。
|
||||
`soft_edge` 是额外高斯羽化，`soft_strength` 控制额外半径，**并未复刻 WebUI 的 Soft Inpainting 原算法及其完整参数** 喵。
|
||||
采样器、调度器和 Refiner 使用当前 ComfyUI 的实现，填充算法也为本插件独立实现喵。
|
||||
目前支持静态图像与 4 维 latent；不支持视频 VAE、WebUI 脚本/扩展和自动读取 WebUI 插件配置喵。
|
||||
文件最大 64 MiB、图像最大 3200 万像素、单边最大 16384 像素；不附带模型或下载服务喵。
|
||||
已在本机 ComfyUI 的隔离 CPU 服务验证节点加载、画布编辑、工作流/运行参数保存与恢复，并用 mock VAE/采样器验证后端；尚未用实际 checkpoint 验证生成质量和各模型家族/Refiner 的兼容性喵。
|
||||
This is an original WebUI-style implementation and does not promise pixel-perfect agreement with AUTOMATIC1111/Forge results.
|
||||
`soft_edge` is extra Gaussian feathering with `soft_strength` controlling the extra radius; it **does not reimplement WebUI's Soft Inpainting algorithm or its full parameter set**.
|
||||
Samplers, schedulers and Refiner use the current ComfyUI implementations, and the fill algorithms are this plugin's own.
|
||||
Static images and 4-dimensional latents are supported; video VAEs, WebUI scripts/extensions and automatic reading of WebUI plugin configuration are not.
|
||||
Limits are 64 MiB per file, 32 megapixels per image and 16384 px per side; no models are bundled and nothing is downloaded.
|
||||
Node loading, canvas editing, workflow/executed-parameter save and restore have been verified in an isolated CPU ComfyUI service on the development machine, and the backend is verified with mock VAE/samplers; real-checkpoint image quality and compatibility across every model family and Refiner have not been tested.
|
||||
|
||||
## English quick start
|
||||
## Tests
|
||||
|
||||
Copy the entire `ComfyUI-Adachi-Workbench` folder into `ComfyUI/custom_nodes`, restart ComfyUI, then hard-refresh your browser喵.
|
||||
Search for `Inline Mask` or `WebUI Inpaint` under **安达工作台 / Adachi Workbench**喵.
|
||||
No extra pip or npm packages are required beyond ComfyUI's PyTorch, NumPy and Pillow喵.
|
||||
|
||||
Drag `examples/01-inline-inpaint.json` into ComfyUI, select a checkpoint, upload an image inside **Inline Mask**, paint, and run the workflow喵.
|
||||
White repaints and black preserves; orange is the visual mask overlay喵.
|
||||
Use `whole_image` to sample the full source extent, or `only_masked` to enlarge the padded mask bounding box for detailed local inpainting喵.
|
||||
Sampling uses `width × height`; the final `image` output is composited at the original image resolution in both modes, while `crop` exposes the generated sampling canvas喵.
|
||||
|
||||
The editor supports brush/eraser, rectangles, freehand lasso, undo/redo, invert, mask import/export, brush size/hardness/opacity, zoom, pan, drag-and-drop and clipboard images喵.
|
||||
Paint with the left button; hold Alt or use the right button to erase temporarily, use Ctrl+wheel for brush size, zoom with the plain wheel, and pan while holding Space喵.
|
||||
Enable **Embed source in workflow** before saving JSON to share the source image along with its mask喵.
|
||||
|
||||
The **Image Compare** node takes `original` from Inline Mask and `result` from the final full-size generated image; hover to compare original on the left and result on the right喵.
|
||||
Select a batch result if needed, then click **采用此结果 / Adopt this result** to upload it as the upstream editor's new source and clear the old mask for another pass喵.
|
||||
|
||||
The all-in-one node adds original/color-fill/noise/zero-latent modes, native ComfyUI sampling, per-image batch variants, dedicated inpaint conditioning and an optional compatible Refiner stage喵.
|
||||
`examples/02-modular-inpaint.json` demonstrates Prepare → standard VAE/KSampler nodes → Composite; use `original` or `fill` in that modular pipeline喵.
|
||||
`soft_edge` adds Gaussian feathering; it does not implement AUTOMATIC1111 Soft Inpainting or its complete parameter set喵.
|
||||
The plugin is an original MIT-licensed implementation and does not bundle WebUI/Forge source, models or extensions喵.
|
||||
Real-checkpoint image quality and every model/Refiner family have not been tested; browser integration and CPU/mock-sampler regression tests have been run喵.
|
||||
|
||||
Run the CPU tests from this plugin directory with your ComfyUI Python喵.
|
||||
Run the CPU tests from this plugin directory with your ComfyUI Python:
|
||||
|
||||
```powershell
|
||||
python tests/test_backend.py -v
|
||||
python -m unittest discover -s tests -v
|
||||
```
|
||||
|
||||
## 中文简介
|
||||
|
||||
本插件把蒙版绘制放在工作流节点内部，**不需要弹出遮罩编辑器**，也省去每画一笔就保存、加载磁盘文件的往返。
|
||||
连接 **WebUI 局部重绘** 节点后，画笔工具与采样参数都在该节点内，支持整图范围与蒙版范围重绘、原尺寸回贴、Alt 临时橡皮擦、Ctrl+滚轮笔径、图像对比，以及把满意的结果一键回填为新的原图继续重绘。
|
||||
代码里的默认文案是英文，以便 Manager 用户直接使用；节点搜索可输入 `Inline Mask`，分类为 **Adachi-Inpaint-Workbench**。
|
||||
|
||||
想用中文界面时，把 ComfyUI 的语言切成中文即可，插件会自动跟随：
|
||||
在 ComfyUI 设置里找到 **Locale / 语言**（设置项 `Comfy.Locale`）选择 `zh`，然后刷新浏览器（`Ctrl+F5`）。
|
||||
节点名称、分类、输入输出名与提示由 `locales/zh/` 提供，通过 ComfyUI 的 `/i18n` 机制加载；
|
||||
画布按钮与参数面板由 `web/i18n.js` 读取同一个语言设置翻译，因此「宽度」「高度」「载入原图」等也会一起变回中文。
|
||||
英文用户看到的一直是英文（英文是内置默认值）；某个词条若没有对应翻译，会自动回退为英文。
|
||||
两套语言共用同一个节点类 ID 和参数键名，所以已保存的工作流不受语言切换影响。
|
||||
|
||||
|
||||
+21
@@ -0,0 +1,21 @@
|
||||
# Git versions and rollback
|
||||
|
||||
`v0.2.0` is the first UI rollback point; `v0.3.0` added the inline parameter panel, the result/original comparison change and the wheel routing fix; `v0.4.0` moved the painting tools and parameters into the WebUI Inpaint node; `v0.4.1` refreshed the eraser cursor and the public name.
|
||||
|
||||
Both the local installation folder and the source folder keep Git history; a normal release ZIP does not contain `.git`, so use the Git bundle to restore history separately.
|
||||
|
||||
Run these commands in the plugin folder. Check there are no unsaved changes before switching versions.
|
||||
|
||||
```powershell
|
||||
git status --short
|
||||
git switch --detach v0.4.1
|
||||
```
|
||||
|
||||
Return to the current version with:
|
||||
|
||||
```powershell
|
||||
git switch main
|
||||
```
|
||||
|
||||
Restart ComfyUI and refresh the browser with `Ctrl+F5` afterwards.
|
||||
If you have local modifications, commit or back them up first so they are not overwritten.
|
||||
+30
-20
@@ -1,26 +1,36 @@
|
||||
# 验证记录
|
||||
# Verification record
|
||||
|
||||
验证环境：Windows、本机 ComfyUI 0.19.3、ComfyUI frontend 1.42.11、PyTorch 2.8.0、Pillow 11.0.0、Chrome 155，使用独立的 8190 端口、CPU、测试输入输出目录和内存数据库喵。
|
||||
Environment: Windows, local ComfyUI 0.19.3, ComfyUI frontend 1.42.11, PyTorch 2.8.0, Pillow 11.0.0, Chrome 155, using a separate port 8190 CPU service with its own input/output directories and an in-memory database.
|
||||
|
||||
- 后端 16 项 CPU 测试通过，覆盖两种范围、边缘蒙版、反相、增长、羽化、周边颜色填充、批量映射、原像素保护、空蒙版、denoise=0、潜空间噪声/置零、专用 inpaint conditioning、不同 VAE 压缩比和 Refiner 分段喵。
|
||||
- 浏览器 12 组交互测试通过，覆盖真实鼠标绘画、右键擦除、矩形/套索、撤销重做、导入持久化、半压力硬笔刷、活动形状保存、缩放坐标、1600/768/390 像素窗口布局喵。
|
||||
- 经典节点与 Nodes 2.0 均完成真实画布拖画、工作流序列化、运行参数序列化与重新载入测试，蒙版像素一致且正确触发工作流修改状态，无插件 JavaScript 错误喵。
|
||||
- 实际 ComfyUI API 队列执行了两种范围的载入→预处理→回贴→保存图像工作流，输出尺寸正确，有效蒙版外 RGB 像素逐值相等喵。
|
||||
- 两份示例由真实节点生成、重新加载并构造执行参数，节点和连线有效，模型文件名为用户选择占位符喵。
|
||||
- 安装脚本在临时目录完成首次安装、再次安装及旧版备份测试喵。
|
||||
- 0.1.1 在经典节点和 Nodes 2.0 用真实鼠标拖动底部高度条，画布增高 160px、缩小 80px，保存并重开后尺寸和蒙版均保留喵。
|
||||
- 0.1.2 用真实浏览器 Ctrl+滚轮测试笔径增减、1–512px 上下限、滑条数值同步和普通滚轮缩放，确认四个滑条位于画布下方；浏览器共 14 组交互验证通过喵。
|
||||
- 0.2.0 新增 Alt 临时擦除和图像对比节点，后端 18 项测试通过；真实鼠标/键盘操作确认松开 Alt 恢复原工具喵。
|
||||
- 0.2.0 在经典节点与 Nodes 2.0 的实际 API 队列验证左右像素、鼠标分割线、滚轮缩放、Ctrl+滚轮笔径、批量结果选择、多编辑器上游定位、点击回填、旧蒙版清空和保存后重新打开，无插件脚本错误喵。
|
||||
- 两种节点模式中的图片滚轮事件均不会误触发整张工作流缩放，回填结果保存在 input 目录并可嵌入工作流喵。
|
||||
- 16 backend CPU tests pass, covering both sampling areas, edge masks, inversion, growth, feathering, surrounding-colour fill, batch mapping, source-pixel protection, empty masks, `denoise=0`, latent noise/zero modes, dedicated inpaint conditioning, different VAE compression ratios and Refiner staging.
|
||||
- 12 browser interaction tests pass, covering real mouse painting, right-button erase, rectangle/lasso, undo/redo, import persistence, half-pressure hard brush, active-shape saving, zoom coordinates and 1600/768/390 pixel window layouts.
|
||||
- Painting on the real canvas, workflow serialization, executed-parameter serialization and reload were verified in both classic nodes and Nodes 2.0: mask pixels match and the workflow correctly enters the modified state, with no plugin JavaScript errors.
|
||||
- The real ComfyUI API queue ran load → prepare → composite → save-image workflows in both sampling areas, with correct output sizes and RGB pixels outside the effective mask equal value-by-value.
|
||||
- Both example workflows were generated by the real nodes, reloaded and used to build executed parameters; nodes and links are valid and model filenames are user-selectable placeholders.
|
||||
- The installer was tested in a temp directory for first install, repeat install and previous-version backup.
|
||||
- 0.1.1: in classic nodes and Nodes 2.0 the bottom height bar was dragged with a real mouse, growing the canvas by 160 px and shrinking it by 80 px; size and mask both survived save and reopen.
|
||||
- 0.1.2: real-browser Ctrl+wheel tests covered brush size growth and shrink, the 1–512 px limits, slider value sync and plain-wheel zoom, confirming the four sliders sit below the canvas; 14 browser interaction checks passed in total.
|
||||
- 0.2.0: added Alt temporary erase and the image comparison node; 18 backend tests pass. Real mouse/keyboard use confirms releasing Alt restores the previous tool.
|
||||
- 0.2.0: the real API queue in classic nodes and Nodes 2.0 verified left/right pixels, the mouse divider, wheel zoom, Ctrl+wheel brush size, batch result selection, upstream editor discovery with several candidates, click-to-adopt, old mask clearing and reopen after save, with no plugin script errors.
|
||||
- Picture wheel events in both node modes never trigger whole-workflow zoom by mistake, and adopted results are stored in the input directory and can be embedded in the workflow.
|
||||
- 0.3.0: in classic nodes and Nodes 2.0 the bottom inline parameters were verified to drive the real sampling node, width/height on separate rows, source-size filling, no repeated growth on workflow reopen, disconnect restoring the original parameters, and the original parameter rows actually hidden in Nodes 2.0.
|
||||
- 0.3.0: wheel events over the toolbar and parameter area pass through to the outer canvas, a continuous outer wheel gesture does not change image zoom when it enters the picture, and wheel events inside the picture after stopping zoom only the picture.
|
||||
- 0.3.0: the comparison node was measured with the result on the left and the original on the right, showing the full result on exit; the divider is a single physical pixel, the round handle, corner labels and bottom caption were removed, and adoption plus batch selection still pass.
|
||||
- 0.3.0: 15 brush browser interaction checks pass, vertical stretching and save/restore pass in both rendering modes, and the two updated example workflows pass link and executed-parameter validation.
|
||||
- 0.4.0: in classic nodes and Nodes 2.0 the inline canvas was verified to keep only the load button with the original painting DOM controls moved into the WebUI node; real mouse painting can then be undone from the inpaint node, the tools and sliders drive the original canvas and the sampling parameters correctly reach the execution request.
|
||||
- 0.4.0: canvas margins shrinking to the image ratio, thin height-bar stretching, size retention across save/reopen, source-size filling, disconnect/reconnect, deleting and recreating the inpaint node, and toolbar-area wheel events continuing to drive the outer canvas were all verified.
|
||||
- 0.4.0: the comparison node no longer has a top toolbar, with result selection, dimensions and fit moved to the bottom; left/right comparison in the real API queue, full result on exit, batch selection and result adoption all pass.
|
||||
- 0.4.1: a real browser confirms the eraser SVG cursor and erase state after holding Alt, restoring the cross brush cursor on release; temporary erase, regular painting and the 18 backend CPU regression tests pass.
|
||||
- 0.4.1: the public name was unified to Adachi-Inpaint-Workbench while node class IDs were kept so existing workflows stay compatible.
|
||||
- 0.4.2: node display names, descriptions, tooltips and frontend labels were converted to English so the nodes are usable for the general Manager audience; the same 18 backend CPU tests pass and every touched script parses.
|
||||
|
||||
采样路径还使用本机 ComfyUI 的真实 common_ksampler/KSampler 函数进行了噪声调度衔接检查；尚未加载实际 checkpoint 测试 GPU 生成质量或所有模型家族，不能将 CPU/接口测试视为模型效果验证喵。
|
||||
The sampling path was also checked for noise-schedule continuity against the real `common_ksampler`/`KSampler` functions in the local ComfyUI; an actual checkpoint has not been loaded to test GPU image quality or every model family, so CPU/interface tests must not be treated as model-quality verification.
|
||||
|
||||
实现参考资料：
|
||||
References used during implementation:
|
||||
|
||||
- [ComfyUI 前端扩展接口](https://docs.comfy.org/custom-nodes/js/javascript_overview)
|
||||
- [ComfyUI widget 序列化说明](https://github.com/Comfy-Org/ComfyUI_frontend/blob/main/docs/WIDGET_SERIALIZATION.md)
|
||||
- [WebUI 重绘预处理语义](https://github.com/AUTOMATIC1111/stable-diffusion-webui/blob/master/modules/processing.py)
|
||||
- [rgthree 图像对比交互参考](https://github.com/rgthree/rgthree-comfy/blob/main/py/image_comparer.py)
|
||||
- [ComfyUI frontend extension APIs](https://docs.comfy.org/custom-nodes/js/javascript_overview)
|
||||
- [ComfyUI widget serialization notes](https://github.com/Comfy-Org/ComfyUI_frontend/blob/main/docs/WIDGET_SERIALIZATION.md)
|
||||
- [WebUI inpainting pre-processing semantics](https://github.com/AUTOMATIC1111/stable-diffusion-webui/blob/master/modules/processing.py)
|
||||
- [rgthree image comparison interaction reference](https://github.com/rgthree/rgthree-comfy/blob/main/py/image_comparer.py)
|
||||
|
||||
插件代码为独立实现，发布许可见 LICENSE，未附带上述项目源码喵。
|
||||
The plugin code is an independent implementation; see LICENSE for the release licence. No source from the projects above is bundled.
|
||||
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
"""Adachi Inline Inpaint custom-node package for ComfyUI."""
|
||||
"""Adachi-Inpaint-Workbench custom-node package for ComfyUI."""
|
||||
|
||||
from .backend import NODE_CLASS_MAPPINGS, NODE_DISPLAY_NAME_MAPPINGS
|
||||
|
||||
|
||||
+42
-42
@@ -21,7 +21,7 @@ import torch
|
||||
import torch.nn.functional as F
|
||||
|
||||
|
||||
CATEGORY = "安达工作台 / Adachi Workbench"
|
||||
CATEGORY = "Adachi-Inpaint-Workbench"
|
||||
MAX_IMAGE_PIXELS = 32_000_000
|
||||
MAX_IMAGE_BYTES = 64 * 1024 * 1024
|
||||
MAX_DATA_URL_CHARS = 4 * ((MAX_IMAGE_BYTES + 2) // 3) + 128
|
||||
@@ -289,17 +289,17 @@ def _composite(generated, context):
|
||||
|
||||
def _prepare_inputs():
|
||||
return {
|
||||
"image": ("IMAGE", {"tooltip": "原图 / Original image; output is restored to this exact size."}),
|
||||
"mask": ("MASK", {"tooltip": "白色重绘，黑色保护 / White repaints; black preserves."}),
|
||||
"area": (["whole_image", "only_masked"], {"default": "only_masked", "tooltip": "whole_image：整张原图缩放采样；only_masked：蒙版包围框加边距放大采样，再贴回原图 / Whole image or mask bounding-box inpainting."}),
|
||||
"width": ("INT", {"default": 1024, "min": 64, "max": 8192, "step": 8, "tooltip": "采样画布宽度；最终输出仍为原图尺寸 / Sampling canvas width, independent of final image size."}),
|
||||
"height": ("INT", {"default": 1024, "min": 64, "max": 8192, "step": 8, "tooltip": "采样画布高度 / Sampling canvas height."}),
|
||||
"padding": ("INT", {"default": 32, "min": 0, "max": 2048, "step": 1, "tooltip": "仅蒙版区域：原图像素单位的上下文边距 / Mask-only context padding in original pixels."}),
|
||||
"mask_blur": ("FLOAT", {"default": 4.0, "min": 0.0, "max": 128.0, "step": 0.5, "tooltip": "原图像素单位的高斯羽化半径 / Gaussian mask feathering in original pixels."}),
|
||||
"mask_grow": ("INT", {"default": 0, "min": -128, "max": 128, "step": 1, "tooltip": "正数扩张，负数收缩 / Positive dilates; negative erodes the mask."}),
|
||||
"mask_mode": (["inside", "outside"], {"default": "inside", "tooltip": "inside：蒙版内；outside：蒙版外 / Repaint inside or invert the mask."}),
|
||||
"fill": (["original", "fill", "latent_noise", "latent_nothing"], {"default": "original", "tooltip": "原图像素、周围颜色填充、潜空间噪声、空白潜空间；后两项由一体采样节点在 latent 层实现 / Original, surrounding-color fill, latent noise, or zero latent. Latent modes require the all-in-one sampler."}),
|
||||
"resize_mode": (["stretch", "crop", "fill"], {"default": "stretch", "tooltip": "整图模式：拉伸、居中裁剪、保比例填充；仅蒙版模式自动保留完整蒙版 / Whole-image resize mode; mask-only mode always retains the entire mask."}),
|
||||
"image": ("IMAGE", {"tooltip": "Original image; output is restored to this exact size."}),
|
||||
"mask": ("MASK", {"tooltip": "White repaints; black preserves."}),
|
||||
"area": (["whole_image", "only_masked"], {"default": "only_masked", "tooltip": "Whole image or mask bounding-box inpainting."}),
|
||||
"width": ("INT", {"default": 1024, "min": 64, "max": 8192, "step": 8, "tooltip": "Sampling canvas width, independent of final image size."}),
|
||||
"height": ("INT", {"default": 1024, "min": 64, "max": 8192, "step": 8, "tooltip": "Sampling canvas height."}),
|
||||
"padding": ("INT", {"default": 32, "min": 0, "max": 2048, "step": 1, "tooltip": "Mask-only context padding in original pixels."}),
|
||||
"mask_blur": ("FLOAT", {"default": 4.0, "min": 0.0, "max": 128.0, "step": 0.5, "tooltip": "Gaussian mask feathering in original pixels."}),
|
||||
"mask_grow": ("INT", {"default": 0, "min": -128, "max": 128, "step": 1, "tooltip": "Positive dilates; negative erodes the mask."}),
|
||||
"mask_mode": (["inside", "outside"], {"default": "inside", "tooltip": "Repaint inside or invert the mask."}),
|
||||
"fill": (["original", "fill", "latent_noise", "latent_nothing"], {"default": "original", "tooltip": "Original, surrounding-color fill, latent noise, or zero latent. Latent modes require the all-in-one sampler."}),
|
||||
"resize_mode": (["stretch", "crop", "fill"], {"default": "stretch", "tooltip": "Whole-image resize mode; mask-only mode always retains the entire mask."}),
|
||||
}
|
||||
|
||||
|
||||
@@ -307,16 +307,16 @@ class AdachiInlineMask:
|
||||
@classmethod
|
||||
def INPUT_TYPES(cls):
|
||||
return {"required": {
|
||||
"image": ("STRING", {"default": "", "tooltip": "ComfyUI input 图片路径，由内联编辑器上传 / Input image path populated by inline upload."}),
|
||||
"mask_data": ("STRING", {"default": "", "multiline": False, "tooltip": "编辑器保存的白底重绘蒙版 PNG / Editor mask PNG data URL; white repaints."}),
|
||||
"source_data": ("STRING", {"default": "", "multiline": False, "tooltip": "嵌入原图以便工作流在其他机器使用 / Embedded source image for portable workflows."}),
|
||||
"image": ("STRING", {"default": "", "tooltip": "Input image path populated by inline upload."}),
|
||||
"mask_data": ("STRING", {"default": "", "multiline": False, "tooltip": "Editor mask PNG data URL; white repaints."}),
|
||||
"source_data": ("STRING", {"default": "", "multiline": False, "tooltip": "Embedded source image for portable workflows."}),
|
||||
}}
|
||||
|
||||
RETURN_TYPES = ("IMAGE", "MASK")
|
||||
RETURN_NAMES = ("image", "mask")
|
||||
FUNCTION = "load"
|
||||
CATEGORY = CATEGORY
|
||||
DESCRIPTION = "直接在工作流节点内涂抹蒙版，无需打开独立编辑器 / Paint an inpaint mask directly in the workflow."
|
||||
DESCRIPTION = "Paint an inpaint mask directly in the workflow."
|
||||
SEARCH_ALIASES = ["inline mask", "webui inpaint", "局部重绘", "安达", "adachi"]
|
||||
|
||||
@classmethod
|
||||
@@ -352,15 +352,15 @@ class AdachiInpaintPrepare:
|
||||
@classmethod
|
||||
def INPUT_TYPES(cls):
|
||||
return {"required": _prepare_inputs(), "optional": {
|
||||
"soft_edge": ("BOOLEAN", {"default": False, "tooltip": "额外羽化；不是 A1111 Soft Inpainting 算法 / Extra feathering, not AUTOMATIC1111's Soft Inpainting algorithm."}),
|
||||
"soft_strength": ("FLOAT", {"default": 0.5, "min": 0.0, "max": 1.0, "step": 0.05, "tooltip": "额外增加 0–16 像素羽化 / Adds 0–16 pixels of Gaussian feathering."}),
|
||||
"soft_edge": ("BOOLEAN", {"default": False, "tooltip": "Extra feathering, not AUTOMATIC1111's Soft Inpainting algorithm."}),
|
||||
"soft_strength": ("FLOAT", {"default": 0.5, "min": 0.0, "max": 1.0, "step": 0.05, "tooltip": "Adds 0–16 pixels of Gaussian feathering."}),
|
||||
}}
|
||||
|
||||
RETURN_TYPES = ("IMAGE", "MASK", "ADACHI_INPAINT_CONTEXT")
|
||||
RETURN_NAMES = ("pixels", "mask", "context")
|
||||
FUNCTION = "prepare"
|
||||
CATEGORY = CATEGORY
|
||||
DESCRIPTION = "局部重绘裁剪、蒙版处理与精确回贴上下文；latent 填充请使用一体采样节点 / Crop and prepare masks with exact compositing context; use the all-in-one sampler for latent fill modes."
|
||||
DESCRIPTION = "Crop and prepare masks with exact compositing context; use the all-in-one sampler for latent fill modes."
|
||||
SEARCH_ALIASES = ["inpaint crop", "局部重绘预处理", "webui", "adachi"]
|
||||
|
||||
def prepare(self, image, mask, **kwargs):
|
||||
@@ -371,15 +371,15 @@ class AdachiInpaintComposite:
|
||||
@classmethod
|
||||
def INPUT_TYPES(cls):
|
||||
return {"required": {
|
||||
"generated": ("IMAGE", {"tooltip": "采样后的裁剪图 / Generated sampling canvas."}),
|
||||
"context": ("ADACHI_INPAINT_CONTEXT", {"tooltip": "预处理节点的裁剪和原图上下文 / Context from Adachi Inpaint Prepare."}),
|
||||
"generated": ("IMAGE", {"tooltip": "Generated sampling canvas."}),
|
||||
"context": ("ADACHI_INPAINT_CONTEXT", {"tooltip": "Context from Adachi Inpaint Prepare."}),
|
||||
}}
|
||||
|
||||
RETURN_TYPES = ("IMAGE",)
|
||||
RETURN_NAMES = ("image",)
|
||||
FUNCTION = "composite"
|
||||
CATEGORY = CATEGORY
|
||||
DESCRIPTION = "还原原图尺寸，软蒙版外保持原像素不变 / Restore original size and preserve pixels outside the effective mask exactly."
|
||||
DESCRIPTION = "Restore original size and preserve pixels outside the effective mask exactly."
|
||||
SEARCH_ALIASES = ["inpaint paste", "局部重绘回贴", "adachi"]
|
||||
|
||||
def composite(self, generated, context):
|
||||
@@ -430,29 +430,29 @@ class AdachiWebUIInpaint:
|
||||
required = {
|
||||
"model": ("MODEL",), "positive": ("CONDITIONING",), "negative": ("CONDITIONING",), "vae": ("VAE",),
|
||||
**_prepare_inputs(),
|
||||
"seed": ("INT", {"default": 0, "min": 0, "max": 0xFFFFFFFFFFFFFFFF, "control_after_generate": True, "tooltip": "可复现批量随机种子 / Seed for a reproducible batch of distinct samples."}),
|
||||
"seed": ("INT", {"default": 0, "min": 0, "max": 0xFFFFFFFFFFFFFFFF, "control_after_generate": True, "tooltip": "Seed for a reproducible batch of distinct samples."}),
|
||||
"steps": ("INT", {"default": 20, "min": 1, "max": 10000}),
|
||||
"cfg": ("FLOAT", {"default": 7.0, "min": 0.0, "max": 100.0, "step": 0.1}),
|
||||
"sampler_name": (comfy.samplers.KSampler.SAMPLERS,),
|
||||
"scheduler": (comfy.samplers.KSampler.SCHEDULERS,),
|
||||
"denoise": ("FLOAT", {"default": 0.75, "min": 0.0, "max": 1.0, "step": 0.01, "tooltip": "0 原样返回原图，1 完全重绘 / Zero returns the original exactly; one fully denoises."}),
|
||||
"batch_size": ("INT", {"default": 1, "min": 1, "max": 16, "tooltip": "每张输入图生成数量 / Number of generated variants per input image."}),
|
||||
"refiner_switch": ("FLOAT", {"default": 0.8, "min": 0.0, "max": 1.0, "step": 0.01, "tooltip": "接入 Refiner 时的采样切换比例；0全程refiner，1全程base / Fraction of steps on the base model when a refiner is connected."}),
|
||||
"denoise": ("FLOAT", {"default": 0.75, "min": 0.0, "max": 1.0, "step": 0.01, "tooltip": "Zero returns the original exactly; one fully denoises."}),
|
||||
"batch_size": ("INT", {"default": 1, "min": 1, "max": 16, "tooltip": "Number of generated variants per input image."}),
|
||||
"refiner_switch": ("FLOAT", {"default": 0.8, "min": 0.0, "max": 1.0, "step": 0.01, "tooltip": "Fraction of steps on the base model when a refiner is connected."}),
|
||||
}
|
||||
return {"required": required, "optional": {
|
||||
"inpaint_model": ("BOOLEAN", {"default": False, "tooltip": "仅专用 inpaint 模型开启，添加原生 inpaint conditioning / Enable only for dedicated inpainting models; uses ComfyUI's native InpaintModelConditioning."}),
|
||||
"soft_edge": ("BOOLEAN", {"default": False, "tooltip": "额外羽化，并非 A1111 Soft Inpainting 原算法 / Extra feathering, not A1111 Soft Inpainting."}),
|
||||
"inpaint_model": ("BOOLEAN", {"default": False, "tooltip": "Enable only for dedicated inpainting models; uses ComfyUI's native InpaintModelConditioning."}),
|
||||
"soft_edge": ("BOOLEAN", {"default": False, "tooltip": "Extra feathering, not A1111 Soft Inpainting."}),
|
||||
"soft_strength": ("FLOAT", {"default": 0.5, "min": 0.0, "max": 1.0, "step": 0.05}),
|
||||
"refiner_model": ("MODEL", {"tooltip": "可选的兼容 Refiner 模型（例如 SDXL refiner） / Optional compatible refiner model, e.g. SDXL refiner."}),
|
||||
"refiner_positive": ("CONDITIONING", {"tooltip": "用 Refiner 的 CLIP 编码；未连接则沿用原始正面条件 / Encode using the refiner CLIP; defaults to original positive conditioning."}),
|
||||
"refiner_negative": ("CONDITIONING", {"tooltip": "用 Refiner 的 CLIP 编码；未连接则沿用原始负面条件 / Encode using the refiner CLIP; defaults to original negative conditioning."}),
|
||||
"refiner_model": ("MODEL", {"tooltip": "Optional compatible refiner model, e.g. SDXL refiner."}),
|
||||
"refiner_positive": ("CONDITIONING", {"tooltip": "Encode using the refiner CLIP; defaults to original positive conditioning."}),
|
||||
"refiner_negative": ("CONDITIONING", {"tooltip": "Encode using the refiner CLIP; defaults to original negative conditioning."}),
|
||||
}}
|
||||
|
||||
RETURN_TYPES = ("IMAGE", "IMAGE", "MASK")
|
||||
RETURN_NAMES = ("image", "crop", "mask")
|
||||
FUNCTION = "sample"
|
||||
CATEGORY = CATEGORY
|
||||
DESCRIPTION = "WebUI 式局部重绘：整图/蒙版区域、填充、采样和原尺寸回贴 / WebUI-style inpainting, crop, latent fill, sampling and original-size compositing."
|
||||
DESCRIPTION = "WebUI-style inpainting, crop, latent fill, sampling and original-size compositing."
|
||||
SEARCH_ALIASES = ["webui", "img2img", "inpaint", "局部重绘", "安达", "adachi"]
|
||||
|
||||
def sample(self, model, positive, negative, vae, image, mask, seed=0, steps=20, cfg=7.0,
|
||||
@@ -525,8 +525,8 @@ class AdachiImageCompare:
|
||||
@classmethod
|
||||
def INPUT_TYPES(cls):
|
||||
return {"required": {
|
||||
"original": ("IMAGE", {"tooltip": "左侧原图，连接内联蒙版的 image / Original image shown on the left."}),
|
||||
"result": ("IMAGE", {"tooltip": "右侧完整重绘图，请连接最终 image 而非 crop / Full-size generated image shown on the right; use image, not crop."}),
|
||||
"original": ("IMAGE", {"tooltip": "Original image shown on the right."}),
|
||||
"result": ("IMAGE", {"tooltip": "Full-size generated image shown on the left; use image, not crop."}),
|
||||
}}
|
||||
|
||||
RETURN_TYPES = ("IMAGE",)
|
||||
@@ -534,7 +534,7 @@ class AdachiImageCompare:
|
||||
FUNCTION = "compare"
|
||||
OUTPUT_NODE = True
|
||||
CATEGORY = CATEGORY
|
||||
DESCRIPTION = "鼠标竖线左右对比原图与重绘结果；点击采用此结果可送回上游内联蒙版 / Hover to compare; adopt a result into the upstream inline editor."
|
||||
DESCRIPTION = "Hover to compare; adopt a result into the upstream inline editor."
|
||||
SEARCH_ALIASES = ["compare", "before after", "图像对比", "adachi", "安达工作台"]
|
||||
|
||||
def compare(self, original, result):
|
||||
@@ -542,9 +542,9 @@ class AdachiImageCompare:
|
||||
|
||||
original, result = _image_tensor(original), _image_tensor(result)
|
||||
if original.shape[1:3] != result.shape[1:3]:
|
||||
raise ValueError("原图与结果尺寸须一致，请连接最终 image 输出而非 crop / Image sizes must match. Connect the final image output, not crop.")
|
||||
raise ValueError("Image sizes must match. Connect the final image output, not crop.")
|
||||
if result.shape[0] % original.shape[0]:
|
||||
raise ValueError("结果批量须为原图批量的整数倍 / Result batch must be a multiple of the original batch.")
|
||||
raise ValueError("Result batch must be a multiple of the original batch.")
|
||||
if original.shape[1] * original.shape[2] > MAX_IMAGE_PIXELS or max(original.shape[1:3]) > 16384:
|
||||
raise ValueError("Comparison images exceed the inline editor's 32 megapixel / 16384px limit.")
|
||||
preview = nodes.PreviewImage()
|
||||
@@ -562,9 +562,9 @@ NODE_CLASS_MAPPINGS = {
|
||||
}
|
||||
|
||||
NODE_DISPLAY_NAME_MAPPINGS = {
|
||||
"AdachiInlineMask": "内联蒙版 / Inline Mask",
|
||||
"AdachiInpaintPrepare": "重绘预处理 / Inpaint Prepare",
|
||||
"AdachiInpaintComposite": "原图回贴 / Inpaint Composite",
|
||||
"AdachiWebUIInpaint": "WebUI 局部重绘 / WebUI Inpaint",
|
||||
"AdachiImageCompare": "图像对比 / Image Compare",
|
||||
"AdachiInlineMask": "Inline Mask",
|
||||
"AdachiInpaintPrepare": "Inpaint Prepare",
|
||||
"AdachiInpaintComposite": "Inpaint Composite",
|
||||
"AdachiWebUIInpaint": "WebUI Inpaint",
|
||||
"AdachiImageCompare": "Image Compare",
|
||||
}
|
||||
|
||||
@@ -20,7 +20,6 @@
|
||||
"mode": 0,
|
||||
"inputs": [
|
||||
{
|
||||
"localized_name": "image",
|
||||
"name": "image",
|
||||
"type": "STRING",
|
||||
"widget": {
|
||||
@@ -29,7 +28,6 @@
|
||||
"link": null
|
||||
},
|
||||
{
|
||||
"localized_name": "mask_data",
|
||||
"name": "mask_data",
|
||||
"type": "STRING",
|
||||
"widget": {
|
||||
@@ -38,7 +36,6 @@
|
||||
"link": null
|
||||
},
|
||||
{
|
||||
"localized_name": "source_data",
|
||||
"name": "source_data",
|
||||
"type": "STRING",
|
||||
"widget": {
|
||||
@@ -49,7 +46,6 @@
|
||||
],
|
||||
"outputs": [
|
||||
{
|
||||
"localized_name": "image",
|
||||
"name": "image",
|
||||
"type": "IMAGE",
|
||||
"links": [
|
||||
@@ -58,7 +54,6 @@
|
||||
]
|
||||
},
|
||||
{
|
||||
"localized_name": "mask",
|
||||
"name": "mask",
|
||||
"type": "MASK",
|
||||
"links": [
|
||||
@@ -84,14 +79,13 @@
|
||||
],
|
||||
"size": [
|
||||
340,
|
||||
110
|
||||
130.65625
|
||||
],
|
||||
"flags": {},
|
||||
"order": 1,
|
||||
"mode": 0,
|
||||
"inputs": [
|
||||
{
|
||||
"localized_name": "Checkpoint名称",
|
||||
"name": "ckpt_name",
|
||||
"type": "COMBO",
|
||||
"widget": {
|
||||
@@ -102,7 +96,6 @@
|
||||
],
|
||||
"outputs": [
|
||||
{
|
||||
"localized_name": "模型",
|
||||
"name": "MODEL",
|
||||
"type": "MODEL",
|
||||
"links": [
|
||||
@@ -110,7 +103,6 @@
|
||||
]
|
||||
},
|
||||
{
|
||||
"localized_name": "CLIP",
|
||||
"name": "CLIP",
|
||||
"type": "CLIP",
|
||||
"links": [
|
||||
@@ -119,7 +111,6 @@
|
||||
]
|
||||
},
|
||||
{
|
||||
"localized_name": "VAE",
|
||||
"name": "VAE",
|
||||
"type": "VAE",
|
||||
"links": [
|
||||
@@ -150,13 +141,11 @@
|
||||
"mode": 0,
|
||||
"inputs": [
|
||||
{
|
||||
"localized_name": "clip",
|
||||
"name": "clip",
|
||||
"type": "CLIP",
|
||||
"link": 1
|
||||
},
|
||||
{
|
||||
"localized_name": "文本",
|
||||
"name": "text",
|
||||
"type": "STRING",
|
||||
"widget": {
|
||||
@@ -167,7 +156,6 @@
|
||||
],
|
||||
"outputs": [
|
||||
{
|
||||
"localized_name": "条件",
|
||||
"name": "CONDITIONING",
|
||||
"type": "CONDITIONING",
|
||||
"links": [
|
||||
@@ -175,7 +163,7 @@
|
||||
]
|
||||
}
|
||||
],
|
||||
"title": "正面提示词 / Positive",
|
||||
"title": "Positive",
|
||||
"properties": {
|
||||
"Node name for S&R": "CLIPTextEncode"
|
||||
},
|
||||
@@ -199,13 +187,11 @@
|
||||
"mode": 0,
|
||||
"inputs": [
|
||||
{
|
||||
"localized_name": "clip",
|
||||
"name": "clip",
|
||||
"type": "CLIP",
|
||||
"link": 2
|
||||
},
|
||||
{
|
||||
"localized_name": "文本",
|
||||
"name": "text",
|
||||
"type": "STRING",
|
||||
"widget": {
|
||||
@@ -216,7 +202,6 @@
|
||||
],
|
||||
"outputs": [
|
||||
{
|
||||
"localized_name": "条件",
|
||||
"name": "CONDITIONING",
|
||||
"type": "CONDITIONING",
|
||||
"links": [
|
||||
@@ -224,7 +209,7 @@
|
||||
]
|
||||
}
|
||||
],
|
||||
"title": "负面提示词 / Negative",
|
||||
"title": "Negative",
|
||||
"properties": {
|
||||
"Node name for S&R": "CLIPTextEncode"
|
||||
},
|
||||
@@ -241,71 +226,61 @@
|
||||
],
|
||||
"size": [
|
||||
430,
|
||||
780
|
||||
1020
|
||||
],
|
||||
"flags": {},
|
||||
"order": 5,
|
||||
"mode": 0,
|
||||
"inputs": [
|
||||
{
|
||||
"localized_name": "model",
|
||||
"name": "model",
|
||||
"type": "MODEL",
|
||||
"link": 3
|
||||
},
|
||||
{
|
||||
"localized_name": "positive",
|
||||
"name": "positive",
|
||||
"type": "CONDITIONING",
|
||||
"link": 5
|
||||
},
|
||||
{
|
||||
"localized_name": "negative",
|
||||
"name": "negative",
|
||||
"type": "CONDITIONING",
|
||||
"link": 6
|
||||
},
|
||||
{
|
||||
"localized_name": "vae",
|
||||
"name": "vae",
|
||||
"type": "VAE",
|
||||
"link": 4
|
||||
},
|
||||
{
|
||||
"localized_name": "image",
|
||||
"name": "image",
|
||||
"type": "IMAGE",
|
||||
"link": 7
|
||||
},
|
||||
{
|
||||
"localized_name": "mask",
|
||||
"name": "mask",
|
||||
"type": "MASK",
|
||||
"link": 8
|
||||
},
|
||||
{
|
||||
"localized_name": "refiner_model",
|
||||
"name": "refiner_model",
|
||||
"shape": 7,
|
||||
"type": "MODEL",
|
||||
"link": null
|
||||
},
|
||||
{
|
||||
"localized_name": "refiner_positive",
|
||||
"name": "refiner_positive",
|
||||
"shape": 7,
|
||||
"type": "CONDITIONING",
|
||||
"link": null
|
||||
},
|
||||
{
|
||||
"localized_name": "refiner_negative",
|
||||
"name": "refiner_negative",
|
||||
"shape": 7,
|
||||
"type": "CONDITIONING",
|
||||
"link": null
|
||||
},
|
||||
{
|
||||
"localized_name": "area",
|
||||
"name": "area",
|
||||
"type": "COMBO",
|
||||
"widget": {
|
||||
@@ -314,7 +289,6 @@
|
||||
"link": null
|
||||
},
|
||||
{
|
||||
"localized_name": "width",
|
||||
"name": "width",
|
||||
"type": "INT",
|
||||
"widget": {
|
||||
@@ -323,7 +297,6 @@
|
||||
"link": null
|
||||
},
|
||||
{
|
||||
"localized_name": "height",
|
||||
"name": "height",
|
||||
"type": "INT",
|
||||
"widget": {
|
||||
@@ -332,7 +305,6 @@
|
||||
"link": null
|
||||
},
|
||||
{
|
||||
"localized_name": "padding",
|
||||
"name": "padding",
|
||||
"type": "INT",
|
||||
"widget": {
|
||||
@@ -341,7 +313,6 @@
|
||||
"link": null
|
||||
},
|
||||
{
|
||||
"localized_name": "mask_blur",
|
||||
"name": "mask_blur",
|
||||
"type": "FLOAT",
|
||||
"widget": {
|
||||
@@ -350,7 +321,6 @@
|
||||
"link": null
|
||||
},
|
||||
{
|
||||
"localized_name": "mask_grow",
|
||||
"name": "mask_grow",
|
||||
"type": "INT",
|
||||
"widget": {
|
||||
@@ -359,7 +329,6 @@
|
||||
"link": null
|
||||
},
|
||||
{
|
||||
"localized_name": "mask_mode",
|
||||
"name": "mask_mode",
|
||||
"type": "COMBO",
|
||||
"widget": {
|
||||
@@ -368,7 +337,6 @@
|
||||
"link": null
|
||||
},
|
||||
{
|
||||
"localized_name": "fill",
|
||||
"name": "fill",
|
||||
"type": "COMBO",
|
||||
"widget": {
|
||||
@@ -377,7 +345,6 @@
|
||||
"link": null
|
||||
},
|
||||
{
|
||||
"localized_name": "resize_mode",
|
||||
"name": "resize_mode",
|
||||
"type": "COMBO",
|
||||
"widget": {
|
||||
@@ -386,7 +353,6 @@
|
||||
"link": null
|
||||
},
|
||||
{
|
||||
"localized_name": "seed",
|
||||
"name": "seed",
|
||||
"type": "INT",
|
||||
"widget": {
|
||||
@@ -395,7 +361,6 @@
|
||||
"link": null
|
||||
},
|
||||
{
|
||||
"localized_name": "steps",
|
||||
"name": "steps",
|
||||
"type": "INT",
|
||||
"widget": {
|
||||
@@ -404,7 +369,6 @@
|
||||
"link": null
|
||||
},
|
||||
{
|
||||
"localized_name": "cfg",
|
||||
"name": "cfg",
|
||||
"type": "FLOAT",
|
||||
"widget": {
|
||||
@@ -413,7 +377,6 @@
|
||||
"link": null
|
||||
},
|
||||
{
|
||||
"localized_name": "sampler_name",
|
||||
"name": "sampler_name",
|
||||
"type": "COMBO",
|
||||
"widget": {
|
||||
@@ -422,7 +385,6 @@
|
||||
"link": null
|
||||
},
|
||||
{
|
||||
"localized_name": "scheduler",
|
||||
"name": "scheduler",
|
||||
"type": "COMBO",
|
||||
"widget": {
|
||||
@@ -431,7 +393,6 @@
|
||||
"link": null
|
||||
},
|
||||
{
|
||||
"localized_name": "denoise",
|
||||
"name": "denoise",
|
||||
"type": "FLOAT",
|
||||
"widget": {
|
||||
@@ -440,7 +401,6 @@
|
||||
"link": null
|
||||
},
|
||||
{
|
||||
"localized_name": "batch_size",
|
||||
"name": "batch_size",
|
||||
"type": "INT",
|
||||
"widget": {
|
||||
@@ -449,7 +409,6 @@
|
||||
"link": null
|
||||
},
|
||||
{
|
||||
"localized_name": "refiner_switch",
|
||||
"name": "refiner_switch",
|
||||
"type": "FLOAT",
|
||||
"widget": {
|
||||
@@ -458,7 +417,6 @@
|
||||
"link": null
|
||||
},
|
||||
{
|
||||
"localized_name": "inpaint_model",
|
||||
"name": "inpaint_model",
|
||||
"shape": 7,
|
||||
"type": "BOOLEAN",
|
||||
@@ -468,7 +426,6 @@
|
||||
"link": null
|
||||
},
|
||||
{
|
||||
"localized_name": "soft_edge",
|
||||
"name": "soft_edge",
|
||||
"shape": 7,
|
||||
"type": "BOOLEAN",
|
||||
@@ -478,7 +435,6 @@
|
||||
"link": null
|
||||
},
|
||||
{
|
||||
"localized_name": "soft_strength",
|
||||
"name": "soft_strength",
|
||||
"shape": 7,
|
||||
"type": "FLOAT",
|
||||
@@ -490,7 +446,6 @@
|
||||
],
|
||||
"outputs": [
|
||||
{
|
||||
"localized_name": "image",
|
||||
"name": "image",
|
||||
"type": "IMAGE",
|
||||
"links": [
|
||||
@@ -498,13 +453,11 @@
|
||||
]
|
||||
},
|
||||
{
|
||||
"localized_name": "crop",
|
||||
"name": "crop",
|
||||
"type": "IMAGE",
|
||||
"links": null
|
||||
},
|
||||
{
|
||||
"localized_name": "mask",
|
||||
"name": "mask",
|
||||
"type": "MASK",
|
||||
"links": null
|
||||
@@ -553,13 +506,11 @@
|
||||
"mode": 0,
|
||||
"inputs": [
|
||||
{
|
||||
"localized_name": "original",
|
||||
"name": "original",
|
||||
"type": "IMAGE",
|
||||
"link": 9
|
||||
},
|
||||
{
|
||||
"localized_name": "result",
|
||||
"name": "result",
|
||||
"type": "IMAGE",
|
||||
"link": 10
|
||||
@@ -567,7 +518,6 @@
|
||||
],
|
||||
"outputs": [
|
||||
{
|
||||
"localized_name": "image",
|
||||
"name": "image",
|
||||
"type": "IMAGE",
|
||||
"links": [
|
||||
@@ -596,13 +546,11 @@
|
||||
"mode": 0,
|
||||
"inputs": [
|
||||
{
|
||||
"localized_name": "图片",
|
||||
"name": "images",
|
||||
"type": "IMAGE",
|
||||
"link": 11
|
||||
},
|
||||
{
|
||||
"localized_name": "文件名前缀",
|
||||
"name": "filename_prefix",
|
||||
"type": "STRING",
|
||||
"widget": {
|
||||
@@ -635,7 +583,7 @@
|
||||
"outputs": [],
|
||||
"properties": {},
|
||||
"widgets_values": [
|
||||
"安达工作台 / Adachi Workbench\n1. 选择自己的 checkpoint 喵\n2. 在左侧节点载入原图并直接涂抹喵\n3. only_masked = 蒙版区域放大采样，whole_image = 整图采样喵\n4. width/height 是采样分辨率，最终 image 回贴为原图尺寸喵\n分享时勾选「原图嵌入工作流」喵"
|
||||
"Adachi-Inpaint-Workbench\n1. Pick your own checkpoint\n2. Load an image in the left node and paint directly on it\n3. Select the brush and adjust inpainting parameters in the WebUI Inpaint node\n4. width/height is the sampling resolution; the final image is composited back at the source size\nTick \"Embed source in workflow\" in the inpaint node before sharing"
|
||||
],
|
||||
"color": "#432",
|
||||
"bgcolor": "#653"
|
||||
@@ -743,4 +691,4 @@
|
||||
}
|
||||
},
|
||||
"version": 0.4
|
||||
}
|
||||
}
|
||||
|
||||
@@ -20,7 +20,6 @@
|
||||
"mode": 0,
|
||||
"inputs": [
|
||||
{
|
||||
"localized_name": "image",
|
||||
"name": "image",
|
||||
"type": "STRING",
|
||||
"widget": {
|
||||
@@ -29,7 +28,6 @@
|
||||
"link": null
|
||||
},
|
||||
{
|
||||
"localized_name": "mask_data",
|
||||
"name": "mask_data",
|
||||
"type": "STRING",
|
||||
"widget": {
|
||||
@@ -38,7 +36,6 @@
|
||||
"link": null
|
||||
},
|
||||
{
|
||||
"localized_name": "source_data",
|
||||
"name": "source_data",
|
||||
"type": "STRING",
|
||||
"widget": {
|
||||
@@ -49,7 +46,6 @@
|
||||
],
|
||||
"outputs": [
|
||||
{
|
||||
"localized_name": "image",
|
||||
"name": "image",
|
||||
"type": "IMAGE",
|
||||
"links": [
|
||||
@@ -58,7 +54,6 @@
|
||||
]
|
||||
},
|
||||
{
|
||||
"localized_name": "mask",
|
||||
"name": "mask",
|
||||
"type": "MASK",
|
||||
"links": [
|
||||
@@ -91,7 +86,6 @@
|
||||
"mode": 0,
|
||||
"inputs": [
|
||||
{
|
||||
"localized_name": "Checkpoint名称",
|
||||
"name": "ckpt_name",
|
||||
"type": "COMBO",
|
||||
"widget": {
|
||||
@@ -102,7 +96,6 @@
|
||||
],
|
||||
"outputs": [
|
||||
{
|
||||
"localized_name": "模型",
|
||||
"name": "MODEL",
|
||||
"type": "MODEL",
|
||||
"links": [
|
||||
@@ -110,7 +103,6 @@
|
||||
]
|
||||
},
|
||||
{
|
||||
"localized_name": "CLIP",
|
||||
"name": "CLIP",
|
||||
"type": "CLIP",
|
||||
"links": [
|
||||
@@ -119,7 +111,6 @@
|
||||
]
|
||||
},
|
||||
{
|
||||
"localized_name": "VAE",
|
||||
"name": "VAE",
|
||||
"type": "VAE",
|
||||
"links": [
|
||||
@@ -151,13 +142,11 @@
|
||||
"mode": 0,
|
||||
"inputs": [
|
||||
{
|
||||
"localized_name": "clip",
|
||||
"name": "clip",
|
||||
"type": "CLIP",
|
||||
"link": 1
|
||||
},
|
||||
{
|
||||
"localized_name": "文本",
|
||||
"name": "text",
|
||||
"type": "STRING",
|
||||
"widget": {
|
||||
@@ -168,7 +157,6 @@
|
||||
],
|
||||
"outputs": [
|
||||
{
|
||||
"localized_name": "条件",
|
||||
"name": "CONDITIONING",
|
||||
"type": "CONDITIONING",
|
||||
"links": [
|
||||
@@ -176,7 +164,7 @@
|
||||
]
|
||||
}
|
||||
],
|
||||
"title": "正面提示词 / Positive",
|
||||
"title": "Positive",
|
||||
"properties": {
|
||||
"Node name for S&R": "CLIPTextEncode"
|
||||
},
|
||||
@@ -200,13 +188,11 @@
|
||||
"mode": 0,
|
||||
"inputs": [
|
||||
{
|
||||
"localized_name": "clip",
|
||||
"name": "clip",
|
||||
"type": "CLIP",
|
||||
"link": 2
|
||||
},
|
||||
{
|
||||
"localized_name": "文本",
|
||||
"name": "text",
|
||||
"type": "STRING",
|
||||
"widget": {
|
||||
@@ -217,7 +203,6 @@
|
||||
],
|
||||
"outputs": [
|
||||
{
|
||||
"localized_name": "条件",
|
||||
"name": "CONDITIONING",
|
||||
"type": "CONDITIONING",
|
||||
"links": [
|
||||
@@ -225,7 +210,7 @@
|
||||
]
|
||||
}
|
||||
],
|
||||
"title": "负面提示词 / Negative",
|
||||
"title": "Negative",
|
||||
"properties": {
|
||||
"Node name for S&R": "CLIPTextEncode"
|
||||
},
|
||||
@@ -242,26 +227,23 @@
|
||||
],
|
||||
"size": [
|
||||
350,
|
||||
420
|
||||
763
|
||||
],
|
||||
"flags": {},
|
||||
"order": 3,
|
||||
"mode": 0,
|
||||
"inputs": [
|
||||
{
|
||||
"localized_name": "image",
|
||||
"name": "image",
|
||||
"type": "IMAGE",
|
||||
"link": 3
|
||||
},
|
||||
{
|
||||
"localized_name": "mask",
|
||||
"name": "mask",
|
||||
"type": "MASK",
|
||||
"link": 4
|
||||
},
|
||||
{
|
||||
"localized_name": "area",
|
||||
"name": "area",
|
||||
"type": "COMBO",
|
||||
"widget": {
|
||||
@@ -270,7 +252,6 @@
|
||||
"link": null
|
||||
},
|
||||
{
|
||||
"localized_name": "width",
|
||||
"name": "width",
|
||||
"type": "INT",
|
||||
"widget": {
|
||||
@@ -279,7 +260,6 @@
|
||||
"link": null
|
||||
},
|
||||
{
|
||||
"localized_name": "height",
|
||||
"name": "height",
|
||||
"type": "INT",
|
||||
"widget": {
|
||||
@@ -288,7 +268,6 @@
|
||||
"link": null
|
||||
},
|
||||
{
|
||||
"localized_name": "padding",
|
||||
"name": "padding",
|
||||
"type": "INT",
|
||||
"widget": {
|
||||
@@ -297,7 +276,6 @@
|
||||
"link": null
|
||||
},
|
||||
{
|
||||
"localized_name": "mask_blur",
|
||||
"name": "mask_blur",
|
||||
"type": "FLOAT",
|
||||
"widget": {
|
||||
@@ -306,7 +284,6 @@
|
||||
"link": null
|
||||
},
|
||||
{
|
||||
"localized_name": "mask_grow",
|
||||
"name": "mask_grow",
|
||||
"type": "INT",
|
||||
"widget": {
|
||||
@@ -315,7 +292,6 @@
|
||||
"link": null
|
||||
},
|
||||
{
|
||||
"localized_name": "mask_mode",
|
||||
"name": "mask_mode",
|
||||
"type": "COMBO",
|
||||
"widget": {
|
||||
@@ -324,7 +300,6 @@
|
||||
"link": null
|
||||
},
|
||||
{
|
||||
"localized_name": "fill",
|
||||
"name": "fill",
|
||||
"type": "COMBO",
|
||||
"widget": {
|
||||
@@ -333,7 +308,6 @@
|
||||
"link": null
|
||||
},
|
||||
{
|
||||
"localized_name": "resize_mode",
|
||||
"name": "resize_mode",
|
||||
"type": "COMBO",
|
||||
"widget": {
|
||||
@@ -342,7 +316,6 @@
|
||||
"link": null
|
||||
},
|
||||
{
|
||||
"localized_name": "soft_edge",
|
||||
"name": "soft_edge",
|
||||
"shape": 7,
|
||||
"type": "BOOLEAN",
|
||||
@@ -352,7 +325,6 @@
|
||||
"link": null
|
||||
},
|
||||
{
|
||||
"localized_name": "soft_strength",
|
||||
"name": "soft_strength",
|
||||
"shape": 7,
|
||||
"type": "FLOAT",
|
||||
@@ -364,7 +336,6 @@
|
||||
],
|
||||
"outputs": [
|
||||
{
|
||||
"localized_name": "pixels",
|
||||
"name": "pixels",
|
||||
"type": "IMAGE",
|
||||
"links": [
|
||||
@@ -372,7 +343,6 @@
|
||||
]
|
||||
},
|
||||
{
|
||||
"localized_name": "mask",
|
||||
"name": "mask",
|
||||
"type": "MASK",
|
||||
"links": [
|
||||
@@ -380,7 +350,6 @@
|
||||
]
|
||||
},
|
||||
{
|
||||
"localized_name": "context",
|
||||
"name": "context",
|
||||
"type": "ADACHI_INPAINT_CONTEXT",
|
||||
"links": [
|
||||
@@ -421,13 +390,11 @@
|
||||
"mode": 0,
|
||||
"inputs": [
|
||||
{
|
||||
"localized_name": "像素",
|
||||
"name": "pixels",
|
||||
"type": "IMAGE",
|
||||
"link": 5
|
||||
},
|
||||
{
|
||||
"localized_name": "vae",
|
||||
"name": "vae",
|
||||
"type": "VAE",
|
||||
"link": 6
|
||||
@@ -435,7 +402,6 @@
|
||||
],
|
||||
"outputs": [
|
||||
{
|
||||
"localized_name": "Latent",
|
||||
"name": "LATENT",
|
||||
"type": "LATENT",
|
||||
"links": [
|
||||
@@ -445,7 +411,8 @@
|
||||
],
|
||||
"properties": {
|
||||
"Node name for S&R": "VAEEncode"
|
||||
}
|
||||
},
|
||||
"widgets_values": []
|
||||
},
|
||||
{
|
||||
"id": 7,
|
||||
@@ -463,13 +430,11 @@
|
||||
"mode": 0,
|
||||
"inputs": [
|
||||
{
|
||||
"localized_name": "Latent",
|
||||
"name": "samples",
|
||||
"type": "LATENT",
|
||||
"link": 7
|
||||
},
|
||||
{
|
||||
"localized_name": "遮罩",
|
||||
"name": "mask",
|
||||
"type": "MASK",
|
||||
"link": 8
|
||||
@@ -477,7 +442,6 @@
|
||||
],
|
||||
"outputs": [
|
||||
{
|
||||
"localized_name": "Latent",
|
||||
"name": "LATENT",
|
||||
"type": "LATENT",
|
||||
"links": [
|
||||
@@ -487,7 +451,8 @@
|
||||
],
|
||||
"properties": {
|
||||
"Node name for S&R": "SetLatentNoiseMask"
|
||||
}
|
||||
},
|
||||
"widgets_values": []
|
||||
},
|
||||
{
|
||||
"id": 8,
|
||||
@@ -498,38 +463,33 @@
|
||||
],
|
||||
"size": [
|
||||
330,
|
||||
310
|
||||
317.3125
|
||||
],
|
||||
"flags": {},
|
||||
"order": 8,
|
||||
"mode": 0,
|
||||
"inputs": [
|
||||
{
|
||||
"localized_name": "模型",
|
||||
"name": "model",
|
||||
"type": "MODEL",
|
||||
"link": 9
|
||||
},
|
||||
{
|
||||
"localized_name": "正面条件",
|
||||
"name": "positive",
|
||||
"type": "CONDITIONING",
|
||||
"link": 10
|
||||
},
|
||||
{
|
||||
"localized_name": "负面条件",
|
||||
"name": "negative",
|
||||
"type": "CONDITIONING",
|
||||
"link": 11
|
||||
},
|
||||
{
|
||||
"localized_name": "Latent图像",
|
||||
"name": "latent_image",
|
||||
"type": "LATENT",
|
||||
"link": 12
|
||||
},
|
||||
{
|
||||
"localized_name": "种子",
|
||||
"name": "seed",
|
||||
"type": "INT",
|
||||
"widget": {
|
||||
@@ -538,7 +498,6 @@
|
||||
"link": null
|
||||
},
|
||||
{
|
||||
"localized_name": "步数",
|
||||
"name": "steps",
|
||||
"type": "INT",
|
||||
"widget": {
|
||||
@@ -547,7 +506,6 @@
|
||||
"link": null
|
||||
},
|
||||
{
|
||||
"localized_name": "cfg",
|
||||
"name": "cfg",
|
||||
"type": "FLOAT",
|
||||
"widget": {
|
||||
@@ -556,7 +514,6 @@
|
||||
"link": null
|
||||
},
|
||||
{
|
||||
"localized_name": "采样器名称",
|
||||
"name": "sampler_name",
|
||||
"type": "COMBO",
|
||||
"widget": {
|
||||
@@ -565,7 +522,6 @@
|
||||
"link": null
|
||||
},
|
||||
{
|
||||
"localized_name": "调度器",
|
||||
"name": "scheduler",
|
||||
"type": "COMBO",
|
||||
"widget": {
|
||||
@@ -574,7 +530,6 @@
|
||||
"link": null
|
||||
},
|
||||
{
|
||||
"localized_name": "降噪",
|
||||
"name": "denoise",
|
||||
"type": "FLOAT",
|
||||
"widget": {
|
||||
@@ -585,7 +540,6 @@
|
||||
],
|
||||
"outputs": [
|
||||
{
|
||||
"localized_name": "Latent",
|
||||
"name": "LATENT",
|
||||
"type": "LATENT",
|
||||
"links": [
|
||||
@@ -622,13 +576,11 @@
|
||||
"mode": 0,
|
||||
"inputs": [
|
||||
{
|
||||
"localized_name": "Latent",
|
||||
"name": "samples",
|
||||
"type": "LATENT",
|
||||
"link": 13
|
||||
},
|
||||
{
|
||||
"localized_name": "vae",
|
||||
"name": "vae",
|
||||
"type": "VAE",
|
||||
"link": 14
|
||||
@@ -636,7 +588,6 @@
|
||||
],
|
||||
"outputs": [
|
||||
{
|
||||
"localized_name": "图像",
|
||||
"name": "IMAGE",
|
||||
"type": "IMAGE",
|
||||
"links": [
|
||||
@@ -646,7 +597,8 @@
|
||||
],
|
||||
"properties": {
|
||||
"Node name for S&R": "VAEDecode"
|
||||
}
|
||||
},
|
||||
"widgets_values": []
|
||||
},
|
||||
{
|
||||
"id": 10,
|
||||
@@ -664,13 +616,11 @@
|
||||
"mode": 0,
|
||||
"inputs": [
|
||||
{
|
||||
"localized_name": "generated",
|
||||
"name": "generated",
|
||||
"type": "IMAGE",
|
||||
"link": 15
|
||||
},
|
||||
{
|
||||
"localized_name": "context",
|
||||
"name": "context",
|
||||
"type": "ADACHI_INPAINT_CONTEXT",
|
||||
"link": 16
|
||||
@@ -678,7 +628,6 @@
|
||||
],
|
||||
"outputs": [
|
||||
{
|
||||
"localized_name": "image",
|
||||
"name": "image",
|
||||
"type": "IMAGE",
|
||||
"links": [
|
||||
@@ -688,7 +637,8 @@
|
||||
],
|
||||
"properties": {
|
||||
"Node name for S&R": "AdachiInpaintComposite"
|
||||
}
|
||||
},
|
||||
"widgets_values": []
|
||||
},
|
||||
{
|
||||
"id": 11,
|
||||
@@ -706,13 +656,11 @@
|
||||
"mode": 0,
|
||||
"inputs": [
|
||||
{
|
||||
"localized_name": "original",
|
||||
"name": "original",
|
||||
"type": "IMAGE",
|
||||
"link": 17
|
||||
},
|
||||
{
|
||||
"localized_name": "result",
|
||||
"name": "result",
|
||||
"type": "IMAGE",
|
||||
"link": 18
|
||||
@@ -720,7 +668,6 @@
|
||||
],
|
||||
"outputs": [
|
||||
{
|
||||
"localized_name": "image",
|
||||
"name": "image",
|
||||
"type": "IMAGE",
|
||||
"links": [
|
||||
@@ -749,13 +696,11 @@
|
||||
"mode": 0,
|
||||
"inputs": [
|
||||
{
|
||||
"localized_name": "图片",
|
||||
"name": "images",
|
||||
"type": "IMAGE",
|
||||
"link": 19
|
||||
},
|
||||
{
|
||||
"localized_name": "文件名前缀",
|
||||
"name": "filename_prefix",
|
||||
"type": "STRING",
|
||||
"widget": {
|
||||
@@ -788,7 +733,7 @@
|
||||
"outputs": [],
|
||||
"properties": {},
|
||||
"widgets_values": [
|
||||
"安达工作台 / Adachi Workbench — 标准节点组合\n选择模型，载入原图并涂抹，然后运行喵\nPrepare → VAE Encode → Set Latent Noise Mask → KSampler → VAE Decode → Composite 喵\n独立 Prepare 的 fill 请选择 original 或 fill 喵\nlatent_noise / latent_nothing 由一体采样节点实现，独立预处理不修改 latent 喵\n使用专用 inpaint checkpoint 时请改用原生 InpaintModelConditioning 或一体节点 inpaint_model 喵"
|
||||
"Adachi-Inpaint-Workbench - standard node combination\nPick a model, load an image, paint, then run\nPrepare -> VAE Encode -> Set Latent Noise Mask -> KSampler -> VAE Decode -> Composite\nFor standalone Prepare, choose fill = original or fill\nlatent_noise / latent_nothing are implemented by the all-in-one sampler; standalone Prepare does not touch the latent\nWith a dedicated inpaint checkpoint, use native InpaintModelConditioning or the all-in-one node's inpaint_model"
|
||||
],
|
||||
"color": "#432",
|
||||
"bgcolor": "#653"
|
||||
@@ -960,4 +905,4 @@
|
||||
}
|
||||
},
|
||||
"version": 0.4
|
||||
}
|
||||
}
|
||||
|
||||
+21
-9
@@ -16,24 +16,36 @@ if (-not (Test-Path -LiteralPath $customRoot)) {
|
||||
New-Item -ItemType Directory -Path $customRoot | Out-Null
|
||||
}
|
||||
$customRoot = (Resolve-Path -LiteralPath $customRoot).ProviderPath
|
||||
$destination = [IO.Path]::GetFullPath((Join-Path $customRoot 'ComfyUI-Adachi-Workbench'))
|
||||
$destination = [IO.Path]::GetFullPath((Join-Path $customRoot 'Adachi-Inpaint-Workbench'))
|
||||
$legacyPath = [IO.Path]::GetFullPath((Join-Path $customRoot 'ComfyUI-Adachi-Workbench'))
|
||||
if (-not $destination.StartsWith($customRoot.TrimEnd('\') + '\', [StringComparison]::OrdinalIgnoreCase)) {
|
||||
throw 'Install destination must stay within the selected custom_nodes directory.'
|
||||
}
|
||||
if ($destination.TrimEnd('\') -eq $packageRoot.TrimEnd('\')) {
|
||||
Write-Host 'This package is already in the selected ComfyUI custom_nodes directory. 喵'
|
||||
Write-Host 'This package is already in the selected ComfyUI custom_nodes directory.'
|
||||
exit 0
|
||||
}
|
||||
if (Test-Path -LiteralPath $destination) {
|
||||
$existing = Get-Item -LiteralPath $destination
|
||||
if ((Test-Path -LiteralPath $destination) -and (Test-Path -LiteralPath $legacyPath)) {
|
||||
throw 'Both current and legacy plugin folders exist. Keep one installation to avoid duplicate node registrations.'
|
||||
}
|
||||
$existingPath = if (Test-Path -LiteralPath $destination) { $destination } elseif (Test-Path -LiteralPath $legacyPath) { $legacyPath } else { $null }
|
||||
if ($existingPath) {
|
||||
$existing = Get-Item -LiteralPath $existingPath
|
||||
if ($existing.Attributes -band [IO.FileAttributes]::ReparsePoint) {
|
||||
throw 'Refusing to overwrite a junction or symbolic-link installation. Use a normal folder.'
|
||||
}
|
||||
$backupRoot = Join-Path $comfyRoot 'user\adachi-workbench-backups'
|
||||
New-Item -ItemType Directory -Path $backupRoot -Force | Out-Null
|
||||
$backupFile = Join-Path $backupRoot ('ComfyUI-Adachi-Workbench-' + (Get-Date -Format 'yyyyMMdd-HHmmss-fff') + '.zip')
|
||||
Compress-Archive -LiteralPath $destination -DestinationPath $backupFile
|
||||
Write-Host "Previous installation backed up: $backupFile 喵"
|
||||
$backupFile = Join-Path $backupRoot ('Adachi-Inpaint-Workbench-' + (Get-Date -Format 'yyyyMMdd-HHmmss-fff') + '.zip')
|
||||
Compress-Archive -LiteralPath $existingPath -DestinationPath $backupFile
|
||||
Write-Host "Previous installation backed up: $backupFile"
|
||||
if ($existingPath -ne $destination) {
|
||||
# Verify both resolved absolute paths before moving the legacy folder.
|
||||
if ([IO.Path]::GetDirectoryName($existingPath) -ne $customRoot -or [IO.Path]::GetDirectoryName($destination) -ne $customRoot) {
|
||||
throw 'Migration paths must remain directly inside the selected custom_nodes directory.'
|
||||
}
|
||||
Move-Item -LiteralPath $existingPath -Destination $destination
|
||||
}
|
||||
} else {
|
||||
New-Item -ItemType Directory -Path $destination | Out-Null
|
||||
}
|
||||
@@ -42,5 +54,5 @@ Get-ChildItem -LiteralPath $packageRoot -Force | Where-Object {
|
||||
} | ForEach-Object {
|
||||
Copy-Item -LiteralPath $_.FullName -Destination $destination -Recurse -Force
|
||||
}
|
||||
Write-Host "Installed Adachi Workbench: $destination 喵"
|
||||
Write-Host 'Restart ComfyUI, then refresh the browser with Ctrl+F5. 喵'
|
||||
Write-Host "Installed Adachi-Inpaint-Workbench: $destination"
|
||||
Write-Host 'Restart ComfyUI, then refresh the browser with Ctrl+F5.'
|
||||
|
||||
@@ -0,0 +1,5 @@
|
||||
{
|
||||
"nodeCategories": {
|
||||
"Adachi-Inpaint-Workbench": "Adachi-Inpaint-Workbench"
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,232 @@
|
||||
{
|
||||
"AdachiInlineMask": {
|
||||
"display_name": "Inline Mask",
|
||||
"description": "Paint an inpaint mask directly in the workflow.",
|
||||
"inputs": {
|
||||
"image": {
|
||||
"name": "image",
|
||||
"tooltip": "Input image path populated by inline upload."
|
||||
},
|
||||
"mask_data": {
|
||||
"name": "mask_data",
|
||||
"tooltip": "Editor mask PNG data URL; white repaints."
|
||||
},
|
||||
"source_data": {
|
||||
"name": "source_data",
|
||||
"tooltip": "Embedded source image for portable workflows."
|
||||
}
|
||||
},
|
||||
"outputs": {
|
||||
"0": {
|
||||
"name": "image"
|
||||
},
|
||||
"1": {
|
||||
"name": "mask"
|
||||
}
|
||||
}
|
||||
},
|
||||
"AdachiInpaintPrepare": {
|
||||
"display_name": "Inpaint Prepare",
|
||||
"description": "Crop and prepare masks with exact compositing context; use the all-in-one sampler for latent fill modes.",
|
||||
"inputs": {
|
||||
"image": {
|
||||
"name": "image",
|
||||
"tooltip": "Original image; output is restored to this exact size."
|
||||
},
|
||||
"mask": {
|
||||
"name": "mask",
|
||||
"tooltip": "White repaints; black preserves."
|
||||
},
|
||||
"area": {
|
||||
"name": "area",
|
||||
"tooltip": "Whole image or mask bounding-box inpainting."
|
||||
},
|
||||
"width": {
|
||||
"name": "width",
|
||||
"tooltip": "Sampling canvas width, independent of final image size."
|
||||
},
|
||||
"height": {
|
||||
"name": "height",
|
||||
"tooltip": "Sampling canvas height."
|
||||
},
|
||||
"padding": {
|
||||
"name": "padding",
|
||||
"tooltip": "Mask-only context padding in original pixels."
|
||||
},
|
||||
"mask_blur": {
|
||||
"name": "mask_blur",
|
||||
"tooltip": "Gaussian mask feathering in original pixels."
|
||||
},
|
||||
"mask_grow": {
|
||||
"name": "mask_grow",
|
||||
"tooltip": "Positive dilates; negative erodes the mask."
|
||||
},
|
||||
"mask_mode": {
|
||||
"name": "mask_mode",
|
||||
"tooltip": "Repaint inside or invert the mask."
|
||||
},
|
||||
"fill": {
|
||||
"name": "fill",
|
||||
"tooltip": "Original, surrounding-color fill, latent noise, or zero latent. Latent modes require the all-in-one sampler."
|
||||
},
|
||||
"resize_mode": {
|
||||
"name": "resize_mode",
|
||||
"tooltip": "Whole-image resize mode; mask-only mode always retains the entire mask."
|
||||
},
|
||||
"soft_edge": {
|
||||
"name": "soft_edge",
|
||||
"tooltip": "Extra feathering, not AUTOMATIC1111's Soft Inpainting algorithm."
|
||||
},
|
||||
"soft_strength": {
|
||||
"name": "soft_strength",
|
||||
"tooltip": "Adds 0-16 pixels of Gaussian feathering."
|
||||
}
|
||||
},
|
||||
"outputs": {
|
||||
"0": {
|
||||
"name": "pixels"
|
||||
},
|
||||
"1": {
|
||||
"name": "mask"
|
||||
},
|
||||
"2": {
|
||||
"name": "context"
|
||||
}
|
||||
}
|
||||
},
|
||||
"AdachiInpaintComposite": {
|
||||
"display_name": "Inpaint Composite",
|
||||
"description": "Restore original size and preserve pixels outside the effective mask exactly.",
|
||||
"inputs": {
|
||||
"generated": {
|
||||
"name": "generated",
|
||||
"tooltip": "Generated sampling canvas."
|
||||
},
|
||||
"context": {
|
||||
"name": "context",
|
||||
"tooltip": "Context from Adachi Inpaint Prepare."
|
||||
}
|
||||
},
|
||||
"outputs": {
|
||||
"0": {
|
||||
"name": "image"
|
||||
}
|
||||
}
|
||||
},
|
||||
"AdachiWebUIInpaint": {
|
||||
"display_name": "WebUI Inpaint",
|
||||
"description": "WebUI-style inpainting, crop, latent fill, sampling and original-size compositing.",
|
||||
"inputs": {
|
||||
"image": {
|
||||
"name": "image",
|
||||
"tooltip": "Original image; output is restored to this exact size."
|
||||
},
|
||||
"mask": {
|
||||
"name": "mask",
|
||||
"tooltip": "White repaints; black preserves."
|
||||
},
|
||||
"area": {
|
||||
"name": "area",
|
||||
"tooltip": "Whole image or mask bounding-box inpainting."
|
||||
},
|
||||
"width": {
|
||||
"name": "width",
|
||||
"tooltip": "Sampling canvas width, independent of final image size."
|
||||
},
|
||||
"height": {
|
||||
"name": "height",
|
||||
"tooltip": "Sampling canvas height."
|
||||
},
|
||||
"padding": {
|
||||
"name": "padding",
|
||||
"tooltip": "Mask-only context padding in original pixels."
|
||||
},
|
||||
"mask_blur": {
|
||||
"name": "mask_blur",
|
||||
"tooltip": "Gaussian mask feathering in original pixels."
|
||||
},
|
||||
"mask_grow": {
|
||||
"name": "mask_grow",
|
||||
"tooltip": "Positive dilates; negative erodes the mask."
|
||||
},
|
||||
"mask_mode": {
|
||||
"name": "mask_mode",
|
||||
"tooltip": "Repaint inside or invert the mask."
|
||||
},
|
||||
"fill": {
|
||||
"name": "fill",
|
||||
"tooltip": "Original, surrounding-color fill, latent noise, or zero latent. Latent modes require the all-in-one sampler."
|
||||
},
|
||||
"resize_mode": {
|
||||
"name": "resize_mode",
|
||||
"tooltip": "Whole-image resize mode; mask-only mode always retains the entire mask."
|
||||
},
|
||||
"seed": {
|
||||
"name": "seed",
|
||||
"tooltip": "Seed for a reproducible batch of distinct samples."
|
||||
},
|
||||
"denoise": {
|
||||
"name": "denoise",
|
||||
"tooltip": "Zero returns the original exactly; one fully denoises."
|
||||
},
|
||||
"batch_size": {
|
||||
"name": "batch_size",
|
||||
"tooltip": "Number of generated variants per input image."
|
||||
},
|
||||
"refiner_switch": {
|
||||
"name": "refiner_switch",
|
||||
"tooltip": "Fraction of steps on the base model when a refiner is connected."
|
||||
},
|
||||
"inpaint_model": {
|
||||
"name": "inpaint_model",
|
||||
"tooltip": "Enable only for dedicated inpainting models; uses ComfyUI's native InpaintModelConditioning."
|
||||
},
|
||||
"soft_edge": {
|
||||
"name": "soft_edge",
|
||||
"tooltip": "Extra feathering, not A1111 Soft Inpainting."
|
||||
},
|
||||
"refiner_model": {
|
||||
"name": "refiner_model",
|
||||
"tooltip": "Optional compatible refiner model, e.g. SDXL refiner."
|
||||
},
|
||||
"refiner_positive": {
|
||||
"name": "refiner_positive",
|
||||
"tooltip": "Encode using the refiner CLIP; defaults to original positive conditioning."
|
||||
},
|
||||
"refiner_negative": {
|
||||
"name": "refiner_negative",
|
||||
"tooltip": "Encode using the refiner CLIP; defaults to original negative conditioning."
|
||||
}
|
||||
},
|
||||
"outputs": {
|
||||
"0": {
|
||||
"name": "image"
|
||||
},
|
||||
"1": {
|
||||
"name": "crop"
|
||||
},
|
||||
"2": {
|
||||
"name": "mask"
|
||||
}
|
||||
}
|
||||
},
|
||||
"AdachiImageCompare": {
|
||||
"display_name": "Image Compare",
|
||||
"description": "Hover to compare; adopt a result into the upstream inline editor.",
|
||||
"inputs": {
|
||||
"original": {
|
||||
"name": "original",
|
||||
"tooltip": "Original image shown on the right."
|
||||
},
|
||||
"result": {
|
||||
"name": "result",
|
||||
"tooltip": "Full-size generated image shown on the left; use image, not crop."
|
||||
}
|
||||
},
|
||||
"outputs": {
|
||||
"0": {
|
||||
"name": "image"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,5 @@
|
||||
{
|
||||
"nodeCategories": {
|
||||
"Adachi-Inpaint-Workbench": "安达工作台 / Adachi-Inpaint-Workbench"
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,236 @@
|
||||
{
|
||||
"AdachiInlineMask": {
|
||||
"display_name": "内联蒙版 / Inline Mask",
|
||||
"description": "直接在工作流节点内涂抹蒙版，无需打开独立编辑器。",
|
||||
"inputs": {
|
||||
"image": {
|
||||
"name": "原图",
|
||||
"tooltip": "由内联编辑器上传填充的 ComfyUI input 图片路径。"
|
||||
},
|
||||
"mask_data": {
|
||||
"name": "蒙版数据",
|
||||
"tooltip": "编辑器保存的蒙版 PNG 数据；白色重绘。"
|
||||
},
|
||||
"source_data": {
|
||||
"name": "嵌入原图",
|
||||
"tooltip": "嵌入原图，便于工作流在其他机器使用。"
|
||||
}
|
||||
},
|
||||
"outputs": {
|
||||
"0": {
|
||||
"name": "图像"
|
||||
},
|
||||
"1": {
|
||||
"name": "蒙版"
|
||||
}
|
||||
}
|
||||
},
|
||||
"AdachiInpaintPrepare": {
|
||||
"display_name": "重绘预处理 / Inpaint Prepare",
|
||||
"description": "局部重绘裁剪、蒙版处理与精确回贴上下文；latent 填充请使用一体采样节点。",
|
||||
"inputs": {
|
||||
"image": {
|
||||
"name": "原图",
|
||||
"tooltip": "原图；输出会还原为这个尺寸。"
|
||||
},
|
||||
"mask": {
|
||||
"name": "蒙版",
|
||||
"tooltip": "白色重绘，黑色保护。"
|
||||
},
|
||||
"area": {
|
||||
"name": "重绘范围",
|
||||
"tooltip": "整张原图重绘，或仅蒙版包围框区域重绘。"
|
||||
},
|
||||
"width": {
|
||||
"name": "宽度",
|
||||
"tooltip": "采样画布宽度；最终输出仍为原图尺寸。"
|
||||
},
|
||||
"height": {
|
||||
"name": "高度",
|
||||
"tooltip": "采样画布高度。"
|
||||
},
|
||||
"padding": {
|
||||
"name": "外扩边距",
|
||||
"tooltip": "仅蒙版区域：原图像素单位的上下文边距。"
|
||||
},
|
||||
"mask_blur": {
|
||||
"name": "蒙版模糊",
|
||||
"tooltip": "原图像素单位的高斯羽化半径。"
|
||||
},
|
||||
"mask_grow": {
|
||||
"name": "蒙版扩张",
|
||||
"tooltip": "正数扩张，负数收缩。"
|
||||
},
|
||||
"mask_mode": {
|
||||
"name": "蒙版内外",
|
||||
"tooltip": "重绘蒙版内，或反相重绘蒙版外。"
|
||||
},
|
||||
"fill": {
|
||||
"name": "填充方式",
|
||||
"tooltip": "原图像素、周围颜色填充、潜空间噪声或空白潜空间；后两项由一体采样节点在 latent 层实现。"
|
||||
},
|
||||
"resize_mode": {
|
||||
"name": "缩放方式",
|
||||
"tooltip": "整图模式的缩放方式；仅蒙版模式始终保留完整蒙版。"
|
||||
},
|
||||
"soft_edge": {
|
||||
"name": "额外羽化",
|
||||
"tooltip": "额外羽化；不是 A1111 的 Soft Inpainting 原算法。"
|
||||
},
|
||||
"soft_strength": {
|
||||
"name": "羽化强度",
|
||||
"tooltip": "额外增加 0–16 像素的高斯羽化。"
|
||||
}
|
||||
},
|
||||
"outputs": {
|
||||
"0": {
|
||||
"name": "像素"
|
||||
},
|
||||
"1": {
|
||||
"name": "蒙版"
|
||||
},
|
||||
"2": {
|
||||
"name": "上下文"
|
||||
}
|
||||
}
|
||||
},
|
||||
"AdachiInpaintComposite": {
|
||||
"display_name": "原图回贴 / Inpaint Composite",
|
||||
"description": "还原原图尺寸，有效蒙版外保持原像素不变。",
|
||||
"inputs": {
|
||||
"generated": {
|
||||
"name": "采样图",
|
||||
"tooltip": "采样后的裁剪图。"
|
||||
},
|
||||
"context": {
|
||||
"name": "上下文",
|
||||
"tooltip": "预处理节点输出的裁剪与原图上下文。"
|
||||
}
|
||||
},
|
||||
"outputs": {
|
||||
"0": {
|
||||
"name": "图像"
|
||||
}
|
||||
}
|
||||
},
|
||||
"AdachiWebUIInpaint": {
|
||||
"display_name": "WebUI 局部重绘 / WebUI Inpaint",
|
||||
"description": "WebUI 式局部重绘：整图/蒙版区域、填充、采样与原尺寸回贴。",
|
||||
"inputs": {
|
||||
"image": {
|
||||
"name": "原图",
|
||||
"tooltip": "原图；输出会还原为这个尺寸。"
|
||||
},
|
||||
"mask": {
|
||||
"name": "蒙版",
|
||||
"tooltip": "白色重绘，黑色保护。"
|
||||
},
|
||||
"area": {
|
||||
"name": "重绘范围",
|
||||
"tooltip": "整张原图重绘，或仅蒙版包围框区域重绘。"
|
||||
},
|
||||
"width": {
|
||||
"name": "宽度",
|
||||
"tooltip": "采样画布宽度；最终输出仍为原图尺寸。"
|
||||
},
|
||||
"height": {
|
||||
"name": "高度",
|
||||
"tooltip": "采样画布高度。"
|
||||
},
|
||||
"padding": {
|
||||
"name": "外扩边距",
|
||||
"tooltip": "仅蒙版区域：原图像素单位的上下文边距。"
|
||||
},
|
||||
"mask_blur": {
|
||||
"name": "蒙版模糊",
|
||||
"tooltip": "原图像素单位的高斯羽化半径。"
|
||||
},
|
||||
"mask_grow": {
|
||||
"name": "蒙版扩张",
|
||||
"tooltip": "正数扩张，负数收缩。"
|
||||
},
|
||||
"mask_mode": {
|
||||
"name": "蒙版内外",
|
||||
"tooltip": "重绘蒙版内，或反相重绘蒙版外。"
|
||||
},
|
||||
"fill": {
|
||||
"name": "填充方式",
|
||||
"tooltip": "原图像素、周围颜色填充、潜空间噪声或空白潜空间。"
|
||||
},
|
||||
"resize_mode": {
|
||||
"name": "缩放方式",
|
||||
"tooltip": "整图模式的缩放方式；仅蒙版模式始终保留完整蒙版。"
|
||||
},
|
||||
"seed": {
|
||||
"name": "随机种子",
|
||||
"tooltip": "可复现的批量随机种子。"
|
||||
},
|
||||
"denoise": {
|
||||
"name": "重绘幅度",
|
||||
"tooltip": "0 原样返回原图，1 完全重绘。"
|
||||
},
|
||||
"batch_size": {
|
||||
"name": "每张生成数量",
|
||||
"tooltip": "每张输入图生成的变体数量。"
|
||||
},
|
||||
"refiner_switch": {
|
||||
"name": "Refiner 切换",
|
||||
"tooltip": "接入 Refiner 时 base 模型所占的采样步骤比例。"
|
||||
},
|
||||
"inpaint_model": {
|
||||
"name": "专用重绘模型",
|
||||
"tooltip": "仅专用 inpaint 模型开启；使用 ComfyUI 原生 InpaintModelConditioning。"
|
||||
},
|
||||
"soft_edge": {
|
||||
"name": "额外羽化",
|
||||
"tooltip": "额外羽化，并非 A1111 Soft Inpainting 原算法。"
|
||||
},
|
||||
"soft_strength": {
|
||||
"name": "羽化强度",
|
||||
"tooltip": "额外增加的高斯羽化强度。"
|
||||
},
|
||||
"refiner_model": {
|
||||
"name": "Refiner 模型",
|
||||
"tooltip": "可选的兼容 Refiner 模型，例如 SDXL refiner。"
|
||||
},
|
||||
"refiner_positive": {
|
||||
"name": "Refiner 正面",
|
||||
"tooltip": "用 Refiner 的 CLIP 编码；未连接则沿用原始正面条件。"
|
||||
},
|
||||
"refiner_negative": {
|
||||
"name": "Refiner 负面",
|
||||
"tooltip": "用 Refiner 的 CLIP 编码；未连接则沿用原始负面条件。"
|
||||
}
|
||||
},
|
||||
"outputs": {
|
||||
"0": {
|
||||
"name": "图像"
|
||||
},
|
||||
"1": {
|
||||
"name": "裁剪图"
|
||||
},
|
||||
"2": {
|
||||
"name": "蒙版"
|
||||
}
|
||||
}
|
||||
},
|
||||
"AdachiImageCompare": {
|
||||
"display_name": "图像对比 / Image Compare",
|
||||
"description": "鼠标悬停左右对比原图与重绘结果；点击可将结果回填到上游内联蒙版。",
|
||||
"inputs": {
|
||||
"original": {
|
||||
"name": "原图",
|
||||
"tooltip": "显示在右侧的原图，连接内联蒙版的 image。"
|
||||
},
|
||||
"result": {
|
||||
"name": "重绘结果",
|
||||
"tooltip": "显示在左侧的完整重绘图；请连接最终 image 而非 crop。"
|
||||
}
|
||||
},
|
||||
"outputs": {
|
||||
"0": {
|
||||
"name": "图像"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 88 KiB After Width: | Height: | Size: 121 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 56 KiB After Width: | Height: | Size: 128 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 102 KiB After Width: | Height: | Size: 78 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 86 KiB After Width: | Height: | Size: 676 KiB |
+18
-2
@@ -1,11 +1,27 @@
|
||||
[project]
|
||||
name = "comfyui-adachi-workbench"
|
||||
version = "0.2.0"
|
||||
name = "adachi-inpaint-workbench"
|
||||
version = "0.4.2"
|
||||
description = "Inline mask painting and WebUI-style inpainting nodes for ComfyUI"
|
||||
requires-python = ">=3.10"
|
||||
license = { file = "LICENSE" }
|
||||
readme = "README.md"
|
||||
authors = [{ name = "Adachi" }]
|
||||
dependencies = ["numpy", "Pillow", "torch"]
|
||||
classifiers = [
|
||||
"Operating System :: OS Independent",
|
||||
"Programming Language :: Python :: 3",
|
||||
]
|
||||
|
||||
[project.urls]
|
||||
Repository = "https://github.com/adachi0130/Adachi-Inpaint-Workbench"
|
||||
Documentation = "https://github.com/adachi0130/Adachi-Inpaint-Workbench#readme"
|
||||
"Bug Tracker" = "https://github.com/adachi0130/Adachi-Inpaint-Workbench/issues"
|
||||
|
||||
[tool.comfy]
|
||||
# Set this to your actual Comfy Registry publisher ID before Registry publishing.
|
||||
# GitHub publication and the Manager legacy-list submission do not require it.
|
||||
PublisherId = ""
|
||||
DisplayName = "Adachi-Inpaint-Workbench"
|
||||
|
||||
[tool.adachi-workbench]
|
||||
frontend = "web"
|
||||
|
||||
@@ -0,0 +1,22 @@
|
||||
# Manager / Registry publishing
|
||||
|
||||
A public GitHub repository does not by itself mean the plugin is listed in the Manager search index or in the Comfy Registry.
|
||||
The Manager listing submission for this plugin is [PR #3378](https://github.com/Comfy-Org/ComfyUI-Manager/pull/3378), currently waiting on the upstream maintainer.
|
||||
|
||||
## Manager listing
|
||||
|
||||
[manager-entry.json](manager-entry.json) is the entry submitted to [ComfyUI-Manager](https://github.com/Comfy-Org/ComfyUI-Manager); it is added to the `custom-node-list.json` at the repository root in a pull request, and the maintainer merges it and refreshes the index.
|
||||
Follow the [official Manager instructions](https://github.com/Comfy-Org/ComfyUI-Manager#how-to-register-your-custom-node-into-comfyui-manager).
|
||||
Until it is listed you can still install through the Manager's Git URL option, using `https://github.com/adachi0130/Adachi-Inpaint-Workbench`.
|
||||
|
||||
## Comfy Registry
|
||||
|
||||
Per the [official publishing guide](https://docs.comfy.org/registry/publishing), the first publish requires you to create your own Publisher and API key.
|
||||
|
||||
1. Sign in at [Comfy Registry](https://registry.comfy.org/) and create a Publisher, then note the actual Publisher ID.
|
||||
2. Replace the empty `[tool.comfy].PublisherId` in `pyproject.toml` with that ID and push it to GitHub.
|
||||
3. In the repository Settings → Secrets and variables → Actions, add `REGISTRY_ACCESS_TOKEN` with the Registry publishing API key.
|
||||
4. Run **Publish to Comfy Registry** manually from the Actions tab and check the publish and platform validation results.
|
||||
|
||||
The workflow is manual-only today and will not publish while no Publisher ID or API key is configured.
|
||||
A Registry version cannot be overwritten once published, so later releases have to bump the version in `pyproject.toml`.
|
||||
@@ -0,0 +1,10 @@
|
||||
{
|
||||
"author": "adachi0130",
|
||||
"title": "Adachi-Inpaint-Workbench",
|
||||
"reference": "https://github.com/adachi0130/Adachi-Inpaint-Workbench",
|
||||
"files": [
|
||||
"https://github.com/adachi0130/Adachi-Inpaint-Workbench"
|
||||
],
|
||||
"install_type": "git-clone",
|
||||
"description": "Paint the inpaint mask directly on the node canvas instead of a modal mask editor, with no save/load round-trip per stroke. The connected inpaint node hosts the live painting tools and WebUI-style sampling controls, and supports whole-image or padded masked-area sampling with original-resolution compositing, Alt temporary erase, Ctrl+wheel brush size, hover image comparison and one-click adoption of a result as the next source image. MIT licensed; reuses ComfyUI's NumPy, Pillow and PyTorch."
|
||||
}
|
||||
@@ -0,0 +1,3 @@
|
||||
numpy
|
||||
Pillow
|
||||
torch
|
||||
+39
-34
@@ -1,4 +1,6 @@
|
||||
/* Original hover-comparison UI, MIT licensed. */
|
||||
import { registerImageWheel } from "./wheel_gestures.js";
|
||||
import { T } from "./i18n.js";
|
||||
const element = (tag, className, text) => {
|
||||
const node = document.createElement(tag);
|
||||
if (className) node.className = className;
|
||||
@@ -8,7 +10,7 @@ const element = (tag, className, text) => {
|
||||
const imageFrom = url => new Promise((resolve, reject) => {
|
||||
const image = new Image();
|
||||
image.onload = () => resolve(image);
|
||||
image.onerror = () => reject(new Error("预览已过期或无法加载，请重新运行 / Preview unavailable; run the workflow again"));
|
||||
image.onerror = () => reject(new Error(T("Preview unavailable; run the workflow again")));
|
||||
image.src = url;
|
||||
});
|
||||
|
||||
@@ -19,35 +21,34 @@ export class ImageCompareView {
|
||||
this.originals = []; this.results = []; this.index = 0;
|
||||
this.zoom = 1; this.pan = { x: 0, y: 0 }; this.split = .5;
|
||||
this.version = 0; this.ready = false;
|
||||
const head = element("div", "dd-head");
|
||||
head.append(element("span", "dd-brand", "ADACHI / COMPARE"));
|
||||
this.dimensionsLabel = element("span", "dd-dimensions", "原图 / 重绘结果"); head.append(this.dimensionsLabel);
|
||||
this.dimensionsLabel = element("span", "dd-dimensions");
|
||||
const toolbar = element("div", "dd-row dd-compare-toolbar");
|
||||
toolbar.append(element("span", "dd-compare-label", "结果"));
|
||||
this.resultSelect = element("select"); this.resultSelect.setAttribute("aria-label", "选择重绘结果 / Choose result");
|
||||
toolbar.append(element("span", "dd-compare-label", T("Result")));
|
||||
this.resultSelect = element("select"); this.resultSelect.setAttribute("aria-label", T("Choose result"));
|
||||
this.resultSelect.onchange = () => { this.index = Number(this.resultSelect.value); this.options.onSelect?.(this.index); this.loadSelected(); };
|
||||
toolbar.append(this.resultSelect);
|
||||
toolbar.append(this.resultSelect, this.dimensionsLabel);
|
||||
const spacer = element("span", "dd-spacer"); toolbar.append(spacer);
|
||||
const fit = element("button", "", "适应"); fit.type = "button";
|
||||
const fit = element("button", "", T("Fit")); fit.type = "button";
|
||||
fit.onclick = () => { this.zoom = 1; this.pan = { x: 0, y: 0 }; this.schedule(); }; toolbar.append(fit);
|
||||
this.stage = element("div", "dd-stage dd-compare-stage");
|
||||
this.canvas = document.createElement("canvas"); this.canvas.tabIndex = 0;
|
||||
this.canvas.setAttribute("aria-label", "左原图、右重绘结果，移动鼠标竖线对比 / Original left, result right; hover to compare");
|
||||
this.canvas.setAttribute("aria-label", T("Result left, original right; hover to compare"));
|
||||
this.canvas.oncontextmenu = event => event.preventDefault();
|
||||
this.canvas.addEventListener("pointerenter", event => { this.hovered = true; this.move(event); this.schedule(); });
|
||||
this.canvas.addEventListener("pointerleave", () => { this.hovered = false; this.schedule(); });
|
||||
this.stage.append(this.canvas);
|
||||
const captions = element("div", "dd-compare-captions");
|
||||
captions.append(element("span", "", "原图"), element("span", "", "重绘结果")); this.stage.append(captions);
|
||||
this.empty = element("div", "dd-empty", "连接原图与重绘结果，然后运行工作流"); this.stage.append(this.empty);
|
||||
this.empty = element("div", "dd-empty", T("Connect an original image and a result, then run the workflow")); this.stage.append(this.empty);
|
||||
const adoption = element("div", "dd-row dd-adoption");
|
||||
adoption.append(element("span", "dd-compare-label", "回填到"));
|
||||
this.targetSelect = element("select"); this.targetSelect.setAttribute("aria-label", "接收结果的内联蒙版 / Target inline editor");
|
||||
adoption.append(element("span", "dd-compare-label", T("Adopt into")));
|
||||
this.targetSelect = element("select"); this.targetSelect.setAttribute("aria-label", T("Target inline editor"));
|
||||
this.targetSelect.onfocus = () => this.refreshTargets();
|
||||
this.targetSelect.onchange = () => { this.manualTarget = true; this.updateButton(); };
|
||||
adoption.append(this.targetSelect);
|
||||
this.adoptButton = element("button", "dd-primary", "采用此结果"); this.adoptButton.type = "button";
|
||||
this.adoptButton = element("button", "dd-primary", T("Adopt this result")); this.adoptButton.type = "button";
|
||||
this.adoptButton.onclick = () => this.adopt(); adoption.append(this.adoptButton);
|
||||
this.message = element("div", "dd-status", "鼠标移动竖线对比 · 滚轮缩放 · 中键拖动");
|
||||
this.root.append(head, toolbar, this.stage, adoption, this.message);
|
||||
this.message = element("div", "dd-status", T("Move to compare · wheel to zoom · middle-drag to pan"));
|
||||
this.message.hidden = true; this.message.setAttribute("role", "alert");
|
||||
this.root.append(this.stage, toolbar, adoption, this.message);
|
||||
this.canvas.addEventListener("pointermove", event => this.move(event));
|
||||
this.canvas.addEventListener("pointerdown", event => {
|
||||
if (!this.ready) return;
|
||||
@@ -63,9 +64,7 @@ export class ImageCompareView {
|
||||
if (this.canvas.hasPointerCapture(id)) this.canvas.releasePointerCapture(id);
|
||||
};
|
||||
for (const name of ["pointerup", "pointercancel", "lostpointercapture"]) this.canvas.addEventListener(name, finish);
|
||||
this.canvas.addEventListener("wheel", event => this.wheel(event), { passive: false });
|
||||
this.captureWheel = event => { if (event.target === this.canvas) this.wheel(event); };
|
||||
window.addEventListener("wheel", this.captureWheel, { capture: true, passive: false });
|
||||
this.stopWheelCapture = registerImageWheel(this.canvas, () => this.ready, event => this.wheel(event), options.onGraphWheel);
|
||||
this.canvas.addEventListener("keydown", event => {
|
||||
if (event.code === "Space") { event.preventDefault(); event.stopPropagation(); this.space = true; }
|
||||
else if (["ArrowLeft", "ArrowRight"].includes(event.key)) {
|
||||
@@ -79,13 +78,13 @@ export class ImageCompareView {
|
||||
this.refreshTargets(); this.updateButton();
|
||||
}
|
||||
|
||||
status(text, error = false) { this.message.textContent = text; this.message.classList.toggle("dd-error", error); }
|
||||
status(text, error = false) { this.message.textContent = text; this.message.classList.toggle("dd-error", error); this.message.hidden = !error; }
|
||||
|
||||
refreshTargets() {
|
||||
const selected = this.targetSelect.value;
|
||||
const { editors = [], preferred = "" } = this.options.getTargets?.() || {};
|
||||
this.targetSelect.replaceChildren();
|
||||
const placeholder = element("option", "", "选择内联蒙版"); placeholder.value = ""; this.targetSelect.append(placeholder);
|
||||
const placeholder = element("option", "", T("Select an inline mask")); placeholder.value = ""; this.targetSelect.append(placeholder);
|
||||
for (const editor of editors) {
|
||||
const option = element("option", "", editor.label); option.value = String(editor.id); this.targetSelect.append(option);
|
||||
}
|
||||
@@ -94,7 +93,7 @@ export class ImageCompareView {
|
||||
this.updateButton();
|
||||
}
|
||||
|
||||
updateButton() { this.adoptButton.disabled = !this.ready || !this.targetSelect.value || !!this.busy; }
|
||||
updateButton() { this.adoptButton.disabled = !this.ready || !this.targetSelect.value || !!this.busy; this.adoptButton.textContent = this.busy ? T("Adopting…") : T("Adopt this result"); }
|
||||
|
||||
async setData(data, index = this.index) {
|
||||
this.originals = Array.isArray(data?.originals) ? data.originals : [];
|
||||
@@ -122,7 +121,7 @@ export class ImageCompareView {
|
||||
this.before = images[0]; this.after = images[1];
|
||||
this.ready = true; this.empty.hidden = true;
|
||||
this.dimensionsLabel.textContent = `${this.before.width} × ${this.before.height}`;
|
||||
this.status("左原图 / 右重绘 · 滚轮缩放 · 满意后点击采用此结果");
|
||||
this.status("");
|
||||
this.updateButton(); this.schedule();
|
||||
} catch (error) { if (version === this.version && !this.destroyed) this.status(error.message, true); }
|
||||
}
|
||||
@@ -131,16 +130,21 @@ export class ImageCompareView {
|
||||
this.refreshTargets();
|
||||
if (!this.ready || !this.targetSelect.value || this.busy) return;
|
||||
const target = this.targetSelect.value, result = this.results[this.index];
|
||||
this.busy = true; this.updateButton(); this.status("正在将结果设为新原图…");
|
||||
this.busy = true; this.updateButton(); this.status(T("Setting the result as the new source image…"));
|
||||
try {
|
||||
await this.options.onAdopt(target, result);
|
||||
if (!this.destroyed) this.status("已采用：回到内联蒙版，可继续涂抹重绘");
|
||||
if (!this.destroyed) this.status(T("Adopted: back in the inline mask, keep painting to inpaint again"));
|
||||
} catch (error) { if (!this.destroyed) this.status(error.message, true); }
|
||||
finally { this.busy = false; if (!this.destroyed) this.updateButton(); }
|
||||
}
|
||||
|
||||
transform() {
|
||||
const rect = this.canvas.getBoundingClientRect();
|
||||
if (this.viewport?.width && this.viewport?.height && rect.width && rect.height) {
|
||||
this.pan.x *= rect.width / this.viewport.width;
|
||||
this.pan.y *= rect.height / this.viewport.height;
|
||||
}
|
||||
this.viewport = { width: rect.width, height: rect.height };
|
||||
const scale = this.before ? Math.min(rect.width / this.before.width, rect.height / this.before.height) * this.zoom : 1;
|
||||
return { width: rect.width, height: rect.height, scale, x: (rect.width - (this.before?.width || 0) * scale) / 2 + this.pan.x, y: (rect.height - (this.before?.height || 0) * scale) / 2 + this.pan.y };
|
||||
}
|
||||
@@ -160,6 +164,7 @@ export class ImageCompareView {
|
||||
|
||||
move(event) {
|
||||
if (!this.ready) return;
|
||||
this.hovered = true;
|
||||
if (this.drag) {
|
||||
event.preventDefault(); event.stopPropagation();
|
||||
this.pan.x = this.drag.pan.x + event.clientX - this.drag.x;
|
||||
@@ -179,20 +184,20 @@ export class ImageCompareView {
|
||||
ctx.setTransform(1, 0, 0, 1, 0, 0); ctx.clearRect(0, 0, width, height);
|
||||
if (!this.ready) return;
|
||||
ctx.setTransform(t.scale * ratio, 0, 0, t.scale * ratio, t.x * ratio, t.y * ratio);
|
||||
ctx.drawImage(this.before, 0, 0);
|
||||
ctx.drawImage(this.after, 0, 0, this.before.width, this.before.height);
|
||||
if (!this.hovered) return;
|
||||
const split = this.split * this.before.width;
|
||||
ctx.save(); ctx.beginPath(); ctx.rect(split, 0, this.before.width - split, this.before.height); ctx.clip();
|
||||
ctx.drawImage(this.after, 0, 0, this.before.width, this.before.height); ctx.restore();
|
||||
ctx.beginPath(); ctx.moveTo(split, 0); ctx.lineTo(split, this.before.height);
|
||||
ctx.strokeStyle = "#141820"; ctx.lineWidth = 3 / t.scale; ctx.stroke();
|
||||
ctx.strokeStyle = "#ffe0b8"; ctx.lineWidth = 1 / t.scale; ctx.stroke();
|
||||
ctx.beginPath(); ctx.arc(split, this.before.height / 2, 7 / t.scale, 0, Math.PI * 2);
|
||||
ctx.fillStyle = "#272c35"; ctx.fill(); ctx.stroke();
|
||||
ctx.drawImage(this.before, 0, 0); ctx.restore();
|
||||
ctx.setTransform(1, 0, 0, 1, 0, 0);
|
||||
const lineX = Math.round((t.x + split * t.scale) * ratio) + .5;
|
||||
ctx.beginPath(); ctx.moveTo(lineX, t.y * ratio); ctx.lineTo(lineX, (t.y + this.before.height * t.scale) * ratio);
|
||||
ctx.strokeStyle = "#ffffffb3"; ctx.lineWidth = 1; ctx.stroke();
|
||||
}
|
||||
|
||||
destroy() {
|
||||
this.destroyed = true; ++this.version; cancelAnimationFrame(this.frame); this.observer.disconnect();
|
||||
window.removeEventListener("wheel", this.captureWheel, true);
|
||||
this.stopWheelCapture();
|
||||
this.before = this.after = null; this.canvas.width = this.canvas.height = 0; this.root.remove();
|
||||
}
|
||||
}
|
||||
|
||||
+9
-5
@@ -1,6 +1,8 @@
|
||||
import { app } from "../../scripts/app.js";
|
||||
import { api } from "../../scripts/api.js";
|
||||
import { ImageCompareView } from "./compare.js";
|
||||
import { routeWheelOutsideImage } from "./wheel_routing.js";
|
||||
import { T } from "./i18n.js";
|
||||
|
||||
function viewUrl(image) {
|
||||
const type = ["input", "output", "temp"].includes(image?.type) ? image.type : "temp";
|
||||
@@ -10,7 +12,7 @@ function viewUrl(image) {
|
||||
function targets(node) {
|
||||
const graph = node.graph;
|
||||
const editors = (graph?._nodes || []).filter(candidate => candidate.type === "AdachiInlineMask" && candidate.adachiUseResult)
|
||||
.map(candidate => ({ id: candidate.id, label: `${candidate.title || "内联蒙版"} #${candidate.id}` }));
|
||||
.map(candidate => ({ id: candidate.id, label: `${candidate.title || T("Inline Mask")} #${candidate.id}` }));
|
||||
const sourceLink = graph?.links?.[node.inputs?.find(input => input.name === "original")?.link];
|
||||
const queue = sourceLink ? [sourceLink.origin_id] : [], seen = new Set(), upstream = new Set();
|
||||
while (queue.length && seen.size < 256) {
|
||||
@@ -34,19 +36,21 @@ app.registerExtension({
|
||||
const value = created?.apply(this, arguments), node = this;
|
||||
const compare = new ImageCompareView({
|
||||
resolveUrl: viewUrl,
|
||||
onGraphWheel: event => app.canvas?.processMouseWheel(event),
|
||||
getTargets: () => targets(node),
|
||||
onSelect: index => { node.properties.adachi_result_index = index; },
|
||||
async onAdopt(id, image) {
|
||||
const target = node.graph?.getNodeById(id);
|
||||
if (!target?.adachiUseResult) throw new Error("找不到接收结果的内联蒙版节点");
|
||||
if (!target?.adachiUseResult) throw new Error(T("No inline mask node is available to receive the result"));
|
||||
const response = await api.fetchApi(`/view?${new URLSearchParams({ filename: image.filename, subfolder: image.subfolder || "", type: image.type || "temp" })}`);
|
||||
if (!response.ok) throw new Error("结果预览已过期，请重新运行工作流");
|
||||
if (!response.ok) throw new Error(T("Result preview expired; run the workflow again"));
|
||||
const blob = await response.blob();
|
||||
if (blob.size > 64 * 1024 * 1024) throw new Error("结果图片超过 64 MiB，请先缩小");
|
||||
if (blob.size > 64 * 1024 * 1024) throw new Error(T("Result image exceeds 64 MiB; downscale it first"));
|
||||
await target.adachiUseResult(new File([blob], `adachi-result-${Date.now()}.png`, { type: "image/png" }));
|
||||
},
|
||||
});
|
||||
node.adachiCompare = compare;
|
||||
const stopWheelRouting = routeWheelOutsideImage(compare.root, compare.canvas, () => compare.ready);
|
||||
const widget = node.addDOMWidget("adachi_compare", "adachi_compare_view", compare.root, {
|
||||
serialize: false, hideOnZoom: false, getMinHeight: () => 420, getMaxHeight: () => 4096,
|
||||
});
|
||||
@@ -66,7 +70,7 @@ app.registerExtension({
|
||||
return result;
|
||||
};
|
||||
const removed = node.onRemoved;
|
||||
node.onRemoved = function () { compare.destroy(); return removed?.apply(this, arguments); };
|
||||
node.onRemoved = function () { stopWheelRouting(); compare.destroy(); return removed?.apply(this, arguments); };
|
||||
node.setSize([Math.max(550, node.size[0]), Math.max(550, node.size[1])]);
|
||||
return value;
|
||||
};
|
||||
|
||||
+43
-1
@@ -6,7 +6,7 @@
|
||||
}
|
||||
.dd-inpaint *, .dd-inpaint *::before, .dd-inpaint *::after { box-sizing: border-box; }
|
||||
.dd-inpaint:focus-within { border-color: #9f7950; }
|
||||
.dd-inpaint .dd-head { display: flex; flex-wrap: wrap; gap: 4px 14px; justify-content: space-between; padding: 11px 12px 6px; align-items: center; }
|
||||
.dd-inpaint .dd-head { display: flex; flex-wrap: wrap; gap: 4px 14px; justify-content: flex-end; padding: 6px 12px 2px; align-items: center; }
|
||||
.dd-inpaint .dd-brand { font-size: 11px; letter-spacing: 1.5px; font-weight: 700; color: var(--dd-accent); }
|
||||
.dd-inpaint .dd-dimensions, .dd-inpaint .dd-zoom { font-size: 11px; color: var(--dd-muted); font-variant-numeric: tabular-nums; }
|
||||
.dd-inpaint .dd-row { display: flex; flex-wrap: wrap; align-items: center; gap: 4px; padding: 5px 10px; }
|
||||
@@ -27,6 +27,7 @@
|
||||
.dd-inpaint .dd-stage { position: relative; flex: 1 1 290px; min-height: 170px; overflow: hidden; border-top: 1px solid var(--dd-line); border-bottom: 1px solid var(--dd-line); background-color: #161a20; background-image: linear-gradient(45deg, #222831 25%, transparent 25%), linear-gradient(-45deg, #222831 25%, transparent 25%), linear-gradient(45deg, transparent 75%, #222831 75%), linear-gradient(-45deg, transparent 75%, #222831 75%); background-size: 20px 20px; background-position: 0 0, 0 10px, 10px -10px, -10px 0; }
|
||||
.dd-inpaint .dd-stage canvas { position: absolute; inset: 0; width: 100%; height: 100%; display: block; touch-action: none; cursor: crosshair; }
|
||||
.dd-inpaint .dd-stage.dd-pan canvas { cursor: grab; }
|
||||
.dd-inpaint .dd-stage.dd-erasing canvas { cursor: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='32' height='32' viewBox='0 0 32 32'%3E%3Cpath d='M6 19 18 7a3 3 0 0 1 4 0l5 5a3 3 0 0 1 0 4L16 27h-5l-5-5a2 2 0 0 1 0-3Z' fill='%23ffb3c0' stroke='%23151a22' stroke-width='3' stroke-linejoin='round'/%3E%3Cpath d='m7 19 7-7 10 10-5 5h-8l-4-4a3 3 0 0 1 0-4Z' fill='%23fff4f6'/%3E%3Cpath d='m13 13 10 10M11 28h17' fill='none' stroke='%23151a22' stroke-width='2'/%3E%3C/svg%3E") 16 16, crosshair; }
|
||||
.dd-inpaint .dd-stage.dd-drop { outline: 3px solid var(--dd-accent); outline-offset: -3px; }
|
||||
.dd-inpaint .dd-empty { position: absolute; inset: 0; display: flex; flex-direction: column; align-items: center; justify-content: center; pointer-events: none; gap: 6px; color: var(--dd-muted); padding: 15px; text-align: center; }
|
||||
.dd-inpaint .dd-empty[hidden] { display: none; }
|
||||
@@ -41,6 +42,28 @@
|
||||
.dd-inpaint .dd-embed input { accent-color: #e9ab68; margin: 0; }
|
||||
.dd-inpaint .dd-status { padding: 5px 11px 8px; color: var(--dd-muted); font-size: 10px; min-height: 27px; overflow-wrap: anywhere; }
|
||||
.dd-inpaint .dd-error { color: #ff9c92; }
|
||||
.dd-inpaint [hidden] { display: none !important; }
|
||||
.dd-inpaint .dd-parameters { flex: 0 0 auto; padding: 10px 12px 8px; border-top: 1px solid var(--dd-line); }
|
||||
.dd-inpaint .dd-param-header { display: flex; align-items: center; justify-content: space-between; gap: 10px; padding-bottom: 7px; }
|
||||
.dd-inpaint .dd-param-header strong { font-weight: 500; font-size: 12px; }
|
||||
.dd-inpaint .dd-param-placeholder { color: var(--dd-muted); padding-block: 4px; font-size: 11px; }
|
||||
.dd-inpaint .dd-param-body { display: flex; flex-direction: column; gap: 8px; }
|
||||
.dd-inpaint .dd-param-field { display: flex; flex-direction: column; gap: 4px; min-width: 0; }
|
||||
.dd-inpaint .dd-param-label { color: var(--dd-muted); font-size: 11px; }
|
||||
.dd-inpaint .dd-param-grid { display: grid; grid-template-columns: repeat(2, minmax(0, 1fr)); gap: 12px; }
|
||||
.dd-inpaint .dd-param-pills { display: flex; flex-wrap: wrap; gap: 4px; }
|
||||
.dd-inpaint .dd-param-pills button { flex: 1; font-size: 11px; padding: 5px 7px; }
|
||||
.dd-inpaint .dd-param-number-label { display: flex; align-items: center; justify-content: space-between; gap: 5px; color: var(--dd-muted); font-size: 11px; }
|
||||
.dd-inpaint .dd-param-field input[type="number"] { width: 86px; min-width: 0; padding: 4px 5px; border: 1px solid var(--dd-line); border-radius: 4px; background: var(--dd-panel); color: var(--dd-text); font: inherit; font-variant-numeric: tabular-nums; }
|
||||
.dd-inpaint .dd-param-field select, .dd-inpaint .dd-param-header select { min-width: 0; max-width: 100%; color: var(--dd-text); background: var(--dd-panel); border: 1px solid var(--dd-line); border-radius: 4px; padding: 5px; font: inherit; }
|
||||
.dd-inpaint .dd-param-field:has(input[aria-label="Seed"]) input { width: 130px; }
|
||||
.dd-inpaint .dd-param-resolution { display: flex; justify-content: space-between; align-items: center; gap: 10px; }
|
||||
.dd-inpaint .dd-param-resolution button { font-size: 11px; }
|
||||
.dd-inpaint .dd-param-advanced { border-top: 1px solid var(--dd-line); padding-top: 7px; }
|
||||
.dd-inpaint .dd-param-advanced summary { color: var(--dd-muted); cursor: pointer; font-size: 11px; }
|
||||
.dd-inpaint .dd-param-advanced-body { display: flex; flex-direction: column; gap: 8px; padding-top: 10px; }
|
||||
.dd-inpaint .dd-param-toggle { display: flex; gap: 6px; align-items: center; color: var(--dd-muted); font-size: 11px; }
|
||||
.dd-inpaint .dd-param-toggle input { margin: 0; accent-color: #e9ab68; }
|
||||
.dd-inpaint .dd-resize-handle { flex: 0 0 18px; display: flex; align-items: center; justify-content: center; color: var(--dd-muted); background: var(--dd-panel); border-top: 1px solid var(--dd-line); cursor: ns-resize; touch-action: none; font-size: 14px; line-height: 1; }
|
||||
.dd-inpaint .dd-resize-handle:hover, .dd-inpaint .dd-resize-handle:focus-visible { color: var(--dd-accent); background: #39424e; outline: none; }
|
||||
.dd-comparer .dd-compare-toolbar, .dd-comparer .dd-adoption { flex-wrap: nowrap; }
|
||||
@@ -51,6 +74,25 @@
|
||||
.dd-comparer .dd-adoption select { flex: 1; }
|
||||
.dd-comparer .dd-compare-stage { min-height: 220px; }
|
||||
.dd-comparer .dd-compare-stage canvas { cursor: ew-resize; }
|
||||
.dd-inline-minimal { position: relative; border: 0; border-radius: 0; background: transparent; }
|
||||
.dd-inline-minimal .dd-stage { border: 0; min-height: 170px; flex-basis: 0; }
|
||||
.dd-inline-minimal > .dd-files { position: absolute; z-index: 2; left: 5px; top: 5px; padding: 0; }
|
||||
.dd-inline-minimal > .dd-files button { min-height: 23px; padding: 2px 6px; font-size: 11px; opacity: .85; }
|
||||
.dd-inline-minimal > .dd-files button:hover { opacity: 1; }
|
||||
.dd-inline-minimal > .dd-resize-handle { position: absolute; z-index: 2; bottom: 0; width: 100%; height: 5px; min-height: 5px; border: 0; color: transparent; background: transparent; }
|
||||
.dd-inline-minimal > .dd-resize-handle:hover { background: #ffc07966; }
|
||||
.dd-inline-minimal > .dd-status:not([hidden]) { position: absolute; bottom: 6px; left: 0; right: 0; background: #20242bee; }
|
||||
.dd-editor-controls { height: auto; flex: 0 0 auto; border: 0; border-radius: 0; background: transparent; overflow: visible; }
|
||||
.dd-editor-controls .dd-source-info { justify-content: space-between; }
|
||||
.dd-editor-controls .dd-filename { padding-left: 0; flex: 1; }
|
||||
.dd-workbench { height: 100%; border: 0; border-radius: 0; }
|
||||
.dd-workbench-tools { flex: 0 0 auto; }
|
||||
.dd-tools-placeholder { padding: 8px 12px; }
|
||||
.dd-comparer { border: 0; border-radius: 0; }
|
||||
.dd-comparer .dd-compare-stage { border: 0; }
|
||||
.dd-comparer .dd-compare-toolbar { padding-top: 5px; padding-bottom: 2px; }
|
||||
.dd-comparer .dd-compare-toolbar .dd-dimensions { margin-left: 5px; }
|
||||
.dd-comparer .dd-adoption { padding-top: 3px; padding-bottom: 5px; }
|
||||
.dd-comparer .dd-compare-captions { position: absolute; top: 8px; left: 8px; right: 8px; display: flex; justify-content: space-between; pointer-events: none; }
|
||||
.dd-comparer .dd-compare-captions span { background: #171d27cc; color: #f1e3cf; padding: 3px 7px; border-radius: 3px; font-size: 11px; }
|
||||
@container (max-width: 380px) { .dd-inpaint .dd-settings { grid-template-columns: repeat(2, minmax(0, 1fr)); gap: 3px 12px; } }
|
||||
|
||||
+90
-40
@@ -1,4 +1,6 @@
|
||||
/* Original implementation, MIT licensed. No WebUI source is bundled. */
|
||||
import { registerImageWheel } from "./wheel_gestures.js";
|
||||
import { T } from "./i18n.js";
|
||||
const el = (tag, cls, text) => {
|
||||
const node = document.createElement(tag);
|
||||
if (cls) node.className = cls;
|
||||
@@ -9,7 +11,7 @@ const makeCanvas = () => document.createElement("canvas");
|
||||
const loadImage = (url) => new Promise((resolve, reject) => {
|
||||
const image = new Image();
|
||||
image.onload = () => resolve(image);
|
||||
image.onerror = () => reject(new Error("无法读取图像 / Cannot load image"));
|
||||
image.onerror = () => reject(new Error(T("Cannot load image")));
|
||||
image.src = url;
|
||||
});
|
||||
|
||||
@@ -40,18 +42,38 @@ export class InlineMaskEditor {
|
||||
this.observer.observe(this.stage);
|
||||
// Nodes 2.0 captures wheel events before widget handlers. Route only
|
||||
// this canvas at window capture so image gestures stay inside it.
|
||||
this.captureWheel = event => { if (event.target === this.canvas) this.wheel(event); };
|
||||
window.addEventListener("wheel", this.captureWheel, { capture: true, passive: false });
|
||||
this.stopWheelCapture = registerImageWheel(this.canvas, () => this.ready, event => this.wheel(event), options.onGraphWheel);
|
||||
this.modifierDown = event => {
|
||||
if (event.key !== "Alt" || !this.ready || !this.canvas.matches(":hover")) return;
|
||||
event.preventDefault(); this.altErase = true; this.updateButtons(); this.schedule();
|
||||
};
|
||||
this.modifierUp = event => {
|
||||
if (event.type !== "blur" && event.key !== "Alt") return;
|
||||
this.altErase = false; this.updateButtons(); this.schedule();
|
||||
};
|
||||
window.addEventListener("keydown", this.modifierDown, true);
|
||||
window.addEventListener("keyup", this.modifierUp, true);
|
||||
window.addEventListener("blur", this.modifierUp);
|
||||
this.root.addEventListener("keydown", (event) => this.keydown(event));
|
||||
this.root.addEventListener("keyup", (event) => {
|
||||
if (event.code === "Space") { this.space = false; this.stage.classList.remove("dd-pan"); }
|
||||
if (event.key === "Alt") { this.altErase = false; this.updateButtons(); this.schedule(); }
|
||||
});
|
||||
this.root.addEventListener("blur", () => { this.space = false; this.altErase = false; this.updateButtons(); this.schedule(); }, true);
|
||||
this.root.addEventListener("paste", (event) => {
|
||||
const paste = event => {
|
||||
const file = [...(event.clipboardData?.files || [])].find(f => f.type.startsWith("image/"));
|
||||
if (file) { event.preventDefault(); event.stopPropagation(); this.upload(file); }
|
||||
});
|
||||
};
|
||||
this.root.addEventListener("paste", paste);
|
||||
if (this.controls) {
|
||||
this.controls.addEventListener("paste", paste);
|
||||
this.controls.addEventListener("blur", () => { this.space = false; this.altErase = false; this.updateButtons(); this.schedule(); }, true);
|
||||
this.controls.addEventListener("keydown", event => this.keydown(event));
|
||||
this.controls.addEventListener("keyup", event => {
|
||||
if (event.code === "Space") { this.space = false; this.stage.classList.remove("dd-pan"); }
|
||||
if (event.key === "Alt") { this.altErase = false; this.updateButtons(); this.schedule(); }
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
button(parent, label, title, action, cls = "") {
|
||||
@@ -66,13 +88,12 @@ export class InlineMaskEditor {
|
||||
|
||||
build() {
|
||||
const head = el("div", "dd-head");
|
||||
head.append(el("span", "dd-brand", "ADACHI WORKBENCH"));
|
||||
this.sizeLabel = el("span", "dd-dimensions", "内联蒙版 · INLINE MASK");
|
||||
this.sizeLabel = el("span", "dd-dimensions", T("INLINE MASK"));
|
||||
head.append(this.sizeLabel);
|
||||
this.root.append(head);
|
||||
const files = el("div", "dd-row dd-files");
|
||||
this.button(files, "载入原图", "上传图片，也可拖放或粘贴 / Upload image", () => this.imageInput.click(), "dd-primary");
|
||||
this.filename = el("span", "dd-filename", "拖放图片到画布");
|
||||
this.loadButton = this.button(files, T("Load image"), T("Upload an image, or drop / paste one"), () => this.imageInput.click(), "dd-primary");
|
||||
this.filename = el("span", "dd-filename", T("Drop an image onto the canvas"));
|
||||
files.append(this.filename);
|
||||
this.root.append(files);
|
||||
this.imageInput = el("input");
|
||||
@@ -98,22 +119,22 @@ export class InlineMaskEditor {
|
||||
const tools = el("div", "dd-row dd-tools");
|
||||
this.toolButtons = {};
|
||||
for (const [name, label, title] of [
|
||||
["brush", "画笔", "画笔 B / Brush"], ["erase", "橡皮", "橡皮 E，按住 Alt 或鼠标右键临时擦除 / Eraser"],
|
||||
["rect", "矩形", "矩形 R / Rectangle"], ["lasso", "套索", "自由套索 L / Freehand lasso"],
|
||||
["pan", "移动", "移动 H，或按住空格 / Pan"],
|
||||
]) this.toolButtons[name] = this.button(tools, label, title, () => this.setTool(name));
|
||||
["brush", "Brush", "Brush (B)"], ["erase", "Eraser", "Eraser (E); hold Alt or right-click for temporary erase"],
|
||||
["rect", "Rectangle", "Rectangle (R)"], ["lasso", "Lasso", "Freehand lasso (L)"],
|
||||
["pan", "Pan", "Pan (H), or hold Space"],
|
||||
]) this.toolButtons[name] = this.button(tools, T(label), T(title), () => this.setTool(name));
|
||||
this.root.append(tools);
|
||||
const settings = el("div", "dd-settings");
|
||||
this.addSlider(settings, "笔径", "brushSize", 1, 512, "px");
|
||||
this.addSlider(settings, "硬度", "hardness", 0, 100, "%");
|
||||
this.addSlider(settings, "笔触", "brushOpacity", 1, 100, "%");
|
||||
this.addSlider(settings, "叠加", "overlayOpacity", 0, 100, "%");
|
||||
this.addSlider(settings, T("Brush size"), "brushSize", 1, 512, "px");
|
||||
this.addSlider(settings, T("Hardness"), "hardness", 0, 100, "%");
|
||||
this.addSlider(settings, T("Brush opacity"), "brushOpacity", 1, 100, "%");
|
||||
this.addSlider(settings, T("Overlay"), "overlayOpacity", 0, 100, "%");
|
||||
this.stage = el("div", "dd-stage");
|
||||
this.canvas = makeCanvas();
|
||||
this.canvas.setAttribute("aria-label", "直接涂抹蒙版；橙色区域将被重绘 / Inline mask painting canvas");
|
||||
this.canvas.setAttribute("aria-label", T("Inline mask painting canvas; orange areas are repainted"));
|
||||
this.stage.append(this.canvas);
|
||||
this.empty = el("div", "dd-empty");
|
||||
this.empty.append(el("span", "dd-empty-symbol", "+"), el("strong", "", "把原图拖到这里"), el("span", "", "直接在节点中涂抹需要重绘的区域"));
|
||||
this.empty.append(el("span", "dd-empty-symbol", "+"), el("strong", "", T("Drop an image here")), el("span", "", T("Paint the areas to repaint directly in this node")));
|
||||
this.stage.append(this.empty);
|
||||
this.root.append(this.stage, settings);
|
||||
this.canvas.oncontextmenu = event => event.preventDefault();
|
||||
@@ -123,7 +144,6 @@ export class InlineMaskEditor {
|
||||
this.canvas.addEventListener("pointercancel", event => this.pointerUp(event));
|
||||
this.canvas.addEventListener("lostpointercapture", event => this.pointerUp(event));
|
||||
this.canvas.addEventListener("pointerleave", () => { this.cursor = null; this.schedule(); });
|
||||
this.canvas.addEventListener("wheel", event => this.wheel(event), { passive: false });
|
||||
this.stage.addEventListener("dragover", event => { event.preventDefault(); event.stopPropagation(); this.stage.classList.add("dd-drop"); });
|
||||
this.stage.addEventListener("dragleave", () => this.stage.classList.remove("dd-drop"));
|
||||
this.stage.addEventListener("drop", event => {
|
||||
@@ -132,33 +152,46 @@ export class InlineMaskEditor {
|
||||
if (file) this.upload(file);
|
||||
});
|
||||
const actions = el("div", "dd-row dd-actions");
|
||||
this.undoButton = this.button(actions, "撤销", "撤销 Ctrl+Z / Undo", () => this.undo());
|
||||
this.redoButton = this.button(actions, "重做", "重做 Ctrl+Shift+Z / Redo", () => this.redo());
|
||||
this.button(actions, "反转", "反转绘制的蒙版 / Invert painted mask", () => this.action({ type: "invert" }));
|
||||
this.button(actions, "全选", "重绘整张图 / Fill mask", () => this.action({ type: "fill" }));
|
||||
this.button(actions, "清空", "清空蒙版 / Clear mask", () => this.action({ type: "clear" }));
|
||||
this.button(actions, "导入蒙版", "白色重绘，黑色保护 / Import mask", () => { if (this.ready) this.maskInput.click(); });
|
||||
this.button(actions, "导出", "导出原始分辨率黑白蒙版 / Export mask PNG", () => this.download());
|
||||
this.undoButton = this.button(actions, T("Undo"), T("Undo (Ctrl+Z)"), () => this.undo());
|
||||
this.redoButton = this.button(actions, T("Redo"), T("Redo (Ctrl+Shift+Z)"), () => this.redo());
|
||||
this.button(actions, T("Invert"), T("Invert the painted mask"), () => this.action({ type: "invert" }));
|
||||
this.button(actions, T("Fill"), T("Fill the whole image with mask"), () => this.action({ type: "fill" }));
|
||||
this.button(actions, T("Clear"), T("Clear the mask"), () => this.action({ type: "clear" }));
|
||||
this.button(actions, T("Import mask"), T("White repaints, black preserves"), () => { if (this.ready) this.maskInput.click(); });
|
||||
this.button(actions, T("Export"), T("Export the mask PNG at full resolution"), () => this.download());
|
||||
this.root.append(actions);
|
||||
const footer = el("div", "dd-row dd-viewbar");
|
||||
this.viewButtons = {};
|
||||
for (const [name, label] of [["overlay", "叠加"], ["image", "原图"], ["mask", "蒙版"]]) {
|
||||
this.viewButtons[name] = this.button(footer, label, `${label} / ${name}`, () => { this.view = name; this.updateButtons(); this.schedule(); });
|
||||
for (const [name, label] of [["overlay", "Overlay"], ["image", "Image"], ["mask", "Mask"]]) {
|
||||
const text = T(label);
|
||||
this.viewButtons[name] = this.button(footer, text, `${text} / ${name}`, () => { this.view = name; this.updateButtons(); this.schedule(); });
|
||||
}
|
||||
const spacer = el("span", "dd-spacer");
|
||||
footer.append(spacer);
|
||||
this.zoomLabel = el("span", "dd-zoom", "100%");
|
||||
footer.append(this.zoomLabel);
|
||||
this.button(footer, "适应", "适应画布 / Fit image", () => this.fit());
|
||||
this.button(footer, T("Fit"), T("Fit the image to the canvas"), () => this.fit());
|
||||
this.root.append(footer);
|
||||
const embedRow = el("label", "dd-embed");
|
||||
this.embed = el("input");
|
||||
this.embed.type = "checkbox";
|
||||
this.embed.onchange = () => this.options.onEmbed?.(this.embed.checked);
|
||||
embedRow.append(this.embed, document.createTextNode("原图嵌入工作流 · 分享时无需另传原图"));
|
||||
embedRow.append(this.embed, document.createTextNode(T("Embed the source image in the workflow; no separate file needed when sharing")));
|
||||
this.root.append(embedRow);
|
||||
this.message = el("div", "dd-status", "Alt 临时擦除 · Ctrl+滚轮调笔径 · 滚轮缩放 / 空格拖动");
|
||||
this.message = el("div", "dd-status", T("Alt = temporary erase · Ctrl+wheel = brush size · wheel = zoom · Space = pan"));
|
||||
this.message.hidden = true;
|
||||
this.message.setAttribute("role", "alert");
|
||||
this.root.append(this.message);
|
||||
if (this.options.compact) {
|
||||
this.root.classList.add("dd-inline-minimal");
|
||||
this.empty.hidden = true;
|
||||
this.controls = el("div", "dd-inpaint dd-editor-controls");
|
||||
const info = el("div", "dd-row dd-source-info"); info.append(this.filename, this.sizeLabel);
|
||||
head.remove();
|
||||
this.controls.append(info, tools, settings, actions, footer, embedRow);
|
||||
// These are the original live controls; the sampler mounts this
|
||||
// same DOM tree so brush state and callbacks are preserved.
|
||||
}
|
||||
this.setTool("brush");
|
||||
this.updateButtons();
|
||||
}
|
||||
@@ -180,12 +213,13 @@ export class InlineMaskEditor {
|
||||
status(message, error = false) {
|
||||
this.message.textContent = message;
|
||||
this.message.classList.toggle("dd-error", error);
|
||||
this.message.hidden = !error;
|
||||
}
|
||||
|
||||
async upload(file) {
|
||||
if (file.size > 64 * 1024 * 1024) { this.status("图片文件不能超过 64 MB / File is too large", true); return; }
|
||||
if (file.size > 64 * 1024 * 1024) { this.status(T("File is too large (max 64 MB)"), true); return; }
|
||||
try {
|
||||
this.status("正在载入原图… / Loading image…");
|
||||
this.status(T("Loading image…"));
|
||||
await this.options.onUpload?.(file);
|
||||
} catch (error) { this.status(error.message, true); }
|
||||
}
|
||||
@@ -197,7 +231,7 @@ export class InlineMaskEditor {
|
||||
const [image, loadedMask] = await Promise.all([loadImage(url), maskData ? loadImage(maskData) : Promise.resolve(null)]);
|
||||
if (version !== this.loadVersion || this.destroyed) return;
|
||||
if (image.width * image.height > 32 * 1024 * 1024 || Math.max(image.width, image.height) > 16384) {
|
||||
throw new Error("图像超过 3200 万像素或单边 16384px，请先缩小 / Image is too large");
|
||||
throw new Error(T("Image is too large; keep it under 32 MP and 16384 px per side"));
|
||||
}
|
||||
this.image = image;
|
||||
for (const canvas of [this.mask, this.baseMask]) { canvas.width = image.width; canvas.height = image.height; }
|
||||
@@ -219,7 +253,7 @@ export class InlineMaskEditor {
|
||||
if (version !== this.loadVersion || this.destroyed) return;
|
||||
this.baseMask.getContext("2d").drawImage(this.mask, 0, 0);
|
||||
this.sizeLabel.textContent = `${image.width} × ${image.height}`;
|
||||
this.filename.textContent = name || "内嵌原图 / Embedded image";
|
||||
this.filename.textContent = name || T("Embedded image");
|
||||
this.filename.title = this.filename.textContent;
|
||||
this.empty.hidden = true;
|
||||
this.ready = true;
|
||||
@@ -227,7 +261,8 @@ export class InlineMaskEditor {
|
||||
this.lastMask = maskData;
|
||||
this.fit();
|
||||
this.updateButtons();
|
||||
this.status("橙色为绘制蒙版 · Alt 临时擦除 · Ctrl+滚轮调笔径");
|
||||
this.options.onImage?.(image);
|
||||
this.status(T("Orange is the painted mask · Alt = temporary erase · Ctrl+wheel = brush size"));
|
||||
} catch (error) {
|
||||
if (version === this.loadVersion && !this.destroyed) this.status(error.message, true);
|
||||
throw error;
|
||||
@@ -259,6 +294,7 @@ export class InlineMaskEditor {
|
||||
}
|
||||
|
||||
updateButtons() {
|
||||
this.stage?.classList.toggle("dd-erasing", !!(this.altErase || this.tool === "erase" || this.stroke?.type === "erase"));
|
||||
for (const [name, button] of Object.entries(this.toolButtons || {})) {
|
||||
const active = name === (this.altErase ? "erase" : this.tool);
|
||||
button.classList.toggle("dd-active", active);
|
||||
@@ -274,6 +310,11 @@ export class InlineMaskEditor {
|
||||
|
||||
dimensions() {
|
||||
const r = this.canvas.getBoundingClientRect();
|
||||
if (this.viewport?.width && this.viewport?.height && r.width && r.height) {
|
||||
this.pan.x *= r.width / this.viewport.width;
|
||||
this.pan.y *= r.height / this.viewport.height;
|
||||
}
|
||||
this.viewport = { width: r.width, height: r.height };
|
||||
const scale = this.image ? Math.min(r.width / this.image.width, r.height / this.image.height) * this.zoom : 1;
|
||||
return { width: r.width, height: r.height, scale, x: (r.width - (this.image?.width || 0) * scale) / 2 + this.pan.x, y: (r.height - (this.image?.height || 0) * scale) / 2 + this.pan.y };
|
||||
}
|
||||
@@ -297,6 +338,7 @@ export class InlineMaskEditor {
|
||||
}
|
||||
if (this.view === "image") { this.view = "overlay"; this.updateButtons(); }
|
||||
this.stroke = { type: event.button === 2 || event.altKey ? "erase" : this.tool, size: this.brushSize, hardness: this.hardness, opacity: this.brushOpacity, points: [this.cursor] };
|
||||
this.updateButtons();
|
||||
if (["brush", "erase"].includes(this.stroke.type)) this.paintSegment(this.mask.getContext("2d"), this.stroke, this.cursor, this.cursor);
|
||||
this.schedule();
|
||||
}
|
||||
@@ -347,6 +389,7 @@ export class InlineMaskEditor {
|
||||
this.drag = null;
|
||||
const id = this.pointerId; this.pointerId = null;
|
||||
if (this.canvas.hasPointerCapture(id)) this.canvas.releasePointerCapture(id);
|
||||
this.updateButtons();
|
||||
this.schedule();
|
||||
}
|
||||
|
||||
@@ -532,8 +575,12 @@ export class InlineMaskEditor {
|
||||
ctx.restore();
|
||||
}
|
||||
if (this.cursor && (this.altErase || ["brush", "erase"].includes(this.tool)) && !this.drag) {
|
||||
const erasing = this.altErase || this.tool === "erase" || this.stroke?.type === "erase";
|
||||
ctx.save();
|
||||
if (erasing) ctx.setLineDash([4 / d.scale, 3 / d.scale]);
|
||||
ctx.beginPath(); ctx.arc(this.cursor.x, this.cursor.y, this.brushSize * this.cursor.p / 2, 0, Math.PI * 2);
|
||||
ctx.strokeStyle = "#15191f"; ctx.lineWidth = 3 / d.scale; ctx.stroke(); ctx.strokeStyle = "white"; ctx.lineWidth = 1 / d.scale; ctx.stroke();
|
||||
ctx.strokeStyle = "#15191f"; ctx.lineWidth = 3 / d.scale; ctx.stroke(); ctx.strokeStyle = erasing ? "#ffd0d7" : "white"; ctx.lineWidth = 1 / d.scale; ctx.stroke();
|
||||
ctx.restore();
|
||||
}
|
||||
this.zoomLabel.textContent = `${Math.round(this.zoom * 100)}%`;
|
||||
}
|
||||
@@ -541,8 +588,11 @@ export class InlineMaskEditor {
|
||||
destroy() {
|
||||
this.destroyed = true; ++this.loadVersion;
|
||||
cancelAnimationFrame(this.frame); this.observer.disconnect();
|
||||
window.removeEventListener("wheel", this.captureWheel, true);
|
||||
this.stopWheelCapture();
|
||||
window.removeEventListener("keydown", this.modifierDown, true);
|
||||
window.removeEventListener("keyup", this.modifierUp, true);
|
||||
window.removeEventListener("blur", this.modifierUp);
|
||||
for (const canvas of [this.mask, this.baseMask, this.overlay, this.canvas]) canvas.width = canvas.height = 0;
|
||||
this.history = []; this.future = []; this.image = null; this.root.remove();
|
||||
this.history = []; this.future = []; this.image = null; this.controls?.remove(); this.root.remove();
|
||||
}
|
||||
}
|
||||
|
||||
+164
@@ -0,0 +1,164 @@
|
||||
// Locale-aware labels for this plugin's own canvas UI.
|
||||
//
|
||||
// The English string in the call site is the default and the dictionary key, so any
|
||||
// missing translation falls back to English. ComfyUI's locales/ files only cover node
|
||||
// definitions (display name, category, sockets, tooltips); the custom panel and canvas
|
||||
// buttons are drawn by this plugin, so they translate here by reading Comfy.Locale.
|
||||
|
||||
const ZH = {
|
||||
// compare.js
|
||||
"Result": "结果",
|
||||
"Choose result": "选择重绘结果",
|
||||
"Connect an original image and a result, then run the workflow": "连接原图与重绘结果，然后运行工作流",
|
||||
"Adopt into": "回填到",
|
||||
"Target inline editor": "接收结果的内联蒙版",
|
||||
"Adopt this result": "采用此结果",
|
||||
"Move to compare · wheel to zoom · middle-drag to pan": "鼠标移动对比 · 滚轮缩放 · 中键拖动",
|
||||
"Select an inline mask": "选择内联蒙版",
|
||||
"Adopting…": "采用中…",
|
||||
"Setting the result as the new source image…": "正在将结果设为新原图…",
|
||||
"Adopted: back in the inline mask, keep painting to inpaint again": "已采用：回到内联蒙版，可继续涂抹重绘",
|
||||
"Inline Mask": "内联蒙版",
|
||||
"No inline mask node is available to receive the result": "找不到接收结果的内联蒙版节点",
|
||||
"Result preview expired; run the workflow again": "结果预览已过期，请重新运行工作流",
|
||||
"Result image exceeds 64 MiB; downscale it first": "结果图片超过 64 MiB，请先缩小",
|
||||
|
||||
// editor.js
|
||||
"Cannot load image": "无法读取图像",
|
||||
"INLINE MASK": "内联蒙版 · INLINE MASK",
|
||||
"Load image": "载入原图",
|
||||
"Upload an image, or drop / paste one": "上传图片，也可拖放或粘贴",
|
||||
"Drop an image onto the canvas": "拖放图片到画布",
|
||||
"Brush": "画笔",
|
||||
"Brush (B)": "画笔 (B)",
|
||||
"Eraser": "橡皮",
|
||||
"Eraser (E); hold Alt or right-click for temporary erase": "橡皮 (E)，按住 Alt 或鼠标右键临时擦除",
|
||||
"Rectangle": "矩形",
|
||||
"Rectangle (R)": "矩形 (R)",
|
||||
"Lasso": "套索",
|
||||
"Freehand lasso (L)": "自由套索 (L)",
|
||||
"Pan": "移动",
|
||||
"Pan (H), or hold Space": "移动 (H)，或按住空格",
|
||||
"Brush size": "笔径",
|
||||
"Hardness": "硬度",
|
||||
"Brush opacity": "笔触",
|
||||
"Overlay": "叠加",
|
||||
"Drop an image here": "把原图拖到这里",
|
||||
"Paint the areas to repaint directly in this node": "直接在节点中涂抹需要重绘的区域",
|
||||
"Undo": "撤销",
|
||||
"Undo (Ctrl+Z)": "撤销 (Ctrl+Z)",
|
||||
"Redo": "重做",
|
||||
"Redo (Ctrl+Shift+Z)": "重做 (Ctrl+Shift+Z)",
|
||||
"Invert": "反转",
|
||||
"Invert the painted mask": "反转绘制的蒙版",
|
||||
"Fill": "全选",
|
||||
"Fill the whole image with mask": "重绘整张图",
|
||||
"Clear": "清空",
|
||||
"Clear the mask": "清空蒙版",
|
||||
"Import mask": "导入蒙版",
|
||||
"White repaints, black preserves": "白色重绘，黑色保护",
|
||||
"Export": "导出",
|
||||
"Export the mask PNG at full resolution": "导出原始分辨率黑白蒙版",
|
||||
"Image": "原图",
|
||||
"Mask": "蒙版",
|
||||
"Fit": "适应",
|
||||
"Fit the image to the canvas": "适应画布",
|
||||
"File is too large (max 64 MB)": "图片文件不能超过 64 MB",
|
||||
"Loading image…": "正在载入原图…",
|
||||
"Embedded image": "内嵌原图",
|
||||
"Orange is the painted mask · Alt = temporary erase · Ctrl+wheel = brush size": "橙色为绘制蒙版 · Alt 临时擦除 · Ctrl+滚轮调笔径",
|
||||
"Image is too large; keep it under 32 MP and 16384 px per side": "图像超过 3200 万像素或单边 16384px，请先缩小",
|
||||
|
||||
// inline_inpaint.js
|
||||
"The inline mask node was removed": "内联蒙版节点已移除",
|
||||
"Adopted the result as the new source image; the old mask was cleared": "已采用重绘结果作为新原图，旧蒙版已清空",
|
||||
"Drag to resize canvas height": "上下拖动调整画布高度",
|
||||
"Resize canvas height": "调整画布高度",
|
||||
"Upload failed": "上传失败",
|
||||
|
||||
// inpaint_node.js
|
||||
"Connect an inline mask to show the painting tools": "连接内联蒙版后显示画笔工具",
|
||||
"The painting tools live in the other inpaint node connected to this image": "画笔工具位于连接此原图的另一个重绘节点",
|
||||
|
||||
// inpaint_panel.js
|
||||
"WebUI Inpaint": "WebUI 局部重绘",
|
||||
"Controlled WebUI inpaint node": "控制的局部重绘节点",
|
||||
"Connect a WebUI inpaint node to edit its parameters here": "连接 WebUI 局部重绘节点后，在这里调整参数",
|
||||
"Mask mode": "重绘区域",
|
||||
"Fill content": "重绘参考内容",
|
||||
"Sampling area": "重绘画布",
|
||||
"Sampling resolution": "采样分辨率",
|
||||
"Use source size": "使用原图宽高",
|
||||
"Fill width and height from the current source image; aligned to 8 px and clamped to 64-8192 px": "填写当前原图宽高；按 8 的倍数对齐，并限制在 64–8192 像素",
|
||||
"Width": "宽度",
|
||||
"Height": "高度",
|
||||
"Denoise": "重绘幅度",
|
||||
"Sampler": "采样器",
|
||||
"Scheduler": "调度器",
|
||||
"Steps": "采样步数",
|
||||
"CFG scale": "提示词引导 CFG",
|
||||
"Seed": "随机种子",
|
||||
"After generate": "生成后种子",
|
||||
"Mask, batch and advanced settings": "蒙版、批量与高级设置",
|
||||
"Context padding": "蒙版外扩边距",
|
||||
"Mask blur": "蒙版模糊",
|
||||
"Mask grow / shrink": "蒙版扩张 / 收缩",
|
||||
"Batch size": "每张生成数量",
|
||||
"Resize mode": "缩放方式",
|
||||
"Use dedicated inpaint model": "使用专用 Inpaint 模型",
|
||||
"Extra edge feathering": "额外羽化边缘",
|
||||
"Feather strength": "额外羽化强度",
|
||||
"Refiner switch ratio": "Refiner 切换比例",
|
||||
|
||||
"Preview unavailable; run the workflow again": "预览已过期或无法加载，请重新运行",
|
||||
"Result left, original right; hover to compare": "左重绘结果、右原图，移动鼠标竖线对比",
|
||||
"Inline mask painting canvas; orange areas are repainted": "直接涂抹蒙版；橙色区域将被重绘",
|
||||
"Embed the source image in the workflow; no separate file needed when sharing": "原图嵌入工作流 · 分享时无需另传原图",
|
||||
"Alt = temporary erase · Ctrl+wheel = brush size · wheel = zoom · Space = pan": "Alt 临时擦除 · Ctrl+滚轮调笔径 · 滚轮缩放 / 空格拖动",
|
||||
|
||||
// enum values
|
||||
"enum:Inside mask": "蒙版内",
|
||||
"enum:Outside mask": "蒙版外",
|
||||
"enum:Fill": "填充",
|
||||
"enum:Original pixels": "原图像素",
|
||||
"enum:Latent noise": "潜空间噪声",
|
||||
"enum:Empty latent": "空白潜空间",
|
||||
"enum:Whole image": "整图重绘",
|
||||
"enum:Masked area only": "仅蒙版区域",
|
||||
"enum:Stretch": "拉伸",
|
||||
"enum:Center crop": "居中裁剪",
|
||||
"enum:Aspect fill": "保比例填充",
|
||||
"enum:Fixed": "固定种子",
|
||||
"enum:Increment": "生成后递增",
|
||||
"enum:Decrement": "生成后递减",
|
||||
"enum:Randomize": "生成后随机",
|
||||
};
|
||||
|
||||
const DICTS = { zh: ZH };
|
||||
|
||||
function readLocale() {
|
||||
try {
|
||||
const api = globalThis.comfyAPI;
|
||||
const value = api?.app?.ui?.settings?.getSettingValue?.("Comfy.Locale");
|
||||
if (value) return String(value);
|
||||
} catch (_) { /* settings unavailable before the app boots */ }
|
||||
try {
|
||||
const value = globalThis.app?.ui?.settings?.getSettingValue?.("Comfy.Locale");
|
||||
if (value) return String(value);
|
||||
} catch (_) { /* ignore */ }
|
||||
return "en";
|
||||
}
|
||||
|
||||
export function localeDict() {
|
||||
const base = readLocale().split("-")[0].toLowerCase();
|
||||
return DICTS[base] || null;
|
||||
}
|
||||
|
||||
// Translate a user-facing string. `context` disambiguates identical English strings
|
||||
// that need different translations (for example the Fill button and the Fill enum).
|
||||
export function T(text, context) {
|
||||
const dict = localeDict();
|
||||
if (!dict) return text;
|
||||
const key = context ? `${context}:${text}` : text;
|
||||
return dict[key] ?? text;
|
||||
}
|
||||
+33
-10
@@ -1,6 +1,9 @@
|
||||
import { app } from "../../scripts/app.js";
|
||||
import { api } from "../../scripts/api.js";
|
||||
import { InlineMaskEditor } from "./editor.js";
|
||||
import { installInpaintWorkbench } from "./inpaint_node.js";
|
||||
import { routeWheelOutsideImage } from "./wheel_routing.js";
|
||||
import { T } from "./i18n.js";
|
||||
|
||||
const styleId = "adachi-inpaint-style";
|
||||
if (!document.getElementById(styleId)) {
|
||||
@@ -37,6 +40,7 @@ function imageUrl(value) {
|
||||
app.registerExtension({
|
||||
name: "Adachi.InlineInpaint",
|
||||
async beforeRegisterNodeDef(nodeType, nodeData) {
|
||||
if (["AdachiWebUIInpaint", "AdachiInpaintPrepare"].includes(nodeData.name)) { installInpaintWorkbench(nodeType); return; }
|
||||
if (nodeData.name !== "AdachiInlineMask") return;
|
||||
const originalCreated = nodeType.prototype.onNodeCreated;
|
||||
nodeType.prototype.onNodeCreated = function () {
|
||||
@@ -56,19 +60,37 @@ app.registerExtension({
|
||||
let restoring = false;
|
||||
let restoreFrame = 0;
|
||||
let uploadVersion = 0;
|
||||
let fitFrame = 0;
|
||||
const fitNodeToImage = () => {
|
||||
cancelAnimationFrame(fitFrame);
|
||||
fitFrame = requestAnimationFrame(() => {
|
||||
if (!editor.ready || editor.destroyed || !node.graph) return;
|
||||
const rect = editor.canvas.getBoundingClientRect();
|
||||
const scale = app.canvas?.ds?.scale || 1;
|
||||
if (!rect.width || !rect.height) return;
|
||||
const overhead = node.size[1] - rect.height / scale;
|
||||
const height = overhead + rect.width / scale * editor.image.height / editor.image.width;
|
||||
node.setSize([node.size[0], Math.max(240, Math.min(4200, Math.ceil(height)))]);
|
||||
node.properties.adachi_compact_ui = true;
|
||||
editor.schedule();
|
||||
});
|
||||
};
|
||||
const restore = async () => {
|
||||
const embedded = sourceWidget?.value;
|
||||
const filename = imageWidget?.value;
|
||||
if (!embedded && !filename) return;
|
||||
restoring = true;
|
||||
editor.embed.checked = !!embedded;
|
||||
try { await editor.setImage(embedded || imageUrl(filename), maskWidget?.value || "", embedded ? "内嵌原图 / Embedded image" : filename); }
|
||||
try { await editor.setImage(embedded || imageUrl(filename), maskWidget?.value || "", embedded ? T("Embedded image") : filename); }
|
||||
catch (error) { console.warn("[Adachi Inpaint]", error); }
|
||||
finally { restoring = false; }
|
||||
};
|
||||
const editor = new InlineMaskEditor({
|
||||
compact: true,
|
||||
onChange(data) { if (maskWidget && !restoring) maskWidget.value = data; },
|
||||
onDirty() { markChanged(); },
|
||||
onImage() { if (!restoring || !node.properties.adachi_compact_ui) fitNodeToImage(); },
|
||||
onGraphWheel: event => app.canvas?.processMouseWheel(event),
|
||||
async onUpload(file) {
|
||||
const version = ++uploadVersion;
|
||||
const body = new FormData();
|
||||
@@ -76,7 +98,7 @@ app.registerExtension({
|
||||
body.append("type", "input");
|
||||
body.append("subfolder", "adachi-inpaint");
|
||||
const response = await api.fetchApi("/upload/image", { method: "POST", body });
|
||||
if (!response.ok) throw new Error(`上传失败 / Upload failed (${response.status})`);
|
||||
if (!response.ok) throw new Error(`${T("Upload failed")} (${response.status})`);
|
||||
const uploaded = await response.json();
|
||||
if (version !== uploadVersion || editor.destroyed) return;
|
||||
const name = uploaded.subfolder ? `${uploaded.subfolder}/${uploaded.name}` : uploaded.name;
|
||||
@@ -94,16 +116,17 @@ app.registerExtension({
|
||||
},
|
||||
});
|
||||
node.adachiEditor = editor;
|
||||
const stopWheelRouting = routeWheelOutsideImage(editor.root, editor.canvas, () => editor.ready);
|
||||
node.adachiUseResult = async file => {
|
||||
if (editor.destroyed) throw new Error("内联蒙版节点已移除");
|
||||
if (editor.destroyed) throw new Error(T("The inline mask node was removed"));
|
||||
await editor.options.onUpload(file);
|
||||
editor.view = "overlay"; editor.updateButtons(); editor.schedule();
|
||||
editor.status("已采用重绘结果作为新原图，旧蒙版已清空");
|
||||
editor.status(T("Adopted the result as the new source image; the old mask was cleared"));
|
||||
};
|
||||
const domWidget = node.addDOMWidget("adachi_canvas", "adachi_inline_mask", editor.root, {
|
||||
serialize: false,
|
||||
hideOnZoom: false,
|
||||
getMinHeight: () => 520,
|
||||
getMinHeight: () => 170,
|
||||
getMaxHeight: () => 4096,
|
||||
});
|
||||
domWidget.serialize = false;
|
||||
@@ -112,15 +135,15 @@ app.registerExtension({
|
||||
const resizeHandle = document.createElement("div");
|
||||
resizeHandle.className = "dd-resize-handle";
|
||||
resizeHandle.textContent = "↕";
|
||||
resizeHandle.title = "上下拖动调整画布高度 / Drag to resize canvas height";
|
||||
resizeHandle.title = T("Drag to resize canvas height");
|
||||
resizeHandle.tabIndex = 0;
|
||||
resizeHandle.setAttribute("role", "separator");
|
||||
resizeHandle.setAttribute("aria-orientation", "horizontal");
|
||||
resizeHandle.setAttribute("aria-label", "调整画布高度 / Resize canvas height");
|
||||
resizeHandle.setAttribute("aria-label", T("Resize canvas height"));
|
||||
editor.root.append(resizeHandle);
|
||||
let resizing = null;
|
||||
const resizeHeight = height => {
|
||||
node.setSize([node.size[0], Math.max(620, Math.min(4200, height))]);
|
||||
node.setSize([node.size[0], Math.max(240, Math.min(4200, height))]);
|
||||
node.graph?.setDirtyCanvas(true, true);
|
||||
editor.schedule();
|
||||
};
|
||||
@@ -173,8 +196,8 @@ app.registerExtension({
|
||||
const previousImageCallback = imageWidget.callback;
|
||||
imageWidget.callback = function () { previousImageCallback?.apply(this, arguments); restore(); };
|
||||
const previousRemoved = node.onRemoved;
|
||||
node.onRemoved = function () { cancelAnimationFrame(restoreFrame); editor.destroy(); return previousRemoved?.apply(this, arguments); };
|
||||
node.setSize([Math.max(510, node.size[0]), Math.max(650, node.size[1])]);
|
||||
node.onRemoved = function () { cancelAnimationFrame(restoreFrame); cancelAnimationFrame(fitFrame); stopWheelRouting(); editor.destroy(); return previousRemoved?.apply(this, arguments); };
|
||||
node.setSize([Math.max(380, node.size[0]), Math.max(480, node.size[1])]);
|
||||
restoreFrame = requestAnimationFrame(restore);
|
||||
return result;
|
||||
};
|
||||
|
||||
@@ -0,0 +1,76 @@
|
||||
import { app } from "../../scripts/app.js";
|
||||
import { InpaintParameterPanel } from "./inpaint_panel.js";
|
||||
import { connectedEditor, connectedSamplers, relocateWidgets } from "./parameter_bridge.js";
|
||||
import { routeWheelOutsideImage } from "./wheel_routing.js";
|
||||
import { T } from "./i18n.js";
|
||||
|
||||
export function installInpaintWorkbench(nodeType) {
|
||||
const created = nodeType.prototype.onNodeCreated;
|
||||
nodeType.prototype.onNodeCreated = function () {
|
||||
const result = created?.apply(this, arguments), node = this;
|
||||
const root = document.createElement("div"); root.className = "dd-inpaint dd-workbench";
|
||||
const tools = document.createElement("div"); tools.className = "dd-workbench-tools";
|
||||
const placeholder = document.createElement("div"); placeholder.className = "dd-param-placeholder dd-tools-placeholder";
|
||||
placeholder.textContent = T("Connect an inline mask to show the painting tools");
|
||||
tools.append(placeholder); root.append(tools);
|
||||
let source = null, mountedEditor = null, frame = 0, removed = false;
|
||||
const markChanged = () => {
|
||||
app.canvas?.emitBeforeChange?.(); app.canvas?.emitAfterChange?.();
|
||||
node.graph?.setDirtyCanvas(true, true);
|
||||
};
|
||||
const refreshEditor = () => {
|
||||
source = connectedEditor(node);
|
||||
const editor = source?.adachiEditor;
|
||||
// A live control tree has one host. Additional samplers still get
|
||||
// their own parameters and use the same source image dimensions.
|
||||
const canMount = editor?.controls && connectedSamplers(source)[0] === node;
|
||||
const next = canMount ? editor : null;
|
||||
if (next !== mountedEditor) {
|
||||
if (mountedEditor?.controls.parentElement === tools) mountedEditor.controls.remove();
|
||||
mountedEditor = next;
|
||||
if (next) tools.append(next.controls);
|
||||
scheduleSize();
|
||||
}
|
||||
placeholder.hidden = !!next;
|
||||
placeholder.textContent = editor ? T("The painting tools live in the other inpaint node connected to this image") : T("Connect an inline mask to show the painting tools");
|
||||
};
|
||||
const contentHeight = () => (tools.scrollHeight || 30) + (panel?.root.scrollHeight || 620);
|
||||
const scheduleSize = () => {
|
||||
cancelAnimationFrame(frame);
|
||||
frame = requestAnimationFrame(() => {
|
||||
if (removed || !node.graph || !root.isConnected) return;
|
||||
const required = node.computeSize()[1];
|
||||
if (Math.abs(node.size[1] - required) > 1) node.setSize([node.size[0], required]);
|
||||
node.graph.setDirtyCanvas(true, true);
|
||||
});
|
||||
};
|
||||
let panel;
|
||||
panel = new InpaintParameterPanel({
|
||||
getTargets: () => { refreshEditor(); return [node]; },
|
||||
getImage: () => source?.adachiEditor?.ready ? source.adachiEditor.image : null,
|
||||
onTargetChange: (previous, next) => relocateWidgets(node, previous, next),
|
||||
onDirty: markChanged, onHeight: scheduleSize,
|
||||
});
|
||||
root.append(panel.root);
|
||||
node.adachiParameters = panel; node.adachiWorkbench = { root, tools, get source() { return source; } };
|
||||
const stopWheelRouting = routeWheelOutsideImage(root, null, () => false);
|
||||
const widget = node.addDOMWidget("adachi_workbench", "adachi_inpaint_controls", root, {
|
||||
serialize: false, hideOnZoom: false, getMinHeight: contentHeight, getMaxHeight: () => Math.max(4096, contentHeight()),
|
||||
});
|
||||
widget.serialize = false;
|
||||
const observer = new ResizeObserver(scheduleSize); observer.observe(tools);
|
||||
const configured = node.onConfigure;
|
||||
node.onConfigure = function () { const result = configured?.apply(this, arguments); queueMicrotask(() => { if (!removed) { panel.refresh(); scheduleSize(); } }); return result; };
|
||||
const connections = node.onConnectionsChange;
|
||||
node.onConnectionsChange = function () { const result = connections?.apply(this, arguments); queueMicrotask(() => { if (!removed) panel.refresh(); }); return result; };
|
||||
const previousRemoved = node.onRemoved;
|
||||
node.onRemoved = function () {
|
||||
removed = true; cancelAnimationFrame(frame); observer.disconnect();
|
||||
if (mountedEditor?.controls.parentElement === tools) mountedEditor.controls.remove();
|
||||
panel.destroy(); stopWheelRouting(); root.remove();
|
||||
return previousRemoved?.apply(this, arguments);
|
||||
};
|
||||
node.setSize([Math.max(510, node.size[0]), node.size[1]]); scheduleSize();
|
||||
return result;
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,150 @@
|
||||
/* Inline controls edit the connected sampler's real widgets, not a second set of parameters. */
|
||||
import { T } from "./i18n.js";
|
||||
const el = (tag, cls, text) => { const e = document.createElement(tag); if (cls) e.className = cls; if (text) e.textContent = text; return e; };
|
||||
export const INPAINT_FIELDS = ["mask_mode", "fill", "area", "padding", "width", "height", "denoise", "sampler_name", "scheduler", "steps", "cfg", "seed", "control_after_generate", "batch_size", "mask_blur", "mask_grow", "resize_mode", "inpaint_model", "soft_edge", "soft_strength", "refiner_switch"];
|
||||
const choices = {
|
||||
mask_mode: { inside: "Inside mask", outside: "Outside mask" },
|
||||
fill: { fill: "Fill", original: "Original pixels", latent_noise: "Latent noise", latent_nothing: "Empty latent" },
|
||||
area: { whole_image: "Whole image", only_masked: "Masked area only" },
|
||||
resize_mode: { stretch: "Stretch", crop: "Center crop", fill: "Aspect fill" },
|
||||
control_after_generate: { fixed: "Fixed", increment: "Increment", decrement: "Decrement", randomize: "Randomize" },
|
||||
};
|
||||
|
||||
export class InpaintParameterPanel {
|
||||
constructor(options) {
|
||||
this.options = options; this.bindings = []; this.root = el("section", "dd-parameters");
|
||||
const header = el("div", "dd-param-header"); header.append(el("strong", "", T("WebUI Inpaint")));
|
||||
this.targetSelect = el("select"); this.targetSelect.setAttribute("aria-label", T("Controlled WebUI inpaint node"));
|
||||
this.targetSelect.onchange = () => { this.preferred = this.targetSelect.value; this.options.onPreferred?.(this.preferred); this.refresh(); };
|
||||
header.append(this.targetSelect); this.root.append(header);
|
||||
this.placeholder = el("div", "dd-param-placeholder", T("Connect a WebUI inpaint node to edit its parameters here"));
|
||||
this.body = el("div", "dd-param-body"); this.root.append(this.placeholder, this.body);
|
||||
this.observer = new ResizeObserver(() => options.onHeight?.()); this.observer.observe(this.root);
|
||||
this.timer = setInterval(() => { if (this.root.isConnected && !document.hidden) this.refresh(); }, 350);
|
||||
this.refresh();
|
||||
}
|
||||
|
||||
refresh() {
|
||||
const targets = this.options.getTargets?.() || [];
|
||||
const preferred = this.preferred || this.options.getPreferred?.();
|
||||
const next = targets.find(n => String(n.id) === String(preferred)) || targets[0] || null;
|
||||
const signature = targets.map(n => `${n.id}:${n.title}`).join("|");
|
||||
if (signature !== this.signature) {
|
||||
this.signature = signature; this.targetSelect.replaceChildren();
|
||||
for (const n of targets) { const option = el("option", "", `${n.title || T("WebUI Inpaint")} #${n.id}`); option.value = String(n.id); this.targetSelect.append(option); }
|
||||
}
|
||||
this.targetSelect.hidden = targets.length < 2;
|
||||
if (next) this.targetSelect.value = String(next.id);
|
||||
if (next !== this.target) {
|
||||
const previous = this.target; this.target = next;
|
||||
this.options.onTargetChange?.(previous, next);
|
||||
this.bindings = []; this.body.replaceChildren();
|
||||
if (next) this.build();
|
||||
this.options.onHeight?.();
|
||||
}
|
||||
this.placeholder.hidden = !!next; this.body.hidden = !next;
|
||||
for (const binding of this.bindings) binding.sync();
|
||||
if (this.sourceSize) this.sourceSize.disabled = !this.options.getImage?.();
|
||||
}
|
||||
|
||||
widget(name) { return this.target?.widgets?.find(w => w.name === name); }
|
||||
linked(name) { return this.target?.inputs?.some(input => input.name === name && input.link != null); }
|
||||
write(name, value, commit = false) {
|
||||
const widget = this.widget(name); if (!widget || this.linked(name)) return;
|
||||
if (widget.value !== value) { widget.value = value; widget.callback?.(value); }
|
||||
if (commit) this.options.onDirty?.();
|
||||
}
|
||||
|
||||
enum(parent, name, label, pills = false) {
|
||||
const widget = this.widget(name); if (!widget) return;
|
||||
label = T(label);
|
||||
const wrapper = el("div", "dd-param-field"); wrapper.append(el("span", "dd-param-label", label));
|
||||
let values = widget.options?.values; if (typeof values === "function") values = values();
|
||||
if (!Array.isArray(values)) values = Object.keys(choices[name] || {});
|
||||
if (!values.includes(widget.value)) values = [widget.value, ...values];
|
||||
const display = value => choices[name]?.[value] ? T(choices[name][value], "enum") : String(value);
|
||||
if (pills) {
|
||||
const row = el("div", "dd-param-pills");
|
||||
const buttons = values.map(value => {
|
||||
const button = el("button", "", display(value)); button.type = "button";
|
||||
button.onclick = () => { this.write(name, value, true); this.refresh(); }; row.append(button); return { button, value };
|
||||
});
|
||||
wrapper.append(row); this.bindings.push({ sync: () => { for (const {button,value} of buttons) { button.classList.toggle("dd-active", widget.value === value); button.setAttribute("aria-pressed", String(widget.value === value)); button.disabled = this.linked(name); } } });
|
||||
} else {
|
||||
const select = el("select"); select.setAttribute("aria-label", label);
|
||||
for (const value of values) { const option = el("option", "", display(value)); option.value = value; select.append(option); }
|
||||
select.onchange = () => this.write(name, select.value, true); wrapper.append(select);
|
||||
this.bindings.push({ sync: () => { if (document.activeElement !== select) select.value = widget.value; select.disabled = this.linked(name); } });
|
||||
}
|
||||
parent.append(wrapper);
|
||||
}
|
||||
|
||||
number(parent, name, label, { min, max, step = 1, range = false, rangeMax = max } = {}) {
|
||||
const widget = this.widget(name); if (!widget) return;
|
||||
label = T(label);
|
||||
min ??= widget.options?.min ?? 0; max ??= widget.options?.max ?? 1000000;
|
||||
const wrapper = el("label", "dd-param-field"); const row = el("span", "dd-param-number-label"); row.append(el("span", "", label));
|
||||
const input = el("input"); input.type = "number"; input.min = min; input.max = max; input.step = step; input.setAttribute("aria-label", label); row.append(input); wrapper.append(row);
|
||||
let slider;
|
||||
const update = raw => {
|
||||
if (raw === "" || !Number.isFinite(Number(raw))) return;
|
||||
const value = Math.max(min, Math.min(max, Math.round(Number(raw) / step) * step));
|
||||
this.write(name, Number(value.toFixed(step < 1 ? Math.ceil(-Math.log10(step)) : 0)));
|
||||
if (slider) slider.value = widget.value;
|
||||
};
|
||||
input.oninput = () => update(input.value); input.onchange = () => { update(input.value); input.value = widget.value; this.options.onDirty?.(); };
|
||||
if (range) {
|
||||
slider = el("input"); slider.type = "range"; slider.min = min; slider.max = rangeMax ?? max; slider.step = step; slider.setAttribute("aria-label", `${label} slider`);
|
||||
slider.oninput = () => { update(slider.value); input.value = widget.value; }; slider.onchange = () => this.options.onDirty?.(); wrapper.append(slider);
|
||||
}
|
||||
this.bindings.push({ sync: () => {
|
||||
if (document.activeElement !== input) input.value = widget.value;
|
||||
if (slider && document.activeElement !== slider) slider.value = widget.value;
|
||||
input.disabled = this.linked(name); if (slider) slider.disabled = input.disabled;
|
||||
} }); parent.append(wrapper);
|
||||
}
|
||||
|
||||
toggle(parent, name, label) {
|
||||
const widget = this.widget(name); if (!widget) return;
|
||||
const wrapper = el("label", "dd-param-toggle"), input = el("input"); input.type = "checkbox";
|
||||
input.onchange = () => this.write(name, input.checked, true); wrapper.append(input, document.createTextNode(T(label))); parent.append(wrapper);
|
||||
this.bindings.push({ sync: () => { input.checked = !!widget.value; input.disabled = this.linked(name); } });
|
||||
}
|
||||
|
||||
grid(parent) { const grid = el("div", "dd-param-grid"); parent.append(grid); return grid; }
|
||||
|
||||
build() {
|
||||
this.enum(this.body, "mask_mode", "Mask mode", true);
|
||||
this.enum(this.body, "fill", "Fill content", true);
|
||||
this.enum(this.body, "area", "Sampling area", true);
|
||||
const resolution = el("div", "dd-param-resolution"); resolution.append(el("span", "dd-param-label", T("Sampling resolution")));
|
||||
this.sourceSize = el("button", "", T("Use source size")); this.sourceSize.type = "button";
|
||||
this.sourceSize.title = T("Fill width and height from the current source image; aligned to 8 px and clamped to 64-8192 px");
|
||||
this.sourceSize.onclick = () => {
|
||||
const image = this.options.getImage?.(); if (!image) return;
|
||||
const aligned = value => Math.max(64, Math.min(8192, Math.round(value / 8) * 8));
|
||||
this.write("width", aligned(image.naturalWidth || image.width)); this.write("height", aligned(image.naturalHeight || image.height));
|
||||
this.options.onDirty?.(); this.refresh();
|
||||
};
|
||||
resolution.append(this.sourceSize); this.body.append(resolution);
|
||||
this.number(this.body, "width", "Width", { min: 64, max: 8192, step: 8, range: true });
|
||||
this.number(this.body, "height", "Height", { min: 64, max: 8192, step: 8, range: true });
|
||||
this.number(this.body, "denoise", "Denoise", { min: 0, max: 1, step: .01, range: true });
|
||||
const sampling = this.grid(this.body); this.enum(sampling, "sampler_name", "Sampler"); this.enum(sampling, "scheduler", "Scheduler");
|
||||
const scale = this.grid(this.body);
|
||||
this.number(scale, "steps", "Steps", { min: 1, max: 10000, range: true, rangeMax: 150 });
|
||||
this.number(scale, "cfg", "CFG scale", { min: 0, max: 100, step: .1, range: true, rangeMax: 30 });
|
||||
const seed = this.grid(this.body); this.number(seed, "seed", "Seed", { min: 0, max: Number.MAX_SAFE_INTEGER }); this.enum(seed, "control_after_generate", "After generate");
|
||||
const advanced = el("details", "dd-param-advanced"), summary = el("summary", "", T("Mask, batch and advanced settings")); advanced.append(summary);
|
||||
const content = el("div", "dd-param-advanced-body"); advanced.append(content);
|
||||
this.number(content, "padding", "Context padding", { min: 0, max: 2048 });
|
||||
const masks = this.grid(content);
|
||||
this.number(masks, "mask_blur", "Mask blur", { min: 0, max: 128, step: .5 }); this.number(masks, "mask_grow", "Mask grow / shrink", { min: -128, max: 128 });
|
||||
const batch = this.grid(content); this.number(batch, "batch_size", "Batch size", { min: 1, max: 16 }); this.enum(batch, "resize_mode", "Resize mode");
|
||||
this.toggle(content, "inpaint_model", "Use dedicated inpaint model"); this.toggle(content, "soft_edge", "Extra edge feathering");
|
||||
this.number(content, "soft_strength", "Feather strength", { min: 0, max: 1, step: .05, range: true });
|
||||
this.number(content, "refiner_switch", "Refiner switch ratio", { min: 0, max: 1, step: .01, range: true }); this.body.append(advanced);
|
||||
}
|
||||
|
||||
destroy() { clearInterval(this.timer); this.observer.disconnect(); this.options.onTargetChange?.(this.target, null); this.target = null; this.root.remove(); }
|
||||
}
|
||||
@@ -0,0 +1,67 @@
|
||||
import { INPAINT_FIELDS } from "./inpaint_panel.js";
|
||||
|
||||
const hiddenWidgets = new WeakMap();
|
||||
const targetSizes = new WeakMap();
|
||||
|
||||
function setHiddenOption(widget, value) {
|
||||
widget.options ??= {};
|
||||
// Recent frontends keep a reactive options proxy on BaseWidget state.
|
||||
// Write through that proxy first so Nodes 2.0 observes runtime relocation.
|
||||
const options = widget._state?.options || widget.options;
|
||||
if (value === undefined) delete options.hidden; else options.hidden = value;
|
||||
if (value === undefined) delete widget.options.hidden; else widget.options.hidden = value;
|
||||
}
|
||||
|
||||
export function connectedEditor(target) {
|
||||
const graph = target.graph; if (!graph) return null;
|
||||
const input = target.inputs?.find(input => input.name === "image");
|
||||
const link = graph.links?.[input?.link]; const queue = link ? [link.origin_id] : [], seen = new Set(), sources = new Set();
|
||||
while (queue.length && seen.size < 256) {
|
||||
const id = queue.shift(); if (seen.has(id)) continue; seen.add(id);
|
||||
const current = graph.getNodeById(id); if (!current) continue;
|
||||
if (current.type === "AdachiInlineMask") { sources.add(current.id); continue; }
|
||||
for (const input of current.inputs || []) {
|
||||
if (current.type === "AdachiImageCompare" && input.name !== "result") continue;
|
||||
if (!["IMAGE", "*"].includes(input.type)) continue;
|
||||
const next = graph.links?.[input.link]; if (next) queue.push(next.origin_id);
|
||||
}
|
||||
}
|
||||
return sources.size === 1 ? graph.getNodeById([...sources][0]) : null;
|
||||
}
|
||||
|
||||
export function connectedSamplers(source) {
|
||||
return (source.graph?._nodes || [])
|
||||
.filter(node => ["AdachiWebUIInpaint", "AdachiInpaintPrepare"].includes(node.type) && connectedEditor(node) === source)
|
||||
.sort((a, b) => Number(b.type === "AdachiWebUIInpaint") - Number(a.type === "AdachiWebUIInpaint"));
|
||||
}
|
||||
|
||||
export function relocateWidgets(owner, previous, next) {
|
||||
if (previous) {
|
||||
for (const widget of previous.widgets || []) {
|
||||
const state = hiddenWidgets.get(widget); if (!state) continue;
|
||||
state.owners.delete(owner); if (state.owners.size) continue;
|
||||
widget.type = state.type; widget.hidden = state.hidden;
|
||||
setHiddenOption(widget, state.optionHidden);
|
||||
if (state.ownComputeSize) widget.computeSize = state.computeSize; else delete widget.computeSize;
|
||||
if (state.element) state.element.style.display = state.display;
|
||||
hiddenWidgets.delete(widget);
|
||||
}
|
||||
const size = targetSizes.get(previous); if (size) { previous.setSize([previous.size[0], Math.max(size[1], previous.computeSize()[1])]); targetSizes.delete(previous); }
|
||||
}
|
||||
if (next) {
|
||||
if (!targetSizes.has(next)) targetSizes.set(next, [...next.size]);
|
||||
for (const widget of next.widgets || []) {
|
||||
if (!INPAINT_FIELDS.includes(widget.name)) continue;
|
||||
let state = hiddenWidgets.get(widget);
|
||||
if (!state) {
|
||||
const element = widget.element || widget.inputEl;
|
||||
state = { type: widget.type, hidden: widget.hidden, optionHidden: widget.options?.hidden, ownComputeSize: Object.hasOwn(widget, "computeSize"), computeSize: widget.computeSize, element, display: element?.style.display || "", owners: new Set() };
|
||||
hiddenWidgets.set(widget, state);
|
||||
widget.type = "hidden"; widget.hidden = true; setHiddenOption(widget, true);
|
||||
widget.computeSize = () => [0, -4]; if (element) element.style.display = "none";
|
||||
}
|
||||
state.owners.add(owner);
|
||||
}
|
||||
next.setSize([next.size[0], next.computeSize()[1]]);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,35 @@
|
||||
/* Keep a continuous wheel gesture with its original viewport. */
|
||||
const canvases = new Map();
|
||||
let owner = null, lastTime = 0, modifiers = "";
|
||||
const IDLE_MS = 180;
|
||||
const reset = () => { owner = null; lastTime = 0; modifiers = ""; };
|
||||
|
||||
function capture(event) {
|
||||
// Ignore synthetic events forwarded by ComfyUI; they are not new gestures.
|
||||
if (!event.isTrusted) return;
|
||||
const entry = canvases.get(event.target);
|
||||
const rect = entry?.canvas.getBoundingClientRect();
|
||||
const inside = rect && event.clientX >= rect.left && event.clientX <= rect.right && event.clientY >= rect.top && event.clientY <= rect.bottom;
|
||||
const canvas = entry && inside && entry.ready() ? entry.canvas : null;
|
||||
const now = performance.now(), keys = `${event.ctrlKey}:${event.altKey}:${event.metaKey}:${event.shiftKey}`;
|
||||
if (!owner || now - lastTime > IDLE_MS || keys !== modifiers) owner = canvas || "graph";
|
||||
else if (owner !== "graph" && owner !== canvas) owner = "graph";
|
||||
lastTime = now; modifiers = keys;
|
||||
if (!entry || !inside || !entry.ready()) return;
|
||||
if (owner === canvas) entry.wheel(event);
|
||||
else if (entry.graphWheel) {
|
||||
event.preventDefault(); event.stopPropagation(); entry.graphWheel(event);
|
||||
}
|
||||
}
|
||||
|
||||
export function registerImageWheel(canvas, ready, wheel, graphWheel) {
|
||||
if (!canvases.size) {
|
||||
window.addEventListener("wheel", capture, { capture: true, passive: false });
|
||||
window.addEventListener("blur", reset);
|
||||
}
|
||||
canvases.set(canvas, { canvas, ready, wheel, graphWheel });
|
||||
return () => {
|
||||
canvases.delete(canvas);
|
||||
if (!canvases.size) { window.removeEventListener("wheel", capture, true); window.removeEventListener("blur", reset); reset(); }
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,13 @@
|
||||
import { app } from "../../scripts/app.js";
|
||||
|
||||
export function routeWheelOutsideImage(root, canvas, isReady) {
|
||||
const route = event => {
|
||||
if (!root.contains(event.target)) return;
|
||||
if (event.target === canvas && isReady()) return;
|
||||
event.preventDefault(); event.stopPropagation();
|
||||
// Preserve the user's ComfyUI navigation mode (zoom or pan).
|
||||
app.canvas?.processMouseWheel(event);
|
||||
};
|
||||
window.addEventListener("wheel", route, { capture: true, passive: false });
|
||||
return () => window.removeEventListener("wheel", route, true);
|
||||
}
|
||||
Reference in New Issue
Block a user