Commit Graph

225 Commits

Author SHA1 Message Date
Aarni Koskela bf67a5dcf4 Upscaler.load_model: don't return None, just use exceptions 2023-06-13 12:44:25 +03:00
Aarni Koskela e3a973a68d Add TODO comments to sus model loads 2023-06-13 12:38:29 +03:00
Aarni Koskela 0afbc0c235 Fix up `if "http" in ...:` to be more sensible startswiths 2023-06-13 12:38:29 +03:00
Aarni Koskela 89352a2f52 Move `load_file_from_url` to modelloader 2023-06-13 12:38:28 +03:00
Danil Boldyrev 9a2da597c5 remove console.log 2023-06-12 22:21:42 +03:00
Danil Boldyrev ee029a8cad Improved error output, improved settings menu 2023-06-12 22:19:22 +03:00
Aarni Koskela d75ed52bfc Don't die when a LoRA is a broken symlink
Fixes #11098
2023-06-09 13:26:36 +03:00
AUTOMATIC1111 e89a248e2e
Merge pull request #11031 from akx/zoom-and-pan-namespace
Zoom and pan: namespace & simplify
2023-06-05 20:40:31 +03:00
AUTOMATIC1111 7a7a201d81
Merge pull request #10956 from akx/len
Simplify a bunch of `len(x) > 0`/`len(x) == 0` style expressions
2023-06-05 11:06:37 +03:00
Aarni Koskela 2d4c66f7b5 Zoom and Pan: simplify waitForOpts 2023-06-05 10:40:42 +03:00
Aarni Koskela 6163b38ad9 Zoom and Pan: use for instead of forEach 2023-06-05 10:37:00 +03:00
Aarni Koskela afbb0b5f86 Zoom and Pan: simplify getElements (it's not actually async) 2023-06-05 10:37:00 +03:00
Aarni Koskela 68cda4f213 Zoom and Pan: use elementIDs from closure scope 2023-06-05 10:37:00 +03:00
Aarni Koskela 8fd20bd4c3 Zoom and Pan: move helpers into its namespace to avoid littering global scope 2023-06-05 10:36:55 +03:00
Danil Boldyrev 0432e37843 Correct definition zoom level
I changed the regular expression and now I always have to select scale from style.transfo
2023-06-04 04:17:55 +03:00
Danil Boldyrev ad3d6d9a22 Fixed visual bugs 2023-06-04 03:38:21 +03:00
Danil Boldyrev 1a49178330 Made a function applyZoomAndPan isolated each instance
Isolated each instance of applyZoomAndPan, now if you add another element to the page, they will work correctly
2023-06-04 03:04:46 +03:00
Danil Boldyrev dc273f7473 Fixed the redmask bug 2023-06-04 01:18:27 +03:00
Danil Boldyrev 3e3635b114 Made the applyZoomAndPan function global for other extensions 2023-06-03 19:24:05 +03:00
AUTOMATIC1111 b1fd2aaa8b
Merge pull request #10943 from catboxanon/sort
Allow dynamically sorting extra networks in UI
2023-06-03 09:05:22 +03:00
Danil Boldyrev 5b682be59a small ui fix
In the error the user will see R instead of KeyR
2023-06-03 02:24:57 +03:00
Danil Boldyrev 1e0ab4015d Added the ability to swap the zoom hotkeys and resize the brush 2023-06-03 02:18:49 +03:00
catboxanon 9009e25cb1
Apply suggestions from code review
Co-authored-by: Aarni Koskela <akx@iki.fi>
2023-06-02 16:12:24 -04:00
Danil Boldyrev d306d25e56 Made tooltip optional.
You can disable it in the settings.
Enabled by default
2023-06-02 19:10:28 +03:00
Aarni Koskela 51864790fd Simplify a bunch of `len(x) > 0`/`len(x) == 0` style expressions 2023-06-02 15:07:10 +03:00
catboxanon 7dca8e7698 Support dynamic sort of extra networks 2023-06-02 04:08:45 +00:00
Danil Boldyrev 38aca6f605 Added a hotkey repeat check to avoid bugs 2023-06-02 01:26:25 +03:00
Danil Boldyrev 68c4beab46 Added the ability to configure hotkeys via webui
Now you can configure the hotkeys directly through the settings

JS and Python scripts are tested and code style compliant
2023-06-02 01:04:17 +03:00
Danil Boldyrev c5d70fe1d3 Fixed the problem with sticking to the mouse, created a tooltip 2023-05-31 23:02:49 +03:00
AUTOMATIC df02498d03 add an option to show selected setting in main txt2img/img2img UI
split some code from ui.py into ui_settings.py ui_gradio_edxtensions.py
add before_process callback for scripts
add ability for alwayson scripts to specify section and let user reorder those sections
2023-05-31 22:40:09 +03:00
AUTOMATIC 05933840f0 rename print_error to report, use it with together with package name 2023-05-31 19:56:37 +03:00
AUTOMATIC1111 52b8752e62
Merge branch 'dev' into report-error 2023-05-31 19:15:21 +03:00
AUTOMATIC1111 58dbd0ea4d
Merge pull request #10759 from daswer123/dev
Add the ability to zoom and move the canvas
2023-05-31 18:52:22 +03:00
Danil Boldyrev c928c228af a small fix for very wide images, because of the scroll bar was the wrong zoom 2023-05-30 16:35:52 +03:00
Aarni Koskela 5fcdaa6a7f Vendor in the single module used from taming_transformers; remove taming_transformers dependency
(and fix the two ruff complaints)
2023-05-30 12:47:57 +03:00
Danil Boldyrev 8ab4e55fe3 Moved the script to the extension build-in 2023-05-29 21:39:10 +03:00
Aarni Koskela 00dfe27f59 Add & use modules.errors.print_error where currently printing exception info by hand 2023-05-29 09:17:30 +03:00
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
AUTOMATIC1111 a6bf4aae30
Merge pull request #10550 from akx/git-blame-ignore-revs
Add .git-blame-ignore-revs
2023-05-19 16:28:22 +03:00
Aarni Koskela 2725dfd8a6 Fix ruff lint 2023-05-19 12:37:34 +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
AUTOMATIC1111 e38e7dbfb9
Merge pull request #10529 from ryankashi/master
Added /sdapi/v1/refresh-loras api checkpoint post request
2023-05-19 08:04:13 +03:00
ryankashi 4dd5559162 Added the refresh-loras post request 2023-05-18 14:12:01 -07:00
AUTOMATIC 44c37f94e1 add messages about Loras that failed to load to UI 2023-05-18 16:36:30 +03:00
AUTOMATIC 57b75f4a03 eslint related file edits 2023-05-18 09:59:10 +03:00
Aarni Koskela 9c54b78d9d Run `eslint --fix` (and normalize tabs to spaces) 2023-05-17 16:09:06 +03:00
AUTOMATIC 7001e1ed61 Merge branch 'master' into dev 2023-05-14 13:36:16 +03:00
AUTOMATIC b9abdb50a3 add a possible fix for 'LatentDiffusion' object has no attribute 'lora_layer_mapping' 2023-05-14 13:31:03 +03:00
AUTOMATIC a00e42556f add a bunch of descriptions and reword a lot of settings (sorry, localizers) 2023-05-14 11:04:21 +03:00
AUTOMATIC e8eea1bb7a Merge branch 'release_candidate' into dev 2023-05-13 20:26:13 +03:00
AUTOMATIC 477199357f add an option to always refer to lora by filenames
never refer to lora by an alias if multiple loras have same alias or the alias is called none
2023-05-13 20:15:37 +03:00
Aarni Koskela 49a55b410b Autofix Ruff W (not W605) (mostly whitespace) 2023-05-11 20:29:11 +03:00
AUTOMATIC 3ec7b705c7 suggestions and fixes from the PR 2023-05-10 21:21:32 +03:00
AUTOMATIC d25219b7e8 manual fixes for some C408 2023-05-10 11:55:09 +03:00
AUTOMATIC a5121e7a06 fixes for B007 2023-05-10 11:37:18 +03:00
AUTOMATIC 550256db1c ruff manual fixes 2023-05-10 11:19:16 +03:00
AUTOMATIC 028d3f6425 ruff auto fixes 2023-05-10 11:05:02 +03:00
AUTOMATIC 4b854806d9 F401 fixes for ruff 2023-05-10 09:02:23 +03:00
AUTOMATIC f741a98bac imports cleanup for ruff 2023-05-10 08:43:42 +03:00
AUTOMATIC 96d6ca4199 manual fixes for ruff 2023-05-10 08:25:25 +03:00
AUTOMATIC 762265eab5 autofixes from ruff 2023-05-10 07:52:45 +03:00
AUTOMATIC eb95809501 rework loras api 2023-05-09 11:25:46 +03:00
Sayo f9abe4cddc Add api method to get LoRA models with prompt 2023-05-08 20:38:10 +08:00
Sayo 34a82a345a Add api method to get LoRA models 2023-05-08 19:55:05 +08:00
AUTOMATIC ec0da07236 Lora: add an option to use old method of applying loras 2023-05-08 12:07:43 +03:00
AUTOMATIC 083dc3c76a directory hiding for extra networks: dirs starting with . will hide their cards on extra network tabs unless specifically searched for
create HTML for extra network pages only on demand
allow directories starting with . to still list their models for lora, checkpoints, etc
keep "search" filter for extra networks when user refreshes the page
2023-05-08 11:33:45 +03:00
AUTOMATIC1111 b15bbef798
Merge pull request #10089 from AUTOMATIC1111/LoraFix
Fix some Lora's not working
2023-05-08 08:45:26 +03:00
AUTOMATIC 2473bafa67 read infotext params from the other extension for Lora if it's not active 2023-05-08 07:28:30 +03:00
AUTOMATIC 2cb3b0be1d if present, use Lora's "ss_output_name" field to refer to it in prompt 2023-05-07 08:25:34 +03:00
Leo Mozoloa c3eced22fc Fix some Lora's not working 2023-05-04 16:14:33 +02:00
AUTOMATIC f9253cee66 do not fail all Loras if some have failed to load when making a picture 2023-04-29 20:28:30 +03:00
AUTOMATIC1111 17cce45613
Merge pull request #8948 from hitomi/master
Fix --realesrgan-models-path and --ldsr-models-path not working
2023-04-29 17:00:24 +03:00
AUTOMATIC1111 e847df7ee9
Merge pull request #9609 from akx/bracket-fix
prompt-bracket-checker: Simplify code + improve error reporting
2023-04-29 12:58:20 +03:00
AUTOMATIC1111 e55cb92067
Merge pull request #9737 from AdjointOperator/master
add tiled inference support for ScuNET
2023-04-29 11:34:35 +03:00
AdjointOperator dec5cdd9b8
add tiled inference support for ScuNET 2023-04-19 15:35:50 +08:00
missionfloyd f4b332f041 Add "None" option to extra networks dropdowns 2023-04-18 17:01:46 -06:00
Aarni Koskela fcc194afad prompt-bracket-checker: Simplify + improve error reporting 2023-04-13 23:00:32 +03:00
hitomi 2ba42bfbd2 fix `--ldsr-models-path` not working 2023-04-04 20:39:51 +08:00
AUTOMATIC1111 c5e1efb4ca
Merge pull request #8525 from bluelovers/pr/sort-001
feat: try sort as ignore-case
2023-03-27 07:34:18 +03:00
camenduru 6a147db128
convert to python v3.9 2023-03-27 04:40:31 +03:00
camenduru 9d7390d2d1
convert to python v3.9 2023-03-27 04:28:40 +03:00
AUTOMATIC 650ddc9dd3 Lora support for SD2 2023-03-26 10:44:20 +03:00
AUTOMATIC b705c9b72b Merge branch 'lora_sd2' into lora_inplace 2023-03-26 07:04:43 +03:00
AUTOMATIC 80b26d2a69 apply Lora by altering layer's weights instead of adding more calculations in forward() 2023-03-25 23:06:33 +03:00
AUTOMATIC1111 03c8eefbcc
Merge pull request #8782 from FNSpd/master
--upcast-sampling support for CUDA
2023-03-25 09:10:01 +03:00
AUTOMATIC 9f0da9f6ed initial gradio 3.22 support 2023-03-25 09:00:36 +03:00
FNSpd 2f0181405f
Update lora.py 2023-03-21 14:53:51 +04:00
AUTOMATIC c19530f1a5 Add view metadata button for Lora cards. 2023-03-14 09:10:26 +03:00
bluelovers 0492424121 feat: try sort as ignore-case
https://github.com/AUTOMATIC1111/stable-diffusion-webui/issues/8368
2023-03-12 10:18:33 +08:00
AUTOMATIC 6da2027213 save previews for extra networks in the selected format 2023-03-11 15:46:20 +03:00
AUTOMATIC ce68ab8d0d remove underscores from function names in #8366
remove LRU from #8366 because I don't know why it's there
2023-03-11 15:27:42 +03:00
Aarni Koskela 06f167da37 Extra networks: support .txt description sidecar file 2023-03-06 21:15:33 +02:00
Aarni Koskela 49b1dc5e07 Deduplicate extra network preview-search code 2023-03-06 21:00:34 +02:00
AUTOMATIC 7cb31a278e initial work on SD2 Lora support 2023-01-29 10:45:46 +03:00
AUTOMATIC f6b7768f84 support for searching subdirectory names for extra networks 2023-01-29 10:20:19 +03:00
AUTOMATIC 1d8e06d542 add checkpoints tab for extra networks UI 2023-01-28 22:52:27 +03:00
AUTOMATIC 2abd89acc6 index on master: 91c8d0d Merge pull request #7231 from EllangoK/master 2023-01-28 20:04:35 +03:00
AUTOMATIC b7d2af8c7f add dropdowns in settings for hypernets and loras 2023-01-28 17:18:47 +03:00
AUTOMATIC 1bfec873fa add an experimental option to apply loras to outputs rather than inputs 2023-01-25 11:29:46 +03:00
catboxanon 3c47b05036
Also make SwinIR skippable 2023-01-23 22:00:27 -05:00
catboxanon f993525820
Make SwinIR interruptible 2023-01-23 21:50:59 -05:00
AUTOMATIC c6f20f7262 make loras before 0.4.0 ALSO work 2023-01-23 18:52:55 +03:00
AUTOMATIC e407d1af89 add support for loras trained on kohya's scripts 0.4.0 (alphas) 2023-01-23 18:12:51 +03:00
AUTOMATIC fe7a623e6b add a slider for default value of added extra networks 2023-01-22 00:02:52 +03:00
AUTOMATIC 500d9a32c7 add --lora-dir commandline option 2023-01-21 23:11:37 +03:00
AUTOMATIC a2749ec655 load Lora from .ckpt also 2023-01-21 18:52:45 +03:00
AUTOMATIC 855b9e3d1c Lora support!
update readme to reflect some recent changes
2023-01-21 16:15:53 +03:00
AUTOMATIC 6d805b669e make CLIP interrogator download original text files if the directory does not exist
remove random artist built-in extension (to re-added as a normal extension on demand)
remove artists.csv (but what does it mean????????????????????)
make interrogate buttons show Loading... when you click them
2023-01-21 09:14:27 +03:00
AUTOMATIC 20a59ab3b1 move token counter to the location of the prompt, add token counting for the negative prompt 2023-01-20 10:18:41 +03:00
AUTOMATIC c12d7ddd72 add handling to some places in javascript that can potentially cause issues #6898 2023-01-19 16:08:09 +03:00
AUTOMATIC 924e222004 add option to show/hide warnings
removed hiding warnings from LDSR
fixed/reworked few places that produced warnings
2023-01-18 23:04:24 +03:00
AUTOMATIC 524d532b38 moved roll artist to built-in extensions 2023-01-01 14:07:40 +03:00
Yuval Aboulafia 3bf5591efe fix F541 f-string without any placeholders 2022-12-24 21:35:29 +02:00
wywywywy 8bcdd50461 Add safetensors support to LDSR 2022-12-10 18:57:18 +00:00
AUTOMATIC1111 685f9631b5
Merge pull request #5586 from wywywywy/ldsr-improvements
LDSR improvements - cache / optimization / opt_channelslast
2022-12-10 18:22:39 +03:00
wywywywy 1581d5a167 Made device agnostic 2022-12-10 14:07:27 +00:00
wywywywy 6df316c881 LDSR cache / optimization / opt_channelslast 2022-12-10 13:54:29 +00:00
Bwin4L 718dbe5e82
Fix token counter color on dark theme 2022-12-10 14:51:11 +01:00
AUTOMATIC e11d0d43b1 change color of the valid prompt to black - back to how it was 2022-12-10 09:53:54 +03:00
AUTOMATIC1111 22f916df79
Merge pull request #5502 from Bwin4L/master
Add bracket checking functionality to the txt2img/img2img prompts
2022-12-10 09:32:11 +03:00
Bwin4L 02f566f684
Add bracket checking functionality to the txt2img/img2img prompts and negative prompts. 2022-12-07 16:14:05 +01:00
wywywywy a8ae263c69 Reinstate DDPM V1 to LDSR 2022-12-04 13:42:19 +00:00
AUTOMATIC cefb5d6d7d fix accessing options when they are not ready for SwinIR. 2022-12-03 20:40:29 +03:00
AUTOMATIC 0d21624cee move #5216 to the extension 2022-12-03 18:16:19 +03:00
AUTOMATIC b6e5edd746 add built-in extension system
add support for adding upscalers in extensions
move LDSR, ScuNET and SwinIR to built-in extensions
2022-12-03 18:06:33 +03:00