Foreign-Mirrors/Fooocus
1
0
Fork 0
mirror of https://github.com/lllyasviel/Fooocus.git synced 2026-08-16 13:13:16 +02:00
Code Issues Packages Projects Releases Wiki Activity
1,115 Commits 15 Branches 23 Tags
c4c3315cd6fe6058d5d56aa125a2f8640f0d54f5
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Manuel Schmid c4c3315cd6 feat: update Colab template parameters 2024-01-24 02:24:00 +01:00
Manuel Schmid 4912599f6e feat: update history link date after each generation 
prevents outdated date in link after midnight
 2024-01-19 01:00:28 +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 4c3a906fb7 Merge branch 'feature/add-nsfw-filter' 
# Conflicts:
#	modules/advanced_parameters.py
#	requirements_versions.txt
 2024-01-17 23:21:36 +01:00
Manuel Schmid 348e3758b7 Merge branch 'main_upstream' into feature/add-nsfw-filter 
# Conflicts:
#	modules/advanced_parameters.py
 2024-01-17 22:42:31 +01:00
Manuel Schmid a4bc5c7d63 fix: add missing diffusers package 2024-01-17 22:40:52 +01:00
Manuel Schmid f1261028b8 feat: use optimized jpg parameters when saving the image 
quality=95
optimize=True
progressive=True
 2024-01-16 01:01:51 +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 a2153dba7d fix: correctlyy hide/show metadata schema on app start 2024-01-15 23:20:43 +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 
https://github.com/AUTOMATIC1111/stable-diffusion-webui/blob/cf2772fab0af5573da775e7437e6acdca424f26e/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 3e9d66c5f6 Merge branch 'feature/automatically-describe-uov-image' 
# Conflicts:
#	webui.py
 2024-01-15 13:37:15 +01:00
Manuel Schmid 5c1d2e8172 feat: automatically describe image on uov image upload if prompt is empty 2024-01-15 13:25:51 +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 2b802da365 feat: always show image_extension element 
this is now possible due to image extension support in gradio via https://github.com/lllyasviel/Fooocus/pull/1932
 2024-01-14 21:59:24 +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 eeb57f3ff5 chore: code cleanup, remove redundant if statement 2024-01-14 21:20:13 +01:00
Manuel Schmid 1779fa0f3a feat: use args temp path if given 2024-01-14 21:19:01 +01:00
Manuel Schmid 161b988522 feat: delete temp images after yielding to gradio 2024-01-14 21:16:16 +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 d79c1d5a27 refactor: change label 2024-01-14 14:25:01 +01:00
Manuel Schmid 694763447d fix: add missing image_extension parameter to log call 2024-01-14 14:23:36 +01:00
Manuel Schmid 79b7eef5ee fix: remove uppercase image names 2024-01-12 22:36:48 +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 b5bb4eb8b1 Merge branch 'feature/add-preset-selection' 
# Conflicts:
#	webui.py
 2024-01-05 21:54:46 +01:00
Manuel Schmid 4900837786 feat: add argument --disable-preset-selection 
useful for cloud provisioning to prevent model switches and keep models loaded
 2024-01-05 21:53:06 +01:00
Manuel Schmid 7a01c8a5b2 Merge branch 'crohrer_main' 2024-01-05 20:18:19 +01:00
Manuel Schmid f1e1257249 fix: implement correct path resolution for all OS 
solves issues for Windows
 2024-01-05 19:59:51 +01:00
Manuel Schmid 62d2a3a454 Merge branch 'feature/add-preset-selection' 
# Conflicts:
#	webui.py
 2024-01-02 22:40:23 +01:00
Manuel Schmid e86b7f56bc Merge branch 'main_upstream' into feature/add-preset-selection 2024-01-02 22:24:25 +01:00
Manuel Schmid 2fa3cf6c3f DRY output parameter handling 2024-01-02 22:23:11 +01:00
Manuel Schmid 0099dd4783 Merge branch 'feature/add-preset-selection' 
# Conflicts:
#	webui.py
 2024-01-01 18:50:43 +01:00
Manuel Schmid 55bb233a3e use state_is_generating for preset selection change 2024-01-01 18:49:01 +01:00
Manuel Schmid 9d8881d052 Merge branch 'main_upstream' into feature/add-preset-selection 2024-01-01 18:41:54 +01:00
Manuel Schmid f52a356cfb Merge branch 'main_upstream' 2023-12-31 15:50:58 +01:00
Manuel Schmid b78d2c864e update readme after PR merges 2023-12-31 00:27:25 +01:00
Manuel Schmid 13bb314cfa Revert "skip free_memory for interrogate" 
This reverts commit 316fe24f65.
Rather add interrogate action to queue than keeping 400MB BLIP loaded in VRAM.
 2023-12-31 00:26:59 +01:00
Manuel Schmid 64c1a3dcce Merge branch 'feature/template-improvements' 2023-12-31 00:23:43 +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 5fb17d1e2c Merge branch 'main_upstream' 2023-12-30 14:43:57 +01:00
Manuel Schmid c7a5638f54 Merge remote-tracking branch 'upstream/main' 
# Conflicts:
#	webui.py
 2023-12-30 14:40:49 +01:00
Manuel Schmid c442a08099 use already existing label "enhancement" instead of "feature" 2023-12-28 19:05:11 +01: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 8a2141c9fc Merge branch 'main_upstream' into feature/add-nsfw-filter 2023-12-27 18:41:56 +01:00
Manuel Schmid f6c00bd9a7 Merge branch 'feature/make-max-image-number-configurable' 2023-12-27 17:32:03 +01:00
Manuel Schmid 5b3b727298 add default_max_image_number to config, use as maximum in default_image_number 2023-12-27 17:21:33 +01:00
Manuel Schmid 82f82e7941 remove restriction for maximum default_max_image_number value 2023-12-27 17:16:20 +01:00
Manuel Schmid 97803bbe9c add list of included features / bugfixes to readme 2023-12-27 17:08:19 +01:00
Manuel Schmid 3503358dfd Merge branch 'hotfix/skip-free-memory-for-interrogate' 2023-12-26 22:47:06 +01:00
Manuel Schmid 316fe24f65 skip free_memory for interrogate 2023-12-26 22:34:57 +01:00
Manuel Schmid f76f91c1e3 set default_overwrite_step to -1 for all other presets than turbo 2023-12-25 01:09:55 +01:00
Manuel Schmid 91be48c596 code cleanup 2023-12-25 00:07:14 +01:00
Manuel Schmid afbafabac0 Merge branch 'feature/add-prompt-translate' 2023-12-24 23:41:01 +01:00
Manuel Schmid 8e605504d7 add translation for translate prompts info text 2023-12-24 23:40:54 +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 e1f05c64e1 Merge branch 'feature/add-sdxl-turbo-preset' 2023-12-24 16:51:49 +01:00
Manuel Schmid 48a3ebd8dd Merge branch 'hotfix/make-generate-button-non-interactive-while-generating' 
# Conflicts:
#	webui.py
 2023-12-24 16:51:41 +01:00
Manuel Schmid b1b445c132 add preset for SDXL Turbo using DreamShaperXL_Turbo 
includes default_override_step = 6
 2023-12-24 16:23:33 +01:00
Manuel Schmid 9d4b2ed713 add workaround for changing prompt while generating 2023-12-24 15:41:34 +01:00
Manuel Schmid 08c4976944 change tab labels to plural 2023-12-24 15:01:40 +01:00
Manuel Schmid 1e0f95c6cf Merge branch 'feature/add-preset-selection' 2023-12-24 13:13:49 +01:00
Manuel Schmid d79a849857 set default refiner to "None" in preset realistic 2023-12-24 13:09:49 +01:00
Manuel Schmid e72850de70 download missing models from preset 2023-12-24 13:09:20 +01:00
Manuel Schmid 2e23e2b7b1 code cleanup 2023-12-24 11:53:06 +01:00
Manuel Schmid 7ddd20e7f0 sort styles after preset change 2023-12-24 11:28:10 +01:00
Manuel Schmid f1bee4b103 add special handling for default_styles and default_aspect_ratio 2023-12-24 11:25:07 +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
Manuel Schmid fc909a3a28 Merge branch 'main_upstream' 2023-12-23 16:40:20 +01:00
Manuel Schmid a1f5af774f Merge branch 'feature/add-advanced-parameter-disable-intermediate-images' 
# Conflicts:
#	webui.py
 2023-12-16 23:38:13 +01:00
Manuel Schmid 459351fb87 update disable_intermediate_results correctly 
based on default and selected performance
 2023-12-16 23:23:15 +01: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 cc9f3d6c71 Merge branch 'feature/add-nsfw-filter' 
# Conflicts:
#	modules/async_worker.py
#	modules/censor.py
#	modules/config.py
 2023-12-16 19:39:19 +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
Manuel Schmid 3a067bf7d1 Merge remote-tracking branch 'upstream/main' into feature/add-advanced-parameter-disable-intermediate-images 2023-12-14 22:56:18 +01: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 5cbf7f94e3 Merge remote-tracking branch 'upstream/main' into feature/add-prompt-translate 
# Conflicts:
#	requirements_versions.txt
 2023-12-14 22:54:02 +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
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 6e0fe7b008 make disable_intermediate_results not interactive when selecting Extreme Performance 
correctly reflects current behaviour to not clog gradio
 2023-11-26 01:15:08 +01:00