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,617 Commits 15 Branches 23 Tags
db36766f34cfff4ec0a644cb5f31b099a1a28bab
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Manuel Schmid 219c494e58 feat: update readme 2024-06-05 22:11:57 +02:00
Manuel Schmid b113eca87e release: bump version to 2.4.2, update changelog 2024-06-05 21:58:51 +02:00
Manuel Schmid 85a8deecee release: bump version to 2.4.2, update changelog 2024-06-05 21:30:43 +02:00
Manuel Schmid cb24c686b0 Merge branch 'main_upstream' into develop_upstream 2024-06-04 20:11:42 +02:00
Manuel Schmid 82f4ffb1f4 Merge branch 'feature/playground-2.5' 2024-06-02 21:00:47 +02:00
Manuel Schmid 7ebc911972 feat: optimize playground v2.5 preset 2024-06-02 16:09:06 +02:00
Manuel Schmid 913fa89c05 Merge branch 'main_upstream' 2024-06-02 02:13:33 +02:00
Manuel Schmid e504b24f8f Merge branch 'feature/make-textboxes-resizeable-again' 2024-06-02 01:55:10 +02:00
Manuel Schmid 12bc7af067 feat: set row height to 84, exactly matching 3 lines for positive prompt 
eliminate need for JS to resize positive prompt onUiLoaded
 2024-06-02 01:54:55 +02:00
Manuel Schmid 6e555fa35a wip: auto-resize positive prompt on new line 
dirty approach as container is hidden and 1px padding is applied for border shadow to actually work
 2024-06-02 01:50:42 +02:00
Manuel Schmid 972c2d2bee Merge branch 'feature/make-textboxes-resizeable-again' 2024-06-02 00:35:30 +02:00
Manuel Schmid 50deba85e7 feat: make textboxes (incl. positive prompt) resizable again 2024-06-02 00:33:07 +02:00
Manuel Schmid 30b2a9536e Merge branch 'feature/playground-2.5' 
# Conflicts:
#	modules/flags.py
 2024-06-01 23:31:19 +02:00
Manuel Schmid 55750b93d3 feat: change URL to mashb1t 2024-06-01 23:30:52 +02:00
Manuel Schmid 778416c5e0 Merge branch 'main_upstream' 2024-06-01 23:25:21 +02:00
Manuel Schmid daaa27098f feat: add preset for playground v2.5 2024-06-01 22:59:08 +02:00
Manuel Schmid fe58df35c9 feat: add support for playground 2.5 2024-06-01 22:43:27 +02:00
Manuel Schmid 5768330142 Merge branch 'feature/optimize-performance-lora-filtering-in-metadata' 
# Conflicts:
#	modules/flags.py
#	modules/util.py
#	webui.py
 2024-05-30 15:21:04 +02:00
Manuel Schmid f5863d878e Merge branch 'feature/performance-restricted-features-rework' 2024-05-30 15:18:34 +02:00
Manuel Schmid 5759caaada feat: rework intermediate image display for restricted performances 
disable intermediate results for all performacnes with restricted features

make disable_intermediate_results interactive again even if performance has restricted features
users who want to disable this option should be able to do so, even if performance will be impacted
 2024-05-30 15:02:23 +02:00
Manuel Schmid 83ef32a88b feat: make disable_intermediate_results interactive again even if performance has restricted features 
users who want to disable this option should be able to do so, even if performance will be impacted
 2024-05-30 14:39:43 +02:00
Manuel Schmid 2dca5ba638 feat: do not filter LoRAs in metadata parser but rather in metadata load action 2024-05-30 01:32:09 +02:00
Manuel Schmid 91281e5561 feat: only filter lora of selected performance instead of all performance LoRAs 
both metadata and history log
 2024-05-30 00:22:31 +02:00
Manuel Schmid 9c8ffbbe18 refactor: remove method ordinal_suffix, not needed anymore 2024-05-30 00:21:18 +02:00
Manuel Schmid 1981ace9e1 feat: add method to_steps to Performance 2024-05-30 00:20:53 +02:00
Manuel Schmid f8f2455b65 feat: use speed steps as default instead of hardcoded 30 2024-05-30 00:20:23 +02:00
Manuel Schmid db8228d8f5 refactor: rename parse_json to to_json, rename parse_string to to_string 2024-05-30 00:19:35 +02:00
Manuel Schmid 8fea1cd9bb fix: disable intermediate results for all restricted performances 
too fast for Gradio, which becomes a bottleneck
 2024-05-30 00:17:37 +02:00
Manuel Schmid e3060e00d4 feat: only filter lora of selected performance instead of all performance LoRAs 2024-05-30 00:16:34 +02:00
Manuel Schmid 55b01a81a6 refactor: cleanup flags, use __member__ to check if enums contains key 2024-05-30 00:14:27 +02:00
Manuel Schmid 9564341fbd feat: use class PerformanceLoRA instead of strings in config 2024-05-30 00:13:14 +02:00
Manuel Schmid 4127fa410b feat: add remove_performance_lora method 2024-05-30 00:11:07 +02:00
Manuel Schmid 1c400b56e9 Merge branch 'main_upstream' 2024-05-29 20:33:41 +02:00
Manuel Schmid 515cdde159 Merge branch 'main_upstream' 2024-05-29 19:51:57 +02:00
Manuel Schmid 27a4c8b107 Merge remote-tracking branch 'upstream/main' 
# Conflicts:
#	fooocus_version.py
 2024-05-28 01:13:49 +02:00
Manuel Schmid 96d1b79c15 Merge branch 'main_upstream' 2024-05-28 00:52:10 +02:00
Manuel Schmid 8c4ce0495d Merge branch 'feat/build-docker-image-on-push-to-main-branch' 2024-05-28 00:32:40 +02:00
Manuel Schmid 3113b9c17b feat: add tag "edge" for main when building the docker image 2024-05-28 00:32:31 +02:00
Manuel Schmid f259f00ec5 Merge branch 'feat/build-docker-image-on-push-to-main-branch' 2024-05-28 00:22:37 +02:00
Manuel Schmid abfc42f2e0 feat: build docker image on push to main branch 2024-05-28 00:21:25 +02:00
Manuel Schmid 4361e7e629 Merge remote-tracking branch 'upstream/main' 2024-05-27 00:30:53 +02:00
Manuel Schmid 08877666ba Merge branch 'main_upstream' 2024-05-26 22:14:20 +02:00
Manuel Schmid 9c4e471a3d Merge branch 'main_upstream' 
# Conflicts:
#	webui.py
 2024-05-26 19:42:24 +02:00
Manuel Schmid c227cf1f56 docs: update changelog 2024-05-26 18:16:18 +02:00
Manuel Schmid 6dd718919c feat: cleanup performance selection, make it completely dynamic 2024-05-26 18:09:22 +02:00
Manuel Schmid 9e038a614a Merge branch 'Alexdnk/main' 
# Conflicts:
#	webui.py
 2024-05-26 17:54:02 +02:00
Manuel Schmid fced8b4c24 fix: adjust indent 2024-05-26 17:25:08 +02:00
Manuel Schmid 7b60f1efdd fix: add missing scroll down for metadata tab 2024-05-26 17:18:50 +02:00
Manuel Schmid be5a152c07 refactor: reorder image number slider, code cleanup 2024-05-26 17:18:03 +02:00
Manuel Schmid 011f65ba78 feat: change title of aspect ratios accordion on load and update 2024-05-26 16:09:23 +02:00
Manuel Schmid f82aa8a909 Merge branch 'develop_upstream' 
# Conflicts:
#	fooocus_version.py
#	modules/util.py
#	tests/test_utils.py
#	webui.py
 2024-05-26 15:28:08 +02:00
Manuel Schmid 67289dd0fe release: bump version to 2.4.0, update changelog 2024-05-26 15:13:54 +02:00
Manuel Schmid a0114de9e9 feat: change preset from option to select, add accordion for resolution 2024-05-23 01:21:08 +02:00
Manuel Schmid ef7abe219b fix: use correct aspect ratio labels again 2024-05-23 00:28:05 +02:00
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