Manuel Schmid
f4a8bf24cf
fix: correctly calculate refiner switch when overwrite_switch is > 0 ( #2165 )
...
When using custom steps, the calculation of switching timing is wrong. Now it is modified to calculate "steps x timing" after custom steps are used.
By @xhoxye
2024-02-11 15:13:20 +01:00
eb3f4d745c
feat: add suffix ordinals ( #845 )
...
* add suffix ordinals with lambda
* delay importing of modules.config (#2195 )
* refactor: use easier to read version to find matching ordinal suffix
---------
Co-authored-by: rsl8 <138326583+rsl8@users.noreply.github.com >
Co-authored-by: Manuel Schmid <manuel.schmid@odt.net >
Co-authored-by: Manuel Schmid <9307310+mashb1t@users.noreply.github.com >
2024-02-10 21:49:23 +01:00
Manuel Schmid
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
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
ed4a958da8
fix: add workaround for multiline prompts
2024-02-02 22:04:28 +01:00
Manuel Schmid
f745d40687
refactor: merge metadata.py into meta_parser.py
2024-02-02 01:55:32 +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
9bdb65ec5d
feat: add metadata handling for all non-img2img parameters
2024-01-31 01:18:09 +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
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
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
e19596c2df
feat: map basic information for scheme A1111
2024-01-28 18:04:40 +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
051faf78b8
fix: use correct default value in metadata check for created_by
2024-01-25 23:49:25 +01:00
Manuel Schmid
20b79788a0
feat: add resolved prompts to metadata
2024-01-25 23:48:47 +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
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
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