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

feat: add metadata to images #1940

Merged
merged 71 commits into from
Feb 26, 2024
+864 −178
Merged

feat: add metadata to images #1940

Changes from 1 commit
Commits
Show all changes
71 commits
Select commit Hold shift + click to select a range
c5a15c7
feat: add metadata logging for images
mashb1t Jan 15, 2024
8d56318
feat: add config and checkbox for save_metadata_to_images
mashb1t Jan 15, 2024
493e484
feat: add argument disable_metadata
mashb1t Jan 15, 2024
191f814
feat: add support for A1111 metadata schema
mashb1t Jan 15, 2024
f7489cc
feat: add model hash support for a1111
mashb1t Jan 15, 2024
1a52367
feat: use resolved prompts with included expansion and styles for a11…
mashb1t Jan 15, 2024
6662381
fix: code cleanup and resolved prompt fixes
mashb1t Jan 15, 2024
7b9deb1
feat: add config metadata_created_by
mashb1t Jan 15, 2024
cd65f21
fix: use stting isntead of quote wrap for A1111 created_by
mashb1t Jan 15, 2024
a2153db
fix: correctlyy hide/show metadata schema on app start
mashb1t Jan 15, 2024
80ad0d0
fix: do not generate hashes when arg --disable-metadata is used
mashb1t Jan 15, 2024
ba5d0b6
refactor: rename metadata_schema to metadata_scheme
mashb1t Jan 15, 2024
3812228
Merge branch 'main_upstream' into feature/add-metadata-to-files
mashb1t Jan 25, 2024
510b587
fix: use pnginfo "parameters" insteadf of "Comments"
mashb1t Jan 25, 2024
20b7978
feat: add resolved prompts to metadata
mashb1t Jan 25, 2024
051faf7
fix: use correct default value in metadata check for created_by
mashb1t Jan 25, 2024
f301031
wip: add metadata mapping, reading and writing
mashb1t Jan 27, 2024
ee21c2b
feat: rename metadata tab and import button label
mashb1t Jan 28, 2024
e19596c
feat: map basic information for scheme A1111
mashb1t Jan 28, 2024
7ddd4e5
wip: optimize handling for metadata in Gradio calls
mashb1t Jan 28, 2024
cbc63eb
feat: add enums for Performance, Steps and StepsUOV
mashb1t Jan 28, 2024
5dcb2bc
fix: correctly map resolution, use empty styles for A1111
mashb1t Jan 28, 2024
2362789
chore: code cleanup
mashb1t Jan 28, 2024
5e84a45
feat: add A1111 prompt style detection
mashb1t Jan 28, 2024
f94b96f
wip: add prompt style extraction for A1111 scheme
mashb1t Jan 29, 2024
13d0341
feat: sort styles after metadata import
mashb1t Jan 29, 2024
c3ab9f1
refactor: use central flag for LoRA count
mashb1t Jan 29, 2024
20e5302
refactor: use central flag for ControlNet image count
mashb1t Jan 29, 2024
c80011b
fix: use correct LoRA mapping, add fallback for backwards compatibility
mashb1t Jan 29, 2024
7fefe3a
feat: add created_by again
mashb1t Jan 29, 2024
33d644f
feat: add prefix "Fooocus" to version
mashb1t Jan 29, 2024
e388f6f
wip: code cleanup, update todos
mashb1t Jan 29, 2024
2656356
fix: use correct order to read LoRA in meta parser
mashb1t Jan 29, 2024
e541097
wip: code cleanup, update todos
mashb1t Jan 29, 2024
89c8e3a
feat: make sha256 with length 10 default
mashb1t Jan 29, 2024
78d1ad3
feat: add lora handling to A1111 scheme
mashb1t Jan 29, 2024
dcc4874
feat: override existing LoRA values when importing, would cause image…
mashb1t Jan 29, 2024
6939f79
fix: correctly extract prompt style when only prompt expansion is sel…
mashb1t Jan 29, 2024
5811234
feat: allow model / LoRA loading from subfolders
mashb1t Jan 29, 2024
e93a345
feat: code cleanup, do not queue metadata preview on image upload
mashb1t Jan 29, 2024
7772eb7
refactor: add flag for refiner_swap_method
mashb1t Jan 31, 2024
9bdb65e
feat: add metadata handling for all non-img2img parameters
mashb1t Jan 31, 2024
6b9c0bd
refactor: code cleanup
mashb1t Jan 31, 2024
23ba050
chore: use str as return type in calculate_sha256
mashb1t Feb 2, 2024
bc9b625
feat: add hash cache to metadata
mashb1t Feb 2, 2024
ea6839b
chore: code cleanup
mashb1t Feb 2, 2024
f4afc4a
feat: add method get_scheme to Metadata
mashb1t Feb 2, 2024
796cf3c
fix: align handling for scheme Fooocus by removing lcm lora from json…
mashb1t Feb 2, 2024
e558701
refactor: add step before parsing to set data in parser
mashb1t Feb 2, 2024
f7e24bd
feat: sort metadata attributes before writing to image
mashb1t Feb 2, 2024
934bdb1
feat: add translations and hint for image prompt parameters
mashb1t Feb 2, 2024
b438f7b
chore: check and remove ToDo's
mashb1t Feb 2, 2024
f745d40
refactor: merge metadata.py into meta_parser.py
mashb1t Feb 2, 2024
9aa82aa
fix: add missing refiner in A1111 parse_json
mashb1t Feb 2, 2024
1c3431e
wip: add TODO for ultiline prompt style resolution
mashb1t Feb 2, 2024
349556b
fix: remove sorting for A1111, change performance key position
mashb1t Feb 2, 2024
ed4a958
fix: add workaround for multiline prompts
mashb1t Feb 2, 2024
63403d6
feat: add sampler mapping
mashb1t Feb 2, 2024
1419231
feat: prevent config reset by renaming metadata_scheme to match confi…
mashb1t Feb 3, 2024
8af73e6
chore: remove remaining todos after analysis
mashb1t Feb 3, 2024
c668228
chore: specify too broad exception types
mashb1t Feb 4, 2024
fe33cc7
feat: add mapping for _gpu samplers to cpu samplers
mashb1t Feb 4, 2024
59dd1c2
Merge remote-tracking branch 'upstream/main' into feature/add-metadat…
mashb1t Feb 4, 2024
dfb48fd
feat: add better handling for image import with empty metadata
mashb1t Feb 4, 2024
c104d58
fix: parse adaptive_cfg as float instead of string
mashb1t Feb 4, 2024
832441e
chore: loosen strict type for parse_json, fix indent
mashb1t Feb 4, 2024
36f6715
chore: make steps enums more strict
mashb1t Feb 18, 2024
f93dd6e
feat: only override steps if metadata value is not in steps enum or i…
mashb1t Feb 18, 2024
692a2e4
Merge branch 'feature/add-metadata-to-files' of github.com:mashb1t/Fo…
mashb1t Feb 18, 2024
0b77db9
Merge branch 'develop' into feature/add-metadata-to-files
mashb1t Feb 26, 2024
65dae45
fix: handle empty strings in metadata
mashb1t Feb 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
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/
  • Loading branch information
@mashb1t
mashb1t committed Feb 4, 2024
commit fe33cc71145f6b9510870ff1a7d5e2386af89137
4 changes: 2 additions & 2 deletions modules/flags.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,10 @@
"dpm_adaptive": "DPM adaptive",
"dpmpp_2s_ancestral": "DPM++ 2S a",
"dpmpp_sde": "DPM++ SDE",
"dpmpp_sde_gpu": "",
"dpmpp_sde_gpu": "DPM++ SDE",
"dpmpp_2m": "DPM++ 2M",
"dpmpp_2m_sde": "DPM++ 2M SDE",
"dpmpp_2m_sde_gpu": "",
"dpmpp_2m_sde_gpu": "DPM++ 2M SDE",
"dpmpp_3m_sde": "",
"dpmpp_3m_sde_gpu": "",
"ddpm": "",
Expand Down