Commit Graph

208 Commits

Author SHA1 Message Date
CodeHatchling
56604f08a1 Moved image filters used by soft inpainting into soft_inpainting.py from images.py 2023-12-07 14:53:44 -07:00
CodeHatchling
28a2b5b4aa Fixed a math mistake. 2023-12-03 14:20:20 -07:00
CodeHatchling
3bd3a09160 Merge remote-tracking branch 'origin/dev' into soft-inpainting
# Conflicts:
#	modules/processing.py
2023-12-02 21:14:02 -07:00
CodeHatchling
609dea36ea Added utility functions related to processing masks. 2023-12-02 18:56:49 -07:00
AUTOMATIC1111
ab63054f95 write infotext to gif image as comment 2023-09-30 09:34:50 +03:00
AUTOMATIC1111
0c71967a53
Merge pull request #13068 from JaredTherriault/master
Load comments from gif images to gather geninfo from gif outputs
2023-09-30 09:33:14 +03:00
AUTOMATIC1111
9e58e11ad4
Merge pull request #13028 from AUTOMATIC1111/fallback-invalid-exif
Add Fallback at images.read_info_from_image if exif data was invalid
2023-09-09 09:21:18 +03:00
AUTOMATIC1111
3ca4655a18 update for #12926 2023-09-09 09:08:31 +03:00
w-e-w
35d1c94549 save_images_add_number_suffix 2023-09-06 20:24:26 +09:00
JaredTherriault
022639a145
Load comments from gif images to gather geninfo from gif outputs 2023-09-04 17:37:48 -07:00
AngelBottomless
f593cbfec4
fallback if exif data was invalid 2023-09-03 21:07:36 +09:00
w-e-w
8ce613bb3a switch to PNG when images too large 2023-08-19 16:50:43 +09:00
w-e-w
a81dc43fcd negative_prompt full_prompt hash 2023-08-18 15:13:12 +09:00
w-e-w
8a1f32b6a5 image hash 2023-08-18 14:04:46 +09:00
AUTOMATIC1111
386245a264 split shared.py into multiple files; should resolve all circular reference import errors related to shared.py 2023-08-09 10:25:35 +03:00
catboxanon
bcff763b6e
Add tab and carriage return to invalid filename chars 2023-08-04 22:59:47 -04:00
AUTOMATIC1111
4334d25978 bugfix: model name was added together with directory name to infotext and to [model_name] filename pattern 2023-07-19 15:49:54 +03:00
Marcus Adams
5d94088eac Added [none] filename token. 2023-07-14 21:52:00 -04:00
AUTOMATIC1111
e93f582a78
Merge pull request #11748 from huaizong/fix/x/resize-less-than-two-pixel-error
fix: check fill size none zero when resize  (fixes #11425)
2023-07-13 14:48:19 +03:00
王怀宗
6c0d5d1198 fix: check fill size none zero when resize (fixes #11425) 2023-07-12 16:51:50 +08:00
AUTOMATIC1111
539518292e
Merge pull request #11468 from NoCrypt/grid-colors-options
Add options to change colors in grid
2023-07-08 14:51:50 +03:00
AUTOMATIC1111
7a7fa25d02 lint fix for #11492 2023-07-08 14:21:40 +03:00
AUTOMATIC1111
ae74b44c69
Merge pull request #11596 from akx/use-read-info
postprocessing: use read_info_from_image
2023-07-08 14:14:12 +03:00
AUTOMATIC1111
2151a9881f
Merge pull request #11492 from semjon00/dev
Fix throwing exception when trying to resize image with I;16 mode
2023-07-08 13:46:08 +03:00
AUTOMATIC1111
19772c3c97 fix problem with extra network saving images as previews losing generation info
add a description for save_image_with_geninfo
2023-07-08 13:43:42 +03:00
semjon00
fb661e089f Fix throwing exception when trying to resize image with I;16 mode 2023-07-05 15:39:04 +03:00
Aarni Koskela
5c6a33b3e1 read_info_from_image: don't mutate info in passed-in image 2023-07-03 13:10:42 +03:00
Aarni Koskela
96f0593c8f read_info_from_image: add type 2023-07-03 13:10:20 +03:00
Aarni Koskela
b2c574891f read_info_from_image: add photoshop to ignored 2023-07-03 13:09:37 +03:00
NoCrypt
d22eb8a17f Fix lint 2023-06-28 17:57:34 +07:00
NoCrypt
45ab7475d6 Revision 2023-06-28 17:55:58 +07:00
NoCrypt
da14f6a663 Add options to change colors in grid 2023-06-28 10:16:44 +07:00
AUTOMATIC1111
4147fd6b2f
Merge branch 'dev' into 10141-gradio-user-exif 2023-06-27 09:05:53 +03:00
Jared Deckard
8f18e67243 Add a user pattern to the filename generator 2023-06-15 11:00:11 -05:00
Aarni Koskela
51864790fd Simplify a bunch of len(x) > 0/len(x) == 0 style expressions 2023-06-02 15:07:10 +03:00
AUTOMATIC1111
cbc38a903b Merge pull request #10905 from AUTOMATIC1111/fix-10896-pnginfo-parameters
fix 10896 pnginfo parameters
2023-06-02 10:37:35 +03:00
w-e-w
0bf09c30c6 remove redundant 2023-06-01 06:34:53 +09:00
w-e-w
72f6367b9b fix 10896 pnginfo parameters 2023-06-01 06:24:37 +09:00
AUTOMATIC1111
6427ffde4d Merge pull request #10808 from AUTOMATIC1111/fix-disable-png-info
fix disable png info
2023-05-31 22:56:56 +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
670195d720
Merge pull request #10808 from AUTOMATIC1111/fix-disable-png-info
fix disable png info
2023-05-31 19:20:19 +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
w-e-w
2aca613a61 fix disable png info 2023-05-29 07:30:32 +09:00
AUTOMATIC1111
9bc037d045
Merge pull request #10655 from fumitakayano/fumitakayano
Added format to specify VAE filename for generated image filenames
2023-05-27 20:11:21 +03:00
AUTOMATIC1111
d0e8fa627d
Merge pull request #10569 from strelokhalfer/pr
Change 'images.zip' to pattern settings
2023-05-27 20:10:17 +03:00
catboxanon
60062b51d8
Remove try/except in img metadata read 2023-05-25 08:33:40 -04:00
catboxanon
7a1bbf99da
Cleaner image metadata read 2023-05-24 16:41:22 -04:00
strelokhalfer
fb5d0ef209 Changed 'images.zip' to generation by pattern 2023-05-24 18:17:02 +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
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