Commit Graph

1523 Commits

Author SHA1 Message Date
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
xyny 299ba4d2a2
fix: remove dash in "docker-compose"
Co-authored-by: Manuel Schmid <9307310+mashb1t@users.noreply.github.com>
2024-05-22 15:39:55 +00:00
xyny ca561944d5
fix: don't update in entrypoint
Co-authored-by: Manuel Schmid <9307310+mashb1t@users.noreply.github.com>
2024-05-22 15:39:34 +00:00
xyny d4e373b83c
fix: build only on versioned tags
Co-authored-by: Manuel Schmid <9307310+mashb1t@users.noreply.github.com>
2024-05-22 15:38:50 +00:00
xyny a80834f3b5
fix: switch to semver versioning
Co-authored-by: Manuel Schmid <9307310+mashb1t@users.noreply.github.com>
2024-05-22 15:38:34 +00:00
xyny 40711b7ac9
chore: replace image name env var with github.event.repository.name (pt2)
Co-authored-by: Manuel Schmid <9307310+mashb1t@users.noreply.github.com>
2024-05-22 15:38:02 +00:00
xyny 7efa300421
chore: replace image name env var with github.event.repository.name
Co-authored-by: Manuel Schmid <9307310+mashb1t@users.noreply.github.com>
2024-05-22 15:37:36 +00: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
xhoxye a9ef2a12c7
Add the information about the size and ratio of the read image 2024-05-21 08:52:13 +08: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 ac14d9d03c
feat: change code owner from @lllyasviel to @mashb1t (#2948) 2024-05-20 17:33:12 +02:00
Manuel Schmid 65a8b25129
feat: inline lora optimisations (#2967)
* feat: add performance loras to the end of the loras array

* fix: resolve circular dependency for unit tests

* feat: allow multiple matches for each token, optimize and extract method cleanup_prompt

* fix: update unit tests

* feat: ignore custom wildcards
2024-05-20 17:31:51 +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 c995511705
feat: progress bar improvements (#2962)
* feat: align progress bar vertically

* feat: use fixed width for status text, remove ordinals

* refactor: align progress to actions
2024-05-19 20:43:11 +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 35b74dfa64
feat: optimize model management of image censoring (#2960)
now follows general Fooocus model management principles + includes code optimisations for reusability
2024-05-19 18:36:47 +02:00
Manuel Schmid dad228907e
fix: remove leftover code from hyper-sd8 testing (#2959) 2024-05-19 17:42:46 +02:00
Manuel Schmid 0466ff944c
release: bump version number to 2.4.0-rc1 2024-05-19 14:29:10 +02:00
Manuel Schmid 13599edb9b
feat: add performance hyper-sd based on 4step LoRA (#2812)
* feat: add performance hyper-sd based on 4step LoRA

* feat: use LoRA weight 0.8, sampler dpmpp_sde_gpu and scheduler_name karras

suggested in https://github.com/lllyasviel/Fooocus/discussions/2813#discussioncomment-9245251
results see https://github.com/lllyasviel/Fooocus/discussions/2813#discussioncomment-9275251

* feat: change ByteDance huggingface profile with mashb1t

* wip: add hyper-sd 8 step cfg lora with negative prompt support

* 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 13:23:08 +02:00
Manuel Schmid 2e2e8f851a
feat: add tcd sampler and discrete distilled tcd scheduler based on sgm_uniform (same as lcm) (#2907) 2024-05-19 13:08:33 +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
cantor-set 3bae73e23e
feat: add support for lora inline prompt references (#2323)
* Adding support to inline prompt references

* Added unittests

* Added an initial documentation for development guidelines

* Added a negative number

* renamed parameter

* removed wrongly committed file

* Code fixes

* Fixed circular reference

* Fixed typo. Added TODO

* Fixed merge

* Code cleanup

* Added missing refernce function

* Removed function from util.py... again...

* Update modules/async_worker.py

Implemented suggested change

Co-authored-by: Manuel Schmid <9307310+mashb1t@users.noreply.github.com>

* Removed another circular reference

* Renamed module

* Addressed PR comments

* Added return type to function

* refactor: move apply_wildcards to module util

* refactor: code cleanup, unify usage of tuples in lora list

* docs: add instructions for running unittests on embedded python, code cleanup

* refactor: code cleanup, move makedirs_with_log back to util

---------

Co-authored-by: cantor-set <cantor-set@no-email.net>
Co-authored-by: Manuel Schmid <9307310+mashb1t@users.noreply.github.com>
Co-authored-by: Manuel Schmid <dev@mash1t.de>
2024-05-18 17:19:46 +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 eebfcac83f
Merge branch 'develop' into lora-reference-parsing 2024-05-18 17:00:25 +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 3a55e7e391
feat: add AlignYourStepsScheduler (#2905) 2024-05-18 15:53:34 +02:00