Commit Graph

111 Commits

Author SHA1 Message Date
Chris OBryan
5732c0282d extras-tweaks: autoformat changed lines 2022-10-28 16:36:25 -05:00
Chris OBryan
1f1b327959 extras: Make image cache LRU
This changes the extras image cache into a Least-Recently-Used
cache. This allows more experimentation with different upscalers
without missing the cache.

Max cache size is increased to 5 and is cleared on source image
update.
2022-10-28 16:14:21 -05:00
Chris OBryan
bde4731f1d extras: Rework image cache
Bit of a refactor to the image cache to make it easier to extend.
Also takes into account the entire image instead of just a cropped portion.
2022-10-28 14:44:25 -05:00
Chris OBryan
26d0819384 extras: Add option to run upscaling before face fixing
Face restoration can look much better if ran after upscaling, as it
allows the restoration to fix upscaling artifacts. This patch adds
an option to choose which order to run upscaling/face fixing in.
2022-10-28 13:33:49 -05: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
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
DepFA
d3338bdef1 extras extend cache key with new upscale to options 2022-10-18 08:29:52 +03:00
AUTOMATIC
5c94aaf290 fix bug for latest model merge RAM improvement 2022-10-17 08:28:18 +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
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
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
fdecb63685 add an ability to merge three checkpoints 2022-10-14 09:20:24 +03:00
Justin Maier
1d64976dbc Simplify crop logic 2022-10-10 12:04:21 -06:00
Justin Maier
6435691bb1 Add "Scale to" option to Extras 2022-10-09 19:26:52 -06:00
Artem Zagidulin
9ecea0a8d6 fix missing png info when Extras Batch Process 2022-10-09 18:35:25 +03:00
AUTOMATIC
bd833409ac additional changes for saving pnginfo for #1803 2022-10-09 13:10:15 +03:00
AUTOMATIC
c77c89cc83 make main model loading and model merger use the same code 2022-10-09 10:23:31 +03:00
Jairo Correa
ad1fbbae93 Merge branch 'master' into fix-vram 2022-09-30 18:58:51 -03:00
AUTOMATIC
3f64e23f81 fix model checkpoint merger tab failing to save model 2022-09-30 22:57:25 +03:00
AUTOMATIC
d1f098540a remove unwanted formatting/functionality from the PR 2022-09-30 11:42:40 +03:00
d8ahazard
d73741794d Merge remote-tracking branch 'upstream/master' into ModelLoader 2022-09-29 19:59:36 -05:00
d8ahazard
0dce0df1ee Holy $hit.
Yep.

Fix gfpgan_model_arch requirement(s).
Add Upscaler base class, move from images.
Add a lot of methods to Upscaler.
Re-work all the child upscalers to be proper classes.
Add BSRGAN scaler.
Add ldsr_model_arch class, removing the dependency for another repo that just uses regular latent-diffusion stuff.
Add one universal method that will always find and load new upscaler models without having to add new "setup_model" calls. Still need to add command line params, but that could probably be automated.
Add a "self.scale" property to all Upscalers so the scalers themselves can do "things" in response to the requested upscaling size.
Ensure LDSR doesn't get stuck in a longer loop of "upscale/downscale/upscale" as we try to reach the target upscale size.
Add typehints for IDE sanity.
PEP-8 improvements.
Moar.
2022-09-29 17:46:23 -05:00
safentisAuth
66fed8ffb8 Add custom name and try-except 2022-09-29 12:41:47 +03:00
Jairo Correa
c938679de7 Fix memory leak and reduce memory usage 2022-09-28 22:14:13 -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
Bernard Maltais
fe2f0e1729 Adding support for inverse sigmoid interpolation 2022-09-28 08:52:46 -04: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
8c48ede135 Fix variable conversion code issue 2022-09-27 21:34:24 -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
Bernard Maltais
e258f89080 Fix file name 2022-09-27 15:31:00 -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
d8ahazard
5756d517a6 Merge remote-tracking branch 'upstream/master' into ModelLoader 2022-09-27 11:02:41 -05:00
Bernard Maltais
0bd8aa937f Add interpolation method and weight to output filename 2022-09-27 10:29:52 -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
William Moorehouse
dc11748dea Added smoothstep interpolation to checkpoint merging 2022-09-26 10:50:21 -04:00
d8ahazard
740070ea9c Re-implement universal model loading 2022-09-26 09:29:50 -05:00
William Moorehouse
91643f651d Add support for checkpoint merging 2022-09-25 19:22:12 -04: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
91bfc71261 A big rework, just what you were secretly hoping for!
SD upscale moved to scripts
Batch processing script removed
Batch processing added to main img2img and now works with scripts
img2img page UI reworked to use tabs
2022-09-22 12:11:48 +03:00
olivier
5fe2c75da0 Support reusing filename stems during batch processing in Extras tab 2022-09-20 07:44:19 +03:00
trufty
6486ec9a56 Automatically show PNGinfo when uploading image 2022-09-19 22:49:05 +03:00
Dement242
33434fc6fc
Fixed "CodeFormer visibility:" rounding to 2 decimals. 2022-09-17 21:02:46 +02:00
jjisnow
047a623f7a
Restore run_pnginfo 2022-09-17 16:07:07 +10:00
JJ
de5bfdf917 image info tab
* handles exceptions if jpeg jfif data not present
* removes further non-comment related exif data.
2022-09-17 06:58:35 +10:00
AUTOMATIC
2288bc96fd fix extras tab showing original images instead of upscales 2022-09-16 12:43:24 +03:00
ArrowM
3763837003 Add batch processing to Extras tab 2022-09-16 07:42:48 +03:00
AUTOMATIC
bb2732c1c7 updates for exif comments #446 2022-09-14 15:20:05 +03:00
JustAnOkapi
f9f9d04b5f prevent extras from saving in dir
Extras have none of the vars used in dir names, so they cant be saved into dirs.
+grid code cleanup
2022-09-14 08:58:13 +03:00
AUTOMATIC
b6b9faa779 add support for reading saved jpeg comments 2022-09-13 19:23:55 +03:00
AUTOMATIC
482a6ce8cb [Feature Request] Save defaults for extras & keep image parameters after using extras #251 2022-09-12 18:59:53 +03:00
AUTOMATIC
11e648f6c7 allow resizing into non-integer sizes 2022-09-12 16:17:32 +03:00
AUTOMATIC
a4416f3585 [BUG] Not Working As Intended - create a directory with name derived from the prompt #306 2022-09-12 15:41:30 +03:00
AUTOMATIC
8fb9c57ed6 add half() supporrt for CLIP interrogation 2022-09-11 23:24:24 +03:00
AUTOMATIC
f185874418 [Feature Request] Save defaults for extras & keep image parameters after using extras #251 2022-09-11 11:31:16 +03:00