Skip to content

Commit 480d17c

Browse files
zhchaoxingzhchaoxing
committed
add our changes from airi-api-v1.6.0-sam-dilate
commit 2a8419d Author: Hal <zhchaoxing@hotmail.com> Date: Wed Mar 27 21:42:59 2024 +0800 Update api.py commit 5b8a41e Author: Hal <zhchaoxing@hotmail.com> Date: Wed Mar 27 20:37:41 2024 +0800 Update api.py commit 7b33080 Author: Hal <zhchaoxing@hotmail.com> Date: Wed Mar 27 18:15:06 2024 +0800 Update api.py commit 3308809 Author: Hal <zhchaoxing@hotmail.com> Date: Wed Mar 27 16:23:26 2024 +0800 Update api.py commit e5c403c Author: Hal <zhchaoxing@hotmail.com> Date: Wed Mar 27 16:02:22 2024 +0800 update image metadata commit 4783bc6 Author: Hal <zhchaoxing@hotmail.com> Date: Thu Mar 21 22:29:42 2024 +0800 Update api.py commit adc5a2d Author: Hal <zhchaoxing@hotmail.com> Date: Thu Mar 21 21:54:39 2024 +0800 Update api.py commit ca76ef8 Author: Hal <zhchaoxing@hotmail.com> Date: Thu Mar 21 19:38:24 2024 +0800 Update api.py commit 6e53e2e Author: Hal <zhchaoxing@hotmail.com> Date: Thu Mar 21 12:59:28 2024 +0800 Update api.py commit 40b4a21 Author: Hal <zhchaoxing@hotmail.com> Date: Wed Mar 20 00:13:08 2024 +0800 Update api.py commit dfbc64a Author: Hal <zhchaoxing@hotmail.com> Date: Tue Mar 19 23:31:28 2024 +0800 Update api.py commit 5930576 Author: Hal <zhchaoxing@hotmail.com> Date: Tue Mar 19 23:26:12 2024 +0800 Update api.py commit 0a049cf Author: Hal <zhchaoxing@hotmail.com> Date: Tue Mar 19 22:52:37 2024 +0800 Update api.py commit 4f84df8 Author: Hal <zhchaoxing@hotmail.com> Date: Tue Mar 19 21:20:44 2024 +0800 Update api.py commit d6c605b Author: Hal <zhchaoxing@hotmail.com> Date: Tue Mar 19 20:12:23 2024 +0800 Update api.py commit cb44b44 Author: Hal <zhchaoxing@hotmail.com> Date: Tue Mar 19 19:48:53 2024 +0800 Update api.py commit 52d9a34 Author: Hal <zhchaoxing@hotmail.com> Date: Tue Mar 19 19:47:25 2024 +0800 Update api.py commit f803fb8 Author: Hal <zhchaoxing@hotmail.com> Date: Tue Mar 19 17:54:49 2024 +0800 Update api.py commit 4a59414 Author: Hal <zhchaoxing@hotmail.com> Date: Tue Mar 19 14:58:04 2024 +0800 Update api.py commit c7ff8de Author: Hal <zhchaoxing@hotmail.com> Date: Tue Mar 19 12:58:17 2024 +0800 Update api.py commit 43f5759 Author: Hal <zhchaoxing@hotmail.com> Date: Tue Mar 19 11:33:34 2024 +0800 Update api.py commit 6faeeac Author: Hal <zhchaoxing@hotmail.com> Date: Tue Mar 19 10:57:13 2024 +0800 Update api.py commit 538faf9 Author: Hal <zhchaoxing@hotmail.com> Date: Tue Mar 19 09:57:02 2024 +0800 Update api.py commit 9dc3f35 Author: Hal <zhchaoxing@hotmail.com> Date: Mon Mar 18 22:42:41 2024 +0800 Update api.py commit 4260fbb Author: Hal <zhchaoxing@hotmail.com> Date: Mon Mar 18 21:58:58 2024 +0800 Update api.py commit 34da505 Author: Hal <zhchaoxing@hotmail.com> Date: Mon Mar 18 21:16:48 2024 +0800 Update api.py commit 89a2517 Author: Hal <zhchaoxing@hotmail.com> Date: Mon Mar 18 16:13:40 2024 +0800 Update api.py commit a5553ad Author: Hal <zhchaoxing@hotmail.com> Date: Mon Mar 18 00:02:33 2024 +0800 Update api.py commit 2cbf9b4 Author: zhchaoxing <zhchaoxing@hotmail.com> Date: Sun Mar 17 16:14:15 2024 +0800 Update api.py commit b11e33b Author: Hal <zhchaoxing@hotmail.com> Date: Sun Mar 17 15:39:46 2024 +0800 Update api.py commit 2a1158f Author: Hal <zhchaoxing@hotmail.com> Date: Sun Mar 17 00:22:03 2024 +0800 Update api.py commit c91fb2c Author: Hal <zhchaoxing@hotmail.com> Date: Sat Mar 16 23:44:15 2024 +0800 Update api.py commit bb52b38 Author: Hal <zhchaoxing@hotmail.com> Date: Sat Mar 16 23:10:35 2024 +0800 Update api.py commit ffa155c Author: Hal <zhchaoxing@hotmail.com> Date: Sat Mar 16 19:35:09 2024 +0800 Update api.py commit 6c2acbb Author: Hal <zhchaoxing@hotmail.com> Date: Sat Mar 16 13:03:38 2024 +0800 Update api.py commit 2150881 Author: Hal <zhchaoxing@hotmail.com> Date: Sat Mar 16 00:37:50 2024 +0800 Update api.py commit 98e9439 Author: Hal <zhchaoxing@hotmail.com> Date: Sat Mar 16 00:07:16 2024 +0800 Update api.py commit a028e6b Author: Hal <zhchaoxing@hotmail.com> Date: Fri Mar 15 17:46:18 2024 +0800 update exif commit 9e2a3e2 Author: Hal <zhchaoxing@hotmail.com> Date: Fri Mar 15 15:32:07 2024 +0800 Fix exif, add user_input to exif, and add user info logging Squashed commit of the following: commit 3ac4664 Author: Hal <zhchaoxing@hotmail.com> Date: Fri Mar 15 11:35:54 2024 +0800 Update api.py commit c333fcd Author: Hal <zhchaoxing@hotmail.com> Date: Fri Mar 15 11:20:13 2024 +0800 Revert "sanity check, revert to default" This reverts commit aa0d545. commit aa0d545 Author: Hal <zhchaoxing@hotmail.com> Date: Thu Mar 14 20:08:51 2024 +0800 sanity check, revert to default commit 3b89d77 Author: Hal <zhchaoxing@hotmail.com> Date: Thu Mar 14 18:43:47 2024 +0800 Update api.py commit 7ba924a Author: Hal <zhchaoxing@hotmail.com> Date: Thu Mar 14 16:29:56 2024 +0800 add log of GenID commit cdaddb6 Author: zhchaoxing <zhchaoxing@hotmail.com> Date: Thu Jan 4 01:03:01 2024 -0800 debug commit 45f8b09 Author: zhchaoxing <zhchaoxing@hotmail.com> Date: Thu Jan 4 00:54:36 2024 -0800 debug commit e27eb8b Author: zhchaoxing <zhchaoxing@hotmail.com> Date: Thu Jan 4 00:13:50 2024 -0800 Update api.py commit b1e571f Author: zhchaoxing <zhchaoxing@hotmail.com> Date: Wed Jan 3 23:30:53 2024 -0800 debug commit 9bb4ec3 Author: zhchaoxing <zhchaoxing@hotmail.com> Date: Wed Jan 3 22:35:26 2024 -0800 debug commit f23dcb1 Author: zhchaoxing <zhchaoxing@hotmail.com> Date: Wed Jan 3 20:03:17 2024 -0800 debug commit e573427 Author: zhchaoxing <zhchaoxing@hotmail.com> Date: Wed Jan 3 17:34:41 2024 -0800 debug commit c2c7008 Author: zhchaoxing <zhchaoxing@hotmail.com> Date: Wed Jan 3 06:49:43 2024 -0800 debug commit 6c88788 Author: zhchaoxing <zhchaoxing@hotmail.com> Date: Wed Jan 3 05:13:28 2024 -0800 debug commit 39ba708 Author: zhchaoxing <zhchaoxing@hotmail.com> Date: Wed Jan 3 05:10:41 2024 -0800 debug commit 55f379f Author: zhchaoxing <zhchaoxing@hotmail.com> Date: Wed Jan 3 00:40:46 2024 -0800 debug commit f18cfae Author: zhchaoxing <zhchaoxing@hotmail.com> Date: Tue Jan 2 21:56:14 2024 -0800 debug commit f388d1a Author: zhchaoxing <zhchaoxing@hotmail.com> Date: Tue Jan 2 20:15:07 2024 -0800 debug commit b2f7a8d Author: zhchaoxing <zhchaoxing@hotmail.com> Date: Tue Jan 2 19:22:08 2024 -0800 debug Update api.py Update api.py commit 283a5db Author: zhchaoxing <zhchaoxing@hotmail.com> Date: Mon Dec 4 22:44:18 2023 -0800 debug commit 7471c32 Author: zhchaoxing <zhchaoxing@hotmail.com> Date: Mon Nov 27 22:34:27 2023 -0800 debug commit 9523dcf Author: zhchaoxing <zhchaoxing@hotmail.com> Date: Mon Nov 27 19:27:23 2023 -0800 fix github action commit 5a9afe1 Author: zhchaoxing <zhchaoxing@hotmail.com> Date: Mon Nov 27 18:39:19 2023 -0800 debug commit 019e8e3 Author: Hal <zhchaoxing@hotmail.com> Date: Wed Nov 22 20:06:16 2023 -0800 Add our changes
1 parent 6c8afb2 commit 480d17c

File tree

7 files changed

+479
-92
lines changed

7 files changed

+479
-92
lines changed

‎.github/workflows/run_tests.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -57,11 +57,11 @@ jobs:
5757
2>&1 | tee output.txt &
5858
- name: Run tests
5959
run: |
60-
wait-for-it --service 127.0.0.1:7860 -t 20
60+
wait-for-it --service 127.0.0.1:8080 -t 600
6161
python -m pytest -vv --junitxml=test/results.xml --cov . --cov-report=xml --verify-base-url test
6262
- name: Kill test server
6363
if: always()
64-
run: curl -vv -XPOST http://127.0.0.1:7860/sdapi/v1/server-stop && sleep 10
64+
run: curl -vv -XPOST http://127.0.0.1:8080/sdapi/v1/server-stop && sleep 10
6565
- name: Show coverage
6666
run: |
6767
python -m coverage combine .coverage*

‎.gitignore

+6-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ __pycache__
1313
/gfpgan/weights/*.pth
1414
/ui-config.json
1515
/outputs
16-
/config.json
1716
/log
1817
/webui.settings.bat
1918
/embeddings
@@ -38,3 +37,9 @@ notification.mp3
3837
/package-lock.json
3938
/.coverage*
4039
/test/test_outputs
40+
.DS_Store
41+
build.info
42+
**/.DS_Store
43+
models/Stable-diffusion/00v2.1_768-ema-pruned.safetensors
44+
models/Stable-diffusion/00v2.1_768-ema-pruned.yaml
45+
webui-user.bat

‎config.json

+26
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
{
2+
"samples_format": "jpeg",
3+
"control_net_model_config": "models/cldm_v21.yaml",
4+
"control_net_max_models_num": 3,
5+
"control_net_model_cache_size": 5,
6+
"control_net_monocular_depth_optim": true,
7+
"control_net_cfg_based_guidance": true,
8+
"control_net_control_transfer": true,
9+
"control_net_no_detectmap": true,
10+
"control_net_detectmap_autosaving": false,
11+
"control_net_only_midctrl_hires": true,
12+
"control_net_allow_script_control": true,
13+
"control_net_skip_img2img_processing": false,
14+
"control_net_only_mid_control": false,
15+
"control_net_sync_field_args": false,
16+
"CLIP_stop_at_last_layers": 2,
17+
"multiple_tqdm": false,
18+
"auto_vae_precision": true,
19+
"upcast_attn": true,
20+
"enable_quantization": true,
21+
"img_max_size_mp": 10.0,
22+
"export_for_4chan": true,
23+
"img_downscale_threshold": 6.0,
24+
"target_side_length": 3600.0,
25+
"randn_source": "CPU"
26+
}

‎launch.py

+10-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,16 @@
2323
configure_for_tests = launch_utils.configure_for_tests
2424
start = launch_utils.start
2525

26-
26+
def debug():
27+
import os
28+
if os.path.isdir('/opt/ml/code/models/ESRGAN'):
29+
print(f"/opt/ml/code/models/ESRGAN exists, contains:")
30+
files = os.listdir('/opt/ml/code/models/ESRGAN')
31+
for file in files:
32+
print(file)
33+
else:
34+
print(f"/opt/ml/code/models/ESRGAN doesn't exists")
35+
print(f"Curently at: {os.getcwd()}")
2736
def main():
2837
if args.dump_sysinfo:
2938
filename = launch_utils.dump_sysinfo()

0 commit comments

Comments
 (0)