Commit Graph
459 Commits
Author SHA1 Message Date
Manuel Schmid 59dd1c2d12 Merge remote-tracking branch 'upstream/main' into feature/add-metadata-to-files 2024-02-04 13:55:00 +01:00
Manuel Schmid 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
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 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 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 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
lllyasviel 1bcbd6501b fix config 2024-01-27 16:18:26 -08:00
lllyasviel 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
Hunter-Houts 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
rayleichenxiand雷晨曦 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
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 510b587e84 fix: use pnginfo "parameters" insteadf of "Comments"
see https://github.com/RupertAvery/DiffusionToolkit/issues/202 and https://github.com/AUTOMATIC1111/stable-diffusion-webui/blob/cf2772fab0af5573da775e7437e6acdca424f26e/modules/processing.py#L939
2024-01-25 21:08:19 +01:00