Commit Graph

440 Commits

Author SHA1 Message Date
Manuel Schmid 9c93c18d0b
fix: process other models than sam when using enhance 2024-06-16 21:05:10 +02:00
Manuel Schmid ff3418876d
feat: refresh the whole pipeline, allows usage of inpaint and enhancement prompts 2024-06-16 20:44:35 +02:00
Manuel Schmid bf6820812f
feat: only process enhance when checkbox is set
similar to input image
2024-06-16 18:39:40 +02:00
Manuel Schmid ef9fd293ff
wip: rename stage2 to enhance 2024-06-16 12:45:18 +02:00
Manuel Schmid a3dcd6e1fd
wip: add inputs for positive and negative prompt for stage2 2024-06-16 12:39:05 +02:00
Manuel Schmid 71f5e70085
refactor: rename segmentation prompt to detection prompt
improved wording: prompt is only applied for GroundingDINO, not actually for segmentation
2024-06-16 12:30:49 +02:00
Manuel Schmid 8b21303542
wip: refactor UI for stage2 2024-06-15 01:38:22 +02:00
Manuel Schmid db0e0aaf59
wip: add inpaint options to stage2 2024-06-14 23:58:59 +02:00
Manuel Schmid f89d5a97b0
refactor: change wording of stage2 disclaimer, adjust gradio structure accordingly 2024-06-13 01:17:20 +02:00
Manuel Schmid f8f36828c7
feat: add disclaimer + skipping, stage2 won't properly work when used with inpaint or outpaint 2024-06-13 01:13:21 +02:00
Manuel Schmid dbc844804b
feat: add handling for stage2_mask_sam_max_num_boxes and config 2024-06-12 22:16:02 +02:00
Manuel Schmid 9998b52dd2
feat: add gradio elements for input 2024-06-12 21:52:48 +02:00
Manuel Schmid 651f9c5cfd
refactor: rename box_erode_or_dilate to dino_erode_or_dilate, add option dino_debug 2024-06-10 20:47:22 +02:00
Manuel Schmid ce1fb74270
feat: add download for sam models to config 2024-06-10 20:33:49 +02:00
Manuel Schmid 980563de9d
feat: remove inpaint_mask_sam_quant 2024-06-10 20:32:12 +02:00
Manuel Schmid 8a81993940
wip: remove ultralytics, always use manual sam for image mask instead of rembg 2024-06-10 01:33:03 +02:00
Manuel Schmid 09e23f5509
refactor: add info to inpaint_mask_sam_prompt_text, rename variable for dino debugging 2024-06-09 23:09:46 +02:00
Manuel Schmid 57c049858c
feat: add debug dino and mask dilate and erode 2024-06-09 22:31:41 +02:00
Manuel Schmid e504b24f8f
Merge branch 'feature/make-textboxes-resizeable-again' 2024-06-02 01:55:10 +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 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 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 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 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
Alexdnk 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
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 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
Manuel Schmid 04f64ab0bc
feat: add translation for image size describe (#2992) 2024-05-24 21:58:17 +02:00
Manuel Schmid a0114de9e9
feat: change preset from option to select, add accordion for resolution 2024-05-23 01:21:08 +02:00