Commit Graph

75 Commits

Author SHA1 Message Date
Manuel Schmid 267d5eee7d
Merge commit '1c999be8c8134fe01a75723ea933858435856950'
# Conflicts:
#	.github/ISSUE_TEMPLATE/bug_report.md
#	launch.py
#	modules/async_worker.py
#	modules/config.py
#	modules/private_logger.py
#	modules/util.py
#	webui.py
2024-02-12 21:13:36 +01:00
eddyizm 074b655dff
fix: implement output path argument (#2074)
* added function to check output path arg and override, other wise, use temp or fallback to config

* added function to check output path arg and override, other wise, use temp or fallback to config #2065

* Revert to 1bcbd650

* moved path output arg handling inside config start up

* Revert "added function to check output path arg and override, other wise, use temp or fallback to config"

This reverts commit fecb97b59c.

* Updated tag to uppercase

* updated docstring to standard double quotes.

Co-authored-by: Manuel Schmid <9307310+mashb1t@users.noreply.github.com>

* removed extra check on image log flag per feedback

* feat: update config_dict value when overriding path_outputs, change message

---------

Co-authored-by: Manuel Schmid <9307310+mashb1t@users.noreply.github.com>
Co-authored-by: Manuel Schmid <manuel.schmid@odt.net>
2024-02-11 13:04:06 +01:00
Manuel Schmid ceefba9b69
Merge branch 'feature/add-metadata-to-files'
# Conflicts:
#	language/en.json
#	modules/async_worker.py
#	modules/config.py
#	modules/flags.py
#	modules/meta_parser.py
#	modules/private_logger.py
#	modules/util.py
#	webui.py
2024-02-04 21:09:24 +01:00
Manuel Schmid 6dadc3314d
Merge remote-tracking branch 'upstream/main'
# Conflicts:
#	modules/config.py
2024-02-04 14:29:54 +01:00
Manuel Schmid 59dd1c2d12
Merge remote-tracking branch 'upstream/main' into feature/add-metadata-to-files 2024-02-04 13:55:00 +01:00
Manuel Schmid c3ab9f1f30
refactor: use central flag for LoRA count 2024-01-29 14:26:56 +01:00
Manuel Schmid 236278948b
chore: code cleanup 2024-01-28 23:50:56 +01:00
Manuel Schmid cbc63ebba3
feat: add enums for Performance, Steps and StepsUOV
also move MetadataSchema enum to prevent circular dependency
2024-01-28 20:01:33 +01:00
Manuel Schmid f3010313fc
wip: add metadata mapping, reading and writing
applying data after reading currently not functional for A1111
2024-01-28 05:35:44 +01:00
lllyasviel 1bcbd6501b fix config 2024-01-27 16:18:26 -08:00
Manuel Schmid 7185abb8ba
Merge branch 'main_upstream'
# Conflicts:
#	launch.py
#	ldm_patched/modules/args_parser.py
#	modules/config.py
#	presets/anime.json
#	presets/default.json
#	presets/lcm.json
#	presets/realistic.json
2024-01-27 21:09:08 +01:00
lllyasviel 69ad1b3c24 advanced preset load
new model list

i

new candidates

add model fallback

allow disable preset download

Update anime.json

Update anime.json

Update config.py

Update anime.json

Update readme.md

Update default.json
2024-01-27 08:06:31 -08:00
Manuel Schmid 1ae495f6b8
Merge branch 'feature/add-inpaint-mask-generation'
# Conflicts:
#	requirements_versions.txt
#	webui.py
2024-01-26 11:32:53 +01:00
rayronvictor 228a0aaeea Add SAM support 2024-01-25 16:45:02 -03:00
Manuel Schmid 366984ca64
Merge branch 'feature/add-inpaint-mask-generation'
# Conflicts:
#	webui.py
2024-01-25 10:48:40 +01:00
rayronvictor f0fb9783e1 Add options to u2net_cloth_seg 2024-01-24 21:26:23 -03:00
Manuel Schmid 23bb69bb13
Merge branch 'feature/add-inpaint-mask-generation' 2024-01-24 19:45:58 +01:00
Manuel Schmid dea4b6c15c
fix: add correct flag validation for default_inpaint_mask_model config 2024-01-24 19:41:25 +01:00
Manuel Schmid e196a35ce2
Merge branch 'feature/add-inpaint-mask-generation'
# Conflicts:
#	modules/config.py
#	requirements_versions.txt
2024-01-24 02:46:09 +01:00
Manuel Schmid db5512fb93
feat: add inpaint mask generation functionality
uses rembg, see https://github.com/danielgatis/rembg
2024-01-24 02:22:50 +01:00
Manuel Schmid 72d1e48def
Merge branch 'jpg_config_image_extension'
# Conflicts:
#	modules/async_worker.py
#	modules/flags.py
#	modules/private_logger.py
#	webui.py
2024-01-19 00:14:44 +01:00
Manuel Schmid 7e52a1de8f
refactor: rename image_file_extension to output_format 2024-01-19 00:06:07 +01:00
Manuel Schmid addd5ef3bd
Merge branch 'feature/add-metadata-to-files'
# Conflicts:
#	args_manager.py
#	modules/async_worker.py
#	modules/config.py
#	modules/private_logger.py
#	modules/util.py
2024-01-16 00:50:46 +01:00
Manuel Schmid ba5d0b6eaf
refactor: rename metadata_schema to metadata_scheme 2024-01-15 23:59:57 +01:00
Manuel Schmid 7b9deb17ee
feat: add config metadata_created_by 2024-01-15 23:06:20 +01:00
Manuel Schmid 191f8148e4
feat: add support for A1111 metadata schema
cf2772fab0/modules/processing.py (L672)
2024-01-15 21:16:52 +01:00
Manuel Schmid 8d56318bed
feat: add config and checkbox for save_metadata_to_images 2024-01-15 18:54:49 +01:00
Manuel Schmid f25bf49894
Merge branch 'jpg_config_image_extension'
# Conflicts:
#	modules/config.py
#	modules/flags.py
#	webui.py
2024-01-14 23:40:24 +01:00
Manuel Schmid 5b633f6cf8
refactor: rename image_extension to image_file_extension 2024-01-14 23:38:36 +01:00
Manuel Schmid b18ae4343d
Merge branch 'jpg_config_image_extension'
# Conflicts:
#	modules/async_worker.py
#	modules/config.py
#	modules/flags.py
#	webui.py
2024-01-14 23:22:03 +01:00
eddyizm ab3acb7817
moved image extension to webui via async worker. Passing as parameter to log and get_current_html_path functions per feedback 2024-01-12 22:49:07 -08:00
eddyizm 9dfa1a99e3
moved function to config module 2024-01-10 19:06:40 -08:00
eddyizm e1697272ec
feature: added flag, config and ui update for image extension change #1789 2024-01-10 09:36:27 -08:00
Manuel Schmid 1ff3efd56b
Merge branch 'feature/update-juggernaut-xl-to-v8'
# Conflicts:
#	css/style.css
2024-01-10 11:02:10 +01:00
Manuel Schmid 92684132b5
clean up model download URL query parameters 2024-01-10 11:00:39 +01:00
Manuel Schmid 21bceb6d51
Merge branch 'feature/update-juggernaut-xl-to-v8' 2024-01-07 16:18:58 +01:00
Manuel Schmid 896fbc6185
feat: update JuggernautXL from v6 to v8 2024-01-07 15:47:07 +01:00
Manuel Schmid 1c42ceadbb
Merge branch 'bugfix/fix-create-dir-if-not-existing'
# Conflicts:
#	modules/config.py
2023-12-31 00:10:38 +01:00
Manuel Schmid 917c422ec6
correctly create directory for outputs if not existing 2023-12-30 19:05:59 +01:00
Manuel Schmid 48b1324a26
add default_max_image_number to config, use as maximum in default_image_number (#1616) 2023-12-28 07:48:30 -08:00
Manuel Schmid 82f82e7941
remove restriction for maximum default_max_image_number value 2023-12-27 17:16:20 +01:00
Manuel Schmid 91be48c596
code cleanup 2023-12-25 00:07:14 +01:00
Manuel Schmid 3ba59df559
add default_overwrite_step handling for meta data and gradio
allows turbo preset switching to set default_overwrite_step correctly
2023-12-24 23:31:46 +01:00
Manuel Schmid 1e0f95c6cf
Merge branch 'feature/add-preset-selection' 2023-12-24 13:13:49 +01:00
Manuel Schmid e72850de70
download missing models from preset 2023-12-24 13:09:20 +01:00
Manuel Schmid 2fe48ab293
Merge branch 'feature/add-preset-selection'
# Conflicts:
#	webui.py
2023-12-23 23:27:35 +01:00
Manuel Schmid ccfd4f5094
add preset refresh on "Refresh All Files" click 2023-12-23 22:17:46 +01:00
Manuel Schmid 2770a40dc1
use default config as fallback value 2023-12-23 21:38:22 +01:00
Manuel Schmid 891a1acb62
add LoRA handling 2023-12-23 19:57:56 +01:00
Manuel Schmid f56e3eb3b0
add preset selection
uses meta parsing to set presets in user session (UI elements only)
2023-12-23 19:30:49 +01:00