Commit Graph

107 Commits

Author SHA1 Message Date
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
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
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