Commit Graph

1597 Commits

Author SHA1 Message Date
Manuel Schmid 82f4ffb1f4
Merge branch 'feature/playground-2.5' 2024-06-02 21:00:47 +02:00
Manuel Schmid 7ebc911972
feat: optimize playground v2.5 preset 2024-06-02 16:09:06 +02:00
Manuel Schmid 913fa89c05
Merge branch 'main_upstream' 2024-06-02 02:13:33 +02:00
Manuel Schmid 3d43976e8e
feat: update cmd args (#3075) 2024-06-02 02:13:16 +02:00
Manuel Schmid e504b24f8f
Merge branch 'feature/make-textboxes-resizeable-again' 2024-06-02 01:55:10 +02:00
Manuel Schmid 12bc7af067
feat: set row height to 84, exactly matching 3 lines for positive prompt
eliminate need for JS to resize positive prompt onUiLoaded
2024-06-02 01:54:55 +02:00
Manuel Schmid 6e555fa35a
wip: auto-resize positive prompt on new line
dirty approach as container is hidden and 1px padding is applied for border shadow to actually work
2024-06-02 01:50:42 +02:00
Manuel Schmid 972c2d2bee
Merge branch 'feature/make-textboxes-resizeable-again' 2024-06-02 00:35:30 +02:00
Manuel Schmid 50deba85e7
feat: make textboxes (incl. positive prompt) resizable again 2024-06-02 00:33:07 +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 55750b93d3
feat: change URL to mashb1t 2024-06-01 23:30:52 +02:00
Manuel Schmid 778416c5e0
Merge branch 'main_upstream' 2024-06-01 23:25:21 +02:00
Manuel Schmid daaa27098f
feat: add preset for playground v2.5 2024-06-01 22:59:08 +02:00
Manuel Schmid fe58df35c9
feat: add support for playground 2.5 2024-06-01 22:43:27 +02:00
Manuel Schmid 07c6c89edf
fix: chown files directly at copy (#3066) 2024-05-31 22:41:36 +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 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 f5863d878e
Merge branch 'feature/performance-restricted-features-rework' 2024-05-30 15:18:34 +02:00
Manuel Schmid 5759caaada
feat: rework intermediate image display for restricted performances
disable intermediate results for all performacnes with restricted features

make disable_intermediate_results interactive again even if performance has restricted features
users who want to disable this option should be able to do so, even if performance will be impacted
2024-05-30 15:02:23 +02:00
Manuel Schmid 83ef32a88b
feat: make disable_intermediate_results interactive again even if performance has restricted features
users who want to disable this option should be able to do so, even if performance will be impacted
2024-05-30 14:39:43 +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 8fea1cd9bb
fix: disable intermediate results for all restricted performances
too fast for Gradio, which becomes a bottleneck
2024-05-30 00:17:37 +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 1c400b56e9
Merge branch 'main_upstream' 2024-05-29 20:33:41 +02:00
Manuel Schmid 3ef663c5b7
fix: do not set textContent on undefined when no translation was given #2 (#3046)
* fix: do not set textContent on undefined when no translation was given
2024-05-29 20:33:15 +02:00
Manuel Schmid 515cdde159
Merge branch 'main_upstream' 2024-05-29 19:51:57 +02:00
Manuel Schmid bf70815a66
fix: use default vae name instead of None on file refresh (#3045) 2024-05-29 19:49:07 +02:00
Manuel Schmid 27a4c8b107
Merge remote-tracking branch 'upstream/main'
# Conflicts:
#	fooocus_version.py
2024-05-28 01:13:49 +02:00
Manuel Schmid 725bf05c31
release: bump version to 2.4.1, update changelog (#3027) 2024-05-28 01:10:45 +02:00
Manuel Schmid 96d1b79c15
Merge branch 'main_upstream' 2024-05-28 00:52:10 +02:00
Manuel Schmid 4a070a9d61
feat: build docker image tagged "edge" on push to main branch (#3026)
* feat: build docker image on push to main branch

* feat: add tag "edge" for main when building the docker image

* feat: update name of build container workflow
2024-05-28 00:49:47 +02:00
Manuel Schmid 8c4ce0495d
Merge branch 'feat/build-docker-image-on-push-to-main-branch' 2024-05-28 00:32:40 +02:00
Manuel Schmid 3113b9c17b
feat: add tag "edge" for main when building the docker image 2024-05-28 00:32:31 +02:00
Manuel Schmid f259f00ec5
Merge branch 'feat/build-docker-image-on-push-to-main-branch' 2024-05-28 00:22:37 +02:00
Manuel Schmid abfc42f2e0
feat: build docker image on push to main branch 2024-05-28 00:21:25 +02:00
Manuel Schmid 0e621ae34e
fix: add type check for undefined, use fallback when no translation for aspect ratios was given (#3025) 2024-05-28 00:09:39 +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 9c4e471a3d
Merge branch 'main_upstream'
# Conflicts:
#	webui.py
2024-05-26 19:42:24 +02:00
Manuel Schmid de34023c79
fix: use translation for aspect ratios label (#3001)
use javascript code instead of python handling for updates for https://github.com/lllyasviel/Fooocus/pull/2590
2024-05-26 19:23:21 +02:00