Commit Graph

226 Commits

Author SHA1 Message Date
Manuel Schmid c7a5638f54
Merge remote-tracking branch 'upstream/main'
# Conflicts:
#	webui.py
2023-12-30 14:40:49 +01:00
lllyasviel eb0b4d51ef
fix #1608 (#1635) 2023-12-28 08:22:50 -08:00
lllyasviel 2f6ebbf876 some fix for previous PRs 2023-12-28 08:07:43 -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 986ab451cf
add workaround for changing prompt while generating (#1578) 2023-12-28 07:46:19 -08: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 48a3ebd8dd
Merge branch 'hotfix/make-generate-button-non-interactive-while-generating'
# Conflicts:
#	webui.py
2023-12-24 16:51:41 +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 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 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 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
lllyasviel 81107298a8
minor fix (#1532) 2023-12-20 19:58:53 -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 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 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 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
lllyasviel c175afb394 fix default 2023-12-12 20:43:14 -08:00
lllyasviel ee06e87a58 reduce artifacts by also setting styles 2023-12-12 20:40:29 -08:00
lllyasviel 2e3e90e282 doc link 2023-12-12 19:35:50 -08:00
lllyasviel f8e651a483 [2.1.831] Fooocus Describe 2023-12-12 19:34:18 -08:00
lllyasviel 8f52b6d5f3
Revert "analytics via argument (#1315)" (#1359)
This reverts commit 7b72d894c5.
2023-12-12 13:27:42 -08:00
Manuel Schmid 7b72d894c5
analytics via argument (#1315) 2023-12-12 13:26:01 -08:00
lllyasviel 48ca305332 fix args 2023-12-12 11:46:49 -08:00
lllyasviel de9950187f fix speed ui 2023-12-12 11:38:22 -08:00
lllyasviel e8d88d3e25 2.1.826 2023-12-12 11:38:05 -08: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 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 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 99f7b6e6d4
Merge branch 'feature/add-advanced-parameter-disable-intermediate-images' 2023-11-22 23:44:18 +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 a5f3e4af9b
Merge branch 'hotfix/prevent-skipping-and-stopping-by-other-users'
# Conflicts:
#	modules/config.py
2023-11-20 22:01:40 +01:00