Commit Graph

1487 Commits

Author SHA1 Message Date
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
Manuel Schmid 00d3d1b4b3
feat: add nsfw image censoring via config and checkbox (#958)
* add nsfw image censoring

activatable via config, uses CompVis/stable-diffusion-safety-checker

* fix progressbar call for nsfw output

* use config to set cache dir for safety checker

* add checkbox black_out_nsfw

makes both enabling via config and checkbox possible, where config overrides the checkbox value

* fix: add missing diffusers package

* feat: extract safety checker, remove dependency to diffusers

* feat: make code compatible again after merge with main

* feat: move censor to extras, optimize safety checker file handling

* refactor: rename folder safety_checker_models to safety_checker
2024-05-18 15:50:28 +02:00
Manuel Schmid 2d327bbd28
Merge branch 'develop' into feature/add-nsfw-filter 2024-05-18 15:40:31 +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 33fa175bd4
feat: automatically describe image on uov image upload (#1938)
* feat: automatically describe image on uov image upload if prompt is empty

* feat: add argument to disable automatic uov image description

* feat: rename argument, disable by default

this prevents computers with low hardware specifications from being unnecessary blocked
2024-05-17 18:25:08 +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
e52fa787 5e594685e1
fix: do not close meta tag in HTML header (#2740)
* fixed typo in HTML (extra </meta> tag)

* refactor: remove closing slash for meta tag

as of specification in https://html.com/tags/meta/, meta tagas are null elements:
This element must not contain any content, and does not need a closing tag.

---------

Co-authored-by: Manuel Schmid <9307310+mashb1t@users.noreply.github.com>
2024-05-17 17:25:56 +02:00
Vishvesh Khanvilkar 96bf89f782
fix: use correct border radius css property (#2845) 2024-05-17 17:18:45 +02:00
Manuel Schmid c5475fe47b
feat: update anime model from 3.1.0 to 4.0.0 2024-05-15 19:16:09 +02:00
Manuel Schmid 1c107e027c
release: bump version to 2.3.3 2024-05-15 17:23:12 +02:00
Manuel Schmid 4d46fb6bcb
Merge branch 'feature/add-tcd-sampler'
# Conflicts:
#	modules/flags.py
2024-05-15 17:17:02 +02:00
Manuel Schmid badbe6e53b
Merge branch 'feature/add-align-your-steps-scheduler'
# Conflicts:
#	presets/anime.json
2024-05-15 17:15:47 +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
794a357f7a/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
docppp bdd6b1a9b0
feat: add full raw prompt to history log (#1920)
* Update async_worker.py

* Update private_logger.py

* refactor: only show full prompt details in logs, exclude from image metadata

---------

Co-authored-by: Manuel Schmid <9307310+mashb1t@users.noreply.github.com>
Co-authored-by: Manuel Schmid <dev@mash1t.de>
2024-05-09 20:25:43 +02:00
Manuel Schmid 4dd5cae53e
release: bump version to 2.3.2 2024-05-09 19:25:21 +02:00