Commit Graph

490 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 1779fa0f3a
feat: use args temp path if given 2024-01-14 21:19:01 +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 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
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
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 851de15f95
Merge branch 'main_upstream' into feature/update-juggernaut-xl-to-v8 2024-01-10 11:01:21 +01:00
Manuel Schmid 92684132b5
clean up model download URL query parameters 2024-01-10 11:00:39 +01:00
Manuel Schmid 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
Chris Rohrer 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
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 80b4c5d615
Merge branch 'hotfix/fix-file-sort' 2024-01-07 14:41:09 +01:00
Manuel Schmid 74eec84a61
fix: correctly sort files, display deepest dir level first 2024-01-07 14:28:12 +01: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 7a01c8a5b2
Merge branch 'crohrer_main' 2024-01-05 20:18:19 +01:00
Manuel Schmid 6d6b4dbd85
fix: implement correct path resolution for all OS
solves issues for Windows
2024-01-05 20:06:43 +01:00
Manuel Schmid acffc6427c
Merge branch 'crohrer_main' 2024-01-05 17:07:02 +01:00
Chris Rohrer a196a648ff feat: adds preview overlay for styles 2024-01-05 16:56:05 +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 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
lllyasviel 8e62a72a63
(requested) support AMD 8GB GPUs via Windows DirectML
this update is requested by users
2023-12-30 06:30:59 -08:00
Manuel Schmid c7a5638f54
Merge remote-tracking branch 'upstream/main'
# Conflicts:
#	webui.py
2023-12-30 14:40:49 +01:00
lllyasviel 2f6ebbf876 some fix for previous PRs 2023-12-28 08:07:43 -08:00
御坂IO ad158450e3
fix to_clipboard from non-localhost access (#1576)
tested on edge(windows&android)
2023-12-28 07:54:59 -08: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 0ab7dd0ce0
Merge branch 'main_upstream' into hotfix/prevent-skipping-and-stopping-by-other-users 2023-12-27 18:43:59 +01:00