98ba1d5d47
fix: correctly sort files, display deepest dir level first ( #1784 )
2024-02-10 19:03:26 +01:00
d1a450c581
Fixed mistakes in HTML generation ( #2187 )
...
Added <!DOCTYPE html> declaration
<img/> instead of <img></img>
<br/> instead of </br>
2024-02-10 17:50:41 +01:00
b281375ce2
feat: add exif data processing (saving and loading)
2024-02-04 23:29:48 +01:00
ceefba9b69
Merge branch 'feature/add-metadata-to-files'
...
# Conflicts:
# language/en.json
# modules/async_worker.py
# modules/config.py
# modules/flags.py
# modules/meta_parser.py
# modules/private_logger.py
# modules/util.py
# webui.py
2024-02-04 21:09:24 +01:00
832441e86d
chore: loosen strict type for parse_json, fix indent
2024-02-04 19:26:10 +01:00
c104d58f76
fix: parse adaptive_cfg as float instead of string
2024-02-04 19:25:20 +01:00
dfb48fd754
feat: add better handling for image import with empty metadata
2024-02-04 19:24:45 +01:00
6dadc3314d
Merge remote-tracking branch 'upstream/main'
...
# Conflicts:
# modules/config.py
2024-02-04 14:29:54 +01:00
59dd1c2d12
Merge remote-tracking branch 'upstream/main' into feature/add-metadata-to-files
2024-02-04 13:55:00 +01:00
fe33cc7114
feat: add mapping for _gpu samplers to cpu samplers
...
gpu samplers are less deterministic than cpu but in general similar, see https://www.reddit.com/r/comfyui/comments/15hayzo/comment/juqcpep/
2024-02-04 13:54:38 +01:00
c668228fe8
chore: specify too broad exception types
2024-02-04 01:31:24 +01:00
8af73e622f
chore: remove remaining todos after analysis
...
refiner is added when set
restoring multiline prompts has been resolved by using separate parameters "raw_prompt" and "raw_negative_prompt"
2024-02-04 00:44:26 +01:00
1419231e74
feat: prevent config reset by renaming metadata_scheme to match config options
2024-02-03 22:41:26 +01:00
63403d614e
feat: add sampler mapping
2024-02-02 23:44:47 +01:00
ed4a958da8
fix: add workaround for multiline prompts
2024-02-02 22:04:28 +01:00
349556bfa6
fix: remove sorting for A1111, change performance key position
...
fixes https://github.com/lllyasviel/Fooocus/pull/1940#issuecomment-1924444633
2024-02-02 20:58:16 +01:00
1c3431e6a7
wip: add TODO for ultiline prompt style resolution
2024-02-02 02:02:41 +01:00
9aa82aa80a
fix: add missing refiner in A1111 parse_json
2024-02-02 01:57:33 +01:00
f745d40687
refactor: merge metadata.py into meta_parser.py
2024-02-02 01:55:32 +01:00
b438f7b43f
chore: check and remove ToDo's
2024-02-02 01:45:08 +01:00
f7e24bdb1f
feat: sort metadata attributes before writing to image
2024-02-02 01:26:20 +01:00
e55870124b
refactor: add step before parsing to set data in parser
...
- add constructor for MetadataSchema class
- remove showable and copyable from log output
- add functional hash cache (model hashing takes about 5 seconds, only required once per model, using hash lazy loading)
2024-02-02 01:25:47 +01:00
796cf3c78d
fix: align handling for scheme Fooocus by removing lcm lora from json parsing
2024-02-02 01:20:28 +01:00
f4afc4af10
feat: add method get_scheme to Metadata
2024-02-02 01:19:21 +01:00
ea6839be83
chore: code cleanup
2024-02-02 01:14:40 +01:00
bc9b625221
feat: add hash cache to metadata
2024-02-02 01:11:50 +01:00
23ba05015a
chore: use str as return type in calculate_sha256
2024-02-02 01:10:26 +01:00
6b9c0bd448
refactor: code cleanup
2024-01-31 01:35:51 +01:00
9bdb65ec5d
feat: add metadata handling for all non-img2img parameters
2024-01-31 01:18:09 +01:00
7772eb7965
refactor: add flag for refiner_swap_method
2024-01-31 01:17:10 +01:00
e93a345ccf
feat: code cleanup, do not queue metadata preview on image upload
2024-01-30 00:20:46 +01:00
5811234d23
feat: allow model / LoRA loading from subfolders
2024-01-30 00:01:29 +01:00
6939f7904a
fix: correctly extract prompt style when only prompt expansion is selected
2024-01-29 22:27:33 +01:00
dcc4874455
feat: override existing LoRA values when importing, would cause images to differ
2024-01-29 21:57:02 +01:00
78d1ad3962
feat: add lora handling to A1111 scheme
2024-01-29 21:56:10 +01:00
89c8e3a812
feat: make sha256 with length 10 default
2024-01-29 21:54:39 +01:00
e541097451
wip: code cleanup, update todos
2024-01-29 21:54:22 +01:00
2656356206
fix: use correct order to read LoRA in meta parser
2024-01-29 18:17:51 +01:00
e388f6fff6
wip: code cleanup, update todos
2024-01-29 16:38:39 +01:00
33d644f4a5
feat: add prefix "Fooocus" to version
2024-01-29 16:29:40 +01:00
7fefe3a3c2
feat: add created_by again
2024-01-29 16:28:47 +01:00
c80011b1d1
fix: use correct LoRA mapping, add fallback for backwards compatibility
2024-01-29 15:45:55 +01:00
20e53028a4
refactor: use central flag for ControlNet image count
2024-01-29 14:27:51 +01:00
c3ab9f1f30
refactor: use central flag for LoRA count
2024-01-29 14:26:56 +01:00
f94b96f6eb
wip: add prompt style extraction for A1111 scheme
2024-01-29 01:52:24 +01:00
5e84a45e22
feat: add A1111 prompt style detection
...
only detects one style as Fooocus doesn't wrap {prompt} with the whole style, but has a separate prompt string for each style
2024-01-28 23:52:06 +01:00
236278948b
chore: code cleanup
2024-01-28 23:50:56 +01:00
5dcb2bc573
fix: correctly map resolution, use empty styles for A1111
2024-01-28 20:42:58 +01:00
cbc63ebba3
feat: add enums for Performance, Steps and StepsUOV
...
also move MetadataSchema enum to prevent circular dependency
2024-01-28 20:01:33 +01:00
e19596c2df
feat: map basic information for scheme A1111
2024-01-28 18:04:40 +01:00
f3010313fc
wip: add metadata mapping, reading and writing
...
applying data after reading currently not functional for A1111
2024-01-28 05:35:44 +01:00
1bcbd6501b
fix config
2024-01-27 16:18:26 -08:00
7185abb8ba
Merge branch 'main_upstream'
...
# Conflicts:
# launch.py
# ldm_patched/modules/args_parser.py
# modules/config.py
# presets/anime.json
# presets/default.json
# presets/lcm.json
# presets/realistic.json
2024-01-27 21:09:08 +01:00
69ad1b3c24
advanced preset load
...
new model list
i
new candidates
add model fallback
allow disable preset download
Update anime.json
Update anime.json
Update config.py
Update anime.json
Update readme.md
Update default.json
2024-01-27 08:06:31 -08:00
ff2187efed
Upgrade requirements_met function ( #1955 )
...
* Upgrade requirements_met function
* Removed extra import
* Using Requirements instead of Regex
2024-01-27 05:12:34 -08:00
80068a0cd7
[enhance]: use opencv to rewrite morphological_open(), achieve a 40x speed increase in morphological_open opporation, for inpanting images size smaller than 3k ( #2016 )
...
Co-authored-by: 雷晨曦 <leichenxi@qiyi.com>
2024-01-27 05:12:34 -08:00
1ae495f6b8
Merge branch 'feature/add-inpaint-mask-generation'
...
# Conflicts:
# requirements_versions.txt
# webui.py
2024-01-26 11:32:53 +01:00
051faf78b8
fix: use correct default value in metadata check for created_by
2024-01-25 23:49:25 +01:00
20b79788a0
feat: add resolved prompts to metadata
2024-01-25 23:48:47 +01:00
510b587e84
fix: use pnginfo "parameters" insteadf of "Comments"
...
see https://github.com/RupertAvery/DiffusionToolkit/issues/202 and cf2772fab0/modules/processing.py (L939)
2024-01-25 21:08:19 +01:00
228a0aaeea
Add SAM support
2024-01-25 16:45:02 -03:00
366984ca64
Merge branch 'feature/add-inpaint-mask-generation'
...
# Conflicts:
# webui.py
2024-01-25 10:48:40 +01:00
f0fb9783e1
Add options to u2net_cloth_seg
2024-01-24 21:26:23 -03:00
23bb69bb13
Merge branch 'feature/add-inpaint-mask-generation'
2024-01-24 19:45:58 +01:00
dea4b6c15c
fix: add correct flag validation for default_inpaint_mask_model config
2024-01-24 19:41:25 +01:00
d7d34647d0
fix: remove segmentation models from rembg model selection
2024-01-24 19:38:12 +01:00
e196a35ce2
Merge branch 'feature/add-inpaint-mask-generation'
...
# Conflicts:
# modules/config.py
# requirements_versions.txt
2024-01-24 02:46:09 +01:00
db5512fb93
feat: add inpaint mask generation functionality
...
uses rembg, see https://github.com/danielgatis/rembg
2024-01-24 02:22:50 +01:00
d7c1f4a6aa
Merge branch 'hotfix/prevent-skipping-and-stopping-by-other-users'
...
# Conflicts:
# modules/advanced_parameters.py
# modules/async_worker.py
# webui.py
2024-01-22 23:15:18 +01:00
148eddf48d
Merge branch 'feature/extract-advanced-parameters' into hotfix/prevent-skipping-and-stopping-by-other-users
...
# Conflicts:
# webui.py
2024-01-22 21:31:24 +01:00
031b1f8b11
chore: cleanup pid code
2024-01-22 21:20:17 +01:00
21f4767c65
fix: resolve circular import, patch_all now in async_worker
2024-01-22 21:14:54 +01:00
177075ff7b
feat: extract remaining attributes, do not use globals in patch
2024-01-22 21:13:44 +01:00
f3222b0f27
feat: extract attribute controlnet_softness
2024-01-22 20:09:24 +01:00
78d2ec8d77
chore: cleanup code
2024-01-22 20:01:43 +01:00
18446dc3a5
wip: add TODOs
2024-01-22 19:23:22 +01:00
4ce27aeb0f
feat: extract inpaint_ctrls attributes
...
debugging_inpaint_preprocessor, inpaint_disable_initial_latent, inpaint_engine, inpaint_strength, inpaint_respective_field, inpaint_mask_upload_checkbox, invert_mask_checkbox, inpaint_erode_or_dilate
2024-01-22 19:20:04 +01:00
eb1d3938fe
feat: extract freeu_ctrls attributes
...
freeu_enabled, freeu_b1, freeu_b2, freeu_s1, freeu_s2
2024-01-22 19:19:40 +01:00
cfb70c0278
feat: extract attribute refiner_swap_method
2024-01-22 19:10:32 +01:00
2d8ca41ce5
feat: extract attribute canny_high_threshold
2024-01-22 19:08:54 +01:00
ec486443ea
feat: extract attribute canny_low_threshold
2024-01-22 19:06:10 +01:00
9f194a91fa
feat: extract attribute skipping_cn_preprocessor
2024-01-22 18:54:25 +01:00
0bf41591a6
feat: extract attribute debugging_cn_preprocessor
2024-01-22 18:52:41 +01:00
6289e5daea
feat: extract attribute mixing_image_prompt_and_inpaint
2024-01-22 18:51:12 +01:00
cce9871cc5
feat: extract attribute mixing_image_prompt_and_vary_upscale
2024-01-22 18:49:29 +01:00
2ab5593d71
feat: extract attribute overwrite_upscale_strength
2024-01-22 18:46:47 +01:00
22af976c51
feat: extract attribute overwrite_vary_strength
2024-01-22 18:45:01 +01:00
9f4a00e868
feat: extract attribute overwrite_height
2024-01-22 18:42:54 +01:00
2eed5a28f2
feat: extract attribute overwrite_width
2024-01-22 18:41:02 +01:00
2b1f501462
feat: extract attribute overwrite_switch
2024-01-22 18:38:20 +01:00
df35033cc9
feat: extract attribute overwrite_step
2024-01-22 18:34:40 +01:00
217be190bb
feat: extract attribute generate_image_grid
2024-01-22 18:23:10 +01:00
d72573aca4
feat: extract attribute scheduler_name
2024-01-22 18:06:11 +01:00
e54bad87f1
feat: extract attribute sampler_name
2024-01-22 18:00:27 +01:00
fc3da75baf
feat: extract attribute adaptive_cfg
2024-01-22 17:31:18 +01:00
618b01764c
feat: extract attribute adm_scaler_end
2024-01-22 17:11:27 +01:00
64dcdbbef3
feat: extract attribute adm_scaler_negative
2024-01-22 17:03:50 +01:00
3607059224
feat: extract attribute adm_scaler_positive
2024-01-22 17:01:32 +01:00
79a63491fe
feat: extract attribute disable_preview
2024-01-22 16:58:46 +01:00
72d1e48def
Merge branch 'jpg_config_image_extension'
...
# Conflicts:
# modules/async_worker.py
# modules/flags.py
# modules/private_logger.py
# webui.py
2024-01-19 00:14:44 +01:00
Manuel Schmid
V1sionVerse
Manuel Schmid
Manuel Schmid
lllyasviel
Hunter-Houts
rayleichenxi
rayronvictor