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,522 Commits 15 Branches 23 Tags
9f21fcf68e5c847f4a73dd1500205084f6ecdca4
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Manuel Schmid 9f21fcf68e Merge branch 'container-updates' 
# Conflicts:
#	.github/workflows/build_container.yml
 2024-05-23 00:18:04 +02:00
Manuel Schmid 1ab1b52cae refactor: remove irrelevant version in docker-compose.yml 2024-05-22 23:54:08 +02:00
Manuel Schmid 1b1c3aabc1 fix: correctly clone checked out version in builds, not always main 2024-05-22 23:52:18 +02:00
Manuel Schmid 260193e36f feat: update cuda to 12.4.1 2024-05-22 23:51:19 +02:00
Manuel Schmid 7f6dfe25a5 feat: sync pytorch for docker with version used in prepare_environment 2024-05-22 23:50:27 +02:00
Manuel Schmid f8483099dd wip: test https://github.com/lllyasviel/Fooocus/pull/2805 2024-05-22 20:52:44 +02:00
Manuel Schmid ebae829f43 Merge branch 'read-image-size' 
# Conflicts:
#	modules/util.py
#	webui.py
 2024-05-22 20:44:22 +02:00
Manuel Schmid 751e867b37 refactor: extract sdxl aspect ratios to flags, use in describe 
as discussed in
https://github.com/lllyasviel/Fooocus/pull/2971#discussion_r1608493765
https://github.com/lllyasviel/Fooocus/pull/2971#issuecomment-2123620595
 2024-05-22 20:38:03 +02:00
Manuel Schmid 311c445090 feat: use available aspect ratios from config, move function to util, change default visibility of label 2024-05-21 22:31:27 +02:00
Manuel Schmid de1c77a923 Merge branch 'feature/inline-lora-optimisations-2' 
# Conflicts:
#	modules/util.py
#	tests/test_utils.py
 2024-05-20 19:19:33 +02:00
Manuel Schmid 045d03ddad feat: only use valid inline loras, add subfolder support 2024-05-20 19:08:35 +02:00
Manuel Schmid 44b46bffba Merge branch 'feature/inline-lora-optimisations' 2024-05-20 17:31:30 +02:00
Manuel Schmid 7153062a27 feat: ignore custom wildcards 2024-05-20 17:29:18 +02:00
Manuel Schmid 8820f82b41 fix: update unit tests 2024-05-20 17:29:11 +02:00
Manuel Schmid 0d1310d9e9 feat: allow multiple matches for each token, optimize and extract method cleanup_prompt 2024-05-20 17:28:55 +02:00
Manuel Schmid faa985c71c fix: resolve circular dependency for unit tests 2024-05-20 17:27:16 +02:00
Manuel Schmid f030490144 feat: add performance loras to the end of the loras array 2024-05-20 17:26:17 +02:00
Manuel Schmid 61710b4ecb Merge remote-tracking branch 'origin/hotfix/lora-a1111-civitai-hashing' 
# Conflicts:
#	modules/config.py
#	modules/meta_parser.py
#	modules/util.py
 2024-05-19 21:08:25 +02:00
Manuel Schmid 999e5b2bc6 Merge branch 'feature/add-nsfw-filter' 
# Conflicts:
#	extras/censor.py
#	modules/async_worker.py
#	modules/config.py
#	requirements_versions.txt
#	webui.py
 2024-05-19 21:00:44 +02:00
Manuel Schmid b1033f1efd Merge branch 'lora-reference-parsing' 
# Conflicts:
#	modules/async_worker.py
 2024-05-19 20:57:57 +02:00
Manuel Schmid b574ad9392 Merge branch 'feature/add-nsfw-filter' 
# Conflicts:
#	extras/censor.py
#	modules/async_worker.py
#	modules/config.py
#	requirements_versions.txt
#	webui.py
 2024-05-19 20:55:39 +02:00
Manuel Schmid dd5a14ac7f Merge branch 'feature/progress-bar' 
# Conflicts:
#	fooocus_version.py
#	modules/async_worker.py
#	webui.py
 2024-05-19 20:54:53 +02:00
Manuel Schmid 5d8eb5235a refactor: align progress to actions 2024-05-19 20:33:21 +02:00
Manuel Schmid 888de56290 feat: use fixed width for status text, remove ordinals 2024-05-19 20:13:29 +02:00
Manuel Schmid d2255a940c feat: align progress bar vertically 2024-05-19 20:12:28 +02:00
Manuel Schmid e94b97604f release: bump version number to 2.4.0-rc2 2024-05-19 18:37:18 +02:00
Manuel Schmid 0466ff944c release: bump version number to 2.4.0-rc1 2024-05-19 14:29:10 +02:00
Manuel Schmid a8a82647a9 feat: remove hyper-sd8 performance 
still waiting for the release of hyper-sd 4step CFG LoRA, not yet satisfied with any of the CFG LoRAs compared to non-cfg ones.
see https://huggingface.co/ByteDance/Hyper-SD
 2024-05-19 12:26:59 +02:00
Manuel Schmid 80cad7787f refactor: code cleanup, move makedirs_with_log back to util 2024-05-18 17:18:23 +02:00
Manuel Schmid f4fc21d05d docs: add instructions for running unittests on embedded python, code cleanup 2024-05-18 16:55:39 +02:00
Manuel Schmid 4e610411fb refactor: code cleanup, unify usage of tuples in lora list 2024-05-18 16:46:26 +02:00
Manuel Schmid a78b3841c9 refactor: move apply_wildcards to module util 2024-05-18 16:43:24 +02:00
Manuel Schmid 49795fe030 refactor: rename folder safety_checker_models to safety_checker 2024-05-18 15:37:58 +02:00
Manuel Schmid 7568b72d9b feat: move censor to extras, optimize safety checker file handling 2024-05-18 01:59:15 +02:00
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 84a71d1ae4 Merge branch 'feature/update-anime-preset' 2024-05-17 18:46:37 +02:00
Manuel Schmid c908b0083b Merge branch 'main_upstream' into feature/update-anime-preset 
# Conflicts:
#	presets/anime.json
 2024-05-17 18:35:42 +02:00
Manuel Schmid 44ac5db94f Merge branch 'develop_upstream' 2024-05-17 18:27:42 +02:00
Manuel Schmid 6c49df5e04 Merge branch 'feature/automatically-describe-uov-image' 2024-05-17 18:26:32 +02:00
Manuel Schmid 1eb58fa366 Merge branch 'main_upstream' into develop_upstream 2024-05-17 18:22:55 +02:00
Manuel Schmid 24721a8511 feat: rename argument, disable by default 
this prevents computers with low hardware specifications from being unnecessary blocked
 2024-05-17 18:19:48 +02:00
Manuel Schmid cb34100295 feat: add argument to disable automatic uov image description 2024-05-17 17:42:15 +02:00
Manuel Schmid 72f59c9554 Merge branch 'main_upstream' into feature/automatically-describe-uov-image 2024-05-17 17:33:19 +02:00
Manuel Schmid 77acf8126a wip: add tcd sampler 
adapted code from https://github.com/comfyanonymous/ComfyUI/pull/3370
TODO: check if virtual scheduler tcd is needed for using sampling_base ModelSamplingDiscreteDistilled or if it's better to use sgm_uniform directly without patching
 2024-05-12 19:42:28 +02:00
Manuel Schmid c507556bfd feat: add AlignYourStepsScheduler 
https://github.com/comfyanonymous/ComfyUI/blob/794a357f7a4bd40c6e2dafab9d93142be9933a56/comfy_extras/nodes_align_your_steps.py
https://research.nvidia.com/labs/toronto-ai/AlignYourSteps/howto.html
 2024-05-12 17:06:13 +02:00
Manuel Schmid 0c9fe7f99e Merge remote-tracking branch 'upstream/develop' 2024-05-09 22:27:36 +02:00
Manuel Schmid 4dd5cae53e release: bump version to 2.3.2 2024-05-09 19:25:21 +02:00
Manuel Schmid 1ecc07ff47 Merge commit '1a9faf4d1bed0af009b5b56810ce85b40ca72097' 2024-05-09 19:21:08 +02:00
Manuel Schmid 8b75efd318 Merge remote-tracking branch 'upstream/develop' 
# Conflicts:
#	modules/async_worker.py
 2024-05-09 19:17:46 +02:00
Manuel Schmid d7dfd6cdf2 Merge commit '3b27a11a90611cc4c1f4a1d24036d127be3ce770' 
# Conflicts:
#	language/en.json
#	webui.py
 2024-05-09 19:15:34 +02:00
Manuel Schmid 3b27a11a90 refactor: rename button label to "Reconnect" 2024-05-09 19:09:14 +02:00
Manuel Schmid 33458af5fb Merge branch 'feature/update-anime-preset' 2024-05-05 02:05:27 +02:00
Manuel Schmid 11129838cc feat: reduce cfg as suggested by vendor from 3.0.0 
https://civitai.com/models/261336?modelVersionId=435001
"recommend to decrease CFG scale." + all examples are in CFG 6
 2024-05-05 02:05:19 +02:00
Manuel Schmid 544054e2b6 Merge branch 'feature/update-anime-preset' 
# Conflicts:
#	presets/anime.json
 2024-05-05 01:38:42 +02:00
Manuel Schmid a0418a5648 feat: update animaPencilXL from 2.6.0 to 3.1.0 2024-05-05 01:16:59 +02:00
Manuel Schmid a6207a949a Merge branch 'feature/add-vae-select' 2024-05-05 01:07:39 +02:00
Manuel Schmid b0d3a3abb0 Merge branch 'feature/add-random-style' 
# Conflicts:
#	modules/async_worker.py
 2024-05-05 01:07:34 +02:00
Manuel Schmid 121f1e0a15 Merge branch 'main_upstream' into develop_upstream 2024-05-05 01:04:12 +02:00
Manuel Schmid ab76a26806 feat: add metadata handling 2024-05-05 00:33:24 +02:00
Manuel Schmid af33e930d3 refactor: code cleanup 2024-05-04 21:13:03 +02:00
Manuel Schmid 4a3aac09a3 fix: do not reload model when VAE stays the same 2024-05-04 21:12:25 +02:00
Manuel Schmid 15696da9b8 feat: use different default label, add translation 2024-05-04 20:37:30 +02:00
Manuel Schmid 8e6299b898 feat: add VAE select 2024-05-04 20:36:47 +02:00
Manuel Schmid 8ef1a2119c wip: add hyper-sd 8 step cfg lora with negative prompt support 2024-05-04 16:24:33 +02:00
Manuel Schmid 5b2d046b12 Merge branch 'main_upstream' into develop_upstream 2024-05-02 23:58:43 +02:00
Manuel Schmid c64c7c3b91 feat: add preview image for random style 2024-05-02 22:39:41 +02:00
Manuel Schmid 3027fafee3 feat: rename random to random style, add translation 2024-05-02 22:32:18 +02:00
Manuel Schmid 0db3c10c60 feat: add random style 2024-05-02 22:20:18 +02:00
Manuel Schmid 1a9faf4d1b feat: change ByteDance huggingface profile with mashb1t 2024-05-02 21:19:22 +02:00
Manuel Schmid 66c6b7af48 Merge branch 'main_upstream' 2024-05-01 14:16:48 +02:00
Manuel Schmid 5bcb56a35c fix: use LF as line breaks for entrypoint.sh 
adjusted for Linux again, see https://github.com/lllyasviel/Fooocus/discussions/2836
 2024-05-01 14:07:49 +02:00
Manuel Schmid fa74a0c7fe feat: add performance hyper-sd based on 4step LoRA 2024-04-26 22:22:09 +02:00
Manuel Schmid 42e301af6d qa: add missing semicolon 2024-04-07 18:30:49 +02:00
Manuel Schmid ef0a1c95ad feat: add button to reconnect UI without having to reload the page 2024-04-07 18:21:38 +02:00
Manuel Schmid fb7c607228 Merge branch 'main_upstream' into feature/update-anime-preset 2024-04-07 16:02:55 +02:00
Manuel Schmid fdf5bab468 feat: update animaPencilXL from 2.0.0 to 2.6.0 2024-04-07 16:02:43 +02:00
Manuel Schmid 2e43c86680 feat: update url for anime model 2024-04-07 16:01:19 +02:00
Manuel Schmid 23aef8f80c feat: update animaPencilXL from 2.0.0 to 2.6.0 2024-04-07 15:54:10 +02:00
Manuel Schmid b4a257bd03 fix: correctly set preset config and loras in meta parser 2024-03-20 22:09:32 +01:00
Manuel Schmid 978267f461 fix: correctly set preset config and loras in meta parser 2024-03-20 21:16:03 +01:00
Manuel Schmid 16c7d343e9 Merge branch 'main_upstream' 
# Conflicts:
#	modules/config.py
 2024-03-19 23:30:14 +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 bb7156ff55 Merge branch 'main_upstream' 
# Conflicts:
#	fooocus_version.py
#	modules/async_worker.py
 2024-03-04 11:49:51 +01:00
Manuel Schmid ee96b854d9 docs: update version and changelog 2024-03-04 11:33:49 +01:00
Manuel Schmid 5c1886b9bd Merge branch 'feature/add-metadata-hint-to-history-log' 2024-03-03 15:26:37 +01:00
Manuel Schmid 7651c13b37 feat: add actual metadata_scheme to log instead of only boolean 2024-03-03 15:26:21 +01:00
Manuel Schmid 8e999764a8 Merge branch 'feature/add-inpaint-mask-generation' 
# Conflicts:
#	language/en.json
#	modules/config.py
 2024-03-03 15:14:20 +01:00
Manuel Schmid bf63506e89 fix: merge full array shapes, not only single channel of mask 2024-03-03 15:02:03 +01:00
Manuel Schmid 1a82c5559c Merge branch 'feature/add-inpaint-mask-generation' of https://github.com/mashb1t/Fooocus into feature/add-inpaint-mask-generation 
# Conflicts:
#	language/en.json
#	launch.py
 2024-03-03 14:56:19 +01:00
Manuel Schmid 83c24ff2e5 feat: add inpaint functionality for mask upload 
allows to quickly adjust the mask after automated generation
 2024-03-03 14:50:07 +01:00
Manuel Schmid 9b31ff4e7f Merge branch 'main_upstream' into feature/add-inpaint-mask-generation 
# Conflicts:
#	launch.py
#	modules/config.py
#	modules/flags.py
 2024-03-03 14:40:13 +01:00
Manuel Schmid 57c9c5a95e Merge branch 'feature/add-metadata-hint-to-history-log' 2024-03-03 13:25:23 +01:00