Commit Graph
21 Commits
Author SHA1 Message Date
Manuel Schmid 0f78f8d8cc feat: make code compatible again after merge with main 2024-05-17 23:56:55 +02:00
Manuel Schmid f338d5fc16 feat: extract safety checker, remove dependency to diffusers 2024-05-17 23:56:02 +02:00
Manuel Schmid 270ce71dbe Merge branch 'main_upstream' into feature/add-nsfw-filter
# Conflicts:
#	modules/advanced_parameters.py
#	modules/async_worker.py
#	modules/config.py
#	webui.py
2024-05-17 23:10:12 +02:00
Manuel Schmid 978267f461 fix: correctly set preset config and loras in meta parser 2024-03-20 21:16:03 +01:00
Manuel Schmid 856eb750ab fix: add enabled value to LoRA when setting default_max_lora_number 2024-03-19 23:08:38 +01:00
Manuel Schmid 5bf96018fe Merge branch 'main_upstream' into develop 2024-03-17 14:13:37 +01:00
Manuel Schmid 86cba3f223 feat: add translation for unsupported image error (#2537) 2024-03-15 23:11:26 +01:00
Manuel Schmid 8baafcd79c Merge branch 'main_upstream' into develop 2024-03-15 20:52:06 +01:00
Manuel Schmid 4363dbc303 fix: revert testing change to default lora activation 2024-03-13 00:32:54 +01:00
Manuel Schmid f7f0b51bab Merge branch 'main_upstream' into develop 2024-03-13 00:31:41 +01:00
Manuel Schmid 57a01865b9 refactor: only use LoRA activate on handover to async worker, extract method 2024-03-11 23:49:45 +01:00
Manuel Schmid ee96b854d9 docs: update version and changelog 2024-03-04 11:33:49 +01:00
Manuel Schmid 4f4d23f4e3 fix: use filename instead of download function call for lcm lora
do not require lcm lora to be downloaded for metadata parsing
2024-02-26 21:14:44 +01:00
Manuel Schmid 9c30961efd fix: add missing return statement in model_refresh_clicked 2024-02-26 21:12:27 +01:00
Manuel Schmid f8ca04a406 feat: add early return for prompt expansion when no new tokens should be added
closes https://github.com/lllyasviel/Fooocus/issues/2278, also removes comma at the end added before tokenizer
2024-02-19 15:22:10 +01:00
Manuel Schmid c4813810e3 Merge remote-tracking branch 'upstream/main' into feature/add-nsfw-filter 2024-02-04 13:34:48 +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 8a2141c9fc Merge branch 'main_upstream' into feature/add-nsfw-filter 2023-12-27 18:41:56 +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 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