Commit Graph

301 Commits

Author SHA1 Message Date
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 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
Manuel Schmid 9b680c51a8
Merge branch 'hotfix/prevent-skipping-and-stopping-by-other-users'
# Conflicts:
#	webui.py
2023-11-19 22:57:58 +01:00
Manuel Schmid ebad9ea976
introduce state for task skipping/stopping 2023-11-18 20:51:54 +01:00
Manuel Schmid 617255d040
use AsyncTask for last_stop handling instead of shared 2023-11-18 17:20:41 +01:00
Manuel Schmid 2e1e82941d
rebase changes of main for easier handling 2023-11-18 12:58:05 +01:00
Manuel Schmid 3dc69a5293
fix progressbar call for nsfw output 2023-11-18 12:17:06 +01:00
Manuel Schmid 6893c8dd48
Merge commit '8f9f020e8f90efb3787f0feb0e544539110e40ce' into feature/add-nsfw-filter
# Conflicts:
#	modules/async_worker.py
2023-11-18 12:03:09 +01:00
lllyasviel 675805960a
2.1.821
* New UI for LoRAs.
* Improved preset system: normalized preset keys and file names.
* Improved session system: now multiple users can use one Fooocus at the same time without seeing others' results.
* Improved some computation related to model precision.
* Improved config loading system with user-friendly prints.
2023-11-17 11:25:39 -08:00
Manuel Schmid 52ae346c9d
add nsfw image censoring
activatable via config, uses CompVis/stable-diffusion-safety-checker
2023-11-15 22:00:45 +01:00
lllyasviel a662567f6c fix #936 2023-11-15 02:25:49 -08:00
lllyasviel cec0c2a8df
2.1.808
* Aspect ratios now show aspect ratios.
* Added style search.
* Added style sorting/ordering/favorites.
2023-11-14 14:06:12 -08:00
lllyasviel 6c812b68db add preprocessor skip 2023-11-13 14:35:23 -08:00
lllyasviel ac8002d2a4 speed up lcm again 2023-11-12 09:12:09 -08:00
lllyasviel 649f45a6df 'Extreme Speed' performance mode 2023-11-12 07:55:44 -08:00
lllyasviel 54f4b265e0 lcm scheduler 2023-11-12 06:44:44 -08:00
lllyasviel e6aeefd2b4 only load libs when necessary 2023-11-12 02:16:11 -08:00
lllyasviel e7fe1d443a only load libs when necessary 2023-11-12 02:10:48 -08:00
lllyasviel 2bef62c545
2.1.790
2.1.790
2023-11-11 22:13:13 -08:00
lllyasviel 4fe08161a5 2.1.782
2.1.782
2023-11-11 01:43:01 -08:00
lllyasviel a9bb1079cf disable refiner when same as base 2023-11-08 23:39:57 -08:00
lllyasviel 2165114876 disable image grid
disable image grid by default because many users reports performance issues. like #829 and so on.
2023-11-05 19:09:20 -08:00
lllyasviel 34bcfa79c0
improve gpt2
improve gpt2
2023-10-30 16:40:50 -07:00
lllyasviel 759bfadefa fix async load order + image wall 2023-10-28 23:03:35 -07:00
lllyasviel f07f7693d3 fix refiner 2023-10-26 19:42:50 -07:00
lllyasviel 4607316c2f get each image during generating
get each image during generating
2023-10-26 17:17:05 -07:00
lllyasviel 9982d34b6c safer deep copy 2023-10-26 10:29:30 -07:00
lllyasviel 823fa924d3 disable expansion when empty since it is not meaningful and influences image prompt
disable expansion when empty since it is not meaningful and influences image prompt
2023-10-26 08:59:49 -07:00
lllyasviel 175f3e3040 update backend + revise styles
update backend + revise styles
2023-10-26 08:24:45 -07:00
lllyasviel 214c2ba04c fix resize 2023-10-25 21:02:55 -07:00
lllyasviel 38e70cebcc Update Backend
Update Backend
2023-10-25 09:40:13 -07:00
MoonRide303 523aa190db Refactored handling max random seed 2023-10-24 12:15:43 +02:00
lllyasviel 60cb91c406 allow ar config 2023-10-23 19:42:23 -07:00
MoonRide303 81650a4305 Increased allowed random seed range 2023-10-23 12:27:12 +02:00
lllyasviel d4a9b116e4 fix log for multiple-line prompts 2023-10-20 05:15:49 -07:00
lllyasviel ff8d649cac bfs for wildcard 2023-10-20 05:05:29 -07:00
lllyasviel 04066124c2 fix many resolution problems 2023-10-20 02:41:04 -07:00
MoonRide303 37da4ac13a Cleaned up Private Log (most users won't need information about raw prompts) 2023-10-20 11:07:23 +02:00
MoonRide303 48d2fb85f9 Added more information about prompts in Private Log, made wildcards in negative prompt use different seed 2023-10-20 10:08:14 +02:00
lllyasviel 906dfa1331 ling
ling
2023-10-18 23:54:40 -07:00
lllyasviel 9660daff94
fix many inpaint bugs (#731)
fix many inpaint bugs
2023-10-18 06:22:08 -07:00
lllyasviel 32ff981075 fix 2023-10-16 23:50:23 -07:00
MoonRide303 eb72b16da0 Added support for wildcards 2023-10-17 07:54:04 +02:00
lvmin b3d662054f using global sigmas for better results 2023-10-14 06:06:34 -07:00
lvmin 10e2db67d6 log 2023-10-13 04:53:02 -07:00
lllyasviel e61aac34ca
sync (#658) 2023-10-12 04:23:10 -07:00
lllyasviel 132afcc2a2
rework refiner
rework refiner
2023-10-11 23:44:40 -07:00
lllyasviel bbdf4bd120
rework refiner for some potential new features (#642)
* sync

* sync

* sync

* sync

* sync

* sync

* sync

* sync

* sync

* sync

* sync

* sync

* sync

* sync

* sync

* sync

* sync

* sync

* sync

* sync

* sync

* sync

* sync

* sync
2023-10-11 03:07:43 -07:00
lllyasviel ec3d211ab5
hq fix (#633) 2023-10-10 16:10:08 -07:00
lllyasviel 07a564b779
inpaint log (#632) 2023-10-10 15:28:29 -07:00
lllyasviel c275434c59
add skip button (#616) 2023-10-09 20:02:03 -07:00
lllyasviel 0723c2fa52
add new Fooocus Inpaint Model V2 (#614) 2023-10-09 18:42:10 -07:00
lllyasviel 05d92ca50b
add more developer debug tools (#603)
* add more developer debug tools

* add more developer debug tools
2023-10-09 12:09:51 -07:00
lvmin 8f370762cd fix log 2023-10-08 16:01:35 -07:00
lllyasviel 9506714985
Update async_worker.py (#561) 2023-10-08 00:35:19 -07:00
lllyasviel f170e1c08e
some fix (#560)
* download upscaler only when user use it

* use better method
2023-10-08 00:28:03 -07:00
lllyasviel 6faaac333b
i (#559) 2023-10-07 22:54:04 -07:00
lllyasviel 6189e482bd
improve human eyes again by using crop adm rather than interpolate adm (#544)
and add an debug slider
2023-10-04 21:42:43 -07:00
lllyasviel aebfc56641
fix (#543)
* fix

* fix

* fix
2023-10-04 15:43:41 -07:00
lllyasviel 8bfc90202d
making debug easier (#542)
* making debug easier

* making debug easier
2023-10-04 15:15:41 -07:00
lllyasviel ba58dbc8bc
speed up again (#527) 2023-10-03 17:14:38 -07:00
lllyasviel 6c56b580d7
dev tool (#526) 2023-10-03 16:08:06 -07:00
lllyasviel bbae307ef2
2.0.80 (#520)
* Rework many patches and some UI details.
* Speed up processing.
* Move Colab to independent branch.
* Implemented CFG Scale and TSNR correction when CFG is bigger than 10.
* Implemented Developer Mode with more options to debug.
2023-10-03 10:36:42 -07:00
MoonRide303 726f684ff2 Added information about diffusion and total execution time (#463) 2023-09-21 10:54:09 +02:00
lllyasviel cdf642437c
bfloat16 vae (#456)
* bfloat16 vae

* bfloat16 vae

* bfloat16 vae
2023-09-20 08:16:20 -07:00
lllyasviel 65b9364170
fix gradio again again again (#453) 2023-09-20 04:12:19 -07:00
lllyasviel 098d08cd22
fix gradio (#444) 2023-09-19 18:30:57 -07:00
lllyasviel b6752c74e3
minor fix (#443)
* minor fix

* minor fix
2023-09-19 18:04:36 -07:00
lllyasviel 0927445492
use fooocus inpaint control model (#429)
use fooocus inpaint control model (#429)
2023-09-19 04:52:22 -07:00
lllyasviel b61642ecba
[Fooocus 2.0.60] Fooocus Inpaint or Outpaint (Midjourney Left/Right/Top/Bottom) (#402)
[Fooocus 2.0.60] Fooocus Inpaint or Outpaint (Midjourney Left/Right/Top/Bottom) (#402)
2023-09-18 01:16:07 -07:00
lllyasviel ceee6dfd73
improve resolution handling (#396)
* improve resolution handling

* improve resolution handling

* improve resolution handling

* improve resolution handling
2023-09-16 13:21:35 -07:00
lllyasviel 6adc771888
fix fast upscale log (#395) 2023-09-16 04:49:02 -07:00
lllyasviel 8ef31d33af
[Fooocus 2.0.50] Variation/Upscale (Midjourney Toolbar) (#389) 2023-09-16 03:29:41 -07:00
lllyasviel cf7cde08b1
try fix colab with virtual ram (#378)
try fix colab with virtual ram (#378)
2023-09-15 01:24:07 -07:00
lllyasviel 2e543fb93f
try improve colab (#366)
* try improve colab

* try improve colab

* try improve colab

* try improve colab

* try improve colab

* try improve colab
2023-09-13 13:30:12 -07:00
lllyasviel e0f97b6fef
just no grad everything to prevent mistakes (#359)
* just no grad everything to prevent mistakes

* just no grad everything to prevent mistakes
2023-09-13 03:07:47 -07:00
lllyasviel 47876aaf99
[Major Update] Fooocus 2.0.0 (#346)
[Major Update] Fooocus 2.0.0 (#346)
2023-09-11 23:10:45 -07:00
lvmin 25fed6a4fe weight 2023-09-11 03:21:43 -07:00
lvmin 0f658a97f7 prompt expansion v2 2023-09-11 02:48:36 -07:00
lvmin 9337ad5f5e Temporarily disable some options 2023-09-11 02:13:48 -07:00
lvmin d50714b261 suffix mode 2023-09-10 17:48:03 -07:00
lvmin c4125c3b6b tune style and prompt balance 2023-09-10 12:45:54 -07:00
lvmin 75b8718ed4 speed up 2023-09-10 00:35:25 -07:00
lvmin 97079667df fix typo 2023-09-09 19:08:28 -07:00
lllyasviel 496766edd7
Fooocus Prompt Expansion (#329)
* add vae approx download

* files

* files

* files

* i

* i

* i

* i

* i

* i

* i

* i

* i

* i
2023-09-09 17:22:32 -07:00
lvmin fe16e8f050 change to 1.0.36 behavior again 2023-08-20 22:51:42 -07:00
lvmin 93df594b72 1.0.39 2023-08-19 21:05:20 -07:00
lvmin dd3c62012e revert to 1.0.36 2023-08-19 20:11:22 -07:00
lllyasviel 0c5e78961e
Tune refiner steps according to UniPC’s formulation (#218) 2023-08-19 19:34:17 -07:00
lvmin db1a49f789 random seed restoring 2023-08-17 15:17:32 -07:00
lllyasviel 3267d56698
i (#163) 2023-08-16 13:39:29 -07:00
lllyasviel 74f8c67377
i (#162) 2023-08-16 13:29:37 -07:00
lllyasviel 0b68b367d8
i (#159) 2023-08-16 13:18:46 -07:00
lllyasviel 55342fcd58
1.0.32 (#158)
Fooocus private log
2023-08-16 13:04:32 -07:00
lllyasviel 5e5a2d428f
i (#114) 2023-08-15 09:01:25 -07:00
lllyasviel 96d15b4933
SAG implemented (#88)
sag
2023-08-14 18:20:20 -07:00
lllyasviel 7900480360
1.0.25 (#67)
support sys.argv --listen --share --port
2023-08-14 06:56:23 -07:00
lllyasviel 2d71dca12c
i (#42) 2023-08-13 07:10:26 -07:00
lllyasviel 8543bb5804
1.0.20 (#37)
Support linux.
2023-08-12 23:43:10 -07:00
lllyasviel 59aa2aedeb
i (#36) 2023-08-12 23:28:44 -07:00
lllyasviel 8720e435f5
1.0.20 (#35)
Re-write UI to use async codes: (1) for faster start, and (2) for better live preview.
Removed opencv dependency
Plan to support Linux soon
2023-08-12 23:14:54 -07:00