Manuel Schmid
c668228fe8
chore: specify too broad exception types
2024-02-04 01:31:24 +01:00
Manuel Schmid
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
Manuel Schmid
1419231e74
feat: prevent config reset by renaming metadata_scheme to match config options
2024-02-03 22:41:26 +01:00
Manuel Schmid
63403d614e
feat: add sampler mapping
2024-02-02 23:44:47 +01:00
Manuel Schmid
ed4a958da8
fix: add workaround for multiline prompts
2024-02-02 22:04:28 +01:00
Manuel Schmid
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
Manuel Schmid
1c3431e6a7
wip: add TODO for ultiline prompt style resolution
2024-02-02 02:02:41 +01:00
Manuel Schmid
9aa82aa80a
fix: add missing refiner in A1111 parse_json
2024-02-02 01:57:33 +01:00
Manuel Schmid
f745d40687
refactor: merge metadata.py into meta_parser.py
2024-02-02 01:55:32 +01:00
Manuel Schmid
b438f7b43f
chore: check and remove ToDo's
2024-02-02 01:45:08 +01:00
Manuel Schmid
934bdb180a
feat: add translations and hint for image prompt parameters
2024-02-02 01:35:49 +01:00
Manuel Schmid
f7e24bdb1f
feat: sort metadata attributes before writing to image
2024-02-02 01:26:20 +01:00
Manuel Schmid
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
Manuel Schmid
796cf3c78d
fix: align handling for scheme Fooocus by removing lcm lora from json parsing
2024-02-02 01:20:28 +01:00
Manuel Schmid
f4afc4af10
feat: add method get_scheme to Metadata
2024-02-02 01:19:21 +01:00
Manuel Schmid
ea6839be83
chore: code cleanup
2024-02-02 01:14:40 +01:00
Manuel Schmid
bc9b625221
feat: add hash cache to metadata
2024-02-02 01:11:50 +01:00
Manuel Schmid
23ba05015a
chore: use str as return type in calculate_sha256
2024-02-02 01:10:26 +01:00
Manuel Schmid
6b9c0bd448
refactor: code cleanup
2024-01-31 01:35:51 +01:00
Manuel Schmid
9bdb65ec5d
feat: add metadata handling for all non-img2img parameters
2024-01-31 01:18:09 +01:00
Manuel Schmid
7772eb7965
refactor: add flag for refiner_swap_method
2024-01-31 01:17:10 +01:00
Manuel Schmid
e93a345ccf
feat: code cleanup, do not queue metadata preview on image upload
2024-01-30 00:20:46 +01:00
Manuel Schmid
5811234d23
feat: allow model / LoRA loading from subfolders
2024-01-30 00:01:29 +01:00
Manuel Schmid
6939f7904a
fix: correctly extract prompt style when only prompt expansion is selected
2024-01-29 22:27:33 +01:00
Manuel Schmid
dcc4874455
feat: override existing LoRA values when importing, would cause images to differ
2024-01-29 21:57:02 +01:00
Manuel Schmid
78d1ad3962
feat: add lora handling to A1111 scheme
2024-01-29 21:56:10 +01:00
Manuel Schmid
89c8e3a812
feat: make sha256 with length 10 default
2024-01-29 21:54:39 +01:00
Manuel Schmid
e541097451
wip: code cleanup, update todos
2024-01-29 21:54:22 +01:00
Manuel Schmid
2656356206
fix: use correct order to read LoRA in meta parser
2024-01-29 18:17:51 +01:00
Manuel Schmid
e388f6fff6
wip: code cleanup, update todos
2024-01-29 16:38:39 +01:00
Manuel Schmid
33d644f4a5
feat: add prefix "Fooocus" to version
2024-01-29 16:29:40 +01:00
Manuel Schmid
7fefe3a3c2
feat: add created_by again
2024-01-29 16:28:47 +01:00
Manuel Schmid
c80011b1d1
fix: use correct LoRA mapping, add fallback for backwards compatibility
2024-01-29 15:45:55 +01:00
Manuel Schmid
20e53028a4
refactor: use central flag for ControlNet image count
2024-01-29 14:27:51 +01:00
Manuel Schmid
c3ab9f1f30
refactor: use central flag for LoRA count
2024-01-29 14:26:56 +01:00
Manuel Schmid
13d0341a02
feat: sort styles after metadata import
2024-01-29 01:52:42 +01:00
Manuel Schmid
f94b96f6eb
wip: add prompt style extraction for A1111 scheme
2024-01-29 01:52:24 +01:00
Manuel Schmid
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
Manuel Schmid
236278948b
chore: code cleanup
2024-01-28 23:50:56 +01:00
Manuel Schmid
5dcb2bc573
fix: correctly map resolution, use empty styles for A1111
2024-01-28 20:42:58 +01:00
Manuel Schmid
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
Manuel Schmid
7ddd4e5209
wip: optimize handling for metadata in Gradio calls
2024-01-28 19:58:36 +01:00
Manuel Schmid
e19596c2df
feat: map basic information for scheme A1111
2024-01-28 18:04:40 +01:00
Manuel Schmid
ee21c2b6bc
feat: rename metadata tab and import button label
2024-01-28 18:02:15 +01:00
Manuel Schmid
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
Manuel Schmid
f8f081b33f
Merge branch 'feature/add-preset-selection'
...
# Conflicts:
# launch.py
# modules/config.py
# presets/realistic.json
# webui.py
2024-01-28 00:58:36 +01:00
Manuel Schmid
6031f85f49
Merge branch 'main_upstream' into feature/add-preset-selection
...
# Conflicts:
# modules/config.py
# presets/realistic.json
2024-01-28 00:57:03 +01:00
Manuel Schmid
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
Manuel Schmid
1ae495f6b8
Merge branch 'feature/add-inpaint-mask-generation'
...
# Conflicts:
# requirements_versions.txt
# webui.py
2024-01-26 11:32:53 +01:00
Manuel Schmid
dd2fd04fd7
feat: set U2NET_HOME env var to path_inpaint
...
previously was using the user dir, see https://github.com/danielgatis/rembg/blob/49d1686f65b71b72df1c3b420551406d13074426/rembg/sessions/base.py#L78
2024-01-26 11:17:58 +01:00
Manuel Schmid
366984ca64
Merge branch 'feature/add-inpaint-mask-generation'
...
# Conflicts:
# webui.py
2024-01-25 10:48:40 +01:00
Manuel Schmid
d2b697f33b
refactor: rename cloth_category to inpaint_mask_cloth_category
2024-01-25 10:47:34 +01:00
Manuel Schmid
23bb69bb13
Merge branch 'feature/add-inpaint-mask-generation'
2024-01-24 19:45:58 +01:00
Manuel Schmid
dea4b6c15c
fix: add correct flag validation for default_inpaint_mask_model config
2024-01-24 19:41:25 +01:00
Manuel Schmid
d7d34647d0
fix: remove segmentation models from rembg model selection
2024-01-24 19:38:12 +01:00
Manuel Schmid
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
Manuel Schmid
25c157b177
Merge commit '4912599f6e5c2ef01acf5d4f0bbcba236fa5c63f'
...
# Conflicts:
# webui.py
2024-01-22 21:53:08 +01:00
Manuel Schmid
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
Manuel Schmid
031b1f8b11
chore: cleanup pid code
2024-01-22 21:20:17 +01:00
Manuel Schmid
21f4767c65
fix: resolve circular import, patch_all now in async_worker
2024-01-22 21:14:54 +01:00
Manuel Schmid
177075ff7b
feat: extract remaining attributes, do not use globals in patch
2024-01-22 21:13:44 +01:00
Manuel Schmid
f3222b0f27
feat: extract attribute controlnet_softness
2024-01-22 20:09:24 +01:00
Manuel Schmid
78d2ec8d77
chore: cleanup code
2024-01-22 20:01:43 +01:00
Manuel Schmid
18446dc3a5
wip: add TODOs
2024-01-22 19:23:22 +01:00
Manuel Schmid
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
Manuel Schmid
eb1d3938fe
feat: extract freeu_ctrls attributes
...
freeu_enabled, freeu_b1, freeu_b2, freeu_s1, freeu_s2
2024-01-22 19:19:40 +01:00
Manuel Schmid
cfb70c0278
feat: extract attribute refiner_swap_method
2024-01-22 19:10:32 +01:00
Manuel Schmid
2d8ca41ce5
feat: extract attribute canny_high_threshold
2024-01-22 19:08:54 +01:00
Manuel Schmid
ec486443ea
feat: extract attribute canny_low_threshold
2024-01-22 19:06:10 +01:00
Manuel Schmid
9f194a91fa
feat: extract attribute skipping_cn_preprocessor
2024-01-22 18:54:25 +01:00
Manuel Schmid
0bf41591a6
feat: extract attribute debugging_cn_preprocessor
2024-01-22 18:52:41 +01:00
Manuel Schmid
6289e5daea
feat: extract attribute mixing_image_prompt_and_inpaint
2024-01-22 18:51:12 +01:00
Manuel Schmid
cce9871cc5
feat: extract attribute mixing_image_prompt_and_vary_upscale
2024-01-22 18:49:29 +01:00
Manuel Schmid
2ab5593d71
feat: extract attribute overwrite_upscale_strength
2024-01-22 18:46:47 +01:00
Manuel Schmid
22af976c51
feat: extract attribute overwrite_vary_strength
2024-01-22 18:45:01 +01:00
Manuel Schmid
9f4a00e868
feat: extract attribute overwrite_height
2024-01-22 18:42:54 +01:00
Manuel Schmid
2eed5a28f2
feat: extract attribute overwrite_width
2024-01-22 18:41:02 +01:00
Manuel Schmid
2b1f501462
feat: extract attribute overwrite_switch
2024-01-22 18:38:20 +01:00
Manuel Schmid
df35033cc9
feat: extract attribute overwrite_step
2024-01-22 18:34:40 +01:00
Manuel Schmid
217be190bb
feat: extract attribute generate_image_grid
2024-01-22 18:23:10 +01:00
Manuel Schmid
d72573aca4
feat: extract attribute scheduler_name
2024-01-22 18:06:11 +01:00
Manuel Schmid
e54bad87f1
feat: extract attribute sampler_name
2024-01-22 18:00:27 +01:00
Manuel Schmid
fc3da75baf
feat: extract attribute adaptive_cfg
2024-01-22 17:31:18 +01:00
Manuel Schmid
618b01764c
feat: extract attribute adm_scaler_end
2024-01-22 17:11:27 +01:00
Manuel Schmid
64dcdbbef3
feat: extract attribute adm_scaler_negative
2024-01-22 17:03:50 +01:00
Manuel Schmid
3607059224
feat: extract attribute adm_scaler_positive
2024-01-22 17:01:32 +01:00
Manuel Schmid
79a63491fe
feat: extract attribute disable_preview
2024-01-22 16:58:46 +01:00
Manuel Schmid
faa09aea9d
update readme PRs
2024-01-10 21:06:08 +01:00
Manuel Schmid
2f6c0a8ca1
Merge branch 'patch-2'
2024-01-10 20:57:24 +01:00
Manuel Schmid
c69fd4df80
feat: update blue_pencil-XL to latest stable version 3.1.0
...
also see https://civitai.com/models/119012?modelVersionId=293405
2024-01-10 20:54:32 +01:00
Manuel Schmid
1ff3efd56b
Merge branch 'feature/update-juggernaut-xl-to-v8'
...
# Conflicts:
# css/style.css
2024-01-10 11:02:10 +01:00
Manuel Schmid
851de15f95
Merge branch 'main_upstream' into feature/update-juggernaut-xl-to-v8
2024-01-10 11:01:21 +01:00
Manuel Schmid
92684132b5
clean up model download URL query parameters
2024-01-10 11:00:39 +01:00
Manuel Schmid
f136e78df7
Merge branch 'crohrer_main'
...
# Conflicts:
# css/style.css
2024-01-09 14:35:01 +01:00
Manuel Schmid
0299d04856
Merge branch 'hotfix/rename-preview-images'
...
# Conflicts:
# css/style.css
# javascript/script.js
# modules/ui_gradio_extensions.py
2024-01-09 14:33:02 +01:00
Manuel Schmid
5a75599c63
Merge branch 'main_upstream' into hotfix/rename-preview-images
...
# Conflicts:
# sdxl_styles/samples/academia.jpg
# sdxl_styles/samples/baroque.jpg
# sdxl_styles/samples/caricature.jpg
# sdxl_styles/samples/constructivism.jpg
# sdxl_styles/samples/cubism.jpg
# sdxl_styles/samples/dadaism.jpg
# sdxl_styles/samples/expressionism.jpg
# sdxl_styles/samples/fauvism.jpg
# sdxl_styles/samples/futurism.jpg
# sdxl_styles/samples/glitchcore.jpg
# sdxl_styles/samples/idyllic.jpg
# sdxl_styles/samples/impressionism.jpg
# sdxl_styles/samples/medievalism.jpg
# sdxl_styles/samples/minimalism.jpg
# sdxl_styles/samples/neoclassicism.jpg
# sdxl_styles/samples/rococo.jpg
# sdxl_styles/samples/sketchup.jpg
# sdxl_styles/samples/suprematism.jpg
# sdxl_styles/samples/surrealism.jpg
# sdxl_styles/samples/terragen.jpg
2024-01-09 14:07:06 +01:00
Manuel Schmid
d6b5aa4dcd
feat: optimise image filesize, compress jpg 80%
2024-01-08 16:44:10 +01:00
Manuel Schmid
88586ddfc8
fix: rename uppercase files to lowercase
2024-01-08 16:38:25 +01:00
Manuel Schmid
21bceb6d51
Merge branch 'feature/update-juggernaut-xl-to-v8'
2024-01-07 16:18:58 +01:00
Manuel Schmid
896fbc6185
feat: update JuggernautXL from v6 to v8
2024-01-07 15:47:07 +01:00
Manuel Schmid