Commit Graph

3007 Commits

Author SHA1 Message Date
AUTOMATIC a6e653be26 possible fix for empty list of optimizations #10605 2023-05-23 18:49:15 +03:00
Kohaku-Blueleaf 72377b0251 Use type to determine if it is enable 2023-05-23 23:48:23 +08:00
AUTOMATIC b186045fee possible fix for empty list of optimizations #10605 2023-05-23 18:02:09 +03:00
fumitaka.yano 1db7d21283 Subject:.
Improvements to handle VAE filenames in generated image filenames

Body:.
1) Added new line 24 to import sd_vae module.
2) Added new method get_vae_filename at lines 340-349 to obtain the VAE filename to be used for image generation and further process it to extract only the filename by splitting it with a dot symbol.
3) Added a new lambda function 'vae_filename' at line 373 to handle VAE filenames.

Reason:.
A function was needed to get the VAE filename and handle it in the program.

Test:.
We tested whether we could use this new functionality to get the expected file names.
The correct behaviour was confirmed for the following commonly distributed VAE files.
vae-ft-mse-840000-ema-pruned.safetensors -> vae-ft-mse-840000-ema-pruned
anything-v4.0.vae.pt -> anything-v4.0

ruff response:.
There were no problems with the code I added.

There was a minor configuration error in a line I did not modify, but I did not modify it as it was not relevant to this modification.
Logged.
images.py:426:56: F841 [*] Local variable `_` is assigned to but never used
images.py:432:43: F841 [*] Local variable `_` is assigned to but never used

Impact:.
This change makes it easier to retrieve the VAE filename used for image generation and use it in the programme.
2023-05-23 15:56:08 +09:00
Kohaku-Blueleaf 70650f87a4 Use better way to impl 2023-05-23 11:34:51 +08:00
Kohaku-Blueleaf 1846ad36a3 Use settings instead of main interface 2023-05-23 10:58:57 +08:00
Kohaku-Blueleaf 38aaad654b
Better hint for user
Co-authored-by: catboxanon <122327233+catboxanon@users.noreply.github.com>
2023-05-23 09:38:30 +08:00
ArthurHeitmann e1c44267ea Fix for #10643 (pixel noise in webui inpainting canvas breaking inpainting, so that it behaves like plain img2img) 2023-05-22 21:56:26 +02:00
AUTOMATIC1111 d77ba18d5d
Merge pull request #10635 from prodialabs/master
disable `timeout_keep_alive`: fixes #10625 #10510 #10474
2023-05-22 22:17:25 +03:00
catboxanon 51d672890d
Revert #10586 2023-05-22 13:06:57 -04:00
Kohaku-Blueleaf 403b304162 use sigma_max/min in model if sigma_max/min is 0 2023-05-23 00:29:38 +08:00
Kohaku-Blueleaf 65a87ccc9b Add error information for recursion error 2023-05-23 00:09:49 +08:00
Kohaku-Blueleaf 302d95c726 Minor naming fixes 2023-05-22 23:43:06 +08:00
Kohaku-Blueleaf 4365c35bf9 Avoid loop import 2023-05-22 23:41:14 +08:00
Kohaku-Blueleaf 5dfb1f597b remove not related code 2023-05-22 23:36:16 +08:00
Kohaku-Blueleaf 7dc9d9e27e only add metadata when k_sched is actually been used 2023-05-22 23:34:16 +08:00
Kohaku-Blueleaf 7882f76da4 Replace karras by k_diffusion, fix gen info 2023-05-22 23:26:28 +08:00
Kohaku-Blueleaf f821051443 Change karras to kdiffusion 2023-05-22 23:09:03 +08:00
Kohaku-Blueleaf e6269cba7f Add dropdown for scheduler type 2023-05-22 23:02:05 +08:00
Monty Anderson efc9853059 `modules/api/api.py`: disable `timeout_keep_alive` 2023-05-22 15:52:44 +01:00
Kohaku-Blueleaf 90ec557d60 remove debug print 2023-05-22 22:06:13 +08:00
Kohaku-Blueleaf a104879869 Add custom karras scheduler 2023-05-22 21:52:46 +08:00
AUTOMATIC ee65e72931 repair file paste for Firefox from #10615
remove animation when pasting files into prompt
rework two dragdrop js files into one
2023-05-22 09:49:59 +03:00
AUTOMATIC1111 0cbcc4d828
Merge pull request #10611 from akx/disable-token-counters
Add option to disable token counters
2023-05-22 08:09:48 +03:00
AUTOMATIC 3366e494a1 option to pad prompt/neg prompt to be same length 2023-05-22 00:13:53 +03:00
Aarni Koskela 618c59b01d Add option to disable prompt token counters 2023-05-21 23:25:06 +03:00
AUTOMATIC 8faac8b963 run basic torch calculation at startup in parallel to reduce the performance impact of first generation 2023-05-21 21:55:14 +03:00
AUTOMATIC fe73d6439a Revert "change width/heights slider steps to 64 from 8"
This reverts commit 9a86932c8b.
2023-05-21 17:35:19 +03:00
AUTOMATIC f9fe5e5f9d reworking launch.py: add references to renamed file 2023-05-21 16:27:34 +03:00
AUTOMATIC 4b07984d1b reworking launch.py: rename 2023-05-21 16:27:34 +03:00
AUTOMATIC1111 38a2324dc3
Merge pull request #10580 from akx/add-some-future-annotations
Add some future annotations
2023-05-21 13:43:29 +03:00
AUTOMATIC 696f16e901 revert git describe --always --tags for extensions because it seems to be causing issues 2023-05-21 13:30:09 +03:00
AUTOMATIC1111 8e9188aa5a
Merge pull request #10564 from AUTOMATIC1111/extensions-clone-depth-1
extensions clone --filter=blob:none
2023-05-21 11:06:26 +03:00
w-e-w cd03317c05 --filter=blob:none
Co-Authored-By: Aarni Koskela <akx@iki.fi>
Co-Authored-By: catboxanon <122327233+catboxanon@users.noreply.github.com>
2023-05-21 16:42:54 +09:00
catboxanon 9a442702d1
Discard penultimate sigma for dpmpp_2m_sde 2023-05-21 01:01:59 -04:00
AUTOMATIC 31545abe14 add DPM-Solver++(2M) SDE from new k-diffusion 2023-05-21 07:31:51 +03:00
Aarni Koskela df004be2fc Add a couple `from __future__ import annotations`es for Py3.9 compat 2023-05-21 00:26:16 +03:00
AUTOMATIC1111 3605407033
Merge pull request #10576 from catboxanon/patch/hires-prompt-edit-attn
Support edit attention keyboard shortcuts in hires fix prompts
2023-05-20 23:23:53 +03:00
catboxanon 373903d851 hiresfix prompt: add classes, update css sel 2023-05-20 19:34:50 +00:00
AUTOMATIC 05e6fc9aa9 Merge branch 'ui-selection-for-cross-attention-optimization' into dev 2023-05-20 22:29:51 +03:00
AUTOMATIC1111 cc6c0fc70a
Merge pull request #10557 from akx/dedupe-webui-boot
Refactor & deduplicate web UI boot code
2023-05-20 22:24:15 +03:00
catboxanon b2b06eee02
Support edit attn shortcut in hires fix prompts 2023-05-20 13:31:18 -04:00
w-e-w bf5e5f4269 extensions clone depth 1 2023-05-20 15:08:08 +09:00
anonCantCode 0b6ca8e77b
preserve declarations 2023-05-20 11:13:03 +05:30
anonCantCode 3758744eb6
Use Optional[] to preserve Python 3.9 compatability 2023-05-20 06:27:12 +05:30
AUTOMATIC 39ec4f06ff calculate hashes for Lora
add lora hashes to infotext
when pasting infotext, use infotext's lora hashes to find local loras for <lora:xxx:1> entries whose hashes match loras the user has
2023-05-19 22:59:29 +03:00
AUTOMATIC 87702febe0 allow hiding buttons in ui-config.json 2023-05-19 19:04:20 +03:00
AUTOMATIC1111 0d84055eb6
Merge pull request #10291 from akx/test-overhaul
Test overhaul
2023-05-19 18:59:31 +03:00
AUTOMATIC 9a86932c8b change width/heights slider steps to 64 from 8 2023-05-19 18:49:39 +03:00
Aarni Koskela 793a491923 Overhaul tests to use py.test 2023-05-19 17:42:34 +03:00
Aarni Koskela 71f4a4afdf Deduplicate webui.py initial-load/reload code 2023-05-19 17:38:42 +03:00
Aarni Koskela 4897e5277b Make load_scripts create new runners (removes reload_scripts) 2023-05-19 15:49:53 +03:00
Aarni Koskela 21ee46eea7 Deduplicate default extra network registration 2023-05-19 15:35:16 +03:00
Aarni Koskela de3abc29ae Fix typo "intialize" 2023-05-19 15:27:23 +03:00
AUTOMATIC 2140bd1c10 make it actually work after suggestions 2023-05-19 10:05:07 +03:00
AUTOMATIC1111 1e5afd4fa9
Apply suggestions from code review
Co-authored-by: Aarni Koskela <akx@iki.fi>
2023-05-19 09:17:36 +03:00
AUTOMATIC df6fffb054 change upscalers to download models into user-specified directory (from commandline args) rather than the default models/<...> 2023-05-19 09:09:18 +03:00
AUTOMATIC 379fd6204d make links to http://<...>.git git extensions work in the extension tab 2023-05-19 09:09:17 +03:00
AUTOMATIC 8a3d232839 fix linter issues 2023-05-19 00:03:27 +03:00
AUTOMATIC a6bbc6aa8c set Navigate image viewer with gamepad option to false by default, by request 2023-05-18 23:59:31 +03:00
AUTOMATIC 3d959f5b49 Merge remote-tracking branch 'missionfloyd/extra-network-preview-lazyload' into dev 2023-05-18 23:23:13 +03:00
AUTOMATIC bd877d7b5a rework #10519 2023-05-18 22:49:00 +03:00
AUTOMATIC 2582a0fd3b make it possible for scripts to add cross attention optimizations
add UI selection for cross attention optimization
2023-05-18 22:48:28 +03:00
AUTOMATIC1111 2e006fa500
Merge pull request #10519 from catboxanon/patch/hires-input-release-event
Improve width/height slider responsiveness
2023-05-18 20:32:21 +03:00
catboxanon 57275da903
Reorder variable assignment 2023-05-18 13:25:32 -04:00
AUTOMATIC ff0e17174f rework hires prompts/sampler code to among other things support different extra networks in first/second pass
rework quoting for infotext items that have commas in them to use json (should be backwards compatible except for cases where it didn't work previously)
add some locals from processing function into the Processing class as fields
2023-05-18 20:16:09 +03:00
catboxanon 63c02314cc
.change -> .release for hires input
Improves overall UI responsiveness.
2023-05-18 13:06:13 -04:00
AUTOMATIC 5ec2c294ee Merge remote-tracking branch 'InvincibleDude/improved-hr-conflict-test' into hires-fix-ext 2023-05-18 17:57:16 +03:00
AUTOMATIC 44c37f94e1 add messages about Loras that failed to load to UI 2023-05-18 16:36:30 +03:00
AUTOMATIC cd8a510ca9 if sd_model is None, do not always try to load it 2023-05-18 15:47:43 +03:00
AUTOMATIC ae252cd5bc add --gradio-allowed-path commandline option 2023-05-18 10:37:25 +03:00
AUTOMATIC bb431df52b python linter fixes 2023-05-18 10:16:33 +03:00
AUTOMATIC f9be4dc498 keep old option for ngrok 2023-05-18 10:14:04 +03:00
AUTOMATIC1111 182330ae40
Merge branch 'dev' into ngrok-py 2023-05-18 10:12:17 +03:00
AUTOMATIC 3694379f26 rework #8863 to work with all img2img tabs 2023-05-18 00:03:16 +03:00
AUTOMATIC 973ae87309 Merge remote-tracking branch 'pieresimakp/img2img-detect-image-size' into dev 2023-05-17 23:49:39 +03:00
AUTOMATIC 61ee563df9 option to specify editor height for img2img 2023-05-17 23:42:01 +03:00
AUTOMATIC e5dd4b4ebf remove some code duplication from #9348 2023-05-17 23:27:06 +03:00
AUTOMATIC1111 04b4508a66
Merge branch 'dev' into improve-frontend-responsiveness 2023-05-17 23:18:56 +03:00
AUTOMATIC b397f63e00 add option to reorder tabs
fix Reload UI not working
2023-05-17 23:11:33 +03:00
AUTOMATIC ad3a7f2ab9 alternative solution to fix styles load when edited by human #9765 as suggested by akx 2023-05-17 22:50:08 +03:00
AUTOMATIC f6fc7916c4 add /sdapi/v1/script-info api 2023-05-17 22:43:24 +03:00
AUTOMATIC 8fe9ea7f4d add options to show/hide hidden files and dirs, and to not list models/files in hidden directories 2023-05-17 21:45:26 +03:00
AUTOMATIC a6b618d072 use a single function for saving images with metadata both in extra networks and main mode for #10395 2023-05-17 21:03:41 +03:00
AUTOMATIC1111 9c91a86720
Merge pull request #10395 from wk5ovc/patch-4
Fix extra networks save preview image geninfo
2023-05-17 20:42:37 +03:00
AUTOMATIC1111 987c1f7d9f
Merge pull request #10483 from Iheuzio/syntax-search
Fix typo in syntax
2023-05-17 20:27:14 +03:00
AUTOMATIC 9fd6c1e343 move some settings to the new Optimization page
add slider for token merging for img2img
rework StableDiffusionProcessing to have the token_merging_ratio field
fix a bug with applying png optimizations for live previews when they shouldn't be applied
2023-05-17 20:22:54 +03:00
Iheuzio f5092164e8 Fix typo in syntax 2023-05-17 12:51:54 -04:00
AUTOMATIC1111 f6c06e3ed2
Merge pull request #10458 from akx/graceful-stop
Graceful server stopping
2023-05-17 18:45:40 +03:00
AUTOMATIC 76ebf750a4 use a local variable instead of dictionary entry for sd_merge_models in merge model metadata code 2023-05-17 17:44:07 +03:00
AUTOMATIC1111 36c14831b3
Merge pull request #10473 from dongweiming/fix-10460
Fix #10460
2023-05-17 17:42:25 +03:00
Weiming 95cb492e41 Fixed: #10460 2023-05-17 22:35:59 +08:00
AUTOMATIC1111 b4703b788b
Merge pull request #10461 from akx/processed-s-min-uncond
Copy s_min_uncond to Processed
2023-05-17 15:08:14 +03:00
AUTOMATIC 1210548cba simplify single_sample_to_image 2023-05-17 14:53:39 +03:00
Sakura-Luna 7a13a3f4ba TAESD fix 2023-05-17 17:39:07 +08:00
Aarni Koskela 315f109427 Copy s_min_uncond to Processed
Should fix #10416
2023-05-17 10:26:32 +03:00
Aarni Koskela 875990a232 Add option for /_stop route (for graceful shutdown) 2023-05-17 10:15:08 +03:00
Aarni Koskela 85b4f89926 Replace state.need_restart with state.server_command + replace poll loop with signal 2023-05-17 10:15:03 +03:00
AUTOMATIC1111 85232a5b26
Merge branch 'dev' into taesd-a 2023-05-17 09:26:26 +03:00
AUTOMATIC 56a2672831 return live preview defaults to how they were
only download TAESD model when it's needed
return calculations in single_sample_to_image to just if/elif/elif blocks
keep taesd model in its own directory
2023-05-17 09:24:01 +03:00