Commit Graph

74 Commits

Author SHA1 Message Date
Milly
1cc36d170a Added job_timestamp to Processed
So `[job_timestamp]` pattern can use in saving image UI.
2022-10-06 20:41:23 +03:00
Milly
070b7d60cf Added styles to Processed
So `[styles]` pattern can use in saving image UI.
2022-10-06 20:41:23 +03:00
Milly
0bb458f0ca Removed duplicate image saving codes
Use `modules.images.save_image()` instead.
2022-10-06 20:15:39 +03:00
AUTOMATIC1111
e6cbef785a
Merge pull request #1550 from RnDMonkey/#1484_fix_empty_styles_pattern
#1484 fix empty styles pattern
2022-10-04 15:26:48 +03:00
Milly
eec1b39bd5 Apply prompt pattern last 2022-10-04 15:22:49 +03:00
RnDMonkey
36ea4ac0f5 moved no-style return outside join function 2022-10-02 22:21:16 -07:00
AUTOMATIC1111
3fac3764b3
Merge branch 'master' into #1484_fix_empty_styles_pattern 2022-10-03 07:54:57 +03:00
AUTOMATIC1111
a9d7eb722f
Merge branch 'master' into saving 2022-10-02 17:03:01 +03:00
RnDMonkey
32edf1732f os.path.normpath wasn't working, reverting to manual strip 2022-10-01 21:37:14 -07:00
RnDMonkey
70f5267047 use os.path.normpath for better safety checking 2022-10-01 21:18:15 -07:00
RnDMonkey
3cf1a96006 added safety for blank directory naming patterns 2022-10-01 21:11:03 -07:00
AUTOMATIC
3a876b16a9 Merge remote-tracking branch 'origin/master' 2022-09-30 18:56:23 +03:00
AUTOMATIC
980cd1697a prevent neural network resizing when it is not necessary #1109 2022-09-30 14:23:41 +03:00
RnDMonkey
5c0c778a65 fixed so that {prompt} can be anywhere in style 2022-09-30 13:00:43 +03:00
RnDMonkey
ff4df06c57 refined [styles] pattern and added [prompt_no_styles] 2022-09-30 13:00:43 +03:00
AUTOMATIC
9a54077d4d repair broken highres fix #1109 2022-09-30 12:26:41 +03:00
AUTOMATIC
d1f098540a remove unwanted formatting/functionality from the PR 2022-09-30 11:42:40 +03:00
AUTOMATIC
a5e7b371d6 fix the bug with broken rescaling in PR 2022-09-30 10:38:48 +03: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
WDevelopsWebApps
03ee67bfd3 add advanced saving for save button 2022-09-28 10:53:40 +02:00
tateisu
78d6aef302 use strftime. update hints.js 2022-09-26 16:24:21 +03:00
tateisu
b39f06cea7 add [datetime] to image file name pattern 2022-09-26 16:24:21 +03:00
Eyrie
1877a3767e Changed job_id to timestamp 2022-09-25 17:11:07 +03:00
Eyrie
40166dbf08 Added job_id pattern for directories 2022-09-25 17:11:07 +03:00
RnDMonkey
a2bea2f97a added [styles] filename pattern 2022-09-24 11:12:58 +03:00
AUTOMATIC
c8c662901b fix for inpaint at full resolution breaking if you have an NN upscaler. 2022-09-23 23:29:53 +03:00
AUTOMATIC
1a0353675d Option to use advanced upscalers with normal img2img 2022-09-23 17:37:47 +03:00
Robin Fernandes
03738668c0 Merge from master 2022-09-23 00:54:32 +00:00
Prof-Cheese
ae32b8a53f Fixed directory name generation process.
'Max prompt words' has been added to config and modified to be used in the directory name generation process.
2022-09-22 20:15:37 +03:00
Robin Fernandes
25eb1e3d90 Add option to save before color correction. Add suffix param when saving files, used for special saves without color correction and face restoration. 2022-09-22 20:54:50 +10:00
Milly
a8a75ec43a Fixed filename part sanitizing
The following file patterns are invalid on Windows.
- Begin or end with the ASCII Space (0x20)
- End with the ASCII Period (0x2E)

For example, if `[prompt_spaces]` is specified as the directory name pattern, sometimes file saving may fail.
2022-09-20 09:46:44 +03:00
olivier
5fe2c75da0 Support reusing filename stems during batch processing in Extras tab 2022-09-20 07:44:19 +03:00
AUTOMATIC
2f18823e69 fix for broken export for 4chan 2022-09-17 15:39:20 +03:00
AUTOMATIC
247f58a5e7 add support for switching model checkpoints at runtime 2022-09-17 12:05:18 +03:00
AUTOMATIC
1fc1c537c7 fix 2022-09-17 09:01:10 +03:00
AUTOMATIC
3c665b8dd6 the last PR broke saving EXiF completely for me. I don't know if it was broken already or some condition changed, but it seems like the person who originally added EXIF said, saving it with PIL may not work. I switched to using piexif to add data after the file written. 2022-09-17 08:35:52 +03:00
JJ
4f1f348b6a image.save parameter fix
* image.save takes exif as a parameter
* piexif takes the bytes as a parameter, not the exif_bytes function itself
* reduce calls to create_exif_bytes
2022-09-17 08:06:50 +03:00
Twizzes
deea9f4d70 Replace invalid filename chars with an underscore
... instead of removing them altogether.
This makes the prompt editing filenames [old🆕step] easier to read
2022-09-16 07:25:58 +03:00
AUTOMATIC
cdaab233c4 Merge remote-tracking branch 'origin/master' 2022-09-15 14:54:33 +03:00
AUTOMATIC
6d2eb339d6 fix for failing to save 4chan downscale for large iamges 2022-09-15 14:54:29 +03:00
JJ
9611008445 exif fix for webp
* fix for odd error only in webp files whereby piexif.insert inserts the bytes correctly, but image.save inserts extra "Exif" in the image metadata which results in an error on reading
2022-09-15 14:53:06 +03:00
EyeDeck
dfb2e830d9 Improved directory sanitization when --hide_ui_dir_config
Fixes an issue where it's still possible to write to arbitrary directories through careful use of \.. or /.. in directory patterns

...and fix the regex to work better

reeeegex
2022-09-15 07:39:57 +03:00
Michoko
6153d9d9e9 Update images.py
Better code
2022-09-14 15:51:45 +03:00
Michoko
d5520d43fd Update images.py
Handles grids names. Code more robust and doesn't fail if mixed with other files.
2022-09-14 15:51:45 +03:00
Michoko
94aeb5dec9 Update images.py
Better computing of images indexes in filenames
2022-09-14 15:51:45 +03:00
AUTOMATIC
bb2732c1c7 updates for exif comments #446 2022-09-14 15:20:05 +03:00
JJ
c4e90bf689 format exif string
* UserComment needs an ID code at the start of the tag area. This is provided by piexif.helper.UserComment, otherwise an "Warning 	 Invalid EXIF text encoding for UserComment" is thrown upon reading the exif data
2022-09-14 15:14:26 +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
JJ
859fff3700 add webp to file formats with exif saved 2022-09-14 08:49:00 +03:00
AUTOMATIC
29022300ba revert the breaking change in font sneaked in by the person who did EXIF #407 2022-09-13 19:53:42 +03:00