Commit Graph

93 Commits

Author SHA1 Message Date
Manuel Schmid 5c43a4bece
fix: resolve circular dependency for sha256, update files and init cache after initial model download
fixes https://github.com/lllyasviel/Fooocus/issues/2372
2024-07-17 10:49:55 +02:00
Manuel Schmid 37fe0465b7
Merge branch 'feature/add-pony-support-and-preset' into develop
# Conflicts:
#	launch.py
2024-06-30 19:34:56 +02:00
Manuel Schmid bbf90a97b7
feat: add pony preset and vae downloads
uses default SDXL VAE, but the model doesn't include it
2024-06-30 15:44:35 +02:00
Manuel Schmid d687ea73c4
Merge branch 'upstream/develop'
# Conflicts:
#	webui.py
2024-04-30 15:34:16 +02:00
Manuel Schmid 1dff430d4c
feat: update interposer from v3.1 to v4.0 (#2717)
* fix: load image number from preset (#2611)

* fix: add default_image_number to preset handling

* fix: use minimum image number of preset and config to prevent UI overflow

* fix: use correct base dimensions for outpaint mask padding (#2612)

* fix: add Civitai compatibility for LoRAs in a1111 metadata scheme by switching schema (#2615)

* feat: update sha256 generation functions

29be1da7cf/modules/hashes.py

* feat: add compatibility for LoRAs in a1111 metadata scheme

* feat: add backwards compatibility

* refactor: extract remove_special_loras

* fix: correctly apply LoRA weight for legacy schema

* docs: bump version number to 2.3.1, add changelog (#2616)

* feat: update interposer vrom v3.1 to v4.0
2024-04-06 15:27:35 +02:00
delta_lt_0 5ada070d88
feat: support download of huggingface files from a mirror website (#2637)
* fix: load image number from preset (#2611)

* fix: add default_image_number to preset handling

* fix: use minimum image number of preset and config to prevent UI overflow

* fix: use correct base dimensions for outpaint mask padding (#2612)

* fix: add Civitai compatibility for LoRAs in a1111 metadata scheme by switching schema (#2615)

* feat: update sha256 generation functions

29be1da7cf/modules/hashes.py

* feat: add compatibility for LoRAs in a1111 metadata scheme

* feat: add backwards compatibility

* refactor: extract remove_special_loras

* fix: correctly apply LoRA weight for legacy schema

* docs: bump version number to 2.3.1, add changelog (#2616)

* feat:support download huggingface files from a  mirror site

---------

Co-authored-by: Manuel Schmid <9307310+mashb1t@users.noreply.github.com>
2024-04-06 15:25:19 +02:00
Manuel Schmid 679c02a09f
Merge branch 'main_upstream'
# Conflicts:
#	css/style.css
#	fooocus_colab.ipynb
#	fooocus_version.py
#	launch.py
#	modules/async_worker.py
#	modules/config.py
#	modules/flags.py
#	modules/meta_parser.py
#	webui.py
2024-03-18 21:27:56 +01:00
Manuel Schmid 4a44be36fd
feat: add preset selection to Gradio UI (session based) (#1570)
* add preset selection

uses meta parsing to set presets in user session (UI elements only)

* add LoRA handling

* use default config as fallback value

* add preset refresh on "Refresh All Files" click

* add special handling for default_styles and default_aspect_ratio

* sort styles after preset change

* code cleanup

* download missing models from preset

* set default refiner to "None" in preset realistic

* use state_is_generating for preset selection change

* DRY output parameter handling

* feat: add argument --disable-preset-selection

useful for cloud provisioning to prevent model switches and keep models loaded

* feat: keep prompt when not set in preset, use more robust syntax

* fix: add default return values when preset download is disabled

https://github.com/mashb1t/Fooocus/issues/20

* feat: add translation for preset label

* refactor: unify preset loading methods in config

* refactor: code cleanup
2024-03-15 22:04:27 +01:00
Manuel Schmid f7f0b51bab
Merge branch 'main_upstream' into develop 2024-03-13 00:31:41 +01:00
Manuel Schmid 6da0441cc7
fix: update xformers to 0.0.23 (#2517)
WARNING[XFORMERS]: xFormers can't load C++/CUDA extensions. xFormers was built for:
    PyTorch 2.0.1+cu118 with CUDA 1108 (you have 2.1.0+cu121)
    Python  3.10.11 (you have 3.10.9)
2024-03-12 23:13:38 +01:00
Manuel Schmid 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 6683ab2589/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
Magee 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 6683ab2589/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
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 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 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 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 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 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
dooglewoogle 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 17285c63e5
Merge branch 'feature/add-preset-selection'
# Conflicts:
#	launch.py
#	webui.py
2024-02-19 00:10:42 +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 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
rsl8 e4929a9ed7
fix: do not overwrite $GRADIO_SERVER_PORT if it is already set (#1921) 2024-02-10 18:44:20 +01:00
rsl8 95f93a1f4b
delay importing of modules.config (#2195) 2024-02-10 17:51:38 +01:00
Manuel Schmid 652799392f
Merge branch 'main' into feature/add-inpaint-mask-generation 2024-02-04 02:50:33 +01:00
Manuel Schmid f8f081b33f
Merge branch 'feature/add-preset-selection'
# Conflicts:
#	launch.py
#	modules/config.py
#	presets/realistic.json
#	webui.py
2024-01-28 00:58:36 +01:00
Manuel Schmid 6031f85f49
Merge branch 'main_upstream' into feature/add-preset-selection
# Conflicts:
#	modules/config.py
#	presets/realistic.json
2024-01-28 00:57:03 +01:00
Manuel Schmid 7185abb8ba
Merge branch 'main_upstream'
# Conflicts:
#	launch.py
#	ldm_patched/modules/args_parser.py
#	modules/config.py
#	presets/anime.json
#	presets/default.json
#	presets/lcm.json
#	presets/realistic.json
2024-01-27 21:09:08 +01:00
lllyasviel 69ad1b3c24 advanced preset load
new model list

i

new candidates

add model fallback

allow disable preset download

Update anime.json

Update anime.json

Update config.py

Update anime.json

Update readme.md

Update default.json
2024-01-27 08:06:31 -08:00
Manuel Schmid dd2fd04fd7
feat: set U2NET_HOME env var to path_inpaint
previously was using the user dir, see 49d1686f65/rembg/sessions/base.py (L78)
2024-01-26 11:17:58 +01:00
lllyasviel 5f3a87d871 try fix ssl 2023-12-12 12:59:58 -08:00
lllyasviel e8d88d3e25 2.1.826 2023-12-12 11:38:05 -08:00
lllyasviel 0d878b0282 try fix some mps problems 2023-12-11 19:16:46 -08:00
lllyasviel 7e0c6d3421 add some javascripts
add some javascripts
2023-11-12 01:52:37 -08:00
lllyasviel 4fe08161a5 2.1.782
2.1.782
2023-11-11 01:43:01 -08:00
lllyasviel 2342761fa1 allow set device 2023-11-06 00:44:38 -08:00
lllyasviel 10574f1cc2 print argv 2023-11-06 00:05:10 -08:00
lllyasviel 933da40735 also launch from launch.py 2023-11-06 00:01:04 -08:00
lllyasviel f010dc6994
preset system (beta)
preset system
2023-10-13 17:37:49 -07:00
lvmin 9efa4ecd27 allow embeddings download 2023-10-13 14:21:43 -07:00
lvmin b3c6624e82 ini build launcher 2023-10-13 13:25:19 -07:00
lvmin a252f75549 log 2023-10-13 05:02:20 -07:00
lllyasviel e61aac34ca
sync (#658) 2023-10-12 04:23:10 -07:00
lllyasviel 132afcc2a2
rework refiner
rework refiner
2023-10-11 23:44:40 -07:00
lllyasviel f55b15ab41
another way to use backend (#638)
* another way to use backend

* another way to use backend
2023-10-10 18:59:04 -07:00
lllyasviel a0bc991e38
Revert "another way to use backend (#636)" (#637)
This reverts commit df34b640a8.
2023-10-10 18:55:32 -07:00