26601a99d1
Merge branch 'feature/add-metadata-to-files'
2024-02-18 16:27:29 +01:00
692a2e4369
Merge branch 'feature/add-metadata-to-files' of github.com:mashb1t/Fooocus into feature/add-metadata-to-files
2024-02-18 16:15:56 +01:00
f93dd6edcc
feat: only override steps if metadata value is not in steps enum or in steps enum and performance is not the same
2024-02-18 16:15:39 +01:00
36f6715512
chore: make steps enums more strict
2024-02-18 16:14:24 +01:00
62a385e6a1
feat: sort with casefold, case insensitive
...
https://docs.python.org/3/library/stdtypes.html#str.casefold
2024-02-12 21:34:07 +01:00
267d5eee7d
Merge commit '1c999be8c8134fe01a75723ea933858435856950'
...
# Conflicts:
# .github/ISSUE_TEMPLATE/bug_report.md
# launch.py
# modules/async_worker.py
# modules/config.py
# modules/private_logger.py
# modules/util.py
# webui.py
2024-02-12 21:13:36 +01:00
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
074b655dff
fix: implement output path argument ( #2074 )
...
* added function to check output path arg and override, other wise, use temp or fallback to config
* added function to check output path arg and override, other wise, use temp or fallback to config #2065
* Revert to 1bcbd650fecb97b59c
2024-02-11 13:04:06 +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
c32b9bdc44
fix: replace regexp to support unicode chars ( #1424 )
2024-02-10 19:15:57 +01:00
98ba1d5d47
fix: correctly sort files, display deepest dir level first ( #1784 )
2024-02-10 19:03:26 +01:00
d1a450c581
Fixed mistakes in HTML generation ( #2187 )
...
Added <!DOCTYPE html> declaration
<img/> instead of <img></img>
<br/> instead of </br>
2024-02-10 17:50:41 +01:00
b281375ce2
feat: add exif data processing (saving and loading)
2024-02-04 23:29:48 +01:00
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
832441e86d
chore: loosen strict type for parse_json, fix indent
2024-02-04 19:26:10 +01:00
c104d58f76
fix: parse adaptive_cfg as float instead of string
2024-02-04 19:25:20 +01:00
dfb48fd754
feat: add better handling for image import with empty metadata
2024-02-04 19:24:45 +01:00
6dadc3314d
Merge remote-tracking branch 'upstream/main'
...
# Conflicts:
# modules/config.py
2024-02-04 14:29:54 +01:00
59dd1c2d12
Merge remote-tracking branch 'upstream/main' into feature/add-metadata-to-files
2024-02-04 13:55:00 +01:00
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
c668228fe8
chore: specify too broad exception types
2024-02-04 01:31:24 +01:00
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
1419231e74
feat: prevent config reset by renaming metadata_scheme to match config options
2024-02-03 22:41:26 +01:00
63403d614e
feat: add sampler mapping
2024-02-02 23:44:47 +01:00
ed4a958da8
fix: add workaround for multiline prompts
2024-02-02 22:04:28 +01:00
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
1c3431e6a7
wip: add TODO for ultiline prompt style resolution
2024-02-02 02:02:41 +01:00
9aa82aa80a
fix: add missing refiner in A1111 parse_json
2024-02-02 01:57:33 +01:00
f745d40687
refactor: merge metadata.py into meta_parser.py
2024-02-02 01:55:32 +01:00
b438f7b43f
chore: check and remove ToDo's
2024-02-02 01:45:08 +01:00
f7e24bdb1f
feat: sort metadata attributes before writing to image
2024-02-02 01:26:20 +01:00
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
796cf3c78d
fix: align handling for scheme Fooocus by removing lcm lora from json parsing
2024-02-02 01:20:28 +01:00
f4afc4af10
feat: add method get_scheme to Metadata
2024-02-02 01:19:21 +01:00
ea6839be83
chore: code cleanup
2024-02-02 01:14:40 +01:00
bc9b625221
feat: add hash cache to metadata
2024-02-02 01:11:50 +01:00
23ba05015a
chore: use str as return type in calculate_sha256
2024-02-02 01:10:26 +01:00
6b9c0bd448
refactor: code cleanup
2024-01-31 01:35:51 +01:00
9bdb65ec5d
feat: add metadata handling for all non-img2img parameters
2024-01-31 01:18:09 +01:00
7772eb7965
refactor: add flag for refiner_swap_method
2024-01-31 01:17:10 +01:00
e93a345ccf
feat: code cleanup, do not queue metadata preview on image upload
2024-01-30 00:20:46 +01:00
5811234d23
feat: allow model / LoRA loading from subfolders
2024-01-30 00:01:29 +01:00
6939f7904a
fix: correctly extract prompt style when only prompt expansion is selected
2024-01-29 22:27:33 +01:00
dcc4874455
feat: override existing LoRA values when importing, would cause images to differ
2024-01-29 21:57:02 +01:00
78d1ad3962
feat: add lora handling to A1111 scheme
2024-01-29 21:56:10 +01:00
89c8e3a812
feat: make sha256 with length 10 default
2024-01-29 21:54:39 +01:00
e541097451
wip: code cleanup, update todos
2024-01-29 21:54:22 +01:00
2656356206
fix: use correct order to read LoRA in meta parser
2024-01-29 18:17:51 +01:00
e388f6fff6
wip: code cleanup, update todos
2024-01-29 16:38:39 +01:00
33d644f4a5
feat: add prefix "Fooocus" to version
2024-01-29 16:29:40 +01:00
Manuel Schmid
eddyizm
hisk2323
Evgenii
Manuel Schmid
V1sionVerse
Manuel Schmid