Skip to content

Commit

Permalink
Rebased api_airi_jerry_merge branch with the latest master of a111
Browse files Browse the repository at this point in the history 
Rebased api_airi_jerry_merge branch with the latest master of a111, except:
- removed requirements.txt following aws jerry api
- used modules/shared.py, webui.py, webui.sh, requirements_versions.txt from a1111 master for now

Squashed api_airi_jerry_merge commit of the following:

commit 2dc849a
Merge: 1cc9b93 63613b8
Author: Hal <zhchaoxing@hotmail.com>
Date:   Thu May 25 00:49:46 2023 -0700

    Merge branch 'api' into api_airi_new_merge

commit 63613b8
Merge: b34e11e c74d4fe
Author: Hal <zhchaoxing@hotmail.com>
Date:   Thu May 25 00:48:37 2023 -0700

    Merge branch 'api' of https://github.com/AIRI-AUBE/aws-stable-diffusion-webui-api into api

commit 1cc9b93
Author: KingLollipop <40582400+jacquesfeng123@users.noreply.github.com>
Date:   Mon May 22 11:44:46 2023 +0800

    easier debug

    - change config.json
    - cleanup api.py log

commit c74d4fe
Author: xieyongliang <yongliangxie@hotmail.com>
Date:   Mon May 22 10:30:49 2023 +0800

    add interrogateapi

commit 17ea042
Author: xieyongliang <yongliangxie@hotmail.com>
Date:   Thu May 18 21:33:33 2023 +0800

    update api.py

commit 1573f3a
Author: xieyongliang <yongliangxie@hotmail.com>
Date:   Mon May 15 13:11:57 2023 +0800

    update api.py

commit ccac477
Author: xieyongliang <yongliangxie@hotmail.com>
Date:   Mon May 15 12:34:48 2023 +0800

    revert change in api.py

commit 0237723
Author: xieyongliang <yongliangxie@hotmail.com>
Date:   Mon May 15 12:28:23 2023 +0800

    update api.py

commit f3b8f00
Author: xieyongliang <yongliangxie@hotmail.com>
Date:   Mon May 15 09:40:25 2023 +0800

    update api.py

commit ef68144
Author: xieyongliang <yongliangxie@hotmail.com>
Date:   Sun May 14 19:19:09 2023 +0800

    fix issues with s3_download

commit b6573ec
Author: xieyongliang <yongliangxie@hotmail.com>
Date:   Sat May 13 22:03:17 2023 +0800

    revise image exported to s3

commit 0c131b4
Author: xieyongliang <yongliangxie@hotmail.com>
Date:   Wed May 10 15:13:59 2023 +0800

    upgrade accelerate to 18.04

commit b26f7fb
Author: xieyongliang <yongliangxie@hotmail.com>
Date:   Fri May 5 21:59:55 2023 +0800

    cleanup

commit 9fdadbc
Merge: 480a6a8 93a20e2
Author: xieyongliang <yongliangxie@hotmail.com>
Date:   Fri May 5 21:54:43 2023 +0800

    Merge pull request AUTOMATIC1111#19 from xiehust/api

    dynamic models loading

commit 93a20e2
Merge: bd45110 480a6a8
Author: xieyongliang <yongliangxie@hotmail.com>
Date:   Fri May 5 21:54:32 2023 +0800

    Merge branch 'api' into api

commit 480a6a8
Author: xieyongliang <yongliangxie@hotmail.com>
Date:   Fri May 5 21:52:12 2023 +0800

    cleanup

commit bd45110
Author: xieyongliang <yongliangxie@hotmail.com>
Date:   Fri May 5 21:46:13 2023 +0800

    Update api.py

commit 3cef84f
Merge: cec5c44 6c0d58e
Author: xieyongliang <yongliangxie@hotmail.com>
Date:   Fri May 5 21:04:20 2023 +0800

    Merge pull request AUTOMATIC1111#20 from xieyongliang/api-dev

    merge from api-dev branch

commit 6c0d58e
Author: xieyongliang <yongliangxie@hotmail.com>
Date:   Thu May 4 15:49:52 2023 +0800

    fix issues with s3_download

commit 44029c4
Author: xieyongliang <yongliangxie@hotmail.com>
Date:   Thu May 4 14:57:37 2023 +0800

    fix issues with s3_download

commit cec5c44
Author: xieyongliang <yongliangxie@hotmail.com>
Date:   Wed May 3 23:49:21 2023 +0800

    add region_name into training script as hyperparameter

commit 666008c
Author: xieyongliang <yongliangxie@hotmail.com>
Date:   Fri Apr 28 14:42:47 2023 +0800

    fix issues with s3_download

commit 62bec0b
Author: xieyongliang <yongliangxie@hotmail.com>
Date:   Thu Apr 27 21:20:39 2023 +0800

    add debug info

commit f95f89c
Author: xieyongliang <yongliangxie@hotmail.com>
Date:   Thu Apr 27 21:01:14 2023 +0800

    cleanup

commit 1d92fc5
Author: xie river <chuanxie@amazon.com>
Date:   Wed Apr 26 06:41:43 2023 +0000

    dynamic models loading

commit b34e11e
Merge: a28f598 71169e0
Author: KingLollipop <40582400+jacquesfeng123@users.noreply.github.com>
Date:   Thu Apr 27 14:05:40 2023 +0800

    Merge branch 'xieyongliang:api' into api

commit 71169e0
Author: xieyongliang <yongliangxie@hotmail.com>
Date:   Thu Apr 27 08:56:40 2023 +0800

    fix issues with mask in img2img api call

commit a28f598
Author: KingLollipop <40582400+jacquesfeng123@users.noreply.github.com>
Date:   Wed Apr 26 21:36:55 2023 +0800

    exp with another place to put ultrasharp

commit 7c86c64
Author: xieyongliang <yongliangxie@hotmail.com>
Date:   Wed Apr 26 19:41:30 2023 +0800

    fix download embeddings/hypernetworks form s3 into endpoint

commit bdd789d
Author: KingLollipop <40582400+jacquesfeng123@users.noreply.github.com>
Date:   Wed Apr 26 19:40:57 2023 +0800

    added a couple of upscalers

commit 9023f4c
Author: KingLollipop <40582400+jacquesfeng123@users.noreply.github.com>
Date:   Wed Apr 26 19:37:30 2023 +0800

    fixing embeddings

    changed a couple of parameters in api to get rid of useless components
    changed gitingore to include embeddings
    added embeddings of nfixer.

commit e1e15e9
Author: KingLollipop <40582400+jacquesfeng123@users.noreply.github.com>
Date:   Tue Apr 25 16:31:54 2023 +0800

    Update config.json

    added more controlnet settings

commit ea7592c
Author: xieyongliang <yongliangxie@hotmail.com>
Date:   Tue Apr 25 12:21:22 2023 +0800

    add id in req

commit 286d791
Author: KingLollipop <40582400+jacquesfeng123@users.noreply.github.com>
Date:   Mon Apr 24 17:04:00 2023 +0800

    Update api.py

commit f8c29b9
Author: KingLollipop <40582400+jacquesfeng123@users.noreply.github.com>
Date:   Mon Apr 24 17:02:20 2023 +0800

    add back config.json

    yes indeed. without this it does not work. putting back config.json

commit ef62422
Author: KingLollipop <40582400+jacquesfeng123@users.noreply.github.com>
Date:   Mon Apr 24 16:41:26 2023 +0800

    [try to delete config json see if this is the reason controlnet 21 works]

commit 46174b9
Author: KingLollipop <40582400+jacquesfeng123@users.noreply.github.com>
Date:   Mon Apr 24 16:40:22 2023 +0800

    Update api.py

commit 258577a
Author: KingLollipop <40582400+jacquesfeng123@users.noreply.github.com>
Date:   Mon Apr 24 14:57:02 2023 +0800

    Update api.py

commit ac698f0
Merge: c9a372c 5e0a2d3
Author: aubeIT <128031040+aubeIT@users.noreply.github.com>
Date:   Mon Apr 24 10:42:37 2023 +0800

    Merge branch 'xieyongliang:api' into api

commit c9a372c
Author: KingLollipop <40582400+jacquesfeng123@users.noreply.github.com>
Date:   Mon Apr 24 00:51:26 2023 +0800

    Update models.py

    try changing options to dict and try again

commit c464f29
Author: KingLollipop <40582400+jacquesfeng123@users.noreply.github.com>
Date:   Mon Apr 24 00:35:32 2023 +0800

    updated models.py to enable more apis

commit 5e0a2d3
Author: xieyongliang <yongliangxie@hotmail.com>
Date:   Mon Apr 24 00:17:36 2023 +0800

    cleanup

commit 3bb9b58
Author: xieyongliang <yongliangxie@hotmail.com>
Date:   Mon Apr 24 00:11:55 2023 +0800

    cleanup

commit d6f0918
Author: xieyongliang <yongliangxie@hotmail.com>
Date:   Sun Apr 23 23:41:22 2023 +0800

    update webui.py

commit b5d78c1
Author: KingLollipop <40582400+jacquesfeng123@users.noreply.github.com>
Date:   Sun Apr 23 23:37:37 2023 +0800

    Update config.json

commit 9639fca
Author: KingLollipop <40582400+jacquesfeng123@users.noreply.github.com>
Date:   Sun Apr 23 23:09:09 2023 +0800

    Update api.py

    added a bunch of controls, let's try if everything works

commit 5da0f15
Author: KingLollipop <40582400+jacquesfeng123@users.noreply.github.com>
Date:   Sun Apr 23 22:48:33 2023 +0800

    Create config.json

    I am first adding a config with the controlnet settings, this should in principle change the controlnet settings to enable 2.1

commit 14aac6e
Author: xieyongliang <yongliangxie@hotmail.com>
Date:   Sun Apr 23 18:58:37 2023 +0800

    make embeddings_s3uri, hypernetwork_s3uri are optional

commit aef8660
Author: xieyongliang <yongliangxie@hotmail.com>
Date:   Sun Apr 23 18:43:29 2023 +0800

    fix typo in api.py

commit 6576099
Author: xieyongliang <yongliangxie@hotmail.com>
Date:   Sun Apr 23 14:03:35 2023 +0800

    cleanup

commit a39b362
Author: xieyongliang <yongliangxie@hotmail.com>
Date:   Sun Apr 23 14:00:46 2023 +0800

    Add error response and handle options and exceptions

commit d71aeac
Author: xieyongliang <yongliangxie@hotmail.com>
Date:   Sat Apr 22 22:31:04 2023 +0800

    fix issues with IllegalLocationConstraintException

commit 7d2e184
Author: xieyongliang <yongliangxie@hotmail.com>
Date:   Wed Apr 19 18:15:19 2023 +0800

    add missing files

commit eb17757
Author: xieyongliang <yongliangxie@hotmail.com>
Date:   Wed Apr 19 17:15:52 2023 +0800

    cleanup

commit b9d4769
Author: xieyongliang <yongliangxie@hotmail.com>
Date:   Wed Apr 19 15:14:10 2023 +0800

    cleanup

commit 4c25c5e
Author: xieyongliang <yongliangxie@hotmail.com>
Date:   Wed Apr 19 13:58:21 2023 +0800

    cleanup

commit d5d5a9a
Author: xieyongliang <yongliangxie@hotmail.com>
Date:   Wed Apr 19 11:25:46 2023 +0800

    update api.py

commit 0acee0b
Author: xieyongliang <yongliangxie@hotmail.com>
Date:   Wed Apr 19 08:28:04 2023 +0800

    sync with latest stable-diffusion-webui-api repo

commit 680e362
Merge: 256fcbd 6ab3681
Author: xieyongliang <yongliangxie@hotmail.com>
Date:   Tue Apr 18 23:02:49 2023 +0800

    Merge pull request AUTOMATIC1111#17 from xiehust/master

    add debug log

commit 256fcbd
Author: xieyongliang <yongliangxie@hotmail.com>
Date:   Tue Apr 18 22:58:50 2023 +0800

    retrieve available lora models from backend

commit 6ab3681
Author: xie river <chuanxie@amazon.com>
Date:   Tue Apr 18 10:33:02 2023 +0000

    add debug log

commit 9a322ff
Merge: 99b2ca8 ba87e23
Author: xieyongliang <yongliangxie@hotmail.com>
Date:   Mon Apr 17 19:58:35 2023 +0800

    Merge branch 'master' of https://github.com/xieyongliang/stable-diffusion-webui

commit 99b2ca8
Author: xieyongliang <yongliangxie@hotmail.com>
Date:   Mon Apr 17 19:58:26 2023 +0800

    update ui.py

commit ba87e23
Merge: c68bad4 733e392
Author: xieyongliang <yongliangxie@hotmail.com>
Date:   Mon Apr 17 18:20:28 2023 +0800

    Merge pull request AUTOMATIC1111#16 from xiehust/master

    fix image upload error

commit 733e392
Author: xie river <chuanxie@amazon.com>
Date:   Mon Apr 17 09:52:03 2023 +0000

    fix image upload error

commit c68bad4
Merge: 970f489 5605d1e
Author: xieyongliang <yongliangxie@hotmail.com>
Date:   Mon Apr 17 14:53:34 2023 +0800

    Merge branch 'master' of https://github.com/xieyongliang/stable-diffusion-webui

commit 970f489
Author: xieyongliang <yongliangxie@hotmail.com>
Date:   Mon Apr 17 14:53:05 2023 +0800

    add infer_type which will depends on the onvironment variable

commit 5605d1e
Merge: bddb41f 28531ec
Author: xieyongliang <yongliangxie@hotmail.com>
Date:   Mon Apr 17 13:59:12 2023 +0800

    Merge pull request AUTOMATIC1111#14 from xiehust/master

    fix ckptmerge s3 url path error

commit 28531ec
Author: xie river <chuanxie@amazon.com>
Date:   Mon Apr 17 05:16:12 2023 +0000

    ckptmerger fix

commit a0a907d
Merge: bddb41f 8832e51
Author: xiehust <xiehust@163.com>
Date:   Mon Apr 17 13:07:52 2023 +0800

    Merge pull request AUTOMATIC1111#1 from xiehust/igg

    merger igg's ckptmerger fix

commit 8832e51
Author: xie river <chuanxie@amazon.com>
Date:   Mon Apr 17 05:04:23 2023 +0000

    fix ckptmerger and add user isolation

commit 54e983b
Author: xie river <chuanxie@amazon.com>
Date:   Sun Apr 16 15:39:37 2023 +0000

    IGG user isolation requirement

commit bddb41f
Author: xieyongliang <yongliangxie@hotmail.com>
Date:   Sun Apr 16 22:04:20 2023 +0800

    update api.py

commit 53065d1
Author: xieyongliang <yongliangxie@hotmail.com>
Date:   Sun Apr 16 12:20:31 2023 +0800

    revise the get_sd_models in shared

commit eb12a91
Author: xieyongliang <yongliangxie@hotmail.com>
Date:   Sun Apr 16 09:27:09 2023 +0800

    cleanup

commit 003d7d7
Author: xieyongliang <yongliangxie@hotmail.com>
Date:   Sun Apr 16 09:08:01 2023 +0800

    cleanup & fix issues with cookies handling

commit ad72065
Author: xieyongliang <yongliangxie@hotmail.com>
Date:   Sat Apr 15 22:29:11 2023 +0800

    update webui.py

commit 3b41d8c
Merge: 24ab0c6 1052f5a
Author: xieyongliang <yongliangxie@hotmail.com>
Date:   Sat Apr 15 14:46:59 2023 +0800

    Merge pull request AUTOMATIC1111#11 from xieyongliang/develop

    Develop

commit 1052f5a
Merge: 4470feb 5980c80
Author: xieyongliang <yongliangxie@hotmail.com>
Date:   Sat Apr 15 14:38:18 2023 +0800

    Merge pull request AUTOMATIC1111#10 from JianyuZhan/dev-jyzhan

    Added support for checkpoint merge from S3

commit 5980c80
Merge: 63233fd 4470feb
Author: xieyongliang <yongliangxie@hotmail.com>
Date:   Sat Apr 15 14:38:01 2023 +0800

    Merge branch 'develop' into dev-jyzhan

commit 63233fd
Author: Jianyu Zhan <jyzhan@amazon.com>
Date:   Fri Apr 14 11:06:48 2023 +0800

    Fix UI user tab missing problem

commit e19ab3c
Author: Jianyu Zhan <jyzhan@amazon.com>
Date:   Thu Apr 6 17:30:37 2023 +0800

    Added support for checkpoint merge from S3

commit 24ab0c6
Author: xieyongliang <yongliangxie@hotmail.com>
Date:   Fri Apr 14 15:30:48 2023 +0800

    sync develop branch to master branch

commit 4470feb
Author: xieyongliang <yongliangxie@hotmail.com>
Date:   Fri Apr 14 14:38:46 2023 +0800

    add support for load VAE models when endpoint is created

commit 59abb69
Author: xieyongliang <yongliangxie@hotmail.com>
Date:   Thu Apr 13 21:58:33 2023 +0800

    update shared.py and ui.py

commit 19c8ccb
Author: xieyongliang <yongliangxie@hotmail.com>
Date:   Thu Apr 13 20:58:09 2023 +0800

    update webui.py

commit 823e510
Author: xieyongliang <yongliangxie@hotmail.com>
Date:   Thu Apr 13 20:08:24 2023 +0800

    update webui.py

commit 0b680c8
Merge: 06824a5 b6105fd
Author: xieyongliang <yongliangxie@hotmail.com>
Date:   Thu Apr 13 19:56:10 2023 +0800

    Merge pull request AUTOMATIC1111#9 from xiehust/dev

    fix s3 path error

commit b6105fd
Author: xieyongliang <yongliangxie@hotmail.com>
Date:   Thu Apr 13 19:55:37 2023 +0800

    Update webui.py

commit dd88ce6
Author: xie river <chuanxie@amazon.com>
Date:   Thu Apr 13 08:22:36 2023 +0000

    fix s3 path error

commit 06824a5
Merge: f352ab2 78afa45
Author: xieyongliang <yongliangxie@hotmail.com>
Date:   Thu Apr 13 07:14:33 2023 +0800

    Merge pull request AUTOMATIC1111#7 from xiehust/dev

    River's dev branch merge

commit 78afa45
Author: xie river <chuanxie@amazon.com>
Date:   Wed Apr 12 14:05:58 2023 +0000

    fix model uploading s3 path

commit d8251f2
Author: xie river <chuanxie@amazon.com>
Date:   Wed Apr 12 10:13:00 2023 +0000

    image viewer

commit 02e3d02
Author: xie river <chuanxie@amazon.com>
Date:   Wed Apr 12 05:28:21 2023 +0000

    merge upstream

commit e3d2139
Merge: 972a04f f352ab2
Author: xie river <chuanxie@amazon.com>
Date:   Wed Apr 12 03:11:44 2023 +0000

    dynamic loading models

commit 972a04f
Author: xie river <chuanxie@amazon.com>
Date:   Tue Apr 11 02:33:17 2023 +0000

    dynamic loading models

commit 1aa2271
Author: xieyongliang <yongliangxie@hotmail.com>
Date:   Tue Apr 11 07:18:17 2023 +0800

    cleanup

commit ccbfa67
Author: xieyongliang <yongliangxie@hotmail.com>
Date:   Tue Apr 11 06:54:07 2023 +0800

    fix issues with upscaler

commit 218d298
Merge: 471add4 18cf813
Author: xieyongliang <yongliangxie@hotmail.com>
Date:   Mon Apr 10 23:11:10 2023 +0800

    Merge branch 'master' of https://github.com/xieyongliang/stable-diffusion-webui

commit 471add4
Author: xieyongliang <yongliangxie@hotmail.com>
Date:   Mon Apr 10 23:10:45 2023 +0800

    update call_queue.py

commit f352ab2
Author: xieyongliang <yongliangxie@hotmail.com>
Date:   Mon Apr 10 16:59:40 2023 +0800

    update webui.py

commit 1807ea8
Author: xieyongliang <yongliangxie@hotmail.com>
Date:   Mon Apr 10 16:16:22 2023 +0800

    update webui.py and api.py

commit 6445c3c
Merge: b155b27 18cf813
Author: xie river <chuanxie@amazon.com>
Date:   Mon Apr 10 01:26:56 2023 +0000

    Merge remote-tracking branch 'upstream/master' into dev

commit b155b27
Author: xie river <chuanxie@amazon.com>
Date:   Mon Apr 10 01:15:18 2023 +0000

    dynamic model laoding

commit ac15d03
Author: xieyongliang <yongliangxie@hotmail.com>
Date:   Sun Apr 9 23:29:57 2023 +0800

    update stable-diffusion-webui

commit 4331462
Author: xieyongliang <yongliangxie@hotmail.com>
Date:   Sun Apr 9 22:06:13 2023 +0800

    save generated imagess and models with user specific path

commit 5be73c9
Author: xieyongliang <yongliangxie@hotmail.com>
Date:   Sun Apr 9 21:25:27 2023 +0800

    update webui.py

commit 78b3a69
Author: xieyongliang <yongliangxie@hotmail.com>
Date:   Sun Apr 9 17:28:02 2023 +0800

    update webui.py

commit 18cf813
Author: xieyongliang <yongliangxie@hotmail.com>
Date:   Sun Apr 9 08:31:14 2023 +0800

    fix issues with username and training embedding/hypernetwork and cleanup

commit 5b62b1b
Author: xieyongliang <yongliangxie@hotmail.com>
Date:   Fri Apr 7 23:04:18 2023 +0800

    fix issues with users

commit 9857725
Author: xieyongliang <yongliangxie@hotmail.com>
Date:   Fri Apr 7 20:36:24 2023 +0800

    cleanup

commit 0cdb815
Author: xieyongliang <yongliangxie@hotmail.com>
Date:   Fri Apr 7 20:29:20 2023 +0800

    update webui.py

commit 91afed1
Author: xieyongliang <yongliangxie@hotmail.com>
Date:   Fri Apr 7 19:56:24 2023 +0800

    update for lora

commit 53de970
Author: xieyongliang <yongliangxie@hotmail.com>
Date:   Thu Apr 6 22:49:17 2023 +0800

    fix issues with http request

commit 553d553
Author: xieyongliang <yongliangxie@hotmail.com>
Date:   Thu Apr 6 16:53:47 2023 +0800

    fix for the issues with request

commit 4ec1dd8
Author: xieyongliang <yongliangxie@hotmail.com>
Date:   Tue Apr 4 22:33:50 2023 +0800

    add Lora support

commit 37bb2b1
Author: xie river <chuanxie@amazon.com>
Date:   Sun Apr 2 14:14:09 2023 +0000

    model file loaded dynamically from s3

commit 7146b33
Merge: 2eaf31c 3ca3a57
Author: xiehust <xiehust@163.com>
Date:   Sat Apr 1 20:25:41 2023 +0800

    Merge branch 'xieyongliang:master' into master

commit 2eaf31c
Author: xie river <chuanxie@amazon.com>
Date:   Fri Mar 31 02:33:15 2023 +0000

    add s3 upload

commit f222d10
Author: xie river <chuanxie@amazon.com>
Date:   Thu Mar 30 16:48:16 2023 +0000

    can upload train images to s3 via webui-timezone fix

commit 5301172
Author: xie river <chuanxie@amazon.com>
Date:   Thu Mar 30 16:04:04 2023 +0000

    can upload train images to s3 via webui

commit 3ca3a57
Author: xieyongliang <yongliangxie@hotmail.com>
Date:   Thu Mar 30 10:27:18 2023 +0800

    hide the setting tabe when current user is admin

commit ad53fd5
Author: xieyongliang <yongliangxie@hotmail.com>
Date:   Wed Mar 29 19:45:55 2023 +0800

    fix typos with safetensors

commit 9e45f12
Author: xie river <chuanxie@amazon.com>
Date:   Wed Mar 29 11:20:49 2023 +0000

    add training job detail link after submit train job

commit dc48a76
Author: xie river <chuanxie@amazon.com>
Date:   Wed Mar 29 06:01:36 2023 +0000

    admin add user ui optimize, add wrap line

commit 725dd7a
Author: xieyongliang <yongliangxie@hotmail.com>
Date:   Tue Mar 28 06:44:59 2023 +0800

    fix issues with controlnet save images

commit ace896b
Author: xieyongliang <yongliangxie@hotmail.com>
Date:   Mon Mar 27 23:45:36 2023 +0800

    fix issues with 1.x SD models training

commit ebdf607
Author: xieyongliang <yongliangxie@hotmail.com>
Date:   Mon Mar 27 23:37:16 2023 +0800

    fix issues with 1.x SD models training

commit 54a56c7
Author: xieyongliang <yongliangxie@hotmail.com>
Date:   Mon Mar 27 23:25:56 2023 +0800

    fix issues with image saving

commit 5673c52
Author: xieyongliang <yongliangxie@hotmail.com>
Date:   Mon Mar 27 08:23:11 2023 +0800

    cleanup

commit 35e5fc0
Author: xieyongliang <yongliangxie@hotmail.com>
Date:   Sun Mar 26 22:13:11 2023 +0800

    fix the model.tar.gz with the correct directory structure

commit 7c9b0fd
Author: xieyongliang <yongliangxie@hotmail.com>
Date:   Sun Mar 26 17:58:27 2023 +0800

    update webui.py

commit 41c20d6
Author: xieyongliang <yongliangxie@hotmail.com>
Date:   Sun Mar 26 17:27:11 2023 +0800

    fix issues with opt.data

commit 3e4f422
Author: xieyongliang <yongliangxie@hotmail.com>
Date:   Sat Mar 25 19:56:33 2023 +0800

    cleanup

commit 4642385
Author: xieyongliang <yongliangxie@hotmail.com>
Date:   Fri Mar 24 14:00:28 2023 +0800

    fix issues with load option data

commit 2a25e7b
Author: xieyongliang <yongliangxie@hotmail.com>
Date:   Fri Mar 24 13:35:17 2023 +0800

    fix issues with update_username

commit 06ae2ff
Author: xieyongliang <yongliangxie@hotmail.com>
Date:   Fri Mar 24 09:34:26 2023 +0800

    fix issues with automatic compress model file in tar format

commit 216a63c
Merge: 92d53f5 fa0bfc9
Author: xieyongliang <yongliangxie@hotmail.com>
Date:   Thu Mar 23 07:19:06 2023 +0800

    cleanup

commit 92d53f5
Author: xieyongliang <yongliangxie@hotmail.com>
Date:   Thu Mar 23 06:57:34 2023 +0800

    update webui.py

commit ad9b78f
Author: xieyongliang <yongliangxie@hotmail.com>
Date:   Wed Mar 22 23:37:54 2023 +0800

    cleanup

commit fa0bfc9
Merge: fc757bb ad48c63
Author: xieyongliang <yongliangxie@hotmail.com>
Date:   Wed Mar 22 22:16:35 2023 +0800

    Merge pull request AUTOMATIC1111#4 from zhazhn/master

    Automatic tar latest checkpoints and upload to s3

commit ad48c63
Author: xieyongliang <yongliangxie@hotmail.com>
Date:   Wed Mar 22 22:15:21 2023 +0800

    Update webui.py

commit ef8405b
Author: xieyongliang <yongliangxie@hotmail.com>
Date:   Wed Mar 22 22:13:27 2023 +0800

    Update webui.py

commit fc757bb
Merge: 5c9e430 0bd5c8a
Author: xieyongliang <yongliangxie@hotmail.com>
Date:   Wed Mar 22 22:09:49 2023 +0800

    Merge pull request AUTOMATIC1111#3 from JianyuZhan/dev-jyzhan

    Limit user to use his/her sagemaker endpoints

commit 0bd5c8a
Author: xieyongliang <yongliangxie@hotmail.com>
Date:   Wed Mar 22 22:08:16 2023 +0800

    Update shared.py

commit b571170
Author: xieyongliang <yongliangxie@hotmail.com>
Date:   Wed Mar 22 22:02:12 2023 +0800

    Update ui.py

commit a4911ee
Author: xieyongliang <yongliangxie@hotmail.com>
Date:   Wed Mar 22 21:59:37 2023 +0800

    Update webui.py

commit 09702d2
Author: xieyongliang <yongliangxie@hotmail.com>
Date:   Wed Mar 22 21:38:32 2023 +0800

    Update api.py

commit eefad18
Author: xieyongliang <yongliangxie@hotmail.com>
Date:   Wed Mar 22 21:31:08 2023 +0800

    cleanup

commit 8eb4f26
Author: xieyongliang <yongliangxie@hotmail.com>
Date:   Wed Mar 22 21:16:16 2023 +0800

    add debug info

commit 3eb2d5b
Author: zhazhn <62846877+zhazhn@users.noreply.github.com>
Date:   Wed Mar 22 20:14:30 2023 +0800

    Automatic tar latest checkpoints and upload to s3

commit 74d8fdf
Author: xieyongliang <yongliangxie@hotmail.com>
Date:   Wed Mar 22 19:38:20 2023 +0800

    cleanup

commit a2d7c5f
Author: xieyongliang <yongliangxie@hotmail.com>
Date:   Wed Mar 22 10:47:37 2023 +0800

    fix for dreambooth training with params_dict

commit 682894f
Author: Jianyu Zhan <jyzhan@amazon.com>
Date:   Fri Mar 17 15:23:13 2023 +0800

    Limit user to use his/her sagemaker endpoints

commit eda27b9
Author: xieyongliang <yongliangxie@hotmail.com>
Date:   Wed Mar 22 08:39:27 2023 +0800

    cleanup

commit b87dd97
Author: xieyongliang <yongliangxie@hotmail.com>
Date:   Tue Mar 21 22:59:57 2023 +0800

    update localizations/zh_CN.json

commit 5c9e430
Merge: 5447455 a5f7ca7
Author: xieyongliang <yongliangxie@hotmail.com>
Date:   Tue Mar 21 21:14:39 2023 +0800

    Merge pull request AUTOMATIC1111#1 from zhazhn/master

    update webui.py

commit 8dc1030
Merge: 59f91bd 5447455
Author: xieyongliang <yongliangxie@hotmail.com>
Date:   Tue Mar 21 19:24:02 2023 +0800

    Merge branch 'master' of https://github.com/xieyongliang/stable-diffusion-webui into 0318

commit 5447455
Merge: 4a085ec 7f76339
Author: xieyongliang <yongliangxie@hotmail.com>
Date:   Tue Mar 21 19:15:48 2023 +0800

    Merge pull request AUTOMATIC1111#2 from xiehust/master

    add xyz plot

commit 4a085ec
Author: xieyongliang <yongliangxie@hotmail.com>
Date:   Tue Mar 21 17:54:56 2023 +0800

    revise for .safetensors

commit 0231ec4
Author: xieyongliang <yongliangxie@hotmail.com>
Date:   Tue Mar 21 17:01:54 2023 +0800

    revise for safesentors file

commit d427458
Author: xieyongliang <yongliangxie@hotmail.com>
Date:   Tue Mar 21 15:33:26 2023 +0800

    fix for the issues with tempdir when gradio is upgraded to 3.16.2

commit 7f76339
Author: xie river <chuanxie@amazon.com>
Date:   Tue Mar 21 03:22:56 2023 +0000

    add xyz plot

commit a5f7ca7
Author: zhazhn <62846877+zhazhn@users.noreply.github.com>
Date:   Tue Mar 21 10:27:37 2023 +0800

    Update webui.py

    add import

commit 59f91bd
Author: xieyongliang <yongliangxie@hotmail.com>
Date:   Tue Mar 21 09:28:48 2023 +0800

    cleanup

commit fb0f6ff
Author: xieyongliang <yongliangxie@hotmail.com>
Date:   Tue Mar 21 09:13:08 2023 +0800

    update for dreambooth upgrade

commit 14ad93d
Author: xieyongliang <yongliangxie@hotmail.com>
Date:   Mon Mar 20 12:25:36 2023 +0800

    cleanup

commit 8e0e392
Author: xieyongliang <yongliangxie@hotmail.com>
Date:   Thu Mar 16 13:36:00 2023 +0800

    add username to filter endpoint with username

commit 31e5250
Author: xieyongliang <yongliangxie@hotmail.com>
Date:   Thu Mar 16 11:32:06 2023 +0800

    fix issues with script_args

commit 569eb3a
Author: xieyongliang <yongliangxie@hotmail.com>
Date:   Wed Mar 15 08:47:12 2023 +0800

    fix issues with api_endpoint when training

commit 460fe3b
Author: xieyongliang <yongliangxie@hotmail.com>
Date:   Mon Mar 13 17:13:50 2023 +0800

    fix for option loading

commit 4c0f8e4
Author: xieyongliang <yongliangxie@hotmail.com>
Date:   Mon Mar 13 16:03:08 2023 +0800

    fix the issues with loading empty users data for admin user

commit 7faf90a
Author: xieyongliang <yongliangxie@hotmail.com>
Date:   Mon Mar 13 08:01:30 2023 +0800

    cleanup

commit 67e6928
Author: xieyongliang <yongliangxie@hotmail.com>
Date:   Sun Mar 12 23:50:31 2023 +0800

    cleanup

commit 75bb305
Author: xieyongliang <yongliangxie@hotmail.com>
Date:   Sun Mar 12 23:31:31 2023 +0800

    cleanup

commit ba4d86c
Author: xieyongliang <yongliangxie@hotmail.com>
Date:   Sun Mar 12 19:10:02 2023 +0800

    cleanup

commit 719eb1e
Author: xieyongliang <yongliangxie@hotmail.com>
Date:   Sun Mar 12 15:42:52 2023 +0800

    revise for user logout

commit 547cc76
Author: xieyongliang <yongliangxie@hotmail.com>
Date:   Sun Mar 12 07:53:28 2023 +0800

    cleanup

commit ed2b673
Author: xieyongliang <yongliangxie@hotmail.com>
Date:   Sun Mar 12 06:55:28 2023 +0800

    fix issues with option saving

commit d34905c
Author: xieyongliang <yongliangxie@hotmail.com>
Date:   Sat Mar 11 23:33:00 2023 +0800

    fix issues with option loading

commit 2bd01b7
Author: xieyongliang <yongliangxie@hotmail.com>
Date:   Sat Mar 11 21:38:06 2023 +0800

    fix issues with load data when logining

commit 86ce539
Author: xieyongliang <yongliangxie@hotmail.com>
Date:   Sat Mar 11 21:11:03 2023 +0800

    cleanup

commit d6a61ab
Merge: 9f7dec7 bdd7135
Author: xieyongliang <yongliangxie@hotmail.com>
Date:   Sat Mar 11 21:09:09 2023 +0800

    cleanup

commit bdd7135
Author: xieyongliang <yongliangxie@hotmail.com>
Date:   Sat Mar 11 21:04:12 2023 +0800

    cleanup

commit 2bd0d52
Author: xieyongliang <yongliangxie@hotmail.com>
Date:   Sat Mar 11 09:31:40 2023 +0800

    update the localizations for zh_CN & zh_TW

commit a32195b
Author: xieyongliang <yongliangxie@hotmail.com>
Date:   Sat Mar 11 08:27:57 2023 +0800

    revise for user authentication

commit 9f7dec7
Author: xieyongliang <yongliangxie@hotmail.com>
Date:   Wed Mar 8 20:02:05 2023 +0800

    fix issues with switching endpoint concurrently

commit 541d7c5
Author: xieyongliang <yongliangxie@hotmail.com>
Date:   Wed Mar 8 15:50:41 2023 +0800

    add queue lock for load_model_weights

commit c25694c
Author: xieyongliang <yongliangxie@hotmail.com>
Date:   Wed Mar 8 09:41:05 2023 +0800

    revise to get username from session token

commit a34026e
Author: xieyongliang <yongliangxie@hotmail.com>
Date:   Tue Mar 7 18:41:00 2023 +0800

    fix issues with dreambooth training

commit 231076a
Author: xieyongliang <yongliangxie@hotmail.com>
Date:   Tue Mar 7 18:39:53 2023 +0800

    fix issues with dreambooth training

commit 082f5b1
Author: xieyongliang <yongliangxie@hotmail.com>
Date:   Tue Mar 7 15:17:43 2023 +0800

    cleanup

commit aa93e24
Author: xieyongliang <yongliangxie@hotmail.com>
Date:   Mon Mar 6 07:02:44 2023 +0800

    fix issues with list cn models

commit d15c814
Merge: 2fe03e2 2b0026e
Author: xieyongliang <yongliangxie@hotmail.com>
Date:   Sun Mar 5 20:54:35 2023 +0800

    cleanup

commit 2fe03e2
Author: xieyongliang <yongliangxie@hotmail.com>
Date:   Sun Mar 5 08:52:29 2023 +0800

    cleanup

commit c25a16c
Author: xieyongliang <yongliangxie@hotmail.com>
Date:   Sat Mar 4 19:33:20 2023 +0800

    cleanup

commit c9bf1d3
Author: xieyongliang <yongliangxie@hotmail.com>
Date:   Wed Mar 1 12:50:49 2023 +0800

    fix image processing with controlnet

commit 5078ae9
Author: xieyongliang <yongliangxie@hotmail.com>
Date:   Tue Feb 28 07:07:00 2023 +0800

    revise for controlnet

commit 2b0026e
Author: xieyongliang <yongliangxie@hotmail.com>
Date:   Sun Mar 5 08:52:29 2023 +0800

    cleanup

commit d62af5c
Author: xieyongliang <yongliangxie@hotmail.com>
Date:   Sat Mar 4 19:33:20 2023 +0800

    cleanup

commit 47dd0bb
Author: xieyongliang <yongliangxie@hotmail.com>
Date:   Wed Mar 1 12:50:49 2023 +0800

    fix image processing with controlnet

commit a5abc21
Author: xieyongliang <yongliangxie@hotmail.com>
Date:   Wed Mar 1 12:46:55 2023 +0800

    update .gitignore

commit 98f6bf1
Author: xieyongliang <yongliangxie@hotmail.com>
Date:   Wed Mar 1 12:45:08 2023 +0800

    Revert "fix image processing with controlnet"

    This reverts commit 52df9cf.

commit 13eb78f
Author: xieyongliang <yongliangxie@hotmail.com>
Date:   Wed Mar 1 12:42:10 2023 +0800

    Revert "update .gitignore"

    This reverts commit 95eab05.

commit 52df9cf
Author: xieyongliang <yongliangxie@hotmail.com>
Date:   Wed Mar 1 12:40:18 2023 +0800

    fix image processing with controlnet

commit 95eab05
Author: xieyongliang <yongliangxie@hotmail.com>
Date:   Tue Feb 28 17:38:57 2023 +0800

    update .gitignore

commit a751e48
Author: xieyongliang <yongliangxie@hotmail.com>
Date:   Tue Feb 28 17:38:00 2023 +0800

    update .gitignore

commit d72a2e0
Author: xieyongliang <yongliangxie@hotmail.com>
Date:   Tue Feb 28 07:07:00 2023 +0800

    revise for controlnet

commit cf29601
Author: xieyongliang <yongliangxie@hotmail.com>
Date:   Thu Feb 23 23:47:37 2023 +0800

    fix issues with list hypernetworks

commit 0ab83c1
Author: xieyongliang <yongliangxie@hotmail.com>
Date:   Thu Feb 23 09:00:18 2023 +0800

    fix issues with hypernetwork training

commit 633095a
Author: xieyongliang <yongliangxie@hotmail.com>
Date:   Fri Feb 17 22:37:16 2023 +0800

    fix issues with hypernetwork training

commit d4c32f0
Author: xieyongliang <yongliangxie@hotmail.com>
Date:   Wed Feb 15 10:28:06 2023 +0800

    cleanup

commit 651c5e6
Author: xieyongliang <yongliangxie@hotmail.com>
Date:   Sun Feb 12 21:40:17 2023 +0800

    cleanup

commit 241dd8a
Author: xieyongliang <yongliangxie@hotmail.com>
Date:   Sun Feb 12 17:32:32 2023 +0800

    cleaup

commit a097d8d
Author: xieyongliang <yongliangxie@hotmail.com>
Date:   Sun Feb 12 11:21:31 2023 +0800

    revise for get_sd_models/get_lora_models/get_db_models

commit a6a51da
Author: xieyongliang <yongliangxie@hotmail.com>
Date:   Fri Feb 10 16:41:50 2023 +0800

    fix issues with concurrent training

commit 0ac9c57
Author: xieyongliang <yongliangxie@hotmail.com>
Date:   Wed Feb 8 08:41:32 2023 +0800

    cleanup

commit 885497b
Author: xieyongliang <yongliangxie@hotmail.com>
Date:   Tue Feb 7 23:48:51 2023 +0800

    revise visibility mgt for train dreambooth button

commit 4e7db20
Author: xieyongliang <yongliangxie@hotmail.com>
Date:   Mon Feb 6 22:16:36 2023 +0800

    cleanup with sd_model

commit 326969a
Author: xieyongliang <yongliangxie@hotmail.com>
Date:   Fri Feb 3 11:03:29 2023 +0800

    fix issues with dreambooth training invocation

commit 83446a5
Author: xieyongliang <yongliangxie@hotmail.com>
Date:   Thu Feb 2 11:23:55 2023 +0800

    UI cleanup

commit 2109a90
Author: xieyongliang <yongliangxie@hotmail.com>
Date:   Wed Feb 1 22:26:26 2023 +0800

    fix bugs with concurrent usage

commit 2fdec78
Author: xieyongliang <yongliangxie@hotmail.com>
Date:   Mon Jan 16 09:30:16 2023 +0800

    fix issues with cfg_scale in img2img

commit 46814f8
Author: xieyongliang <yongliangxie@hotmail.com>
Date:   Mon Jan 9 18:08:26 2023 +0800

    cleanup

commit 89b83ef
Author: xieyongliang <yongliangxie@hotmail.com>
Date:   Fri Jan 6 10:11:54 2023 +0800

    cleanup

commit f41e8be
Author: xieyongliang <yongliangxie@hotmail.com>
Date:   Tue Jan 3 09:17:49 2023 +0800

    revise webui.py

commit 52c313e
Author: xieyongliang <yongliangxie@hotmail.com>
Date:   Mon Jan 2 22:44:57 2023 +0800

    revise localization support

commit 0298684
Author: xieyongliang <yongliangxie@hotmail.com>
Date:   Mon Jan 2 08:30:53 2023 +0800

    fix build error for inference

commit 864d366
Author: xieyongliang <yongliangxie@hotmail.com>
Date:   Sat Dec 31 19:18:57 2022 +0800

    cleanup

commit 99112d2
Author: xieyongliang <yongliangxie@hotmail.com>
Date:   Thu Dec 29 16:35:19 2022 +0800

    add dreambooth support

commit 665db1c
Author: xieyongliang <yongliangxie@hotmail.com>
Date:   Thu Dec 22 10:02:43 2022 +0800

    cleanup

commit 552b206
Author: xieyongliang <yongliangxie@hotmail.com>
Date:   Wed Dec 21 11:44:40 2022 +0800

    cleanup

commit f9ebe7c
Author: xieyongliang <yongliangxie@hotmail.com>
Date:   Wed Dec 14 15:49:38 2022 +0800

    revise hypernetwork support

commit 03a84e1
Author: xieyongliang <yongliangxie@hotmail.com>
Date:   Tue Dec 13 21:40:23 2022 +0800

    cleanup

commit 12df72e
Author: xieyongliang <yongliangxie@hotmail.com>
Date:   Tue Dec 13 20:20:57 2022 +0800

    fix bugs in invacation when swapping models

commit 3ca03cd
Author: xieyongliang <yongliangxie@hotmail.com>
Date:   Tue Dec 13 15:44:49 2022 +0800

    cleanup

commit b3d97a6
Author: xieyongliang <yongliangxie@hotmail.com>
Date:   Mon Dec 12 23:32:38 2022 +0800

    fix bugs when s3 folder is empty

commit f2294b4
Author: xieyongliang <yongliangxie@hotmail.com>
Date:   Mon Dec 12 17:28:09 2022 +0800

    cleanup

commit 7377a1f
Author: xieyongliang <yongliangxie@hotmail.com>
Date:   Mon Dec 12 16:39:25 2022 +0800

    revise webui.sh

commit 7b26d01
Author: xieyongliang <yongliangxie@hotmail.com>
Date:   Sun Dec 11 22:32:27 2022 +0800

    cleanup

commit 0e4a5fd
Author: xieyongliang <yongliangxie@hotmail.com>
Date:   Sun Dec 11 21:12:00 2022 +0800

    add config.json

commit ed05192
Author: xieyongliang <yongliangxie@hotmail.com>
Date:   Sun Dec 11 20:29:44 2022 +0800

    sync with latest repo to support sd2.0

commit 1eb35d5
Author: xieyongliang <yongliangxie@hotmail.com>
Date:   Wed Dec 7 09:11:06 2022 +0800

    revise sd_model_checkpoint

commit 366b4c1
Author: xieyongliang <yongliangxie@hotmail.com>
Date:   Tue Dec 6 09:49:19 2022 +0800

    review for iframe embedding

commit b1d9758
Author: xieyongliang <yongliangxie@hotmail.com>
Date:   Mon Dec 5 09:50:41 2022 +0800

    revise multi-user support

commit 18815ab
Author: xieyongliang <yongliangxie@hotmail.com>
Date:   Fri Dec 2 16:29:19 2022 +0800

    big cleanup and revise for stable-diffusion-webui

commit 26ae67b
Author: xieyongliang <yongliangxie@hotmail.com>
Date:   Sat Nov 26 07:27:11 2022 +0800

    add logo

commit 0cc9ee8
Author: xieyongliang <yongliangxie@hotmail.com>
Date:   Sat Nov 26 07:11:03 2022 +0800

    revise & big cleanup

commit e44eebc
Author: xieyongliang <yongliangxie@hotmail.com>
Date:   Mon Nov 14 09:03:23 2022 +0800

    add support for training

commit d69a1f6
Author: xieyongliang <yongliangxie@hotmail.com>
Date:   Wed Nov 9 09:54:21 2022 +0800

    cleanup

commit 079d30b
Author: xieyongliang <yongliangxie@hotmail.com>
Date:   Wed Nov 9 08:22:04 2022 +0800

    cleanup

commit 9707891
Author: xieyongliang <yongliangxie@hotmail.com>
Date:   Wed Nov 9 08:10:50 2022 +0800

    git submodule updated

commit 730f47b
Author: xieyongliang <yongliangxie@hotmail.com>
Date:   Tue Nov 8 17:26:02 2022 +0800

    add support to run it on sagemaker
  • Loading branch information
@zhchaoxing
zhchaoxing committed May 25, 2023
1 parent 89f9faa commit c91d386
Show file tree
Hide file tree
Showing 14 changed files with 1,524 additions and 1,063 deletions.
8 changes: 3 additions & 5 deletions .gitignore
View file
Expand Up @@ -4,19 +4,18 @@ __pycache__
*.pth
/ESRGAN/*
/SwinIR/*
/cache.json*
/config_states/
/repositories
/venv
/tmp
/model.ckpt
/models/**/*
/GFPGANv1.3.pth
/gfpgan/weights/*.pth
/ui-config.json
/outputs
/config.json
/log
/webui.settings.bat
/embeddings
/styles.csv
/params.txt
/styles.csv.bak
Expand All @@ -32,5 +31,4 @@ notification.mp3
/extensions
/test/stdout.txt
/test/stderr.txt
/cache.json*
/config_states/
build.info
25 changes: 25 additions & 0 deletions config.json
View file
@@ -0,0 +1,25 @@
{
"control_net_model_config": "models/cldm_v21.yaml",
"control_net_max_models_num": 3,
"control_net_model_cache_size": 3,
"control_net_monocular_depth_optim": true,
"control_net_cfg_based_guidance": true,
"control_net_control_transfer": true,
"control_net_no_detectmap": true,
"control_net_detectmap_autosaving": false,
"control_net_only_midctrl_hires": true,
"control_net_allow_script_control": true,
"control_net_skip_img2img_processing": false,
"control_net_only_mid_control": false,
"control_net_sync_field_args": false,
"CLIP_stop_at_last_layers": 2,
"show_progressbar": false,
"live_previews_enable": false,
"show_progress_grid": false,
"show_progress_in_title": false,
"do_not_show_images": true,
"return_grid": false,
"show_progress_every_n_steps": 30,
"show_progress_type": "Approx cheap",
"upcast_attn": false
}
Binary file added embeddings/nartfixer.pt
View file
Binary file not shown.
Binary file added embeddings/nfixer.pt
View file
Binary file not shown.
Binary file added embeddings/nrealfixer.pt
View file
Binary file not shown.
12 changes: 6 additions & 6 deletions extensions-builtin/LDSR/preload.py
View file
@@ -1,6 +1,6 @@
import os
from modules import paths


def preload(parser):
parser.add_argument("--ldsr-models-path", type=str, help="Path to directory with LDSR model file(s).", default=os.path.join(paths.models_path, 'LDSR'))
import os
from modules import paths


def preload(parser):
parser.add_argument("--ldsr-models-path", type=str, help="Path to directory with LDSR model file(s).", default=os.path.join(paths.models_path, 'LDSR'))

0 comments on commit c91d386

Please sign in to comment.