d22eb8a17f
Fix lint
2023-06-28 17:57:34 +07:00
45ab7475d6
Revision
2023-06-28 17:55:58 +07:00
da14f6a663
Add options to change colors in grid
2023-06-28 10:16:44 +07:00
4147fd6b2f
Merge branch 'dev' into 10141-gradio-user-exif
2023-06-27 09:05:53 +03:00
8f18e67243
Add a user pattern to the filename generator
2023-06-15 11:00:11 -05:00
51864790fd
Simplify a bunch of `len(x) > 0`/`len(x) == 0` style expressions
2023-06-02 15:07:10 +03:00
cbc38a903b
Merge pull request #10905 from AUTOMATIC1111/fix-10896-pnginfo-parameters
...
fix 10896 pnginfo parameters
2023-06-02 10:37:35 +03:00
0bf09c30c6
remove redundant
2023-06-01 06:34:53 +09:00
72f6367b9b
fix 10896 pnginfo parameters
2023-06-01 06:24:37 +09:00
6427ffde4d
Merge pull request #10808 from AUTOMATIC1111/fix-disable-png-info
...
fix disable png info
2023-05-31 22:56:56 +03:00
05933840f0
rename print_error to report, use it with together with package name
2023-05-31 19:56:37 +03:00
670195d720
Merge pull request #10808 from AUTOMATIC1111/fix-disable-png-info
...
fix disable png info
2023-05-31 19:20:19 +03:00
00dfe27f59
Add & use modules.errors.print_error where currently printing exception info by hand
2023-05-29 09:17:30 +03:00
2aca613a61
fix disable png info
2023-05-29 07:30:32 +09:00
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
d0e8fa627d
Merge pull request #10569 from strelokhalfer/pr
...
Change 'images.zip' to pattern settings
2023-05-27 20:10:17 +03:00
60062b51d8
Remove try/except in img metadata read
2023-05-25 08:33:40 -04:00
7a1bbf99da
Cleaner image metadata read
2023-05-24 16:41:22 -04:00
fb5d0ef209
Changed 'images.zip' to generation by pattern
2023-05-24 18:17:02 +03:00
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
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
49a55b410b
Autofix Ruff W (not W605) (mostly whitespace)
2023-05-11 20:29:11 +03:00
1332c46b71
Drop fonts + font-roboto deps since we only use the single regular cut of Roboto
2023-05-11 10:07:28 +03:00
df7070eca2
Deduplicate get_font code
2023-05-11 10:06:19 +03:00
a5121e7a06
fixes for B007
2023-05-10 11:37:18 +03:00
f741a98bac
imports cleanup for ruff
2023-05-10 08:43:42 +03:00
96d6ca4199
manual fixes for ruff
2023-05-10 08:25:25 +03:00
762265eab5
autofixes from ruff
2023-05-10 07:52:45 +03:00
3ba6c3c83c
Fix up string formatting/concatenation to f-strings where feasible
2023-05-09 22:25:39 +03:00
cde0d642f3
add denoising strength filename pattern
2023-05-06 02:20:33 +09:00
faff08f396
rework [batch_number]/[generation_number] filename patterns
2023-04-29 16:48:43 +03:00
e7d624574d
Merge branch 'dev' into master
2023-04-29 16:41:01 +03:00
87535fcf29
Merge branch 'dev' into Branch_AddNewFilenameGen
2023-04-29 13:10:46 +03:00
acbec22554
Add self argument that is mandatory to [clip_skip] filename pattern.
2023-04-16 17:14:11 +09:00
596556162e
Add filename pattern for CLIP_stop_at_last_layers.
2023-04-16 16:49:21 +09:00
02e3518807
Add new FilenameGenerator [hasprompt<prompt1|default><prompt2>..]
2023-04-15 23:20:08 +08:00
d609f6030e
Add [batch_number] and [generation_number] filename patterns
2023-04-07 21:04:46 +09:00
4c1ad743e3
for img2img, use None as upscaler instead of erroring out if the desired upscaler is not found
2023-03-26 11:01:32 +03:00
4697def235
bump gradio to 3.23
...
fix broken image dragging
2023-03-25 09:00:37 +03:00
af9158a8c7
update `fullfn` properly
2023-03-12 12:36:04 -07:00
48df6d66ea
add safety check in case of short extensions
...
so eg if a two-letter or empty extension is used, `.txt` would break, this `max` call protects that.
2023-03-12 12:33:29 -07:00
a71b7b5ec0
relocate filename length limit to better spot
2023-03-12 12:30:31 -07:00
7fd19fa4e7
initial fix for filename length limits on *nix systems
2023-03-11 07:22:22 -08:00
aa108bd02a
Add lossless webp option
2023-02-24 20:57:18 -07:00
f71a3c9c3a
convert resolution to int using round()
2023-02-20 17:47:20 +09:00
9c4eaac61f
Merge pull request #7691 from missionfloyd/16bit-convert
...
Convert 16-bit greyscale to 8-bit when saving as JPEG
2023-02-19 10:15:49 +03:00
fb2354cb2a
reword settings for 4chan export, remove unneded try/excepts, add try/except for actually saving JPG
2023-02-19 10:12:45 +03:00
73a97cac11
Use RGB for webp
...
Doesn't support greyscale (L)
2023-02-09 17:04:55 -07:00
463ab84180
Convert 16-bit greyscale to 8-bit when saving as JPEG
2023-02-09 02:13:49 -07:00
fe33be6cac
use Default if ValueError
2023-02-05 23:33:05 +09:00
6d11cda418
configurable image downscale
...
allowing the user to configure the image downscale parameters in setting
2023-02-05 23:12:42 +09:00
0ca1a64cfc
adds grid margins to xyz plot and prompt matrix
2023-02-05 03:44:56 -05:00
5a1b62e9f8
Add prompt_hash option for file/dir name pattern
2023-02-05 15:48:51 +09:00
40e51fd6ef
add margin parameter to draw_grid_annotations
2023-02-04 13:29:04 +03:00
09a142a05a
Reduce grid rows if larger than number of images available
...
When a set number of grid rows is specified in settings, then it leads
to situations where an entire row in the grid is empty.
The most noticable example is the processing preview when the row count
is set to 2, where it shows the preview just fine but with a black
rectangle under it.
2023-01-28 19:25:52 -05:00
e46bfa5a9e
handling sub grids and merging into one
2023-01-24 02:24:32 -05:00
3a0d6b7729
make it so that PNG images with EXIF do not lose parameters in PNG info tab
2023-01-17 23:54:23 +03:00
a8eb9e3bf8
Revert "Merge pull request #3791 from shirayu/fix/filename"
...
This reverts commit eed58279e74ae960b01c
2023-01-04 18:20:38 +03:00
eed58279e7
Merge pull request #3791 from shirayu/fix/filename
...
Truncate too long filename (Fix #705 )
2023-01-04 18:17:50 +03:00
ef27a18b6b
Hires fix rework
2023-01-02 19:42:10 +03:00
e672cfb074
rework of callback for #6094
2023-01-01 18:37:55 +03:00
6062c85d4d
Merge pull request #6094 from AlUlkesh/master
...
Adding image numbers on grids
2023-01-01 18:31:01 +03:00
5f12b23b8b
Adding image numbers on grids
...
New grid option in settings enables adding of image numbers on grids. This makes identifying the images, especially in larger batches, much easier.
Revert "Adding image numbers on grids"
This reverts commit 3530c283b4b1d3a3cab40efbffe4cf2697938b6f.
Implements Callback for image grid loop
Necessary to make "Add image's number to its picture in the grid" extension possible.
2023-01-01 11:21:50 +01:00
ae955b0146
fix rgba to rgb when using jpeg output
2022-12-26 09:56:19 -05:00
3bf5591efe
fix F541 f-string without any placeholders
2022-12-24 21:35:29 +02:00
fac92610d2
Merge pull request #5753 from calvinballing/master
...
Fix various typos
2022-12-24 09:58:28 +03:00
9441c28c94
add an option for img2img background color
2022-12-24 09:46:35 +03:00
b7c478c3eb
fix: Modify font size when unable to fit in plot
...
This prevents scenarios where text without line breaks will start overlapping with each other when generating X/Y plots. This is most evident when generating X/Y plots with checkpoints, as most don't contain spaces and sometimes include extra information such as the epoch, making it extra long.
2022-12-17 00:45:43 -05:00
c0355caefe
Fix various typos
2022-12-14 21:01:32 -05:00
89237852f4
Merge pull request #5119 from 0xb8/master
...
Atomically rename saved image to avoid race condition with other processes
2022-12-10 13:26:07 +03:00
506d529d19
rework #5012 to also work for pictures dragged into the prompt and also add Clip skip + ENSD to parameters
2022-11-27 16:28:32 +03:00
185ab3cbd1
Atomically rename saved image to avoid race condition with other processes.
2022-11-27 18:23:08 +05:00
ca8c764af8
Merge pull request #4986 from mcmonkey4eva/add-model-name
...
add model_name pattern for saving
2022-11-27 13:58:34 +03:00
b006382784
serve images from where they are saved instead of a temporary directory
...
add an option to choose a different temporary directory in the UI
add an option to cleanup the selected temporary directory at startup
2022-11-27 11:52:53 +03:00
ffcbbcf385
add filename santization
...
Probably redundant, considering the model name *is* a filename, but I suppose better safe than sorry.
2022-11-23 06:44:20 -08:00
6001684be3
add model_name pattern for saving
2022-11-23 06:35:44 -08:00
cdc8020d13
change StableDiffusionProcessing to internally use sampler name instead of sampler index
2022-11-19 12:01:51 +03:00
8792be5007
Add PNG info to pngs only if option is enabled.
2022-10-31 17:29:04 -07:00
539c0f51e4
Update images.py
...
Filename tags [height] and [width] are wrongly referencing to process size instead of resulting image size. Making all upscale files named wrongly.
2022-10-29 01:07:01 +02:00
c4b5ca5778
Truncate too long filename
2022-10-27 22:00:28 +09:00
0cd7460253
add script callback for before image save and change callback for after image save to use a class with parameters
2022-10-26 13:12:44 +03:00
757264c453
default_time_format if format is blank
2022-10-26 09:51:32 +03:00
146856f66d
images: allow nested bracket in filename pattern
2022-10-26 09:50:24 +03:00
91c1e1e6a9
fix default filename pattern
2022-10-25 09:44:54 +03:00
16416e42b5
Merge branch 'master' into on-image-saved-callback
2022-10-25 08:40:12 +03:00
0c0028a9d3
UnknownTimeZoneError
2022-10-24 16:01:48 +03:00
8da1bd48bf
add an option to skip adding number to filenames when saving.
...
rework filename pattern function go through the pattern once and not calculate any of replacements until they are actually encountered in the pattern.
2022-10-24 14:03:58 +03:00
eb007e5884
use the same datetime object for [date] and [datetime]
2022-10-24 10:28:42 +03:00
5a981310e6
replace_datetime() can now accept a datetime parameter
2022-10-24 10:28:42 +03:00
8f6af4ed65
remove lowercasing file_decoration as it is not needed anymore
2022-10-24 10:28:42 +03:00
00952fb4a8
add sanitize_filename() to datetime
2022-10-24 10:28:42 +03:00
480d8e7646
replace "srt.replace()" in apply_filename_pattern() with equivalent re.sub()
...
the file_decoration passed into apply_filename_pattern() is formatted to lowercase to increase compatibility
the use of case sensitive srt.replace()
but because the newly implemented "time format" is case sensitive
the lowercasing the file_decoration will cause time format to be broken
in order to resolve this issue
I decided to replace every srt.replace() and in if "str" in x to regular expression (case insensitive) equivalent
2022-10-24 10:28:42 +03:00
37dd6deafb
filename pattern [datetime], extended customizable Format and Time Zone
...
format:
[datetime]
[datetime<Format>]
[datetime<Format><Time Zone>]
2022-10-24 10:28:42 +03:00
7d4a4db9ea
modify unnecessary sting assignment as it's going to get overwritten
2022-10-24 10:28:42 +03:00
c5d90628a4
move "file_decoration" initialize section
...
into "if forced_filename is None:"
no need to initialize it if it's not going to be used
2022-10-24 10:28:42 +03:00
734986dde3
add callback after image is saved
2022-10-24 01:25:31 -05:00
2273e752fb
Remove redundant try/except.
2022-10-21 09:55:00 +03:00
4ff274e1e3
Revise comments.
2022-10-21 09:55:00 +03:00
6014fb8afb
Do nothing if image file already exists.
2022-10-21 09:55:00 +03:00
5f87dd1ee0
Add option to prevent empty spots in grid (2/2)
2022-10-14 19:54:24 +03:00
NoCrypt