Mirror/stable-diffusion-webui
1
0
Fork 0
mirror of https://github.com/AUTOMATIC1111/stable-diffusion-webui.git synced 2024-06-07 21:20:49 +00:00
Code Issues Packages Projects Releases Wiki Activity
5,006 Commits 35 Branches 33 Tags 305 MiB
f873890298
Commit Graph

172 Commits

Author SHA1 Message Date
AUTOMATIC
a8eb9e3bf8 Revert "Merge pull request #3791 from shirayu/fix/filename" 
This reverts commit eed58279e7, reversing
changes made to 4ae960b01c.
 2023-01-04 18:20:38 +03:00
AUTOMATIC1111
eed58279e7
Merge pull request #3791 from shirayu/fix/filename 
Truncate too long filename (Fix #705)
 2023-01-04 18:17:50 +03:00
AUTOMATIC
ef27a18b6b Hires fix rework 2023-01-02 19:42:10 +03:00
AUTOMATIC
e672cfb074 rework of callback for #6094 2023-01-01 18:37:55 +03:00
AUTOMATIC1111
6062c85d4d
Merge pull request #6094 from AlUlkesh/master 
Adding image numbers on grids
 2023-01-01 18:31:01 +03:00
AlUlkesh
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
Vladimir Mandic
ae955b0146 fix rgba to rgb when using jpeg output 2022-12-26 09:56:19 -05:00
Yuval Aboulafia
3bf5591efe fix F541 f-string without any placeholders 2022-12-24 21:35:29 +02:00
AUTOMATIC1111
fac92610d2
Merge pull request #5753 from calvinballing/master 
Fix various typos
 2022-12-24 09:58:28 +03:00
AUTOMATIC
9441c28c94 add an option for img2img background color 2022-12-24 09:46:35 +03:00
MMaker
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
Jim Hays
c0355caefe Fix various typos 2022-12-14 21:01:32 -05:00
AUTOMATIC1111
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
AUTOMATIC
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
cat
185ab3cbd1 Atomically rename saved image to avoid race condition with other processes. 2022-11-27 18:23:08 +05:00
AUTOMATIC1111
ca8c764af8
Merge pull request #4986 from mcmonkey4eva/add-model-name 
add model_name pattern for saving
 2022-11-27 13:58:34 +03:00
AUTOMATIC
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
Alex "mcmonkey" Goodwin
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
Alex "mcmonkey" Goodwin
6001684be3 add model_name pattern for saving 2022-11-23 06:35:44 -08:00
AUTOMATIC
cdc8020d13 change StableDiffusionProcessing to internally use sampler name instead of sampler index 2022-11-19 12:01:51 +03:00
timntorres
8792be5007 Add PNG info to pngs only if option is enabled. 2022-10-31 17:29:04 -07:00
Yaiol
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
Yuta Hayashibe
c4b5ca5778 Truncate too long filename 2022-10-27 22:00:28 +09:00
AUTOMATIC
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
w-e-w
757264c453 default_time_format if format is blank 2022-10-26 09:51:32 +03:00
Milly
146856f66d images: allow nested bracket in filename pattern 2022-10-26 09:50:24 +03:00
w-e-w
91c1e1e6a9 fix default filename pattern 2022-10-25 09:44:54 +03:00
AUTOMATIC1111
16416e42b5
Merge branch 'master' into on-image-saved-callback 2022-10-25 08:40:12 +03:00
w-e-w
0c0028a9d3 UnknownTimeZoneError 2022-10-24 16:01:48 +03:00
AUTOMATIC
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
w-e-w
eb007e5884 use the same datetime object for [date] and [datetime] 2022-10-24 10:28:42 +03:00
w-e-w
5a981310e6 replace_datetime() can now accept a datetime parameter 2022-10-24 10:28:42 +03:00
w-e-w
8f6af4ed65 remove lowercasing file_decoration as it is not needed anymore 2022-10-24 10:28:42 +03:00
w-e-w
00952fb4a8 add sanitize_filename() to datetime 2022-10-24 10:28:42 +03:00
w-e-w
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
w-e-w
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
w-e-w
7d4a4db9ea modify unnecessary sting assignment as it's going to get overwritten 2022-10-24 10:28:42 +03:00
w-e-w
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
Trung Ngo
734986dde3 add callback after image is saved 2022-10-24 01:25:31 -05:00
timntorres
2273e752fb Remove redundant try/except. 2022-10-21 09:55:00 +03:00
timntorres
4ff274e1e3 Revise comments. 2022-10-21 09:55:00 +03:00
timntorres
6014fb8afb Do nothing if image file already exists. 2022-10-21 09:55:00 +03:00
Gugubo
5f87dd1ee0 Add option to prevent empty spots in grid (2/2) 2022-10-14 19:54:24 +03:00
Gugubo
2fb9891af3 Change grid row count autodetect to prevent empty spots 
Instead of just rounding (sometimes resulting in grids with "empty" spots), find a divisor.
For example: 8 images will now result in a 4x2 grid instead of a 3x3 with one empty spot.
 2022-10-14 19:54:24 +03:00
AUTOMATIC
0aec19d783 make pasting into img2img prompt work 
make image params request not use temp files
 2022-10-14 18:15:03 +03:00
d8ahazard
54e0051bdd Add drag/drop param loading. 
Drop an image or generational text onto the prompt bar, it loads the info for parsing.
 2022-10-12 18:17:26 -05:00
aoirusann
14192c5b20 Support Download for txt files. 2022-10-09 10:49:11 +03:00
Milly
405c8171d1 Prefer using Processed.sd_model_hash attribute when filename pattern 2022-10-06 20:41:23 +03:00
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
AUTOMATIC
b6b9faa779 add support for reading saved jpeg comments 2022-09-13 19:23:55 +03:00
JJ
27c2a0680a save the exif data upon image write 2022-09-13 18:11:46 +03:00