Commit Graph
1629 Commits
Author SHA1 Message Date
Manuel Schmid d3113f5c3f feat: use consistent file name in gradio (#1932)
* feat: use consistent file name in gradio

returns and uses filepaths instead of numpy image by saving to temp dir
uses double the temp dir file storage on disk as it saves to temp dir and gradio temp dir when displaying the image, but reuses logged output image

* feat: delete temp images after yielding to gradio

* feat: use args temp path if given

* chore: code cleanup, remove redundant if statement
2024-02-25 22:56:38 +01:00
Brian FlanneryandManuel Schmid c898e6a4dc feat: add array support on main prompt (#1503)
* prompt array support

* update change log

* update change log

* docs: remove 2.1.847 change log

* refactor: rename freeze_seed to disable_seed_increment, move to developer debug mode

* feat: add translation for new labels

* fix: use task_rng based on task_seed, not initial seed

---------

Co-authored-by: Manuel Schmid <manuel.schmid@odt.net>
2024-02-25 22:22:49 +01:00
MindOfMatterandManuel Schmid 3be76ef8a3 feat: make lora min max weight editable in config (#2216)
* Initial commit

* Update README.md

* sync with original main Fooocus repo

* update with my gitignore setup

* add min max weight configs feature

* add max lora config feature

* Revert "add max lora config feature"

This reverts commit cfe7463fe2.

* Update README.md

* Update .gitignore

* update

* merge

* revert

---------

Co-authored-by: Manuel Schmid <manuel.schmid@odt.net>
2024-02-25 21:36:25 +01:00
MindOfMatterandManuel Schmid 18f9f7dc31 feat: make lora number editable in config (#2215)
* Initial commit

* Update README.md

* sync with original main Fooocus repo

* update with my gitignore setup

* add max lora config feature

* Revert "add max lora config feature"

This reverts commit cfe7463fe2.

* add max loras config feature

* Update README.md

* Update .gitignore

* update

* merge

* revert

* refactor: rename default_loras_max_number to default_max_lora_number, validate config for int

* fix: add missing patch_all call and imports again

---------

Co-authored-by: Manuel Schmid <manuel.schmid@odt.net>
2024-02-25 21:12:26 +01:00
MindOfMatterandManuel Schmid 468d704b29 feat: add button to enable LoRAs (#2210)
* Initial commit

* Update README.md

* sync with original main Fooocus repo

* update with my gitignore setup

* add max lora config feature

* Revert "add max lora config feature"

This reverts commit cfe7463fe2.

* add lora enabler feature

* Update README.md

* Update .gitignore

* update

* merge

* revert changes

* revert

* feat: change width of LoRA columns

* refactor: rename lora_enable to lora_enabled, optimize code

---------

Co-authored-by: Manuel Schmid <manuel.schmid@odt.net>
2024-02-25 19:59:28 +01:00
Manuel Schmid eebd7752ab fix: allow path_outputs to be outside of root dir (#2332)
allows Gradio to serve outputs when folder has been changed in the config
2024-02-25 18:44:28 +01:00
Manuel Schmid b5f019fb62 fix: correctly create directory for path_outputs if not existing (#1668)
* correctly create directory for outputs if not existing

* feat: add make_directory parameter checks for list, extract make_directory to util
2024-02-25 18:41:43 +01:00
Manuel Schmid 9c19300a3e feat: improve bug report and feature request issue templates (#1631)
* refactor and improve bug report and feature request issue templates

* update operating system placeholder to Windows 10

most common usage i assume

* use already existing label "enhancement" instead of "feature"

* feat: add checkbox for latest version check, add triage to feature requests

* feat: add link to ask a question

* feat: use templates of stable-diffusion-webui-forge as basis

* feat: add optional hosting and operating system inputs
2024-02-25 18:04:46 +01:00
Maxim SaplinandManuel Schmid 4d34f31a72 feat: allow users to specify the number of threads when running on CPU (#1601)
* CPU_NUM_THREADS

* refactor: optimize code, type is already strict

---------

Co-authored-by: Manuel Schmid <manuel.schmid@odt.net>
2024-02-25 17:14:17 +01:00
dooglewoogleandManuel Schmid ef1999c52c feat: add ability to load checkpoints and loras from multiple locations (#1256)
* Add ability to load checkpoints and loras from multiple locations

* Found another location a default path is required

* feat: use array as default

---------

Co-authored-by: Manuel Schmid <manuel.schmid@odt.net>
2024-02-25 12:47:14 +01:00
Manuel Schmid 7cfb5e742d feat: add advanced parameter for disable_intermediate_results (progress_gallery) (#1013)
* add advanced parameter for disable_intermediate_results

prevents gradio frontend process from clogging image output and updates in high throughput scenarios such as LCM with image number >= 4

* update disable_intermediate_results correctly

based on default and selected performance

* chore: add missing translations
2024-02-25 11:31:00 +01:00
Manuel Schmid 490f1a93d0 Merge branch 'bugfix/allow-path-outputs-to-be-outside-of-fooocus-root' 2024-02-25 11:09:19 +01:00
Manuel Schmid 965364cd80 feat: add list of 100 most popular animals to wildcards (#985) 2024-02-24 19:03:46 +01:00
Manuel Schmid 5b7ddf8b22 feat: advanced params refactoring + prevent users from skipping/stopping other users tasks in queue (#981)
* only make stop_button and skip_button interactive when rendering process starts

fix inconsistency in behaviour of stop_button and skip_button as it was possible to skip or stop other users processes while still being in queue

* use AsyncTask for last_stop handling instead of shared

* Revert "only make stop_button and skip_button interactive when rendering process starts"

This reverts commit d3f9156854.

* introduce state for task skipping/stopping

* fix return parameters of stop_clicked

* code cleanup, do not disable skip/stop on stop_clicked

* reset last_stop when skipping for further processing

* fix: replace fcbh with ldm_patched

* fix: use currentTask instead of ctrls after merging upstream

* feat: extract attribute disable_preview

* feat: extract attribute adm_scaler_positive

* feat: extract attribute adm_scaler_negative

* feat: extract attribute adm_scaler_end

* feat: extract attribute adaptive_cfg

* feat: extract attribute sampler_name

* feat: extract attribute scheduler_name

* feat: extract attribute generate_image_grid

* feat: extract attribute overwrite_step

* feat: extract attribute overwrite_switch

* feat: extract attribute overwrite_width

* feat: extract attribute overwrite_height

* feat: extract attribute overwrite_vary_strength

* feat: extract attribute overwrite_upscale_strength

* feat: extract attribute mixing_image_prompt_and_vary_upscale

* feat: extract attribute mixing_image_prompt_and_inpaint

* feat: extract attribute debugging_cn_preprocessor

* feat: extract attribute skipping_cn_preprocessor

* feat: extract attribute canny_low_threshold

* feat: extract attribute canny_high_threshold

* feat: extract attribute refiner_swap_method

* feat: extract freeu_ctrls attributes

freeu_enabled, freeu_b1, freeu_b2, freeu_s1, freeu_s2

* feat: extract inpaint_ctrls attributes

debugging_inpaint_preprocessor, inpaint_disable_initial_latent, inpaint_engine, inpaint_strength, inpaint_respective_field, inpaint_mask_upload_checkbox, invert_mask_checkbox, inpaint_erode_or_dilate

* wip: add TODOs

* chore: cleanup code

* feat: extract attribute controlnet_softness

* feat: extract remaining attributes, do not use globals in patch

* fix: resolve circular import, patch_all now in async_worker

* chore: cleanup pid code
2024-02-24 19:01:06 +01:00
Manuel Schmid 1d606ecb7e feat: optimize image censoring
Does not save 2x to file (log and yield), but only once (log).
2024-02-24 18:09:45 +01:00
Manuel Schmid 4905f3f2fa fix: use correct format for upscale metadata 2024-02-24 17:50:40 +01:00
cantor-set 9e60a8c3f8 renamed parameter 2024-02-22 18:51:51 -05:00
cantor-set e802016043 Added a negative number 2024-02-22 18:50:06 -05:00
cantor-set 2e6d4c3abb Added an initial documentation for development guidelines 2024-02-22 18:44:20 -05:00
cantor-set 24acbc39fe Added unittests 2024-02-22 18:42:30 -05:00
Manuel Schmid acae289dc6 fix: allow path_outputs to be outside of root dir
allows Gradio to serve outputs when folder has been changed in the config
2024-02-22 23:06:42 +01:00
Manuel Schmid 741a693083 feat: add ByteDance lightning preset, code cleanup 2024-02-22 23:02:58 +01:00
Manuel Schmid 0ed01da4e4 Merge pull request #2313 from charliewilco/patch-1
chore: add .DS_Store to .gitignore
2024-02-22 21:53:36 +01:00
cantor-set 31263b40f6 Adding support to inline prompt references 2024-02-21 21:15:24 -05:00
Charlie ⚡️ 187f4a76c6 Remove mac generated invisible files 2024-02-20 21:51:01 -05:00
Manuel Schmid 5e3816a8b3 fix: add nsfw filter support again
accidentally deleted when merging
2024-02-19 23:12:33 +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 17285c63e5 Merge branch 'feature/add-preset-selection'
# Conflicts:
#	launch.py
#	webui.py
2024-02-19 00:10:42 +01:00
Manuel Schmid 6d9e0e6f95 feat: keep prompt when not set in preset, use more robust syntax 2024-02-19 00:06:39 +01:00
Manuel Schmid 78e75fd040 fix: use base_model and not fallback key as value for default_model
now correctly loads fallback models
2024-02-18 23:10:02 +01:00
Manuel Schmid 82864301a6 Merge branch 'main_upstream' into feature/add-preset-selection
# Conflicts:
#	launch.py
#	modules/config.py
2024-02-18 23:07:49 +01:00
Manuel Schmid a01afaf1b3 Merge pull request #15 from blckbx/load-upscale-strength-from-config
[Feature]: Load debug settings `upscale strength` from config file
2024-02-18 17:46:08 +01:00
Manuel Schmid 26601a99d1 Merge branch 'feature/add-metadata-to-files' 2024-02-18 16:27:29 +01:00
Manuel Schmid 692a2e4369 Merge branch 'feature/add-metadata-to-files' of github.com:mashb1t/Fooocus into feature/add-metadata-to-files 2024-02-18 16:15:56 +01:00
Manuel Schmid f93dd6edcc feat: only override steps if metadata value is not in steps enum or in steps enum and performance is not the same 2024-02-18 16:15:39 +01:00
Manuel Schmid 36f6715512 chore: make steps enums more strict 2024-02-18 16:14:24 +01:00
Manuel Schmid 613febdce8 Merge branch 'develop' 2024-02-18 15:34:58 +01:00
blckbx 1f951a48f8 Merge branch 'mashb1t:main' into load-upscale-strength-from-config 2024-02-18 11:38:01 +01:00
Manuel Schmid 3b97302116 docs: mark merged PRs in readme 2024-02-12 22:18:10 +01:00
Manuel Schmid a78f66ffb5 fix: sort with casefold, case insensitive
https://docs.python.org/3/library/stdtypes.html#str.casefold
2024-02-12 21:59:22 +01:00
Manuel Schmid 94d80d35a9 feat: add distinction in version identifier for easier debugging in issues 2024-02-12 21:40:53 +01:00
Manuel Schmid 62a385e6a1 feat: sort with casefold, case insensitive
https://docs.python.org/3/library/stdtypes.html#str.casefold
2024-02-12 21:34:07 +01:00
Manuel Schmid 267d5eee7d Merge commit '1c999be8c8134fe01a75723ea933858435856950'
# Conflicts:
#	.github/ISSUE_TEMPLATE/bug_report.md
#	launch.py
#	modules/async_worker.py
#	modules/config.py
#	modules/private_logger.py
#	modules/util.py
#	webui.py
2024-02-12 21:13:36 +01:00
Manuel Schmid 1c999be8c8 Merge pull request #2229 from lllyasviel/develop
Release 2.1.865
2.1.865
2024-02-11 15:20:27 +01:00
Manuel Schmid f4a8bf24cf fix: correctly calculate refiner switch when overwrite_switch is > 0 (#2165)
When using custom steps, the calculation of switching timing is wrong. Now it is modified to calculate "steps x timing" after custom steps are used.
By @xhoxye
2024-02-11 15:13:20 +01:00
074b655dff fix: implement output path argument (#2074)
* added function to check output path arg and override, other wise, use temp or fallback to config

* added function to check output path arg and override, other wise, use temp or fallback to config #2065

* Revert to 1bcbd650

* moved path output arg handling inside config start up

* Revert "added function to check output path arg and override, other wise, use temp or fallback to config"

This reverts commit fecb97b59c.

* Updated tag to uppercase

* updated docstring to standard double quotes.

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

* removed extra check on image log flag per feedback

* feat: update config_dict value when overriding path_outputs, change message

---------

Co-authored-by: Manuel Schmid <9307310+mashb1t@users.noreply.github.com>
Co-authored-by: Manuel Schmid <manuel.schmid@odt.net>
2024-02-11 13:04:06 +01:00
blckbx 194824343e revert: load_data_outputs 2024-02-11 12:08:21 +01:00
blckbx d921cd428b webui, config: save and load overwrite upscale strength 2024-02-11 11:51:10 +01:00
Manuel Schmid ee3ce95566 docs: update version 2024-02-10 21:59:13 +01:00
Manuel Schmid 2037de3fcb chore: fix typos and adjust wording (#1521, #1644, #1691, #1772) 2024-02-10 21:54:50 +01:00