Commit Graph

1544 Commits

Author SHA1 Message Date
Manuel Schmid 6dd718919c
feat: cleanup performance selection, make it completely dynamic 2024-05-26 18:09:22 +02:00
Manuel Schmid 9e038a614a
Merge branch 'Alexdnk/main'
# Conflicts:
#	webui.py
2024-05-26 17:54:02 +02:00
Manuel Schmid fced8b4c24
fix: adjust indent 2024-05-26 17:25:08 +02:00
Manuel Schmid 41eaf39ded
Merge branch 'develop' into main 2024-05-26 17:23:06 +02:00
Manuel Schmid 7b60f1efdd
fix: add missing scroll down for metadata tab 2024-05-26 17:18:50 +02:00
Manuel Schmid be5a152c07
refactor: reorder image number slider, code cleanup 2024-05-26 17:18:03 +02:00
Manuel Schmid 011f65ba78
feat: change title of aspect ratios accordion on load and update 2024-05-26 16:09:23 +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 67289dd0fe
release: bump version to 2.4.0, update changelog 2024-05-26 15:13:54 +02:00
Manuel Schmid cc58fe5270
feat: add clip skip handling (#2999) 2024-05-26 14:18:19 +02:00
Manuel Schmid 4e5509351f
feat: remove labels from most of the image input fields (#2998) 2024-05-26 11:47:33 +02:00
Manuel Schmid 1d1a4a3ebd
feat: add inpaint color picker (#2997)
Workaround as tool color-sketch applies changes directly to the image canvas and not the mask canvas.
Color picker is not correctly implemented in Gradio 3.41.2 => does always get displayed as separate containers and not merged with other elements
2024-05-26 11:40:15 +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
Manuel Schmid 7b70d27032
feat: configure line ending format LF for *.sh files (#2991) 2024-05-24 21:36:07 +02:00
Manuel Schmid a0114de9e9
feat: change preset from option to select, add accordion for resolution 2024-05-23 01:21:08 +02:00
Manuel Schmid ef7abe219b
fix: use correct aspect ratio labels again 2024-05-23 00:28:05 +02:00
xyny 4da5a68c10
feat: build and push container image for ghcr.io, update docker.md, and other related fixes (#2805)
* chore: update cuda version in container

* fix: use symlink to fix error libcuda.so: cannot open shared object file:

* fix: update docker entrypoint to use entry_with_update.py

* feat: add container build & push workflow

* fix: container action run conditions

* fix: container action versions

* fix: container action versions v2

* fix: docker action registry login and metadata

* docs: adjust docker documentation based on latest changes, add docs for podman and docker

* chore: replace image name env var with github.event.repository.name

Co-authored-by: Manuel Schmid <9307310+mashb1t@users.noreply.github.com>

* chore: replace image name env var with github.event.repository.name (pt2)

Co-authored-by: Manuel Schmid <9307310+mashb1t@users.noreply.github.com>

* fix: switch to semver versioning

Co-authored-by: Manuel Schmid <9307310+mashb1t@users.noreply.github.com>

* fix: build only on versioned tags

Co-authored-by: Manuel Schmid <9307310+mashb1t@users.noreply.github.com>

* fix: don't update in entrypoint

Co-authored-by: Manuel Schmid <9307310+mashb1t@users.noreply.github.com>

* fix: remove dash in "docker-compose"

Co-authored-by: Manuel Schmid <9307310+mashb1t@users.noreply.github.com>

* feat: sync pytorch for docker with version used in prepare_environment

* feat: update cuda to 12.4.1

* fix: correctly clone checked out version in builds, not always main

* refactor: remove irrelevant version in docker-compose.yml

---------

Co-authored-by: Manuel Schmid <9307310+mashb1t@users.noreply.github.com>
Co-authored-by: Manuel Schmid <dev@mash1t.de>
2024-05-23 00:19:54 +02:00
Manuel Schmid 9f21fcf68e
Merge branch 'container-updates'
# Conflicts:
#	.github/workflows/build_container.yml
2024-05-23 00:18:04 +02:00
Manuel Schmid 1ab1b52cae
refactor: remove irrelevant version in docker-compose.yml 2024-05-22 23:54:08 +02:00
Manuel Schmid 1b1c3aabc1
fix: correctly clone checked out version in builds, not always main 2024-05-22 23:52:18 +02:00
Manuel Schmid 260193e36f
feat: update cuda to 12.4.1 2024-05-22 23:51:19 +02:00
Manuel Schmid 7f6dfe25a5
feat: sync pytorch for docker with version used in prepare_environment 2024-05-22 23:50:27 +02:00
Manuel Schmid f8483099dd
wip: test https://github.com/lllyasviel/Fooocus/pull/2805 2024-05-22 20:52:44 +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
xyny 299ba4d2a2
fix: remove dash in "docker-compose"
Co-authored-by: Manuel Schmid <9307310+mashb1t@users.noreply.github.com>
2024-05-22 15:39:55 +00:00
xyny ca561944d5
fix: don't update in entrypoint
Co-authored-by: Manuel Schmid <9307310+mashb1t@users.noreply.github.com>
2024-05-22 15:39:34 +00:00
xyny d4e373b83c
fix: build only on versioned tags
Co-authored-by: Manuel Schmid <9307310+mashb1t@users.noreply.github.com>
2024-05-22 15:38:50 +00:00
xyny a80834f3b5
fix: switch to semver versioning
Co-authored-by: Manuel Schmid <9307310+mashb1t@users.noreply.github.com>
2024-05-22 15:38:34 +00:00
xyny 40711b7ac9
chore: replace image name env var with github.event.repository.name (pt2)
Co-authored-by: Manuel Schmid <9307310+mashb1t@users.noreply.github.com>
2024-05-22 15:38:02 +00:00
xyny 7efa300421
chore: replace image name env var with github.event.repository.name
Co-authored-by: Manuel Schmid <9307310+mashb1t@users.noreply.github.com>
2024-05-22 15:37:36 +00: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
xhoxye a9ef2a12c7
Add the information about the size and ratio of the read image 2024-05-21 08:52:13 +08: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 ac14d9d03c
feat: change code owner from @lllyasviel to @mashb1t (#2948) 2024-05-20 17:33:12 +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 7153062a27
feat: ignore custom wildcards 2024-05-20 17:29:18 +02:00
Manuel Schmid 8820f82b41
fix: update unit tests 2024-05-20 17:29:11 +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
Manuel Schmid faa985c71c
fix: resolve circular dependency for unit tests 2024-05-20 17:27:16 +02:00
Manuel Schmid f030490144
feat: add performance loras to the end of the loras array 2024-05-20 17:26:17 +02:00
Manuel Schmid 61710b4ecb
Merge remote-tracking branch 'origin/hotfix/lora-a1111-civitai-hashing'
# Conflicts:
#	modules/config.py
#	modules/meta_parser.py
#	modules/util.py
2024-05-19 21:08:25 +02:00
Manuel Schmid 999e5b2bc6
Merge branch 'feature/add-nsfw-filter'
# Conflicts:
#	extras/censor.py
#	modules/async_worker.py
#	modules/config.py
#	requirements_versions.txt
#	webui.py
2024-05-19 21:00:44 +02:00
Manuel Schmid b1033f1efd
Merge branch 'lora-reference-parsing'
# Conflicts:
#	modules/async_worker.py
2024-05-19 20:57:57 +02:00
Manuel Schmid b574ad9392
Merge branch 'feature/add-nsfw-filter'
# Conflicts:
#	extras/censor.py
#	modules/async_worker.py
#	modules/config.py
#	requirements_versions.txt
#	webui.py
2024-05-19 20:55:39 +02:00