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
993 Commits 15 Branches 23 Tags
62d2a3a4548b2bc10f78efec18e4bb3ea3a6a2ce
Commit Graph
75 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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 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 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
Manuel Schmid 6ccf5cf2c1 correctly preset value and interactive for disable_preview when NSFW preview is configured accordingly 2023-11-26 00:33:32 +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 29d1c3ee34 update tqdm to 4.65.0 to be able to use translators==5.8.9 
this commit is optional and can be reverted
 2023-11-25 23:39:30 +01:00
Manuel Schmid 25c3184ddc move prompt translation to async_worker 2023-11-25 23:26:29 +01:00
Manuel Schmid eeb1013638 use separate module for translator 2023-11-25 23:21:09 +01:00
Manuel Schmid 65af7d3764 add prompt translation functionality 2023-11-25 23:13:54 +01:00
Manuel Schmid 823939cd5a Merge remote-tracking branch 'upstream/main' 2023-11-25 22:20:05 +01:00
Manuel Schmid 81f1ddb6c4 deactivate global / file style sorter 2023-11-25 21:19:09 +01:00
Manuel Schmid 44c6ddb731 disable intermediate results on LCM sampler 
prevents image result clogging due to LCM being so fast
 2023-11-23 00:34:08 +01:00
Manuel Schmid 87e312e683 add advanced parameter for disable_intermediate_results 
prevents gradio frontend process from clogging image output and updates in high throughput scenarios such as LCM with image number >= 4
 2023-11-22 23:42:25 +01:00
Manuel Schmid b1f79a4b44 move nsfw filter to core module, make preview hiding more effective 2023-11-22 23:22:55 +01:00
Manuel Schmid 87fc830981 add steps info to performance selection radio buttons 2023-11-22 22:17:24 +01:00
Manuel Schmid 0e7c42f6e8 Merge remote-tracking branch 'origin/hotfix/prevent-skipping-and-stopping-by-other-users' 2023-11-21 22:32:27 +01: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 7a302f3244 add list of 100 most popular animals to wildcards 2023-11-19 22:28:03 +01:00
Manuel Schmid 4a576bf08b code cleanup, do not disable skip/stop on stop_clicked 2023-11-18 21:40:14 +01:00
Manuel Schmid 8060e50a88 fix return parameters of stop_clicked 2023-11-18 21:00:35 +01:00
Manuel Schmid ebad9ea976 introduce state for task skipping/stopping 2023-11-18 20:51:54 +01:00