Commit Graph
1379 Commits
Author SHA1 Message Date
CruxialandManuel Schmid f6117180d4 feat: scan wildcard subdirectories (#2466)
* Fix typo

* Scan wildcards recursively

Adds a method for getting the top-most occurrence of a given file in a directory tree

* Use already existing method for locating files

* Fix issue with incorrect files being loaded

When using the `name-filter` parameter in `get_model_filenames`, it doesn't guarantee the best match to be in the first index. This change adds a step to ensure the correct wildcard is being loaded.

* feat: make path for wildcards configurable, cache filenames on refresh files, rename button variable

* Fix formatting

---------

Co-authored-by: Manuel Schmid <manuel.schmid@odt.net>
2024-03-10 21:35:41 +01:00
400471f7af feat: add config for temp path and temp path cleanup on launch (#1992)
* Added options to set the Gradio cache path and clear cache on launch.

* Renamed cache to temp

* clear temp

* feat: do not delete temp folder but only clean content

also use fallback to system temp dir
see https://github.com/gradio-app/gradio/blob/6683ab2589f9d8658e1f51acc1b7526edce988d3/gradio/utils.py#L1151

* refactor: code cleanup

* feat: unify arg --temp-path and new temp_path config value

* feat: change default temp dir from gradio to fooocus

* refactor: move temp path method definition and configs

* feat: rename get_temp_path to init_temp_path

---------

Co-authored-by: Magee <koshms3@gmail.com>
Co-authored-by: steveyourcreativepeople <steve@yourcreativepeople.com>
Co-authored-by: Manuel Schmid <manuel.schmid@odt.net>
2024-03-10 21:11:41 +01:00
Manuel Schmid 5409bfdb26 Revert "feat: add config for temp path and temp path cleanup on launch (#1992)" (#2502)
This reverts commit 85e8aa8ce2.
2024-03-10 21:08:55 +01:00
85e8aa8ce2 feat: add config for temp path and temp path cleanup on launch (#1992)
* Added options to set the Gradio cache path and  clear cache on launch.

* Renamed cache to temp

* clear temp

* feat: do not delete temp folder but only clean content

also use fallback to system temp dir
see https://github.com/gradio-app/gradio/blob/6683ab2589f9d8658e1f51acc1b7526edce988d3/gradio/utils.py#L1151

* refactor: code cleanup

* feat: unify arg --temp-path and new temp_path config value

* feat: change default temp dir from gradio to fooocus

* refactor: move temp path method definition and configs

* feat: rename get_temp_path to init_temp_path

---------

Co-authored-by: steveyourcreativepeople <steve@yourcreativepeople.com>
Co-authored-by: Manuel Schmid <manuel.schmid@odt.net>
2024-03-10 21:06:08 +01:00
db7d2018ca fix: change synthetic refiner switch from 0.5 to 0.8 (#2165)
* fix problem

1. In partial redrawing, when refiner is empty, enable use_synthetic_refiner. The default switching timing of 0.5 is too early, which is now modified to SDXL default of 0.8.
2. 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.

* fix: parse width and height as int when applying metadata (#2452)

fixes an issue with A1111 metadata scheme where width and height are strings after splitting resolution

* fix: do not attempt to remove non-existing image grid file (#2456)

image grid is actually not an image here but a numpy array, as the grid isn't saved by default

* feat: add troubleshooting guide to bug report template again (#2489)

---------

Co-authored-by: Manuel Schmid <9307310+mashb1t@users.noreply.github.com>
Co-authored-by: Manuel Schmid <manuel.schmid@odt.net>
2024-03-10 14:42:03 +01:00
Manuel Schmid 4701b4f8f3 Merge branch 'main_upstream' into develop 2024-03-10 14:40:58 +01:00
Manuel Schmid 25650b4bc4 feat: add performance lightning with 4 step LoRA (#2415)
* feat: add performance sdxl lightning

based on https://huggingface.co/ByteDance/SDXL-Lightning/blob/main/sdxl_lightning_4step_lora.safetensors

* feat: add method for centralized restriction of features for specific performance modes

* feat: add lightning preset
2024-03-10 14:34:48 +01:00
Manuel Schmid aadc75f845 fix: also adjust fallback for model again 2024-03-09 17:23:46 +01:00
Manuel Schmid 8e8ebd91c0 fix: do not use default config values but actually load preset models 2024-03-09 17:19:31 +01:00
Manuel Schmid b6e4bb86f4 feat: use jpeg instead of jpg, use enums instead of strings (#2453)
* fix: parse width and height as int when applying metadata (#2452)

fixes an issue with A1111 metadata scheme where width and height are strings after splitting resolution

* feat: use jpeg instead of jpg, use enums instead of strings
2024-03-09 16:00:25 +01:00
Manuel Schmid 831c6b93cc feat: add troubleshooting guide to bug report template again (#2489) 2024-03-09 14:13:16 +01:00
Manuel Schmid 6301619229 Merge branch 'feature/update-anime-preset'
# Conflicts:
#	presets/anime.json
2024-03-06 11:20:25 +01:00
Manuel Schmid 856f7d968c refactor: remove lightning preset, now selectable as performance 2024-03-05 23:56:39 +01:00
Manuel Schmid 14509ebceb Merge branch 'main_upstream' 2024-03-05 21:17:40 +01:00
Manuel Schmid 3a64fe3eb3 fix: do not attempt to remove non-existing image grid file (#2456)
image grid is actually not an image here but a numpy array, as the grid isn't saved by default
2024-03-05 21:16:21 +01:00
Manuel Schmid f7cec5b971 feat: update anime from animaPencilXL_v100 to animaPencilXL_v200 2024-03-05 19:16:10 +01:00
Manuel Schmid 48beec2343 Merge branch 'main_upstream' 2024-03-05 18:50:34 +01:00
Manuel Schmid 6cfcc62000 fix: parse width and height as int when applying metadata (#2452)
fixes an issue with A1111 metadata scheme where width and height are strings after splitting resolution
2024-03-05 18:18:47 +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 28cdc2f104 Merge pull request #2439 from lllyasviel/develop
release 2.2.1
2.2.1
2024-03-04 11:37:41 +01:00
Manuel Schmid ee96b854d9 docs: update version and changelog 2024-03-04 11:33:49 +01:00
Manuel Schmid 9155d94067 feat: match anything in array syntax, not only words and whitespace (#2438)
allows e.g. [[ (red:1.1), (blue:1.2) ]] and enables same seed checks for different prompt weight
2024-03-04 11:22:24 +01:00
nbs e54fb54f91 fix: typo in wildcards/animal.txt (#2433)
* Fix typo in animal wildcards

* Update animal.txt
2024-03-04 10:19:49 +01:00
eddyizm e965bfc39c fix: add hint for png to metadata scheme selection (#2434) 2024-03-04 00:22:47 +01:00
Manuel Schmid e241c53f0e feat: adjust width of lora_weight for firefox (#2431) 2024-03-03 21:15:42 +01:00
Manuel Schmid c3fd57acb9 feat: add metadata flag and steps override to history log (#2425)
* feat: add metadata hint to history log

* feat: add actual metadata_scheme to log instead of only boolean

* feat: add steps to log if they were overridden

* fix: pass copy of metadata

prevents LoRA file extension removal in history log caused by passing reference to meta_parser fooocus scheme
2024-03-03 19:34:38 +01:00
Manuel Schmid fb94394b10 fix: add fallback value for default_max_lora_number when default_loras is empty (#2430) 2024-03-03 18:46:26 +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
Manuel Schmid 7ef65ca94c feat: add metadata hint to history log 2024-03-03 13:12:04 +01:00
Manuel Schmid ff051c1e8d docs: update readme 2024-03-03 01:27:00 +01:00
Manuel Schmid ac841f1f4c Merge branch 'feature/add-performance-sdxl-lightning'
# Conflicts:
#	modules/async_worker.py
2024-03-03 01:26:44 +01:00
Manuel Schmid 0768357136 Merge branch 'main_upstream'
# Conflicts:
#	modules/async_worker.py
2024-03-03 00:46:54 +01:00
Manuel Schmid 0f6e912fde feat: add performance sdxl lightning
based on https://huggingface.co/ByteDance/SDXL-Lightning/blob/main/sdxl_lightning_4step_lora.safetensors
2024-03-03 00:40:02 +01:00
Manuel Schmid 4ea3baff50 fix: add handling for filepaths to image grid (#2414)
previously skipped due to not being in np.ndarray format but string
2024-03-03 00:21:59 +01:00
Manuel Schmid 90839430da fix: adjust parameters for upscale fast 2x (#2411) 2024-03-02 19:05:11 +01:00
Manuel Schmid 056840c513 Merge commit '4945fc99624afc661aae2d3c5c5d73a32ba21897'
# Conflicts:
#	fooocus_version.py
#	language/en.json
#	launch.py
#	modules/async_worker.py
#	modules/config.py
#	modules/flags.py
#	modules/meta_parser.py
#	modules/util.py
#	webui.py
2024-03-02 17:24:53 +01:00
Manuel Schmid 4945fc9962 Merge pull request #2406 from lllyasviel/develop
release 2.2.0
2.2.0
2024-03-02 16:27:54 +01:00
Manuel Schmid 6db14acf8e docs: update version and changelog 2024-03-02 16:25:31 +01:00
Gianluca Teti 41e88a4e8d docs: fix typo in readme (#2368) 2024-02-29 16:10:34 +01:00
Manuel Schmid 8bfc4e1e35 Merge branch 'feature/add-preset-selection' 2024-02-29 15:42:26 +01:00
Manuel Schmid 45b8bc37f1 Merge branch 'feature/add-preset-selection' of github.com:mashb1t/Fooocus into feature/add-preset-selection 2024-02-29 15:41:37 +01:00
Manuel Schmid 681f61e159 fix: add default return values when preset download is disabled
https://github.com/mashb1t/Fooocus/issues/20
2024-02-29 15:41:11 +01:00
Manuel Schmid 4f4d23f4e3 fix: use filename instead of download function call for lcm lora
do not require lcm lora to be downloaded for metadata parsing
2024-02-26 21:14:44 +01:00