Commit Graph

1836 Commits

Author SHA1 Message Date
DepFA 737eb28fac typo: cmd_opts.embedding_dir to cmd_opts.embeddings_dir 2022-10-26 17:38:08 +03:00
Bruno Seoane b2e0d8ba78 Remove folder endpoint 2022-10-26 09:54:26 -03:00
Bruno Seoane 8320963dcb Merge branch 'master' of https://github.com/AUTOMATIC1111/stable-diffusion-webui 2022-10-26 09:50:26 -03:00
Sihan Wang 7bd8581e46
Fix error caused by EXIF transpose when using custom scripts
Some custom scripts read image directly and no need to select image in UI, this will cause error.
2022-10-26 20:32:55 +08:00
AUTOMATIC 0cd7460253 add script callback for before image save and change callback for after image save to use a class with parameters 2022-10-26 13:12:44 +03:00
AUTOMATIC 1e428238db add override_settings to API as an alternative to #3629 2022-10-26 11:47:17 +03:00
guaneec b6a8bb123b
Fix merge 2022-10-26 15:15:19 +08:00
timntorres f4e1464217 Implement PR #3625 but for embeddings. 2022-10-26 10:14:35 +03:00
timntorres 4875a6c217 Implement PR #3309 but for embeddings. 2022-10-26 10:14:35 +03:00
timntorres c2dc9bfa89 Implement PR #3189 but for embeddings. 2022-10-26 10:14:35 +03:00
timntorres a524d137d0 patch bug (SeverianVoid's comment on 5245c7a) 2022-10-26 10:12:46 +03:00
timntorres cb49800c08 img2img, use smartphone photos' EXIF orientation 2022-10-26 10:10:57 +03:00
guaneec 91bb35b1e6
Merge fix 2022-10-26 15:00:03 +08:00
guaneec 649d79a8ec
Merge branch 'master' into hn-activation 2022-10-26 14:58:04 +08:00
AUTOMATIC 9d82c351ac fix typo in on_save_imaged/on_image_saved; hope no extension is using it yet 2022-10-26 09:56:32 +03:00
w-e-w 757264c453 default_time_format if format is blank 2022-10-26 09:51:32 +03:00
guaneec 877d94f97c
Back compatibility 2022-10-26 14:50:58 +08:00
Milly 146856f66d images: allow nested bracket in filename pattern 2022-10-26 09:50:24 +03:00
Stephen b46c64c6e5 clean 2022-10-26 09:46:17 +03:00
Stephen db9ab1a46b [Bugfix][API] - Fix API response for colab users 2022-10-26 09:46:17 +03:00
AUTOMATIC cbb857b675 enable creating embedding with --medvram 2022-10-26 09:44:02 +03:00
AUTOMATIC1111 ee73341f04
Merge pull request #3139 from captin411/focal-point-cropping
[Preprocess image] New option to auto crop based on complexity, edges, faces
2022-10-26 09:24:21 +03:00
AngelBottomless 7207e3bf49 remove duplicate keys and lowercase 2022-10-26 09:17:01 +03:00
AngelBottomless de096d0ce7 Weight initialization and More activation func
add weight init

add weight init option in create_hypernetwork

fstringify hypernet info

save weight initialization info for further debugging

fill bias with zero for He/Xavier

initialize LayerNorm with Normal

fix loading weight_init
2022-10-26 09:17:01 +03:00
guaneec c702d4d0df
Fix off-by-one 2022-10-26 13:43:04 +08:00
guaneec 2f4c91894d
Remove activation from final layer of HNs 2022-10-26 12:10:30 +08:00
captin411 df0c5ea29d update default weights 2022-10-25 17:06:59 -07:00
captin411 54f0c14824 download better face detection module dynamically 2022-10-25 16:14:13 -07:00
captin411 db8ed5fe5c Focal crop UI elements 2022-10-25 15:22:29 -07:00
captin411 6629446a2f Merge branch 'master' into focal-point-cropping 2022-10-25 13:22:27 -07:00
random_thoughtss 8b4f32779f Switch to a continous blend for cond. image. 2022-10-25 13:15:08 -07:00
captin411 3e6c2420c1 improve debug markers, fix algo weighting 2022-10-25 13:13:12 -07:00
random_thoughtss 605d27687f Added conditioning image masking to xy_grid.
Use `True` and `False` to select values.
2022-10-25 12:20:54 -07:00
random_thoughtss f9549d1cbb Added option to use unmasked conditioning image. 2022-10-25 11:14:12 -07:00
不会画画的中医不是好程序员 4ff4730d82
Merge branch 'AUTOMATIC1111:master' into Inspiron 2022-10-25 19:09:38 +08:00
yfszzx f300d0f2b4 Merge branch 'Inspiron' of https://github.com/yfszzx/stable-diffusion-webui-plus into Inspiron 2022-10-25 18:48:24 +08:00
yfszzx 9ba439b533 need some rights for extensions 2022-10-25 18:48:07 +08:00
AUTOMATIC 3e15f8e0f5 update callbacks code for #3549 2022-10-25 12:16:25 +03:00
不会画画的中医不是好程序员 5bfa2b23ca
Merge branch 'AUTOMATIC1111:master' into Inspiron 2022-10-25 15:38:33 +08:00
yfszzx ff305acd51 some rights for extensions 2022-10-25 15:33:43 +08:00
w-e-w 91c1e1e6a9 fix default filename pattern 2022-10-25 09:44:54 +03:00
brkirch faed465a0b MPS Upscalers Fix
Get ESRGAN, SCUNet, and SwinIR working correctly on MPS by ensuring memory is contiguous for tensor views before sending to MPS device.
2022-10-25 09:42:53 +03:00
brkirch 4c24347e45 Remove BSRGAN from --use-cpu, add SwinIR 2022-10-25 09:42:53 +03:00
AUTOMATIC1111 16416e42b5
Merge branch 'master' into on-image-saved-callback 2022-10-25 08:40:12 +03:00
AUTOMATIC 77a320f406 do not stop execution when script's callback misbehaves and report which script it was 2022-10-25 08:32:47 +03:00
ritosonn b383702752 fix #3145 #3093 2022-10-25 08:32:33 +03:00
w-e-w 0c0028a9d3 UnknownTimeZoneError 2022-10-24 16:01:48 +03:00
yfszzx cb9d2f8705 move to img component to public 2022-10-24 20:06:53 +08:00
Bruno Seoane 2267498a8c Merge remote-tracking branch 'upstream/master' 2022-10-24 08:37:37 -03:00
Bruno Seoane 595dca85af Reverse run_extras change
Update serialization on the batch images endpoint
2022-10-24 08:32:18 -03:00
AUTOMATIC 2c05e06ea7 rename api/processing to api/models for #3511 2022-10-24 14:11:14 +03:00
AUTOMATIC 8da1bd48bf add an option to skip adding number to filenames when saving.
rework filename pattern function go through the pattern once and not calculate any of replacements until they are actually encountered in the pattern.
2022-10-24 14:03:58 +03:00
yfszzx 994aaadf08 a strange bug 2022-10-24 16:44:36 +08:00
w-e-w eb007e5884 use the same datetime object for [date] and [datetime] 2022-10-24 10:28:42 +03:00
w-e-w 5a981310e6 replace_datetime() can now accept a datetime parameter 2022-10-24 10:28:42 +03:00
w-e-w 8f6af4ed65 remove lowercasing file_decoration as it is not needed anymore 2022-10-24 10:28:42 +03:00
w-e-w 00952fb4a8 add sanitize_filename() to datetime 2022-10-24 10:28:42 +03:00
w-e-w 480d8e7646 replace "srt.replace()" in apply_filename_pattern() with equivalent re.sub()
the file_decoration passed into apply_filename_pattern() is formatted to lowercase to increase compatibility
the use of case sensitive srt.replace()

but because the newly implemented "time format" is case sensitive
the lowercasing the file_decoration will cause time format to be broken

in order to resolve this issue
I decided to replace every srt.replace() and in if "str" in x to regular expression (case insensitive) equivalent
2022-10-24 10:28:42 +03:00
w-e-w 37dd6deafb filename pattern [datetime], extended customizable Format and Time Zone
format:
[datetime]
[datetime<Format>]
[datetime<Format><Time Zone>]
2022-10-24 10:28:42 +03:00
w-e-w 7d4a4db9ea modify unnecessary sting assignment as it's going to get overwritten 2022-10-24 10:28:42 +03:00
w-e-w c5d90628a4 move "file_decoration" initialize section
into "if forced_filename is None:"
no need to initialize it if it's not going to be used
2022-10-24 10:28:42 +03:00
w-e-w 3be6b29d81 indent=4 config.json 2022-10-24 10:22:48 +03:00
AUTOMATIC 876a96f0f9 remove erroneous dir in the extension directory
remove loading .js files from scripts dir (they go into javascript)
load scripts after models, for scripts that depend on loaded models
2022-10-24 09:39:46 +03:00
AUTOMATIC1111 999929bea4
Merge pull request #3537 from yfszzx/Inspiron
Move out images browser from project
2022-10-24 09:28:37 +03:00
Trung Ngo 734986dde3 add callback after image is saved 2022-10-24 01:25:31 -05:00
AUTOMATIC 6cbb04f7a5 fix #3517 breaking txt2img 2022-10-24 09:15:26 +03:00
不会画画的中医不是好程序员 68931242cf
Merge branch 'AUTOMATIC1111:master' into Inspiron 2022-10-24 14:09:27 +08:00
AngelBottomless e9a410b535 check length for variance 2022-10-24 09:07:39 +03:00
AngelBottomless 0d2e1dac40 convert deque -> list
I don't feel this being efficient
2022-10-24 09:07:39 +03:00
AngelBottomless 348f89c8d4 statistics for pbar 2022-10-24 09:07:39 +03:00
AngelBottomless 40b56c9289 cleanup some code 2022-10-24 09:07:39 +03:00
AngelBottomless b297cc3324 Hypernetworks - fix KeyError in statistics caching
Statistics logging has changed to {filename : list[losses]}, so it has to use loss_info[key].pop()
2022-10-24 09:07:39 +03:00
Vladimir Repin f2cc3f32d5 fix whitespaces 2022-10-24 08:58:56 +03:00
Vladimir Repin 9741969325 Save properly processed image before color correction 2022-10-24 08:58:56 +03:00
yfszzx a889c93f23 paste_fields add to public 2022-10-24 11:13:16 +08:00
yfszzx cef1b89aa2 remove browser to extension 2022-10-24 10:10:33 +08:00
yfszzx 124e44cf1e remove browser to extension 2022-10-24 09:51:56 +08:00
Bruno Seoane 90f02c7522 Remove unused field and class 2022-10-23 16:05:54 -03:00
Bruno Seoane 1e625624ba Add folder processing endpoint
Also minor refactor
2022-10-23 16:01:16 -03:00
Bruno Seoane 866b36d705 Move processing's models into models.py
It didn't make sense to have two differente files for the same and
"models" is a more descriptive name.
2022-10-23 15:35:49 -03:00
Bruno Seoane e0ca4dfbc1 Update endpoints to use gradio's own utils functions 2022-10-23 15:13:37 -03:00
Bruno Seoane e3f0e34cd6 Merge branch 'master' of https://github.com/bamarillo/stable-diffusion-webui 2022-10-23 13:14:54 -03:00
Bruno Seoane 4ff852ffb5 Add batch processing "extras" endpoint 2022-10-23 13:07:59 -03:00
Bruno Seoane 0523704dad Update run_extras to use the temp filename
In batch mode run_extras tries to preserve the original file name of the
images. The problem is that this makes no sense since the user only gets
a list of images in the UI, trying to manually save them shows that this
images have random temp names. Also, trying to keep "orig_name" in the
API is a hassle that adds complexity to the consuming UI since the
client has to use (or emulate) an input (type=file) element in a form.
Using the normal file name not only doesn't change the output and
functionality in the original UI but also helps keep the API simple.
2022-10-23 12:27:50 -03:00
captin411 1be5933ba2
auto cropping now works with non square crops 2022-10-23 04:11:07 -07:00
AUTOMATIC1111 6bd6154a92
Merge pull request #2067 from victorca25/esrgan_mod
update ESRGAN architecture and model to support all ESRGAN models
2022-10-23 13:43:41 +03:00
yfszzx 6a9ea40d7f Move browser and Inspiration into extension 2022-10-23 16:17:37 +08:00
Stephen 5dc0739ecd working mask 2022-10-23 09:26:56 +03:00
Stephen 9e1a8b7734 non-implemented mask with any type 2022-10-23 09:26:56 +03:00
Stephen a7c213d0f5 [API][Feature] - Add img2img API endpoint 2022-10-23 09:26:56 +03:00
DepFA 1fbfc052eb Update hypernetwork.py 2022-10-23 08:34:33 +03:00
Bruno Seoane 28e26c2bef Add "extra" single image operation
- Separate extra modes into 3 endpoints so the user ddoesn't ahve to
handle so many unused parameters.
 - Add response model for codumentation
2022-10-22 23:17:27 -03:00
Bruno Seoane b02926df13 Moved moodels to their own file and extracted base64 conversion to its own function 2022-10-22 20:24:04 -03:00
Bruno Seoane 1b4d04737a Remove unused imports 2022-10-22 20:13:16 -03:00
papuSpartan ce42879438 fix js func signature and not forget to initialize confirmation var to prevent exception upon cancelling confirmation 2022-10-22 14:53:37 -05:00
AngelBottomless 48dbf99e84 Allow tracking real-time loss
Someone had 6000 images in their dataset, and it was shown as 0, which was confusing.
This will allow tracking real time dataset-average loss for registered objects.
2022-10-22 22:24:19 +03:00
AUTOMATIC ca5a9e79dc fix for img2img color correction in a batch #3218 2022-10-22 22:06:54 +03:00
AUTOMATIC be748e8b08 add --freeze-settings commandline argument to disable changing settings 2022-10-22 22:05:22 +03:00
AUTOMATIC d213d6ca6f removed the option to use 2x more memory when generating previews
added an option to always only show one image in previews
removed duplicate code
2022-10-22 20:48:13 +03:00
Unnoen 4fdb53c1e9 Generate grid preview for progress image 2022-10-22 20:36:04 +03:00
AngelBottomless 24694e5983 Update hypernetwork.py 2022-10-22 20:25:32 +03:00
AUTOMATIC 321bacc6a9 call model_loaded_callback after setting shared.sd_model in case scripts refer to it using that 2022-10-22 20:15:12 +03:00
MrCheeze 0df94d3fcf fix aesthetic gradients doing nothing after loading a different model 2022-10-22 20:14:18 +03:00
AUTOMATIC 324c7c732d record First pass size as 0x0 for #3328 2022-10-22 20:09:51 +03:00
AUTOMATIC1111 ffea9b1509
Merge pull request #3414 from discus0434/master
[Hypernetworks] Add a feature to use dropout / more activation functions
2022-10-22 19:32:13 +03:00
Greendayle e38625011c fix part2 2022-10-22 19:27:16 +03:00
Greendayle 72383abacd Deepdanbooru linux fix 2022-10-22 19:27:16 +03:00
AUTOMATIC dbc8ab65f6 typo 2022-10-22 19:19:17 +03:00
AUTOMATIC d37cfffd53 added callback for creating new settings in extensions 2022-10-22 19:18:56 +03:00
discus0434 6a4fa73a38 small fix 2022-10-22 13:44:39 +00:00
discus0434 97749b7c7d
Merge branch 'AUTOMATIC1111:master' into master 2022-10-22 22:00:59 +09:00
discus0434 7912acef72 small fix 2022-10-22 13:00:44 +00:00
discus0434 fccba4729d add an option to avoid dying relu 2022-10-22 12:02:41 +00:00
AUTOMATIC 7fd90128eb added a guard for hypernet training that will stop early if weights are getting no gradients 2022-10-22 14:48:43 +03:00
AUTOMATIC 1cd3ed7def fix for extensions without style.css 2022-10-22 14:28:56 +03:00
discus0434 dcb45dfecf Merge branch 'master' of upstream 2022-10-22 11:14:46 +00:00
discus0434 0e8ca8e7af add dropout 2022-10-22 11:07:00 +00:00
AUTOMATIC 50b5504401 remove parsing command line from devices.py 2022-10-22 14:04:14 +03:00
AUTOMATIC1111 1fa53dab2c
Merge branch 'master' into cuda-device-id-selection 2022-10-22 13:57:20 +03:00
AUTOMATIC 6398dc9b10 further support for extensions 2022-10-22 13:34:49 +03:00
AUTOMATIC 2b91251637 removed aesthetic gradients as built-in
added support for extensions
2022-10-22 12:23:58 +03:00
yfszzx 67b78f0ea6 inspiration perfected 2022-10-22 10:29:23 +08:00
yfszzx d93ea5cdeb inspiration perfected 2022-10-22 10:21:21 +08:00
yfszzx 40ddb6df61 inspiration perfected 2022-10-22 10:16:22 +08:00
papuSpartan 700340448b forgot to clear neg prompt after moving to back. Add tooltip to hints 2022-10-21 17:24:04 -05:00
Extraltodeus 29bfacd63c
implement CUDA device selection, --device-id arg 2022-10-22 00:12:46 +02:00
Extraltodeus 57eb54b838
implement CUDA device selection by ID 2022-10-22 00:11:07 +02:00
papuSpartan 0c7cf08b3d some doc and formatting 2022-10-21 15:32:26 -05:00
papuSpartan 9e40520f00 refactor internal terminology to use 'clear' instead of 'trash' like #2728 2022-10-21 15:13:12 -05:00
papuSpartan de70ddaf58 update token counter when clearing prompt 2022-10-21 15:00:35 -05:00
papuSpartan ee0505dd00 only delete prompt on back end and remove client-side deletion 2022-10-21 14:24:14 -05:00
papuSpartan 9ba372de90 initial work on getting prompts cleared on the backend and synchronizing token counter 2022-10-21 13:55:48 -05:00
papuSpartan 4a9ff0891a
Merge branch 'AUTOMATIC1111:master' into master 2022-10-21 13:53:32 -05:00
yfszzx bb0f1a2cda inspiration finished 2022-10-22 01:23:00 +08:00
AUTOMATIC 26d1073745 Merge remote-tracking branch 'historytab/master' 2022-10-21 18:49:56 +03:00
AUTOMATIC f49c08ea56 prevent error spam when processing images without txt files for captions 2022-10-21 18:46:02 +03:00
AUTOMATIC1111 5e9afa5c8a
Merge branch 'master' into fix/train-preprocess-keep-ratio 2022-10-21 18:36:29 +03:00
AUTOMATIC ac0aa2b18e loading SD VAE, see PR #3303 2022-10-21 17:35:51 +03:00
AUTOMATIC 704036ff07 make aspect ratio overlay work regardless of selected localization 2022-10-21 17:11:42 +03:00
Rcmcpe 02e4d4694d Change option description of unload_models_when_training 2022-10-21 16:53:06 +03:00
timntorres 272fa527bb Remove unused variable. 2022-10-21 16:52:24 +03:00
timntorres fccad18a59 Refer to Hypernet's name, sensibly, by its name variable. 2022-10-21 16:52:24 +03:00
timntorres 19818f023c Match hypernet name with filename in all cases. 2022-10-21 16:52:24 +03:00
timntorres 51e3dc9cca Sanitize hypernet name input. 2022-10-21 16:52:24 +03:00
DepFA 306e2ff6ab Update image_embedding.py 2022-10-21 16:47:37 +03:00
DepFA d0ea471b0c Use opts in textual_inversion image_embedding.py for dynamic fonts 2022-10-21 16:47:37 +03:00
AUTOMATIC 9286fe53de make aestetic embedding ciompatible with prompts longer than 75 tokens 2022-10-21 16:38:06 +03:00
AUTOMATIC df57064093 do not load aesthetic clip model until it's needed
add refresh button for aesthetic embeddings
add aesthetic params to images' infotext
2022-10-21 16:10:51 +03:00
AUTOMATIC 7d6b388d71 Merge branch 'ae' 2022-10-21 13:35:01 +03:00
AUTOMATIC bf30673f51 Fix Hypernet infotext string split bug for PR #3283 2022-10-21 10:19:25 +03:00
AUTOMATIC 03a1e288c4 turns out LayerNorm also has weight and bias and needs to be pre-multiplied and trained for hypernets 2022-10-21 10:13:24 +03:00
AUTOMATIC1111 0c5522ea21
Merge branch 'master' into training-help-text 2022-10-21 09:57:55 +03:00
timntorres 2273e752fb Remove redundant try/except. 2022-10-21 09:55:00 +03:00
timntorres 4ff274e1e3 Revise comments. 2022-10-21 09:55:00 +03:00
timntorres 6014fb8afb Do nothing if image file already exists. 2022-10-21 09:55:00 +03:00
timntorres 5245c7a493 Issue #2921-Give PNG info to Hypernet previews. 2022-10-21 09:55:00 +03:00
guaneec b69c37d25e Allow datasets with only 1 image in TI 2022-10-21 09:54:09 +03:00
Patryk Wychowaniec 7157e5d064 interrogate: Fix CLIP-interrogation on CPU
Currently, trying to perform CLIP interrogation on a CPU fails, saying:

```
RuntimeError: "slow_conv2d_cpu" not implemented for 'Half'
```

This merge request fixes this issue by detecting whether the target
device is CPU and, if so, force-enabling `--no-half` and passing
`device="cpu"` to `clip.load()` (which then does some extra tricks to
ensure it works correctly on CPU).
2022-10-21 09:52:12 +03:00
AUTOMATIC1111 d6bd6a425d
Merge branch 'master' into master 2022-10-21 09:49:32 +03:00
AUTOMATIC c23f666dba a more strict check for activation type and a more reasonable check for type of layer in hypernets 2022-10-21 09:47:43 +03:00
AUTOMATIC1111 a26fc2834c
Merge pull request #3199 from discus0434/master
Add features to insert activation functions to hypernetworks
2022-10-21 09:34:45 +03:00
winterspringsummer 9d71eef02e sort file list in alphabetical ordering in extras 2022-10-21 09:00:46 +03:00
winterspringsummer a13c3bed3c Fixed path issue while extras batch processing 2022-10-21 09:00:46 +03:00
winterspringsummer fb5a8cf0d9 Added try except to extras batch from directory 2022-10-21 09:00:45 +03:00
winterspringsummer 60872c5b40 Fixed path issue while extras batch processing 2022-10-21 09:00:45 +03:00
AUTOMATIC 74088c2a06 allow float sizes for hypernet's layer_structure 2022-10-21 09:00:45 +03:00
AUTOMATIC 4587218190 updated readme and some small stylistic changes to code 2022-10-21 09:00:39 +03:00
papuSpartan a3b047b7c7 add settings option to toggle button visibility 2022-10-20 19:28:58 -05:00
random_thoughtss 49533eed9e XY grid correctly re-assignes model when config changes 2022-10-20 16:01:27 -07:00
Vladimir Repin d23a46ceaa Different approach to skip/interrupt with highres fix 2022-10-20 23:49:14 +03:00
random_thoughtss 708c3a7bd8 Added PLMS hijack and made sure to always replace methods 2022-10-20 13:28:43 -07:00
Vladimir Repin d1cb08bfb2 fix skip and interrupt for highres. fix option 2022-10-20 22:49:06 +03:00
random_thoughtss 92a17a7a4a Made dummy latents smaller. Minor code cleanups 2022-10-20 09:45:03 -07:00
aria1th f89829ec3a Revert "fix bugs and optimizations"
This reverts commit 108be15500.
2022-10-21 01:37:11 +09:00
不会画画的中医不是好程序员 dc66540629
Merge branch 'AUTOMATIC1111:master' into Inspiron 2022-10-21 00:07:31 +08:00
AngelBottomless 108be15500
fix bugs and optimizations 2022-10-21 01:00:41 +09:00
yfszzx d07cb46f34 inspiration pull request 2022-10-20 23:58:52 +08:00
AngelBottomless a71e021236
only linear 2022-10-20 23:48:52 +09:00
AngelBottomless d8acd34f66
generalized some functions and option for ignoring first layer 2022-10-20 23:43:03 +09:00
Milly 85dd62c4c7 train: ui: added `Split image threshold` and `Split image overlap ratio` to preprocess 2022-10-20 23:35:01 +09:00
Milly 9681419e42 train: fixed preprocess image ratio 2022-10-20 23:32:41 +09:00
discus0434 f8733ad08b add linear as a act func (option for doin nothing) 2022-10-20 11:07:37 +00:00
discus0434 6b38c2c19c
Merge branch 'AUTOMATIC1111:master' into master 2022-10-20 18:51:12 +09:00
captin411 0ddaf8d202
improve face detection a lot 2022-10-20 00:34:55 -07:00
papuSpartan 8931a825f4
Merge branch 'AUTOMATIC1111:master' into master 2022-10-20 01:59:49 -05:00
papuSpartan 158d678f59 clear prompt button now works on both relevant tabs. Device detection stuff will be added later. 2022-10-20 01:08:24 -05:00
AUTOMATIC 7f8ab1ee8f Merge remote-tracking branch 'origin/master' 2022-10-20 08:18:19 +03:00
AUTOMATIC 930b4c64f7 allow float sizes for hypernet's layer_structure 2022-10-20 08:18:02 +03:00
random_thoughtss aa7ff2a197 Fixed non-square highres fix generation 2022-10-19 21:46:13 -07:00
papuSpartan c6345bd445 nerf line length 2022-10-19 21:23:57 -05:00
DepFA 858462f719
do caption copy for both flips 2022-10-20 02:57:18 +01:00
captin411 59ed744383
face detection algo, configurability, reusability
Try to move the crop in the direction of a face if it is present

More internal configuration options for choosing weights of each of the algorithm's findings

Move logic into its module
2022-10-19 17:19:02 -07:00
discus0434 ba469343e6 align ui.py imports with upstream 2022-10-20 00:17:04 +00:00
discus0434 ecb433b220 update 2022-10-20 00:14:16 +00:00
discus0434 6f98e89486 update 2022-10-20 00:10:45 +00:00
papuSpartan 8b74b9aa9a add symbol for clear button and simplify roll_col css selector 2022-10-19 19:06:14 -05:00
DepFA 55d8c6cce6
default to ignore existing captions 2022-10-20 00:53:29 +01:00
DepFA 9b65c4ecf4
pass preprocess_txt_action param 2022-10-20 00:49:23 +01:00
DepFA ab353b141d
link existing txt option 2022-10-20 00:48:07 +01:00
DepFA fbcce66601
add existing caption file handling 2022-10-20 00:46:54 +01:00
DepFA 4d6b9f76a5
reorder create_hypernetwork params 2022-10-20 00:27:16 +01:00
DepFA c3835ec85c
pass overwrite old flag 2022-10-20 00:24:24 +01:00
DepFA 632e8d6602
split learn rates 2022-10-20 00:19:40 +01:00
DepFA 0087079c2d
allow overwrite old embedding 2022-10-20 00:10:59 +01:00
DepFA 166be3919b
allow overwrite old hn 2022-10-20 00:09:40 +01:00
DepFA d6ea584137
change html output 2022-10-20 00:07:57 +01:00
random_thoughtss c418467c03 Don't compute latent mask if were not using it. Also added support for fixed highres_fix generation. 2022-10-19 15:09:43 -07:00
random_thoughtss dde9f96072 added support for ddim img2img 2022-10-19 14:14:24 -07:00
random_thoughtss 0719c10bf1 Fixed copying mistake 2022-10-19 13:56:26 -07:00
random_thoughtss 8e7097d06a Added support for RunwayML inpainting model 2022-10-19 13:47:45 -07:00
captin411 41e3877be2
fix entropy point calculation 2022-10-19 13:44:59 -07:00
DepFA 4d663055de
update ui with extra training options 2022-10-19 20:33:18 +01:00
DepFA eb7ba4b713
update training header text 2022-10-19 19:50:46 +01:00
Mackerel b748b583c0 generation_parameters_copypaste.py: fix indent 2022-10-19 21:30:32 +03:00
Vladimir Repin 46122c4ff6 Send empty prompts as valid generation parameter 2022-10-19 20:31:16 +03:00
timntorres 5e012e4dfa Infotext saves more specific hypernet name. 2022-10-19 20:20:25 +03:00
Alexandre Simard 1e4809b251 Added a bit of padding to the left 2022-10-19 20:06:41 +03:00
Alexandre Simard 57eb1a64c8 Update ui.py 2022-10-19 20:06:41 +03:00
discus0434 2ce52d32e4 fix for #3086 failing to load any previous hypernet 2022-10-19 16:31:12 +00:00
AUTOMATIC c6e9fed500 fix for #3086 failing to load any previous hypernet 2022-10-19 19:21:16 +03:00
DepFA 019a3a88f0
Update ui.py 2022-10-19 17:15:47 +01:00
discus0434 365d4b1650
Merge branch 'AUTOMATIC1111:master' into master 2022-10-20 00:48:13 +09:00
AUTOMATIC1111 f510a2277e
Merge pull request #3086 from discus0434/master
Add settings for multi-layer structure hypernetworks
2022-10-19 18:40:53 +03:00
discus0434 3770b8d2fa enable to write layer structure of hn himself 2022-10-19 15:28:42 +00:00
discus0434 42fbda83bb layer options moves into create hnet ui 2022-10-19 14:30:33 +00:00
captin411 087609ee18
UI changes for focal point image cropping 2022-10-19 03:19:35 -07:00
captin411 abeec4b630
Add auto focal point cropping to Preprocess images
This algorithm plots a bunch of points of interest on the source
image and averages their locations to find a center.

Most points come from OpenCV.  One point comes from an
entropy model. OpenCV points account for 50% of the weight and the
entropy based point is the other 50%.

The center of all weighted points is calculated and a bounding box
is drawn as close to centered over that point as possible.
2022-10-19 03:18:26 -07:00
AUTOMATIC f894dd552f fix for broken checkpoint merger 2022-10-19 12:45:42 +03:00
Ikko Ashimine bb0e7232b3 Fix typo in prompt_parser.py
assoicated -> associated
2022-10-19 11:52:12 +03:00
MalumaDev 2362d5f00e
Merge branch 'master' into test_resolve_conflicts 2022-10-19 10:22:39 +02:00
AUTOMATIC1111 05315d8a23
Merge branch 'master' into hot-reload-javascript 2022-10-19 09:43:49 +03:00
Anastasius 1d4aa376e6 Predictable long operation check for time estimation 2022-10-19 09:39:28 +03:00
Anastasius 442dbedc15 Estimated time displayed if jobs take more 60 sec 2022-10-19 09:39:28 +03:00
Anastasius bcfbb33e50 Added time left estimation 2022-10-19 09:39:28 +03:00
Cheka 2fd7935ef4 Remove wrong self reference in CUDA support for invokeai 2022-10-19 09:35:53 +03:00
discus0434 7f8670c4ef
Merge branch 'master' into master 2022-10-19 15:18:45 +09:00
Silent da72becb13 Use training width/height when training hypernetworks. 2022-10-19 09:13:28 +03:00
discus0434 5d16f59794
Merge branch 'master' into master 2022-10-19 14:56:27 +09:00
AUTOMATIC 5daf9cbb98 Merge remote-tracking branch 'origin/api' 2022-10-19 08:44:51 +03:00
AUTOMATIC 10aca1ca3e more careful loading of model weights (eliminates some issues with checkpoints that have weird cond_stage_model layer names) 2022-10-19 08:42:22 +03:00
arcticfaded 0f0d6ab8e0 call sampler by name 2022-10-19 05:19:01 +00:00
yfszzx 538bc89c26 Image browser improved 2022-10-19 11:27:51 +08:00
arcticfaded e7f4808505 provide sampler by name 2022-10-18 19:04:56 +00:00
discus0434 e40ba281f1 update 2022-10-19 01:03:58 +09:00
discus0434 7f2095c6c8 update 2022-10-19 01:01:22 +09:00
discus0434 a5611ea502 update 2022-10-19 01:00:01 +09:00
discus0434 6021f7a75f add options to custom hypernetwork layer structure 2022-10-19 00:51:36 +09:00
MalumaDev c2765c9bcd
Merge branch 'master' into test_resolve_conflicts 2022-10-18 17:27:30 +02:00
AUTOMATIC cbf15edbf9 remove dependence on TQDM for sampler progress/interrupt functionality 2022-10-18 17:23:38 +03:00
yfszzx b7e78ef692 Image browser improve 2022-10-18 22:21:54 +08:00
AUTOMATIC ec1924ee57 additional fix for difference model merging 2022-10-18 16:05:52 +03:00
AUTOMATIC e20b7e30fe fix for add difference model merging 2022-10-18 15:33:32 +03:00
w-e-w 2f448d97a9 styles.csv encoding utf8 to utf-8-sig
utf-8-bom for better compatibility for some programs
2022-10-18 15:18:51 +03:00
AUTOMATIC 433a7525c1 remove shared option for update check (because it is not an argument of webui)
have launch.py examine both COMMANDLINE_ARGS as well as argv for its arguments
2022-10-18 15:18:02 +03:00
yfszzx eb299527b1 Image browser 2022-10-18 20:14:11 +08:00
DepFA 4c605c5174 add shared option for update check 2022-10-18 15:10:09 +03:00
ふぁ 02622b1919 update scripts.py 2022-10-18 15:08:23 +03:00
ふぁ 3003438088 Add visible for dropdown 2022-10-18 15:08:23 +03:00
ふぁ de29ec0743 Remove exception handling 2022-10-18 15:08:23 +03:00
ふぁ 97d3ba3941 Add scripts to ui-config,json 2022-10-18 15:08:23 +03:00
AUTOMATIC d2f459c5cf clarify the comment for the new option from #2959 and move it to UI section. 2022-10-18 14:22:52 +03:00
trufty 8b02662215 Disable auto weights swap with config option 2022-10-18 14:19:06 +03:00
AUTOMATIC1111 cd9c6e0edf
Merge pull request #2984 from guaneec/D
Don't eat colons in booru tags
2022-10-18 14:18:05 +03:00
AUTOMATIC1111 f6c758d055
Merge branch 'master' into dark-mode 2022-10-18 14:04:17 +03:00
C43H66N12O12S2 c71008c741 Update sd_hijack_optimizations.py 2022-10-18 11:53:04 +03:00
C43H66N12O12S2 73b5dbf72a Update sd_hijack.py 2022-10-18 11:53:04 +03:00
C43H66N12O12S2 84823275e8 readd xformers attnblock 2022-10-18 11:53:04 +03:00
C43H66N12O12S2 2043c4a231 delete xformers attnblock 2022-10-18 11:53:04 +03:00
C43H66N12O12S2 786ed49922 use legacy attnblock 2022-10-18 11:53:04 +03:00
MalumaDev 1997ccff13
Merge branch 'master' into test_resolve_conflicts 2022-10-18 08:55:08 +02:00
arcticfaded 8d5d863a9d gradio and FastAPI 2022-10-18 06:51:53 +00:00
Mykeehu 7432b6f4d2 Fix typo "celem_id" to "elem_id" 2022-10-18 08:59:14 +03:00
Ryan Voots 1df3ff25e6 Add --nowebui as a means of disabling the webui and run on the other port 2022-10-18 08:44:50 +03:00
Ryan Voots 247aeb3aaa Put API under /sdapi/ so that routing is simpler in the future. This means that one could allow access to /sdapi/ but not the webui. 2022-10-18 08:44:50 +03:00
Ryan Voots c3851a853d Re-use webui fastapi application rather than requiring one or the other, not both. 2022-10-18 08:44:50 +03:00
DepFA d3338bdef1 extras extend cache key with new upscale to options 2022-10-18 08:29:52 +03:00
Jordan Hall ab3f997c0c Fix typo in 'choices' when loading upscaler 2 config 2022-10-18 00:27:16 +03:00
arcticfaded f29b16bad1 prevent API from saving 2022-10-17 20:36:14 +00:00
guaneec 2e28c841f4
Oops 2022-10-18 03:15:41 +08:00
arcticfaded f80e914ac4 example API working with gradio 2022-10-17 19:10:36 +00:00
guaneec d62ef76614
Don't eat colons in booru tags 2022-10-18 03:09:50 +08:00
AUTOMATIC cf47d13c1e localization support 2022-10-17 21:15:32 +03:00
AUTOMATIC 695377a8b9 make modelmerger work with ui-config.json 2022-10-17 19:56:23 +03:00
Michoko 665beebc08 Use of a --theme argument for more flexibility
Added possibility to set the theme (light or dark)
2022-10-17 18:24:24 +02:00
yfszzx 2b5b62e768 fix two bug 2022-10-17 23:14:03 +08:00
yfszzx 2272cf2f35 fix two bug 2022-10-17 23:04:42 +08:00
yfszzx c408a0b41c fix two bug 2022-10-17 22:28:43 +08:00
Michoko 8c6a981d5d Added dark mode switch
Launch the UI in dark mode with the --dark-mode switch
2022-10-17 11:05:05 +02:00
AUTOMATIC d42125baf6 add missing requirement for api and fix some typos 2022-10-17 11:50:20 +03:00
Jonathan 71d42bb44b Update api.py 2022-10-17 11:34:22 +03:00
Jonathan 99013ba68a Update processing.py 2022-10-17 11:34:22 +03:00
Jonathan 832b490e51 Update processing.py 2022-10-17 11:34:22 +03:00
arcticfaded 9e02812afd pydantic instrumentation 2022-10-17 11:34:22 +03:00
arcticfaded 60251c9456 initial prototype by borrowing contracts 2022-10-17 11:34:22 +03:00
yfszzx 9d702b16f0 fix two little bug 2022-10-17 16:11:03 +08:00
yfszzx 2a3e7ed872 Merge branch 'master' of https://github.com/yfszzx/stable-diffusion-webui-plus 2022-10-17 15:23:32 +08:00
yfszzx 5b1394bead speed up images history perfect 2022-10-17 15:20:16 +08:00
DepFA 62edfae257 print list of embeddings on reload 2022-10-17 08:42:17 +03:00
AUTOMATIC b99d3cf6dd make CLIP interrogate ranks output sane values 2022-10-17 08:41:02 +03:00
AUTOMATIC 5c94aaf290 fix bug for latest model merge RAM improvement 2022-10-17 08:28:18 +03:00
DenkingOfficial 58f3ef7733 Fix CLIP Interrogator and disable ranks for it 2022-10-17 08:01:59 +03:00
AUTOMATIC 6f7b7a3dcd only read files with .py extension from the scripts dir 2022-10-17 07:56:23 +03:00
MrCheeze 0fd1307671 improve performance of 3-way merge on machines with not enough ram, by only accessing two of the models at a time 2022-10-17 07:54:36 +03:00
MalumaDev 589215df22
Merge branch 'master' into test_resolve_conflicts 2022-10-16 21:06:21 +02:00
SGKoishi c8045c5ad4 The hide_ui_dir_config flag also restrict write attempt to path settings 2022-10-16 20:59:06 +03:00
MalumaDev ae0fdad64a
Merge branch 'master' into test_resolve_conflicts 2022-10-16 17:55:58 +02:00
MalumaDev 9324cdaa31 ui fix, re organization of the code 2022-10-16 17:53:56 +02:00
yfszzx a4de699e3c Images history speed up 2022-10-16 22:37:12 +08:00
DancingSnow fc220a51cf fix dir_path in some path like `D:/Pic/outputs` 2022-10-16 16:40:04 +03:00
CookieHCl adc0ea74e1 Better readablity of logs 2022-10-16 16:36:06 +03:00
CookieHCl c9836279f5 Only make output dir when creating output 2022-10-16 16:36:06 +03:00
CookieHCl 91235d8008 Fix FileNotFoundError in history tab
Now only traverse images when directory exists
2022-10-16 16:36:06 +03:00
yfszzx f62905fdf9 images history speed up 2022-10-16 21:22:38 +08:00
不会画画的中医不是好程序员 272d979d1c
Merge branch 'AUTOMATIC1111:master' into master 2022-10-16 21:16:08 +08:00
MalumaDev e4f8b5f00d ui fix 2022-10-16 10:28:21 +02:00
MalumaDev 523140d780 ui fix 2022-10-16 10:23:30 +02:00
Junpeng Qiu 36a0ba357a Added Refresh Button to embedding and hypernetwork names in Train Tab
Problem
everytime I modified pt files in embedding_dir or hypernetwork_dir, I
need to restart webui to have the new files shown in the dropdown of
Train Tab

Solution
refactored create_refresh_button out of create_setting_component so we
can use this method to create button next to gr.Dropdowns of embedding
name and hypernetworks

Extra Modification
hypernetwork pt are now sorted in alphabetic order
2022-10-16 10:51:06 +03:00
CookieHCl 9258a33e37 Warn when user uses bad ui setting 2022-10-16 10:04:14 +03:00
CookieHCl b65a3101ce Use default value when dropdown ui setting is bad
Default value is the first value of selectables.
Particually, None in styles.
2022-10-16 10:04:14 +03:00
CookieHCl 20bf99052a Make style configurable in ui-config.json 2022-10-16 10:04:14 +03:00
ddPn08 3395ba493f Allow specifying the region of ngrok. 2022-10-16 09:56:33 +03:00
AUTOMATIC 179e3ca752 honor --hide-ui-dir-config option for #2807 2022-10-16 09:51:01 +03:00
winterspringsummer 2ce27728f6 added extras batch work from directory 2022-10-16 09:47:31 +03:00
AUTOMATIC 0c5fa9a681 do not reload embeddings from disk when doing textual inversion 2022-10-16 09:09:04 +03:00
yfszzx 5d8c59eee5 Merge branch 'master' of https://github.com/yfszzx/stable-diffusion-webui-plus 2022-10-16 12:34:05 +08:00
yfszzx 763b893f31 images history sorting files by date 2022-10-16 10:03:09 +08:00
MalumaDev b694bba39a Merge remote-tracking branch 'origin/test_resolve_conflicts' into test_resolve_conflicts 2022-10-16 00:24:05 +02:00
MalumaDev 9325c85f78 fixed dropbox update 2022-10-16 00:23:47 +02:00
MalumaDev 97ceaa23d0
Merge branch 'master' into test_resolve_conflicts 2022-10-16 00:06:36 +02:00
MalumaDev 3d21684ee3 Add support to other img format, fixed dropbox update 2022-10-16 00:01:00 +02:00
zhengxiaoyao0716 9a33292ce4 reload javascript files when custom script bodies 2022-10-16 01:41:37 +08:00
C43H66N12O12S2 529afbf4d7 Update sd_hijack.py 2022-10-15 20:25:27 +03:00
AUTOMATIC 74a9ee7002 fix saving images compatibility with gradio update 2022-10-15 20:09:45 +03:00
MalumaDev 3f5c3b981e
Update modules/ui.py
Co-authored-by: Víctor Gallego <vicgalle@ucm.es>
2022-10-15 18:41:46 +02:00
MalumaDev ad9bc604a8
Update modules/ui.py
Co-authored-by: Víctor Gallego <vicgalle@ucm.es>
2022-10-15 18:41:18 +02:00
MalumaDev 0d4f5db235
Update modules/ui.py
Co-authored-by: Víctor Gallego <vicgalle@ucm.es>
2022-10-15 18:40:58 +02:00
MalumaDev 9b7705e057
Update modules/aesthetic_clip.py
Co-authored-by: Víctor Gallego <vicgalle@ucm.es>
2022-10-15 18:40:34 +02:00
MalumaDev 4387e4fe64
Update modules/ui.py
Co-authored-by: Víctor Gallego <vicgalle@ucm.es>
2022-10-15 18:39:29 +02:00
DepFA b6e3b96dab Change vector size footer label 2022-10-15 17:23:39 +03:00
DepFA ddf6899df0 generalise to popular lossless formats 2022-10-15 17:23:39 +03:00
DepFA 9a1dcd78ed add webp for embed load 2022-10-15 17:23:39 +03:00
DepFA 939f16529a only save 1 image per embedding 2022-10-15 17:23:39 +03:00
DepFA 9e846083b7 add vector size to embed text 2022-10-15 17:23:39 +03:00
MalumaDev 7b7561f6e4
Merge branch 'master' into test_resolve_conflicts 2022-10-15 16:20:17 +02:00
AngelBottomless 703e6d9e4e check NaN for hypernetwork tuning 2022-10-15 17:15:26 +03:00
ruocaled 5fd638f14d fix download section layout 2022-10-15 17:14:58 +03:00
MalumaDev 37d7ffb415 fix to tokens lenght, addend embs generator, add new features to edit the embedding before the generation using text 2022-10-15 15:59:37 +02:00
NO_ob eef3bc6490 typo 2022-10-15 16:13:13 +03:00
AUTOMATIC 97f0727489 add First pass size always regardless of whether it was auto chosen or specified 2022-10-15 15:47:02 +03:00
AUTOMATIC 20a1f68c75 fix gadio issue with sending files between tabs 2022-10-15 15:44:46 +03:00
AUTOMATIC d3463bc59a change styling for top right corner UI
made save style button not die when you cancel
2022-10-15 14:22:30 +03:00
AUTOMATIC f7ca63937a bring back scale latent option in settings 2022-10-15 13:23:12 +03:00
AUTOMATIC 5967d07d1a fix new gradio failing to preserve image params 2022-10-15 13:11:28 +03:00
AUTOMATIC e8729dd051 re-apply height hacks to work with new gradio 2022-10-15 12:54:23 +03:00
AUTOMATIC1111 af144ebdc7
Merge branch 'master' into ckpt-cache 2022-10-15 10:35:18 +03:00
CookieHCl c24df4b486 Disable compiling deepbooru model
This is only necessary when you have to train,
and compiling model produces warning.
2022-10-15 10:21:22 +03:00
AUTOMATIC1111 ea8aa1701a
Merge branch 'master' into master 2022-10-15 10:13:16 +03:00
githublsx a13af34b90 Set to -1 when seed input is none 2022-10-15 10:12:16 +03:00
ddPn08 0da6c18099 use "outdir_samples" if specified 2022-10-15 10:07:45 +03:00
ddPn08 cd28465bf8 do not force relative paths in image history 2022-10-15 10:07:45 +03:00
aoirusann db27b987a9 Add hint for `ctrl/alt enter`
And duplicate implementations are removed
2022-10-15 09:59:40 +03:00
AUTOMATIC c7a86f7fe9 add option to use batch size for training 2022-10-15 09:24:59 +03:00
AUTOMATIC acedbe67d2 bring history tab back, make it behave; it's still slow but won't fuck anything up until you use it 2022-10-15 00:43:15 +03:00
AUTOMATIC 4bbe5d62e0 reformat lines in images_history.py 2022-10-15 00:25:09 +03:00
AUTOMATIC 4dc4265099 rename firstpass w/h to discard old user settings 2022-10-15 00:21:48 +03:00
Melan 4d19f3b7d4 Raise an assertion error if no training images have been found. 2022-10-14 22:45:26 +02:00
AUTOMATIC 368f4cc4c7 set firstpass w/h to 0 by default and rever to old behavior when any are 0 2022-10-14 23:19:05 +03:00
AUTOMATIC cd58e44051 disabling history - i knew it was slow as fuck but i didn't realize it would also show galleries on launch 2022-10-14 23:17:28 +03:00
Rae Fu e21f01f645 add checkpoint cache option to UI for faster model switching
switching time reduced from ~1500ms to ~280ms
2022-10-14 14:09:23 -06:00
AUTOMATIC 03d62538ae remove duplicate code for log loss, add step, make it read from options rather than gradio input 2022-10-14 22:43:55 +03:00
AUTOMATIC 326fe7d44b Merge remote-tracking branch 'Melanpan/master' 2022-10-14 22:14:50 +03:00
AUTOMATIC c250cb289c change checkpoint merger to work in a more obvious way
remove sigmoid and inverse sigmoid because they just did the same thing as weighed sum only with changed multiplier
2022-10-14 22:02:32 +03:00
AUTOMATIC 2f0e089c7c should fix the issue with missing layers in chechpoint merger 2022-10-14 21:20:28 +03:00
AUTOMATIC c344ba3b32 add option to read generation params for learning previews from txt2img 2022-10-14 20:31:49 +03:00
AUTOMATIC bb295f5478 rework the code for lowram a bit 2022-10-14 20:03:41 +03:00
Ljzd-PRO 4a216ded43 load models to VRAM when using `--lowram` param
load models to VRM instead of RAM (for machines which have bigger VRM than RAM such as free Google Colab server)
2022-10-14 19:57:23 +03:00
Ljzd-PRO a8eeb2b7ad add `--lowram` parameter
load models to VRM instead of RAM (for machines which have bigger VRM than RAM such as free Google Colab server)
2022-10-14 19:57:23 +03:00
Gugubo 5f87dd1ee0 Add option to prevent empty spots in grid (2/2) 2022-10-14 19:54:24 +03:00
Gugubo 43f926aad1 Add option to prevent empty spots in grid (1/2) 2022-10-14 19:54:24 +03:00
Gugubo 2fb9891af3 Change grid row count autodetect to prevent empty spots
Instead of just rounding (sometimes resulting in grids with "empty" spots), find a divisor.
For example: 8 images will now result in a 4x2 grid instead of a 3x3 with one empty spot.
2022-10-14 19:54:24 +03:00
AUTOMATIC1111 6b77af7a43
Merge pull request #2396 from yfszzx/master
Add a "History" tab
2022-10-14 19:32:19 +03:00
AUTOMATIC 67f447ddcc possibility to load checkpoint, clip skip, and hypernet from infotext 2022-10-14 19:30:28 +03:00
AUTOMATIC 0aec19d783 make pasting into img2img prompt work
make image params request not use temp files
2022-10-14 18:15:03 +03:00
AUTOMATIC a156c097ab Merge branch 'param-loading' 2022-10-14 17:14:24 +03:00
AUTOMATIC e644b5a80b remove scale latent and no-crop options from hires fix
support copy-pasting new parameters for hires fix
2022-10-14 17:03:03 +03:00
Buckzor b382de2d77 Fixed Scale ratio problem 2022-10-14 16:47:16 +03:00
Buckzor 40d1c6e423 Option between stretch and crop for Highres. fix 2022-10-14 16:47:16 +03:00
Buckzor b2261b53ae Added first_pass_width and height as adjustable inputs to "High Res Fix" 2022-10-14 16:47:16 +03:00
AUTOMATIC 9e5ca5077f extra message for unpicking fails 2022-10-14 16:37:36 +03:00
brkirch fdef8253a4 Add 'interrogate' and 'all' choices to --use-cpu
* Add 'interrogate' and 'all' choices to --use-cpu
* Change type for --use-cpu argument to str.lower, so that choices are case insensitive
2022-10-14 16:31:39 +03:00
MalumaDev bb57f30c2d init 2022-10-14 10:56:41 +02:00
不会画画的中医不是好程序员 f7712e28e5 Merge branch 'AUTOMATIC1111:master' into master 2022-10-14 14:43:44 +08:00
AUTOMATIC fdecb63685 add an ability to merge three checkpoints 2022-10-14 09:20:24 +03:00
yfszzx d48f3470c8 Merge branch 'master' of https://github.com/yfszzx/stable-diffusion-webui-plus 2022-10-14 11:51:26 +08:00
yfszzx 4a37c7eede fix deep nesting directories problem 2022-10-14 11:48:28 +08:00
不会画画的中医不是好程序员 7c8903367c
Merge branch 'AUTOMATIC1111:master' into master 2022-10-14 07:35:07 +08:00
yfszzx a1489f9428 images history fix all known bug 2022-10-14 07:13:38 +08:00
AUTOMATIC 08b3f7aef1 emergency fix for broken send to buttons 2022-10-13 20:42:27 +03:00
AUTOMATIC 354ef0da3b add hypernetwork multipliers 2022-10-13 20:12:37 +03:00
AUTOMATIC a10b0e11fc options to refresh list of models and hypernetworks 2022-10-13 19:22:49 +03:00
AUTOMATIC bb7baf6b9c add option to change what's shown in quicksettings bar 2022-10-13 16:22:25 +03:00
Melan 8636b50aea Add learn_rate to csv and removed a left-over debug statement 2022-10-13 12:37:58 +02:00
Greg Fuller fed7f0e281 Revert "fix prompt in log.csv"
This reverts commit e4b5d16964.
2022-10-13 13:25:29 +03:00
Greg Fuller a3f02e4690 fix prompt in log.csv 2022-10-13 13:25:29 +03:00
Greg Fuller 8711c2fe01 Fix metadata contents 2022-10-13 13:25:29 +03:00
Greg Fuller aeacbac218 Fix save error 2022-10-13 13:25:29 +03:00
AUTOMATIC fde7fefa2e update #2336 to prevent reading params.txt when --hide-ui-dir-config option is enabled (for servers, since this will let some users access others' params) 2022-10-13 12:26:34 +03:00
Trung Ngo e72adc999b Restore last generation params 2022-10-13 12:21:20 +03:00
Greg Fuller 04c0e643f2 Merge branch 'master' of https://github.com/HunterVacui/stable-diffusion-webui 2022-10-13 08:21:01 +03:00
AUTOMATIC1111 4f73e057a9
Merge pull request #2324 from HunterVacui/interrogate_include_ranks_in_output
Interrogate: add option to include ranks in output
2022-10-13 08:05:41 +03:00
AUTOMATIC 78592d404a remove interrogate option I accidentally deleted 2022-10-13 07:40:03 +03:00
不会画画的中医不是好程序员 0186db178e
Merge branch 'AUTOMATIC1111:master' into master 2022-10-13 12:35:39 +08:00
yfszzx 716a9e034f images history delete a number of images consecutively next 2022-10-13 12:19:50 +08:00
d8ahazard 54e0051bdd Add drag/drop param loading.
Drop an image or generational text onto the prompt bar, it loads the info for parsing.
2022-10-12 18:17:26 -05:00
Melan 1cfc2a1898 Save a csv containing the loss while training 2022-10-12 23:36:29 +02:00
Greg Fuller 514456101b [3/?] [wip] fix incorrect variable reference
still needs testing
2022-10-12 13:14:13 -07:00
Greg Fuller f776254b12 [2/?] [wip] ignore OPT_INCLUDE_RANKS for training filenames 2022-10-12 13:12:18 -07:00
Greg Fuller efefa4862c [1/?] [wip] Reintroduce opts.interrogate_return_ranks
looks functionally correct, needs testing

Needs particular testing care around whether the colon usage (:) will break anything in whatever new use cases were introduced by https://github.com/AUTOMATIC1111/stable-diffusion-webui/pull/2143
2022-10-12 13:03:00 -07:00
Greg Fuller fb3cefb348 Merge remote-tracking branch 'upstream/master' into interrogate_include_ranks_in_output 2022-10-12 12:44:41 -07:00
AUTOMATIC 698d303b04 deepbooru: added option to use spaces or underscores
deepbooru: added option to quote (\) in tags
deepbooru/BLIP: write caption to file instead of image filename
deepbooru/BLIP: now possible to use both for captions
deepbooru: process is stopped even if an exception occurs
2022-10-12 21:55:43 +03:00
AUTOMATIC c3c8eef9fd train: change filename processing to be more simple and configurable
train: make it possible to make text files with prompts
train: rework scheduler so that there's less repeating code in textual inversion and hypernets
train: move epochs setting to options
2022-10-12 20:49:47 +03:00
yfszzx df97947b21 Merge branch 'master' of https://github.com/yfszzx/stable-diffusion-webui-plus 2022-10-13 00:28:37 +08:00
不会画画的中医不是好程序员 324e6ed5d1
Merge branch 'AUTOMATIC1111:master' into master 2022-10-13 00:21:57 +08:00
yfszzx a2aa2a68bc images history improvement 2022-10-13 00:21:16 +08:00
yfszzx a1a94b8b5f images history improvement 2022-10-13 00:19:34 +08:00
yfszzx c87c3b9c11 test 2022-10-12 21:24:40 +08:00
AUTOMATIC1111 cc5803603b
Merge pull request #2037 from AUTOMATIC1111/embed-embeddings-in-images
Add option to store TI embeddings in png chunks, and load from same.
2022-10-12 15:59:24 +03:00
yfszzx 511ca57e37 Merge branch 'master' of https://github.com/yfszzx/stable-diffusion-webui-plus 2022-10-12 20:48:03 +08:00
yfszzx e05573e1ad images history improvement 2022-10-12 20:47:55 +08:00
DepFA 10a2de644f
formatting 2022-10-12 13:15:35 +01:00
DepFA 50be33e953
formatting 2022-10-12 13:13:25 +01:00
AUTOMATIC 429442f4a6 fix iterator bug for #2295 2022-10-12 13:38:03 +03:00
hentailord85ez 80f3cf2bb2 Account when lines are mismatched 2022-10-12 11:38:41 +03:00
AUTOMATIC ee015a1af6 change textual inversion tab to train
remake train interface to use tabs
2022-10-12 11:05:57 +03:00
Milly 2d006ce16c xy_grid: Find hypernetwork by closest name 2022-10-12 10:40:10 +03:00
AUTOMATIC1111 dc1432e0dd
Merge branch 'master' into feature/scale_to 2022-10-12 10:35:42 +03:00
brkirch 57e03cdd24 Ensure the directory exists before saving to it
The directory for the images saved with the Save button may still not exist, so it needs to be created prior to opening the log.csv file.
2022-10-12 09:55:56 +03:00
AUTOMATIC 336bd8703c just add the deepdanbooru settings unconditionally 2022-10-12 09:00:07 +03:00
AUTOMATIC ee10c41e2a Merge remote-tracking branch 'origin/steve3d' 2022-10-12 08:35:52 +03:00
AUTOMATIC1111 2e2d45b281
Merge pull request #2143 from JC-Array/deepdanbooru_pre_process
deepbooru tags for textual inversion preproccessing
2022-10-12 08:35:27 +03:00
Greg Fuller fec2221eea Truncate error text to fix service lockup / stall
What:
* Update wrap_gradio_call to add a limit to the maximum amount of text output

Why:
* wrap_gradio_call currently prints out a list of the arguments provided to the failing function.
   * if that function is save_image, this causes the entire image to be printed to stderr
    * If the image is large, this can cause the service to lock up while attempting to print all the text
 * It is easy to generate large images using the x/y plot script
 * it is easy to encounter image save exceptions, including if the output directory does not exist / cannot be written to, or if the file is too big
  * The huge amount of log spam is confusing and not particularly helpful
2022-10-12 08:30:06 +03:00
AUTOMATIC 6ac2ec2b78 create dir for hypernetworks 2022-10-12 07:01:20 +03:00
Greg Fuller d717eb079c Interrogate: add option to include ranks in output
Since the UI also allows users to specify ranks, it can be useful to show people what ranks are being returned by interrogate

This can also give much better results when feeding the interrogate results back into either img2img or txt2img, especially when trying to generate a specific character or scene for which you have a similar concept image

Testing Steps:

Launch Webui with command line arg: --deepdanbooru
Navigate to img2img tab, use interrogate DeepBooru, verify tags appears as before. Use "Interrogate CLIP", verify prompt appears as before
Navigate to Settings tab, enable new option, click "apply settings"
Navigate to img2img, Interrogate DeepBooru again, verify that weights appear and are properly formatted. Note that "Interrogate CLIP" prompt is still unchanged
In my testing, this change has no effect to "Interrogate CLIP", as it seems to generate a sentence-structured caption, and not a set of tags.

(reproduce changes from 6ed4faac46)
2022-10-11 18:02:41 -07:00
supersteve3d 65b973ac4e
Update shared.py
Correct typo to "Unload VAE and CLIP from VRAM when training" in settings tab.
2022-10-12 08:21:52 +08:00
JC_Array f53f703aeb resolved conflicts, moved settings under interrogate section, settings only show if deepbooru flag is enabled 2022-10-11 18:12:12 -05:00
JC-Array 963d986396
Merge branch 'AUTOMATIC1111:master' into deepdanbooru_pre_process 2022-10-11 17:33:15 -05:00
AUTOMATIC 6be32b31d1 reports that training with medvram is possible. 2022-10-11 23:07:09 +03:00
DepFA 66ec505975
add file based test 2022-10-11 20:21:30 +01:00
DepFA 7e6a6e00ad
Add files via upload 2022-10-11 20:20:46 +01:00
DepFA 5f3317376b
spacing 2022-10-11 20:09:49 +01:00
DepFA 91d7ee0d09
update imports 2022-10-11 20:09:10 +01:00
DepFA aa75d5cfe8
correct conflict resolution typo 2022-10-11 20:06:13 +01:00
AUTOMATIC d6fcc6b87b apply lr schedule to hypernets 2022-10-11 22:03:05 +03:00
DepFA db71290d26
remove old caption method 2022-10-11 19:55:54 +01:00
DepFA 61788c0538
shift embedding logic out of textual_inversion 2022-10-11 19:50:50 +01:00
AUTOMATIC1111 419e539fe3
Merge branch 'learning_rate-scheduling' into learnschedule 2022-10-11 21:50:19 +03:00
DepFA e5fbf5c755
remove embedding related image functions from images 2022-10-11 19:46:33 +01:00
DepFA c080f52cea
move embedding logic to separate file 2022-10-11 19:37:58 +01:00
AUTOMATIC 6a9ea5b41c prevent extra modules from being saved/loaded with hypernet 2022-10-11 19:22:30 +03:00
AUTOMATIC d4ea5f4d86 add an option to unload models during hypernetwork training to save VRAM 2022-10-11 19:03:08 +03:00
AUTOMATIC 6d09b8d1df produce error when training with medvram/lowvram enabled 2022-10-11 18:33:57 +03:00
JC_Array ff4ef13dd5 removed unneeded print 2022-10-11 10:24:27 -05:00
AUTOMATIC d682444ecc add option to select hypernetwork modules when creating 2022-10-11 18:04:47 +03:00
AUTOMATIC1111 4f96ffd0b5
Merge pull request #2201 from alg-wiki/textual__inversion
Textual Inversion: Preprocess and Training will only pick-up image files instead
2022-10-11 17:25:36 +03:00
brkirch 861db783c7 Use apply_hypernetwork function 2022-10-11 17:24:00 +03:00
brkirch 574c8e554a Add InvokeAI and lstein to credits, add back CUDA support 2022-10-11 17:24:00 +03:00
brkirch 98fd5cde72 Add check for psutil 2022-10-11 17:24:00 +03:00
brkirch c0484f1b98 Add cross-attention optimization from InvokeAI
* Add cross-attention optimization from InvokeAI (~30% speed improvement on MPS)
* Add command line option for it
* Make it default when CUDA is unavailable
2022-10-11 17:24:00 +03:00
AUTOMATIC1111 f7e86aa420
Merge pull request #2227 from papuSpartan/master
Refresh list of models/ckpts upon hitting restart gradio in the setti…
2022-10-11 17:15:19 +03:00
DepFA 1eaad95533
Merge branch 'master' into embed-embeddings-in-images 2022-10-11 15:15:09 +01:00
AUTOMATIC 66b7d7584f become even stricter with pickles
no pickle shall pass
thank you again, RyotaK
2022-10-11 17:03:16 +03:00
papuSpartan d01a2d0156 move list refresh to webui.py and add stdout indicating it's doing so 2022-10-11 08:31:28 -05:00
不会画画的中医不是好程序员 a36dea9596
Merge branch 'master' into master 2022-10-11 21:03:41 +08:00
AUTOMATIC b0583be088 more renames 2022-10-11 15:54:34 +03:00
AUTOMATIC 873efeed49 rename hypernetwork dir to hypernetworks to prevent clash with an old filename that people who use zip instead of git clone will have 2022-10-11 15:51:30 +03:00
JamnedZ a004d1a855 Added new line at the end of ngrok.py 2022-10-11 15:38:53 +03:00
JamnedZ 5992564448 Cleaned ngrok integration 2022-10-11 15:38:53 +03:00
Ben 861297cefe add a space holder 2022-10-11 15:37:04 +03:00
Ben 87b77cad5f Layout fix 2022-10-11 15:37:04 +03:00
yfszzx 87d63bbab5 images history improvement 2022-10-11 20:37:03 +08:00
Martin Cairns eacc03b167 Fix typo in comments 2022-10-11 15:36:29 +03:00
Martin Cairns 1eae307607 Remove debug code for checking that first sigma value is same after code cleanup 2022-10-11 15:36:29 +03:00
Martin Cairns 92d7a13885 Handle different parameters for DPM fast & adaptive 2022-10-11 15:36:29 +03:00
yfszzx 594ab4ba53 images history improvement 2022-10-11 20:23:41 +08:00
yfszzx 7b1db45e1f images history improvement 2022-10-11 20:17:27 +08:00
AUTOMATIC 530103b586 fixes related to merge 2022-10-11 14:53:02 +03:00
alg-wiki 8bacbca0a1
Removed my local edits to checkpoint image generation 2022-10-11 17:35:09 +09:00
alg-wiki b2368a3bce
Switched to exception handling 2022-10-11 17:32:46 +09:00
AUTOMATIC 5de806184f Merge branch 'master' into hypernetwork-training 2022-10-11 11:14:36 +03:00
AUTOMATIC 948533950c replace duplicate code with a function 2022-10-11 11:10:17 +03:00
hentailord85ez 5e2627a1a6
Comma backtrack padding (#2192)
Comma backtrack padding
2022-10-11 09:55:28 +03:00
Kenneth 8617396c6d Added slider for deepbooru score threshold in settings 2022-10-11 09:43:16 +03:00
Jairo Correa 8b7d3f1bef Make the ctrl+enter shortcut use the generate button on the current tab 2022-10-11 09:32:03 +03:00
DepFA 7aa8fcac1e
use simple lcg in xor 2022-10-11 04:17:36 +01:00
papuSpartan 1add3cff84 Refresh list of models/ckpts upon hitting restart gradio in the settings pane 2022-10-10 19:57:43 -05:00
JC_Array bb932dbf9f added alpha sort and threshold variables to create process method in preprocessing 2022-10-10 18:37:52 -05:00
JC-Array 47f5e216da
Merge branch 'deepdanbooru_pre_process' into master 2022-10-10 18:10:49 -05:00
JC_Array 76ef3d75f6 added deepbooru settings (threshold and sort by alpha or likelyhood) 2022-10-10 18:01:49 -05:00
DepFA e0fbe6d27e
colour depth conversion fix 2022-10-10 23:26:24 +01:00
DepFA 767202a4c3
add dependency 2022-10-10 23:20:52 +01:00
DepFA 315d5a8ed9
update data dis[play style 2022-10-10 23:14:44 +01:00
JC_Array b980e7188c corrected tag return in get_deepbooru_tags 2022-10-10 16:52:54 -05:00
JC_Array a1a05ad2d1 import time missing, added to deepbooru fixxing error on get_deepbooru_tags 2022-10-10 16:47:58 -05:00
alg-wiki 907a88b2d0 Added .webp .bmp 2022-10-11 06:35:07 +09:00
Fampai 2536ecbb17 Refactored learning rate code 2022-10-10 17:10:29 -04:00
AUTOMATIC f98338faa8 add an option to not add watermark to created images 2022-10-10 23:15:48 +03:00
alg-wiki f0ab972f85
Merge branch 'master' into textual__inversion 2022-10-11 03:35:28 +08:00
alg-wiki bc3e183b73
Textual Inversion: Preprocess and Training will only pick-up image files 2022-10-11 04:30:13 +09:00
Justin Maier 1d64976dbc Simplify crop logic 2022-10-10 12:04:21 -06:00
AUTOMATIC 727e4d1086 no to different messages plus fix using != to compare to None 2022-10-10 20:46:55 +03:00
AUTOMATIC1111 b3d3b335cf
Merge pull request #2131 from ssysm/upstream-master
Add VAE Path Arguments
2022-10-10 20:45:14 +03:00
AUTOMATIC 39919c40dd add eta noise seed delta option 2022-10-10 20:32:44 +03:00
ssysm af62ad4d25 change vae loading method 2022-10-10 13:25:28 -04:00
C43H66N12O12S2 ed769977f0 add swinir v2 support 2022-10-10 19:54:57 +03:00
C43H66N12O12S2 ece27fe989 Add files via upload 2022-10-10 19:54:57 +03:00
C43H66N12O12S2 3e7a981194 remove functorch 2022-10-10 19:54:07 +03:00
C43H66N12O12S2 623251ce2b allow pascal onwards 2022-10-10 19:54:07 +03:00
Vladimir Repin 9d33baba58 Always show previous mask and fix extras_send dest 2022-10-10 19:39:24 +03:00
hentailord85ez d5c14365fd Add back in output hidden states parameter 2022-10-10 18:54:48 +03:00
hentailord85ez 460bbae587 Pad beginning of textual inversion embedding 2022-10-10 18:54:48 +03:00
hentailord85ez b340439586 Unlimited Token Works
Unlimited tokens actually work now. Works with textual inversion too. Replaces the previous not-so-much-working implementation.
2022-10-10 18:54:48 +03:00
RW21 f347ddfd80 Remove max_batch_count from ui.py 2022-10-10 18:53:40 +03:00
DepFA df6d0d9286
convert back to rgb as some hosts add alpha 2022-10-10 15:43:09 +01:00
DepFA 707a431100
add pixel data footer 2022-10-10 15:34:49 +01:00
DepFA ce2d7f7eac
Merge branch 'master' into embed-embeddings-in-images 2022-10-10 15:13:48 +01:00
alg-wiki 7a20f914ed Custom Width and Height 2022-10-10 17:05:12 +03:00
alg-wiki 6ad3a53e36 Fixed progress bar output for epoch 2022-10-10 17:05:12 +03:00
alg-wiki ea00c1624b Textual Inversion: Added custom training image size and number of repeats per input image in a single epoch 2022-10-10 17:05:12 +03:00
AUTOMATIC 8f1efdc130 --no-half-vae pt2 2022-10-10 17:03:45 +03:00
alg-wiki 04c745ea4f
Custom Width and Height 2022-10-10 22:35:35 +09:00
AUTOMATIC 7349088d32 --no-half-vae 2022-10-10 16:16:29 +03:00
不会画画的中医不是好程序员 1e18a5ffcc
Merge branch 'AUTOMATIC1111:master' into master 2022-10-10 20:21:25 +08:00
yfszzx 23f2989799 images history over 2022-10-10 18:33:49 +08:00
JC_Array 2f94331df2 removed change in last commit, simplified to adding the visible argument to process_caption_deepbooru and it set to False if deepdanbooru argument is not set 2022-10-10 03:34:00 -05:00
alg-wiki 4ee7519fc2
Fixed progress bar output for epoch 2022-10-10 17:31:33 +09:00
JC_Array 8ec069e64d removed duplicate run_preprocess.click by creating run_preprocess_inputs list and appending deepbooru variable to input list if in scope 2022-10-10 03:23:24 -05:00
alg-wiki 3110f895b2
Textual Inversion: Added custom training image size and number of repeats per input image in a single epoch 2022-10-10 17:07:46 +09:00
yfszzx 8a7c07a214 show image history 2022-10-10 15:39:39 +08:00
brkirch 8acc901ba3 Newer versions of PyTorch use TypedStorage instead
Pytorch 1.13 and later will rename _TypedStorage to TypedStorage, so check for TypedStorage and use _TypedStorage if it is not available. Currently this is needed so that nightly builds of PyTorch work correctly.
2022-10-10 08:04:52 +03:00
JC_Array 1f92336be7 refactored the deepbooru module to improve speed on running multiple interogations in a row. Added the option to generate deepbooru tags for textual inversion preproccessing. 2022-10-09 23:58:18 -05:00
ssysm 6fdad291bd Merge branch 'master' of https://github.com/AUTOMATIC1111/stable-diffusion-webui into upstream-master 2022-10-09 23:20:39 -04:00
ssysm cc92dc1f8d add vae path args 2022-10-09 23:17:29 -04:00
Justin Maier 6435691bb1 Add "Scale to" option to Extras 2022-10-09 19:26:52 -06:00
DepFA 4117afff11
Merge branch 'master' into embed-embeddings-in-images 2022-10-10 00:38:54 +01:00
DepFA e2c2925eb4
remove braces from steps 2022-10-10 00:12:53 +01:00
DepFA d6a599ef9b
change caption method 2022-10-10 00:07:52 +01:00
DepFA 0ac3a07eec
add caption image with overlay 2022-10-10 00:05:36 +01:00
DepFA 01fd9cf0d2
change source of step count 2022-10-09 22:17:02 +01:00
DepFA 96f1e6be59
source checkpoint hash from current checkpoint 2022-10-09 22:14:50 +01:00
DepFA 6684610510
correct case on embeddingFromB64 2022-10-09 22:06:42 +01:00
DepFA d0184b8f76
change json tensor key name 2022-10-09 22:06:12 +01:00
DepFA 5d12ec82d3
add encoder and decoder classes 2022-10-09 22:05:09 +01:00
DepFA 969bd8256e
add alternate checkpoint hash source 2022-10-09 22:02:28 +01:00
DepFA 03694e1f99
add embedding load and save from b64 json 2022-10-09 21:58:14 +01:00
AUTOMATIC a65476718f add DoubleStorage to list of allowed classes for pickle 2022-10-09 23:38:49 +03:00
DepFA fa0c5eb81b
Add pretty image captioning functions 2022-10-09 20:41:22 +01:00
AUTOMATIC 8d340cfb88 do not add clip skip to parameters if it's 1 or 0 2022-10-09 22:31:35 +03:00
Fampai 1824e9ee3a Removed unnecessary tmp variable 2022-10-09 22:31:23 +03:00
Fampai ad3ae44108 Updated code for legibility 2022-10-09 22:31:23 +03:00
Fampai ec2bd9be75 Fix issues with CLIP ignore option name change 2022-10-09 22:31:23 +03:00
Fampai a14f7bf113 Corrected CLIP Layer Ignore description and updated its range to the max possible 2022-10-09 22:31:23 +03:00
Fampai e59c66c008 Optimized code for Ignoring last CLIP layers 2022-10-09 22:31:23 +03:00
AUTOMATIC 6c383d2e82 show model selection setting on top of page 2022-10-09 22:24:07 +03:00
Artem Zagidulin 9ecea0a8d6 fix missing png info when Extras Batch Process 2022-10-09 18:35:25 +03:00
AUTOMATIC 875ddfeecf added guard for torch.load to prevent loading pickles with unknown content 2022-10-09 17:58:43 +03:00
victorca25 53154ba10a
Merge branch 'master' into esrgan_mod 2022-10-09 14:11:22 +02:00
AUTOMATIC 9d1138e294 fix typo in filename for ESRGAN arch 2022-10-09 15:08:27 +03:00
AUTOMATIC e6e8cabe0c change up #2056 to make it work how i want it to plus make xy plot write correct values to images 2022-10-09 14:57:48 +03:00
William Moorehouse 594cbfd8fb Sanitize infotext output (for now) 2022-10-09 14:49:15 +03:00
William Moorehouse 006791c13d Fix grabbing the model name for infotext 2022-10-09 14:49:15 +03:00
William Moorehouse d6d10a37bf Added extended model details to infotext 2022-10-09 14:49:15 +03:00
AUTOMATIC 542a3d3a4a fix btoken hypernetworks in XY plot 2022-10-09 14:33:22 +03:00
victorca25 ad4de819c4 update ESRGAN architecture and model to support all ESRGAN models in the DB, BSRGAN and real-ESRGAN models 2022-10-09 13:07:50 +02:00
AUTOMATIC 77a719648d fix logic error in #1832 2022-10-09 13:48:04 +03:00
AUTOMATIC f4578b343d fix model switching not working properly if there is a different yaml config 2022-10-09 13:23:30 +03:00
AUTOMATIC bd833409ac additional changes for saving pnginfo for #1803 2022-10-09 13:10:15 +03:00
Milly 0609ce06c0 Removed duplicate definition model_path 2022-10-09 12:46:07 +03:00
AUTOMATIC 6f6798ddab prevent a possible code execution error (thanks, RyotaK) 2022-10-09 12:33:37 +03:00
AUTOMATIC 0241d811d2 Revert "Fix for Prompts_from_file showing extra textbox."
This reverts commit e2930f9821.
2022-10-09 12:04:44 +03:00
AUTOMATIC ab4fe4f44c hide filenames for save button by default 2022-10-09 11:59:41 +03:00
Tony Beeman cbf6dad02d Handle case where on_show returns the wrong number of arguments 2022-10-09 11:16:38 +03:00
Tony Beeman 86cb16886f Pull Request Code Review Fixes 2022-10-09 11:16:38 +03:00
Tony Beeman e2930f9821 Fix for Prompts_from_file showing extra textbox. 2022-10-09 11:16:38 +03:00
Nicolas Noullet 1ffeb42d38 Fix typo 2022-10-09 11:10:13 +03:00
frostydad ef93acdc73 remove line break 2022-10-09 11:09:17 +03:00
frostydad 03e570886f Fix incorrect sampler name in output 2022-10-09 11:09:17 +03:00
Fampai 122d42687b Fix VRAM Issue by only loading in hypernetwork when selected in settings 2022-10-09 11:08:11 +03:00
AUTOMATIC1111 e00b4df7c6
Merge pull request #1752 from Greendayle/dev/deepdanbooru
Added DeepDanbooru interrogator
2022-10-09 10:52:21 +03:00
aoirusann 14192c5b20 Support `Download` for txt files. 2022-10-09 10:49:11 +03:00
aoirusann 5ab7e88d9b Add `Download` & `Download as zip` 2022-10-09 10:49:11 +03:00
AUTOMATIC 4e569fd888 fixed incorrect message about loading config; thanks anon! 2022-10-09 10:31:47 +03:00
AUTOMATIC c77c89cc83 make main model loading and model merger use the same code 2022-10-09 10:23:31 +03:00
DepFA cd8673bd9b
add embed embedding to ui 2022-10-09 05:40:57 +01:00
DepFA 5841990b0d
Update textual_inversion.py 2022-10-09 05:38:38 +01:00
AUTOMATIC 050a6a798c support loading .yaml config with same name as model
support EMA weights in processing (????)
2022-10-08 23:26:48 +03:00
Aidan Holland 432782163a chore: Fix typos 2022-10-08 22:42:30 +03:00
Edouard Leurent 610a7f4e14 Break after finding the local directory of stable diffusion
Otherwise, we may override it with one of the next two path (. or ..) if it is present there, and then the local paths of other modules (taming transformers, codeformers, etc.) wont be found in sd_path/../.

Fix https://github.com/AUTOMATIC1111/stable-diffusion-webui/issues/1085
2022-10-08 22:35:04 +03:00
AUTOMATIC 3b2141c5fb add 'Ignore last layers of CLIP model' option as a parameter to the infotext 2022-10-08 22:21:15 +03:00
AUTOMATIC e6e42f98df make --force-enable-xformers work without needing --xformers 2022-10-08 22:12:23 +03:00
Fampai 1371d7608b Added ability to ignore last n layers in FrozenCLIPEmbedder 2022-10-08 22:10:37 +03:00
DepFA b458fa48fe Update ui.py 2022-10-08 20:38:35 +03:00
DepFA 15c4278f1a TI preprocess wording
I had to check the code to work out what splitting was 🤷🏿
2022-10-08 20:38:35 +03:00
Greendayle 0ec80f0125
Merge branch 'master' into dev/deepdanbooru 2022-10-08 18:28:22 +02:00
AUTOMATIC 3061cdb7b6 add --force-enable-xformers option and also add messages to console regarding cross attention optimizations 2022-10-08 19:22:15 +03:00
AUTOMATIC f9c5da1592 add fallback for xformers_attnblock_forward 2022-10-08 19:05:19 +03:00
Greendayle 01f8cb4447 made deepdanbooru optional, added to readme, automatic download of deepbooru model 2022-10-08 18:02:56 +02:00
Artem Zagidulin a5550f0213 alternate prompt 2022-10-08 18:12:19 +03:00
C43H66N12O12S2 cc0258aea7 check for ampere without destroying the optimizations. again. 2022-10-08 17:54:16 +03:00
C43H66N12O12S2 017b6b8744 check for ampere 2022-10-08 17:54:16 +03:00
Greendayle 5329d0aba0 Merge branch 'master' into dev/deepdanbooru 2022-10-08 16:30:28 +02:00
AUTOMATIC cfc33f99d4 why did you do this 2022-10-08 17:29:06 +03:00
Greendayle 2e8ba0fa47 fix conflicts 2022-10-08 16:27:48 +02:00
Milly 4f33289d0f Fixed typo 2022-10-08 17:15:30 +03:00
AUTOMATIC 27032c47df restore old opt_split_attention/disable_opt_split_attention logic 2022-10-08 17:10:05 +03:00
AUTOMATIC dc1117233e simplify xfrmers options: --xformers to enable and that's it 2022-10-08 17:02:18 +03:00
AUTOMATIC 7ff1170a2e emergency fix for xformers (continue + shared) 2022-10-08 16:33:39 +03:00
AUTOMATIC1111 48feae37ff
Merge pull request #1851 from C43H66N12O12S2/flash
xformers attention
2022-10-08 16:29:59 +03:00
C43H66N12O12S2 970de9ee68
Update sd_hijack.py 2022-10-08 16:29:43 +03:00
C43H66N12O12S2 69d0053583
update sd_hijack_opt to respect new env variables 2022-10-08 16:21:40 +03:00
C43H66N12O12S2 ddfa9a9786
add xformers_available shared variable 2022-10-08 16:20:41 +03:00
C43H66N12O12S2 26b459a379
default to split attention if cuda is available and xformers is not 2022-10-08 16:20:04 +03:00
MrCheeze 5f85a74b00 fix bug where when using prompt composition, hijack_comments generated before the final AND will be dropped 2022-10-08 15:48:04 +03:00
ddPn08 772db721a5 fix glob path in hypernetwork.py 2022-10-08 15:46:54 +03:00
AUTOMATIC 7001bffe02 fix AND broken for long prompts 2022-10-08 15:43:25 +03:00
AUTOMATIC 77f4237d1c fix bugs related to variable prompt lengths 2022-10-08 15:25:59 +03:00
AUTOMATIC 4999eb2ef9 do not let user choose his own prompt token count limit 2022-10-08 14:25:47 +03:00
Trung Ngo 00117a07ef check specifically for skipped 2022-10-08 13:40:39 +03:00
Trung Ngo 786d9f63aa Add button to skip the current iteration 2022-10-08 13:40:39 +03:00
AUTOMATIC 45cc0ce3c4 Merge remote-tracking branch 'origin/master' 2022-10-08 13:39:08 +03:00
AUTOMATIC 706d5944a0 let user choose his own prompt token count limit 2022-10-08 13:38:57 +03:00
leko 616b7218f7 fix: handles when state_dict does not exist 2022-10-08 12:38:50 +03:00
C43H66N12O12S2 91d66f5520
use new attnblock for xformers path 2022-10-08 11:56:01 +03:00
C43H66N12O12S2 76a616fa6b
Update sd_hijack_optimizations.py 2022-10-08 11:55:38 +03:00
C43H66N12O12S2 5d54f35c58
add xformers attnblock and hypernetwork support 2022-10-08 11:55:02 +03:00
brkirch f2055cb1d4 Add hypernetwork support to split cross attention v1
* Add hypernetwork support to split_cross_attention_forward_v1
* Fix device check in esrgan_model.py to use devices.device_esrgan instead of shared.device
2022-10-08 09:39:17 +03:00
C43H66N12O12S2 b70eaeb200
delete broken and unnecessary aliases 2022-10-08 04:10:35 +03:00
C43H66N12O12S2 c9cc65b201
switch to the proper way of calling xformers 2022-10-08 04:09:18 +03:00
AUTOMATIC 12c4d5c6b5 hypernetwork training mk1 2022-10-07 23:22:22 +03:00
Greendayle 5f12e7efd9 linux test 2022-10-07 20:58:30 +02:00
Greendayle fa2ea648db even more powerfull fix 2022-10-07 20:46:38 +02:00
Greendayle 54fa613c83 loading tf only in interrogation process 2022-10-07 20:37:43 +02:00
Greendayle 537da7a304 Merge branch 'master' into dev/deepdanbooru 2022-10-07 18:31:49 +02:00
AUTOMATIC f7c787eb7c make it possible to use hypernetworks without opt split attention 2022-10-07 16:39:51 +03:00
AUTOMATIC 97bc0b9504 do not stop working on failed hypernetwork load 2022-10-07 13:22:50 +03:00
AUTOMATIC d15b3ec001 support loading VAE 2022-10-07 10:40:22 +03:00
AUTOMATIC bad7cb29ce added support for hypernetworks (???) 2022-10-07 10:17:52 +03:00
C43H66N12O12S2 5e3ff846c5
Update sd_hijack.py 2022-10-07 06:38:01 +03:00
C43H66N12O12S2 5303df2428
Update sd_hijack.py 2022-10-07 06:01:14 +03:00
C43H66N12O12S2 35d6b23162
Update sd_hijack.py 2022-10-07 05:31:53 +03:00
C43H66N12O12S2 da4ab2707b
Update shared.py 2022-10-07 05:23:06 +03:00