e541097451
wip: code cleanup, update todos
2024-01-29 21:54:22 +01:00
2656356206
fix: use correct order to read LoRA in meta parser
2024-01-29 18:17:51 +01:00
e388f6fff6
wip: code cleanup, update todos
2024-01-29 16:38:39 +01:00
33d644f4a5
feat: add prefix "Fooocus" to version
2024-01-29 16:29:40 +01:00
7fefe3a3c2
feat: add created_by again
2024-01-29 16:28:47 +01:00
c80011b1d1
fix: use correct LoRA mapping, add fallback for backwards compatibility
2024-01-29 15:45:55 +01:00
20e53028a4
refactor: use central flag for ControlNet image count
2024-01-29 14:27:51 +01:00
c3ab9f1f30
refactor: use central flag for LoRA count
2024-01-29 14:26:56 +01:00
f94b96f6eb
wip: add prompt style extraction for A1111 scheme
2024-01-29 01:52:24 +01:00
5e84a45e22
feat: add A1111 prompt style detection
...
only detects one style as Fooocus doesn't wrap {prompt} with the whole style, but has a separate prompt string for each style
2024-01-28 23:52:06 +01:00
236278948b
chore: code cleanup
2024-01-28 23:50:56 +01:00
5dcb2bc573
fix: correctly map resolution, use empty styles for A1111
2024-01-28 20:42:58 +01:00
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
e19596c2df
feat: map basic information for scheme A1111
2024-01-28 18:04:40 +01:00
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
1bcbd6501b
fix config
2024-01-27 16:18:26 -08:00
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
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
ff2187efed
Upgrade requirements_met function ( #1955 )
...
* Upgrade requirements_met function
* Removed extra import
* Using Requirements instead of Regex
2024-01-27 05:12:34 -08:00
80068a0cd7
[enhance]: use opencv to rewrite morphological_open(), achieve a 40x speed increase in morphological_open opporation, for inpanting images size smaller than 3k ( #2016 )
...
Co-authored-by: 雷晨曦 <leichenxi@qiyi.com>
2024-01-27 05:12:34 -08:00
1ae495f6b8
Merge branch 'feature/add-inpaint-mask-generation'
...
# Conflicts:
# requirements_versions.txt
# webui.py
2024-01-26 11:32:53 +01:00
051faf78b8
fix: use correct default value in metadata check for created_by
2024-01-25 23:49:25 +01:00
20b79788a0
feat: add resolved prompts to metadata
2024-01-25 23:48:47 +01:00
510b587e84
fix: use pnginfo "parameters" insteadf of "Comments"
...
see https://github.com/RupertAvery/DiffusionToolkit/issues/202 and cf2772fab0/modules/processing.py (L939)
2024-01-25 21:08:19 +01:00
228a0aaeea
Add SAM support
2024-01-25 16:45:02 -03:00
366984ca64
Merge branch 'feature/add-inpaint-mask-generation'
...
# Conflicts:
# webui.py
2024-01-25 10:48:40 +01:00
f0fb9783e1
Add options to u2net_cloth_seg
2024-01-24 21:26:23 -03:00
23bb69bb13
Merge branch 'feature/add-inpaint-mask-generation'
2024-01-24 19:45:58 +01:00
dea4b6c15c
fix: add correct flag validation for default_inpaint_mask_model config
2024-01-24 19:41:25 +01:00
d7d34647d0
fix: remove segmentation models from rembg model selection
2024-01-24 19:38:12 +01:00
e196a35ce2
Merge branch 'feature/add-inpaint-mask-generation'
...
# Conflicts:
# modules/config.py
# requirements_versions.txt
2024-01-24 02:46:09 +01:00
db5512fb93
feat: add inpaint mask generation functionality
...
uses rembg, see https://github.com/danielgatis/rembg
2024-01-24 02:22:50 +01:00
d7c1f4a6aa
Merge branch 'hotfix/prevent-skipping-and-stopping-by-other-users'
...
# Conflicts:
# modules/advanced_parameters.py
# modules/async_worker.py
# webui.py
2024-01-22 23:15:18 +01:00
148eddf48d
Merge branch 'feature/extract-advanced-parameters' into hotfix/prevent-skipping-and-stopping-by-other-users
...
# Conflicts:
# webui.py
2024-01-22 21:31:24 +01:00
031b1f8b11
chore: cleanup pid code
2024-01-22 21:20:17 +01:00
21f4767c65
fix: resolve circular import, patch_all now in async_worker
2024-01-22 21:14:54 +01:00
177075ff7b
feat: extract remaining attributes, do not use globals in patch
2024-01-22 21:13:44 +01:00
f3222b0f27
feat: extract attribute controlnet_softness
2024-01-22 20:09:24 +01:00
78d2ec8d77
chore: cleanup code
2024-01-22 20:01:43 +01:00
18446dc3a5
wip: add TODOs
2024-01-22 19:23:22 +01:00
4ce27aeb0f
feat: extract inpaint_ctrls attributes
...
debugging_inpaint_preprocessor, inpaint_disable_initial_latent, inpaint_engine, inpaint_strength, inpaint_respective_field, inpaint_mask_upload_checkbox, invert_mask_checkbox, inpaint_erode_or_dilate
2024-01-22 19:20:04 +01:00
eb1d3938fe
feat: extract freeu_ctrls attributes
...
freeu_enabled, freeu_b1, freeu_b2, freeu_s1, freeu_s2
2024-01-22 19:19:40 +01:00
cfb70c0278
feat: extract attribute refiner_swap_method
2024-01-22 19:10:32 +01:00
2d8ca41ce5
feat: extract attribute canny_high_threshold
2024-01-22 19:08:54 +01:00
ec486443ea
feat: extract attribute canny_low_threshold
2024-01-22 19:06:10 +01:00
9f194a91fa
feat: extract attribute skipping_cn_preprocessor
2024-01-22 18:54:25 +01:00
0bf41591a6
feat: extract attribute debugging_cn_preprocessor
2024-01-22 18:52:41 +01:00
6289e5daea
feat: extract attribute mixing_image_prompt_and_inpaint
2024-01-22 18:51:12 +01:00
cce9871cc5
feat: extract attribute mixing_image_prompt_and_vary_upscale
2024-01-22 18:49:29 +01:00
2ab5593d71
feat: extract attribute overwrite_upscale_strength
2024-01-22 18:46:47 +01:00
22af976c51
feat: extract attribute overwrite_vary_strength
2024-01-22 18:45:01 +01:00
9f4a00e868
feat: extract attribute overwrite_height
2024-01-22 18:42:54 +01:00
2eed5a28f2
feat: extract attribute overwrite_width
2024-01-22 18:41:02 +01:00
2b1f501462
feat: extract attribute overwrite_switch
2024-01-22 18:38:20 +01:00
df35033cc9
feat: extract attribute overwrite_step
2024-01-22 18:34:40 +01:00
217be190bb
feat: extract attribute generate_image_grid
2024-01-22 18:23:10 +01:00
d72573aca4
feat: extract attribute scheduler_name
2024-01-22 18:06:11 +01:00
e54bad87f1
feat: extract attribute sampler_name
2024-01-22 18:00:27 +01:00
fc3da75baf
feat: extract attribute adaptive_cfg
2024-01-22 17:31:18 +01:00
618b01764c
feat: extract attribute adm_scaler_end
2024-01-22 17:11:27 +01:00
64dcdbbef3
feat: extract attribute adm_scaler_negative
2024-01-22 17:03:50 +01:00
3607059224
feat: extract attribute adm_scaler_positive
2024-01-22 17:01:32 +01:00
79a63491fe
feat: extract attribute disable_preview
2024-01-22 16:58:46 +01:00
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
7e52a1de8f
refactor: rename image_file_extension to output_format
2024-01-19 00:06:07 +01:00
4c3a906fb7
Merge branch 'feature/add-nsfw-filter'
...
# Conflicts:
# modules/advanced_parameters.py
# requirements_versions.txt
2024-01-17 23:21:36 +01:00
348e3758b7
Merge branch 'main_upstream' into feature/add-nsfw-filter
...
# Conflicts:
# modules/advanced_parameters.py
2024-01-17 22:42:31 +01:00
f1261028b8
feat: use optimized jpg parameters when saving the image
...
quality=95
optimize=True
progressive=True
2024-01-16 01:01:51 +01:00
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
ba5d0b6eaf
refactor: rename metadata_schema to metadata_scheme
2024-01-15 23:59:57 +01:00
80ad0d070e
fix: do not generate hashes when arg --disable-metadata is used
2024-01-15 23:58:34 +01:00
cd65f21d98
fix: use stting isntead of quote wrap for A1111 created_by
2024-01-15 23:14:49 +01:00
7b9deb17ee
feat: add config metadata_created_by
2024-01-15 23:06:20 +01:00
6662381931
fix: code cleanup and resolved prompt fixes
2024-01-15 23:00:59 +01:00
1a52367f3f
feat: use resolved prompts with included expansion and styles for a1111 metadata
2024-01-15 22:17:51 +01:00
f7489cc9ef
feat: add model hash support for a1111
2024-01-15 22:11:46 +01:00
191f8148e4
feat: add support for A1111 metadata schema
...
cf2772fab0/modules/processing.py (L672)
2024-01-15 21:16:52 +01:00
493e484122
feat: add argument disable_metadata
2024-01-15 19:11:40 +01:00
8d56318bed
feat: add config and checkbox for save_metadata_to_images
2024-01-15 18:54:49 +01:00
c5a15c7321
feat: add metadata logging for images
...
inspired by https://github.com/MoonRide303/Fooocus-MRE
2024-01-15 18:31:58 +01:00
f25bf49894
Merge branch 'jpg_config_image_extension'
...
# Conflicts:
# modules/config.py
# modules/flags.py
# webui.py
2024-01-14 23:40:24 +01:00
5b633f6cf8
refactor: rename image_extension to image_file_extension
2024-01-14 23:38:36 +01:00
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
dc6c02540a
Merge branch 'feature/use-consistent-file-name-in-gradio' into jpg_config_image_extension
...
# Conflicts:
# modules/async_worker.py
# modules/private_logger.py
2024-01-14 21:47:05 +01:00
1779fa0f3a
feat: use args temp path if given
2024-01-14 21:19:01 +01:00
3c855bd331
feat: use consistent file name in gradio
...
returns and uses filepaths instead of numpy image by saving to temp dir
uses double the temp dir file storage on disk as it saves to temp dir and gradio temp dir when displaying the image, but reuses logged output image
2024-01-14 20:21:33 +01:00
26f31ff2bd
feat: add webp to image_extensions
...
supported image extemsions: see https://pillow.readthedocs.io/en/stable/handbook/image-file-formats.html
2024-01-14 14:25:52 +01:00
694763447d
fix: add missing image_extension parameter to log call
2024-01-14 14:23:36 +01:00
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
9dfa1a99e3
moved function to config module
2024-01-10 19:06:40 -08:00
e1697272ec
feature: added flag, config and ui update for image extension change #1789
2024-01-10 09:36:27 -08:00
1ff3efd56b
Merge branch 'feature/update-juggernaut-xl-to-v8'
...
# Conflicts:
# css/style.css
2024-01-10 11:02:10 +01:00
851de15f95
Merge branch 'main_upstream' into feature/update-juggernaut-xl-to-v8
2024-01-10 11:01:21 +01:00
92684132b5
clean up model download URL query parameters
2024-01-10 11:00:39 +01:00
0299d04856
Merge branch 'hotfix/rename-preview-images'
...
# Conflicts:
# css/style.css
# javascript/script.js
# modules/ui_gradio_extensions.py
2024-01-09 14:33:02 +01:00
f298ebca76
feat: adds preview overlay for styles ( #1762 )
...
* feat: adds preview overlay for styles
* fix: implement correct path resolution for all OS
solves issues for Windows
* fix: makes preview overlay also work with other languages
* feat: scale down images to 258x200, fix aspect ratio in css
reduces file size from 19,6MB to 3,4MB
* fix: adjust z-index to correctly overlay gradio border pulse when generating images
* update files
* version
---------
Co-authored-by: Manuel Schmid <9307310+mashb1t@users.noreply.github.com>
Co-authored-by: Manuel Schmid <manuel.schmid@odt.net>
Co-authored-by: lllyasviel <lyuminzhang@outlook.com>
2024-01-07 15:10:42 -08:00
21bceb6d51
Merge branch 'feature/update-juggernaut-xl-to-v8'
2024-01-07 16:18:58 +01:00
896fbc6185
feat: update JuggernautXL from v6 to v8
2024-01-07 15:47:07 +01:00
80b4c5d615
Merge branch 'hotfix/fix-file-sort'
2024-01-07 14:41:09 +01:00
74eec84a61
fix: correctly sort files, display deepest dir level first
2024-01-07 14:28:12 +01:00
Manuel Schmid
lllyasviel
Hunter-Houts
rayleichenxi
Manuel Schmid
rayronvictor
eddyizm
Chris Rohrer