Ryan Dick
41e1a9f202
Use the correct device / dtype for RegionalPromptData calculations.
2024-03-05 15:19:58 -05:00
Ryan Dick
bcfb43e5f0
(minor) Remove commented code.
2024-03-05 09:12:17 -05:00
Ryan Dick
a665f20fb5
Add positive_self_attn_mask_score and self_attn_adjustment_end_step_percent to the prompt nodes.
2024-03-04 15:34:26 -05:00
Ryan Dick
d313e5eb70
Remove AddConditioningMaskInvocaton.
2024-03-04 14:11:38 -05:00
Ryan Dick
271f8f2414
Merge branch 'main' into ryan/regional-conditioning-tuning
2024-03-04 10:52:24 -05:00
Mary Hipp Rogers
8b34f5298c
Default model settings ( #5850 )
...
* UI in MM to create trigger phrases
* add scheduler and vaePrecision to config
* UI for configuring default settings for models'
* hook MM default model settings up to API
* add button to set default settings in parameters
* pull out trigger phrases
* back-end for default settings
* lint
* remove log;
gi
* ruff
* ruff format
---------
Co-authored-by: Mary Hipp <maryhipp@Marys-MacBook-Air.local>
2024-03-04 09:39:03 -05:00
Ryan Dick
5fad379192
Add ability to control regional prompt region weights.
2024-03-03 12:55:07 -05:00
psychedelicious
554d175792
feat(mm): improved model hash class
...
- Use memory view for hashlib algorithms (closer to python 3.11's filehash API in hashlib)
- Remove `sha1_fast` (realized it doesn't even hash the whole file, it just does the first block)
- Add support for custom file filters
- Update docstrings
- Update tests
2024-03-03 14:32:14 +11:00
psychedelicious
86982f3059
feat(mm): make ModelHash instantiatable, taking an algorithm as arg
2024-03-03 14:32:14 +11:00
psychedelicious
ec8ed530a7
feat(mm): modularize ModelHash to facilitate testing
2024-03-03 14:32:14 +11:00
psychedelicious
982076d7d7
feat(mm): add hashing algos to ModelHash
...
- Some algos are slow, so it is now just called ModelHash
- Added all hashlib algos, plus BLAKE3 and the fast (but incorrect) SHA1 algo
2024-03-03 14:32:14 +11:00
psychedelicious
2e4672f931
feat(mm): make hash.py a script for testing
2024-03-03 14:32:14 +11:00
psychedelicious
908e915a71
feat(mm): use blake3 for hashing
2024-03-03 14:32:14 +11:00
Lincoln Stein
a72056e0df
make model key assignment deterministic
...
- When installing, model keys are now calculated from the model contents.
- .safetensors, .ckpt and other single file models are hashed with sha1
- The contents of diffusers directories are hashed using imohash (faster)
fixup yaml->sql db migration script to assign deterministic key
- this commit also detects and assigns the correct image encoder for
ip adapter models.
2024-03-03 14:32:14 +11:00
Ryan Dick
ad18429fe3
Very experimentation with various regional prompting tuning params.
2024-03-02 17:43:21 -05:00
Ryan Dick
cc45007dc4
Remove unused code for attention map saving.
2024-03-02 08:25:41 -05:00
Ryan Dick
73bec56c59
Delete unused functions from shared_invokeai_diffusion.py.
2024-03-02 08:25:41 -05:00
Ryan Dick
942efa011e
Implement (very slow) self-attention regional masking.
2024-03-01 18:43:32 -05:00
Ryan Dick
6935830f99
Remove unused constructor declared with typo in name: __int__.
2024-03-01 15:12:03 -05:00
Ryan Dick
7651eeea8d
Merge sequential conditioning and cac conditioning logic to eliminate a bunch of duplication.
2024-03-01 15:12:03 -05:00
Ryan Dick
204e7d383b
Remove outdated comments related to T2I-Adapters and ControlNets.
2024-03-01 15:12:03 -05:00
Ryan Dick
9bc4e7a593
Remove use of **kwargs in do_unet_step(...), where full parameter list is known and supported.
2024-03-01 15:12:03 -05:00
Ryan Dick
ad96857e0f
Fix avoid storing extra conditioning info in two places.
2024-03-01 15:12:03 -05:00
Ryan Dick
ffc4ebb14c
Merge branch 'ryan/remove-attention-map-saving' into ryan/regional-conditioning
2024-03-01 11:33:50 -05:00
Ryan Dick
5b3adf0740
Remove unused code for attention map saving.
2024-02-29 23:42:37 -05:00
Ryan Dick
a5c94fba43
Delete unused functions from shared_invokeai_diffusion.py.
2024-02-29 23:41:15 -05:00
Ryan Dick
3e14bd6c45
Remove unused constructor declared with typo in name: __int__.
2024-02-29 22:42:59 -05:00
Ryan Dick
8721926f14
Merge sequential conditioning and cac conditioning logic to eliminate a bunch of duplication.
2024-02-29 22:42:59 -05:00
Ryan Dick
d87ff3a206
Remove outdated comments related to T2I-Adapters and ControlNets.
2024-02-29 22:42:59 -05:00
Ryan Dick
7d9671014b
Remove use of **kwargs in do_unet_step(...), where full parameter list is known and supported.
2024-02-29 22:42:59 -05:00
Ryan Dick
4a1acd4db9
Fix avoid storing extra conditioning info in two places.
2024-02-29 22:42:59 -05:00
Lincoln Stein
0832e1818e
Fix problem of all installed models being assigned "<NOKEY>"
...
- Also fix redundant scanning of models directory at startup.
2024-02-29 22:31:05 -05:00
psychedelicious
dd9daf8efb
chore: ruff
2024-03-01 10:42:33 +11:00
psychedelicious
0305e90287
chore: ruff
2024-03-01 10:42:33 +11:00
blessedcoolant
ae34bcfbc0
fix: Assertion issue with SDXL Compel
2024-03-01 10:42:33 +11:00
Brandon Rising
e7afae0159
Switch absolute path to as_posix in _walk_directory
2024-03-01 10:42:33 +11:00
Brandon Rising
f16e64084b
Ruff checks
2024-03-01 10:42:33 +11:00
Brandon Rising
8992d89817
Fix directory called on _walk_directory
2024-03-01 10:42:33 +11:00
Brandon Rising
0fc2f90824
Switch ModelSearch from os.walk to os.scandir
2024-03-01 10:42:33 +11:00
Lincoln Stein
94e3857110
handle change to Civitai metadata schema for commercial usage
2024-03-01 10:42:33 +11:00
psychedelicious
7d2e840590
tidy: remove some traces of ONNX
2024-03-01 10:42:33 +11:00
psychedelicious
10d36b4045
tidy(mm): remove ONNX from AnyModelConfig
2024-03-01 10:42:33 +11:00
psychedelicious
c80c0f0fb9
fix(mm): fix ModelCacheBase method name
2024-03-01 10:42:33 +11:00
psychedelicious
37d66488c5
chore: ruff
2024-03-01 10:42:33 +11:00
Lincoln Stein
371e3cc260
recover gracefuly from GPU out of memory errors (next version)
2024-03-01 10:42:33 +11:00
Lincoln Stein
d22738723d
clear out VRAM when an OOM occurs
2024-03-01 10:42:33 +11:00
Brandon Rising
c778ab8db4
Allow passing in key on register
2024-03-01 10:42:33 +11:00
psychedelicious
239ecfaf79
fix(nodes): make fields on ModelConfigBase
required
...
The setup of `ModelConfigBase` means autogenerated types have critical fields flagged as nullable (like `key` and `base`). Need to manually flag them as required.
2024-03-01 10:42:33 +11:00
Lincoln Stein
cc41e8912c
several small model install enhancements
...
- Support extended HF repoid syntax in TUI. This allows
installation of subfolders and safetensors files, as in
`XpucT/Deliberate::Deliberate_v5.safetensors`
- Add `error` and `error_traceback` properties to the install
job objects.
- Rename the `heuristic_import` route to `heuristic_install`.
- Fix the example `config` input in the `heuristic_install` route.
2024-03-01 10:42:33 +11:00
Lincoln Stein
5bb3aeaccd
remove startup dependency on legacy models.yaml file
2024-03-01 10:42:33 +11:00