Commit Graph

149 Commits

Author SHA1 Message Date
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 80ad0d070e
fix: do not generate hashes when arg --disable-metadata is used 2024-01-15 23:58:34 +01:00
Manuel Schmid cd65f21d98
fix: use stting isntead of quote wrap for A1111 created_by 2024-01-15 23:14:49 +01:00
Manuel Schmid 7b9deb17ee
feat: add config metadata_created_by 2024-01-15 23:06:20 +01:00
Manuel Schmid 6662381931
fix: code cleanup and resolved prompt fixes 2024-01-15 23:00:59 +01:00
Manuel Schmid 1a52367f3f
feat: use resolved prompts with included expansion and styles for a1111 metadata 2024-01-15 22:17:51 +01:00
Manuel Schmid f7489cc9ef
feat: add model hash support for a1111 2024-01-15 22:11:46 +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 493e484122
feat: add argument disable_metadata 2024-01-15 19:11:40 +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 c5a15c7321
feat: add metadata logging for images
inspired by https://github.com/MoonRide303/Fooocus-MRE
2024-01-15 18:31:58 +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
Manuel Schmid 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
Manuel Schmid 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
Manuel Schmid 694763447d
fix: add missing image_extension parameter to log call 2024-01-14 14:23:36 +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
Manuel Schmid 2e16b0faa4
Merge remote-tracking branch 'origin/hotfix/prevent-skipping-and-stopping-by-other-users'
# Conflicts:
#	modules/async_worker.py
2024-01-05 22:59:09 +01:00
Manuel Schmid e68c8aa0a7
Merge branch 'main_upstream' into hotfix/prevent-skipping-and-stopping-by-other-users
# Conflicts:
#	webui.py
2024-01-04 18:07:06 +01:00
Manuel Schmid ee3d70ab87
fix: replace fcbh with ldm_patched 2024-01-04 18:03:12 +01:00
Manuel Schmid 925ba509f7
Merge branch 'main_upstream'
# Conflicts:
#	modules/advanced_parameters.py
2024-01-02 18:00:26 +01:00
lllyasviel e5af760db8 mask upload 2024-01-02 08:21:50 -08:00
xhoxye b5163e057f
Fooocus mask enhance, mask upload and invert.蒙版增强功能,上传蒙版、反转手涂蒙版 (#1645)
* Update webui.py

Added a mask upload interface.添加蒙版上传界面。

* Add mask upload feature

Add mask upload feature.添加蒙版上传功能。

* Add mask upload feature

Add mask upload feature.添加蒙版上传功能。

* Try to fix the problem when drawing mates with external enrichment.

Swap the judgment criteria and try to fix the problem when drawing mates with external enrichment.
调换判断条件,尝试修复和外部扩充绘制配合时出现的问题

* 修改注释

* 修改注释

* Update readme.md

更新日志

* Add mask upload check box,

Add check box, default does not show mask upload box, check it and then show it.
添加复选框,默认不显示蒙版上传框,勾选后再显示。

* back to normal

还原

* Try adding a mask inversion feature

Try adding a mask inversion feature.
尝试添加蒙版反转功能。
增加一个复选框来决定是否将蒙版反转。

* Try adding a mask inversion feature

Try adding a mask inversion feature.
尝试添加蒙版反转功能。
增加一个复选框来决定是否将蒙版反转。

* Fixed word errors

* Fix the words of the description
2024-01-02 07:17:02 -08:00
Manuel Schmid 0ab7dd0ce0
Merge branch 'main_upstream' into hotfix/prevent-skipping-and-stopping-by-other-users 2023-12-27 18:43:59 +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 fc909a3a28
Merge branch 'main_upstream' 2023-12-23 16:40:20 +01:00
lllyasviel 7b5bced6c2
small url fix (#1551) 2023-12-22 00:20:09 -08:00
lllyasviel f7bb578a14
2.1.854
* Add a button to copy parameters to clipboard in log.
* Allow users to load parameters directly by pasting parameters to prompt.
2023-12-20 19:52:38 -08:00
Manuel Schmid a5ed897e21
Merge branch 'main_upstream' 2023-12-20 18:11:07 +01:00
Huy Nguyen 7a6b46f363
New Log System 2023-12-17 20:20:02 -08:00
Manuel Schmid f47c57a2e5
Merge branch 'feature/add-nsfw-filter'
# Conflicts:
#	modules/advanced_parameters.py
#	webui.py
2023-12-16 23:01:55 +01:00
Manuel Schmid e97008d4fb
add checkbox black_out_nsfw
makes both enabling via config and checkbox possible, where config overrides the checkbox value
2023-12-16 22:55:25 +01:00
Manuel Schmid 1f9d9999db
Merge remote-tracking branch 'upstream/main' 2023-12-14 23:01:49 +01:00
Manuel Schmid 5496ec41a8
Merge remote-tracking branch 'upstream/main' into hotfix/prevent-skipping-and-stopping-by-other-users
# Conflicts:
#	modules/async_worker.py
#	webui.py
2023-12-14 22:58:12 +01:00
lllyasviel 323af5667a
2.1.840
* Fix some potential frozen after model mismatch
* Fix crash when cfg=1 when using anime preset
* Added some guidelines for troubleshoot the "CUDA kernel errors asynchronously" problem
2023-12-14 13:55:49 -08:00
Manuel Schmid ea764855f8
Merge remote-tracking branch 'upstream/main' into feature/add-nsfw-filter
# Conflicts:
#	modules/async_worker.py
#	modules/config.py
2023-12-14 22:55:45 +01:00
Manuel Schmid 07fba58c99
Merge remote-tracking branch 'upstream/main'
# Conflicts:
#	modules/async_worker.py
#	requirements_versions.txt
#	webui.py
2023-12-14 22:49:29 +01:00
lllyasviel 5b99e3a1e4
2.1.839 2023-12-13 21:14:50 -08:00
lllyasviel e8d88d3e25 2.1.826 2023-12-12 11:38:05 -08:00
Manuel Schmid 92a54cff22
Merge branch 'feature/add-prompt-translate' 2023-11-26 11:23:38 +01:00
Manuel Schmid 8718e80dc2
move import as it checks for users ip and geolocation
Only metadata of users who specifically activated the prompt translate checkbox should be requested.
This also prevented users with adblockers on DNS level from being able to generate images, now fixed.
2023-11-26 11:23:02 +01:00
Manuel Schmid 298a807a1b Merge branch 'feature/add-prompt-translate'
# Conflicts:
#	requirements_versions.txt
#	webui.py
2023-11-26 00:14:12 +01:00
Manuel Schmid 25c3184ddc move prompt translation to async_worker 2023-11-25 23:26:29 +01:00
Manuel Schmid a5f3e4af9b
Merge branch 'hotfix/prevent-skipping-and-stopping-by-other-users'
# Conflicts:
#	modules/config.py
2023-11-20 22:01:40 +01:00
Manuel Schmid 8acb2d7537
Merge branch 'main_upstream' into hotfix/prevent-skipping-and-stopping-by-other-users
# Conflicts:
#	webui.py
2023-11-20 22:00:08 +01:00
lllyasviel dececbd060
[2.1.822] New Inpaint System
See related documents for more details.
2023-11-19 17:37:22 -08:00
Manuel Schmid d7f9fe9732 Merge branch 'hotfix/prevent-skipping-and-stopping-by-other-users' 2023-11-19 23:30:29 +01:00
Manuel Schmid d2cc9a4fc8 reset last_stop when skipping for further processing 2023-11-19 23:30:18 +01:00