Commit Graph

1622 Commits

Author SHA1 Message Date
Manuel Schmid e541097451
wip: code cleanup, update todos 2024-01-29 21:54:22 +01:00
Manuel Schmid 2656356206
fix: use correct order to read LoRA in meta parser 2024-01-29 18:17:51 +01:00
Manuel Schmid e388f6fff6
wip: code cleanup, update todos 2024-01-29 16:38:39 +01:00
Manuel Schmid 33d644f4a5
feat: add prefix "Fooocus" to version 2024-01-29 16:29:40 +01:00
Manuel Schmid 7fefe3a3c2
feat: add created_by again 2024-01-29 16:28:47 +01:00
Manuel Schmid c80011b1d1
fix: use correct LoRA mapping, add fallback for backwards compatibility 2024-01-29 15:45:55 +01:00
Manuel Schmid 20e53028a4
refactor: use central flag for ControlNet image count 2024-01-29 14:27:51 +01:00
Manuel Schmid c3ab9f1f30
refactor: use central flag for LoRA count 2024-01-29 14:26:56 +01:00
Manuel Schmid 13d0341a02
feat: sort styles after metadata import 2024-01-29 01:52:42 +01:00
Manuel Schmid f94b96f6eb
wip: add prompt style extraction for A1111 scheme 2024-01-29 01:52:24 +01:00
Manuel Schmid 5e84a45e22
feat: add A1111 prompt style detection
only detects one style as Fooocus doesn't wrap {prompt} with the whole style, but has a separate prompt string for each style
2024-01-28 23:52:06 +01:00
Manuel Schmid 236278948b
chore: code cleanup 2024-01-28 23:50:56 +01:00
Manuel Schmid 5dcb2bc573
fix: correctly map resolution, use empty styles for A1111 2024-01-28 20:42:58 +01:00
Manuel Schmid cbc63ebba3
feat: add enums for Performance, Steps and StepsUOV
also move MetadataSchema enum to prevent circular dependency
2024-01-28 20:01:33 +01:00
Manuel Schmid 7ddd4e5209
wip: optimize handling for metadata in Gradio calls 2024-01-28 19:58:36 +01:00
Manuel Schmid e19596c2df
feat: map basic information for scheme A1111 2024-01-28 18:04:40 +01:00
Manuel Schmid ee21c2b6bc
feat: rename metadata tab and import button label 2024-01-28 18:02:15 +01:00
Manuel Schmid f3010313fc
wip: add metadata mapping, reading and writing
applying data after reading currently not functional for A1111
2024-01-28 05:35:44 +01:00
lllyasviel 1bcbd6501b fix config 2024-01-27 16:18:26 -08: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 9685a90090
Merge branch 'feature/add-inpaint-mask-generation' 2024-01-27 21:48:41 +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 31fc99d2bc
fix (#2069) 2024-01-27 09:07:30 -08:00
lllyasviel 3b1cd37631
Merge pull request #2068 from lllyasviel/dev0127
2.1.864
2024-01-27 09:01:44 -08:00
lllyasviel 0cb2db9c41 Update readme.md 2024-01-27 09:00:46 -08:00
lllyasviel 79afb3a619 version
version

Update fooocus_version.py
2024-01-27 08:31:25 -08:00
lllyasviel 7b26b29226 new model list
i

Update readme.md
2024-01-27 08:30:46 -08: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
Hunter-Houts ff2187efed Upgrade requirements_met function (#1955)
* Upgrade requirements_met function

* Removed extra import

* Using Requirements instead of Regex
2024-01-27 05:12:34 -08:00
rayleichenxi 80068a0cd7 [enhance]: use opencv to rewrite morphological_open(), achieve a 40x speed increase in morphological_open opporation, for inpanting images size smaller than 3k (#2016)
Co-authored-by: 雷晨曦 <leichenxi@qiyi.com>
2024-01-27 05:12:34 -08:00
lllyasviel 1cc40d24d7 backend 2024-01-27 05:12:34 -08:00
Pradhyo Bijja 0b00aaf897
add venv mentioned in the readme to gitignore (#2038) 2024-01-27 04:59:04 -08:00
Manuel Schmid f97e682e80
Merge pull request #7 from rayronvictor/feature/add-inpaint-mask-generation
fix error when run_grounded_sam finds no boxes
2024-01-26 12:16:21 +01:00
rayronvictor dd5264dd14 fix error when run_grounded_sam find no boxes 2024-01-26 07:58:57 -03:00
Manuel Schmid 1ae495f6b8
Merge branch 'feature/add-inpaint-mask-generation'
# Conflicts:
#	requirements_versions.txt
#	webui.py
2024-01-26 11:32:53 +01: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
Manuel Schmid 62fe86f1e8
chore: always use cpu as default device
this is overridden anyways
2024-01-26 02:34:25 +01:00
Manuel Schmid 486c5b4fa5
Merge branch 'feature/add-inpaint-mask-generation-2' into feature/add-inpaint-mask-generation 2024-01-26 02:10:34 +01:00
Manuel Schmid 338004c2e5
feat: optimize gradio element visibility changes and data provisioning 2024-01-26 02:08:27 +01:00
Manuel Schmid d515d0f074
fix: remove unnecessary fp32 / fp16 handling 2024-01-26 02:06:17 +01:00
Manuel Schmid 90be73a6df
feat: add model patching
automatically unload model when not needed anymore
2024-01-26 02:05:38 +01:00
Manuel Schmid 051faf78b8
fix: use correct default value in metadata check for created_by 2024-01-25 23:49:25 +01:00
Manuel Schmid 20b79788a0
feat: add resolved prompts to metadata 2024-01-25 23:48:47 +01:00
Manuel Schmid 510b587e84
fix: use pnginfo "parameters" insteadf of "Comments"
see https://github.com/RupertAvery/DiffusionToolkit/issues/202 and cf2772fab0/modules/processing.py (L939)
2024-01-25 21:08:19 +01:00
Manuel Schmid 3812228758
Merge branch 'main_upstream' into feature/add-metadata-to-files 2024-01-25 21:01:51 +01:00
rayronvictor 860ac91b16 Merge remote-tracking branch 'upstream/feature/add-inpaint-mask-generation' into feature/add-inpaint-mask-generation
# Conflicts:
#	webui.py
2024-01-25 16:49:19 -03:00
rayronvictor 228a0aaeea Add SAM support 2024-01-25 16:45:02 -03:00
Manuel Schmid 366984ca64
Merge branch 'feature/add-inpaint-mask-generation'
# Conflicts:
#	webui.py
2024-01-25 10:48:40 +01:00
Manuel Schmid d2b697f33b
refactor: rename cloth_category to inpaint_mask_cloth_category 2024-01-25 10:47:34 +01:00