e504b24f8f
Merge branch 'feature/make-textboxes-resizeable-again'
2024-06-02 01:55:10 +02:00
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
972c2d2bee
Merge branch 'feature/make-textboxes-resizeable-again'
2024-06-02 00:35:30 +02:00
50deba85e7
feat: make textboxes (incl. positive prompt) resizable again
2024-06-02 00:33:07 +02:00
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
f5863d878e
Merge branch 'feature/performance-restricted-features-rework'
2024-05-30 15:18:34 +02:00
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
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
db8228d8f5
refactor: rename parse_json to to_json, rename parse_string to to_string
2024-05-30 00:19:35 +02:00
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
515cdde159
Merge branch 'main_upstream'
2024-05-29 19:51:57 +02:00
bf70815a66
fix: use default vae name instead of None on file refresh ( #3045 )
2024-05-29 19:49:07 +02:00
4361e7e629
Merge remote-tracking branch 'upstream/main'
2024-05-27 00:30:53 +02:00
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
2024-05-27 00:28:22 +02:00
08877666ba
Merge branch 'main_upstream'
2024-05-26 22:14:20 +02:00
989a1ad52b
Revert "feat: add clip skip handling ( #2999 )" ( #3008 )
...
This reverts commit cc58fe5270
2024-05-26 22:07:44 +02:00
9c4e471a3d
Merge branch 'main_upstream'
...
# Conflicts:
# webui.py
2024-05-26 19:42:24 +02:00
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
57d2f2a0dd
feat: make ui settings more compact ( #2590 )
...
* Slightly more compact ui settings
Changed Radio to Dropdown.
* feat: change preset from option to select, add accordion for resolution
* feat: change title of aspect ratios accordion on load and update
* refactor: reorder image number slider, code cleanup
* fix: add missing scroll down for metadata tab
* fix: adjust indent
---------
Co-authored-by: Manuel Schmid <dev@mash1t.de>
Co-authored-by: Manuel Schmid <9307310+mashb1t@users.noreply.github.com>
2024-05-26 18:10:29 +02:00
6dd718919c
feat: cleanup performance selection, make it completely dynamic
2024-05-26 18:09:22 +02:00
9e038a614a
Merge branch 'Alexdnk/main'
...
# Conflicts:
# webui.py
2024-05-26 17:54:02 +02:00
fced8b4c24
fix: adjust indent
2024-05-26 17:25:08 +02:00
41eaf39ded
Merge branch 'develop' into main
2024-05-26 17:23:06 +02:00
7b60f1efdd
fix: add missing scroll down for metadata tab
2024-05-26 17:18:50 +02:00
be5a152c07
refactor: reorder image number slider, code cleanup
2024-05-26 17:18:03 +02:00
011f65ba78
feat: change title of aspect ratios accordion on load and update
2024-05-26 16:09:23 +02:00
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
cc58fe5270
feat: add clip skip handling ( #2999 )
2024-05-26 14:18:19 +02:00
4e5509351f
feat: remove labels from most of the image input fields ( #2998 )
2024-05-26 11:47:33 +02:00
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
04f64ab0bc
feat: add translation for image size describe ( #2992 )
2024-05-24 21:58:17 +02:00
a0114de9e9
feat: change preset from option to select, add accordion for resolution
2024-05-23 01:21:08 +02:00
ef7abe219b
fix: use correct aspect ratio labels again
2024-05-23 00:28:05 +02:00
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
ebae829f43
Merge branch 'read-image-size'
...
# Conflicts:
# modules/util.py
# webui.py
2024-05-22 20:44:22 +02:00
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
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
a9ef2a12c7
Add the information about the size and ratio of the read image
2024-05-21 08:52:13 +08:00
dd5a14ac7f
Merge branch 'feature/progress-bar'
...
# Conflicts:
# fooocus_version.py
# modules/async_worker.py
# webui.py
2024-05-19 20:54:53 +02:00
00d3d1b4b3
feat: add nsfw image censoring via config and checkbox ( #958 )
...
* add nsfw image censoring
activatable via config, uses CompVis/stable-diffusion-safety-checker
* fix progressbar call for nsfw output
* use config to set cache dir for safety checker
* add checkbox black_out_nsfw
makes both enabling via config and checkbox possible, where config overrides the checkbox value
* fix: add missing diffusers package
* feat: extract safety checker, remove dependency to diffusers
* feat: make code compatible again after merge with main
* feat: move censor to extras, optimize safety checker file handling
* refactor: rename folder safety_checker_models to safety_checker
2024-05-18 15:50:28 +02:00
6c49df5e04
Merge branch 'feature/automatically-describe-uov-image'
2024-05-17 18:26:32 +02:00
33fa175bd4
feat: automatically describe image on uov image upload ( #1938 )
...
* feat: automatically describe image on uov image upload if prompt is empty
* feat: add argument to disable automatic uov image description
* feat: rename argument, disable by default
this prevents computers with low hardware specifications from being unnecessary blocked
2024-05-17 18:25:08 +02:00
24721a8511
feat: rename argument, disable by default
...
this prevents computers with low hardware specifications from being unnecessary blocked
2024-05-17 18:19:48 +02:00
cb34100295
feat: add argument to disable automatic uov image description
2024-05-17 17:42:15 +02:00
72f59c9554
Merge branch 'main_upstream' into feature/automatically-describe-uov-image
2024-05-17 17:33:19 +02:00
d7dfd6cdf2
Merge commit '3b27a11a90611cc4c1f4a1d24036d127be3ce770'
...
# Conflicts:
# language/en.json
# webui.py
2024-05-09 19:15:34 +02:00
052393bb9b
refactor: rename label for reconnect button ( #2893 )
...
* feat: add button to reconnect UI without having to reload the page
* qa: add missing semicolon
* refactor: rename button label to "Reconnect"
2024-05-09 19:13:59 +02:00
3b27a11a90
refactor: rename button label to "Reconnect"
2024-05-09 19:09:14 +02:00
c32bc5e199
feat: add optional model VAE select ( #2867 )
...
* Revert "fix: use LF as line breaks for Docker entrypoint.sh (#2843 )" (#2865 )
False alarm, worked as intended before. Sorry for the fuzz.
This reverts commit d16a54edd6
2024-05-09 18:59:35 +02:00
a6207a949a
Merge branch 'feature/add-vae-select'
2024-05-05 01:07:39 +02:00
Manuel Schmid
Manuel Schmid
Alexdnk
xhoxye