Manuel Schmid
c1f62361ba
refactor: add EarlyReturnException to prevent return value issues
2024-06-08 20:25:50 +02:00
Manuel Schmid
e58d913fbb
refactor: extract async_worker handle method into separate functions
2024-06-08 19:55:31 +02:00
Manuel Schmid
9c352b6eb7
Merge branch 'main_upstream'
...
# Conflicts:
# fooocus_version.py
# modules/config.py
# modules/extra_utils.py
2024-06-06 19:50:15 +02:00
Manuel Schmid
db36766f34
Merge branch 'fix/try-parse-env-var-strings-as-boolean'
...
# Conflicts:
# modules/config.py
2024-06-06 19:40:14 +02:00
Manuel Schmid
5abae220c5
feat: parse env var strings to expected config value types ( #3107 )
...
* fix: add try_parse_bool for env var strings to enable config overrides of boolean values
* fix: fallback to given value if not parseable
* feat: extend eval to all valid types
* fix: remove return type
* fix: prevent strange type conversions by providing expected type
* feat: add tests
2024-06-06 19:29:08 +02:00
Manuel Schmid
09be2c972c
fix: prevent strange type conversions by providing expected type
2024-06-06 19:13:17 +02:00
Manuel Schmid
2186d3e15d
fix: remove return type
2024-06-06 18:38:58 +02:00
Manuel Schmid
bef79e3cb4
feat: extend eval to all valid types
2024-06-06 18:37:00 +02:00
Manuel Schmid
beab2b9d48
fix: fallback to given value if not parseable
2024-06-06 18:20:14 +02:00
Manuel Schmid
c4faf2ae6c
fix: add try_parse_bool for env var strings to enable config overrides of boolean values
2024-06-06 18:05:55 +02:00
Manuel Schmid
c8093ac1ca
Merge branch 'lllyasviel:main' into main
2024-06-06 14:03:19 +02:00
Manuel Schmid
04d764820e
fix: correctly set alphas_cumprod ( #3106 )
2024-06-06 13:42:26 +02:00
Manuel Schmid
b113eca87e
release: bump version to 2.4.2, update changelog
2024-06-05 21:58:51 +02:00
Manuel Schmid
2d55a5f257
feat: add support for playground v2.5 ( #3073 )
...
* feat: add support for playground v2.5
* feat: add preset for playground v2.5
* feat: change URL to mashb1t
* feat: optimize playground v2.5 preset
2024-06-04 20:15:49 +02:00
Manuel Schmid
cb24c686b0
Merge branch 'main_upstream' into develop_upstream
2024-06-04 20:11:42 +02:00
Manuel Schmid
30b2a9536e
Merge branch 'feature/playground-2.5'
...
# Conflicts:
# modules/flags.py
2024-06-01 23:31:19 +02:00
Manuel Schmid
778416c5e0
Merge branch 'main_upstream'
2024-06-01 23:25:21 +02:00
Manuel Schmid
fe58df35c9
feat: add support for playground 2.5
2024-06-01 22:43:27 +02:00
Manuel Schmid
7899261755
fix: turbo scheduler loading issue ( #3065 )
...
* fix: correctly load ModelPatcher
* feat: do not load model at all, not needed
2024-05-31 22:24:19 +02:00
Manuel Schmid
4e658bb63a
feat: optimize performance lora filtering in metadata ( #3048 )
...
* feat: add remove_performance_lora method
* feat: use class PerformanceLoRA instead of strings in config
* refactor: cleanup flags, use __member__ to check if enums contains key
* feat: only filter lora of selected performance instead of all performance LoRAs
* fix: disable intermediate results for all restricted performances
too fast for Gradio, which becomes a bottleneck
* refactor: rename parse_json to to_json, rename parse_string to to_string
* feat: use speed steps as default instead of hardcoded 30
* feat: add method to_steps to Performance
* refactor: remove method ordinal_suffix, not needed anymore
* feat: only filter lora of selected performance instead of all performance LoRAs
both metadata and history log
* feat: do not filter LoRAs in metadata parser but rather in metadata load action
2024-05-30 16:14:28 +02:00
Manuel Schmid
5768330142
Merge branch 'feature/optimize-performance-lora-filtering-in-metadata'
...
# Conflicts:
# modules/flags.py
# modules/util.py
# webui.py
2024-05-30 15:21:04 +02:00
Manuel Schmid
2dca5ba638
feat: do not filter LoRAs in metadata parser but rather in metadata load action
2024-05-30 01:32:09 +02:00
Manuel Schmid
91281e5561
feat: only filter lora of selected performance instead of all performance LoRAs
...
both metadata and history log
2024-05-30 00:22:31 +02:00
Manuel Schmid
9c8ffbbe18
refactor: remove method ordinal_suffix, not needed anymore
2024-05-30 00:21:18 +02:00
Manuel Schmid
1981ace9e1
feat: add method to_steps to Performance
2024-05-30 00:20:53 +02:00
Manuel Schmid
f8f2455b65
feat: use speed steps as default instead of hardcoded 30
2024-05-30 00:20:23 +02:00
Manuel Schmid
db8228d8f5
refactor: rename parse_json to to_json, rename parse_string to to_string
2024-05-30 00:19:35 +02:00
Manuel Schmid
e3060e00d4
feat: only filter lora of selected performance instead of all performance LoRAs
2024-05-30 00:16:34 +02:00
Manuel Schmid
55b01a81a6
refactor: cleanup flags, use __member__ to check if enums contains key
2024-05-30 00:14:27 +02:00
Manuel Schmid
9564341fbd
feat: use class PerformanceLoRA instead of strings in config
2024-05-30 00:13:14 +02:00
Manuel Schmid
4127fa410b
feat: add remove_performance_lora method
2024-05-30 00:11:07 +02:00
Manuel Schmid
4361e7e629
Merge remote-tracking branch 'upstream/main'
2024-05-27 00:30:53 +02:00
Manuel Schmid
dfff9b7dcf
fix: adjust clip skip default value from 1 to 2 ( #3011 )
...
* Revert "Revert "feat: add clip skip handling (#2999 )" (#3008 )"
This reverts commit 989a1ad52b .
* feat: use clip skip 2 as default
2024-05-27 00:28:22 +02:00
Manuel Schmid
08877666ba
Merge branch 'main_upstream'
2024-05-26 22:14:20 +02:00
Manuel Schmid
989a1ad52b
Revert "feat: add clip skip handling ( #2999 )" ( #3008 )
...
This reverts commit cc58fe5270 .
2024-05-26 22:07:44 +02:00
Manuel Schmid
6dd718919c
feat: cleanup performance selection, make it completely dynamic
2024-05-26 18:09:22 +02:00
Manuel Schmid
f82aa8a909
Merge branch 'develop_upstream'
...
# Conflicts:
# fooocus_version.py
# modules/util.py
# tests/test_utils.py
# webui.py
2024-05-26 15:28:08 +02:00
Manuel Schmid
cc58fe5270
feat: add clip skip handling ( #2999 )
2024-05-26 14:18:19 +02:00
Alexdnk
d850bca09f
feat: read value 'CFG Mimicking from TSNR' (adaptive_cfg) from presets ( #2990 )
2024-05-24 22:05:28 +02:00
Manuel Schmid
04f64ab0bc
feat: add translation for image size describe ( #2992 )
2024-05-24 21:58:17 +02:00
xhoxye
302bfdf855
feat: read size and ratio of an image and provide the recommended size ( #2971 )
...
* Add the information about the size and ratio of the read image
* feat: use available aspect ratios from config, move function to util, change default visibility of label
* refactor: extract sdxl aspect ratios to flags, use in describe
as discussed in
https://github.com/lllyasviel/Fooocus/pull/2971#discussion_r1608493765
https://github.com/lllyasviel/Fooocus/pull/2971#issuecomment-2123620595
---------
Co-authored-by: Manuel Schmid <dev@mash1t.de>
Co-authored-by: Manuel Schmid <9307310+mashb1t@users.noreply.github.com>
2024-05-22 20:47:44 +02:00
Manuel Schmid
ebae829f43
Merge branch 'read-image-size'
...
# Conflicts:
# modules/util.py
# webui.py
2024-05-22 20:44:22 +02:00
Manuel Schmid
751e867b37
refactor: extract sdxl aspect ratios to flags, use in describe
...
as discussed in
https://github.com/lllyasviel/Fooocus/pull/2971#discussion_r1608493765
https://github.com/lllyasviel/Fooocus/pull/2971#issuecomment-2123620595
2024-05-22 20:38:03 +02:00
Manuel Schmid
311c445090
feat: use available aspect ratios from config, move function to util, change default visibility of label
2024-05-21 22:31:27 +02:00
Manuel Schmid
7537612bcc
feat: only use valid inline loras, add subfolder support ( #2968 )
2024-05-20 19:21:41 +02:00
Manuel Schmid
de1c77a923
Merge branch 'feature/inline-lora-optimisations-2'
...
# Conflicts:
# modules/util.py
# tests/test_utils.py
2024-05-20 19:19:33 +02:00
Manuel Schmid
045d03ddad
feat: only use valid inline loras, add subfolder support
2024-05-20 19:08:35 +02:00
Manuel Schmid
65a8b25129
feat: inline lora optimisations ( #2967 )
...
* feat: add performance loras to the end of the loras array
* fix: resolve circular dependency for unit tests
* feat: allow multiple matches for each token, optimize and extract method cleanup_prompt
* fix: update unit tests
* feat: ignore custom wildcards
2024-05-20 17:31:51 +02:00
Manuel Schmid
44b46bffba
Merge branch 'feature/inline-lora-optimisations'
2024-05-20 17:31:30 +02:00
Manuel Schmid
0d1310d9e9
feat: allow multiple matches for each token, optimize and extract method cleanup_prompt
2024-05-20 17:28:55 +02:00