방재호
commited on
Commit
·
b5ba7a5
1
Parent(s):
ceec4e0
init
Browse filesThis view is limited to 50 files because it contains too many changes.
See raw diff
- adetailer/CHANGELOG.md +235 -0
- adetailer/LICENSE.md +662 -0
- adetailer/README.md +105 -0
- adetailer/adetailer/__init__.py +20 -0
- adetailer/adetailer/__version__.py +1 -0
- adetailer/adetailer/args.py +214 -0
- adetailer/adetailer/common.py +127 -0
- adetailer/adetailer/mask.py +245 -0
- adetailer/adetailer/mediapipe.py +184 -0
- adetailer/adetailer/traceback.py +158 -0
- adetailer/adetailer/ui.py +505 -0
- adetailer/adetailer/ultralytics.py +54 -0
- adetailer/controlnet_ext/__init__.py +7 -0
- adetailer/controlnet_ext/controlnet_ext.py +140 -0
- adetailer/controlnet_ext/restore.py +49 -0
- adetailer/install.py +81 -0
- adetailer/preload.py +9 -0
- adetailer/pyproject.toml +26 -0
- adetailer/scripts/!adetailer.py +784 -0
- adetailer/sd_webui/__init__.py +0 -0
- adetailer/sd_webui/devices.py +11 -0
- adetailer/sd_webui/images.py +62 -0
- adetailer/sd_webui/paths.py +14 -0
- adetailer/sd_webui/processing.py +176 -0
- adetailer/sd_webui/safe.py +10 -0
- adetailer/sd_webui/script_callbacks.py +26 -0
- adetailer/sd_webui/scripts.py +94 -0
- adetailer/sd_webui/shared.py +66 -0
- openOutpaint-webUI-extension/.DS_Store +0 -0
- openOutpaint-webUI-extension/LICENSE +21 -0
- openOutpaint-webUI-extension/README.MD +22 -0
- openOutpaint-webUI-extension/app/.DS_Store +0 -0
- openOutpaint-webUI-extension/app/.devtools/README.md +12 -0
- openOutpaint-webUI-extension/app/.devtools/lint.sh +21 -0
- openOutpaint-webUI-extension/app/.devtools/sethooks.ps1 +4 -0
- openOutpaint-webUI-extension/app/.devtools/sethooks.sh +3 -0
- openOutpaint-webUI-extension/app/.devtools/updatehashes.ps1 +27 -0
- openOutpaint-webUI-extension/app/.devtools/updatehashes.sh +128 -0
- openOutpaint-webUI-extension/app/.gitattributes +1 -0
- openOutpaint-webUI-extension/app/.githooks/linux/pre-commit +9 -0
- openOutpaint-webUI-extension/app/.githooks/windows/pre-commit +9 -0
- openOutpaint-webUI-extension/app/.github/ISSUE_TEMPLATE/bug_report.yml +91 -0
- openOutpaint-webUI-extension/app/.github/ISSUE_TEMPLATE/feature_request.yml +48 -0
- openOutpaint-webUI-extension/app/.github/workflows/autoformat.yml +22 -0
- openOutpaint-webUI-extension/app/.github/workflows/cachebusting.yml +26 -0
- openOutpaint-webUI-extension/app/.gitignore +12 -0
- openOutpaint-webUI-extension/app/.prettierrc.json +19 -0
- openOutpaint-webUI-extension/app/CONTRIBUTING.md +63 -0
- openOutpaint-webUI-extension/app/LICENSE +21 -0
- openOutpaint-webUI-extension/app/README.md +92 -0
adetailer/CHANGELOG.md
ADDED
@@ -0,0 +1,235 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
# Changelog
|
2 |
+
|
3 |
+
## 2023-07-07
|
4 |
+
|
5 |
+
- v23.7.4
|
6 |
+
- batch count > 1일때 프롬프트의 인덱스 문제 수정
|
7 |
+
|
8 |
+
- v23.7.5
|
9 |
+
- i2i의 `cached_uc`와 `cached_c`가 p의 `cached_uc`와 `cached_c`가 다른 인스턴스가 되도록 수정
|
10 |
+
|
11 |
+
## 2023-07-05
|
12 |
+
|
13 |
+
- v23.7.3
|
14 |
+
- 버그 수정
|
15 |
+
- `object()`가 json 직렬화 안되는 문제
|
16 |
+
- `process`를 호출함에 따라 배치 카운트가 2이상일 때, all_prompts가 고정되는 문제
|
17 |
+
- `ad-before`와 `ad-preview` 이미지 파일명이 실제 파일명과 다른 문제
|
18 |
+
- pydantic 2.0 호환성 문제
|
19 |
+
|
20 |
+
## 2023-07-04
|
21 |
+
|
22 |
+
- v23.7.2
|
23 |
+
- `mediapipe_face_mesh_eyes_only` 모델 추가: `mediapipe_face_mesh`로 감지한 뒤 눈만 사용함.
|
24 |
+
- 매 배치 시작 전에 `scripts.postprocess`를, 후에 `scripts.process`를 호출함.
|
25 |
+
- 컨트롤넷을 사용하면 소요 시간이 조금 늘어나지만 몇몇 문제 해결에 도움이 됨.
|
26 |
+
- `lora_block_weight`를 스크립트 화이트리스트에 추가함.
|
27 |
+
- 한번이라도 ADetailer를 사용한 사람은 수동으로 추가해야함.
|
28 |
+
|
29 |
+
## 2023-07-03
|
30 |
+
|
31 |
+
- v23.7.1
|
32 |
+
- `process_images`를 진행한 뒤 `StableDiffusionProcessing` 오브젝트의 close를 호출함
|
33 |
+
- api 호출로 사용했는지 확인하는 속성 추가
|
34 |
+
- `NansException`이 발생했을 때 중지하지 않고 남은 과정 계속 진행함
|
35 |
+
|
36 |
+
## 2023-07-02
|
37 |
+
|
38 |
+
- v23.7.0
|
39 |
+
- `NansException`이 발생하면 로그에 표시하고 원본 이미지를 반환하게 설정
|
40 |
+
- `rich`를 사용한 에러 트레이싱
|
41 |
+
- install.py에 `rich` 추가
|
42 |
+
- 생성 중에 컴포넌트의 값을 변경하면 args의 값도 함께 변경되는 문제 수정 (issue #180)
|
43 |
+
- 터미널 로그로 ad_prompt와 ad_negative_prompt에 적용된 실제 프롬프트 확인할 수 있음 (입력과 다를 경우에만)
|
44 |
+
|
45 |
+
## 2023-06-28
|
46 |
+
|
47 |
+
- v23.6.4
|
48 |
+
- 최대 모델 수 5 -> 10개
|
49 |
+
- ad_prompt와 ad_negative_prompt에 빈칸으로 놔두면 입력 프롬프트가 사용된다는 문구 추가
|
50 |
+
- huggingface 모델 다운로드 실패시 로깅
|
51 |
+
- 1st 모델이 `None`일 경우 나머지 입력을 무시하던 문제 수정
|
52 |
+
- `--use-cpu` 에 `adetailer` 입력 시 cpu로 yolo모델을 사용함
|
53 |
+
|
54 |
+
## 2023-06-20
|
55 |
+
|
56 |
+
- v23.6.3
|
57 |
+
- 컨트롤넷 inpaint 모델에 대해, 3가지 모듈을 사용할 수 있도록 함
|
58 |
+
- Noise Multiplier 옵션 추가 (PR #149)
|
59 |
+
- pydantic 최소 버전 1.10.8로 설정 (Issue #146)
|
60 |
+
|
61 |
+
## 2023-06-05
|
62 |
+
|
63 |
+
- v23.6.2
|
64 |
+
- xyz_grid에서 ADetailer를 사용할 수 있게함.
|
65 |
+
- 8가지 옵션만 1st 탭에 적용되도록 함.
|
66 |
+
|
67 |
+
## 2023-06-01
|
68 |
+
|
69 |
+
- v23.6.1
|
70 |
+
- `inpaint, scribble, lineart, openpose, tile` 5가지 컨트롤넷 모델 지원 (PR #107)
|
71 |
+
- controlnet guidance start, end 인자 추가 (PR #107)
|
72 |
+
- `modules.extensions`를 사용하여 컨트롤넷 확장을 불러오고 경로를 알아내로록 변경
|
73 |
+
- ui에서 컨트롤넷을 별도 함수로 분리
|
74 |
+
|
75 |
+
## 2023-05-30
|
76 |
+
|
77 |
+
- v23.6.0
|
78 |
+
- 스크립트의 이름을 `After Detailer`에서 `ADetailer`로 변경
|
79 |
+
- API 사용자는 변경 필요함
|
80 |
+
- 몇몇 설정 변경
|
81 |
+
- `ad_conf` → `ad_confidence`. 0~100 사이의 int → 0.0~1.0 사이의 float
|
82 |
+
- `ad_inpaint_full_res` → `ad_inpaint_only_masked`
|
83 |
+
- `ad_inpaint_full_res_padding` → `ad_inpaint_only_masked_padding`
|
84 |
+
- mediapipe face mesh 모델 추가
|
85 |
+
- mediapipe 최소 버전 `0.10.0`
|
86 |
+
|
87 |
+
- rich traceback 제거함
|
88 |
+
- huggingface 다운로드 실패할 때 에러가 나지 않게 하고 해당 모델을 제거함
|
89 |
+
|
90 |
+
## 2023-05-26
|
91 |
+
|
92 |
+
- v23.5.19
|
93 |
+
- 1번째 탭에도 `None` 옵션을 추가함
|
94 |
+
- api로 ad controlnet model에 inpaint가 아닌 다른 컨트롤넷 모델을 사용하지 못하도록 막음
|
95 |
+
- adetailer 진행중에 total tqdm 진행바 업데이트를 멈춤
|
96 |
+
- state.inturrupted 상태에서 adetailer 과정을 중지함
|
97 |
+
- 컨트롤넷 process를 각 batch가 끝난 순간에만 호출하도록 변경
|
98 |
+
|
99 |
+
### 2023-05-25
|
100 |
+
|
101 |
+
- v23.5.18
|
102 |
+
- 컨트롤넷 관련 수정
|
103 |
+
- unit의 `input_mode`를 `SIMPLE`로 모두 변경
|
104 |
+
- 컨트롤넷 유넷 훅과 하이잭 함수들을 adetailer를 실행할 때에만 되돌리는 기능 추가
|
105 |
+
- adetailer 처리가 끝난 뒤 컨트롤넷 스크립트의 process를 다시 진행함. (batch count 2 이상일때의 문제 해결)
|
106 |
+
- 기본 활성 스크립트 목록에서 컨트롤넷을 뺌
|
107 |
+
|
108 |
+
### 2023-05-22
|
109 |
+
|
110 |
+
- v23.5.17
|
111 |
+
- 컨트롤넷 확장이 있으면 컨트롤넷 스크립트를 활성화함. (컨트롤넷 관련 문제 해결)
|
112 |
+
- 모든 컴포넌트에 elem_id 설정
|
113 |
+
- ui에 버전을 표시함
|
114 |
+
|
115 |
+
|
116 |
+
### 2023-05-19
|
117 |
+
|
118 |
+
- v23.5.16
|
119 |
+
- 추가한 옵션
|
120 |
+
- Mask min/max ratio
|
121 |
+
- Mask merge mode
|
122 |
+
- Restore faces after ADetailer
|
123 |
+
- 옵션들을 Accordion으로 묶음
|
124 |
+
|
125 |
+
### 2023-05-18
|
126 |
+
|
127 |
+
- v23.5.15
|
128 |
+
- 필요한 것만 임포트하도록 변경 (vae 로딩 오류 없어짐. 로딩 속도 빨라짐)
|
129 |
+
|
130 |
+
### 2023-05-17
|
131 |
+
|
132 |
+
- v23.5.14
|
133 |
+
- `[SKIP]`으로 ad prompt 일부를 건너뛰는 기능 추가
|
134 |
+
- bbox 정렬 옵션 추가
|
135 |
+
- sd_webui 타입힌트를 만들어냄
|
136 |
+
- enable checker와 관련된 api 오류 수정?
|
137 |
+
|
138 |
+
### 2023-05-15
|
139 |
+
|
140 |
+
- v23.5.13
|
141 |
+
- `[SEP]`으로 ad prompt를 분리하여 적용하는 기능 추가
|
142 |
+
- enable checker를 다시 pydantic으로 변경함
|
143 |
+
- ui 관련 함수를 adetailer.ui 폴더로 분리함
|
144 |
+
- controlnet을 사용할 때 모든 controlnet unit 비활성화
|
145 |
+
- adetailer 폴더가 없으면 만들게 함
|
146 |
+
|
147 |
+
### 2023-05-13
|
148 |
+
|
149 |
+
- v23.5.12
|
150 |
+
- `ad_enable`을 제외한 입력이 dict타입으로 들어오도록 변경
|
151 |
+
- web api로 사용할 때에 특히 사용하기 쉬움
|
152 |
+
- web api breaking change
|
153 |
+
- `mask_preprocess` 인자를 넣지 않았던 오류 수정 (PR #47)
|
154 |
+
- huggingface에서 모델을 다운로드하지 않는 옵션 추가 `--ad-no-huggingface`
|
155 |
+
|
156 |
+
### 2023-05-12
|
157 |
+
|
158 |
+
- v23.5.11
|
159 |
+
- `ultralytics` 알람 제거
|
160 |
+
- 필요없는 exif 인자 더 제거함
|
161 |
+
- `use separate steps` 옵션 추가
|
162 |
+
- ui 배치를 조정함
|
163 |
+
|
164 |
+
### 2023-05-09
|
165 |
+
|
166 |
+
- v23.5.10
|
167 |
+
- 선택한 스크립트만 ADetailer에 적용하는 옵션 추가, 기본값 `True`. 설정 탭에서 지정가능.
|
168 |
+
- 기본값: `dynamic_prompting,dynamic_thresholding,wildcards,wildcard_recursive`
|
169 |
+
- `person_yolov8s-seg.pt` 모델 추가
|
170 |
+
- `ultralytics`의 최소 버전을 `8.0.97`로 설정 (C:\\ 문제 해결된 버전)
|
171 |
+
|
172 |
+
### 2023-05-08
|
173 |
+
|
174 |
+
- v23.5.9
|
175 |
+
- 2가지 이상의 모델을 사용할 수 있음. 기본값: 2, 최대: 5
|
176 |
+
- segment 모델을 사용할 수 있게 함. `person_yolov8n-seg.pt` 추가
|
177 |
+
|
178 |
+
### 2023-05-07
|
179 |
+
|
180 |
+
- v23.5.8
|
181 |
+
- 프롬프트와 네거티브 프롬프트에 방향키 지원 (PR #24)
|
182 |
+
- `mask_preprocess`를 추가함. 이전 버전과 시드값이 달라질 가능성 있음!
|
183 |
+
- 이미지 처리가 일어났을 때에만 before이미지를 저장함
|
184 |
+
- 설정창의 레이블을 ADetailer 대신 더 적절하게 수정함
|
185 |
+
|
186 |
+
### 2023-05-06
|
187 |
+
|
188 |
+
- v23.5.7
|
189 |
+
- `ad_use_cfg_scale` 옵션 추가. cfg 스케일을 따로 사용할지 말지 결정함.
|
190 |
+
- `ad_enable` 기본값을 `True`에서 `False`로 변경
|
191 |
+
- `ad_model`의 기본값을 `None`에서 첫번째 모델로 변경
|
192 |
+
- 최소 2개의 입력(ad_enable, ad_model)만 들어오면 작동하게 변경.
|
193 |
+
|
194 |
+
- v23.5.7.post0
|
195 |
+
- `init_controlnet_ext`을 controlnet_exists == True일때에만 실행
|
196 |
+
- webui를 C드라이브 바로 밑에 설치한 사람들에게 `ultralytics` 경고 표시
|
197 |
+
|
198 |
+
### 2023-05-05 (어린이날)
|
199 |
+
|
200 |
+
- v23.5.5
|
201 |
+
- `Save images before ADetailer` 옵션 추가
|
202 |
+
- 입력으로 들어온 인자와 ALL_ARGS의 길이가 다르면 에러메세지
|
203 |
+
- README.md에 설치방법 추가
|
204 |
+
|
205 |
+
- v23.5.6
|
206 |
+
- get_args에서 IndexError가 발생하면 자세한 에러메세지를 볼 수 있음
|
207 |
+
- AdetailerArgs에 extra_params 내장
|
208 |
+
- scripts_args를 딥카피함
|
209 |
+
- postprocess_image를 약간 분리함
|
210 |
+
|
211 |
+
- v23.5.6.post0
|
212 |
+
- `init_controlnet_ext`에서 에러메세지를 자세히 볼 수 있음
|
213 |
+
|
214 |
+
### 2023-05-04
|
215 |
+
|
216 |
+
- v23.5.4
|
217 |
+
- use pydantic for arguments validation
|
218 |
+
- revert: ad_model to `None` as default
|
219 |
+
- revert: `__future__` imports
|
220 |
+
- lazily import yolo and mediapipe
|
221 |
+
|
222 |
+
### 2023-05-03
|
223 |
+
|
224 |
+
- v23.5.3.post0
|
225 |
+
- remove `__future__` imports
|
226 |
+
- change to copy scripts and scripts args
|
227 |
+
|
228 |
+
- v23.5.3.post1
|
229 |
+
- change default ad_model from `None`
|
230 |
+
|
231 |
+
### 2023-05-02
|
232 |
+
|
233 |
+
- v23.5.3
|
234 |
+
- Remove `None` from model list and add `Enable ADetailer` checkbox.
|
235 |
+
- install.py `skip_install` fix.
|
adetailer/LICENSE.md
ADDED
@@ -0,0 +1,662 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
|
2 |
+
GNU AFFERO GENERAL PUBLIC LICENSE
|
3 |
+
Version 3, 19 November 2007
|
4 |
+
|
5 |
+
Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
|
6 |
+
Everyone is permitted to copy and distribute verbatim copies
|
7 |
+
of this license document, but changing it is not allowed.
|
8 |
+
|
9 |
+
Preamble
|
10 |
+
|
11 |
+
The GNU Affero General Public License is a free, copyleft license for
|
12 |
+
software and other kinds of works, specifically designed to ensure
|
13 |
+
cooperation with the community in the case of network server software.
|
14 |
+
|
15 |
+
The licenses for most software and other practical works are designed
|
16 |
+
to take away your freedom to share and change the works. By contrast,
|
17 |
+
our General Public Licenses are intended to guarantee your freedom to
|
18 |
+
share and change all versions of a program--to make sure it remains free
|
19 |
+
software for all its users.
|
20 |
+
|
21 |
+
When we speak of free software, we are referring to freedom, not
|
22 |
+
price. Our General Public Licenses are designed to make sure that you
|
23 |
+
have the freedom to distribute copies of free software (and charge for
|
24 |
+
them if you wish), that you receive source code or can get it if you
|
25 |
+
want it, that you can change the software or use pieces of it in new
|
26 |
+
free programs, and that you know you can do these things.
|
27 |
+
|
28 |
+
Developers that use our General Public Licenses protect your rights
|
29 |
+
with two steps: (1) assert copyright on the software, and (2) offer
|
30 |
+
you this License which gives you legal permission to copy, distribute
|
31 |
+
and/or modify the software.
|
32 |
+
|
33 |
+
A secondary benefit of defending all users' freedom is that
|
34 |
+
improvements made in alternate versions of the program, if they
|
35 |
+
receive widespread use, become available for other developers to
|
36 |
+
incorporate. Many developers of free software are heartened and
|
37 |
+
encouraged by the resulting cooperation. However, in the case of
|
38 |
+
software used on network servers, this result may fail to come about.
|
39 |
+
The GNU General Public License permits making a modified version and
|
40 |
+
letting the public access it on a server without ever releasing its
|
41 |
+
source code to the public.
|
42 |
+
|
43 |
+
The GNU Affero General Public License is designed specifically to
|
44 |
+
ensure that, in such cases, the modified source code becomes available
|
45 |
+
to the community. It requires the operator of a network server to
|
46 |
+
provide the source code of the modified version running there to the
|
47 |
+
users of that server. Therefore, public use of a modified version, on
|
48 |
+
a publicly accessible server, gives the public access to the source
|
49 |
+
code of the modified version.
|
50 |
+
|
51 |
+
An older license, called the Affero General Public License and
|
52 |
+
published by Affero, was designed to accomplish similar goals. This is
|
53 |
+
a different license, not a version of the Affero GPL, but Affero has
|
54 |
+
released a new version of the Affero GPL which permits relicensing under
|
55 |
+
this license.
|
56 |
+
|
57 |
+
The precise terms and conditions for copying, distribution and
|
58 |
+
modification follow.
|
59 |
+
|
60 |
+
TERMS AND CONDITIONS
|
61 |
+
|
62 |
+
0. Definitions.
|
63 |
+
|
64 |
+
"This License" refers to version 3 of the GNU Affero General Public License.
|
65 |
+
|
66 |
+
"Copyright" also means copyright-like laws that apply to other kinds of
|
67 |
+
works, such as semiconductor masks.
|
68 |
+
|
69 |
+
"The Program" refers to any copyrightable work licensed under this
|
70 |
+
License. Each licensee is addressed as "you". "Licensees" and
|
71 |
+
"recipients" may be individuals or organizations.
|
72 |
+
|
73 |
+
To "modify" a work means to copy from or adapt all or part of the work
|
74 |
+
in a fashion requiring copyright permission, other than the making of an
|
75 |
+
exact copy. The resulting work is called a "modified version" of the
|
76 |
+
earlier work or a work "based on" the earlier work.
|
77 |
+
|
78 |
+
A "covered work" means either the unmodified Program or a work based
|
79 |
+
on the Program.
|
80 |
+
|
81 |
+
To "propagate" a work means to do anything with it that, without
|
82 |
+
permission, would make you directly or secondarily liable for
|
83 |
+
infringement under applicable copyright law, except executing it on a
|
84 |
+
computer or modifying a private copy. Propagation includes copying,
|
85 |
+
distribution (with or without modification), making available to the
|
86 |
+
public, and in some countries other activities as well.
|
87 |
+
|
88 |
+
To "convey" a work means any kind of propagation that enables other
|
89 |
+
parties to make or receive copies. Mere interaction with a user through
|
90 |
+
a computer network, with no transfer of a copy, is not conveying.
|
91 |
+
|
92 |
+
An interactive user interface displays "Appropriate Legal Notices"
|
93 |
+
to the extent that it includes a convenient and prominently visible
|
94 |
+
feature that (1) displays an appropriate copyright notice, and (2)
|
95 |
+
tells the user that there is no warranty for the work (except to the
|
96 |
+
extent that warranties are provided), that licensees may convey the
|
97 |
+
work under this License, and how to view a copy of this License. If
|
98 |
+
the interface presents a list of user commands or options, such as a
|
99 |
+
menu, a prominent item in the list meets this criterion.
|
100 |
+
|
101 |
+
1. Source Code.
|
102 |
+
|
103 |
+
The "source code" for a work means the preferred form of the work
|
104 |
+
for making modifications to it. "Object code" means any non-source
|
105 |
+
form of a work.
|
106 |
+
|
107 |
+
A "Standard Interface" means an interface that either is an official
|
108 |
+
standard defined by a recognized standards body, or, in the case of
|
109 |
+
interfaces specified for a particular programming language, one that
|
110 |
+
is widely used among developers working in that language.
|
111 |
+
|
112 |
+
The "System Libraries" of an executable work include anything, other
|
113 |
+
than the work as a whole, that (a) is included in the normal form of
|
114 |
+
packaging a Major Component, but which is not part of that Major
|
115 |
+
Component, and (b) serves only to enable use of the work with that
|
116 |
+
Major Component, or to implement a Standard Interface for which an
|
117 |
+
implementation is available to the public in source code form. A
|
118 |
+
"Major Component", in this context, means a major essential component
|
119 |
+
(kernel, window system, and so on) of the specific operating system
|
120 |
+
(if any) on which the executable work runs, or a compiler used to
|
121 |
+
produce the work, or an object code interpreter used to run it.
|
122 |
+
|
123 |
+
The "Corresponding Source" for a work in object code form means all
|
124 |
+
the source code needed to generate, install, and (for an executable
|
125 |
+
work) run the object code and to modify the work, including scripts to
|
126 |
+
control those activities. However, it does not include the work's
|
127 |
+
System Libraries, or general-purpose tools or generally available free
|
128 |
+
programs which are used unmodified in performing those activities but
|
129 |
+
which are not part of the work. For example, Corresponding Source
|
130 |
+
includes interface definition files associated with source files for
|
131 |
+
the work, and the source code for shared libraries and dynamically
|
132 |
+
linked subprograms that the work is specifically designed to require,
|
133 |
+
such as by intimate data communication or control flow between those
|
134 |
+
subprograms and other parts of the work.
|
135 |
+
|
136 |
+
The Corresponding Source need not include anything that users
|
137 |
+
can regenerate automatically from other parts of the Corresponding
|
138 |
+
Source.
|
139 |
+
|
140 |
+
The Corresponding Source for a work in source code form is that
|
141 |
+
same work.
|
142 |
+
|
143 |
+
2. Basic Permissions.
|
144 |
+
|
145 |
+
All rights granted under this License are granted for the term of
|
146 |
+
copyright on the Program, and are irrevocable provided the stated
|
147 |
+
conditions are met. This License explicitly affirms your unlimited
|
148 |
+
permission to run the unmodified Program. The output from running a
|
149 |
+
covered work is covered by this License only if the output, given its
|
150 |
+
content, constitutes a covered work. This License acknowledges your
|
151 |
+
rights of fair use or other equivalent, as provided by copyright law.
|
152 |
+
|
153 |
+
You may make, run and propagate covered works that you do not
|
154 |
+
convey, without conditions so long as your license otherwise remains
|
155 |
+
in force. You may convey covered works to others for the sole purpose
|
156 |
+
of having them make modifications exclusively for you, or provide you
|
157 |
+
with facilities for running those works, provided that you comply with
|
158 |
+
the terms of this License in conveying all material for which you do
|
159 |
+
not control copyright. Those thus making or running the covered works
|
160 |
+
for you must do so exclusively on your behalf, under your direction
|
161 |
+
and control, on terms that prohibit them from making any copies of
|
162 |
+
your copyrighted material outside their relationship with you.
|
163 |
+
|
164 |
+
Conveying under any other circumstances is permitted solely under
|
165 |
+
the conditions stated below. Sublicensing is not allowed; section 10
|
166 |
+
makes it unnecessary.
|
167 |
+
|
168 |
+
3. Protecting Users' Legal Rights From Anti-Circumvention Law.
|
169 |
+
|
170 |
+
No covered work shall be deemed part of an effective technological
|
171 |
+
measure under any applicable law fulfilling obligations under article
|
172 |
+
11 of the WIPO copyright treaty adopted on 20 December 1996, or
|
173 |
+
similar laws prohibiting or restricting circumvention of such
|
174 |
+
measures.
|
175 |
+
|
176 |
+
When you convey a covered work, you waive any legal power to forbid
|
177 |
+
circumvention of technological measures to the extent such circumvention
|
178 |
+
is effected by exercising rights under this License with respect to
|
179 |
+
the covered work, and you disclaim any intention to limit operation or
|
180 |
+
modification of the work as a means of enforcing, against the work's
|
181 |
+
users, your or third parties' legal rights to forbid circumvention of
|
182 |
+
technological measures.
|
183 |
+
|
184 |
+
4. Conveying Verbatim Copies.
|
185 |
+
|
186 |
+
You may convey verbatim copies of the Program's source code as you
|
187 |
+
receive it, in any medium, provided that you conspicuously and
|
188 |
+
appropriately publish on each copy an appropriate copyright notice;
|
189 |
+
keep intact all notices stating that this License and any
|
190 |
+
non-permissive terms added in accord with section 7 apply to the code;
|
191 |
+
keep intact all notices of the absence of any warranty; and give all
|
192 |
+
recipients a copy of this License along with the Program.
|
193 |
+
|
194 |
+
You may charge any price or no price for each copy that you convey,
|
195 |
+
and you may offer support or warranty protection for a fee.
|
196 |
+
|
197 |
+
5. Conveying Modified Source Versions.
|
198 |
+
|
199 |
+
You may convey a work based on the Program, or the modifications to
|
200 |
+
produce it from the Program, in the form of source code under the
|
201 |
+
terms of section 4, provided that you also meet all of these conditions:
|
202 |
+
|
203 |
+
a) The work must carry prominent notices stating that you modified
|
204 |
+
it, and giving a relevant date.
|
205 |
+
|
206 |
+
b) The work must carry prominent notices stating that it is
|
207 |
+
released under this License and any conditions added under section
|
208 |
+
7. This requirement modifies the requirement in section 4 to
|
209 |
+
"keep intact all notices".
|
210 |
+
|
211 |
+
c) You must license the entire work, as a whole, under this
|
212 |
+
License to anyone who comes into possession of a copy. This
|
213 |
+
License will therefore apply, along with any applicable section 7
|
214 |
+
additional terms, to the whole of the work, and all its parts,
|
215 |
+
regardless of how they are packaged. This License gives no
|
216 |
+
permission to license the work in any other way, but it does not
|
217 |
+
invalidate such permission if you have separately received it.
|
218 |
+
|
219 |
+
d) If the work has interactive user interfaces, each must display
|
220 |
+
Appropriate Legal Notices; however, if the Program has interactive
|
221 |
+
interfaces that do not display Appropriate Legal Notices, your
|
222 |
+
work need not make them do so.
|
223 |
+
|
224 |
+
A compilation of a covered work with other separate and independent
|
225 |
+
works, which are not by their nature extensions of the covered work,
|
226 |
+
and which are not combined with it such as to form a larger program,
|
227 |
+
in or on a volume of a storage or distribution medium, is called an
|
228 |
+
"aggregate" if the compilation and its resulting copyright are not
|
229 |
+
used to limit the access or legal rights of the compilation's users
|
230 |
+
beyond what the individual works permit. Inclusion of a covered work
|
231 |
+
in an aggregate does not cause this License to apply to the other
|
232 |
+
parts of the aggregate.
|
233 |
+
|
234 |
+
6. Conveying Non-Source Forms.
|
235 |
+
|
236 |
+
You may convey a covered work in object code form under the terms
|
237 |
+
of sections 4 and 5, provided that you also convey the
|
238 |
+
machine-readable Corresponding Source under the terms of this License,
|
239 |
+
in one of these ways:
|
240 |
+
|
241 |
+
a) Convey the object code in, or embodied in, a physical product
|
242 |
+
(including a physical distribution medium), accompanied by the
|
243 |
+
Corresponding Source fixed on a durable physical medium
|
244 |
+
customarily used for software interchange.
|
245 |
+
|
246 |
+
b) Convey the object code in, or embodied in, a physical product
|
247 |
+
(including a physical distribution medium), accompanied by a
|
248 |
+
written offer, valid for at least three years and valid for as
|
249 |
+
long as you offer spare parts or customer support for that product
|
250 |
+
model, to give anyone who possesses the object code either (1) a
|
251 |
+
copy of the Corresponding Source for all the software in the
|
252 |
+
product that is covered by this License, on a durable physical
|
253 |
+
medium customarily used for software interchange, for a price no
|
254 |
+
more than your reasonable cost of physically performing this
|
255 |
+
conveying of source, or (2) access to copy the
|
256 |
+
Corresponding Source from a network server at no charge.
|
257 |
+
|
258 |
+
c) Convey individual copies of the object code with a copy of the
|
259 |
+
written offer to provide the Corresponding Source. This
|
260 |
+
alternative is allowed only occasionally and noncommercially, and
|
261 |
+
only if you received the object code with such an offer, in accord
|
262 |
+
with subsection 6b.
|
263 |
+
|
264 |
+
d) Convey the object code by offering access from a designated
|
265 |
+
place (gratis or for a charge), and offer equivalent access to the
|
266 |
+
Corresponding Source in the same way through the same place at no
|
267 |
+
further charge. You need not require recipients to copy the
|
268 |
+
Corresponding Source along with the object code. If the place to
|
269 |
+
copy the object code is a network server, the Corresponding Source
|
270 |
+
may be on a different server (operated by you or a third party)
|
271 |
+
that supports equivalent copying facilities, provided you maintain
|
272 |
+
clear directions next to the object code saying where to find the
|
273 |
+
Corresponding Source. Regardless of what server hosts the
|
274 |
+
Corresponding Source, you remain obligated to ensure that it is
|
275 |
+
available for as long as needed to satisfy these requirements.
|
276 |
+
|
277 |
+
e) Convey the object code using peer-to-peer transmission, provided
|
278 |
+
you inform other peers where the object code and Corresponding
|
279 |
+
Source of the work are being offered to the general public at no
|
280 |
+
charge under subsection 6d.
|
281 |
+
|
282 |
+
A separable portion of the object code, whose source code is excluded
|
283 |
+
from the Corresponding Source as a System Library, need not be
|
284 |
+
included in conveying the object code work.
|
285 |
+
|
286 |
+
A "User Product" is either (1) a "consumer product", which means any
|
287 |
+
tangible personal property which is normally used for personal, family,
|
288 |
+
or household purposes, or (2) anything designed or sold for incorporation
|
289 |
+
into a dwelling. In determining whether a product is a consumer product,
|
290 |
+
doubtful cases shall be resolved in favor of coverage. For a particular
|
291 |
+
product received by a particular user, "normally used" refers to a
|
292 |
+
typical or common use of that class of product, regardless of the status
|
293 |
+
of the particular user or of the way in which the particular user
|
294 |
+
actually uses, or expects or is expected to use, the product. A product
|
295 |
+
is a consumer product regardless of whether the product has substantial
|
296 |
+
commercial, industrial or non-consumer uses, unless such uses represent
|
297 |
+
the only significant mode of use of the product.
|
298 |
+
|
299 |
+
"Installation Information" for a User Product means any methods,
|
300 |
+
procedures, authorization keys, or other information required to install
|
301 |
+
and execute modified versions of a covered work in that User Product from
|
302 |
+
a modified version of its Corresponding Source. The information must
|
303 |
+
suffice to ensure that the continued functioning of the modified object
|
304 |
+
code is in no case prevented or interfered with solely because
|
305 |
+
modification has been made.
|
306 |
+
|
307 |
+
If you convey an object code work under this section in, or with, or
|
308 |
+
specifically for use in, a User Product, and the conveying occurs as
|
309 |
+
part of a transaction in which the right of possession and use of the
|
310 |
+
User Product is transferred to the recipient in perpetuity or for a
|
311 |
+
fixed term (regardless of how the transaction is characterized), the
|
312 |
+
Corresponding Source conveyed under this section must be accompanied
|
313 |
+
by the Installation Information. But this requirement does not apply
|
314 |
+
if neither you nor any third party retains the ability to install
|
315 |
+
modified object code on the User Product (for example, the work has
|
316 |
+
been installed in ROM).
|
317 |
+
|
318 |
+
The requirement to provide Installation Information does not include a
|
319 |
+
requirement to continue to provide support service, warranty, or updates
|
320 |
+
for a work that has been modified or installed by the recipient, or for
|
321 |
+
the User Product in which it has been modified or installed. Access to a
|
322 |
+
network may be denied when the modification itself materially and
|
323 |
+
adversely affects the operation of the network or violates the rules and
|
324 |
+
protocols for communication across the network.
|
325 |
+
|
326 |
+
Corresponding Source conveyed, and Installation Information provided,
|
327 |
+
in accord with this section must be in a format that is publicly
|
328 |
+
documented (and with an implementation available to the public in
|
329 |
+
source code form), and must require no special password or key for
|
330 |
+
unpacking, reading or copying.
|
331 |
+
|
332 |
+
7. Additional Terms.
|
333 |
+
|
334 |
+
"Additional permissions" are terms that supplement the terms of this
|
335 |
+
License by making exceptions from one or more of its conditions.
|
336 |
+
Additional permissions that are applicable to the entire Program shall
|
337 |
+
be treated as though they were included in this License, to the extent
|
338 |
+
that they are valid under applicable law. If additional permissions
|
339 |
+
apply only to part of the Program, that part may be used separately
|
340 |
+
under those permissions, but the entire Program remains governed by
|
341 |
+
this License without regard to the additional permissions.
|
342 |
+
|
343 |
+
When you convey a copy of a covered work, you may at your option
|
344 |
+
remove any additional permissions from that copy, or from any part of
|
345 |
+
it. (Additional permissions may be written to require their own
|
346 |
+
removal in certain cases when you modify the work.) You may place
|
347 |
+
additional permissions on material, added by you to a covered work,
|
348 |
+
for which you have or can give appropriate copyright permission.
|
349 |
+
|
350 |
+
Notwithstanding any other provision of this License, for material you
|
351 |
+
add to a covered work, you may (if authorized by the copyright holders of
|
352 |
+
that material) supplement the terms of this License with terms:
|
353 |
+
|
354 |
+
a) Disclaiming warranty or limiting liability differently from the
|
355 |
+
terms of sections 15 and 16 of this License; or
|
356 |
+
|
357 |
+
b) Requiring preservation of specified reasonable legal notices or
|
358 |
+
author attributions in that material or in the Appropriate Legal
|
359 |
+
Notices displayed by works containing it; or
|
360 |
+
|
361 |
+
c) Prohibiting misrepresentation of the origin of that material, or
|
362 |
+
requiring that modified versions of such material be marked in
|
363 |
+
reasonable ways as different from the original version; or
|
364 |
+
|
365 |
+
d) Limiting the use for publicity purposes of names of licensors or
|
366 |
+
authors of the material; or
|
367 |
+
|
368 |
+
e) Declining to grant rights under trademark law for use of some
|
369 |
+
trade names, trademarks, or service marks; or
|
370 |
+
|
371 |
+
f) Requiring indemnification of licensors and authors of that
|
372 |
+
material by anyone who conveys the material (or modified versions of
|
373 |
+
it) with contractual assumptions of liability to the recipient, for
|
374 |
+
any liability that these contractual assumptions directly impose on
|
375 |
+
those licensors and authors.
|
376 |
+
|
377 |
+
All other non-permissive additional terms are considered "further
|
378 |
+
restrictions" within the meaning of section 10. If the Program as you
|
379 |
+
received it, or any part of it, contains a notice stating that it is
|
380 |
+
governed by this License along with a term that is a further
|
381 |
+
restriction, you may remove that term. If a license document contains
|
382 |
+
a further restriction but permits relicensing or conveying under this
|
383 |
+
License, you may add to a covered work material governed by the terms
|
384 |
+
of that license document, provided that the further restriction does
|
385 |
+
not survive such relicensing or conveying.
|
386 |
+
|
387 |
+
If you add terms to a covered work in accord with this section, you
|
388 |
+
must place, in the relevant source files, a statement of the
|
389 |
+
additional terms that apply to those files, or a notice indicating
|
390 |
+
where to find the applicable terms.
|
391 |
+
|
392 |
+
Additional terms, permissive or non-permissive, may be stated in the
|
393 |
+
form of a separately written license, or stated as exceptions;
|
394 |
+
the above requirements apply either way.
|
395 |
+
|
396 |
+
8. Termination.
|
397 |
+
|
398 |
+
You may not propagate or modify a covered work except as expressly
|
399 |
+
provided under this License. Any attempt otherwise to propagate or
|
400 |
+
modify it is void, and will automatically terminate your rights under
|
401 |
+
this License (including any patent licenses granted under the third
|
402 |
+
paragraph of section 11).
|
403 |
+
|
404 |
+
However, if you cease all violation of this License, then your
|
405 |
+
license from a particular copyright holder is reinstated (a)
|
406 |
+
provisionally, unless and until the copyright holder explicitly and
|
407 |
+
finally terminates your license, and (b) permanently, if the copyright
|
408 |
+
holder fails to notify you of the violation by some reasonable means
|
409 |
+
prior to 60 days after the cessation.
|
410 |
+
|
411 |
+
Moreover, your license from a particular copyright holder is
|
412 |
+
reinstated permanently if the copyright holder notifies you of the
|
413 |
+
violation by some reasonable means, this is the first time you have
|
414 |
+
received notice of violation of this License (for any work) from that
|
415 |
+
copyright holder, and you cure the violation prior to 30 days after
|
416 |
+
your receipt of the notice.
|
417 |
+
|
418 |
+
Termination of your rights under this section does not terminate the
|
419 |
+
licenses of parties who have received copies or rights from you under
|
420 |
+
this License. If your rights have been terminated and not permanently
|
421 |
+
reinstated, you do not qualify to receive new licenses for the same
|
422 |
+
material under section 10.
|
423 |
+
|
424 |
+
9. Acceptance Not Required for Having Copies.
|
425 |
+
|
426 |
+
You are not required to accept this License in order to receive or
|
427 |
+
run a copy of the Program. Ancillary propagation of a covered work
|
428 |
+
occurring solely as a consequence of using peer-to-peer transmission
|
429 |
+
to receive a copy likewise does not require acceptance. However,
|
430 |
+
nothing other than this License grants you permission to propagate or
|
431 |
+
modify any covered work. These actions infringe copyright if you do
|
432 |
+
not accept this License. Therefore, by modifying or propagating a
|
433 |
+
covered work, you indicate your acceptance of this License to do so.
|
434 |
+
|
435 |
+
10. Automatic Licensing of Downstream Recipients.
|
436 |
+
|
437 |
+
Each time you convey a covered work, the recipient automatically
|
438 |
+
receives a license from the original licensors, to run, modify and
|
439 |
+
propagate that work, subject to this License. You are not responsible
|
440 |
+
for enforcing compliance by third parties with this License.
|
441 |
+
|
442 |
+
An "entity transaction" is a transaction transferring control of an
|
443 |
+
organization, or substantially all assets of one, or subdividing an
|
444 |
+
organization, or merging organizations. If propagation of a covered
|
445 |
+
work results from an entity transaction, each party to that
|
446 |
+
transaction who receives a copy of the work also receives whatever
|
447 |
+
licenses to the work the party's predecessor in interest had or could
|
448 |
+
give under the previous paragraph, plus a right to possession of the
|
449 |
+
Corresponding Source of the work from the predecessor in interest, if
|
450 |
+
the predecessor has it or can get it with reasonable efforts.
|
451 |
+
|
452 |
+
You may not impose any further restrictions on the exercise of the
|
453 |
+
rights granted or affirmed under this License. For example, you may
|
454 |
+
not impose a license fee, royalty, or other charge for exercise of
|
455 |
+
rights granted under this License, and you may not initiate litigation
|
456 |
+
(including a cross-claim or counterclaim in a lawsuit) alleging that
|
457 |
+
any patent claim is infringed by making, using, selling, offering for
|
458 |
+
sale, or importing the Program or any portion of it.
|
459 |
+
|
460 |
+
11. Patents.
|
461 |
+
|
462 |
+
A "contributor" is a copyright holder who authorizes use under this
|
463 |
+
License of the Program or a work on which the Program is based. The
|
464 |
+
work thus licensed is called the contributor's "contributor version".
|
465 |
+
|
466 |
+
A contributor's "essential patent claims" are all patent claims
|
467 |
+
owned or controlled by the contributor, whether already acquired or
|
468 |
+
hereafter acquired, that would be infringed by some manner, permitted
|
469 |
+
by this License, of making, using, or selling its contributor version,
|
470 |
+
but do not include claims that would be infringed only as a
|
471 |
+
consequence of further modification of the contributor version. For
|
472 |
+
purposes of this definition, "control" includes the right to grant
|
473 |
+
patent sublicenses in a manner consistent with the requirements of
|
474 |
+
this License.
|
475 |
+
|
476 |
+
Each contributor grants you a non-exclusive, worldwide, royalty-free
|
477 |
+
patent license under the contributor's essential patent claims, to
|
478 |
+
make, use, sell, offer for sale, import and otherwise run, modify and
|
479 |
+
propagate the contents of its contributor version.
|
480 |
+
|
481 |
+
In the following three paragraphs, a "patent license" is any express
|
482 |
+
agreement or commitment, however denominated, not to enforce a patent
|
483 |
+
(such as an express permission to practice a patent or covenant not to
|
484 |
+
sue for patent infringement). To "grant" such a patent license to a
|
485 |
+
party means to make such an agreement or commitment not to enforce a
|
486 |
+
patent against the party.
|
487 |
+
|
488 |
+
If you convey a covered work, knowingly relying on a patent license,
|
489 |
+
and the Corresponding Source of the work is not available for anyone
|
490 |
+
to copy, free of charge and under the terms of this License, through a
|
491 |
+
publicly available network server or other readily accessible means,
|
492 |
+
then you must either (1) cause the Corresponding Source to be so
|
493 |
+
available, or (2) arrange to deprive yourself of the benefit of the
|
494 |
+
patent license for this particular work, or (3) arrange, in a manner
|
495 |
+
consistent with the requirements of this License, to extend the patent
|
496 |
+
license to downstream recipients. "Knowingly relying" means you have
|
497 |
+
actual knowledge that, but for the patent license, your conveying the
|
498 |
+
covered work in a country, or your recipient's use of the covered work
|
499 |
+
in a country, would infringe one or more identifiable patents in that
|
500 |
+
country that you have reason to believe are valid.
|
501 |
+
|
502 |
+
If, pursuant to or in connection with a single transaction or
|
503 |
+
arrangement, you convey, or propagate by procuring conveyance of, a
|
504 |
+
covered work, and grant a patent license to some of the parties
|
505 |
+
receiving the covered work authorizing them to use, propagate, modify
|
506 |
+
or convey a specific copy of the covered work, then the patent license
|
507 |
+
you grant is automatically extended to all recipients of the covered
|
508 |
+
work and works based on it.
|
509 |
+
|
510 |
+
A patent license is "discriminatory" if it does not include within
|
511 |
+
the scope of its coverage, prohibits the exercise of, or is
|
512 |
+
conditioned on the non-exercise of one or more of the rights that are
|
513 |
+
specifically granted under this License. You may not convey a covered
|
514 |
+
work if you are a party to an arrangement with a third party that is
|
515 |
+
in the business of distributing software, under which you make payment
|
516 |
+
to the third party based on the extent of your activity of conveying
|
517 |
+
the work, and under which the third party grants, to any of the
|
518 |
+
parties who would receive the covered work from you, a discriminatory
|
519 |
+
patent license (a) in connection with copies of the covered work
|
520 |
+
conveyed by you (or copies made from those copies), or (b) primarily
|
521 |
+
for and in connection with specific products or compilations that
|
522 |
+
contain the covered work, unless you entered into that arrangement,
|
523 |
+
or that patent license was granted, prior to 28 March 2007.
|
524 |
+
|
525 |
+
Nothing in this License shall be construed as excluding or limiting
|
526 |
+
any implied license or other defenses to infringement that may
|
527 |
+
otherwise be available to you under applicable patent law.
|
528 |
+
|
529 |
+
12. No Surrender of Others' Freedom.
|
530 |
+
|
531 |
+
If conditions are imposed on you (whether by court order, agreement or
|
532 |
+
otherwise) that contradict the conditions of this License, they do not
|
533 |
+
excuse you from the conditions of this License. If you cannot convey a
|
534 |
+
covered work so as to satisfy simultaneously your obligations under this
|
535 |
+
License and any other pertinent obligations, then as a consequence you may
|
536 |
+
not convey it at all. For example, if you agree to terms that obligate you
|
537 |
+
to collect a royalty for further conveying from those to whom you convey
|
538 |
+
the Program, the only way you could satisfy both those terms and this
|
539 |
+
License would be to refrain entirely from conveying the Program.
|
540 |
+
|
541 |
+
13. Remote Network Interaction; Use with the GNU General Public License.
|
542 |
+
|
543 |
+
Notwithstanding any other provision of this License, if you modify the
|
544 |
+
Program, your modified version must prominently offer all users
|
545 |
+
interacting with it remotely through a computer network (if your version
|
546 |
+
supports such interaction) an opportunity to receive the Corresponding
|
547 |
+
Source of your version by providing access to the Corresponding Source
|
548 |
+
from a network server at no charge, through some standard or customary
|
549 |
+
means of facilitating copying of software. This Corresponding Source
|
550 |
+
shall include the Corresponding Source for any work covered by version 3
|
551 |
+
of the GNU General Public License that is incorporated pursuant to the
|
552 |
+
following paragraph.
|
553 |
+
|
554 |
+
Notwithstanding any other provision of this License, you have
|
555 |
+
permission to link or combine any covered work with a work licensed
|
556 |
+
under version 3 of the GNU General Public License into a single
|
557 |
+
combined work, and to convey the resulting work. The terms of this
|
558 |
+
License will continue to apply to the part which is the covered work,
|
559 |
+
but the work with which it is combined will remain governed by version
|
560 |
+
3 of the GNU General Public License.
|
561 |
+
|
562 |
+
14. Revised Versions of this License.
|
563 |
+
|
564 |
+
The Free Software Foundation may publish revised and/or new versions of
|
565 |
+
the GNU Affero General Public License from time to time. Such new versions
|
566 |
+
will be similar in spirit to the present version, but may differ in detail to
|
567 |
+
address new problems or concerns.
|
568 |
+
|
569 |
+
Each version is given a distinguishing version number. If the
|
570 |
+
Program specifies that a certain numbered version of the GNU Affero General
|
571 |
+
Public License "or any later version" applies to it, you have the
|
572 |
+
option of following the terms and conditions either of that numbered
|
573 |
+
version or of any later version published by the Free Software
|
574 |
+
Foundation. If the Program does not specify a version number of the
|
575 |
+
GNU Affero General Public License, you may choose any version ever published
|
576 |
+
by the Free Software Foundation.
|
577 |
+
|
578 |
+
If the Program specifies that a proxy can decide which future
|
579 |
+
versions of the GNU Affero General Public License can be used, that proxy's
|
580 |
+
public statement of acceptance of a version permanently authorizes you
|
581 |
+
to choose that version for the Program.
|
582 |
+
|
583 |
+
Later license versions may give you additional or different
|
584 |
+
permissions. However, no additional obligations are imposed on any
|
585 |
+
author or copyright holder as a result of your choosing to follow a
|
586 |
+
later version.
|
587 |
+
|
588 |
+
15. Disclaimer of Warranty.
|
589 |
+
|
590 |
+
THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
|
591 |
+
APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
|
592 |
+
HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
|
593 |
+
OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
|
594 |
+
THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
|
595 |
+
PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
|
596 |
+
IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
|
597 |
+
ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
|
598 |
+
|
599 |
+
16. Limitation of Liability.
|
600 |
+
|
601 |
+
IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
|
602 |
+
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
|
603 |
+
THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
|
604 |
+
GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
|
605 |
+
USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
|
606 |
+
DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
|
607 |
+
PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
|
608 |
+
EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
|
609 |
+
SUCH DAMAGES.
|
610 |
+
|
611 |
+
17. Interpretation of Sections 15 and 16.
|
612 |
+
|
613 |
+
If the disclaimer of warranty and limitation of liability provided
|
614 |
+
above cannot be given local legal effect according to their terms,
|
615 |
+
reviewing courts shall apply local law that most closely approximates
|
616 |
+
an absolute waiver of all civil liability in connection with the
|
617 |
+
Program, unless a warranty or assumption of liability accompanies a
|
618 |
+
copy of the Program in return for a fee.
|
619 |
+
|
620 |
+
END OF TERMS AND CONDITIONS
|
621 |
+
|
622 |
+
How to Apply These Terms to Your New Programs
|
623 |
+
|
624 |
+
If you develop a new program, and you want it to be of the greatest
|
625 |
+
possible use to the public, the best way to achieve this is to make it
|
626 |
+
free software which everyone can redistribute and change under these terms.
|
627 |
+
|
628 |
+
To do so, attach the following notices to the program. It is safest
|
629 |
+
to attach them to the start of each source file to most effectively
|
630 |
+
state the exclusion of warranty; and each file should have at least
|
631 |
+
the "copyright" line and a pointer to where the full notice is found.
|
632 |
+
|
633 |
+
<one line to give the program's name and a brief idea of what it does.>
|
634 |
+
Copyright (C) <year> <name of author>
|
635 |
+
|
636 |
+
This program is free software: you can redistribute it and/or modify
|
637 |
+
it under the terms of the GNU Affero General Public License as published
|
638 |
+
by the Free Software Foundation, either version 3 of the License, or
|
639 |
+
(at your option) any later version.
|
640 |
+
|
641 |
+
This program is distributed in the hope that it will be useful,
|
642 |
+
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
643 |
+
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
644 |
+
GNU Affero General Public License for more details.
|
645 |
+
|
646 |
+
You should have received a copy of the GNU Affero General Public License
|
647 |
+
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
648 |
+
|
649 |
+
Also add information on how to contact you by electronic and paper mail.
|
650 |
+
|
651 |
+
If your software can interact with users remotely through a computer
|
652 |
+
network, you should also make sure that it provides a way for users to
|
653 |
+
get its source. For example, if your program is a web application, its
|
654 |
+
interface could display a "Source" link that leads users to an archive
|
655 |
+
of the code. There are many ways you could offer source, and different
|
656 |
+
solutions will be better for different programs; see section 13 for the
|
657 |
+
specific requirements.
|
658 |
+
|
659 |
+
You should also get your employer (if you work as a programmer) or school,
|
660 |
+
if any, to sign a "copyright disclaimer" for the program, if necessary.
|
661 |
+
For more information on this, and how to apply and follow the GNU AGPL, see
|
662 |
+
<http://www.gnu.org/licenses/>.
|
adetailer/README.md
ADDED
@@ -0,0 +1,105 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
# !After Detailer
|
2 |
+
|
3 |
+
!After Detailer is a extension for stable diffusion webui, similar to Detection Detailer, except it uses ultralytics instead of the mmdet.
|
4 |
+
|
5 |
+
## Install
|
6 |
+
|
7 |
+
(from Mikubill/sd-webui-controlnet)
|
8 |
+
|
9 |
+
1. Open "Extensions" tab.
|
10 |
+
2. Open "Install from URL" tab in the tab.
|
11 |
+
3. Enter `https://github.com/Bing-su/adetailer.git` to "URL for extension's git repository".
|
12 |
+
4. Press "Install" button.
|
13 |
+
5. Wait 5 seconds, and you will see the message "Installed into stable-diffusion-webui\extensions\adetailer. Use Installed tab to restart".
|
14 |
+
6. Go to "Installed" tab, click "Check for updates", and then click "Apply and restart UI". (The next time you can also use this method to update extensions.)
|
15 |
+
7. Completely restart A1111 webui including your terminal. (If you do not know what is a "terminal", you can reboot your computer: turn your computer off and turn it on again.)
|
16 |
+
|
17 |
+
You can now install it directly from the Extensions tab.
|
18 |
+
|
19 |
+

|
20 |
+
|
21 |
+
You **DON'T** need to download any model from huggingface.
|
22 |
+
|
23 |
+
## Options
|
24 |
+
|
25 |
+
| Model, Prompts | | |
|
26 |
+
| --------------------------------- | ------------------------------------- | ------------------------------------------------- |
|
27 |
+
| ADetailer model | Determine what to detect. | `None` = disable |
|
28 |
+
| ADetailer prompt, negative prompt | Prompts and negative prompts to apply | If left blank, it will use the same as the input. |
|
29 |
+
|
30 |
+
| Detection | | |
|
31 |
+
| ------------------------------------ | -------------------------------------------------------------------------------------------- | --- |
|
32 |
+
| Detection model confidence threshold | Only objects with a detection model confidence above this threshold are used for inpainting. | |
|
33 |
+
| Mask min/max ratio | Only use masks whose area is between those ratios for the area of the entire image. | |
|
34 |
+
|
35 |
+
If you want to exclude objects in the background, try setting the min ratio to around `0.01`.
|
36 |
+
|
37 |
+
| Mask Preprocessing | | |
|
38 |
+
| ------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------- |
|
39 |
+
| Mask x, y offset | Moves the mask horizontally and vertically by | |
|
40 |
+
| Mask erosion (-) / dilation (+) | Enlarge or reduce the detected mask. | [opencv example](https://docs.opencv.org/4.7.0/db/df6/tutorial_erosion_dilatation.html) |
|
41 |
+
| Mask merge mode | `None`: Inpaint each mask<br/>`Merge`: Merge all masks and inpaint<br/>`Merge and Invert`: Merge all masks and Invert, then inpaint | |
|
42 |
+
|
43 |
+
Applied in this order: x, y offset → erosion/dilation → merge/invert.
|
44 |
+
|
45 |
+
#### Inpainting
|
46 |
+
|
47 |
+

|
48 |
+
|
49 |
+
Each option corresponds to a corresponding option on the inpaint tab.
|
50 |
+
|
51 |
+
## ControlNet Inpainting
|
52 |
+
|
53 |
+
You can use the ControlNet extension if you have ControlNet installed and ControlNet models.
|
54 |
+
|
55 |
+
Support `inpaint, scribble, lineart, openpose, tile` controlnet models. Once you choose a model, the preprocessor is set automatically.
|
56 |
+
|
57 |
+
## Model
|
58 |
+
|
59 |
+
| Model | Target | mAP 50 | mAP 50-95 |
|
60 |
+
| --------------------- | --------------------- | ----------------------------- | ----------------------------- |
|
61 |
+
| face_yolov8n.pt | 2D / realistic face | 0.660 | 0.366 |
|
62 |
+
| face_yolov8s.pt | 2D / realistic face | 0.713 | 0.404 |
|
63 |
+
| hand_yolov8n.pt | 2D / realistic hand | 0.767 | 0.505 |
|
64 |
+
| person_yolov8n-seg.pt | 2D / realistic person | 0.782 (bbox)<br/>0.761 (mask) | 0.555 (bbox)<br/>0.460 (mask) |
|
65 |
+
| person_yolov8s-seg.pt | 2D / realistic person | 0.824 (bbox)<br/>0.809 (mask) | 0.605 (bbox)<br/>0.508 (mask) |
|
66 |
+
| mediapipe_face_full | realistic face | - | - |
|
67 |
+
| mediapipe_face_short | realistic face | - | - |
|
68 |
+
| mediapipe_face_mesh | realistic face | - | - |
|
69 |
+
|
70 |
+
The yolo models can be found on huggingface [Bingsu/adetailer](https://huggingface.co/Bingsu/adetailer).
|
71 |
+
|
72 |
+
### User Model
|
73 |
+
|
74 |
+
Put your [ultralytics](https://github.com/ultralytics/ultralytics) model in `webui/models/adetailer`. The model name should end with `.pt` or `.pth`.
|
75 |
+
|
76 |
+
It must be a bbox detection or segment model and use all label.
|
77 |
+
|
78 |
+
### Dataset
|
79 |
+
|
80 |
+
Datasets used for training the yolo models are:
|
81 |
+
|
82 |
+
#### Face
|
83 |
+
|
84 |
+
- [Anime Face CreateML](https://universe.roboflow.com/my-workspace-mph8o/anime-face-createml)
|
85 |
+
- [xml2txt](https://universe.roboflow.com/0oooooo0/xml2txt-njqx1)
|
86 |
+
- [AN](https://universe.roboflow.com/sed-b8vkf/an-lfg5i)
|
87 |
+
- [wider face](http://shuoyang1213.me/WIDERFACE/index.html)
|
88 |
+
|
89 |
+
#### Hand
|
90 |
+
|
91 |
+
- [AnHDet](https://universe.roboflow.com/1-yshhi/anhdet)
|
92 |
+
- [hand-detection-fuao9](https://universe.roboflow.com/catwithawand/hand-detection-fuao9)
|
93 |
+
|
94 |
+
#### Person
|
95 |
+
|
96 |
+
- [coco2017](https://cocodataset.org/#home) (only person)
|
97 |
+
- [AniSeg](https://github.com/jerryli27/AniSeg)
|
98 |
+
- [skytnt/anime-segmentation](https://huggingface.co/datasets/skytnt/anime-segmentation)
|
99 |
+
|
100 |
+
## Example
|
101 |
+
|
102 |
+

|
103 |
+

|
104 |
+
|
105 |
+
[](https://ko-fi.com/F1F1L7V2N)
|
adetailer/adetailer/__init__.py
ADDED
@@ -0,0 +1,20 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
from .__version__ import __version__
|
2 |
+
from .args import AD_ENABLE, ALL_ARGS, ADetailerArgs, EnableChecker
|
3 |
+
from .common import PredictOutput, get_models
|
4 |
+
from .mediapipe import mediapipe_predict
|
5 |
+
from .ultralytics import ultralytics_predict
|
6 |
+
|
7 |
+
AFTER_DETAILER = "ADetailer"
|
8 |
+
|
9 |
+
__all__ = [
|
10 |
+
"__version__",
|
11 |
+
"AD_ENABLE",
|
12 |
+
"ADetailerArgs",
|
13 |
+
"AFTER_DETAILER",
|
14 |
+
"ALL_ARGS",
|
15 |
+
"EnableChecker",
|
16 |
+
"PredictOutput",
|
17 |
+
"get_models",
|
18 |
+
"mediapipe_predict",
|
19 |
+
"ultralytics_predict",
|
20 |
+
]
|
adetailer/adetailer/__version__.py
ADDED
@@ -0,0 +1 @@
|
|
|
|
|
1 |
+
__version__ = "23.7.5"
|
adetailer/adetailer/args.py
ADDED
@@ -0,0 +1,214 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
from __future__ import annotations
|
2 |
+
|
3 |
+
from collections import UserList
|
4 |
+
from functools import cached_property, partial
|
5 |
+
from typing import Any, Literal, NamedTuple, Optional, Union
|
6 |
+
|
7 |
+
import pydantic
|
8 |
+
from pydantic import (
|
9 |
+
BaseModel,
|
10 |
+
Extra,
|
11 |
+
NonNegativeFloat,
|
12 |
+
NonNegativeInt,
|
13 |
+
PositiveInt,
|
14 |
+
confloat,
|
15 |
+
constr,
|
16 |
+
root_validator,
|
17 |
+
validator,
|
18 |
+
)
|
19 |
+
|
20 |
+
cn_model_regex = r".*(inpaint|tile|scribble|lineart|openpose).*|^None$"
|
21 |
+
|
22 |
+
|
23 |
+
class Arg(NamedTuple):
|
24 |
+
attr: str
|
25 |
+
name: str
|
26 |
+
|
27 |
+
|
28 |
+
class ArgsList(UserList):
|
29 |
+
@cached_property
|
30 |
+
def attrs(self) -> tuple[str]:
|
31 |
+
return tuple(attr for attr, _ in self)
|
32 |
+
|
33 |
+
@cached_property
|
34 |
+
def names(self) -> tuple[str]:
|
35 |
+
return tuple(name for _, name in self)
|
36 |
+
|
37 |
+
|
38 |
+
class ADetailerArgs(BaseModel, extra=Extra.forbid):
|
39 |
+
ad_model: str = "None"
|
40 |
+
ad_prompt: str = ""
|
41 |
+
ad_negative_prompt: str = ""
|
42 |
+
ad_confidence: confloat(ge=0.0, le=1.0) = 0.3
|
43 |
+
ad_mask_min_ratio: confloat(ge=0.0, le=1.0) = 0.0
|
44 |
+
ad_mask_max_ratio: confloat(ge=0.0, le=1.0) = 1.0
|
45 |
+
ad_dilate_erode: int = 4
|
46 |
+
ad_x_offset: int = 0
|
47 |
+
ad_y_offset: int = 0
|
48 |
+
ad_mask_merge_invert: Literal["None", "Merge", "Merge and Invert"] = "None"
|
49 |
+
ad_mask_blur: NonNegativeInt = 4
|
50 |
+
ad_denoising_strength: confloat(ge=0.0, le=1.0) = 0.4
|
51 |
+
ad_inpaint_only_masked: bool = True
|
52 |
+
ad_inpaint_only_masked_padding: NonNegativeInt = 32
|
53 |
+
ad_use_inpaint_width_height: bool = False
|
54 |
+
ad_inpaint_width: PositiveInt = 512
|
55 |
+
ad_inpaint_height: PositiveInt = 512
|
56 |
+
ad_use_steps: bool = False
|
57 |
+
ad_steps: PositiveInt = 28
|
58 |
+
ad_use_cfg_scale: bool = False
|
59 |
+
ad_cfg_scale: NonNegativeFloat = 7.0
|
60 |
+
ad_use_noise_multiplier: bool = False
|
61 |
+
ad_noise_multiplier: confloat(ge=0.5, le=1.5) = 1.0
|
62 |
+
ad_restore_face: bool = False
|
63 |
+
ad_controlnet_model: constr(regex=cn_model_regex) = "None"
|
64 |
+
ad_controlnet_module: Optional[constr(regex=r".*inpaint.*|^None$")] = None
|
65 |
+
ad_controlnet_weight: confloat(ge=0.0, le=1.0) = 1.0
|
66 |
+
ad_controlnet_guidance_start: confloat(ge=0.0, le=1.0) = 0.0
|
67 |
+
ad_controlnet_guidance_end: confloat(ge=0.0, le=1.0) = 1.0
|
68 |
+
is_api: bool = True
|
69 |
+
|
70 |
+
@root_validator(skip_on_failure=True)
|
71 |
+
def ad_controlnt_module_validator(cls, values): # noqa: N805
|
72 |
+
cn_model = values.get("ad_controlnet_model", "None")
|
73 |
+
cn_module = values.get("ad_controlnet_module", None)
|
74 |
+
if "inpaint" not in cn_model or cn_module == "None":
|
75 |
+
values["ad_controlnet_module"] = None
|
76 |
+
return values
|
77 |
+
|
78 |
+
@validator("is_api", pre=True)
|
79 |
+
def is_api_validator(cls, v: Any): # noqa: N805
|
80 |
+
"tuple is json serializable but cannot be made with json deserialize."
|
81 |
+
return type(v) is not tuple
|
82 |
+
|
83 |
+
@staticmethod
|
84 |
+
def ppop(
|
85 |
+
p: dict[str, Any],
|
86 |
+
key: str,
|
87 |
+
pops: list[str] | None = None,
|
88 |
+
cond: Any = None,
|
89 |
+
) -> None:
|
90 |
+
if pops is None:
|
91 |
+
pops = [key]
|
92 |
+
if key not in p:
|
93 |
+
return
|
94 |
+
value = p[key]
|
95 |
+
cond = (not bool(value)) if cond is None else value == cond
|
96 |
+
|
97 |
+
if cond:
|
98 |
+
for k in pops:
|
99 |
+
p.pop(k, None)
|
100 |
+
|
101 |
+
def extra_params(self, suffix: str = "") -> dict[str, Any]:
|
102 |
+
if self.ad_model == "None":
|
103 |
+
return {}
|
104 |
+
|
105 |
+
p = {name: getattr(self, attr) for attr, name in ALL_ARGS}
|
106 |
+
ppop = partial(self.ppop, p)
|
107 |
+
|
108 |
+
ppop("ADetailer prompt")
|
109 |
+
ppop("ADetailer negative prompt")
|
110 |
+
ppop("ADetailer mask min ratio", cond=0.0)
|
111 |
+
ppop("ADetailer mask max ratio", cond=1.0)
|
112 |
+
ppop("ADetailer x offset", cond=0)
|
113 |
+
ppop("ADetailer y offset", cond=0)
|
114 |
+
ppop("ADetailer mask merge/invert", cond="None")
|
115 |
+
ppop("ADetailer inpaint only masked", ["ADetailer inpaint padding"])
|
116 |
+
ppop(
|
117 |
+
"ADetailer use inpaint width/height",
|
118 |
+
[
|
119 |
+
"ADetailer use inpaint width/height",
|
120 |
+
"ADetailer inpaint width",
|
121 |
+
"ADetailer inpaint height",
|
122 |
+
],
|
123 |
+
)
|
124 |
+
ppop(
|
125 |
+
"ADetailer use separate steps",
|
126 |
+
["ADetailer use separate steps", "ADetailer steps"],
|
127 |
+
)
|
128 |
+
ppop(
|
129 |
+
"ADetailer use separate CFG scale",
|
130 |
+
["ADetailer use separate CFG scale", "ADetailer CFG scale"],
|
131 |
+
)
|
132 |
+
ppop(
|
133 |
+
"ADetailer use separate noise multiplier",
|
134 |
+
["ADetailer use separate noise multiplier", "ADetailer noise multiplier"],
|
135 |
+
)
|
136 |
+
|
137 |
+
ppop("ADetailer restore face")
|
138 |
+
ppop(
|
139 |
+
"ADetailer ControlNet model",
|
140 |
+
[
|
141 |
+
"ADetailer ControlNet model",
|
142 |
+
"ADetailer ControlNet module",
|
143 |
+
"ADetailer ControlNet weight",
|
144 |
+
"ADetailer ControlNet guidance start",
|
145 |
+
"ADetailer ControlNet guidance end",
|
146 |
+
],
|
147 |
+
cond="None",
|
148 |
+
)
|
149 |
+
ppop("ADetailer ControlNet module")
|
150 |
+
ppop("ADetailer ControlNet weight", cond=1.0)
|
151 |
+
ppop("ADetailer ControlNet guidance start", cond=0.0)
|
152 |
+
ppop("ADetailer ControlNet guidance end", cond=1.0)
|
153 |
+
|
154 |
+
if suffix:
|
155 |
+
p = {k + suffix: v for k, v in p.items()}
|
156 |
+
|
157 |
+
return p
|
158 |
+
|
159 |
+
|
160 |
+
class EnableChecker(BaseModel):
|
161 |
+
enable: bool
|
162 |
+
arg_list: list
|
163 |
+
|
164 |
+
def is_enabled(self) -> bool:
|
165 |
+
ad_model = ALL_ARGS[0].attr
|
166 |
+
if not self.enable:
|
167 |
+
return False
|
168 |
+
return any(arg.get(ad_model, "None") != "None" for arg in self.arg_list)
|
169 |
+
|
170 |
+
|
171 |
+
_all_args = [
|
172 |
+
("ad_enable", "ADetailer enable"),
|
173 |
+
("ad_model", "ADetailer model"),
|
174 |
+
("ad_prompt", "ADetailer prompt"),
|
175 |
+
("ad_negative_prompt", "ADetailer negative prompt"),
|
176 |
+
("ad_confidence", "ADetailer confidence"),
|
177 |
+
("ad_mask_min_ratio", "ADetailer mask min ratio"),
|
178 |
+
("ad_mask_max_ratio", "ADetailer mask max ratio"),
|
179 |
+
("ad_x_offset", "ADetailer x offset"),
|
180 |
+
("ad_y_offset", "ADetailer y offset"),
|
181 |
+
("ad_dilate_erode", "ADetailer dilate/erode"),
|
182 |
+
("ad_mask_merge_invert", "ADetailer mask merge/invert"),
|
183 |
+
("ad_mask_blur", "ADetailer mask blur"),
|
184 |
+
("ad_denoising_strength", "ADetailer denoising strength"),
|
185 |
+
("ad_inpaint_only_masked", "ADetailer inpaint only masked"),
|
186 |
+
("ad_inpaint_only_masked_padding", "ADetailer inpaint padding"),
|
187 |
+
("ad_use_inpaint_width_height", "ADetailer use inpaint width/height"),
|
188 |
+
("ad_inpaint_width", "ADetailer inpaint width"),
|
189 |
+
("ad_inpaint_height", "ADetailer inpaint height"),
|
190 |
+
("ad_use_steps", "ADetailer use separate steps"),
|
191 |
+
("ad_steps", "ADetailer steps"),
|
192 |
+
("ad_use_cfg_scale", "ADetailer use separate CFG scale"),
|
193 |
+
("ad_cfg_scale", "ADetailer CFG scale"),
|
194 |
+
("ad_use_noise_multiplier", "ADetailer use separate noise multiplier"),
|
195 |
+
("ad_noise_multiplier", "ADetailer noise multiplier"),
|
196 |
+
("ad_restore_face", "ADetailer restore face"),
|
197 |
+
("ad_controlnet_model", "ADetailer ControlNet model"),
|
198 |
+
("ad_controlnet_module", "ADetailer ControlNet module"),
|
199 |
+
("ad_controlnet_weight", "ADetailer ControlNet weight"),
|
200 |
+
("ad_controlnet_guidance_start", "ADetailer ControlNet guidance start"),
|
201 |
+
("ad_controlnet_guidance_end", "ADetailer ControlNet guidance end"),
|
202 |
+
]
|
203 |
+
|
204 |
+
AD_ENABLE = Arg(*_all_args[0])
|
205 |
+
_args = [Arg(*args) for args in _all_args[1:]]
|
206 |
+
ALL_ARGS = ArgsList(_args)
|
207 |
+
|
208 |
+
BBOX_SORTBY = [
|
209 |
+
"None",
|
210 |
+
"Position (left to right)",
|
211 |
+
"Position (center to edge)",
|
212 |
+
"Area (large to small)",
|
213 |
+
]
|
214 |
+
MASK_MERGE_INVERT = ["None", "Merge", "Merge and Invert"]
|
adetailer/adetailer/common.py
ADDED
@@ -0,0 +1,127 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
from __future__ import annotations
|
2 |
+
|
3 |
+
from collections import OrderedDict
|
4 |
+
from dataclasses import dataclass, field
|
5 |
+
from pathlib import Path
|
6 |
+
from typing import Optional, Union
|
7 |
+
|
8 |
+
from huggingface_hub import hf_hub_download
|
9 |
+
from PIL import Image, ImageDraw
|
10 |
+
from rich import print
|
11 |
+
|
12 |
+
repo_id = "Bingsu/adetailer"
|
13 |
+
|
14 |
+
|
15 |
+
@dataclass
|
16 |
+
class PredictOutput:
|
17 |
+
bboxes: list[list[int | float]] = field(default_factory=list)
|
18 |
+
masks: list[Image.Image] = field(default_factory=list)
|
19 |
+
preview: Optional[Image.Image] = None
|
20 |
+
|
21 |
+
|
22 |
+
def hf_download(file: str):
|
23 |
+
try:
|
24 |
+
path = hf_hub_download(repo_id, file)
|
25 |
+
except Exception:
|
26 |
+
msg = f"[-] ADetailer: Failed to load model {file!r} from huggingface"
|
27 |
+
print(msg)
|
28 |
+
path = "INVALID"
|
29 |
+
return path
|
30 |
+
|
31 |
+
|
32 |
+
def get_models(
|
33 |
+
model_dir: Union[str, Path], huggingface: bool = True
|
34 |
+
) -> OrderedDict[str, Optional[str]]:
|
35 |
+
model_dir = Path(model_dir)
|
36 |
+
if model_dir.is_dir():
|
37 |
+
model_paths = [
|
38 |
+
p
|
39 |
+
for p in model_dir.rglob("*")
|
40 |
+
if p.is_file() and p.suffix in (".pt", ".pth")
|
41 |
+
]
|
42 |
+
else:
|
43 |
+
model_paths = []
|
44 |
+
|
45 |
+
models = OrderedDict()
|
46 |
+
if huggingface:
|
47 |
+
models.update(
|
48 |
+
{
|
49 |
+
"face_yolov8n.pt": hf_download("face_yolov8n.pt"),
|
50 |
+
"face_yolov8s.pt": hf_download("face_yolov8s.pt"),
|
51 |
+
"hand_yolov8n.pt": hf_download("hand_yolov8n.pt"),
|
52 |
+
"person_yolov8n-seg.pt": hf_download("person_yolov8n-seg.pt"),
|
53 |
+
"person_yolov8s-seg.pt": hf_download("person_yolov8s-seg.pt"),
|
54 |
+
}
|
55 |
+
)
|
56 |
+
models.update(
|
57 |
+
{
|
58 |
+
"mediapipe_face_full": None,
|
59 |
+
"mediapipe_face_short": None,
|
60 |
+
"mediapipe_face_mesh": None,
|
61 |
+
"mediapipe_face_mesh_eyes_only": None,
|
62 |
+
}
|
63 |
+
)
|
64 |
+
|
65 |
+
invalid_keys = [k for k, v in models.items() if v == "INVALID"]
|
66 |
+
for key in invalid_keys:
|
67 |
+
models.pop(key)
|
68 |
+
|
69 |
+
for path in model_paths:
|
70 |
+
if path.name in models:
|
71 |
+
continue
|
72 |
+
models[path.name] = str(path)
|
73 |
+
|
74 |
+
return models
|
75 |
+
|
76 |
+
|
77 |
+
def create_mask_from_bbox(
|
78 |
+
bboxes: list[list[float]], shape: tuple[int, int]
|
79 |
+
) -> list[Image.Image]:
|
80 |
+
"""
|
81 |
+
Parameters
|
82 |
+
----------
|
83 |
+
bboxes: list[list[float]]
|
84 |
+
list of [x1, y1, x2, y2]
|
85 |
+
bounding boxes
|
86 |
+
shape: tuple[int, int]
|
87 |
+
shape of the image (width, height)
|
88 |
+
|
89 |
+
Returns
|
90 |
+
-------
|
91 |
+
masks: list[Image.Image]
|
92 |
+
A list of masks
|
93 |
+
|
94 |
+
"""
|
95 |
+
masks = []
|
96 |
+
for bbox in bboxes:
|
97 |
+
mask = Image.new("L", shape, 0)
|
98 |
+
mask_draw = ImageDraw.Draw(mask)
|
99 |
+
mask_draw.rectangle(bbox, fill=255)
|
100 |
+
masks.append(mask)
|
101 |
+
return masks
|
102 |
+
|
103 |
+
|
104 |
+
def create_bbox_from_mask(
|
105 |
+
masks: list[Image.Image], shape: tuple[int, int]
|
106 |
+
) -> list[list[int]]:
|
107 |
+
"""
|
108 |
+
Parameters
|
109 |
+
----------
|
110 |
+
masks: list[Image.Image]
|
111 |
+
A list of masks
|
112 |
+
shape: tuple[int, int]
|
113 |
+
shape of the image (width, height)
|
114 |
+
|
115 |
+
Returns
|
116 |
+
-------
|
117 |
+
bboxes: list[list[float]]
|
118 |
+
A list of bounding boxes
|
119 |
+
|
120 |
+
"""
|
121 |
+
bboxes = []
|
122 |
+
for mask in masks:
|
123 |
+
mask = mask.resize(shape)
|
124 |
+
bbox = mask.getbbox()
|
125 |
+
if bbox is not None:
|
126 |
+
bboxes.append(list(bbox))
|
127 |
+
return bboxes
|
adetailer/adetailer/mask.py
ADDED
@@ -0,0 +1,245 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
from __future__ import annotations
|
2 |
+
|
3 |
+
from enum import IntEnum
|
4 |
+
from functools import partial, reduce
|
5 |
+
from math import dist
|
6 |
+
|
7 |
+
import cv2
|
8 |
+
import numpy as np
|
9 |
+
from PIL import Image, ImageChops
|
10 |
+
|
11 |
+
from adetailer.args import MASK_MERGE_INVERT
|
12 |
+
from adetailer.common import PredictOutput
|
13 |
+
|
14 |
+
|
15 |
+
class SortBy(IntEnum):
|
16 |
+
NONE = 0
|
17 |
+
LEFT_TO_RIGHT = 1
|
18 |
+
CENTER_TO_EDGE = 2
|
19 |
+
AREA = 3
|
20 |
+
|
21 |
+
|
22 |
+
class MergeInvert(IntEnum):
|
23 |
+
NONE = 0
|
24 |
+
MERGE = 1
|
25 |
+
MERGE_INVERT = 2
|
26 |
+
|
27 |
+
|
28 |
+
def _dilate(arr: np.ndarray, value: int) -> np.ndarray:
|
29 |
+
kernel = cv2.getStructuringElement(cv2.MORPH_RECT, (value, value))
|
30 |
+
return cv2.dilate(arr, kernel, iterations=1)
|
31 |
+
|
32 |
+
|
33 |
+
def _erode(arr: np.ndarray, value: int) -> np.ndarray:
|
34 |
+
kernel = cv2.getStructuringElement(cv2.MORPH_RECT, (value, value))
|
35 |
+
return cv2.erode(arr, kernel, iterations=1)
|
36 |
+
|
37 |
+
|
38 |
+
def dilate_erode(img: Image.Image, value: int) -> Image.Image:
|
39 |
+
"""
|
40 |
+
The dilate_erode function takes an image and a value.
|
41 |
+
If the value is positive, it dilates the image by that amount.
|
42 |
+
If the value is negative, it erodes the image by that amount.
|
43 |
+
|
44 |
+
Parameters
|
45 |
+
----------
|
46 |
+
img: PIL.Image.Image
|
47 |
+
the image to be processed
|
48 |
+
value: int
|
49 |
+
kernel size of dilation or erosion
|
50 |
+
|
51 |
+
Returns
|
52 |
+
-------
|
53 |
+
PIL.Image.Image
|
54 |
+
The image that has been dilated or eroded
|
55 |
+
"""
|
56 |
+
if value == 0:
|
57 |
+
return img
|
58 |
+
|
59 |
+
arr = np.array(img)
|
60 |
+
arr = _dilate(arr, value) if value > 0 else _erode(arr, -value)
|
61 |
+
|
62 |
+
return Image.fromarray(arr)
|
63 |
+
|
64 |
+
|
65 |
+
def offset(img: Image.Image, x: int = 0, y: int = 0) -> Image.Image:
|
66 |
+
"""
|
67 |
+
The offset function takes an image and offsets it by a given x(→) and y(↑) value.
|
68 |
+
|
69 |
+
Parameters
|
70 |
+
----------
|
71 |
+
mask: Image.Image
|
72 |
+
Pass the mask image to the function
|
73 |
+
x: int
|
74 |
+
→
|
75 |
+
y: int
|
76 |
+
↑
|
77 |
+
|
78 |
+
Returns
|
79 |
+
-------
|
80 |
+
PIL.Image.Image
|
81 |
+
A new image that is offset by x and y
|
82 |
+
"""
|
83 |
+
return ImageChops.offset(img, x, -y)
|
84 |
+
|
85 |
+
|
86 |
+
def is_all_black(img: Image.Image) -> bool:
|
87 |
+
arr = np.array(img)
|
88 |
+
return cv2.countNonZero(arr) == 0
|
89 |
+
|
90 |
+
|
91 |
+
def bbox_area(bbox: list[float]):
|
92 |
+
return (bbox[2] - bbox[0]) * (bbox[3] - bbox[1])
|
93 |
+
|
94 |
+
|
95 |
+
def mask_preprocess(
|
96 |
+
masks: list[Image.Image],
|
97 |
+
kernel: int = 0,
|
98 |
+
x_offset: int = 0,
|
99 |
+
y_offset: int = 0,
|
100 |
+
merge_invert: int | MergeInvert | str = MergeInvert.NONE,
|
101 |
+
) -> list[Image.Image]:
|
102 |
+
"""
|
103 |
+
The mask_preprocess function takes a list of masks and preprocesses them.
|
104 |
+
It dilates and erodes the masks, and offsets them by x_offset and y_offset.
|
105 |
+
|
106 |
+
Parameters
|
107 |
+
----------
|
108 |
+
masks: list[Image.Image]
|
109 |
+
A list of masks
|
110 |
+
kernel: int
|
111 |
+
kernel size of dilation or erosion
|
112 |
+
x_offset: int
|
113 |
+
→
|
114 |
+
y_offset: int
|
115 |
+
↑
|
116 |
+
|
117 |
+
Returns
|
118 |
+
-------
|
119 |
+
list[Image.Image]
|
120 |
+
A list of processed masks
|
121 |
+
"""
|
122 |
+
if not masks:
|
123 |
+
return []
|
124 |
+
|
125 |
+
if x_offset != 0 or y_offset != 0:
|
126 |
+
masks = [offset(m, x_offset, y_offset) for m in masks]
|
127 |
+
|
128 |
+
if kernel != 0:
|
129 |
+
masks = [dilate_erode(m, kernel) for m in masks]
|
130 |
+
masks = [m for m in masks if not is_all_black(m)]
|
131 |
+
|
132 |
+
return mask_merge_invert(masks, mode=merge_invert)
|
133 |
+
|
134 |
+
|
135 |
+
# Bbox sorting
|
136 |
+
def _key_left_to_right(bbox: list[float]) -> float:
|
137 |
+
"""
|
138 |
+
Left to right
|
139 |
+
|
140 |
+
Parameters
|
141 |
+
----------
|
142 |
+
bbox: list[float]
|
143 |
+
list of [x1, y1, x2, y2]
|
144 |
+
"""
|
145 |
+
return bbox[0]
|
146 |
+
|
147 |
+
|
148 |
+
def _key_center_to_edge(bbox: list[float], *, center: tuple[float, float]) -> float:
|
149 |
+
"""
|
150 |
+
Center to edge
|
151 |
+
|
152 |
+
Parameters
|
153 |
+
----------
|
154 |
+
bbox: list[float]
|
155 |
+
list of [x1, y1, x2, y2]
|
156 |
+
image: Image.Image
|
157 |
+
the image
|
158 |
+
"""
|
159 |
+
bbox_center = ((bbox[0] + bbox[2]) / 2, (bbox[1] + bbox[3]) / 2)
|
160 |
+
return dist(center, bbox_center)
|
161 |
+
|
162 |
+
|
163 |
+
def _key_area(bbox: list[float]) -> float:
|
164 |
+
"""
|
165 |
+
Large to small
|
166 |
+
|
167 |
+
Parameters
|
168 |
+
----------
|
169 |
+
bbox: list[float]
|
170 |
+
list of [x1, y1, x2, y2]
|
171 |
+
"""
|
172 |
+
return -bbox_area(bbox)
|
173 |
+
|
174 |
+
|
175 |
+
def sort_bboxes(
|
176 |
+
pred: PredictOutput, order: int | SortBy = SortBy.NONE
|
177 |
+
) -> PredictOutput:
|
178 |
+
if order == SortBy.NONE or len(pred.bboxes) <= 1:
|
179 |
+
return pred
|
180 |
+
|
181 |
+
if order == SortBy.LEFT_TO_RIGHT:
|
182 |
+
key = _key_left_to_right
|
183 |
+
elif order == SortBy.CENTER_TO_EDGE:
|
184 |
+
width, height = pred.preview.size
|
185 |
+
center = (width / 2, height / 2)
|
186 |
+
key = partial(_key_center_to_edge, center=center)
|
187 |
+
elif order == SortBy.AREA:
|
188 |
+
key = _key_area
|
189 |
+
else:
|
190 |
+
raise RuntimeError
|
191 |
+
|
192 |
+
items = len(pred.bboxes)
|
193 |
+
idx = sorted(range(items), key=lambda i: key(pred.bboxes[i]))
|
194 |
+
pred.bboxes = [pred.bboxes[i] for i in idx]
|
195 |
+
pred.masks = [pred.masks[i] for i in idx]
|
196 |
+
return pred
|
197 |
+
|
198 |
+
|
199 |
+
# Filter by ratio
|
200 |
+
def is_in_ratio(bbox: list[float], low: float, high: float, orig_area: int) -> bool:
|
201 |
+
area = bbox_area(bbox)
|
202 |
+
return low <= area / orig_area <= high
|
203 |
+
|
204 |
+
|
205 |
+
def filter_by_ratio(pred: PredictOutput, low: float, high: float) -> PredictOutput:
|
206 |
+
if not pred.bboxes:
|
207 |
+
return pred
|
208 |
+
|
209 |
+
w, h = pred.preview.size
|
210 |
+
orig_area = w * h
|
211 |
+
items = len(pred.bboxes)
|
212 |
+
idx = [i for i in range(items) if is_in_ratio(pred.bboxes[i], low, high, orig_area)]
|
213 |
+
pred.bboxes = [pred.bboxes[i] for i in idx]
|
214 |
+
pred.masks = [pred.masks[i] for i in idx]
|
215 |
+
return pred
|
216 |
+
|
217 |
+
|
218 |
+
# Merge / Invert
|
219 |
+
def mask_merge(masks: list[Image.Image]) -> list[Image.Image]:
|
220 |
+
arrs = [np.array(m) for m in masks]
|
221 |
+
arr = reduce(cv2.bitwise_or, arrs)
|
222 |
+
return [Image.fromarray(arr)]
|
223 |
+
|
224 |
+
|
225 |
+
def mask_invert(masks: list[Image.Image]) -> list[Image.Image]:
|
226 |
+
return [ImageChops.invert(m) for m in masks]
|
227 |
+
|
228 |
+
|
229 |
+
def mask_merge_invert(
|
230 |
+
masks: list[Image.Image], mode: int | MergeInvert | str
|
231 |
+
) -> list[Image.Image]:
|
232 |
+
if isinstance(mode, str):
|
233 |
+
mode = MASK_MERGE_INVERT.index(mode)
|
234 |
+
|
235 |
+
if mode == MergeInvert.NONE or not masks:
|
236 |
+
return masks
|
237 |
+
|
238 |
+
if mode == MergeInvert.MERGE:
|
239 |
+
return mask_merge(masks)
|
240 |
+
|
241 |
+
if mode == MergeInvert.MERGE_INVERT:
|
242 |
+
merged = mask_merge(masks)
|
243 |
+
return mask_invert(merged)
|
244 |
+
|
245 |
+
raise RuntimeError
|
adetailer/adetailer/mediapipe.py
ADDED
@@ -0,0 +1,184 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
from __future__ import annotations
|
2 |
+
|
3 |
+
from functools import partial
|
4 |
+
|
5 |
+
import numpy as np
|
6 |
+
from PIL import Image, ImageDraw
|
7 |
+
|
8 |
+
from adetailer import PredictOutput
|
9 |
+
from adetailer.common import create_bbox_from_mask, create_mask_from_bbox
|
10 |
+
|
11 |
+
|
12 |
+
def mediapipe_predict(
|
13 |
+
model_type: str, image: Image.Image, confidence: float = 0.3
|
14 |
+
) -> PredictOutput:
|
15 |
+
mapping = {
|
16 |
+
"mediapipe_face_short": partial(mediapipe_face_detection, 0),
|
17 |
+
"mediapipe_face_full": partial(mediapipe_face_detection, 1),
|
18 |
+
"mediapipe_face_mesh": mediapipe_face_mesh,
|
19 |
+
"mediapipe_face_mesh_eyes_only": mediapipe_face_mesh_eyes_only,
|
20 |
+
}
|
21 |
+
if model_type in mapping:
|
22 |
+
func = mapping[model_type]
|
23 |
+
return func(image, confidence)
|
24 |
+
msg = f"[-] ADetailer: Invalid mediapipe model type: {model_type}, Available: {list(mapping.keys())!r}"
|
25 |
+
raise RuntimeError(msg)
|
26 |
+
|
27 |
+
|
28 |
+
def mediapipe_face_detection(
|
29 |
+
model_type: int, image: Image.Image, confidence: float = 0.3
|
30 |
+
) -> PredictOutput:
|
31 |
+
import mediapipe as mp
|
32 |
+
|
33 |
+
img_width, img_height = image.size
|
34 |
+
|
35 |
+
mp_face_detection = mp.solutions.face_detection
|
36 |
+
draw_util = mp.solutions.drawing_utils
|
37 |
+
|
38 |
+
img_array = np.array(image)
|
39 |
+
|
40 |
+
with mp_face_detection.FaceDetection(
|
41 |
+
model_selection=model_type, min_detection_confidence=confidence
|
42 |
+
) as face_detector:
|
43 |
+
pred = face_detector.process(img_array)
|
44 |
+
|
45 |
+
if pred.detections is None:
|
46 |
+
return PredictOutput()
|
47 |
+
|
48 |
+
preview_array = img_array.copy()
|
49 |
+
|
50 |
+
bboxes = []
|
51 |
+
for detection in pred.detections:
|
52 |
+
draw_util.draw_detection(preview_array, detection)
|
53 |
+
|
54 |
+
bbox = detection.location_data.relative_bounding_box
|
55 |
+
x1 = bbox.xmin * img_width
|
56 |
+
y1 = bbox.ymin * img_height
|
57 |
+
w = bbox.width * img_width
|
58 |
+
h = bbox.height * img_height
|
59 |
+
x2 = x1 + w
|
60 |
+
y2 = y1 + h
|
61 |
+
|
62 |
+
bboxes.append([x1, y1, x2, y2])
|
63 |
+
|
64 |
+
masks = create_mask_from_bbox(bboxes, image.size)
|
65 |
+
preview = Image.fromarray(preview_array)
|
66 |
+
|
67 |
+
return PredictOutput(bboxes=bboxes, masks=masks, preview=preview)
|
68 |
+
|
69 |
+
|
70 |
+
def get_convexhull(points: np.ndarray) -> list[tuple[int, int]]:
|
71 |
+
"""
|
72 |
+
Parameters
|
73 |
+
----------
|
74 |
+
points: An ndarray of shape (n, 2) containing the 2D points.
|
75 |
+
|
76 |
+
Returns
|
77 |
+
-------
|
78 |
+
list[tuple[int, int]]: Input for the draw.polygon function
|
79 |
+
"""
|
80 |
+
from scipy.spatial import ConvexHull
|
81 |
+
|
82 |
+
hull = ConvexHull(points)
|
83 |
+
vertices = hull.vertices
|
84 |
+
return list(zip(points[vertices, 0], points[vertices, 1]))
|
85 |
+
|
86 |
+
|
87 |
+
def mediapipe_face_mesh(image: Image.Image, confidence: float = 0.3) -> PredictOutput:
|
88 |
+
import mediapipe as mp
|
89 |
+
|
90 |
+
mp_face_mesh = mp.solutions.face_mesh
|
91 |
+
draw_util = mp.solutions.drawing_utils
|
92 |
+
drawing_styles = mp.solutions.drawing_styles
|
93 |
+
|
94 |
+
w, h = image.size
|
95 |
+
|
96 |
+
with mp_face_mesh.FaceMesh(
|
97 |
+
static_image_mode=True, max_num_faces=20, min_detection_confidence=confidence
|
98 |
+
) as face_mesh:
|
99 |
+
arr = np.array(image)
|
100 |
+
pred = face_mesh.process(arr)
|
101 |
+
|
102 |
+
if pred.multi_face_landmarks is None:
|
103 |
+
return PredictOutput()
|
104 |
+
|
105 |
+
preview = arr.copy()
|
106 |
+
masks = []
|
107 |
+
|
108 |
+
for landmarks in pred.multi_face_landmarks:
|
109 |
+
draw_util.draw_landmarks(
|
110 |
+
image=preview,
|
111 |
+
landmark_list=landmarks,
|
112 |
+
connections=mp_face_mesh.FACEMESH_TESSELATION,
|
113 |
+
landmark_drawing_spec=None,
|
114 |
+
connection_drawing_spec=drawing_styles.get_default_face_mesh_tesselation_style(),
|
115 |
+
)
|
116 |
+
|
117 |
+
points = np.array([(land.x * w, land.y * h) for land in landmarks.landmark])
|
118 |
+
outline = get_convexhull(points)
|
119 |
+
|
120 |
+
mask = Image.new("L", image.size, "black")
|
121 |
+
draw = ImageDraw.Draw(mask)
|
122 |
+
draw.polygon(outline, fill="white")
|
123 |
+
masks.append(mask)
|
124 |
+
|
125 |
+
bboxes = create_bbox_from_mask(masks, image.size)
|
126 |
+
preview = Image.fromarray(preview)
|
127 |
+
return PredictOutput(bboxes=bboxes, masks=masks, preview=preview)
|
128 |
+
|
129 |
+
|
130 |
+
def mediapipe_face_mesh_eyes_only(
|
131 |
+
image: Image.Image, confidence: float = 0.3
|
132 |
+
) -> PredictOutput:
|
133 |
+
import mediapipe as mp
|
134 |
+
|
135 |
+
mp_face_mesh = mp.solutions.face_mesh
|
136 |
+
|
137 |
+
left_idx = np.array(list(mp_face_mesh.FACEMESH_LEFT_EYE)).flatten()
|
138 |
+
right_idx = np.array(list(mp_face_mesh.FACEMESH_RIGHT_EYE)).flatten()
|
139 |
+
|
140 |
+
w, h = image.size
|
141 |
+
|
142 |
+
with mp_face_mesh.FaceMesh(
|
143 |
+
static_image_mode=True, max_num_faces=20, min_detection_confidence=confidence
|
144 |
+
) as face_mesh:
|
145 |
+
arr = np.array(image)
|
146 |
+
pred = face_mesh.process(arr)
|
147 |
+
|
148 |
+
if pred.multi_face_landmarks is None:
|
149 |
+
return PredictOutput()
|
150 |
+
|
151 |
+
preview = image.copy()
|
152 |
+
masks = []
|
153 |
+
|
154 |
+
for landmarks in pred.multi_face_landmarks:
|
155 |
+
points = np.array([(land.x * w, land.y * h) for land in landmarks.landmark])
|
156 |
+
left_eyes = points[left_idx]
|
157 |
+
right_eyes = points[right_idx]
|
158 |
+
left_outline = get_convexhull(left_eyes)
|
159 |
+
right_outline = get_convexhull(right_eyes)
|
160 |
+
|
161 |
+
mask = Image.new("L", image.size, "black")
|
162 |
+
draw = ImageDraw.Draw(mask)
|
163 |
+
for outline in (left_outline, right_outline):
|
164 |
+
draw.polygon(outline, fill="white")
|
165 |
+
masks.append(mask)
|
166 |
+
|
167 |
+
bboxes = create_bbox_from_mask(masks, image.size)
|
168 |
+
preview = draw_preview(preview, bboxes, masks)
|
169 |
+
return PredictOutput(bboxes=bboxes, masks=masks, preview=preview)
|
170 |
+
|
171 |
+
|
172 |
+
def draw_preview(
|
173 |
+
preview: Image.Image, bboxes: list[list[int]], masks: list[Image.Image]
|
174 |
+
) -> Image.Image:
|
175 |
+
red = Image.new("RGB", preview.size, "red")
|
176 |
+
for mask in masks:
|
177 |
+
masked = Image.composite(red, preview, mask)
|
178 |
+
preview = Image.blend(preview, masked, 0.25)
|
179 |
+
|
180 |
+
draw = ImageDraw.Draw(preview)
|
181 |
+
for bbox in bboxes:
|
182 |
+
draw.rectangle(bbox, outline="red", width=2)
|
183 |
+
|
184 |
+
return preview
|
adetailer/adetailer/traceback.py
ADDED
@@ -0,0 +1,158 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
from __future__ import annotations
|
2 |
+
|
3 |
+
import io
|
4 |
+
import platform
|
5 |
+
import sys
|
6 |
+
from typing import Any, Callable
|
7 |
+
|
8 |
+
from rich.console import Console, Group
|
9 |
+
from rich.panel import Panel
|
10 |
+
from rich.table import Table
|
11 |
+
from rich.traceback import Traceback
|
12 |
+
|
13 |
+
from adetailer.__version__ import __version__
|
14 |
+
|
15 |
+
|
16 |
+
def processing(*args: Any) -> dict[str, Any]:
|
17 |
+
try:
|
18 |
+
from modules.processing import (
|
19 |
+
StableDiffusionProcessingImg2Img,
|
20 |
+
StableDiffusionProcessingTxt2Img,
|
21 |
+
)
|
22 |
+
except ImportError:
|
23 |
+
return {}
|
24 |
+
|
25 |
+
p = None
|
26 |
+
for arg in args:
|
27 |
+
if isinstance(
|
28 |
+
arg, (StableDiffusionProcessingTxt2Img, StableDiffusionProcessingImg2Img)
|
29 |
+
):
|
30 |
+
p = arg
|
31 |
+
break
|
32 |
+
|
33 |
+
if p is None:
|
34 |
+
return {}
|
35 |
+
|
36 |
+
info = {
|
37 |
+
"prompt": p.prompt,
|
38 |
+
"negative_prompt": p.negative_prompt,
|
39 |
+
"n_iter": p.n_iter,
|
40 |
+
"batch_size": p.batch_size,
|
41 |
+
"width": p.width,
|
42 |
+
"height": p.height,
|
43 |
+
"sampler_name": p.sampler_name,
|
44 |
+
"enable_hr": getattr(p, "enable_hr", False),
|
45 |
+
"hr_upscaler": getattr(p, "hr_upscaler", ""),
|
46 |
+
}
|
47 |
+
|
48 |
+
info.update(sd_models())
|
49 |
+
return info
|
50 |
+
|
51 |
+
|
52 |
+
def sd_models() -> dict[str, str]:
|
53 |
+
try:
|
54 |
+
from modules import shared
|
55 |
+
|
56 |
+
opts = shared.opts
|
57 |
+
except Exception:
|
58 |
+
return {}
|
59 |
+
|
60 |
+
return {
|
61 |
+
"checkpoint": getattr(opts, "sd_model_checkpoint", "------"),
|
62 |
+
"vae": getattr(opts, "sd_vae", "------"),
|
63 |
+
"unet": getattr(opts, "sd_unet", "------"),
|
64 |
+
}
|
65 |
+
|
66 |
+
|
67 |
+
def ad_args(*args: Any) -> dict[str, Any]:
|
68 |
+
ad_args = [
|
69 |
+
arg
|
70 |
+
for arg in args
|
71 |
+
if isinstance(arg, dict) and arg.get("ad_model", "None") != "None"
|
72 |
+
]
|
73 |
+
if not ad_args:
|
74 |
+
return {}
|
75 |
+
|
76 |
+
arg0 = ad_args[0]
|
77 |
+
is_api = arg0.get("is_api", True)
|
78 |
+
return {
|
79 |
+
"version": __version__,
|
80 |
+
"ad_model": arg0["ad_model"],
|
81 |
+
"ad_prompt": arg0.get("ad_prompt", ""),
|
82 |
+
"ad_negative_prompt": arg0.get("ad_negative_prompt", ""),
|
83 |
+
"ad_controlnet_model": arg0.get("ad_controlnet_model", "None"),
|
84 |
+
"is_api": type(is_api) is not tuple,
|
85 |
+
}
|
86 |
+
|
87 |
+
|
88 |
+
def sys_info() -> dict[str, Any]:
|
89 |
+
try:
|
90 |
+
import launch
|
91 |
+
|
92 |
+
version = launch.git_tag()
|
93 |
+
commit = launch.commit_hash()
|
94 |
+
except Exception:
|
95 |
+
version = commit = "------"
|
96 |
+
|
97 |
+
return {
|
98 |
+
"Platform": platform.platform(),
|
99 |
+
"Python": sys.version,
|
100 |
+
"Version": version,
|
101 |
+
"Commit": commit,
|
102 |
+
"Commandline": sys.argv,
|
103 |
+
}
|
104 |
+
|
105 |
+
|
106 |
+
def get_table(title: str, data: dict[str, Any]) -> Table:
|
107 |
+
table = Table(title=title, highlight=True)
|
108 |
+
table.add_column(" ", justify="right", style="dim")
|
109 |
+
table.add_column("Value")
|
110 |
+
for key, value in data.items():
|
111 |
+
if not isinstance(value, str):
|
112 |
+
value = repr(value)
|
113 |
+
table.add_row(key, value)
|
114 |
+
|
115 |
+
return table
|
116 |
+
|
117 |
+
|
118 |
+
def force_terminal_value():
|
119 |
+
try:
|
120 |
+
from modules.shared import cmd_opts
|
121 |
+
|
122 |
+
return True if hasattr(cmd_opts, "skip_torch_cuda_test") else None
|
123 |
+
except Exception:
|
124 |
+
return None
|
125 |
+
|
126 |
+
|
127 |
+
def rich_traceback(func: Callable) -> Callable:
|
128 |
+
force_terminal = force_terminal_value()
|
129 |
+
|
130 |
+
def wrapper(*args, **kwargs):
|
131 |
+
string = io.StringIO()
|
132 |
+
width = Console().width
|
133 |
+
width = width - 4 if width > 4 else None
|
134 |
+
console = Console(file=string, force_terminal=force_terminal, width=width)
|
135 |
+
try:
|
136 |
+
return func(*args, **kwargs)
|
137 |
+
except Exception as e:
|
138 |
+
tables = [
|
139 |
+
get_table(title, data)
|
140 |
+
for title, data in [
|
141 |
+
("System info", sys_info()),
|
142 |
+
("Inputs", processing(*args)),
|
143 |
+
("ADetailer", ad_args(*args)),
|
144 |
+
]
|
145 |
+
if data
|
146 |
+
]
|
147 |
+
tables.append(Traceback())
|
148 |
+
|
149 |
+
console.print(Panel(Group(*tables)))
|
150 |
+
output = "\n" + string.getvalue()
|
151 |
+
|
152 |
+
try:
|
153 |
+
error = e.__class__(output)
|
154 |
+
except Exception:
|
155 |
+
error = RuntimeError(output)
|
156 |
+
raise error from None
|
157 |
+
|
158 |
+
return wrapper
|
adetailer/adetailer/ui.py
ADDED
@@ -0,0 +1,505 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
from __future__ import annotations
|
2 |
+
|
3 |
+
from functools import partial
|
4 |
+
from types import SimpleNamespace
|
5 |
+
from typing import Any
|
6 |
+
|
7 |
+
import gradio as gr
|
8 |
+
|
9 |
+
from adetailer import AFTER_DETAILER, __version__
|
10 |
+
from adetailer.args import AD_ENABLE, ALL_ARGS, MASK_MERGE_INVERT
|
11 |
+
from controlnet_ext import controlnet_exists, get_cn_models
|
12 |
+
|
13 |
+
cn_module_choices = [
|
14 |
+
"inpaint_global_harmonious",
|
15 |
+
"inpaint_only",
|
16 |
+
"inpaint_only+lama",
|
17 |
+
]
|
18 |
+
|
19 |
+
|
20 |
+
class Widgets(SimpleNamespace):
|
21 |
+
def tolist(self):
|
22 |
+
return [getattr(self, attr) for attr in ALL_ARGS.attrs]
|
23 |
+
|
24 |
+
|
25 |
+
def gr_interactive(value: bool = True):
|
26 |
+
return gr.update(interactive=value)
|
27 |
+
|
28 |
+
|
29 |
+
def ordinal(n: int) -> str:
|
30 |
+
d = {1: "st", 2: "nd", 3: "rd"}
|
31 |
+
return str(n) + ("th" if 11 <= n % 100 <= 13 else d.get(n % 10, "th"))
|
32 |
+
|
33 |
+
|
34 |
+
def suffix(n: int, c: str = " ") -> str:
|
35 |
+
return "" if n == 0 else c + ordinal(n + 1)
|
36 |
+
|
37 |
+
|
38 |
+
def on_widget_change(state: dict, value: Any, *, attr: str):
|
39 |
+
state[attr] = value
|
40 |
+
return state
|
41 |
+
|
42 |
+
|
43 |
+
def on_generate_click(state: dict, *values: Any):
|
44 |
+
for attr, value in zip(ALL_ARGS.attrs, values):
|
45 |
+
state[attr] = value
|
46 |
+
state["is_api"] = ()
|
47 |
+
return state
|
48 |
+
|
49 |
+
|
50 |
+
def on_cn_model_update(cn_model: str):
|
51 |
+
if "inpaint" in cn_model:
|
52 |
+
return gr.update(
|
53 |
+
visible=True, choices=cn_module_choices, value=cn_module_choices[0]
|
54 |
+
)
|
55 |
+
return gr.update(visible=False, choices=["None"], value="None")
|
56 |
+
|
57 |
+
|
58 |
+
def elem_id(item_id: str, n: int, is_img2img: bool) -> str:
|
59 |
+
tap = "img2img" if is_img2img else "txt2img"
|
60 |
+
suf = suffix(n, "_")
|
61 |
+
return f"script_{tap}_adetailer_{item_id}{suf}"
|
62 |
+
|
63 |
+
|
64 |
+
def adui(
|
65 |
+
num_models: int,
|
66 |
+
is_img2img: bool,
|
67 |
+
model_list: list[str],
|
68 |
+
t2i_button: gr.Button,
|
69 |
+
i2i_button: gr.Button,
|
70 |
+
):
|
71 |
+
states = []
|
72 |
+
infotext_fields = []
|
73 |
+
eid = partial(elem_id, n=0, is_img2img=is_img2img)
|
74 |
+
|
75 |
+
with gr.Accordion(AFTER_DETAILER, open=False, elem_id=eid("ad_main_accordion")):
|
76 |
+
with gr.Row():
|
77 |
+
with gr.Column(scale=6):
|
78 |
+
ad_enable = gr.Checkbox(
|
79 |
+
label="Enable ADetailer",
|
80 |
+
value=False,
|
81 |
+
visible=True,
|
82 |
+
elem_id=eid("ad_enable"),
|
83 |
+
)
|
84 |
+
|
85 |
+
with gr.Column(scale=1, min_width=180):
|
86 |
+
gr.Markdown(
|
87 |
+
f"v{__version__}",
|
88 |
+
elem_id=eid("ad_version"),
|
89 |
+
)
|
90 |
+
|
91 |
+
infotext_fields.append((ad_enable, AD_ENABLE.name))
|
92 |
+
|
93 |
+
with gr.Group(), gr.Tabs():
|
94 |
+
for n in range(num_models):
|
95 |
+
with gr.Tab(ordinal(n + 1)):
|
96 |
+
state, infofields = one_ui_group(
|
97 |
+
n=n,
|
98 |
+
is_img2img=is_img2img,
|
99 |
+
model_list=model_list,
|
100 |
+
t2i_button=t2i_button,
|
101 |
+
i2i_button=i2i_button,
|
102 |
+
)
|
103 |
+
|
104 |
+
states.append(state)
|
105 |
+
infotext_fields.extend(infofields)
|
106 |
+
|
107 |
+
# components: [bool, dict, dict, ...]
|
108 |
+
components = [ad_enable, *states]
|
109 |
+
return components, infotext_fields
|
110 |
+
|
111 |
+
|
112 |
+
def one_ui_group(
|
113 |
+
n: int,
|
114 |
+
is_img2img: bool,
|
115 |
+
model_list: list[str],
|
116 |
+
t2i_button: gr.Button,
|
117 |
+
i2i_button: gr.Button,
|
118 |
+
):
|
119 |
+
w = Widgets()
|
120 |
+
state = gr.State({})
|
121 |
+
eid = partial(elem_id, n=n, is_img2img=is_img2img)
|
122 |
+
|
123 |
+
with gr.Row():
|
124 |
+
model_choices = [*model_list, "None"] if n == 0 else ["None", *model_list]
|
125 |
+
|
126 |
+
w.ad_model = gr.Dropdown(
|
127 |
+
label="ADetailer model" + suffix(n),
|
128 |
+
choices=model_choices,
|
129 |
+
value=model_choices[0],
|
130 |
+
visible=True,
|
131 |
+
type="value",
|
132 |
+
elem_id=eid("ad_model"),
|
133 |
+
)
|
134 |
+
|
135 |
+
with gr.Group():
|
136 |
+
with gr.Row(elem_id=eid("ad_toprow_prompt")):
|
137 |
+
w.ad_prompt = gr.Textbox(
|
138 |
+
label="ad_prompt" + suffix(n),
|
139 |
+
show_label=False,
|
140 |
+
lines=3,
|
141 |
+
placeholder="ADetailer prompt"
|
142 |
+
+ suffix(n)
|
143 |
+
+ "\nIf blank, the main prompt is used.",
|
144 |
+
elem_id=eid("ad_prompt"),
|
145 |
+
)
|
146 |
+
|
147 |
+
with gr.Row(elem_id=eid("ad_toprow_negative_prompt")):
|
148 |
+
w.ad_negative_prompt = gr.Textbox(
|
149 |
+
label="ad_negative_prompt" + suffix(n),
|
150 |
+
show_label=False,
|
151 |
+
lines=2,
|
152 |
+
placeholder="ADetailer negative prompt"
|
153 |
+
+ suffix(n)
|
154 |
+
+ "\nIf blank, the main negative prompt is used.",
|
155 |
+
elem_id=eid("ad_negative_prompt"),
|
156 |
+
)
|
157 |
+
|
158 |
+
with gr.Group():
|
159 |
+
with gr.Accordion(
|
160 |
+
"Detection", open=False, elem_id=eid("ad_detection_accordion")
|
161 |
+
):
|
162 |
+
detection(w, n, is_img2img)
|
163 |
+
|
164 |
+
with gr.Accordion(
|
165 |
+
"Mask Preprocessing",
|
166 |
+
open=False,
|
167 |
+
elem_id=eid("ad_mask_preprocessing_accordion"),
|
168 |
+
):
|
169 |
+
mask_preprocessing(w, n, is_img2img)
|
170 |
+
|
171 |
+
with gr.Accordion(
|
172 |
+
"Inpainting", open=False, elem_id=eid("ad_inpainting_accordion")
|
173 |
+
):
|
174 |
+
inpainting(w, n, is_img2img)
|
175 |
+
|
176 |
+
with gr.Group():
|
177 |
+
controlnet(w, n, is_img2img)
|
178 |
+
|
179 |
+
all_inputs = [state, *w.tolist()]
|
180 |
+
target_button = i2i_button if is_img2img else t2i_button
|
181 |
+
target_button.click(
|
182 |
+
fn=on_generate_click, inputs=all_inputs, outputs=state, queue=False
|
183 |
+
)
|
184 |
+
|
185 |
+
infotext_fields = [(getattr(w, attr), name + suffix(n)) for attr, name in ALL_ARGS]
|
186 |
+
|
187 |
+
return state, infotext_fields
|
188 |
+
|
189 |
+
|
190 |
+
def detection(w: Widgets, n: int, is_img2img: bool):
|
191 |
+
eid = partial(elem_id, n=n, is_img2img=is_img2img)
|
192 |
+
|
193 |
+
with gr.Row():
|
194 |
+
with gr.Column():
|
195 |
+
w.ad_confidence = gr.Slider(
|
196 |
+
label="Detection model confidence threshold" + suffix(n),
|
197 |
+
minimum=0.0,
|
198 |
+
maximum=1.0,
|
199 |
+
step=0.01,
|
200 |
+
value=0.3,
|
201 |
+
visible=True,
|
202 |
+
elem_id=eid("ad_confidence"),
|
203 |
+
)
|
204 |
+
|
205 |
+
with gr.Column(variant="compact"):
|
206 |
+
w.ad_mask_min_ratio = gr.Slider(
|
207 |
+
label="Mask min area ratio" + suffix(n),
|
208 |
+
minimum=0.0,
|
209 |
+
maximum=1.0,
|
210 |
+
step=0.001,
|
211 |
+
value=0.0,
|
212 |
+
visible=True,
|
213 |
+
elem_id=eid("ad_mask_min_ratio"),
|
214 |
+
)
|
215 |
+
w.ad_mask_max_ratio = gr.Slider(
|
216 |
+
label="Mask max area ratio" + suffix(n),
|
217 |
+
minimum=0.0,
|
218 |
+
maximum=1.0,
|
219 |
+
step=0.001,
|
220 |
+
value=1.0,
|
221 |
+
visible=True,
|
222 |
+
elem_id=eid("ad_mask_max_ratio"),
|
223 |
+
)
|
224 |
+
|
225 |
+
|
226 |
+
def mask_preprocessing(w: Widgets, n: int, is_img2img: bool):
|
227 |
+
eid = partial(elem_id, n=n, is_img2img=is_img2img)
|
228 |
+
|
229 |
+
with gr.Group():
|
230 |
+
with gr.Row():
|
231 |
+
with gr.Column(variant="compact"):
|
232 |
+
w.ad_x_offset = gr.Slider(
|
233 |
+
label="Mask x(→) offset" + suffix(n),
|
234 |
+
minimum=-200,
|
235 |
+
maximum=200,
|
236 |
+
step=1,
|
237 |
+
value=0,
|
238 |
+
visible=True,
|
239 |
+
elem_id=eid("ad_x_offset"),
|
240 |
+
)
|
241 |
+
w.ad_y_offset = gr.Slider(
|
242 |
+
label="Mask y(↑) offset" + suffix(n),
|
243 |
+
minimum=-200,
|
244 |
+
maximum=200,
|
245 |
+
step=1,
|
246 |
+
value=0,
|
247 |
+
visible=True,
|
248 |
+
elem_id=eid("ad_y_offset"),
|
249 |
+
)
|
250 |
+
|
251 |
+
with gr.Column(variant="compact"):
|
252 |
+
w.ad_dilate_erode = gr.Slider(
|
253 |
+
label="Mask erosion (-) / dilation (+)" + suffix(n),
|
254 |
+
minimum=-128,
|
255 |
+
maximum=128,
|
256 |
+
step=4,
|
257 |
+
value=4,
|
258 |
+
visible=True,
|
259 |
+
elem_id=eid("ad_dilate_erode"),
|
260 |
+
)
|
261 |
+
|
262 |
+
with gr.Row():
|
263 |
+
w.ad_mask_merge_invert = gr.Radio(
|
264 |
+
label="Mask merge mode" + suffix(n),
|
265 |
+
choices=MASK_MERGE_INVERT,
|
266 |
+
value="None",
|
267 |
+
elem_id=eid("ad_mask_merge_invert"),
|
268 |
+
)
|
269 |
+
|
270 |
+
|
271 |
+
def inpainting(w: Widgets, n: int, is_img2img: bool):
|
272 |
+
eid = partial(elem_id, n=n, is_img2img=is_img2img)
|
273 |
+
|
274 |
+
with gr.Group():
|
275 |
+
with gr.Row():
|
276 |
+
w.ad_mask_blur = gr.Slider(
|
277 |
+
label="Inpaint mask blur" + suffix(n),
|
278 |
+
minimum=0,
|
279 |
+
maximum=64,
|
280 |
+
step=1,
|
281 |
+
value=4,
|
282 |
+
visible=True,
|
283 |
+
elem_id=eid("ad_mask_blur"),
|
284 |
+
)
|
285 |
+
|
286 |
+
w.ad_denoising_strength = gr.Slider(
|
287 |
+
label="Inpaint denoising strength" + suffix(n),
|
288 |
+
minimum=0.0,
|
289 |
+
maximum=1.0,
|
290 |
+
step=0.01,
|
291 |
+
value=0.4,
|
292 |
+
visible=True,
|
293 |
+
elem_id=eid("ad_denoising_strength"),
|
294 |
+
)
|
295 |
+
|
296 |
+
with gr.Row():
|
297 |
+
with gr.Column(variant="compact"):
|
298 |
+
w.ad_inpaint_only_masked = gr.Checkbox(
|
299 |
+
label="Inpaint only masked" + suffix(n),
|
300 |
+
value=True,
|
301 |
+
visible=True,
|
302 |
+
elem_id=eid("ad_inpaint_only_masked"),
|
303 |
+
)
|
304 |
+
w.ad_inpaint_only_masked_padding = gr.Slider(
|
305 |
+
label="Inpaint only masked padding, pixels" + suffix(n),
|
306 |
+
minimum=0,
|
307 |
+
maximum=256,
|
308 |
+
step=4,
|
309 |
+
value=32,
|
310 |
+
visible=True,
|
311 |
+
elem_id=eid("ad_inpaint_only_masked_padding"),
|
312 |
+
)
|
313 |
+
|
314 |
+
w.ad_inpaint_only_masked.change(
|
315 |
+
gr_interactive,
|
316 |
+
inputs=w.ad_inpaint_only_masked,
|
317 |
+
outputs=w.ad_inpaint_only_masked_padding,
|
318 |
+
queue=False,
|
319 |
+
)
|
320 |
+
|
321 |
+
with gr.Column(variant="compact"):
|
322 |
+
w.ad_use_inpaint_width_height = gr.Checkbox(
|
323 |
+
label="Use separate width/height" + suffix(n),
|
324 |
+
value=False,
|
325 |
+
visible=True,
|
326 |
+
elem_id=eid("ad_use_inpaint_width_height"),
|
327 |
+
)
|
328 |
+
|
329 |
+
w.ad_inpaint_width = gr.Slider(
|
330 |
+
label="inpaint width" + suffix(n),
|
331 |
+
minimum=64,
|
332 |
+
maximum=2048,
|
333 |
+
step=4,
|
334 |
+
value=512,
|
335 |
+
visible=True,
|
336 |
+
elem_id=eid("ad_inpaint_width"),
|
337 |
+
)
|
338 |
+
|
339 |
+
w.ad_inpaint_height = gr.Slider(
|
340 |
+
label="inpaint height" + suffix(n),
|
341 |
+
minimum=64,
|
342 |
+
maximum=2048,
|
343 |
+
step=4,
|
344 |
+
value=512,
|
345 |
+
visible=True,
|
346 |
+
elem_id=eid("ad_inpaint_height"),
|
347 |
+
)
|
348 |
+
|
349 |
+
w.ad_use_inpaint_width_height.change(
|
350 |
+
lambda value: (gr_interactive(value), gr_interactive(value)),
|
351 |
+
inputs=w.ad_use_inpaint_width_height,
|
352 |
+
outputs=[w.ad_inpaint_width, w.ad_inpaint_height],
|
353 |
+
queue=False,
|
354 |
+
)
|
355 |
+
|
356 |
+
with gr.Row():
|
357 |
+
with gr.Column(variant="compact"):
|
358 |
+
w.ad_use_steps = gr.Checkbox(
|
359 |
+
label="Use separate steps" + suffix(n),
|
360 |
+
value=False,
|
361 |
+
visible=True,
|
362 |
+
elem_id=eid("ad_use_steps"),
|
363 |
+
)
|
364 |
+
|
365 |
+
w.ad_steps = gr.Slider(
|
366 |
+
label="ADetailer steps" + suffix(n),
|
367 |
+
minimum=1,
|
368 |
+
maximum=150,
|
369 |
+
step=1,
|
370 |
+
value=28,
|
371 |
+
visible=True,
|
372 |
+
elem_id=eid("ad_steps"),
|
373 |
+
)
|
374 |
+
|
375 |
+
w.ad_use_steps.change(
|
376 |
+
gr_interactive,
|
377 |
+
inputs=w.ad_use_steps,
|
378 |
+
outputs=w.ad_steps,
|
379 |
+
queue=False,
|
380 |
+
)
|
381 |
+
|
382 |
+
with gr.Column(variant="compact"):
|
383 |
+
w.ad_use_cfg_scale = gr.Checkbox(
|
384 |
+
label="Use separate CFG scale" + suffix(n),
|
385 |
+
value=False,
|
386 |
+
visible=True,
|
387 |
+
elem_id=eid("ad_use_cfg_scale"),
|
388 |
+
)
|
389 |
+
|
390 |
+
w.ad_cfg_scale = gr.Slider(
|
391 |
+
label="ADetailer CFG scale" + suffix(n),
|
392 |
+
minimum=0.0,
|
393 |
+
maximum=30.0,
|
394 |
+
step=0.5,
|
395 |
+
value=7.0,
|
396 |
+
visible=True,
|
397 |
+
elem_id=eid("ad_cfg_scale"),
|
398 |
+
)
|
399 |
+
|
400 |
+
w.ad_use_cfg_scale.change(
|
401 |
+
gr_interactive,
|
402 |
+
inputs=w.ad_use_cfg_scale,
|
403 |
+
outputs=w.ad_cfg_scale,
|
404 |
+
queue=False,
|
405 |
+
)
|
406 |
+
|
407 |
+
with gr.Row():
|
408 |
+
with gr.Column(variant="compact"):
|
409 |
+
w.ad_use_noise_multiplier = gr.Checkbox(
|
410 |
+
label="Use separate noise multiplier" + suffix(n),
|
411 |
+
value=False,
|
412 |
+
visible=True,
|
413 |
+
elem_id=eid("ad_use_noise_multiplier"),
|
414 |
+
)
|
415 |
+
|
416 |
+
w.ad_noise_multiplier = gr.Slider(
|
417 |
+
label="Noise multiplier for img2img" + suffix(n),
|
418 |
+
minimum=0.5,
|
419 |
+
maximum=1.5,
|
420 |
+
step=0.01,
|
421 |
+
value=1.0,
|
422 |
+
visible=True,
|
423 |
+
elem_id=eid("ad_noise_multiplier"),
|
424 |
+
)
|
425 |
+
|
426 |
+
w.ad_use_noise_multiplier.change(
|
427 |
+
gr_interactive,
|
428 |
+
inputs=w.ad_use_noise_multiplier,
|
429 |
+
outputs=w.ad_noise_multiplier,
|
430 |
+
queue=False,
|
431 |
+
)
|
432 |
+
|
433 |
+
w.ad_restore_face = gr.Checkbox(
|
434 |
+
label="Restore faces after ADetailer" + suffix(n),
|
435 |
+
value=False,
|
436 |
+
elem_id=eid("ad_restore_face"),
|
437 |
+
)
|
438 |
+
|
439 |
+
|
440 |
+
def controlnet(w: Widgets, n: int, is_img2img: bool):
|
441 |
+
eid = partial(elem_id, n=n, is_img2img=is_img2img)
|
442 |
+
cn_models = ["None", *get_cn_models()]
|
443 |
+
|
444 |
+
with gr.Row(variant="panel"):
|
445 |
+
with gr.Column(variant="compact"):
|
446 |
+
w.ad_controlnet_model = gr.Dropdown(
|
447 |
+
label="ControlNet model" + suffix(n),
|
448 |
+
choices=cn_models,
|
449 |
+
value="None",
|
450 |
+
visible=True,
|
451 |
+
type="value",
|
452 |
+
interactive=controlnet_exists,
|
453 |
+
elem_id=eid("ad_controlnet_model"),
|
454 |
+
)
|
455 |
+
|
456 |
+
w.ad_controlnet_module = gr.Dropdown(
|
457 |
+
label="ControlNet module" + suffix(n),
|
458 |
+
choices=cn_module_choices,
|
459 |
+
value="inpaint_global_harmonious",
|
460 |
+
visible=False,
|
461 |
+
type="value",
|
462 |
+
interactive=controlnet_exists,
|
463 |
+
elem_id=eid("ad_controlnet_module"),
|
464 |
+
)
|
465 |
+
|
466 |
+
w.ad_controlnet_weight = gr.Slider(
|
467 |
+
label="ControlNet weight" + suffix(n),
|
468 |
+
minimum=0.0,
|
469 |
+
maximum=1.0,
|
470 |
+
step=0.01,
|
471 |
+
value=1.0,
|
472 |
+
visible=True,
|
473 |
+
interactive=controlnet_exists,
|
474 |
+
elem_id=eid("ad_controlnet_weight"),
|
475 |
+
)
|
476 |
+
|
477 |
+
w.ad_controlnet_model.change(
|
478 |
+
on_cn_model_update,
|
479 |
+
inputs=w.ad_controlnet_model,
|
480 |
+
outputs=w.ad_controlnet_module,
|
481 |
+
queue=False,
|
482 |
+
)
|
483 |
+
|
484 |
+
with gr.Column(variant="compact"):
|
485 |
+
w.ad_controlnet_guidance_start = gr.Slider(
|
486 |
+
label="ControlNet guidance start" + suffix(n),
|
487 |
+
minimum=0.0,
|
488 |
+
maximum=1.0,
|
489 |
+
step=0.01,
|
490 |
+
value=0.0,
|
491 |
+
visible=True,
|
492 |
+
interactive=controlnet_exists,
|
493 |
+
elem_id=eid("ad_controlnet_guidance_start"),
|
494 |
+
)
|
495 |
+
|
496 |
+
w.ad_controlnet_guidance_end = gr.Slider(
|
497 |
+
label="ControlNet guidance end" + suffix(n),
|
498 |
+
minimum=0.0,
|
499 |
+
maximum=1.0,
|
500 |
+
step=0.01,
|
501 |
+
value=1.0,
|
502 |
+
visible=True,
|
503 |
+
interactive=controlnet_exists,
|
504 |
+
elem_id=eid("ad_controlnet_guidance_end"),
|
505 |
+
)
|
adetailer/adetailer/ultralytics.py
ADDED
@@ -0,0 +1,54 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
from __future__ import annotations
|
2 |
+
|
3 |
+
from pathlib import Path
|
4 |
+
|
5 |
+
import cv2
|
6 |
+
from PIL import Image
|
7 |
+
|
8 |
+
from adetailer import PredictOutput
|
9 |
+
from adetailer.common import create_mask_from_bbox
|
10 |
+
|
11 |
+
|
12 |
+
def ultralytics_predict(
|
13 |
+
model_path: str | Path,
|
14 |
+
image: Image.Image,
|
15 |
+
confidence: float = 0.3,
|
16 |
+
device: str = "",
|
17 |
+
) -> PredictOutput:
|
18 |
+
from ultralytics import YOLO
|
19 |
+
|
20 |
+
model_path = str(model_path)
|
21 |
+
|
22 |
+
model = YOLO(model_path)
|
23 |
+
pred = model(image, conf=confidence, device=device)
|
24 |
+
|
25 |
+
bboxes = pred[0].boxes.xyxy.cpu().numpy()
|
26 |
+
if bboxes.size == 0:
|
27 |
+
return PredictOutput()
|
28 |
+
bboxes = bboxes.tolist()
|
29 |
+
|
30 |
+
if pred[0].masks is None:
|
31 |
+
masks = create_mask_from_bbox(bboxes, image.size)
|
32 |
+
else:
|
33 |
+
masks = mask_to_pil(pred[0].masks.data, image.size)
|
34 |
+
preview = pred[0].plot()
|
35 |
+
preview = cv2.cvtColor(preview, cv2.COLOR_BGR2RGB)
|
36 |
+
preview = Image.fromarray(preview)
|
37 |
+
|
38 |
+
return PredictOutput(bboxes=bboxes, masks=masks, preview=preview)
|
39 |
+
|
40 |
+
|
41 |
+
def mask_to_pil(masks, shape: tuple[int, int]) -> list[Image.Image]:
|
42 |
+
"""
|
43 |
+
Parameters
|
44 |
+
----------
|
45 |
+
masks: torch.Tensor, dtype=torch.float32, shape=(N, H, W).
|
46 |
+
The device can be CUDA, but `to_pil_image` takes care of that.
|
47 |
+
|
48 |
+
shape: tuple[int, int]
|
49 |
+
(width, height) of the original image
|
50 |
+
"""
|
51 |
+
from torchvision.transforms.functional import to_pil_image
|
52 |
+
|
53 |
+
n = masks.shape[0]
|
54 |
+
return [to_pil_image(masks[i], mode="L").resize(shape) for i in range(n)]
|
adetailer/controlnet_ext/__init__.py
ADDED
@@ -0,0 +1,7 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
from .controlnet_ext import ControlNetExt, controlnet_exists, get_cn_models
|
2 |
+
|
3 |
+
__all__ = [
|
4 |
+
"ControlNetExt",
|
5 |
+
"controlnet_exists",
|
6 |
+
"get_cn_models",
|
7 |
+
]
|
adetailer/controlnet_ext/controlnet_ext.py
ADDED
@@ -0,0 +1,140 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
from __future__ import annotations
|
2 |
+
|
3 |
+
import importlib
|
4 |
+
import re
|
5 |
+
from functools import lru_cache
|
6 |
+
from pathlib import Path
|
7 |
+
|
8 |
+
from modules import extensions, sd_models, shared
|
9 |
+
from modules.paths import data_path, models_path, script_path
|
10 |
+
|
11 |
+
ext_path = Path(data_path, "extensions")
|
12 |
+
ext_builtin_path = Path(script_path, "extensions-builtin")
|
13 |
+
controlnet_exists = False
|
14 |
+
controlnet_path = None
|
15 |
+
cn_base_path = ""
|
16 |
+
|
17 |
+
for extension in extensions.active():
|
18 |
+
if not extension.enabled:
|
19 |
+
continue
|
20 |
+
# For cases like sd-webui-controlnet-master
|
21 |
+
if "sd-webui-controlnet" in extension.name:
|
22 |
+
controlnet_exists = True
|
23 |
+
controlnet_path = Path(extension.path)
|
24 |
+
cn_base_path = ".".join(controlnet_path.parts[-2:])
|
25 |
+
break
|
26 |
+
|
27 |
+
cn_model_module = {
|
28 |
+
"inpaint": "inpaint_global_harmonious",
|
29 |
+
"scribble": "t2ia_sketch_pidi",
|
30 |
+
"lineart": "lineart_coarse",
|
31 |
+
"openpose": "openpose_full",
|
32 |
+
"tile": None,
|
33 |
+
}
|
34 |
+
cn_model_regex = re.compile("|".join(cn_model_module.keys()))
|
35 |
+
|
36 |
+
|
37 |
+
class ControlNetExt:
|
38 |
+
def __init__(self):
|
39 |
+
self.cn_models = ["None"]
|
40 |
+
self.cn_available = False
|
41 |
+
self.external_cn = None
|
42 |
+
|
43 |
+
def init_controlnet(self):
|
44 |
+
import_path = cn_base_path + ".scripts.external_code"
|
45 |
+
|
46 |
+
self.external_cn = importlib.import_module(import_path, "external_code")
|
47 |
+
self.cn_available = True
|
48 |
+
models = self.external_cn.get_models()
|
49 |
+
self.cn_models.extend(m for m in models if cn_model_regex.search(m))
|
50 |
+
|
51 |
+
def update_scripts_args(
|
52 |
+
self,
|
53 |
+
p,
|
54 |
+
model: str,
|
55 |
+
module: str | None,
|
56 |
+
weight: float,
|
57 |
+
guidance_start: float,
|
58 |
+
guidance_end: float,
|
59 |
+
):
|
60 |
+
if (not self.cn_available) or model == "None":
|
61 |
+
return
|
62 |
+
|
63 |
+
if module is None:
|
64 |
+
for m, v in cn_model_module.items():
|
65 |
+
if m in model:
|
66 |
+
module = v
|
67 |
+
break
|
68 |
+
|
69 |
+
cn_units = [
|
70 |
+
self.external_cn.ControlNetUnit(
|
71 |
+
model=model,
|
72 |
+
weight=weight,
|
73 |
+
control_mode=self.external_cn.ControlMode.BALANCED,
|
74 |
+
module=module,
|
75 |
+
guidance_start=guidance_start,
|
76 |
+
guidance_end=guidance_end,
|
77 |
+
pixel_perfect=True,
|
78 |
+
)
|
79 |
+
]
|
80 |
+
|
81 |
+
self.external_cn.update_cn_script_in_processing(p, cn_units)
|
82 |
+
|
83 |
+
|
84 |
+
def get_cn_model_dirs() -> list[Path]:
|
85 |
+
cn_model_dir = Path(models_path, "ControlNet")
|
86 |
+
if controlnet_path is not None:
|
87 |
+
cn_model_dir_old = controlnet_path.joinpath("models")
|
88 |
+
else:
|
89 |
+
cn_model_dir_old = None
|
90 |
+
ext_dir1 = shared.opts.data.get("control_net_models_path", "")
|
91 |
+
ext_dir2 = shared.opts.data.get("controlnet_dir", "")
|
92 |
+
|
93 |
+
dirs = [cn_model_dir]
|
94 |
+
for ext_dir in [cn_model_dir_old, ext_dir1, ext_dir2]:
|
95 |
+
if ext_dir:
|
96 |
+
dirs.append(Path(ext_dir))
|
97 |
+
|
98 |
+
return dirs
|
99 |
+
|
100 |
+
|
101 |
+
@lru_cache
|
102 |
+
def _get_cn_models() -> list[str]:
|
103 |
+
"""
|
104 |
+
Since we can't import ControlNet, we use a function that does something like
|
105 |
+
controlnet's `list(global_state.cn_models_names.values())`.
|
106 |
+
"""
|
107 |
+
cn_model_exts = (".pt", ".pth", ".ckpt", ".safetensors")
|
108 |
+
dirs = get_cn_model_dirs()
|
109 |
+
name_filter = shared.opts.data.get("control_net_models_name_filter", "")
|
110 |
+
name_filter = name_filter.strip(" ").lower()
|
111 |
+
|
112 |
+
model_paths = []
|
113 |
+
|
114 |
+
for base in dirs:
|
115 |
+
if not base.exists():
|
116 |
+
continue
|
117 |
+
|
118 |
+
for p in base.rglob("*"):
|
119 |
+
if (
|
120 |
+
p.is_file()
|
121 |
+
and p.suffix in cn_model_exts
|
122 |
+
and cn_model_regex.search(p.name)
|
123 |
+
):
|
124 |
+
if name_filter and name_filter not in p.name.lower():
|
125 |
+
continue
|
126 |
+
model_paths.append(p)
|
127 |
+
model_paths.sort(key=lambda p: p.name)
|
128 |
+
|
129 |
+
models = []
|
130 |
+
for p in model_paths:
|
131 |
+
model_hash = sd_models.model_hash(p)
|
132 |
+
name = f"{p.stem} [{model_hash}]"
|
133 |
+
models.append(name)
|
134 |
+
return models
|
135 |
+
|
136 |
+
|
137 |
+
def get_cn_models() -> list[str]:
|
138 |
+
if controlnet_exists:
|
139 |
+
return _get_cn_models()
|
140 |
+
return []
|
adetailer/controlnet_ext/restore.py
ADDED
@@ -0,0 +1,49 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
from __future__ import annotations
|
2 |
+
|
3 |
+
from contextlib import contextmanager
|
4 |
+
|
5 |
+
from modules import img2img, processing, shared
|
6 |
+
|
7 |
+
|
8 |
+
def cn_restore_unet_hook(p, cn_latest_network):
|
9 |
+
if cn_latest_network is not None:
|
10 |
+
unet = p.sd_model.model.diffusion_model
|
11 |
+
cn_latest_network.restore(unet)
|
12 |
+
|
13 |
+
|
14 |
+
class CNHijackRestore:
|
15 |
+
def __init__(self):
|
16 |
+
self.process = hasattr(processing, "__controlnet_original_process_images_inner")
|
17 |
+
self.img2img = hasattr(img2img, "__controlnet_original_process_batch")
|
18 |
+
|
19 |
+
def __enter__(self):
|
20 |
+
if self.process:
|
21 |
+
self.orig_process = processing.process_images_inner
|
22 |
+
processing.process_images_inner = getattr(
|
23 |
+
processing, "__controlnet_original_process_images_inner"
|
24 |
+
)
|
25 |
+
if self.img2img:
|
26 |
+
self.orig_img2img = img2img.process_batch
|
27 |
+
img2img.process_batch = getattr(
|
28 |
+
img2img, "__controlnet_original_process_batch"
|
29 |
+
)
|
30 |
+
|
31 |
+
def __exit__(self, *args, **kwargs):
|
32 |
+
if self.process:
|
33 |
+
processing.process_images_inner = self.orig_process
|
34 |
+
if self.img2img:
|
35 |
+
img2img.process_batch = self.orig_img2img
|
36 |
+
|
37 |
+
|
38 |
+
@contextmanager
|
39 |
+
def cn_allow_script_control():
|
40 |
+
orig = False
|
41 |
+
if "control_net_allow_script_control" in shared.opts.data:
|
42 |
+
try:
|
43 |
+
orig = shared.opts.data["control_net_allow_script_control"]
|
44 |
+
shared.opts.data["control_net_allow_script_control"] = True
|
45 |
+
yield
|
46 |
+
finally:
|
47 |
+
shared.opts.data["control_net_allow_script_control"] = orig
|
48 |
+
else:
|
49 |
+
yield
|
adetailer/install.py
ADDED
@@ -0,0 +1,81 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
from __future__ import annotations
|
2 |
+
|
3 |
+
import importlib.util
|
4 |
+
import subprocess
|
5 |
+
import sys
|
6 |
+
from importlib.metadata import version # python >= 3.8
|
7 |
+
|
8 |
+
from packaging.version import parse
|
9 |
+
|
10 |
+
|
11 |
+
def is_installed(
|
12 |
+
package: str, min_version: str | None = None, max_version: str | None = None
|
13 |
+
):
|
14 |
+
try:
|
15 |
+
spec = importlib.util.find_spec(package)
|
16 |
+
except ModuleNotFoundError:
|
17 |
+
return False
|
18 |
+
|
19 |
+
if spec is None:
|
20 |
+
return False
|
21 |
+
|
22 |
+
if not min_version and not max_version:
|
23 |
+
return True
|
24 |
+
|
25 |
+
if not min_version:
|
26 |
+
min_version = "0.0.0"
|
27 |
+
if not max_version:
|
28 |
+
max_version = "99999999.99999999.99999999"
|
29 |
+
|
30 |
+
if package == "google.protobuf":
|
31 |
+
package = "protobuf"
|
32 |
+
|
33 |
+
try:
|
34 |
+
pkg_version = version(package)
|
35 |
+
return parse(min_version) <= parse(pkg_version) <= parse(max_version)
|
36 |
+
except Exception:
|
37 |
+
return False
|
38 |
+
|
39 |
+
|
40 |
+
def run_pip(*args):
|
41 |
+
subprocess.run([sys.executable, "-m", "pip", "install", *args])
|
42 |
+
|
43 |
+
|
44 |
+
def install():
|
45 |
+
deps = [
|
46 |
+
# requirements
|
47 |
+
("ultralytics", "8.0.97", None),
|
48 |
+
("mediapipe", "0.10.0", None),
|
49 |
+
("huggingface_hub", None, None),
|
50 |
+
("pydantic", "1.10.8", None),
|
51 |
+
("rich", "13.4.2", None),
|
52 |
+
# mediapipe
|
53 |
+
("protobuf", "3.20.0", "3.20.9999"),
|
54 |
+
]
|
55 |
+
|
56 |
+
for pkg, low, high in deps:
|
57 |
+
# https://github.com/protocolbuffers/protobuf/tree/main/python
|
58 |
+
name = "google.protobuf" if pkg == "protobuf" else pkg
|
59 |
+
|
60 |
+
if not is_installed(name, low, high):
|
61 |
+
if low and high:
|
62 |
+
cmd = f"{pkg}>={low},<={high}"
|
63 |
+
elif low:
|
64 |
+
cmd = f"{pkg}>={low}"
|
65 |
+
elif high:
|
66 |
+
cmd = f"{pkg}<={high}"
|
67 |
+
else:
|
68 |
+
cmd = pkg
|
69 |
+
|
70 |
+
run_pip("-U", cmd)
|
71 |
+
|
72 |
+
|
73 |
+
try:
|
74 |
+
import launch
|
75 |
+
|
76 |
+
skip_install = launch.args.skip_install
|
77 |
+
except Exception:
|
78 |
+
skip_install = False
|
79 |
+
|
80 |
+
if not skip_install:
|
81 |
+
install()
|
adetailer/preload.py
ADDED
@@ -0,0 +1,9 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
import argparse
|
2 |
+
|
3 |
+
|
4 |
+
def preload(parser: argparse.ArgumentParser):
|
5 |
+
parser.add_argument(
|
6 |
+
"--ad-no-huggingface",
|
7 |
+
action="store_true",
|
8 |
+
help="Don't use adetailer models from huggingface",
|
9 |
+
)
|
adetailer/pyproject.toml
ADDED
@@ -0,0 +1,26 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
[project]
|
2 |
+
name = "adetailer"
|
3 |
+
description = "An object detection and auto-mask extension for stable diffusion webui."
|
4 |
+
authors = [
|
5 |
+
{name = "dowon", email = "[email protected]"},
|
6 |
+
]
|
7 |
+
requires-python = ">=3.8,<3.12"
|
8 |
+
readme = "README.md"
|
9 |
+
license = {text = "AGPL-3.0"}
|
10 |
+
|
11 |
+
[project.urls]
|
12 |
+
repository = "https://github.com/Bing-su/adetailer"
|
13 |
+
|
14 |
+
[tool.isort]
|
15 |
+
profile = "black"
|
16 |
+
known_first_party = ["launch", "modules"]
|
17 |
+
|
18 |
+
[tool.ruff]
|
19 |
+
select = ["A", "B", "C4", "C90", "E", "EM", "F", "FA", "I001", "ISC", "N", "PIE", "PT", "RET", "RUF", "SIM", "UP", "W"]
|
20 |
+
ignore = ["B008", "B905", "E501", "F401", "UP007"]
|
21 |
+
|
22 |
+
[tool.ruff.isort]
|
23 |
+
known-first-party = ["launch", "modules"]
|
24 |
+
|
25 |
+
[tool.ruff.per-file-ignores]
|
26 |
+
"sd_webui/*.py" = ["B027", "F403"]
|
adetailer/scripts/!adetailer.py
ADDED
@@ -0,0 +1,784 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
from __future__ import annotations
|
2 |
+
|
3 |
+
import os
|
4 |
+
import platform
|
5 |
+
import re
|
6 |
+
import sys
|
7 |
+
import traceback
|
8 |
+
from contextlib import contextmanager
|
9 |
+
from copy import copy, deepcopy
|
10 |
+
from functools import partial
|
11 |
+
from pathlib import Path
|
12 |
+
from textwrap import dedent
|
13 |
+
from typing import Any
|
14 |
+
|
15 |
+
import gradio as gr
|
16 |
+
import torch
|
17 |
+
from rich import print
|
18 |
+
|
19 |
+
import modules
|
20 |
+
from adetailer import (
|
21 |
+
AFTER_DETAILER,
|
22 |
+
__version__,
|
23 |
+
get_models,
|
24 |
+
mediapipe_predict,
|
25 |
+
ultralytics_predict,
|
26 |
+
)
|
27 |
+
from adetailer.args import ALL_ARGS, BBOX_SORTBY, ADetailerArgs, EnableChecker
|
28 |
+
from adetailer.common import PredictOutput
|
29 |
+
from adetailer.mask import filter_by_ratio, mask_preprocess, sort_bboxes
|
30 |
+
from adetailer.traceback import rich_traceback
|
31 |
+
from adetailer.ui import adui, ordinal, suffix
|
32 |
+
from controlnet_ext import ControlNetExt, controlnet_exists, get_cn_models
|
33 |
+
from controlnet_ext.restore import (
|
34 |
+
CNHijackRestore,
|
35 |
+
cn_allow_script_control,
|
36 |
+
cn_restore_unet_hook,
|
37 |
+
)
|
38 |
+
from sd_webui import images, safe, script_callbacks, scripts, shared
|
39 |
+
from sd_webui.devices import NansException
|
40 |
+
from sd_webui.paths import data_path, models_path
|
41 |
+
from sd_webui.processing import (
|
42 |
+
Processed,
|
43 |
+
StableDiffusionProcessingImg2Img,
|
44 |
+
create_infotext,
|
45 |
+
process_images,
|
46 |
+
)
|
47 |
+
from sd_webui.shared import cmd_opts, opts, state
|
48 |
+
|
49 |
+
no_huggingface = getattr(cmd_opts, "ad_no_huggingface", False)
|
50 |
+
adetailer_dir = Path(models_path, "adetailer")
|
51 |
+
model_mapping = get_models(adetailer_dir, huggingface=not no_huggingface)
|
52 |
+
txt2img_submit_button = img2img_submit_button = None
|
53 |
+
SCRIPT_DEFAULT = "dynamic_prompting,dynamic_thresholding,wildcard_recursive,wildcards,lora_block_weight"
|
54 |
+
|
55 |
+
if (
|
56 |
+
not adetailer_dir.exists()
|
57 |
+
and adetailer_dir.parent.exists()
|
58 |
+
and os.access(adetailer_dir.parent, os.W_OK)
|
59 |
+
):
|
60 |
+
adetailer_dir.mkdir()
|
61 |
+
|
62 |
+
print(
|
63 |
+
f"[-] ADetailer initialized. version: {__version__}, num models: {len(model_mapping)}"
|
64 |
+
)
|
65 |
+
|
66 |
+
|
67 |
+
@contextmanager
|
68 |
+
def change_torch_load():
|
69 |
+
orig = torch.load
|
70 |
+
try:
|
71 |
+
torch.load = safe.unsafe_torch_load
|
72 |
+
yield
|
73 |
+
finally:
|
74 |
+
torch.load = orig
|
75 |
+
|
76 |
+
|
77 |
+
@contextmanager
|
78 |
+
def pause_total_tqdm():
|
79 |
+
orig = opts.data.get("multiple_tqdm", True)
|
80 |
+
try:
|
81 |
+
opts.data["multiple_tqdm"] = False
|
82 |
+
yield
|
83 |
+
finally:
|
84 |
+
opts.data["multiple_tqdm"] = orig
|
85 |
+
|
86 |
+
|
87 |
+
@contextmanager
|
88 |
+
def preseve_prompts(p):
|
89 |
+
all_pt = copy(p.all_prompts)
|
90 |
+
all_ng = copy(p.all_negative_prompts)
|
91 |
+
try:
|
92 |
+
yield
|
93 |
+
finally:
|
94 |
+
p.all_prompts = all_pt
|
95 |
+
p.all_negative_prompts = all_ng
|
96 |
+
|
97 |
+
|
98 |
+
class AfterDetailerScript(scripts.Script):
|
99 |
+
def __init__(self):
|
100 |
+
super().__init__()
|
101 |
+
self.ultralytics_device = self.get_ultralytics_device()
|
102 |
+
|
103 |
+
self.controlnet_ext = None
|
104 |
+
self.cn_script = None
|
105 |
+
self.cn_latest_network = None
|
106 |
+
|
107 |
+
def __repr__(self):
|
108 |
+
return f"{self.__class__.__name__}(version={__version__})"
|
109 |
+
|
110 |
+
def title(self):
|
111 |
+
return AFTER_DETAILER
|
112 |
+
|
113 |
+
def show(self, is_img2img):
|
114 |
+
return scripts.AlwaysVisible
|
115 |
+
|
116 |
+
def ui(self, is_img2img):
|
117 |
+
num_models = opts.data.get("ad_max_models", 2)
|
118 |
+
model_list = list(model_mapping.keys())
|
119 |
+
|
120 |
+
components, infotext_fields = adui(
|
121 |
+
num_models,
|
122 |
+
is_img2img,
|
123 |
+
model_list,
|
124 |
+
txt2img_submit_button,
|
125 |
+
img2img_submit_button,
|
126 |
+
)
|
127 |
+
|
128 |
+
self.infotext_fields = infotext_fields
|
129 |
+
return components
|
130 |
+
|
131 |
+
def init_controlnet_ext(self) -> None:
|
132 |
+
if self.controlnet_ext is not None:
|
133 |
+
return
|
134 |
+
self.controlnet_ext = ControlNetExt()
|
135 |
+
|
136 |
+
if controlnet_exists:
|
137 |
+
try:
|
138 |
+
self.controlnet_ext.init_controlnet()
|
139 |
+
except ImportError:
|
140 |
+
error = traceback.format_exc()
|
141 |
+
print(
|
142 |
+
f"[-] ADetailer: ControlNetExt init failed:\n{error}",
|
143 |
+
file=sys.stderr,
|
144 |
+
)
|
145 |
+
|
146 |
+
def update_controlnet_args(self, p, args: ADetailerArgs) -> None:
|
147 |
+
if self.controlnet_ext is None:
|
148 |
+
self.init_controlnet_ext()
|
149 |
+
|
150 |
+
if (
|
151 |
+
self.controlnet_ext is not None
|
152 |
+
and self.controlnet_ext.cn_available
|
153 |
+
and args.ad_controlnet_model != "None"
|
154 |
+
):
|
155 |
+
self.controlnet_ext.update_scripts_args(
|
156 |
+
p,
|
157 |
+
model=args.ad_controlnet_model,
|
158 |
+
module=args.ad_controlnet_module,
|
159 |
+
weight=args.ad_controlnet_weight,
|
160 |
+
guidance_start=args.ad_controlnet_guidance_start,
|
161 |
+
guidance_end=args.ad_controlnet_guidance_end,
|
162 |
+
)
|
163 |
+
|
164 |
+
def is_ad_enabled(self, *args_) -> bool:
|
165 |
+
arg_list = [arg for arg in args_ if isinstance(arg, dict)]
|
166 |
+
if not args_ or not arg_list or not isinstance(args_[0], (bool, dict)):
|
167 |
+
message = f"""
|
168 |
+
[-] ADetailer: Invalid arguments passed to ADetailer.
|
169 |
+
input: {args_!r}
|
170 |
+
"""
|
171 |
+
raise ValueError(dedent(message))
|
172 |
+
enable = args_[0] if isinstance(args_[0], bool) else True
|
173 |
+
checker = EnableChecker(enable=enable, arg_list=arg_list)
|
174 |
+
return checker.is_enabled()
|
175 |
+
|
176 |
+
def get_args(self, p, *args_) -> list[ADetailerArgs]:
|
177 |
+
"""
|
178 |
+
`args_` is at least 1 in length by `is_ad_enabled` immediately above
|
179 |
+
"""
|
180 |
+
args = [arg for arg in args_ if isinstance(arg, dict)]
|
181 |
+
|
182 |
+
if not args:
|
183 |
+
message = f"[-] ADetailer: Invalid arguments passed to ADetailer: {args_!r}"
|
184 |
+
raise ValueError(message)
|
185 |
+
|
186 |
+
if hasattr(p, "adetailer_xyz"):
|
187 |
+
args[0].update(p.adetailer_xyz)
|
188 |
+
|
189 |
+
all_inputs = []
|
190 |
+
|
191 |
+
for n, arg_dict in enumerate(args, 1):
|
192 |
+
try:
|
193 |
+
inp = ADetailerArgs(**arg_dict)
|
194 |
+
except ValueError as e:
|
195 |
+
msgs = [
|
196 |
+
f"[-] ADetailer: ValidationError when validating {ordinal(n)} arguments: {e}\n"
|
197 |
+
]
|
198 |
+
for attr in ALL_ARGS.attrs:
|
199 |
+
arg = arg_dict.get(attr)
|
200 |
+
dtype = type(arg)
|
201 |
+
arg = "DEFAULT" if arg is None else repr(arg)
|
202 |
+
msgs.append(f" {attr}: {arg} ({dtype})")
|
203 |
+
raise ValueError("\n".join(msgs)) from e
|
204 |
+
|
205 |
+
all_inputs.append(inp)
|
206 |
+
|
207 |
+
return all_inputs
|
208 |
+
|
209 |
+
def extra_params(self, arg_list: list[ADetailerArgs]) -> dict:
|
210 |
+
params = {}
|
211 |
+
for n, args in enumerate(arg_list):
|
212 |
+
params.update(args.extra_params(suffix=suffix(n)))
|
213 |
+
params["ADetailer version"] = __version__
|
214 |
+
return params
|
215 |
+
|
216 |
+
@staticmethod
|
217 |
+
def get_ultralytics_device() -> str:
|
218 |
+
if "adetailer" in shared.cmd_opts.use_cpu:
|
219 |
+
return "cpu"
|
220 |
+
|
221 |
+
if platform.system() == "Darwin":
|
222 |
+
return ""
|
223 |
+
|
224 |
+
if any(getattr(cmd_opts, vram, False) for vram in ["lowvram", "medvram"]):
|
225 |
+
return "cpu"
|
226 |
+
|
227 |
+
return ""
|
228 |
+
|
229 |
+
def prompt_blank_replacement(
|
230 |
+
self, all_prompts: list[str], i: int, default: str
|
231 |
+
) -> str:
|
232 |
+
if not all_prompts:
|
233 |
+
return default
|
234 |
+
if i < len(all_prompts):
|
235 |
+
return all_prompts[i]
|
236 |
+
j = i % len(all_prompts)
|
237 |
+
return all_prompts[j]
|
238 |
+
|
239 |
+
def _get_prompt(
|
240 |
+
self, ad_prompt: str, all_prompts: list[str], i: int, default: str
|
241 |
+
) -> list[str]:
|
242 |
+
prompts = re.split(r"\s*\[SEP\]\s*", ad_prompt)
|
243 |
+
blank_replacement = self.prompt_blank_replacement(all_prompts, i, default)
|
244 |
+
for n in range(len(prompts)):
|
245 |
+
if not prompts[n]:
|
246 |
+
prompts[n] = blank_replacement
|
247 |
+
return prompts
|
248 |
+
|
249 |
+
def get_prompt(self, p, args: ADetailerArgs) -> tuple[list[str], list[str]]:
|
250 |
+
i = p._ad_idx
|
251 |
+
|
252 |
+
prompt = self._get_prompt(args.ad_prompt, p.all_prompts, i, p.prompt)
|
253 |
+
negative_prompt = self._get_prompt(
|
254 |
+
args.ad_negative_prompt, p.all_negative_prompts, i, p.negative_prompt
|
255 |
+
)
|
256 |
+
|
257 |
+
return prompt, negative_prompt
|
258 |
+
|
259 |
+
def get_seed(self, p) -> tuple[int, int]:
|
260 |
+
i = p._ad_idx
|
261 |
+
|
262 |
+
if not p.all_seeds:
|
263 |
+
seed = p.seed
|
264 |
+
elif i < len(p.all_seeds):
|
265 |
+
seed = p.all_seeds[i]
|
266 |
+
else:
|
267 |
+
j = i % len(p.all_seeds)
|
268 |
+
seed = p.all_seeds[j]
|
269 |
+
|
270 |
+
if not p.all_subseeds:
|
271 |
+
subseed = p.subseed
|
272 |
+
elif i < len(p.all_subseeds):
|
273 |
+
subseed = p.all_subseeds[i]
|
274 |
+
else:
|
275 |
+
j = i % len(p.all_subseeds)
|
276 |
+
subseed = p.all_subseeds[j]
|
277 |
+
|
278 |
+
return seed, subseed
|
279 |
+
|
280 |
+
def get_width_height(self, p, args: ADetailerArgs) -> tuple[int, int]:
|
281 |
+
if args.ad_use_inpaint_width_height:
|
282 |
+
width = args.ad_inpaint_width
|
283 |
+
height = args.ad_inpaint_height
|
284 |
+
else:
|
285 |
+
width = p.width
|
286 |
+
height = p.height
|
287 |
+
|
288 |
+
return width, height
|
289 |
+
|
290 |
+
def get_steps(self, p, args: ADetailerArgs) -> int:
|
291 |
+
if args.ad_use_steps:
|
292 |
+
return args.ad_steps
|
293 |
+
return p.steps
|
294 |
+
|
295 |
+
def get_cfg_scale(self, p, args: ADetailerArgs) -> float:
|
296 |
+
if args.ad_use_cfg_scale:
|
297 |
+
return args.ad_cfg_scale
|
298 |
+
return p.cfg_scale
|
299 |
+
|
300 |
+
def get_initial_noise_multiplier(self, p, args: ADetailerArgs) -> float | None:
|
301 |
+
if args.ad_use_noise_multiplier:
|
302 |
+
return args.ad_noise_multiplier
|
303 |
+
return None
|
304 |
+
|
305 |
+
def infotext(self, p) -> str:
|
306 |
+
return create_infotext(
|
307 |
+
p, p.all_prompts, p.all_seeds, p.all_subseeds, None, 0, 0
|
308 |
+
)
|
309 |
+
|
310 |
+
def write_params_txt(self, p) -> None:
|
311 |
+
infotext = self.infotext(p)
|
312 |
+
params_txt = Path(data_path, "params.txt")
|
313 |
+
params_txt.write_text(infotext, encoding="utf-8")
|
314 |
+
|
315 |
+
def script_filter(self, p, args: ADetailerArgs):
|
316 |
+
script_runner = copy(p.scripts)
|
317 |
+
script_args = deepcopy(p.script_args)
|
318 |
+
self.disable_controlnet_units(script_args)
|
319 |
+
|
320 |
+
ad_only_seleted_scripts = opts.data.get("ad_only_seleted_scripts", True)
|
321 |
+
if not ad_only_seleted_scripts:
|
322 |
+
return script_runner, script_args
|
323 |
+
|
324 |
+
ad_script_names = opts.data.get("ad_script_names", SCRIPT_DEFAULT)
|
325 |
+
script_names_set = {
|
326 |
+
name
|
327 |
+
for script_name in ad_script_names.split(",")
|
328 |
+
for name in (script_name, script_name.strip())
|
329 |
+
}
|
330 |
+
|
331 |
+
if args.ad_controlnet_model != "None":
|
332 |
+
script_names_set.add("controlnet")
|
333 |
+
|
334 |
+
filtered_alwayson = []
|
335 |
+
for script_object in script_runner.alwayson_scripts:
|
336 |
+
filepath = script_object.filename
|
337 |
+
filename = Path(filepath).stem
|
338 |
+
if filename in script_names_set:
|
339 |
+
filtered_alwayson.append(script_object)
|
340 |
+
if filename == "controlnet":
|
341 |
+
self.cn_script = script_object
|
342 |
+
self.cn_latest_network = script_object.latest_network
|
343 |
+
|
344 |
+
script_runner.alwayson_scripts = filtered_alwayson
|
345 |
+
return script_runner, script_args
|
346 |
+
|
347 |
+
def disable_controlnet_units(self, script_args: list[Any]) -> None:
|
348 |
+
for obj in script_args:
|
349 |
+
if "controlnet" in obj.__class__.__name__.lower():
|
350 |
+
if hasattr(obj, "enabled"):
|
351 |
+
obj.enabled = False
|
352 |
+
if hasattr(obj, "input_mode"):
|
353 |
+
obj.input_mode = getattr(obj.input_mode, "SIMPLE", "simple")
|
354 |
+
|
355 |
+
elif isinstance(obj, dict) and "module" in obj:
|
356 |
+
obj["enabled"] = False
|
357 |
+
|
358 |
+
def get_i2i_p(self, p, args: ADetailerArgs, image):
|
359 |
+
seed, subseed = self.get_seed(p)
|
360 |
+
width, height = self.get_width_height(p, args)
|
361 |
+
steps = self.get_steps(p, args)
|
362 |
+
cfg_scale = self.get_cfg_scale(p, args)
|
363 |
+
initial_noise_multiplier = self.get_initial_noise_multiplier(p, args)
|
364 |
+
|
365 |
+
sampler_name = p.sampler_name
|
366 |
+
if sampler_name in ["PLMS", "UniPC"]:
|
367 |
+
sampler_name = "Euler"
|
368 |
+
|
369 |
+
i2i = StableDiffusionProcessingImg2Img(
|
370 |
+
init_images=[image],
|
371 |
+
resize_mode=0,
|
372 |
+
denoising_strength=args.ad_denoising_strength,
|
373 |
+
mask=None,
|
374 |
+
mask_blur=args.ad_mask_blur,
|
375 |
+
inpainting_fill=1,
|
376 |
+
inpaint_full_res=args.ad_inpaint_only_masked,
|
377 |
+
inpaint_full_res_padding=args.ad_inpaint_only_masked_padding,
|
378 |
+
inpainting_mask_invert=0,
|
379 |
+
initial_noise_multiplier=initial_noise_multiplier,
|
380 |
+
sd_model=p.sd_model,
|
381 |
+
outpath_samples=p.outpath_samples,
|
382 |
+
outpath_grids=p.outpath_grids,
|
383 |
+
prompt="", # replace later
|
384 |
+
negative_prompt="",
|
385 |
+
styles=p.styles,
|
386 |
+
seed=seed,
|
387 |
+
subseed=subseed,
|
388 |
+
subseed_strength=p.subseed_strength,
|
389 |
+
seed_resize_from_h=p.seed_resize_from_h,
|
390 |
+
seed_resize_from_w=p.seed_resize_from_w,
|
391 |
+
sampler_name=sampler_name,
|
392 |
+
batch_size=1,
|
393 |
+
n_iter=1,
|
394 |
+
steps=steps,
|
395 |
+
cfg_scale=cfg_scale,
|
396 |
+
width=width,
|
397 |
+
height=height,
|
398 |
+
restore_faces=args.ad_restore_face,
|
399 |
+
tiling=p.tiling,
|
400 |
+
extra_generation_params=p.extra_generation_params,
|
401 |
+
do_not_save_samples=True,
|
402 |
+
do_not_save_grid=True,
|
403 |
+
)
|
404 |
+
|
405 |
+
i2i.cached_c = [None, None]
|
406 |
+
i2i.cached_uc = [None, None]
|
407 |
+
i2i.scripts, i2i.script_args = self.script_filter(p, args)
|
408 |
+
i2i._disable_adetailer = True
|
409 |
+
|
410 |
+
if args.ad_controlnet_model != "None":
|
411 |
+
self.update_controlnet_args(i2i, args)
|
412 |
+
else:
|
413 |
+
i2i.control_net_enabled = False
|
414 |
+
|
415 |
+
return i2i
|
416 |
+
|
417 |
+
def save_image(self, p, image, *, condition: str, suffix: str) -> None:
|
418 |
+
i = p._ad_idx
|
419 |
+
if p.all_prompts:
|
420 |
+
i %= len(p.all_prompts)
|
421 |
+
save_prompt = p.all_prompts[i]
|
422 |
+
else:
|
423 |
+
save_prompt = p.prompt
|
424 |
+
seed, _ = self.get_seed(p)
|
425 |
+
|
426 |
+
if opts.data.get(condition, False):
|
427 |
+
images.save_image(
|
428 |
+
image=image,
|
429 |
+
path=p.outpath_samples,
|
430 |
+
basename="",
|
431 |
+
seed=seed,
|
432 |
+
prompt=save_prompt,
|
433 |
+
extension=opts.samples_format,
|
434 |
+
info=self.infotext(p),
|
435 |
+
p=p,
|
436 |
+
suffix=suffix,
|
437 |
+
)
|
438 |
+
|
439 |
+
def get_ad_model(self, name: str):
|
440 |
+
if name not in model_mapping:
|
441 |
+
msg = f"[-] ADetailer: Model {name!r} not found. Available models: {list(model_mapping.keys())}"
|
442 |
+
raise ValueError(msg)
|
443 |
+
return model_mapping[name]
|
444 |
+
|
445 |
+
def sort_bboxes(self, pred: PredictOutput) -> PredictOutput:
|
446 |
+
sortby = opts.data.get("ad_bbox_sortby", BBOX_SORTBY[0])
|
447 |
+
sortby_idx = BBOX_SORTBY.index(sortby)
|
448 |
+
return sort_bboxes(pred, sortby_idx)
|
449 |
+
|
450 |
+
def pred_preprocessing(self, pred: PredictOutput, args: ADetailerArgs):
|
451 |
+
pred = filter_by_ratio(
|
452 |
+
pred, low=args.ad_mask_min_ratio, high=args.ad_mask_max_ratio
|
453 |
+
)
|
454 |
+
pred = self.sort_bboxes(pred)
|
455 |
+
return mask_preprocess(
|
456 |
+
pred.masks,
|
457 |
+
kernel=args.ad_dilate_erode,
|
458 |
+
x_offset=args.ad_x_offset,
|
459 |
+
y_offset=args.ad_y_offset,
|
460 |
+
merge_invert=args.ad_mask_merge_invert,
|
461 |
+
)
|
462 |
+
|
463 |
+
def i2i_prompts_replace(
|
464 |
+
self, i2i, prompts: list[str], negative_prompts: list[str], j: int
|
465 |
+
) -> None:
|
466 |
+
i1 = min(j, len(prompts) - 1)
|
467 |
+
i2 = min(j, len(negative_prompts) - 1)
|
468 |
+
prompt = prompts[i1]
|
469 |
+
negative_prompt = negative_prompts[i2]
|
470 |
+
i2i.prompt = prompt
|
471 |
+
i2i.negative_prompt = negative_prompt
|
472 |
+
|
473 |
+
@staticmethod
|
474 |
+
def compare_prompt(p, processed, n: int = 0):
|
475 |
+
if p.prompt != processed.all_prompts[0]:
|
476 |
+
print(
|
477 |
+
f"[-] ADetailer: applied {ordinal(n + 1)} ad_prompt: {processed.all_prompts[0]!r}"
|
478 |
+
)
|
479 |
+
|
480 |
+
if p.negative_prompt != processed.all_negative_prompts[0]:
|
481 |
+
print(
|
482 |
+
f"[-] ADetailer: applied {ordinal(n + 1)} ad_negative_prompt: {processed.all_negative_prompts[0]!r}"
|
483 |
+
)
|
484 |
+
|
485 |
+
def need_call_process(self, p) -> bool:
|
486 |
+
i = p._ad_idx
|
487 |
+
bs = p.batch_size
|
488 |
+
return i % bs == bs - 1
|
489 |
+
|
490 |
+
def need_call_postprocess(self, p) -> bool:
|
491 |
+
i = p._ad_idx
|
492 |
+
bs = p.batch_size
|
493 |
+
return i % bs == 0
|
494 |
+
|
495 |
+
@rich_traceback
|
496 |
+
def process(self, p, *args_):
|
497 |
+
if getattr(p, "_disable_adetailer", False):
|
498 |
+
return
|
499 |
+
|
500 |
+
if self.is_ad_enabled(*args_):
|
501 |
+
arg_list = self.get_args(p, *args_)
|
502 |
+
extra_params = self.extra_params(arg_list)
|
503 |
+
p.extra_generation_params.update(extra_params)
|
504 |
+
|
505 |
+
def _postprocess_image(self, p, pp, args: ADetailerArgs, *, n: int = 0) -> bool:
|
506 |
+
"""
|
507 |
+
Returns
|
508 |
+
-------
|
509 |
+
bool
|
510 |
+
|
511 |
+
`True` if image was processed, `False` otherwise.
|
512 |
+
"""
|
513 |
+
if state.interrupted:
|
514 |
+
return False
|
515 |
+
|
516 |
+
i = p._ad_idx
|
517 |
+
|
518 |
+
i2i = self.get_i2i_p(p, args, pp.image)
|
519 |
+
seed, subseed = self.get_seed(p)
|
520 |
+
ad_prompts, ad_negatives = self.get_prompt(p, args)
|
521 |
+
|
522 |
+
is_mediapipe = args.ad_model.lower().startswith("mediapipe")
|
523 |
+
|
524 |
+
kwargs = {}
|
525 |
+
if is_mediapipe:
|
526 |
+
predictor = mediapipe_predict
|
527 |
+
ad_model = args.ad_model
|
528 |
+
else:
|
529 |
+
predictor = ultralytics_predict
|
530 |
+
ad_model = self.get_ad_model(args.ad_model)
|
531 |
+
kwargs["device"] = self.ultralytics_device
|
532 |
+
|
533 |
+
with change_torch_load():
|
534 |
+
pred = predictor(ad_model, pp.image, args.ad_confidence, **kwargs)
|
535 |
+
|
536 |
+
masks = self.pred_preprocessing(pred, args)
|
537 |
+
|
538 |
+
if not masks:
|
539 |
+
print(
|
540 |
+
f"[-] ADetailer: nothing detected on image {i + 1} with {ordinal(n + 1)} settings."
|
541 |
+
)
|
542 |
+
return False
|
543 |
+
|
544 |
+
self.save_image(
|
545 |
+
p,
|
546 |
+
pred.preview,
|
547 |
+
condition="ad_save_previews",
|
548 |
+
suffix="-ad-preview" + suffix(n, "-"),
|
549 |
+
)
|
550 |
+
|
551 |
+
steps = len(masks)
|
552 |
+
processed = None
|
553 |
+
state.job_count += steps
|
554 |
+
|
555 |
+
if is_mediapipe:
|
556 |
+
print(f"mediapipe: {steps} detected.")
|
557 |
+
|
558 |
+
_user_pt = p.prompt
|
559 |
+
_user_ng = p.negative_prompt
|
560 |
+
|
561 |
+
p2 = copy(i2i)
|
562 |
+
for j in range(steps):
|
563 |
+
p2.image_mask = masks[j]
|
564 |
+
self.i2i_prompts_replace(p2, ad_prompts, ad_negatives, j)
|
565 |
+
|
566 |
+
if re.match(r"^\s*\[SKIP\]\s*$", p2.prompt):
|
567 |
+
continue
|
568 |
+
|
569 |
+
p2.seed = seed + j
|
570 |
+
p2.subseed = subseed + j
|
571 |
+
|
572 |
+
try:
|
573 |
+
processed = process_images(p2)
|
574 |
+
except NansException as e:
|
575 |
+
msg = f"[-] ADetailer: 'NansException' occurred with {ordinal(n + 1)} settings.\n{e}"
|
576 |
+
print(msg, file=sys.stderr)
|
577 |
+
continue
|
578 |
+
finally:
|
579 |
+
p2.close()
|
580 |
+
|
581 |
+
self.compare_prompt(p2, processed, n=n)
|
582 |
+
p2 = copy(i2i)
|
583 |
+
p2.init_images = [processed.images[0]]
|
584 |
+
|
585 |
+
if processed is not None:
|
586 |
+
pp.image = processed.images[0]
|
587 |
+
return True
|
588 |
+
|
589 |
+
return False
|
590 |
+
|
591 |
+
@rich_traceback
|
592 |
+
def postprocess_image(self, p, pp, *args_):
|
593 |
+
if getattr(p, "_disable_adetailer", False):
|
594 |
+
return
|
595 |
+
|
596 |
+
if not self.is_ad_enabled(*args_):
|
597 |
+
return
|
598 |
+
|
599 |
+
p._ad_idx = getattr(p, "_ad_idx", -1) + 1
|
600 |
+
init_image = copy(pp.image)
|
601 |
+
arg_list = self.get_args(p, *args_)
|
602 |
+
|
603 |
+
if p.scripts is not None and self.need_call_postprocess(p):
|
604 |
+
dummy = Processed(p, [], p.seed, "")
|
605 |
+
with preseve_prompts(p):
|
606 |
+
p.scripts.postprocess(copy(p), dummy)
|
607 |
+
|
608 |
+
is_processed = False
|
609 |
+
with CNHijackRestore(), pause_total_tqdm(), cn_allow_script_control():
|
610 |
+
for n, args in enumerate(arg_list):
|
611 |
+
if args.ad_model == "None":
|
612 |
+
continue
|
613 |
+
is_processed |= self._postprocess_image(p, pp, args, n=n)
|
614 |
+
|
615 |
+
if is_processed:
|
616 |
+
self.save_image(
|
617 |
+
p, init_image, condition="ad_save_images_before", suffix="-ad-before"
|
618 |
+
)
|
619 |
+
|
620 |
+
if p.scripts is not None and self.need_call_process(p):
|
621 |
+
with preseve_prompts(p):
|
622 |
+
p.scripts.process(copy(p))
|
623 |
+
|
624 |
+
try:
|
625 |
+
ia = p._ad_idx
|
626 |
+
lenp = len(p.all_prompts)
|
627 |
+
if ia % lenp == lenp - 1:
|
628 |
+
self.write_params_txt(p)
|
629 |
+
except Exception:
|
630 |
+
pass
|
631 |
+
|
632 |
+
|
633 |
+
def on_after_component(component, **_kwargs):
|
634 |
+
global txt2img_submit_button, img2img_submit_button
|
635 |
+
if getattr(component, "elem_id", None) == "txt2img_generate":
|
636 |
+
txt2img_submit_button = component
|
637 |
+
return
|
638 |
+
|
639 |
+
if getattr(component, "elem_id", None) == "img2img_generate":
|
640 |
+
img2img_submit_button = component
|
641 |
+
|
642 |
+
|
643 |
+
def on_ui_settings():
|
644 |
+
section = ("ADetailer", AFTER_DETAILER)
|
645 |
+
shared.opts.add_option(
|
646 |
+
"ad_max_models",
|
647 |
+
shared.OptionInfo(
|
648 |
+
default=2,
|
649 |
+
label="Max models",
|
650 |
+
component=gr.Slider,
|
651 |
+
component_args={"minimum": 1, "maximum": 10, "step": 1},
|
652 |
+
section=section,
|
653 |
+
),
|
654 |
+
)
|
655 |
+
|
656 |
+
shared.opts.add_option(
|
657 |
+
"ad_save_previews",
|
658 |
+
shared.OptionInfo(False, "Save mask previews", section=section),
|
659 |
+
)
|
660 |
+
|
661 |
+
shared.opts.add_option(
|
662 |
+
"ad_save_images_before",
|
663 |
+
shared.OptionInfo(False, "Save images before ADetailer", section=section),
|
664 |
+
)
|
665 |
+
|
666 |
+
shared.opts.add_option(
|
667 |
+
"ad_only_seleted_scripts",
|
668 |
+
shared.OptionInfo(
|
669 |
+
True, "Apply only selected scripts to ADetailer", section=section
|
670 |
+
),
|
671 |
+
)
|
672 |
+
|
673 |
+
textbox_args = {
|
674 |
+
"placeholder": "comma-separated list of script names",
|
675 |
+
"interactive": True,
|
676 |
+
}
|
677 |
+
|
678 |
+
shared.opts.add_option(
|
679 |
+
"ad_script_names",
|
680 |
+
shared.OptionInfo(
|
681 |
+
default=SCRIPT_DEFAULT,
|
682 |
+
label="Script names to apply to ADetailer (separated by comma)",
|
683 |
+
component=gr.Textbox,
|
684 |
+
component_args=textbox_args,
|
685 |
+
section=section,
|
686 |
+
),
|
687 |
+
)
|
688 |
+
|
689 |
+
shared.opts.add_option(
|
690 |
+
"ad_bbox_sortby",
|
691 |
+
shared.OptionInfo(
|
692 |
+
default="None",
|
693 |
+
label="Sort bounding boxes by",
|
694 |
+
component=gr.Radio,
|
695 |
+
component_args={"choices": BBOX_SORTBY},
|
696 |
+
section=section,
|
697 |
+
),
|
698 |
+
)
|
699 |
+
|
700 |
+
|
701 |
+
# xyz_grid
|
702 |
+
|
703 |
+
|
704 |
+
def make_axis_on_xyz_grid():
|
705 |
+
xyz_grid = None
|
706 |
+
for script in scripts.scripts_data:
|
707 |
+
if script.script_class.__module__ == "xyz_grid.py":
|
708 |
+
xyz_grid = script.module
|
709 |
+
break
|
710 |
+
|
711 |
+
if xyz_grid is None:
|
712 |
+
return
|
713 |
+
|
714 |
+
model_list = ["None", *model_mapping.keys()]
|
715 |
+
|
716 |
+
def set_value(p, x, xs, *, field: str):
|
717 |
+
if not hasattr(p, "adetailer_xyz"):
|
718 |
+
p.adetailer_xyz = {}
|
719 |
+
p.adetailer_xyz[field] = x
|
720 |
+
|
721 |
+
axis = [
|
722 |
+
xyz_grid.AxisOption(
|
723 |
+
"[ADetailer] ADetailer model 1st",
|
724 |
+
str,
|
725 |
+
partial(set_value, field="ad_model"),
|
726 |
+
choices=lambda: model_list,
|
727 |
+
),
|
728 |
+
xyz_grid.AxisOption(
|
729 |
+
"[ADetailer] ADetailer prompt 1st",
|
730 |
+
str,
|
731 |
+
partial(set_value, field="ad_prompt"),
|
732 |
+
),
|
733 |
+
xyz_grid.AxisOption(
|
734 |
+
"[ADetailer] ADetailer negative prompt 1st",
|
735 |
+
str,
|
736 |
+
partial(set_value, field="ad_negative_prompt"),
|
737 |
+
),
|
738 |
+
xyz_grid.AxisOption(
|
739 |
+
"[ADetailer] Mask erosion / dilation 1st",
|
740 |
+
int,
|
741 |
+
partial(set_value, field="ad_dilate_erode"),
|
742 |
+
),
|
743 |
+
xyz_grid.AxisOption(
|
744 |
+
"[ADetailer] Inpaint denoising strength 1st",
|
745 |
+
float,
|
746 |
+
partial(set_value, field="ad_denoising_strength"),
|
747 |
+
),
|
748 |
+
xyz_grid.AxisOption(
|
749 |
+
"[ADetailer] Inpaint only masked 1st",
|
750 |
+
str,
|
751 |
+
partial(set_value, field="ad_inpaint_only_masked"),
|
752 |
+
choices=lambda: ["True", "False"],
|
753 |
+
),
|
754 |
+
xyz_grid.AxisOption(
|
755 |
+
"[ADetailer] Inpaint only masked padding 1st",
|
756 |
+
int,
|
757 |
+
partial(set_value, field="ad_inpaint_only_masked_padding"),
|
758 |
+
),
|
759 |
+
xyz_grid.AxisOption(
|
760 |
+
"[ADetailer] ControlNet model 1st",
|
761 |
+
str,
|
762 |
+
partial(set_value, field="ad_controlnet_model"),
|
763 |
+
choices=lambda: ["None", *get_cn_models()],
|
764 |
+
),
|
765 |
+
]
|
766 |
+
|
767 |
+
if not any(x.label.startswith("[ADetailer]") for x in xyz_grid.axis_options):
|
768 |
+
xyz_grid.axis_options.extend(axis)
|
769 |
+
|
770 |
+
|
771 |
+
def on_before_ui():
|
772 |
+
try:
|
773 |
+
make_axis_on_xyz_grid()
|
774 |
+
except Exception:
|
775 |
+
error = traceback.format_exc()
|
776 |
+
print(
|
777 |
+
f"[-] ADetailer: xyz_grid error:\n{error}",
|
778 |
+
file=sys.stderr,
|
779 |
+
)
|
780 |
+
|
781 |
+
|
782 |
+
script_callbacks.on_ui_settings(on_ui_settings)
|
783 |
+
script_callbacks.on_after_component(on_after_component)
|
784 |
+
script_callbacks.on_before_ui(on_before_ui)
|
adetailer/sd_webui/__init__.py
ADDED
File without changes
|
adetailer/sd_webui/devices.py
ADDED
@@ -0,0 +1,11 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
from __future__ import annotations
|
2 |
+
|
3 |
+
from typing import TYPE_CHECKING
|
4 |
+
|
5 |
+
if TYPE_CHECKING:
|
6 |
+
|
7 |
+
class NansException(Exception): # noqa: N818
|
8 |
+
pass
|
9 |
+
|
10 |
+
else:
|
11 |
+
from modules.devices import NansException
|
adetailer/sd_webui/images.py
ADDED
@@ -0,0 +1,62 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
from __future__ import annotations
|
2 |
+
|
3 |
+
from typing import TYPE_CHECKING
|
4 |
+
|
5 |
+
if TYPE_CHECKING:
|
6 |
+
from PIL import Image, PngImagePlugin
|
7 |
+
|
8 |
+
from sd_webui.processing import StableDiffusionProcessing
|
9 |
+
|
10 |
+
def save_image(
|
11 |
+
image: Image.Image,
|
12 |
+
path: str,
|
13 |
+
basename: str,
|
14 |
+
seed: int | None = None,
|
15 |
+
prompt: str = "",
|
16 |
+
extension: str = "png",
|
17 |
+
info: str | PngImagePlugin.iTXt = "",
|
18 |
+
short_filename: bool = False,
|
19 |
+
no_prompt: bool = False,
|
20 |
+
grid: bool = False,
|
21 |
+
pnginfo_section_name: str = "parameters",
|
22 |
+
p: StableDiffusionProcessing | None = None,
|
23 |
+
existing_info: dict | None = None,
|
24 |
+
forced_filename: str | None = None,
|
25 |
+
suffix: str = "",
|
26 |
+
save_to_dirs: bool = False,
|
27 |
+
) -> tuple[str, str | None]:
|
28 |
+
"""Save an image.
|
29 |
+
|
30 |
+
Args:
|
31 |
+
image (`PIL.Image`):
|
32 |
+
The image to be saved.
|
33 |
+
path (`str`):
|
34 |
+
The directory to save the image. Note, the option `save_to_dirs` will make the image to be saved into a sub directory.
|
35 |
+
basename (`str`):
|
36 |
+
The base filename which will be applied to `filename pattern`.
|
37 |
+
seed, prompt, short_filename,
|
38 |
+
extension (`str`):
|
39 |
+
Image file extension, default is `png`.
|
40 |
+
pngsectionname (`str`):
|
41 |
+
Specify the name of the section which `info` will be saved in.
|
42 |
+
info (`str` or `PngImagePlugin.iTXt`):
|
43 |
+
PNG info chunks.
|
44 |
+
existing_info (`dict`):
|
45 |
+
Additional PNG info. `existing_info == {pngsectionname: info, ...}`
|
46 |
+
no_prompt:
|
47 |
+
TODO I don't know its meaning.
|
48 |
+
p (`StableDiffusionProcessing`)
|
49 |
+
forced_filename (`str`):
|
50 |
+
If specified, `basename` and filename pattern will be ignored.
|
51 |
+
save_to_dirs (bool):
|
52 |
+
If true, the image will be saved into a subdirectory of `path`.
|
53 |
+
|
54 |
+
Returns: (fullfn, txt_fullfn)
|
55 |
+
fullfn (`str`):
|
56 |
+
The full path of the saved imaged.
|
57 |
+
txt_fullfn (`str` or None):
|
58 |
+
If a text file is saved for this image, this will be its full path. Otherwise None.
|
59 |
+
"""
|
60 |
+
|
61 |
+
else:
|
62 |
+
from modules.images import save_image
|
adetailer/sd_webui/paths.py
ADDED
@@ -0,0 +1,14 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
from __future__ import annotations
|
2 |
+
|
3 |
+
from typing import TYPE_CHECKING
|
4 |
+
|
5 |
+
if TYPE_CHECKING:
|
6 |
+
import os
|
7 |
+
|
8 |
+
models_path = os.path.join(os.path.dirname(__file__), "1")
|
9 |
+
script_path = os.path.join(os.path.dirname(__file__), "2")
|
10 |
+
data_path = os.path.join(os.path.dirname(__file__), "3")
|
11 |
+
extensions_dir = os.path.join(os.path.dirname(__file__), "4")
|
12 |
+
extensions_builtin_dir = os.path.join(os.path.dirname(__file__), "5")
|
13 |
+
else:
|
14 |
+
from modules.paths import data_path, models_path, script_path
|
adetailer/sd_webui/processing.py
ADDED
@@ -0,0 +1,176 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
from __future__ import annotations
|
2 |
+
|
3 |
+
from typing import TYPE_CHECKING
|
4 |
+
|
5 |
+
if TYPE_CHECKING:
|
6 |
+
from dataclasses import dataclass, field
|
7 |
+
from typing import Any, Callable
|
8 |
+
|
9 |
+
import numpy as np
|
10 |
+
import torch
|
11 |
+
from PIL import Image
|
12 |
+
|
13 |
+
def _image():
|
14 |
+
return Image.new("L", (512, 512))
|
15 |
+
|
16 |
+
@dataclass
|
17 |
+
class StableDiffusionProcessing:
|
18 |
+
sd_model: torch.nn.Module = field(default_factory=lambda: torch.nn.Linear(1, 1))
|
19 |
+
outpath_samples: str = ""
|
20 |
+
outpath_grids: str = ""
|
21 |
+
prompt: str = ""
|
22 |
+
prompt_for_display: str = ""
|
23 |
+
negative_prompt: str = ""
|
24 |
+
styles: list[str] = field(default_factory=list)
|
25 |
+
seed: int = -1
|
26 |
+
subseed: int = -1
|
27 |
+
subseed_strength: float = 0.0
|
28 |
+
seed_resize_from_h: int = -1
|
29 |
+
seed_resize_from_w: int = -1
|
30 |
+
sampler_name: str | None = None
|
31 |
+
batch_size: int = 1
|
32 |
+
n_iter: int = 1
|
33 |
+
steps: int = 50
|
34 |
+
cfg_scale: float = 7.0
|
35 |
+
width: int = 512
|
36 |
+
height: int = 512
|
37 |
+
restore_faces: bool = False
|
38 |
+
tiling: bool = False
|
39 |
+
do_not_save_samples: bool = False
|
40 |
+
do_not_save_grid: bool = False
|
41 |
+
extra_generation_params: dict[str, Any] = field(default_factory=dict)
|
42 |
+
overlay_images: list[Image.Image] = field(default_factory=list)
|
43 |
+
eta: float = 0.0
|
44 |
+
do_not_reload_embeddings: bool = False
|
45 |
+
paste_to: tuple[int | float, ...] = (0, 0, 0, 0)
|
46 |
+
color_corrections: list[np.ndarray] = field(default_factory=list)
|
47 |
+
denoising_strength: float = 0.0
|
48 |
+
sampler_noise_scheduler_override: Callable | None = None
|
49 |
+
ddim_discretize: str = ""
|
50 |
+
s_min_uncond: float = 0.0
|
51 |
+
s_churn: float = 0.0
|
52 |
+
s_tmin: float = 0.0
|
53 |
+
s_tmax: float = 0.0
|
54 |
+
s_noise: float = 0.0
|
55 |
+
override_settings: dict[str, Any] = field(default_factory=dict)
|
56 |
+
override_settings_restore_afterwards: bool = False
|
57 |
+
is_using_inpainting_conditioning: bool = False
|
58 |
+
disable_extra_networks: bool = False
|
59 |
+
scripts: Any = None
|
60 |
+
script_args: list[Any] = field(default_factory=list)
|
61 |
+
all_prompts: list[str] = field(default_factory=list)
|
62 |
+
all_negative_prompts: list[str] = field(default_factory=list)
|
63 |
+
all_seeds: list[int] = field(default_factory=list)
|
64 |
+
all_subseeds: list[int] = field(default_factory=list)
|
65 |
+
iteration: int = 1
|
66 |
+
is_hr_pass: bool = False
|
67 |
+
|
68 |
+
def close(self) -> None:
|
69 |
+
pass
|
70 |
+
|
71 |
+
@dataclass
|
72 |
+
class StableDiffusionProcessingTxt2Img(StableDiffusionProcessing):
|
73 |
+
sampler: Callable | None = None
|
74 |
+
enable_hr: bool = False
|
75 |
+
denoising_strength: float = 0.75
|
76 |
+
hr_scale: float = 2.0
|
77 |
+
hr_upscaler: str = ""
|
78 |
+
hr_second_pass_steps: int = 0
|
79 |
+
hr_resize_x: int = 0
|
80 |
+
hr_resize_y: int = 0
|
81 |
+
hr_upscale_to_x: int = 0
|
82 |
+
hr_upscale_to_y: int = 0
|
83 |
+
width: int = 512
|
84 |
+
height: int = 512
|
85 |
+
truncate_x: int = 512
|
86 |
+
truncate_y: int = 512
|
87 |
+
applied_old_hires_behavior_to: tuple[int, int] = (512, 512)
|
88 |
+
|
89 |
+
@dataclass
|
90 |
+
class StableDiffusionProcessingImg2Img(StableDiffusionProcessing):
|
91 |
+
sampler: Callable | None = None
|
92 |
+
init_images: list[Image.Image] = field(default_factory=list)
|
93 |
+
resize_mode: int = 0
|
94 |
+
denoising_strength: float = 0.75
|
95 |
+
image_cfg_scale: float | None = None
|
96 |
+
init_latent: torch.Tensor | None = None
|
97 |
+
image_mask: Image.Image = field(default_factory=_image)
|
98 |
+
latent_mask: Image.Image = field(default_factory=_image)
|
99 |
+
mask_for_overlay: Image.Image = field(default_factory=_image)
|
100 |
+
mask_blur: int = 4
|
101 |
+
inpainting_fill: int = 0
|
102 |
+
inpaint_full_res: bool = True
|
103 |
+
inpaint_full_res_padding: int = 0
|
104 |
+
inpainting_mask_invert: int | bool = 0
|
105 |
+
initial_noise_multiplier: float = 1.0
|
106 |
+
mask: torch.Tensor | None = None
|
107 |
+
nmask: torch.Tensor | None = None
|
108 |
+
image_conditioning: torch.Tensor | None = None
|
109 |
+
|
110 |
+
@dataclass
|
111 |
+
class Processed:
|
112 |
+
images: list[Image.Image] = field(default_factory=list)
|
113 |
+
prompt: list[str] = field(default_factory=list)
|
114 |
+
negative_prompt: list[str] = field(default_factory=list)
|
115 |
+
seed: list[int] = field(default_factory=list)
|
116 |
+
subseed: list[int] = field(default_factory=list)
|
117 |
+
subseed_strength: float = 0.0
|
118 |
+
info: str = ""
|
119 |
+
comments: str = ""
|
120 |
+
width: int = 512
|
121 |
+
height: int = 512
|
122 |
+
sampler_name: str = ""
|
123 |
+
cfg_scale: float = 7.0
|
124 |
+
image_cfg_scale: float | None = None
|
125 |
+
steps: int = 50
|
126 |
+
batch_size: int = 1
|
127 |
+
restore_faces: bool = False
|
128 |
+
face_restoration_model: str | None = None
|
129 |
+
sd_model_hash: str = ""
|
130 |
+
seed_resize_from_w: int = -1
|
131 |
+
seed_resize_from_h: int = -1
|
132 |
+
denoising_strength: float = 0.0
|
133 |
+
extra_generation_params: dict[str, Any] = field(default_factory=dict)
|
134 |
+
index_of_first_image: int = 0
|
135 |
+
styles: list[str] = field(default_factory=list)
|
136 |
+
job_timestamp: str = ""
|
137 |
+
clip_skip: int = 1
|
138 |
+
eta: float = 0.0
|
139 |
+
ddim_discretize: str = ""
|
140 |
+
s_churn: float = 0.0
|
141 |
+
s_tmin: float = 0.0
|
142 |
+
s_tmax: float = 0.0
|
143 |
+
s_noise: float = 0.0
|
144 |
+
sampler_noise_scheduler_override: Callable | None = None
|
145 |
+
is_using_inpainting_conditioning: bool = False
|
146 |
+
all_prompts: list[str] = field(default_factory=list)
|
147 |
+
all_negative_prompts: list[str] = field(default_factory=list)
|
148 |
+
all_seeds: list[int] = field(default_factory=list)
|
149 |
+
all_subseeds: list[int] = field(default_factory=list)
|
150 |
+
infotexts: list[str] = field(default_factory=list)
|
151 |
+
|
152 |
+
def create_infotext(
|
153 |
+
p: StableDiffusionProcessingTxt2Img | StableDiffusionProcessingImg2Img,
|
154 |
+
all_prompts: list[str],
|
155 |
+
all_seeds: list[int],
|
156 |
+
all_subseeds: list[int],
|
157 |
+
comments: Any,
|
158 |
+
iteration: int = 0,
|
159 |
+
position_in_batch: int = 0,
|
160 |
+
) -> str:
|
161 |
+
pass
|
162 |
+
|
163 |
+
def process_images(
|
164 |
+
p: StableDiffusionProcessingTxt2Img | StableDiffusionProcessingImg2Img,
|
165 |
+
) -> Processed:
|
166 |
+
pass
|
167 |
+
|
168 |
+
else:
|
169 |
+
from modules.processing import (
|
170 |
+
Processed,
|
171 |
+
StableDiffusionProcessing,
|
172 |
+
StableDiffusionProcessingImg2Img,
|
173 |
+
StableDiffusionProcessingTxt2Img,
|
174 |
+
create_infotext,
|
175 |
+
process_images,
|
176 |
+
)
|
adetailer/sd_webui/safe.py
ADDED
@@ -0,0 +1,10 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
from __future__ import annotations
|
2 |
+
|
3 |
+
from typing import TYPE_CHECKING
|
4 |
+
|
5 |
+
if TYPE_CHECKING:
|
6 |
+
import torch
|
7 |
+
|
8 |
+
unsafe_torch_load = torch.load
|
9 |
+
else:
|
10 |
+
from modules.safe import unsafe_torch_load
|
adetailer/sd_webui/script_callbacks.py
ADDED
@@ -0,0 +1,26 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
from __future__ import annotations
|
2 |
+
|
3 |
+
from typing import TYPE_CHECKING
|
4 |
+
|
5 |
+
if TYPE_CHECKING:
|
6 |
+
from typing import Callable
|
7 |
+
|
8 |
+
def on_app_started(callback: Callable):
|
9 |
+
pass
|
10 |
+
|
11 |
+
def on_ui_settings(callback: Callable):
|
12 |
+
pass
|
13 |
+
|
14 |
+
def on_after_component(callback: Callable):
|
15 |
+
pass
|
16 |
+
|
17 |
+
def on_before_ui(callback: Callable):
|
18 |
+
pass
|
19 |
+
|
20 |
+
else:
|
21 |
+
from modules.script_callbacks import (
|
22 |
+
on_after_component,
|
23 |
+
on_app_started,
|
24 |
+
on_before_ui,
|
25 |
+
on_ui_settings,
|
26 |
+
)
|
adetailer/sd_webui/scripts.py
ADDED
@@ -0,0 +1,94 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
from __future__ import annotations
|
2 |
+
|
3 |
+
from typing import TYPE_CHECKING
|
4 |
+
|
5 |
+
if TYPE_CHECKING:
|
6 |
+
from abc import ABC, abstractmethod
|
7 |
+
from collections import namedtuple
|
8 |
+
from dataclasses import dataclass
|
9 |
+
from typing import Any
|
10 |
+
|
11 |
+
import gradio as gr
|
12 |
+
from PIL import Image
|
13 |
+
|
14 |
+
from sd_webui.processing import (
|
15 |
+
Processed,
|
16 |
+
StableDiffusionProcessingImg2Img,
|
17 |
+
StableDiffusionProcessingTxt2Img,
|
18 |
+
)
|
19 |
+
|
20 |
+
SDPType = StableDiffusionProcessingImg2Img | StableDiffusionProcessingTxt2Img
|
21 |
+
AlwaysVisible = object()
|
22 |
+
|
23 |
+
@dataclass
|
24 |
+
class PostprocessImageArgs:
|
25 |
+
image: Image.Image
|
26 |
+
|
27 |
+
class Script(ABC):
|
28 |
+
filename: str
|
29 |
+
args_from: int
|
30 |
+
args_to: int
|
31 |
+
alwayson: bool
|
32 |
+
|
33 |
+
is_txt2img: bool
|
34 |
+
is_img2img: bool
|
35 |
+
|
36 |
+
group: gr.Group
|
37 |
+
infotext_fields: list[tuple[str, str]]
|
38 |
+
paste_field_names: list[str]
|
39 |
+
|
40 |
+
@abstractmethod
|
41 |
+
def title(self):
|
42 |
+
raise NotImplementedError
|
43 |
+
|
44 |
+
def ui(self, is_img2img: bool):
|
45 |
+
pass
|
46 |
+
|
47 |
+
def show(self, is_img2img: bool):
|
48 |
+
return True
|
49 |
+
|
50 |
+
def run(self, p: SDPType, *args):
|
51 |
+
pass
|
52 |
+
|
53 |
+
def process(self, p: SDPType, *args):
|
54 |
+
pass
|
55 |
+
|
56 |
+
def before_process_batch(self, p: SDPType, *args, **kwargs):
|
57 |
+
pass
|
58 |
+
|
59 |
+
def process_batch(self, p: SDPType, *args, **kwargs):
|
60 |
+
pass
|
61 |
+
|
62 |
+
def postprocess_batch(self, p: SDPType, *args, **kwargs):
|
63 |
+
pass
|
64 |
+
|
65 |
+
def postprocess_image(self, p: SDPType, pp: PostprocessImageArgs, *args):
|
66 |
+
pass
|
67 |
+
|
68 |
+
def postprocess(self, p: SDPType, processed: Processed, *args):
|
69 |
+
pass
|
70 |
+
|
71 |
+
def before_component(self, component, **kwargs):
|
72 |
+
pass
|
73 |
+
|
74 |
+
def after_component(self, component, **kwargs):
|
75 |
+
pass
|
76 |
+
|
77 |
+
def describe(self):
|
78 |
+
return ""
|
79 |
+
|
80 |
+
def elem_id(self, item_id: Any) -> str:
|
81 |
+
pass
|
82 |
+
|
83 |
+
ScriptClassData = namedtuple(
|
84 |
+
"ScriptClassData", ["script_class", "path", "basedir", "module"]
|
85 |
+
)
|
86 |
+
scripts_data: list[ScriptClassData] = []
|
87 |
+
|
88 |
+
else:
|
89 |
+
from modules.scripts import (
|
90 |
+
AlwaysVisible,
|
91 |
+
PostprocessImageArgs,
|
92 |
+
Script,
|
93 |
+
scripts_data,
|
94 |
+
)
|
adetailer/sd_webui/shared.py
ADDED
@@ -0,0 +1,66 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
from __future__ import annotations
|
2 |
+
|
3 |
+
from typing import TYPE_CHECKING
|
4 |
+
|
5 |
+
if TYPE_CHECKING:
|
6 |
+
import argparse
|
7 |
+
from dataclasses import dataclass
|
8 |
+
from typing import Any, Callable
|
9 |
+
|
10 |
+
import torch
|
11 |
+
from PIL import Image
|
12 |
+
|
13 |
+
@dataclass
|
14 |
+
class State:
|
15 |
+
skipped: bool = False
|
16 |
+
interrupted: bool = False
|
17 |
+
job: str = ""
|
18 |
+
job_no: int = 0
|
19 |
+
job_count: int = 0
|
20 |
+
processing_has_refined_job_count: bool = False
|
21 |
+
job_timestamp: str = "0"
|
22 |
+
sampling_step: int = 0
|
23 |
+
sampling_steps: int = 0
|
24 |
+
current_latent: torch.Tensor | None = None
|
25 |
+
current_image: Image.Image | None = None
|
26 |
+
current_image_sampling_step: int = 0
|
27 |
+
id_live_preview: int = 0
|
28 |
+
textinfo: str | None = None
|
29 |
+
time_start: float | None = None
|
30 |
+
need_restart: bool = False
|
31 |
+
server_start: float | None = None
|
32 |
+
|
33 |
+
@dataclass
|
34 |
+
class OptionInfo:
|
35 |
+
default: Any = None
|
36 |
+
label: str = ""
|
37 |
+
component: Any = None
|
38 |
+
component_args: Callable[[], dict] | dict[str, Any] | None = None
|
39 |
+
onchange: Callable[[], None] | None = None
|
40 |
+
section: tuple[str, str] | None = None
|
41 |
+
refresh: Callable[[], None] | None = None
|
42 |
+
|
43 |
+
class Option:
|
44 |
+
data_labels: dict[str, OptionInfo]
|
45 |
+
|
46 |
+
def __init__(self):
|
47 |
+
self.data: dict[str, Any] = {}
|
48 |
+
|
49 |
+
def add_option(self, key: str, info: OptionInfo):
|
50 |
+
pass
|
51 |
+
|
52 |
+
def __getattr__(self, item: str):
|
53 |
+
if self.data is not None and item in self.data:
|
54 |
+
return self.data[item]
|
55 |
+
|
56 |
+
if item in self.data_labels:
|
57 |
+
return self.data_labels[item].default
|
58 |
+
|
59 |
+
return super().__getattribute__(item)
|
60 |
+
|
61 |
+
opts = Option()
|
62 |
+
cmd_opts = argparse.Namespace()
|
63 |
+
state = State()
|
64 |
+
|
65 |
+
else:
|
66 |
+
from modules.shared import OptionInfo, cmd_opts, opts, state
|
openOutpaint-webUI-extension/.DS_Store
ADDED
Binary file (6.15 kB). View file
|
|
openOutpaint-webUI-extension/LICENSE
ADDED
@@ -0,0 +1,21 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
MIT License
|
2 |
+
|
3 |
+
Copyright (c) 2022 tim h
|
4 |
+
|
5 |
+
Permission is hereby granted, free of charge, to any person obtaining a copy
|
6 |
+
of this software and associated documentation files (the "Software"), to deal
|
7 |
+
in the Software without restriction, including without limitation the rights
|
8 |
+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
9 |
+
copies of the Software, and to permit persons to whom the Software is
|
10 |
+
furnished to do so, subject to the following conditions:
|
11 |
+
|
12 |
+
The above copyright notice and this permission notice shall be included in all
|
13 |
+
copies or substantial portions of the Software.
|
14 |
+
|
15 |
+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
16 |
+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
17 |
+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
18 |
+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
19 |
+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
20 |
+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
21 |
+
SOFTWARE.
|
openOutpaint-webUI-extension/README.MD
ADDED
@@ -0,0 +1,22 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
In this repo lives a mighty handy little wrapper for adding [openOutpaint](https://github.com/zero01101/openOutpaint) to [AUTOMATIC1111 webUI](https://github.com/AUTOMATIC1111/stable-diffusion-webui) directly as a native extension.
|
2 |
+
|
3 |
+
Please see the respective READMEs and wikis for each of the above projects for a more comprehensive understanding of their feature sets.
|
4 |
+
|
5 |
+
This extension also adds buttons to send output from webUI txt2img and img2img tools directly to openOutpaint which will also include the prompts used for convenience.
|
6 |
+
|
7 |
+
**_2023-01-23: new `--lock-oo-submodule` commandline argument if you want to roll back to a previous version of openOutpaint and keep it there - be sure to install/run openOutpaint extension at least once before enabling this flag_**
|
8 |
+
|
9 |
+
**Note: Requires `--api` flag enabled in your webui-user launch script!**
|
10 |
+
|
11 |
+
**_FURTHER NOTE: the commandline flag `--gradio-debug` disables custom API routes and completely breaks openOutpaint. please remove it from your COMMANDLINE_ARGS before running openOutpaint._**
|
12 |
+
|
13 |
+
**_EVEN FURTHER NOTE: [PLEASE SEE DOCUMENTATION REGARDING NEW HRfix FEATURES](https://github.com/zero01101/openOutpaint/wiki/Manual#hrfix) IMPLEMENTED AS OF webUI COMMIT [ef27a18](https://github.com/AUTOMATIC1111/stable-diffusion-webui/commit/ef27a18b6b7cb1a8eebdc9b2e88d25baf2c2414d)_**
|
14 |
+
|
15 |
+

|
16 |
+
|
17 |
+
### surprising incompatibilities
|
18 |
+
|
19 |
+
**_COLAB USERS: you may experience issues installing openOutpaint (and other webUI extensions) - there is a workaround that has been discovered and tested against [TheLastBen's fast-stable-diffusion](https://github.com/TheLastBen/fast-stable-diffusion). Please see [this discussion](https://github.com/TheLastBen/fast-stable-diffusion/discussions/1161) containing the workaround, which requires adding a command into the final cell of the colab, as well as setting `Enable_API` to `True`._**
|
20 |
+
|
21 |
+
- [microsoft editor extension for chrome/edge seems to disable the overmask slider](https://github.com/zero01101/openOutpaint/discussions/88#discussioncomment-4498341)
|
22 |
+
- ~~[duckduckgo privacy extension for firefox breaks outpainting, resulting in pure black output](https://github.com/zero01101/openOutpaint-webUI-extension/issues/3#issuecomment-1367694000) - add an exception for your openOutpaint host (likely localhost or 127.0.0.1)~~ should be fixed as of [b128943](https://github.com/zero01101/openOutpaint/commit/b128943f0c94970600fdc1c98bfec22de619866f)
|
openOutpaint-webUI-extension/app/.DS_Store
ADDED
Binary file (6.15 kB). View file
|
|
openOutpaint-webUI-extension/app/.devtools/README.md
ADDED
@@ -0,0 +1,12 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
# openOutpaint DevTools
|
2 |
+
|
3 |
+
This is a folder containing some handy scripts to help developers to automate workflows and write code in openOutpaint's standards.
|
4 |
+
All scripts must be run from the root of the project.
|
5 |
+
|
6 |
+
## `sethooks.sh` and `sethooks.ps1` scripts
|
7 |
+
|
8 |
+
These scripts will setup git hooks for this project. Hooks are mainly for cache busting purposes for now. It is recommended to run this script and setup hooks before any commits are made.
|
9 |
+
|
10 |
+
## `lint.sh` script
|
11 |
+
|
12 |
+
Uses `npm` to install prettier and lint javascript, html and css files according to `.prettierrc.json`. This script will install node modules locally, so editors with prettier support are recommended over this script.
|
openOutpaint-webUI-extension/app/.devtools/lint.sh
ADDED
@@ -0,0 +1,21 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
#!/usr/bin/bash
|
2 |
+
|
3 |
+
if ! which npx 2>&1 > /dev/null; then
|
4 |
+
echo "[lint] npm/npx is not installed"
|
5 |
+
exit 1
|
6 |
+
fi
|
7 |
+
|
8 |
+
npx prettier > /dev/null || npm install prettier && echo "[lint] We have 'prettier'"
|
9 |
+
npx eslint > /dev/null || npm install eslint && echo "[lint] We have 'eslint'"
|
10 |
+
npx prettier-eslint > /dev/null || npm install prettier-eslint-cli && echo "[lint] We have 'prettier-eslint'"
|
11 |
+
|
12 |
+
echo "[lint] Linting JavaScript files..."
|
13 |
+
npx prettier-eslint --write "**/*.js"
|
14 |
+
echo "[lint] Linting HTML files..."
|
15 |
+
npx prettier-eslint --write "**/*.html"
|
16 |
+
echo "[lint] Linting CSS files..."
|
17 |
+
npx prettier-eslint --write "**/*.css"
|
18 |
+
echo "[lint] Linting MarkDown files"
|
19 |
+
npx prettier-eslint --write "**/*.md"
|
20 |
+
|
21 |
+
echo "[lint] Finished Linting."
|
openOutpaint-webUI-extension/app/.devtools/sethooks.ps1
ADDED
@@ -0,0 +1,4 @@
|
|
|
|
|
|
|
|
|
|
|
1 |
+
git config core.eol lf
|
2 |
+
git config core.autocrlf input
|
3 |
+
|
4 |
+
git config core.hooksPath .githooks/windows
|
openOutpaint-webUI-extension/app/.devtools/sethooks.sh
ADDED
@@ -0,0 +1,3 @@
|
|
|
|
|
|
|
|
|
1 |
+
#!/usr/bin/sh
|
2 |
+
|
3 |
+
git config core.hooksPath .githooks/linux
|
openOutpaint-webUI-extension/app/.devtools/updatehashes.ps1
ADDED
@@ -0,0 +1,27 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
# Updates html files with cache busting urls including file hashes.
|
2 |
+
|
3 |
+
# Actual file processing
|
4 |
+
$htmlfiles = Get-ChildItem -Path . -Recurse -Filter "*.html" | Where {$_.FullName -notlike "*\node_modules\*"} | Resolve-path -relative
|
5 |
+
foreach ($htmlfile in $htmlfiles) {
|
6 |
+
Write-Host "[info] Processing '${htmlfile}' for cache busting..." -ForegroundColor Blue
|
7 |
+
|
8 |
+
$resfiles = (@(Get-ChildItem -Path . -Recurse -Filter "*.css") + (Get-ChildItem -Path . -Recurse -Filter "*.js")) | Resolve-Path -relative
|
9 |
+
|
10 |
+
if ($args[0] -eq "gitadd") {
|
11 |
+
$resfiles = (git status -s | Select-String -Pattern "[A-Z] .+") | ForEach-Object { -split $_.Line | Select-Object -Last 1 }
|
12 |
+
}
|
13 |
+
|
14 |
+
foreach ($resfile in $resfiles) {
|
15 |
+
$resfile = $resfile -replace '\\', '/' -replace '\./', ''
|
16 |
+
# Check if resource is used in html file
|
17 |
+
if ($null -ne (Select-String -Path $htmlfile -Pattern $resfile)) {
|
18 |
+
$hash = (Get-FileHash $resfile -Algorithm SHA1).Hash
|
19 |
+
|
20 |
+
# This is just for cache busting...
|
21 |
+
# If 7 first characters of SHA1 is okay for git, it should be more than enough for us
|
22 |
+
$hash = $hash.Substring(0, 7).ToLower()
|
23 |
+
|
24 |
+
(Get-Content -Raw -Path $htmlfile).replace('\r\n', "\n") -replace "$resfile(\?v=[a-z0-9]+)?", "${resfile}?v=$hash" | Set-Content $htmlfile
|
25 |
+
}
|
26 |
+
}
|
27 |
+
}
|
openOutpaint-webUI-extension/app/.devtools/updatehashes.sh
ADDED
@@ -0,0 +1,128 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
#!/usr/bin/bash
|
2 |
+
#
|
3 |
+
# Updates html files with cache busting urls including file hashes.
|
4 |
+
|
5 |
+
# Setup colors
|
6 |
+
# Reset
|
7 |
+
Color_Off='\033[0m' # Text Reset
|
8 |
+
|
9 |
+
# Regular Colors
|
10 |
+
Black='\033[0;30m' # Black
|
11 |
+
Red='\033[0;31m' # Red
|
12 |
+
Green='\033[0;32m' # Green
|
13 |
+
Yellow='\033[0;33m' # Yellow
|
14 |
+
Blue='\033[0;34m' # Blue
|
15 |
+
Purple='\033[0;35m' # Purple
|
16 |
+
Cyan='\033[0;36m' # Cyan
|
17 |
+
White='\033[0;37m' # White
|
18 |
+
|
19 |
+
# Bold
|
20 |
+
BBlack='\033[1;30m' # Black
|
21 |
+
BRed='\033[1;31m' # Red
|
22 |
+
BGreen='\033[1;32m' # Green
|
23 |
+
BYellow='\033[1;33m' # Yellow
|
24 |
+
BBlue='\033[1;34m' # Blue
|
25 |
+
BPurple='\033[1;35m' # Purple
|
26 |
+
BCyan='\033[1;36m' # Cyan
|
27 |
+
BWhite='\033[1;37m' # White
|
28 |
+
|
29 |
+
# Underline
|
30 |
+
UBlack='\033[4;30m' # Black
|
31 |
+
URed='\033[4;31m' # Red
|
32 |
+
UGreen='\033[4;32m' # Green
|
33 |
+
UYellow='\033[4;33m' # Yellow
|
34 |
+
UBlue='\033[4;34m' # Blue
|
35 |
+
UPurple='\033[4;35m' # Purple
|
36 |
+
UCyan='\033[4;36m' # Cyan
|
37 |
+
UWhite='\033[4;37m' # White
|
38 |
+
|
39 |
+
# Background
|
40 |
+
On_Black='\033[40m' # Black
|
41 |
+
On_Red='\033[41m' # Red
|
42 |
+
On_Green='\033[42m' # Green
|
43 |
+
On_Yellow='\033[43m' # Yellow
|
44 |
+
On_Blue='\033[44m' # Blue
|
45 |
+
On_Purple='\033[45m' # Purple
|
46 |
+
On_Cyan='\033[46m' # Cyan
|
47 |
+
On_White='\033[47m' # White
|
48 |
+
|
49 |
+
# High Intensity
|
50 |
+
IBlack='\033[0;90m' # Black
|
51 |
+
IRed='\033[0;91m' # Red
|
52 |
+
IGreen='\033[0;92m' # Green
|
53 |
+
IYellow='\033[0;93m' # Yellow
|
54 |
+
IBlue='\033[0;94m' # Blue
|
55 |
+
IPurple='\033[0;95m' # Purple
|
56 |
+
ICyan='\033[0;96m' # Cyan
|
57 |
+
IWhite='\033[0;97m' # White
|
58 |
+
|
59 |
+
# Bold High Intensity
|
60 |
+
BIBlack='\033[1;90m' # Black
|
61 |
+
BIRed='\033[1;91m' # Red
|
62 |
+
BIGreen='\033[1;92m' # Green
|
63 |
+
BIYellow='\033[1;93m' # Yellow
|
64 |
+
BIBlue='\033[1;94m' # Blue
|
65 |
+
BIPurple='\033[1;95m' # Purple
|
66 |
+
BICyan='\033[1;96m' # Cyan
|
67 |
+
BIWhite='\033[1;97m' # White
|
68 |
+
|
69 |
+
# High Intensity backgrounds
|
70 |
+
On_IBlack='\033[0;100m' # Black
|
71 |
+
On_IRed='\033[0;101m' # Red
|
72 |
+
On_IGreen='\033[0;102m' # Green
|
73 |
+
On_IYellow='\033[0;103m' # Yellow
|
74 |
+
On_IBlue='\033[0;104m' # Blue
|
75 |
+
On_IPurple='\033[0;105m' # Purple
|
76 |
+
On_ICyan='\033[0;106m' # Cyan
|
77 |
+
On_IWhite='\033[0;107m' # White
|
78 |
+
|
79 |
+
# Check requirements
|
80 |
+
if ! which echo > /dev/null
|
81 |
+
then
|
82 |
+
exit -1
|
83 |
+
fi
|
84 |
+
|
85 |
+
required_programs=(find grep cut sed sha1sum)
|
86 |
+
|
87 |
+
for program in $required_programs
|
88 |
+
do
|
89 |
+
if ! which $program > /dev/null
|
90 |
+
then
|
91 |
+
echo -e "${Red}[error] Requires '$program' command to be installed${Color_Off}"
|
92 |
+
exit -1
|
93 |
+
fi
|
94 |
+
done
|
95 |
+
|
96 |
+
# Actual file processing
|
97 |
+
for htmlfile in $(find -type f -name \*.html -not -path "./node_modules/*")
|
98 |
+
do
|
99 |
+
echo -e "${BIBlue}[info] Processing '${htmlfile}' for cache busting...${Color_Off}"
|
100 |
+
|
101 |
+
LIST=$(find -type f -regex '.*\.css\|.*\.js' -not -path "./node_modules/*" | sed 's/\.\///g')
|
102 |
+
|
103 |
+
if [ "$1" = "gitadd" ]
|
104 |
+
then
|
105 |
+
LIST=$(git status -s | grep -oE "[A-Z] .+" | cut -d" " -f3)
|
106 |
+
fi
|
107 |
+
|
108 |
+
for resourcefile in $LIST
|
109 |
+
do
|
110 |
+
# Check if resource is used in html file
|
111 |
+
resourceusage=$(grep -i "$resourcefile" "$htmlfile")
|
112 |
+
if [ $? -eq 0 ]
|
113 |
+
then
|
114 |
+
# This is just for cache busting...
|
115 |
+
# If 7 first characters of SHA1 is okay for git, it should be more than enough for us
|
116 |
+
hash="$(sha1sum $resourcefile | cut -d' ' -f1 | head -c 7)"
|
117 |
+
|
118 |
+
# Check if resource hash is already correct
|
119 |
+
if ! echo "$resourceusage" | grep -i "=$hash\"" > /dev/null
|
120 |
+
then
|
121 |
+
escaped=$(echo $resourcefile | sed 's/\//\\\//g' | sed 's/\./\\./g')
|
122 |
+
sed -Ei "s/${escaped}(\?v=[a-z0-9]+)?/${escaped}?v=${hash}/g" "$htmlfile"
|
123 |
+
|
124 |
+
echo -e "${BIBlue}[info]${Color_Off} Updated resource ${resourcefile} to hash ${hash}"
|
125 |
+
fi
|
126 |
+
fi
|
127 |
+
done
|
128 |
+
done
|
openOutpaint-webUI-extension/app/.gitattributes
ADDED
@@ -0,0 +1 @@
|
|
|
|
|
1 |
+
* text eol=lf
|
openOutpaint-webUI-extension/app/.githooks/linux/pre-commit
ADDED
@@ -0,0 +1,9 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
#!/bin/sh
|
2 |
+
#
|
3 |
+
# Script to perform some basic operations to the code before committing.
|
4 |
+
|
5 |
+
# Adds file hashes to html script imports for cache busting purposes
|
6 |
+
sh .devtools/updatehashes.sh gitadd
|
7 |
+
|
8 |
+
# Adds file to current commit
|
9 |
+
git add "**.html"
|
openOutpaint-webUI-extension/app/.githooks/windows/pre-commit
ADDED
@@ -0,0 +1,9 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
#!/bin/sh
|
2 |
+
#
|
3 |
+
# Script to perform some basic operations to the code before committing.
|
4 |
+
|
5 |
+
# Adds file hashes to html script imports for cache busting purposes
|
6 |
+
powershell .devtools/updatehashes.ps1 gitadd
|
7 |
+
|
8 |
+
# Adds file to current commit
|
9 |
+
git add "**.html"
|
openOutpaint-webUI-extension/app/.github/ISSUE_TEMPLATE/bug_report.yml
ADDED
@@ -0,0 +1,91 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
name: Bug Report
|
2 |
+
description: You think somethings is broken in the UI
|
3 |
+
title: "[Bug]: "
|
4 |
+
labels: ["bug"]
|
5 |
+
assignees: zero01101, seijihariki
|
6 |
+
|
7 |
+
body:
|
8 |
+
- type: markdown
|
9 |
+
attributes:
|
10 |
+
value: |
|
11 |
+
*Please complete this form with as much detailed information as possible.*
|
12 |
+
- type: textarea
|
13 |
+
id: what-did
|
14 |
+
attributes:
|
15 |
+
label: What happened?
|
16 |
+
description: What happened that you weren't expecting, or what happened incorrectly?
|
17 |
+
validations:
|
18 |
+
required: true
|
19 |
+
- type: textarea
|
20 |
+
id: steps
|
21 |
+
attributes:
|
22 |
+
label: Steps to reproduce the problem
|
23 |
+
description: Please provide us with precise step-by-step information on how to reproduce the issue
|
24 |
+
value: |
|
25 |
+
1. Go to ....
|
26 |
+
2. Press ....
|
27 |
+
3. ... [etc]
|
28 |
+
validations:
|
29 |
+
required: true
|
30 |
+
- type: textarea
|
31 |
+
id: what-should
|
32 |
+
attributes:
|
33 |
+
label: What should have happened?
|
34 |
+
description: Describe what you believe should have ocurred instead of what actually happened.
|
35 |
+
validations:
|
36 |
+
required: true
|
37 |
+
- type: input
|
38 |
+
id: commit
|
39 |
+
attributes:
|
40 |
+
label: Commit where the problem happens
|
41 |
+
description: Which commit are you running? (i.e. https://github.com/zero01101/openOutpaint/commit/bf21c19ae352800d9e1b37bb490e817b6848e533, bf21c19)
|
42 |
+
validations:
|
43 |
+
required: true
|
44 |
+
- type: dropdown
|
45 |
+
id: platforms
|
46 |
+
attributes:
|
47 |
+
label: What platforms do you use to access openOutpaint?
|
48 |
+
multiple: true
|
49 |
+
options:
|
50 |
+
- Windows
|
51 |
+
- Linux
|
52 |
+
- MacOS
|
53 |
+
- iOS
|
54 |
+
- Android
|
55 |
+
- Other/Cloud
|
56 |
+
validations:
|
57 |
+
required: true
|
58 |
+
- type: dropdown
|
59 |
+
id: browsers
|
60 |
+
attributes:
|
61 |
+
label: What browsers do you use to access the UI ?
|
62 |
+
multiple: true
|
63 |
+
options:
|
64 |
+
- Mozilla Firefox
|
65 |
+
- Google Chrome
|
66 |
+
- Brave
|
67 |
+
- Apple Safari
|
68 |
+
- Microsoft Edge
|
69 |
+
- Opera
|
70 |
+
- Other (please list in additional information)
|
71 |
+
validations:
|
72 |
+
required: true
|
73 |
+
- type: textarea
|
74 |
+
id: browser-extensions
|
75 |
+
attributes:
|
76 |
+
label: Browser Extensions/Addons
|
77 |
+
description: Please list all browser extensions/addons you have running. Some have been known to cause issues with openOutpaint.
|
78 |
+
validations:
|
79 |
+
required: true
|
80 |
+
- type: textarea
|
81 |
+
id: webui-commandline
|
82 |
+
attributes:
|
83 |
+
label: AUTOMATIC1111 webUI Commandline Arguments
|
84 |
+
description: Please list all used commandline arguments passed to A1111 webUI (i.e. `--api`).
|
85 |
+
validations:
|
86 |
+
required: true
|
87 |
+
- type: textarea
|
88 |
+
id: misc
|
89 |
+
attributes:
|
90 |
+
label: Additional information
|
91 |
+
description: Please provide us with any relevant additional information, context, screenshots, etc.
|
openOutpaint-webUI-extension/app/.github/ISSUE_TEMPLATE/feature_request.yml
ADDED
@@ -0,0 +1,48 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
name: Feature request
|
2 |
+
description: Suggest an idea for this project
|
3 |
+
title: "[Feature Request]: "
|
4 |
+
labels: ["enhancement"]
|
5 |
+
assignees: zero01101, seijihariki
|
6 |
+
|
7 |
+
body:
|
8 |
+
- type: markdown
|
9 |
+
attributes:
|
10 |
+
value: |
|
11 |
+
*Please complete this form with as much detailed information as possible.*
|
12 |
+
- type: textarea
|
13 |
+
id: related
|
14 |
+
attributes:
|
15 |
+
label: Is your feature request related to a problem? Please describe.
|
16 |
+
description: A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
|
17 |
+
validations:
|
18 |
+
required: true
|
19 |
+
- type: textarea
|
20 |
+
id: feature
|
21 |
+
attributes:
|
22 |
+
label: Describe the solution you'd like
|
23 |
+
description: A clear and concise description of what you want to happen, preferably with example use-case scenario.
|
24 |
+
validations:
|
25 |
+
required: true
|
26 |
+
- type: textarea
|
27 |
+
id: workflow
|
28 |
+
attributes:
|
29 |
+
label: Proposed workflow
|
30 |
+
description: Please provide us with step by step information on how you'd like the feature to be accessed and used
|
31 |
+
value: |
|
32 |
+
1. Go to ....
|
33 |
+
2. Press ....
|
34 |
+
3. ...
|
35 |
+
validations:
|
36 |
+
required: true
|
37 |
+
- type: textarea
|
38 |
+
id: alternatives
|
39 |
+
attributes:
|
40 |
+
label: Describe alternatives you've considered
|
41 |
+
description: A clear and concise description of any alternative solutions or features you've considered.
|
42 |
+
validations:
|
43 |
+
required: true
|
44 |
+
- type: textarea
|
45 |
+
id: misc
|
46 |
+
attributes:
|
47 |
+
label: Additional context
|
48 |
+
description: Add any other context or screenshots about the feature request here.
|
openOutpaint-webUI-extension/app/.github/workflows/autoformat.yml
ADDED
@@ -0,0 +1,22 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
name: Prettier Autoformatting
|
2 |
+
on:
|
3 |
+
push:
|
4 |
+
branches:
|
5 |
+
- "main"
|
6 |
+
- "testing"
|
7 |
+
pull_request:
|
8 |
+
branches: [main, testing]
|
9 |
+
types: [opened, synchronize, closed]
|
10 |
+
|
11 |
+
jobs:
|
12 |
+
prettier:
|
13 |
+
runs-on: ubuntu-latest
|
14 |
+
steps:
|
15 |
+
- name: Checkout
|
16 |
+
uses: actions/checkout@v3
|
17 |
+
with:
|
18 |
+
ref: ${{ github.event.pull_request.head.sha }}
|
19 |
+
- name: Prettify
|
20 |
+
uses: creyD/[email protected]
|
21 |
+
with:
|
22 |
+
prettier_options: --write **/*.{js,html,css,md}
|
openOutpaint-webUI-extension/app/.github/workflows/cachebusting.yml
ADDED
@@ -0,0 +1,26 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
name: Cache Busting
|
2 |
+
on:
|
3 |
+
push:
|
4 |
+
branches:
|
5 |
+
- "main"
|
6 |
+
- "testing"
|
7 |
+
pull_request:
|
8 |
+
branches: [main, testing]
|
9 |
+
types: [opened, synchronize, closed]
|
10 |
+
|
11 |
+
jobs:
|
12 |
+
update_hashes:
|
13 |
+
runs-on: ubuntu-latest
|
14 |
+
steps:
|
15 |
+
- name: Checkout
|
16 |
+
uses: actions/checkout@v3
|
17 |
+
with:
|
18 |
+
ref: ${{ github.event.pull_request.head.ref }}
|
19 |
+
- name: Update hashes in html files
|
20 |
+
run: bash .devtools/updatehashes.sh
|
21 |
+
- name: Commit
|
22 |
+
uses: EndBug/[email protected]
|
23 |
+
with:
|
24 |
+
committer_name: Github Actions
|
25 |
+
committer_email: [email protected]
|
26 |
+
message: "Fixed resource hashes"
|
openOutpaint-webUI-extension/app/.gitignore
ADDED
@@ -0,0 +1,12 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
.vscode/*
|
2 |
+
|
3 |
+
# Key for embedding
|
4 |
+
key.json
|
5 |
+
|
6 |
+
# NPM things
|
7 |
+
package.json
|
8 |
+
package-lock.json
|
9 |
+
node_modules/
|
10 |
+
|
11 |
+
# Yarn things
|
12 |
+
yarn.lock
|
openOutpaint-webUI-extension/app/.prettierrc.json
ADDED
@@ -0,0 +1,19 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
{
|
2 |
+
"arrowParens": "always",
|
3 |
+
"bracketSameLine": true,
|
4 |
+
"bracketSpacing": false,
|
5 |
+
"embeddedLanguageFormatting": "auto",
|
6 |
+
"htmlWhitespaceSensitivity": "ignore",
|
7 |
+
"insertPragma": false,
|
8 |
+
"jsxSingleQuote": false,
|
9 |
+
"printWidth": 80,
|
10 |
+
"proseWrap": "preserve",
|
11 |
+
"quoteProps": "as-needed",
|
12 |
+
"requirePragma": false,
|
13 |
+
"semi": true,
|
14 |
+
"singleQuote": false,
|
15 |
+
"tabWidth": 2,
|
16 |
+
"trailingComma": "es5",
|
17 |
+
"useTabs": true,
|
18 |
+
"vueIndentScriptAndStyle": false
|
19 |
+
}
|
openOutpaint-webUI-extension/app/CONTRIBUTING.md
ADDED
@@ -0,0 +1,63 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
# Contributing to openOutpaint
|
2 |
+
|
3 |
+
We love your input! We want to make contributing to this project as easy and transparent as possible, whether it's:
|
4 |
+
|
5 |
+
- Reporting a bug
|
6 |
+
- Discussing the current state of the code
|
7 |
+
- Submitting a fix
|
8 |
+
- Proposing new features
|
9 |
+
- Becoming a maintainer
|
10 |
+
|
11 |
+
## We Develop with Github
|
12 |
+
|
13 |
+
We use github to host code, to track issues and feature requests, as well as accept pull requests.
|
14 |
+
|
15 |
+
## We Use [Github Flow](https://guides.github.com/introduction/flow/index.html), So All Code Changes Happen Through Pull Requests
|
16 |
+
|
17 |
+
Pull requests are the best way to propose changes to the codebase (we use [Github Flow](https://guides.github.com/introduction/flow/index.html)). We actively welcome your pull requests:
|
18 |
+
|
19 |
+
1. Fork the repo and create your branch from `main` or `testing`.
|
20 |
+
2. Setup [commit hooks](https://github.com/zero01101/openOutpaint/tree/main/.devtools) for automatic calculation of cache busting hashes for resources.
|
21 |
+
3. Please add comments when reasonable, and when possible, use [JSDoc](https://jsdoc.app/) for documenting types. Lack of this will not prevent your pull being merged, but it would be nice to have.
|
22 |
+
4. If you've added code that should be tested please pull into `testing`. For documentation and smaller fixes, a pull request directly to `main` should be okay, unless it pertains to changes only present in `testing`.
|
23 |
+
5. Create a pull request with a short description of what you did. Thanks for your contribution!
|
24 |
+
|
25 |
+
## Any contributions you make will be under the MIT Software License
|
26 |
+
|
27 |
+
In short, when you submit code changes, your submissions are understood to be under the same [MIT License](http://choosealicense.com/licenses/mit/) that covers the project. Feel free to contact the maintainers if that's a concern.
|
28 |
+
|
29 |
+
## Report bugs using Github's [issues](https://github.com/zero01101/openOutpaint/issues)
|
30 |
+
|
31 |
+
We use GitHub issues to track public bugs. Report a bug by [opening a new issue](https://github.com/zero01101/openOutpaint/issues); it's that easy!
|
32 |
+
|
33 |
+
## Write bug reports with detail, background, and sample code
|
34 |
+
|
35 |
+
If possible, bug reports should have the most detail it is reasonable to have for the bug in question. If you are more versed in javascript, pointing out the issue in code, or even creating a pull request is also appreciated!
|
36 |
+
|
37 |
+
**Great Bug Reports** tend to have:
|
38 |
+
|
39 |
+
- A quick summary and/or background
|
40 |
+
- Steps to reproduce
|
41 |
+
- Be specific!
|
42 |
+
- Give sample code or screenshots if you can!
|
43 |
+
- What you expected would happen
|
44 |
+
- What actually happens
|
45 |
+
- Notes (possibly including why you think this might be happening, or stuff you tried that didn't work)
|
46 |
+
|
47 |
+
We have some issue templates that are, admittedly, basically github's default templates. You can and should use that as a guide. Sometimes some fields may not be applicable to your particular report. In this case, things such as _alternative solutions_ don't need to be included.
|
48 |
+
|
49 |
+
People _love_ thorough bug reports. I'm not even kidding.
|
50 |
+
|
51 |
+
## Use a Consistent Coding Style
|
52 |
+
|
53 |
+
For styling, we are currently using prettier for linting. And that's basically it. We are currently using tabs and some other defaults defined in the [.prettierrc.json](https://github.com/zero01101/openOutpaint/blob/main/.prettierrc.json) file. We don't use npm on our project, so you would have to install prettier and prettier-eslint locally. We have a handy [lint.sh](https://github.com/zero01101/openOutpaint/blob/main/lint.sh) script you can run, but it is recommended to use an IDE with prettier support for more practical use.
|
54 |
+
|
55 |
+
Any suggestions regarding change of styles or style guides (Airbnb, Google, or whatnot) are welcome, as the current file is quite simplistic.
|
56 |
+
|
57 |
+
## License
|
58 |
+
|
59 |
+
By contributing, you agree that your contributions will be licensed under its MIT License.
|
60 |
+
|
61 |
+
## References
|
62 |
+
|
63 |
+
This document was adapted from the open-source contribution guidelines for [Facebook's Draft](https://github.com/facebook/draft-js/blob/a9316a723f9e918afde44dea68b5f9f39b7d9b00/CONTRIBUTING.md) and based on [this template from briandk](https://gist.github.com/briandk/3d2e8b3ec8daf5a27a62).
|
openOutpaint-webUI-extension/app/LICENSE
ADDED
@@ -0,0 +1,21 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
MIT License
|
2 |
+
|
3 |
+
Copyright (c) 2022 tim h
|
4 |
+
|
5 |
+
Permission is hereby granted, free of charge, to any person obtaining a copy
|
6 |
+
of this software and associated documentation files (the "Software"), to deal
|
7 |
+
in the Software without restriction, including without limitation the rights
|
8 |
+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
9 |
+
copies of the Software, and to permit persons to whom the Software is
|
10 |
+
furnished to do so, subject to the following conditions:
|
11 |
+
|
12 |
+
The above copyright notice and this permission notice shall be included in all
|
13 |
+
copies or substantial portions of the Software.
|
14 |
+
|
15 |
+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
16 |
+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
17 |
+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
18 |
+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
19 |
+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
20 |
+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
21 |
+
SOFTWARE.
|
openOutpaint-webUI-extension/app/README.md
ADDED
@@ -0,0 +1,92 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
# hello there 🐠
|
2 |
+
|
3 |
+
[openOutpaint creating some undersea... well, stuff](https://user-images.githubusercontent.com/1649724/205455599-7817812e-5b50-4c96-807e-268b40fa2fd7.mp4)
|
4 |
+
|
5 |
+
_silly demo example current as of [9b174d6](https://github.com/zero01101/openOutpaint/commit/9b174d66c9b9d83ce8657128c97f917b473b13a9) / v0.0.8 / 2022-12-03_ //TODO UPDATE SRSLY
|
6 |
+
|
7 |
+
this is a completely vanilla javascript and html canvas outpainting convenience doodad built for the API optionally exposed by [AUTOMATIC1111's stable diffusion webUI](https://github.com/AUTOMATIC1111/stable-diffusion-webui), operating similarly to a few others that are probably more well-known. this simply offers an alternative for my following vain desires:
|
8 |
+
|
9 |
+
- avoiding the overhead of an additional virtual python environment or impacting a pre-existing one
|
10 |
+
- operates against the API exposed by A1111's webUI
|
11 |
+
- no external dependencies, extremely boring vanilla
|
12 |
+
- no external connectivity, self-hosted and offline
|
13 |
+
- unobfuscated (cough cough)
|
14 |
+
- <a name="terrible"></a>i am terrible at javascript and should probably correct that
|
15 |
+
- i have never used html canvas for anything before and should try it out
|
16 |
+
|
17 |
+
## features
|
18 |
+
|
19 |
+
- SDXL "support"! (please check outpaint/inpaint fill types in the context menus and fiddle with denoising a LOT for img2img, it's touchy)
|
20 |
+
- [now available as an extension for webUI!](https://github.com/zero01101/openOutpaint-webUI-extension) you can find it under the default "available" section in the webUI _extensions_ tab
|
21 |
+
- **_NOTE: extension still requires `--api` flag in webui-user launch script_**
|
22 |
+
- intuitive, convenient outpainting - that's like the whole point right
|
23 |
+
- queueable, cancelable dreams - just start a'clickin' all over the place
|
24 |
+
- arbitrary dream reticle size - draw the rectangle of your dreams
|
25 |
+
- an [effectively infinite](https://github.com/zero01101/openOutpaint/pull/108), resizable, scalable canvas for you to paint all over
|
26 |
+
- **_NOTE: v0.0.10 introduces a new "camera control" modifier key - hold [`CTRL`] and use the scrollwheel to zoom (scroll the wheel or use the two-finger vertical gesture on, uh, modern touchpads) and pan (hold the scrollwheel button, or if you don't have one, left-click button) around the canvas_**
|
27 |
+
- extremely limited, janky support for a shockingly restrictive list of A1111 extensions including controlnet inpainting for legitimately magic promptless inpainting and outpainting ([a](https://github.com/Mikubill/sd-webui-controlnet/discussions/1464), [b](https://github.com/Mikubill/sd-webui-controlnet/discussions/1143), [c](https://github.com/Mikubill/sd-webui-controlnet/discussions/1597)) and in-line reference preprocessors for keeping existing style while replacing things (reference requires at least 2 controlnet units enabled in A1111 settings), as well as a very very basic dynamic-prompts-on-or-off toggle
|
28 |
+
- **_NOTE: this is_ JANKY, _pull requests greatly welcomed lol_**
|
29 |
+
- a very nicely functional and familiar layer system
|
30 |
+
- save, load, import, and export workspaces - includes all your layers, history, canvas size, you name it!
|
31 |
+
- inpainting/touchup mask brush
|
32 |
+
- webUI script support (but you gotta [_find it_](https://github.com/zero01101/openOutpaint/wiki/Manual))
|
33 |
+
- prompt history panel
|
34 |
+
- optional (visibly) inverted mask mode - red masks get mutated, blue masks stay the same, but you can't take both pills at once
|
35 |
+
- inpainting color brush to bring out your inner vincent van bob ross
|
36 |
+
- dedicated img2img tool with optional border masking for enhanced output coherence with existing subject matter
|
37 |
+
- marquee select tool to select regions and arbitrarily scale, rotate, create stamps, move chunks, peek at lower layers, do all sorts of damage
|
38 |
+
- optionally decoupled cursor size and output resolution
|
39 |
+
- interrogate tool
|
40 |
+
- floating control panel to easily change models/samplers/steps/prompts/CFG/etc options for each dream summoned from the latent void _(NOTE: model switching requires A1111 webUI to be on commit [5a6387e](https://github.com/AUTOMATIC1111/stable-diffusion-webui/commit/5a6387e189dc365c47a7979b9040d5b6fdd7ba43) or more recent)_
|
41 |
+
- floating toolbox with handy keyboard shortcuts
|
42 |
+
- optional grid snapping for precision
|
43 |
+
- optional hi-res fix for blank/txt2img dreams
|
44 |
+
- **_NOTE: as of v0.0.12.5/webUI commit [ef27a18](https://github.com/AUTOMATIC1111/stable-diffusion-webui/commit/ef27a18b6b7cb1a8eebdc9b2e88d25baf2c2414d), HRfix has been COMPLETELY reworked and no longer works remotely the same, thus openOutpaint's implementation is no longer compatible with versions of A1111 predating that. You will be alerted to the outdated webUI and the HRfix option will become limited to simply using [reticle dimensions / 2] in this event. Please see the [manual entry](https://github.com/zero01101/openOutpaint/wiki/Manual#hrfix) regarding HRfix and its available options._**
|
45 |
+
- optional overmasking for potentially better seams between outpaints - set overmask px value to 0 to disable the feature
|
46 |
+
- import arbitrary images and rotate/scale/stamp on the canvas whenever, wherever you'd like
|
47 |
+
- upscaler support for final output images
|
48 |
+
- saves your preferences/imported images to browser localstorage for maximum convenience
|
49 |
+
- reset to defaults button to unsave your preferences if things go squirrely
|
50 |
+
- floating navigable undo/redo palette with ctrl+z/y keyboard shortcuts for additional maximum convenience and desquirreliness
|
51 |
+
- optional generate-ahead function to keep crankin' out the dreams while you look through the ones that already exist
|
52 |
+
- _all this and much more for the low, low price of simply already owning an expensive GPU!_
|
53 |
+
|
54 |
+
## operation
|
55 |
+
|
56 |
+
**_NOTE: [PLEASE SEE DOCUMENTATION REGARDING NEW HRfix FEATURES](https://github.com/zero01101/openOutpaint/wiki/Manual#hrfix) IMPLEMENTED AS OF webUI COMMIT [ef27a18](https://github.com/AUTOMATIC1111/stable-diffusion-webui/commit/ef27a18b6b7cb1a8eebdc9b2e88d25baf2c2414d)_**
|
57 |
+
|
58 |
+
### prerequisities
|
59 |
+
|
60 |
+
you'll obviously need A1111's webUI installed before you can use this, thus you're presumed to have an operational python install up and running to boot.
|
61 |
+
|
62 |
+
A1111 webUI must be launched with the `--api` flag enabled, and the `--cors-allow-origins=` flag set with the host where openOutpaint will be running.
|
63 |
+
|
64 |
+
**_NOTE: the commandline flag `--gradio-debug` disables custom API routes and completely breaks openOutpaint. please remove it from your COMMANDLINE_ARGS before running openOutpaint._**
|
65 |
+
|
66 |
+
### surprising incompatibilities
|
67 |
+
|
68 |
+
**_COLAB USERS: you may experience issues installing openOutpaint (and other webUI extensions) - there is a workaround that has been discovered and tested against [TheLastBen's fast-stable-diffusion](https://github.com/TheLastBen/fast-stable-diffusion). Please see [this discussion](https://github.com/TheLastBen/fast-stable-diffusion/discussions/1161) containing the workaround, which requires adding a command into the final cell of the colab, as well as setting `Enable_API` to `True`._**
|
69 |
+
|
70 |
+
If anything goes wrong with openOutpaint, try running it on another browser and disable all extensions and try again. If a new incompatible extension is found, please open an issue so we can notify other users of extension incompatibilities.
|
71 |
+
|
72 |
+
- [microsoft editor extension for chrome/edge seems to disable the overmask slider](https://github.com/zero01101/openOutpaint/discussions/88#discussioncomment-4498341)
|
73 |
+
- ~~[duckduckgo privacy extension for firefox breaks outpainting, resulting in pure black output](https://github.com/zero01101/openOutpaint-webUI-extension/issues/3#issuecomment-1367694000) - add an exception for your openOutpaint host (likely localhost or 127.0.0.1)~~ should be fixed as of [b128943](https://github.com/zero01101/openOutpaint/commit/b128943f0c94970600fdc1c98bfec22de619866f)
|
74 |
+
- ~~[same for dark reader](https://github.com/zero01101/openOutpaint-webUI-extension/issues/3#issuecomment-1367838766)~~ same for dark reader
|
75 |
+
|
76 |
+
### quickstart speedrun
|
77 |
+
|
78 |
+
1. edit your `cors-allow-origins` to include https://zero01101.github.io and run webUI
|
79 |
+
2. go to https://zero01101.github.io/openOutpaint/ and fill in the host value with your webUI API address
|
80 |
+
3. click things and do stuff
|
81 |
+
|
82 |
+
### step-by-step actually useful instructions
|
83 |
+
|
84 |
+
please see the [quickstart wiki article](https://github.com/zero01101/openOutpaint/wiki/SBS-Guided-Example) and comprehensive [manual](https://github.com/zero01101/openOutpaint/wiki/Manual).
|
85 |
+
|
86 |
+
## pull requests/bug reports
|
87 |
+
|
88 |
+
please do! see [contributing](https://github.com/zero01101/openOutpaint/blob/main/CONTRIBUTING.md) for details!
|
89 |
+
|
90 |
+
## warranty
|
91 |
+
|
92 |
+
[lmao](https://github.com/moyix/fauxpilot#support-and-warranty)
|