Commit Graph

342 Commits

Author SHA1 Message Date
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
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
不会画画的中医不是好程序员 0186db178e
Merge branch 'AUTOMATIC1111:master' into master 2022-10-13 12:35:39 +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
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
不会画画的中医不是好程序员 324e6ed5d1
Merge branch 'AUTOMATIC1111:master' into master 2022-10-13 00:21:57 +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
AUTOMATIC ee015a1af6 change textual inversion tab to train
remake train interface to use tabs
2022-10-12 11:05:57 +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
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
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 d6fcc6b87b apply lr schedule to hypernets 2022-10-11 22:03:05 +03:00
AUTOMATIC1111 419e539fe3
Merge branch 'learning_rate-scheduling' into learnschedule 2022-10-11 21:50:19 +03:00
AUTOMATIC d682444ecc add option to select hypernetwork modules when creating 2022-10-11 18:04:47 +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
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 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 594ab4ba53 images history improvement 2022-10-11 20:23:41 +08:00
AUTOMATIC 530103b586 fixes related to merge 2022-10-11 14:53:02 +03:00
AUTOMATIC 5de806184f Merge branch 'master' into hypernetwork-training 2022-10-11 11:14:36 +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
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 47f5e216da
Merge branch 'deepdanbooru_pre_process' into master 2022-10-10 18:10:49 -05:00
Fampai 2536ecbb17 Refactored learning rate code 2022-10-10 17:10:29 -04:00
Justin Maier 1d64976dbc Simplify crop logic 2022-10-10 12:04:21 -06:00
Vladimir Repin 9d33baba58 Always show previous mask and fix extras_send dest 2022-10-10 19:39:24 +03:00
RW21 f347ddfd80 Remove max_batch_count from ui.py 2022-10-10 18:53:40 +03: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 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
不会画画的中医不是好程序员 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
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
yfszzx 8a7c07a214 show image history 2022-10-10 15:39:39 +08: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
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
AUTOMATIC 6c383d2e82 show model selection setting on top of page 2022-10-09 22:24:07 +03:00
AUTOMATIC 6f6798ddab prevent a possible code execution error (thanks, RyotaK) 2022-10-09 12:33:37 +03:00
AUTOMATIC ab4fe4f44c hide filenames for save button by default 2022-10-09 11:59:41 +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
DepFA cd8673bd9b
add embed embedding to ui 2022-10-09 05:40:57 +01:00
Aidan Holland 432782163a chore: Fix typos 2022-10-08 22:42:30 +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 01f8cb4447 made deepdanbooru optional, added to readme, automatic download of deepbooru model 2022-10-08 18:02:56 +02: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
Trung Ngo 786d9f63aa Add button to skip the current iteration 2022-10-08 13:40:39 +03:00
AUTOMATIC 12c4d5c6b5 hypernetwork training mk1 2022-10-07 23:22:22 +03:00
Greendayle 537da7a304 Merge branch 'master' into dev/deepdanbooru 2022-10-07 18:31:49 +02:00
Milly 0bb458f0ca Removed duplicate image saving codes
Use `modules.images.save_image()` instead.
2022-10-06 20:15:39 +03:00
AUTOMATIC c26732fbee added support for AND from https://energy-based-model.github.io/Compositional-Visual-Generation-with-Composable-Diffusion-Models/ 2022-10-05 23:16:27 +03:00
Greendayle 59a2b9e5af deepdanbooru interrogator 2022-10-05 20:55:26 +02:00
DepFA bbdbbd36ed shared.state.interrupt when restart is requested 2022-10-05 11:37:18 +03:00
xpscyho ef40e4cd4d Display time taken in mins, secs when relevant
Fixes #1656
2022-10-04 23:41:42 +03:00
AUTOMATIC b32852ef03 add editor to img2img 2022-10-04 20:49:54 +03:00
AUTOMATIC d5bba20a58 ignore errors in parse for purposes of token counting for #1564 2022-10-04 14:35:12 +03:00
AUTOMATIC 43a74fa595 batch processing for img2img with an empty output directory, by request 2022-10-03 11:48:19 +03:00
Hanusz Leszek e615d4f9d1 Convert folder icon surrogate pair to valid utf8 2022-10-03 07:59:13 +03:00
AUTOMATIC 6785331e22 keep textual inversion dataset latents in CPU memory to save a bit of VRAM 2022-10-02 22:59:01 +03:00
AUTOMATIC c7543d4940 preprocessing for textual inversion added 2022-10-02 22:41:21 +03:00
Lopyter 91f327f22b make save to dirs optional for imgs saved from ui 2022-10-02 21:47:52 +03:00
AUTOMATIC1111 688c4a914a
Merge branch 'master' into 1404-script-reload-without-restart 2022-10-02 21:33:22 +03:00
DepFA e808096cf6
correct indent 2022-10-02 19:26:06 +01:00
AUTOMATIC1111 0b94fc5033
Merge pull request #1324 from liamkerr/token_updates
Fixing Bugs with Token Counter
2022-10-02 21:20:05 +03:00
AUTOMATIC 88ec0cf557 fix for incorrect embedding token length calculation (will break seeds that use embeddings, you're welcome!)
add option to input initialization text for embeddings
2022-10-02 19:40:51 +03:00
liamkerr a32a068ed1
Merge branch 'master' into token_updates 2022-10-02 10:26:20 -04:00
AUTOMATIC1111 a9d7eb722f
Merge branch 'master' into saving 2022-10-02 17:03:01 +03:00
liamkerr 7308aeefd9
Merge branch 'master' into token_updates 2022-10-02 10:02:38 -04:00
AUTOMATIC 820f1dc96b initial support for training textual inversion 2022-10-02 15:03:39 +03:00
DepFA 2deea86781
Put reload buttons in row and add secondary style 2022-10-02 01:36:30 +01:00
DepFA 07e40ad7f2
add custom script body only refresh option 2022-10-02 01:19:55 +01:00
DepFA 0aa354bd5e
remove styling from python side 2022-10-02 00:13:47 +01:00
DepFA 027c5aae55
update reloading message style 2022-10-01 23:29:26 +01:00
DepFA 6048002dad
Add scope warning to refresh button 2022-10-01 23:10:07 +01:00
DepFA afaa03c5fd
add redefinition guard to gradio_routes_templates_response 2022-10-01 22:43:45 +01:00
DepFA 4f8490cd56
add restart button 2022-10-01 18:33:31 +01:00
Liam 3c6a049fc3 consolidated token counter functions 2022-09-30 18:22:50 -04:00
Liam ff8dc1908a fixed token counter for prompt editing 2022-09-30 18:22:50 -04:00
Liam abdbf1de64 token counters now update when roll artist and style buttons are pressed https://github.com/AUTOMATIC1111/stable-diffusion-webui/pull/1194#issuecomment-1261203893 2022-09-30 18:22:40 -04:00
Trung Ngo d1db330010 ALT + return will submit prompt when it's in focus 2022-09-30 15:39:57 -05:00
AUTOMATIC 43c87ef0fc change default inpaint mode to original 2022-09-30 18:07:49 +03:00
Justin Maier a112168d28 Save parameters as comments when saving as jpg 2022-09-29 19:07:29 +03:00
Justin Maier ca5901b5c8 Save should use desired sample format fixes #1028 2022-09-29 19:07:29 +03:00
WDevelopsWebApps f28ce3e3a1
Merge branch 'master' into saving 2022-09-29 12:19:13 +02:00
safentisAuth 66fed8ffb8 Add custom name and try-except 2022-09-29 12:41:47 +03:00
Michoko 819fd3af40 Add output folder icons
Changed the hidden element class name to a more generic one, so people can reuse it if they want to hide further elements in the future
2022-09-29 12:10:00 +03:00
Michoko 02c4b757b6 Add output folder icons
Handling of the --hide-ui-dir-config flag and added multi-platform code for opening a folder
2022-09-29 12:10:00 +03:00
Michoko f8acbb8f88 Add output folder icons
Adds icons on the first 3 tabs to directly open the corresponding images output directory
2022-09-29 12:10:00 +03:00
William Moorehouse 041d2aefc0
Respect --ckpt-dir command-line argument when merging models (#1261)
* Update .gitignore to ignore *all* checkpoint files in /models
* Fixed typo in UI
2022-09-29 01:00:48 +03:00
AUTOMATIC 7acfaca05a update lists of models after merging them in checkpoints tab
support saving as half
2022-09-29 00:59:44 +03:00
AUTOMATIC 791808c890 correctly list and display model names for #1261 2022-09-29 00:21:54 +03:00
AUTOMATIC1111 278e7c7114
Merge pull request #1194 from liamkerr/token_count
Token count
2022-09-28 19:22:55 +03:00
AUTOMATIC 9be0d1b89e Merge remote-tracking branch 'origin/master' 2022-09-28 17:05:32 +03:00
AUTOMATIC aea5b2510e save parameters for images when using the Save button. 2022-09-28 17:05:23 +03:00
Liam 7ca9858c4c removed unused import; now using javascript to watch prompt textarea 2022-09-28 09:43:54 -04:00
Bernard Maltais fe2f0e1729 Adding support for inverse sigmoid interpolation 2022-09-28 08:52:46 -04:00
WDevelopsWebApps 03ee67bfd3 add advanced saving for save button 2022-09-28 10:53:40 +02:00
Bernard Maltais 4c9c2a6702 -Fix interp_amount rounding in filename
-Sort list of checkpoints in list
2022-09-27 22:16:25 -04:00
Bernard Maltais d641af6a7d - Add gradio dropdown list to select checkpoints
- Update checkpoint model fields labels
2022-09-27 21:09:28 -04:00
Liam e5707b66d6 switched the token counter to use hidden buttons instead of api call 2022-09-27 19:29:53 -04:00
Liam 981fe9c4a3 Merge remote-tracking branch 'upstream/master' into token_count 2022-09-27 16:37:24 -04:00
Liam 5034f7d759 added token counter next to txt2img and img2img prompts 2022-09-27 15:56:18 -04:00
Bernard Maltais 20b41b7be7 (feat): Rework Checkpoint Merger UI for better clarity
- Rename variables to better align with field input
- Improve merged checkpoint output file name
2022-09-27 15:21:25 -04:00
AUTOMATIC ada901ed66 added console outputs, more clear indication of progress, and ability to specify full filename to checkpoint merger
restore "Loading..." text
2022-09-27 10:44:00 +03:00
AUTOMATIC1111 a9dc307a21
Merge pull request #1066 from moorehousew/master
Add support for checkpoint merging
2022-09-27 09:59:37 +03:00
Connum 2846ca5702 adds support for a notification.mp3 in the root directory that will play upon completion (fixes #1013) 2022-09-26 22:57:31 +02:00
William Moorehouse dc11748dea Added smoothstep interpolation to checkpoint merging 2022-09-26 10:50:21 -04:00
Liam db4ab47f09 copy over fields when sending to img2img: https://github.com/AUTOMATIC1111/stable-diffusion-webui/issues/1029 2022-09-26 08:33:02 +03:00
William Moorehouse 91643f651d Add support for checkpoint merging 2022-09-25 19:22:12 -04:00
AUTOMATIC ca3e5519e8 Merge remote-tracking branch 'origin/master' 2022-09-25 19:45:22 +03:00
AUTOMATIC ff107845b4 added hiding items to ui-config.json 2022-09-25 19:43:42 +03:00
DepFA 50ae19acf6 add custom script source to config path keys 2022-09-25 09:59:31 +03:00
AUTOMATIC b8eae5de93 Merge remote-tracking branch 'origin/master' 2022-09-25 09:25:47 +03:00
AUTOMATIC 600cc0342d added support for setting hires fix from pasted prompts
added more robust detection of last line with parameters for pasted prompts
2022-09-25 09:25:28 +03:00
DepFA 72e2a96284 Correct indent 2022-09-25 08:46:09 +03:00
DepFA ab5a472556 Persist default Number values 2022-09-25 08:46:09 +03:00
DepFA ca13264609 Add attr to skip 2022-09-25 08:46:09 +03:00
DepFA b1320d79b5 Apply to all checkboxes and textboxes 2022-09-25 08:46:09 +03:00
DepFA 714dcda068 Add attributes to checkboxes for persisting 2022-09-25 08:46:09 +03:00
AUTOMATIC 53be15c204 by popular request, moves width/height sliders higher 2022-09-25 08:40:29 +03:00
EyeDeck b5d705e263 Disable 'batch img2img' when launched with --hide-ui-dir-config
Prevent writing to arbitrary directories, as usual
2022-09-24 19:06:36 +03:00
AUTOMATIC 410bef0853 do not hide preview image too early 2022-09-24 09:16:54 +03:00
innovaciones 3e4b7fb869 Remove double loading message 2022-09-24 07:58:07 +03:00
AUTOMATIC 71cfb9ebac fix for settings sometimes not applying on javascript side 2022-09-24 00:13:32 +03:00
AUTOMATIC 39ce23f42d add the bitton to paste parameters into UI for txt2img, img2img, and pnginfo tabs
fixed some [send to..] buttons to work properly with all tabs
2022-09-23 22:49:21 +03:00
AUTOMATIC 8ffc07b7b1 one change didn't make it into the previous commit 2022-09-23 20:54:17 +03:00
AUTOMATIC 0065327726 upgrade to gradio==3.4b3 t fixthe inpain bugs
rework progressbar/preview to work with new gradio
remove unnecessary create style button
added link to alternative colab
2022-09-23 20:46:02 +03:00