Foreign-Mirrors/Fooocus
1
0
Fork 0
mirror of https://github.com/lllyasviel/Fooocus.git synced 2026-08-16 13:13:16 +02:00
Code Issues Packages Projects Releases Wiki Activity
1,692 Commits 15 Branches 23 Tags
c0397bddbdb6ea5427fc4f0362f1488de6fd65aa
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Manuel Schmid c0397bddbd feat: enable edit attention with ctrl + arrow keys for enhance prompts 2024-06-18 22:39:09 +02:00
Manuel Schmid 6cb0b2143b fix: correctly initialize inpaint_mask var, rename task styles index 2024-06-18 22:38:36 +02:00
Manuel Schmid dd866616bc refactor: code cleanup 2024-06-18 22:16:48 +02:00
Manuel Schmid c0f7c3a8ee feat: add erode or dilate and mask invert to enhance mask inpaint settings 2024-06-18 21:39:27 +02:00
Manuel Schmid 229ff81738 refactor: rename max_num_boxes to max_detections 2024-06-18 21:07:27 +02:00
Manuel Schmid b7fb42436c fix: correctly calculate current progress, display progressbar without any jumping 2024-06-18 12:35:41 +02:00
Manuel Schmid 1175df843b fix: correctly proceed progress bar within tasks 
does not yet include jumping back for preparation steps
 2024-06-18 11:48:42 +02:00
Manuel Schmid 3567c04918 wip: refactor code to make it more efficient 
now first processes all tasks and then does enhancements
 2024-06-17 21:46:00 +02:00
Manuel Schmid 24d66f6f77 Revert "feat: update GroundingDINO from SwinT (tiny) to SwinB (base)" 
This reverts commit 7f3fd8f318.
 2024-06-16 23:22:21 +02:00
Manuel Schmid 7f3fd8f318 feat: update GroundingDINO from SwinT (tiny) to SwinB (base) 2024-06-16 23:22:10 +02:00
Manuel Schmid 65cc25e5bf feat: add debug setting for enhance mask output 2024-06-16 22:54:44 +02:00
Manuel Schmid e300930298 feat: improve performance, do not reload the pipeline when prompts are the same as in the original task 2024-06-16 22:18:11 +02:00
Manuel Schmid 33a9c156ad fix: do not apply loras more than one time when not using lora in prompt 2024-06-16 21:40:39 +02:00
Manuel Schmid eeb1b79baa feat: optimize prompt translation 2024-06-16 21:40:07 +02:00
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 e1be3fa37a Merge branch 'main' into feature/multi-step-rendering 2024-06-16 18:54:52 +02:00
Manuel Schmid cecd6876a5 Merge branch 'hotfix/add-missing-method-in-performance' 2024-06-16 18:54:42 +02:00
Manuel Schmid 9ef7fe0843 hotfix: add missing method in performance enum 2024-06-16 18:52:20 +02:00
Manuel Schmid b64d6d393c fix: use != for literal comparison 2024-06-16 18:49:52 +02:00
Manuel Schmid 64fc025c50 Merge branch 'main' into feature/multi-step-rendering 2024-06-16 18:44:54 +02:00
Manuel Schmid af209cda53 fix: add workaround for same value in Steps IntEnum 
(cherry picked from commit ea1562d078)
 2024-06-16 18:41:17 +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 ea1562d078 fix: add workaround for same value in Steps IntEnum 2024-06-16 17:46:48 +02:00
Manuel Schmid e279d032ef Merge branch 'hotfix/correctly-filter-performance-lora' 2024-06-16 16:50:47 +02:00
Manuel Schmid 2704c90997 Merge branch 'hotfix/correctly-filter-performance-lora' into feature/multi-step-rendering 2024-06-16 16:50:26 +02:00
Manuel Schmid 6b17bf56d1 fix: correctly identify and remove performance LoRA 
(cherry picked from commit b3e4506009)
(cherry picked from commit b947a5a4e6)
 2024-06-16 16:50:04 +02:00
Manuel Schmid b947a5a4e6 fix: correctly identify and remove performance LoRA 
(cherry picked from commit b3e4506009)
 2024-06-16 16:48:35 +02:00
Manuel Schmid b3e4506009 fix: correctly identify and remove performance LoRA 2024-06-16 16:48:12 +02:00
Manuel Schmid 541fb2d445 feat: add support for enhance prompts 2024-06-16 15:58:27 +02:00
Manuel Schmid b585d9dfa7 fix: correctly count sam masks 2024-06-16 15:57:53 +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 a71739026b refactor: change wording of hint when nothing has been detected 2024-06-13 01:19:28 +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 190c4b0a6f fix: do not set denoising_strength to async_worker dynamically 
use parameter input and output
 2024-06-12 21:51:49 +02:00
Manuel Schmid 2590230bcd Merge branch 'main' into feature/multi-step-rendering 2024-06-11 22:56:35 +02:00
Manuel Schmid 07de6dd5f8 Merge remote-tracking branch 'upstream/main' 2024-06-11 22:56:17 +02:00
Manuel Schmid e055510f1b fix: use correct mask dimensions 2024-06-11 00:12:02 +02:00
Manuel Schmid b5b33361c9 feat: only process sam_options.dino_erode_or_dilate when set 2024-06-10 23:47:09 +02:00
Manuel Schmid ab3f4df935 feat: use vit_b as default for experiment 2024-06-10 23:46:50 +02:00
Manuel Schmid ead1ed617a refactor: remove adetailer code 2024-06-10 23:46:25 +02:00
Manuel Schmid 29967d3a18 feat: add dino_erode_or_dilate and dino_debug again 2024-06-10 23:23:38 +02:00
Manuel Schmid 757863c023 feat: wrap sam model in model patcher for predict 2024-06-10 22:42:35 +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 b8578a080a fix: remove already declared config option 2024-06-10 20:46:25 +02:00
Manuel Schmid 3873892b0a feat: change default_inpaint_mask_sam_model to match sam model registry 2024-06-10 20:45:56 +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 f2e7b65ed3 wip: add experiments mask generation, install segment_anything v1.0 2024-06-09 18:48:01 +02:00
Manuel Schmid 8087861743 refactor: reorder inpaint_mask_sam_model by model size ascending 2024-06-09 18:46:18 +02:00
Manuel Schmid ff9fa6c837 feat: add box_erode_or_dilate to generate_mask_from_image, expose more sam return values 2024-06-09 18:45:13 +02:00
Manuel Schmid 9affa32583 feat: set inpaint_respective_field manually 2024-06-09 01:36:32 +02:00
Manuel Schmid 85b9005fa7 wip: adjust progressbar 2024-06-09 01:23:44 +02:00
Manuel Schmid 5d8353eb74 fix: correctly reset pipeline 
reset unet and inpaint worker after each adetailer task, improve memory efficiency
 2024-06-09 01:10:11 +02:00
Manuel Schmid df70294a3e wip: add adetailer 2024-06-08 23:30:45 +02:00
Manuel Schmid bb72938261 refactor: always use format width, height 2024-06-08 21:41:30 +02:00
Manuel Schmid c79f6bd461 refactor: move methods to handler scope 2024-06-08 20:33:47 +02:00
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 219c494e58 feat: update readme 2024-06-05 22:11:57 +02:00
Manuel Schmid b113eca87e release: bump version to 2.4.2, update changelog 2024-06-05 21:58:51 +02:00
Manuel Schmid 85a8deecee release: bump version to 2.4.2, update changelog 2024-06-05 21:30:43 +02:00
Manuel Schmid cb24c686b0 Merge branch 'main_upstream' into develop_upstream 2024-06-04 20:11:42 +02:00
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 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 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