Skip to content

Commit c5ed07e

Browse files
authored
Merge from main (#2857)
* Replace mask upload with effective region mask (#2830) * 📝 Update to version v1.1.446 (#2832) * 📝 Update to version v1.1.446 * update readme * Fix blur_gaussian slider param (#2834) * Support PuLID (#2838) * Add preprocessors * Fix resolution param * Fix various issues * Add PuLID attn * remove unused import * Resize img before passing to facexlib * safe unload * 📝 Update to version v1.1.447 (#2842) * 📝 Update to version v1.1.447 * update readme * Allow pulid accept multiple inputs (#2843) * Quick fix enum issue (#2844) * Move enum (#2845) * Move enums to enums.py * Add missing import * Remove unused import * Remove legacy test (#2846) * Quickfix Enum Issue 2 (#2849) * Drop external_code. prefix (#2850) * Drop external_code. prefix * Remove unused imports * fix test (#2851) * Adjust test template's threshold a/b value (#2852) * Validate ControlNetUnit using pydantic (#2847) * Add Pydantic ControlNetUnit Add test config Add images field Adjust image field handling fix various ui Fix most UI issues accept greyscale image/mask Fix infotext Fix preset Fix infotext nit Move infotext parsing test Remove preset Remove unused js code Adjust test payload By default disable unit refresh enum usage Align resize mode change test func name remove unused import nit Change default handling Skip bound check when not enabled Fix batch Various batch fix Disable batch hijack test adjust test fix test expectations Fix unit copy nit Fix test failures * Change script args back to ControlNetUnit for compatibility * import enum for compatibility * Fix unit test * simplify unfold * Add test coverage * handle directly set np image * re-enable batch test * Add back canvas scribble support * nit * Fix batch hijack test * 📝 Update to version v1.1.448 (#2853) * Update UI image (#2855) * Fix duplicated version logging (#2856)
1 parent 003ee34 commit c5ed07e

40 files changed

+1601
-1293
lines changed

.github/workflows/tests.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,10 @@ jobs:
9494
wait-for-it --service 127.0.0.1:7860 -t 600
9595
python -m pytest -v --junitxml=test/results.xml --cov ./extensions/sd-webui-controlnet --cov-report=xml --verify-base-url ./extensions/sd-webui-controlnet/tests
9696
working-directory: stable-diffusion-webui
97+
- name: Run unit tests
98+
run: |
99+
python -m pytest -v ./unit_tests/
100+
working-directory: stable-diffusion-webui/extensions/sd-webui-controlnet/
97101
- name: Kill test server
98102
if: always()
99103
run: curl -vv -XPOST http://127.0.0.1:7860/sdapi/v1/server-stop && sleep 10

README.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
# ControlNet for Stable Diffusion WebUI
22

33
The WebUI extension for ControlNet and other injection-based SD controls.
4-
5-
![image](https://github.com/Mikubill/sd-webui-controlnet/assets/20929282/51172d20-606b-4b9f-aba5-db2f2417cb0b)
4+
![image](https://github.com/Mikubill/sd-webui-controlnet/assets/20929282/261f9a50-ba9c-472f-b398-fced61929c4a)
65

76
This extension is for AUTOMATIC1111's [Stable Diffusion web UI](https://github.com/AUTOMATIC1111/stable-diffusion-webui), allows the Web UI to add [ControlNet](https://github.com/lllyasviel/ControlNet) to the original Stable Diffusion model to generate images. The addition is on-the-fly, the merging is not required.
87

98
# News
9+
10+
- [2024-05-04] 🔥[v1.1.447] PuLID [Discussion thread: https://github.com/Mikubill/sd-webui-controlnet/discussions/2841]
11+
- [2024-04-30] 🔥[v1.1.446] Effective region mask supported for ControlNet/IPAdapter [Discussion thread: https://github.com/Mikubill/sd-webui-controlnet/discussions/2831]
1012
- [2024-04-27] 🔥ControlNet-lllite Normal Dsine released [Discussion thread: https://github.com/Mikubill/sd-webui-controlnet/discussions/2813]
1113
- [2024-04-19] 🔥[v1.1.445] IPAdapter advanced weight [Instant Style] [Discussion thread: https://github.com/Mikubill/sd-webui-controlnet/discussions/2770]
1214
- [2024-04-17] 🔥[v1.1.444] Marigold depth preprocessor [Discussion thread: https://github.com/Mikubill/sd-webui-controlnet/discussions/2760]

internal_controlnet/__init__.py

Whitespace-only changes.

0 commit comments

Comments
 (0)