Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: add metadata to images #1940

Merged
merged 71 commits into from
Feb 26, 2024
Merged

feat: add metadata to images #1940

merged 71 commits into from
Feb 26, 2024

Commits on Jan 15, 2024

  1. feat: add metadata logging for images 

    inspired by https://github.com/MoonRide303/Fooocus-MRE
    @mashb1t
    mashb1t committed Jan 15, 2024
    Configuration menu
    Copy the full SHA
    c5a15c7 View commit details
    Browse the repository at this point in the history

  2. feat: add config and checkbox for save_metadata_to_images

    @mashb1t
    mashb1t committed Jan 15, 2024
    Configuration menu
    Copy the full SHA
    8d56318 View commit details
    Browse the repository at this point in the history

  3. feat: add argument disable_metadata

    @mashb1t
    mashb1t committed Jan 15, 2024
    Configuration menu
    Copy the full SHA
    493e484 View commit details
    Browse the repository at this point in the history

  4. feat: add support for A1111 metadata schema 

    https://github.com/AUTOMATIC1111/stable-diffusion-webui/blob/cf2772fab0af5573da775e7437e6acdca424f26e/modules/processing.py#L672
    @mashb1t
    mashb1t committed Jan 15, 2024
    Configuration menu
    Copy the full SHA
    191f814 View commit details
    Browse the repository at this point in the history

  5. feat: add model hash support for a1111

    @mashb1t
    mashb1t committed Jan 15, 2024
    Configuration menu
    Copy the full SHA
    f7489cc View commit details
    Browse the repository at this point in the history

  6. feat: use resolved prompts with included expansion and styles for a11… 

    …11 metadata
    @mashb1t
    mashb1t committed Jan 15, 2024
    Configuration menu
    Copy the full SHA
    1a52367 View commit details
    Browse the repository at this point in the history

  7. fix: code cleanup and resolved prompt fixes

    @mashb1t
    mashb1t committed Jan 15, 2024
    Configuration menu
    Copy the full SHA
    6662381 View commit details
    Browse the repository at this point in the history

  8. feat: add config metadata_created_by

    @mashb1t
    mashb1t committed Jan 15, 2024
    Configuration menu
    Copy the full SHA
    7b9deb1 View commit details
    Browse the repository at this point in the history

  9. fix: use stting isntead of quote wrap for A1111 created_by

    @mashb1t
    mashb1t committed Jan 15, 2024
    Configuration menu
    Copy the full SHA
    cd65f21 View commit details
    Browse the repository at this point in the history

  10. fix: correctlyy hide/show metadata schema on app start

    @mashb1t
    mashb1t committed Jan 15, 2024
    Configuration menu
    Copy the full SHA
    a2153db View commit details
    Browse the repository at this point in the history

  11. fix: do not generate hashes when arg --disable-metadata is used

    @mashb1t
    mashb1t committed Jan 15, 2024
    Configuration menu
    Copy the full SHA
    80ad0d0 View commit details
    Browse the repository at this point in the history

  12. refactor: rename metadata_schema to metadata_scheme

    @mashb1t
    mashb1t committed Jan 15, 2024
    Configuration menu
    Copy the full SHA
    ba5d0b6 View commit details
    Browse the repository at this point in the history

Commits on Jan 25, 2024

  1. Merge branch 'main_upstream' into feature/add-metadata-to-files

    @mashb1t
    mashb1t committed Jan 25, 2024
    Configuration menu
    Copy the full SHA
    3812228 View commit details
    Browse the repository at this point in the history

  2. fix: use pnginfo "parameters" insteadf of "Comments" 

    see RupertAvery/DiffusionToolkit#202 and https://github.com/AUTOMATIC1111/stable-diffusion-webui/blob/cf2772fab0af5573da775e7437e6acdca424f26e/modules/processing.py#L939
    @mashb1t
    mashb1t committed Jan 25, 2024
    Configuration menu
    Copy the full SHA
    510b587 View commit details
    Browse the repository at this point in the history

  3. feat: add resolved prompts to metadata

    @mashb1t
    mashb1t committed Jan 25, 2024
    Configuration menu
    Copy the full SHA
    20b7978 View commit details
    Browse the repository at this point in the history

  4. fix: use correct default value in metadata check for created_by

    @mashb1t
    mashb1t committed Jan 25, 2024
    Configuration menu
    Copy the full SHA
    051faf7 View commit details
    Browse the repository at this point in the history

Commits on Jan 28, 2024

  1. wip: add metadata mapping, reading and writing 

    applying data after reading currently not functional for A1111
    @mashb1t
    mashb1t committed Jan 28, 2024
    Configuration menu
    Copy the full SHA
    f301031 View commit details
    Browse the repository at this point in the history

  2. feat: rename metadata tab and import button label

    @mashb1t
    mashb1t committed Jan 28, 2024
    Configuration menu
    Copy the full SHA
    ee21c2b View commit details
    Browse the repository at this point in the history

  3. feat: map basic information for scheme A1111

    @mashb1t
    mashb1t committed Jan 28, 2024
    Configuration menu
    Copy the full SHA
    e19596c View commit details
    Browse the repository at this point in the history

  4. wip: optimize handling for metadata in Gradio calls

    @mashb1t
    mashb1t committed Jan 28, 2024
    Configuration menu
    Copy the full SHA
    7ddd4e5 View commit details
    Browse the repository at this point in the history

  5. feat: add enums for Performance, Steps and StepsUOV 

    also move MetadataSchema enum to prevent circular dependency
    @mashb1t
    mashb1t committed Jan 28, 2024
    Configuration menu
    Copy the full SHA
    cbc63eb View commit details
    Browse the repository at this point in the history

  6. fix: correctly map resolution, use empty styles for A1111

    @mashb1t
    mashb1t committed Jan 28, 2024
    Configuration menu
    Copy the full SHA
    5dcb2bc View commit details
    Browse the repository at this point in the history

  7. chore: code cleanup

    @mashb1t
    mashb1t committed Jan 28, 2024
    Configuration menu
    Copy the full SHA
    2362789 View commit details
    Browse the repository at this point in the history

  8. 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
    @mashb1t
    mashb1t committed Jan 28, 2024
    Configuration menu
    Copy the full SHA
    5e84a45 View commit details
    Browse the repository at this point in the history

Commits on Jan 29, 2024

  1. wip: add prompt style extraction for A1111 scheme

    @mashb1t
    mashb1t committed Jan 29, 2024
    Configuration menu
    Copy the full SHA
    f94b96f View commit details
    Browse the repository at this point in the history

  2. feat: sort styles after metadata import

    @mashb1t
    mashb1t committed Jan 29, 2024
    Configuration menu
    Copy the full SHA
    13d0341 View commit details
    Browse the repository at this point in the history

  3. refactor: use central flag for LoRA count

    @mashb1t
    mashb1t committed Jan 29, 2024
    Configuration menu
    Copy the full SHA
    c3ab9f1 View commit details
    Browse the repository at this point in the history

  4. refactor: use central flag for ControlNet image count

    @mashb1t
    mashb1t committed Jan 29, 2024
    Configuration menu
    Copy the full SHA
    20e5302 View commit details
    Browse the repository at this point in the history

  5. fix: use correct LoRA mapping, add fallback for backwards compatibility

    @mashb1t
    mashb1t committed Jan 29, 2024
    Configuration menu
    Copy the full SHA
    c80011b View commit details
    Browse the repository at this point in the history

  6. feat: add created_by again

    @mashb1t
    mashb1t committed Jan 29, 2024
    Configuration menu
    Copy the full SHA
    7fefe3a View commit details
    Browse the repository at this point in the history

  7. feat: add prefix "Fooocus" to version

    @mashb1t
    mashb1t committed Jan 29, 2024
    Configuration menu
    Copy the full SHA
    33d644f View commit details
    Browse the repository at this point in the history

  8. wip: code cleanup, update todos

    @mashb1t
    mashb1t committed Jan 29, 2024
    Configuration menu
    Copy the full SHA
    e388f6f View commit details
    Browse the repository at this point in the history

  9. fix: use correct order to read LoRA in meta parser

    @mashb1t
    mashb1t committed Jan 29, 2024
    Configuration menu
    Copy the full SHA
    2656356 View commit details
    Browse the repository at this point in the history

  10. wip: code cleanup, update todos

    @mashb1t
    mashb1t committed Jan 29, 2024
    Configuration menu
    Copy the full SHA
    e541097 View commit details
    Browse the repository at this point in the history

  11. feat: make sha256 with length 10 default

    @mashb1t
    mashb1t committed Jan 29, 2024
    Configuration menu
    Copy the full SHA
    89c8e3a View commit details
    Browse the repository at this point in the history

  12. feat: add lora handling to A1111 scheme

    @mashb1t
    mashb1t committed Jan 29, 2024
    Configuration menu
    Copy the full SHA
    78d1ad3 View commit details
    Browse the repository at this point in the history

  13. feat: override existing LoRA values when importing, would cause image… 

    …s to differ
    @mashb1t
    mashb1t committed Jan 29, 2024
    Configuration menu
    Copy the full SHA
    dcc4874 View commit details
    Browse the repository at this point in the history

  14. fix: correctly extract prompt style when only prompt expansion is sel… 

    …ected
    @mashb1t
    mashb1t committed Jan 29, 2024
    Configuration menu
    Copy the full SHA
    6939f79 View commit details
    Browse the repository at this point in the history

  15. feat: allow model / LoRA loading from subfolders

    @mashb1t
    mashb1t committed Jan 29, 2024
    Configuration menu
    Copy the full SHA
    5811234 View commit details
    Browse the repository at this point in the history

  16. feat: code cleanup, do not queue metadata preview on image upload

    @mashb1t
    mashb1t committed Jan 29, 2024
    Configuration menu
    Copy the full SHA
    e93a345 View commit details
    Browse the repository at this point in the history

Commits on Jan 31, 2024

  1. refactor: add flag for refiner_swap_method

    @mashb1t
    mashb1t committed Jan 31, 2024
    Configuration menu
    Copy the full SHA
    7772eb7 View commit details
    Browse the repository at this point in the history

  2. feat: add metadata handling for all non-img2img parameters

    @mashb1t
    mashb1t committed Jan 31, 2024
    Configuration menu
    Copy the full SHA
    9bdb65e View commit details
    Browse the repository at this point in the history

  3. refactor: code cleanup

    @mashb1t
    mashb1t committed Jan 31, 2024
    Configuration menu
    Copy the full SHA
    6b9c0bd View commit details
    Browse the repository at this point in the history

Commits on Feb 2, 2024

  1. chore: use str as return type in calculate_sha256

    @mashb1t
    mashb1t committed Feb 2, 2024
    Configuration menu
    Copy the full SHA
    23ba050 View commit details
    Browse the repository at this point in the history

  2. feat: add hash cache to metadata

    @mashb1t
    mashb1t committed Feb 2, 2024
    Configuration menu
    Copy the full SHA
    bc9b625 View commit details
    Browse the repository at this point in the history

  3. chore: code cleanup

    @mashb1t
    mashb1t committed Feb 2, 2024
    Configuration menu
    Copy the full SHA
    ea6839b View commit details
    Browse the repository at this point in the history

  4. feat: add method get_scheme to Metadata

    @mashb1t
    mashb1t committed Feb 2, 2024
    Configuration menu
    Copy the full SHA
    f4afc4a View commit details
    Browse the repository at this point in the history

  5. fix: align handling for scheme Fooocus by removing lcm lora from json… 

    … parsing
    @mashb1t
    mashb1t committed Feb 2, 2024
    Configuration menu
    Copy the full SHA
    796cf3c View commit details
    Browse the repository at this point in the history

  6. 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)
    @mashb1t
    mashb1t committed Feb 2, 2024
    Configuration menu
    Copy the full SHA
    e558701 View commit details
    Browse the repository at this point in the history

  7. feat: sort metadata attributes before writing to image

    @mashb1t
    mashb1t committed Feb 2, 2024
    Configuration menu
    Copy the full SHA
    f7e24bd View commit details
    Browse the repository at this point in the history

  8. feat: add translations and hint for image prompt parameters

    @mashb1t
    mashb1t committed Feb 2, 2024
    Configuration menu
    Copy the full SHA
    934bdb1 View commit details
    Browse the repository at this point in the history

  9. chore: check and remove ToDo's

    @mashb1t
    mashb1t committed Feb 2, 2024
    Configuration menu
    Copy the full SHA
    b438f7b View commit details
    Browse the repository at this point in the history

  10. refactor: merge metadata.py into meta_parser.py

    @mashb1t
    mashb1t committed Feb 2, 2024
    Configuration menu
    Copy the full SHA
    f745d40 View commit details
    Browse the repository at this point in the history

  11. fix: add missing refiner in A1111 parse_json

    @mashb1t
    mashb1t committed Feb 2, 2024
    Configuration menu
    Copy the full SHA
    9aa82aa View commit details
    Browse the repository at this point in the history

  12. wip: add TODO for ultiline prompt style resolution

    @mashb1t
    mashb1t committed Feb 2, 2024
    Configuration menu
    Copy the full SHA
    1c3431e View commit details
    Browse the repository at this point in the history

  13. fix: remove sorting for A1111, change performance key position 

    fixes lllyasviel#1940 (comment)
    @mashb1t
    mashb1t committed Feb 2, 2024
    Configuration menu
    Copy the full SHA
    349556b View commit details
    Browse the repository at this point in the history

  14. fix: add workaround for multiline prompts

    @mashb1t
    mashb1t committed Feb 2, 2024
    Configuration menu
    Copy the full SHA
    ed4a958 View commit details
    Browse the repository at this point in the history

  15. feat: add sampler mapping

    @mashb1t
    mashb1t committed Feb 2, 2024
    Configuration menu
    Copy the full SHA
    63403d6 View commit details
    Browse the repository at this point in the history

Commits on Feb 3, 2024

  1. feat: prevent config reset by renaming metadata_scheme to match confi… 

    …g options
    @mashb1t
    mashb1t committed Feb 3, 2024
    Configuration menu
    Copy the full SHA
    1419231 View commit details
    Browse the repository at this point in the history

  2. 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"
    @mashb1t
    mashb1t committed Feb 3, 2024
    Configuration menu
    Copy the full SHA
    8af73e6 View commit details
    Browse the repository at this point in the history

Commits on Feb 4, 2024

  1. chore: specify too broad exception types

    @mashb1t
    mashb1t committed Feb 4, 2024
    Configuration menu
    Copy the full SHA
    c668228 View commit details
    Browse the repository at this point in the history

  2. 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/
    @mashb1t
    mashb1t committed Feb 4, 2024
    Configuration menu
    Copy the full SHA
    fe33cc7 View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'upstream/main' into feature/add-metadat… 

    …a-to-files
    @mashb1t
    mashb1t committed Feb 4, 2024
    Configuration menu
    Copy the full SHA
    59dd1c2 View commit details
    Browse the repository at this point in the history

  4. feat: add better handling for image import with empty metadata

    @mashb1t
    mashb1t committed Feb 4, 2024
    Configuration menu
    Copy the full SHA
    dfb48fd View commit details
    Browse the repository at this point in the history

  5. fix: parse adaptive_cfg as float instead of string

    @mashb1t
    mashb1t committed Feb 4, 2024
    Configuration menu
    Copy the full SHA
    c104d58 View commit details
    Browse the repository at this point in the history

  6. chore: loosen strict type for parse_json, fix indent

    @mashb1t
    mashb1t committed Feb 4, 2024
    Configuration menu
    Copy the full SHA
    832441e View commit details
    Browse the repository at this point in the history

Commits on Feb 18, 2024

  1. chore: make steps enums more strict

    @mashb1t
    mashb1t committed Feb 18, 2024
    Configuration menu
    Copy the full SHA
    36f6715 View commit details
    Browse the repository at this point in the history

  2. feat: only override steps if metadata value is not in steps enum or i… 

    …n steps enum and performance is not the same
    @mashb1t
    mashb1t committed Feb 18, 2024
    Configuration menu
    Copy the full SHA
    f93dd6e View commit details
    Browse the repository at this point in the history

  3. Merge branch 'feature/add-metadata-to-files' of github.com:mashb1t/Fo… 

    …oocus into feature/add-metadata-to-files
    @mashb1t
    mashb1t committed Feb 18, 2024
    Configuration menu
    Copy the full SHA
    692a2e4 View commit details
    Browse the repository at this point in the history

Commits on Feb 26, 2024

  1. Merge branch 'develop' into feature/add-metadata-to-files 

    # Conflicts:
#	modules/async_worker.py
#	modules/config.py
#	modules/meta_parser.py
#	modules/private_logger.py
#	modules/util.py
#	webui.py
    @mashb1t
    mashb1t committed Feb 26, 2024
    Configuration menu
    Copy the full SHA
    0b77db9 View commit details
    Browse the repository at this point in the history

  2. fix: handle empty strings in metadata 

    e.g. raw negative prompt when none is set
    @mashb1t
    mashb1t committed Feb 26, 2024
    Configuration menu
    Copy the full SHA
    65dae45 View commit details
    Browse the repository at this point in the history