Commit Graph

876 Commits

Author SHA1 Message Date
Manuel Schmid 89cb354e8b
Merge branch 'feature/persistent-hashing' into develop 2024-07-08 15:13:50 +02:00
Manuel Schmid edd886cea4
feat: make hash generation multi-threaded, change --rebuild-hash-cache from bool to int
keep in mind that most likely the drive is going to be the bottleneck now
2024-07-08 15:08:32 +02:00
Manuel Schmid 68a2a542e3
Merge branch 'feature/add-pony-support-and-preset' into develop
# Conflicts:
#	webui.py
2024-07-01 23:30:18 +02:00
Manuel Schmid 0c2d66e2e5
fix: do not update inpaint engine if inpaint mode is details 2024-07-01 23:26:30 +02:00
Manuel Schmid e75ef84378
Merge branch 'feature/add-pony-support-and-preset' into develop
# Conflicts:
#	webui.py
2024-07-01 23:10:37 +02:00
Manuel Schmid 33c22929e4
feat: add preset option for default_inpaint_engine_version, revert previous overwrite_step changes
add handling with state to allow overrides with inpaint_mode preset setting (currently disabled)
2024-07-01 22:08:52 +02:00
Manuel Schmid 49d898f6c7
wip: set default_overwrite_switch for pony preset
synthetic refiner introduces artifacts, overriding refiner switch disables all refiners (never switches to them)
discussion in https://github.com/lllyasviel/Fooocus/discussions/3217#discussioncomment-9928035
2024-07-01 19:59:22 +02:00
Manuel Schmid f3a44b21d8
feat: allow default_overwrite_switch in preset 2024-07-01 19:50:34 +02:00
Manuel Schmid fbb64533b9
Merge branch 'feature/persistent-hashing' into develop 2024-07-01 18:00:23 +02:00
Manuel Schmid df2dd194cc
feat: only use hash cache logs for exceptions 2024-07-01 17:59:05 +02:00
Manuel Schmid b19ecf410b
feat: add attribute --rebuild-hash-cache, add handling 2024-07-01 17:50:15 +02:00
Manuel Schmid 1fa7eeac84
feat: change type of hash_cache file to txt, append to file if single line is provided 2024-07-01 17:21:30 +02:00
Manuel Schmid 33b1c5cb87
feat: add hash_cache 2024-07-01 17:20:20 +02:00
Manuel Schmid 176a3f31af
Merge branch 'develop_upstream' into develop 2024-07-01 14:31:15 +02:00
licyk 34f67c01a8
feat: add restart sampler (#3219) 2024-07-01 14:24:21 +02:00
Manuel Schmid 9a578b2ebf
Merge branch 'feature/add-pony-support-and-preset' into develop 2024-07-01 13:39:41 +02:00
Manuel Schmid c44f331cee
fix: add missing key vae_downloads to possible_preset_keys 2024-07-01 13:39:26 +02:00
Manuel Schmid f88452262d
Merge branch 'main' into develop 2024-07-01 13:01:35 +02:00
Manuel Schmid 4752166944
fix: use correct metadata when inline prompt LoRAs are used 2024-07-01 13:01:17 +02:00
Manuel Schmid 7068250a99
feat: reload all inpaint modes in enhance tabs when preset is changed and inpaint_mode is set 2024-06-30 20:52:57 +02:00
Manuel Schmid dbbe42ed30
Merge branch 'feature/add-pony-support-and-preset' into develop
# Conflicts:
#	webui.py
2024-06-30 20:51:39 +02:00
Manuel Schmid 333cc6db50
feat: add config default_inpaint_method, reload on start and preset change 2024-06-30 20:19:18 +02:00
Manuel Schmid 37fe0465b7
Merge branch 'feature/add-pony-support-and-preset' into develop
# Conflicts:
#	launch.py
2024-06-30 19:34:56 +02:00
Manuel Schmid bbf90a97b7
feat: add pony preset and vae downloads
uses default SDXL VAE, but the model doesn't include it
2024-06-30 15:44:35 +02:00
Manuel Schmid 40e00f2263
fix: correctly break after user stopped during enhance inpainting 2024-06-30 13:33:28 +02:00
Manuel Schmid c0e556a7f6
fix: get upscale model filepath by calling downloading_upscale_model()
ensures the model exists, called in 80068a0cd7/modules/inpaint_worker.py (L162)
see https://github.com/mashb1t/Fooocus/discussions/42#discussioncomment-9898976
2024-06-30 13:32:21 +02:00
Manuel Schmid 0b2e23a97e
fix: add handling for only enhance upscale fast to not divide by 0 2024-06-27 23:48:32 +02:00
Manuel Schmid 1bc5363e43
fix: add missing prompt return values for upscale fast 2x in enhance 2024-06-27 23:47:30 +02:00
Manuel Schmid 49275c0ba1
refactor: rename checkbox "enable mask upload" to "enable advanced masking features" 2024-06-26 21:20:40 +02:00
Manuel Schmid 96306616bb
fix: move current_task_id increase to handler again
allows access of correct value by callback, does not show 2/1 anymore
2024-06-26 21:04:39 +02:00
Manuel Schmid b3a4b4e532
fix: add missing handling for cloth category for u2net_cloth_seg 2024-06-26 20:21:25 +02:00
Manuel Schmid 6f4d73b349
refactor: code cleanup 2024-06-25 22:06:07 +02:00
Manuel Schmid 32d77909f8
fix: reset last enhance prompts for each enhancement iteration, bump version 2024-06-24 21:59:28 +02:00
Manuel Schmid dfa586d483
refactor: rename enhancement uov flag prompt last to last filled 2024-06-24 21:55:43 +02:00
Manuel Schmid b2a23262fc
feat: only update uov last prompt when all preconditions are met 2024-06-24 21:54:10 +02:00
Manuel Schmid 1d3c0b9bca
fix: use non-prefixed uov attributes in async_worker 2024-06-24 21:49:04 +02:00
Manuel Schmid a245b67531
feat: add config for enhance upv checkbox and method, prefix with default_ 2024-06-24 21:43:38 +02:00
Manuel Schmid 5c1191258e
refactor: use labels as enhancement uov values before and after
allows for usage of label as default value in config
2024-06-24 21:27:47 +02:00
Manuel Schmid 85121a03cb
feat: change default selection for enhancement uov prompt type 2024-06-24 21:26:14 +02:00
Manuel Schmid 00a27e7400
feat: add config and option for uov prompt type 2024-06-24 21:21:11 +02:00
Manuel Schmid 9f9fcfa7ad
fix: start enhance from index 1, not 0 2024-06-24 20:45:50 +02:00
Manuel Schmid acb76adf67
feat: use last enhanced prompt for upscaling if provided
prevents replaced subjects from being replaced again with original subjects when upscaling due to using the original prompt
2024-06-24 20:45:05 +02:00
Manuel Schmid 25f4484c79
fix: correctly display current progress on non-enhance steps after skipping 2024-06-23 18:17:44 +02:00
Manuel Schmid 1ef6367635
feat: add option to process uov either before or after enhance 2024-06-23 17:41:21 +02:00
Manuel Schmid 7ecaee8285
fix: correctly track progress with image_number > 1 and not enhance 2024-06-23 17:40:20 +02:00
Manuel Schmid b094ac820b
fix: only allow one image number if enhance image has been uploaded 2024-06-23 16:21:10 +02:00
Manuel Schmid bd3a29ba68
fix: use 0 steps when upscaling with skip_prompt_processing 2024-06-22 01:45:53 +02:00
Manuel Schmid 7ed98521ec
fix: correctly call upscale vary 2024-06-22 01:06:40 +02:00
Manuel Schmid e8220bae49
feat: display intermediate results wqhen enhance is true 2024-06-22 01:06:22 +02:00
Manuel Schmid 18d294de63
feat: do not extend main prompt when enhance prompt is provided
reduces prompt consistency with input but greatly improves prompt accuracy
2024-06-22 00:14:32 +02:00