Commit Graph

350 Commits (master)

Author SHA1 Message Date
Bryce 92baff890e feature: surprise me improvements 1 year ago
Bryce c7ed86a36f feature: auto-retry generation unsafe image is created 1 year ago
Bryce f60fa880a7 feature: less visually confusing shell output 1 year ago
Bryce 16cef16c3e feature: facilitate references to previous image generation 1 year ago
Bryce 248679d8de feature: image sizes can now be multiples of 8 instead of 64
from https://github.com/CompVis/stable-diffusion/issues/60#issuecomment-1240294667
1 year ago
Bryce 9212f0227c fix: bypass hf cache retrieval bug
If one uses `hf_hub_download` only referencing specific commits the `refs` folder will not be created even though data will be cached via `snapshots` and `blobs`.  Subsequent calls to `try_to_load_from_cache` will return None even though the desired data was in the cache.

Example:

```python
# download something
hf_hub_download(repo_id=repo, revision=commit_hash, filename=filepath, token=token)
# returns None
try_to_load_from_cache(repo_id=repo, revision=commit_hash, filename=filepath)
```

https://github.com/huggingface/huggingface_hub/pull/1306
1 year ago
Bryce 290b0a318e fix: MacOS MPS background can't handle large slices
per
- https://github.com/brycedrennan/imaginAIry/issues/175
- https://github.com/invoke-ai/InvokeAI/issues/1244
1 year ago
Bryce 1c986d8644 fix: use py3.7 compat lru_cache
- disable lint fixer that updates to newer syntax
1 year ago
Bryce 097e763887 fix: hf_hub_download signature compat
instead of (incorrectly) trying to detect the function signature of the old version, just catch the error and try the old signature
1 year ago
mebelz 2571097087 fix: spelling typo
leave references to misspelled files- don't want to break any existing links
1 year ago
Bryce 00408d176f performance: use tiling for upscaling for better use of memory 1 year ago
Bryce 2fca01b911 fix: not so old 1 year ago
Bryce 7c05c3aae2 feature: image edit gifs and demo-reels 1 year ago
Bryce 2a3e19f5a1 feature: 🎉 Edit Images with Instructions alone! 1 year ago
Bryce 7285644909 feature: prune-ckpt command can prune to just the ema 1 year ago
Bryce 5b56f05da7 feature: print version
- fix: default config wasn't being selected for custom models
1 year ago
Bryce 9b1d130f93 feature: ability to load safetensors 1 year ago
Bryce 81f294216b feature: 🎉 outpainting 1 year ago
Bryce 02af4c37b9 fix: gracefully fail if older pytorch-lightning installed 1 year ago
Bryce 24e10f9e5f fix: don't report a safety issue when a black image is generated 1 year ago
Bryce fad7f17790 feature: run face enhancement on the GPU
Should run 10x faster
1 year ago
Bryce 85c084099c fix: incorrect config files being used for non-1.0 models 1 year ago
Bryce 5cc73f6087 feature: finetuning
- feature: finetuning your own image models
- feature: image prep command. crops to face or other interesting parts of photo
- fix: back-compat for hf_hub_download
- feature: add prune-ckpt command
- feature: allow specification of model config file
1 year ago
Bryce 4bc78b9be5 build: vendorize realesrgan
Removes lots of dependencies including problematic `grpcio` and `tb-nightly`
1 year ago
Bryce 35ac8d64d7 build: vendorize parts of basicsr
Trying to get rid of tb-nightly dependency and any other unnecessary dependencies.
1 year ago
Bryce e9a3e1a99b build: unpin dependencies 1 year ago
Bryce 4bc940ddf4 feature: remove more randomness 1 year ago
Bryce 1381c7fed4 lint: new ruff linter 1 year ago
Bryce da0f1e1ee6 fix: make sure randomness is generated on cpu for consistency 1 year ago
Bryce 239b235140 feature: depth-based image-to-image generations (and inpainting) 1 year ago
Bryce ad0b9e8ab8 feature: tile in a single dimension ("x" or "y") 1 year ago
Bryce 1f7403155e fix: more thorough cleaning of memory when switching models
also cleanup up some test failures
1 year ago
Bryce Drennan ccf9749df5
fix: performance improvement. disable ema (#139)
A configuration `use_ema: False` was became necessary in the newer Stable Diffusion code but was missing from the 1.5 config.
1 year ago
Paul Mestemaker ad5e467042
feat: include negative prompts in logs and exif metadata (#135) 1 year ago
Paul Mestemaker 68791cf236
feat: better handling for default model names (#134)
* feat: better handling for default model names

Addresses #124
1 year ago
Bryce f30823e0b5 feature: Stable Diffusion 2.1 2 years ago
Bryce 2f8edc1530 feature: negative prompting
- feature: negative prompting.  `--negative-prompt` or `ImaginePrompt(..., negative_prompt="ugly, deformed, extra arms, etc")`
- feature: a default negative prompt is added to all generations. Images in SD-2.0 don't look bad anymore. Images in 1.5 look improved as well.
2 years ago
Bryce 257752887d perf: add back memory efficiency improvements
Removed these in a rush to get SD-2.0 out.
2 years ago
Bryce e0af5d0089 fix: version metadata was broken
Fixes #114
2 years ago
Bryce 4610d7f01d feature: xformers support
add more upscaling code (that doesn't yet work)
2 years ago
Bryce 9c153a8d2d feature: support k-sampler methods for SD-2.0-v (768) 2 years ago
Bryce 015088507f feature/refactor/fix: better defaults. correct version in metadata
- feature: use different default steps and image sizes depending on sampler and model selceted
- fix: #110 use proper version in image metadata
- refactor: samplers all have their own class that inherits from ImageSampler
2 years ago
Kian-Meng Ang 3d04df4dee Fix typos
Found via `codespell -S ./imaginairy/vendored`
2 years ago
Bryce 58c2897dd1 refactor: fix lint issues 2 years ago
Maxime Mouchet 40ab571fc1 cli: show defaults and cleanup help text 2 years ago
Bryce e67341223b feature: Stable Diffusion 2.0
working: CUDA and MacOS
working: 512p model with all samplers
working: inpainting with all samplers
working: 768p model with ddim sampler
2 years ago
Bryce 893b041a8f feature: progress image callback 2 years ago
Bryce 095a905d72 fix: cpu generation doesn't use autocast
autocast not supported on CPU
https://github.com/pytorch/pytorch/issues/55374
https://github.com/invoke-ai/InvokeAI/pull/518
2 years ago
Bryce b8a88370de fix: lower memory reqs for attention on M1s 2 years ago
Bryce d499ca307b fix: use inpainting source that doesn't require login 2 years ago
Bryce 584e0d9df0 feature: change default sampler to k_dpmpp_2m, which is more than twice as fast 2 years ago
Bryce 0f02fc587c fix: k_dpm_fast on MPS platform
fixes #75

As discussed here: https://github.com/AUTOMATIC1111/stable-diffusion-webui/issues/2446#issuecomment-1279733739
2 years ago
Bryce 7af1ab66ca fix: add workaround for bug in k_diffusion on mps
As documented here: https://github.com/AUTOMATIC1111/stable-diffusion-webui/issues/4558#issuecomment-1310387114

- make image logs more consistent
- note which step the progress images belong to in the filename
2 years ago
Bryce 7fba2972e8 feature: added `DPM++ 2S a` and `DPM++ 2M` samplers
-fix: fix bug with `--show-work`
2 years ago
Bryce 021a0c540d feature: inpainting model support; improved model manager 2 years ago
Bryce 94c0aeab12 feature: switch between models without restarting python instance 2 years ago
Bryce 4d802a043e feature: stable diffusion 1.5 2 years ago
Bryce 8332593fed feature: dilation and erosion of masks
Previously the `+` and `-` characters in a mask (example: `face{+0.1}`) added to the grayscale value of any masked areas. This wasn't very useful. The new behavior is that the mask will expand or contract by the number of pixel specified. The technical terms for this are dilation and erosion.  This allows much greater control over the masked area.
2 years ago
Bryce 741a433c56 feature: update k_diffusion. add dpm_fast and dpm_addaptive samplers 2 years ago
Bryce dcf953383e tests: support distributed test runs
- switch to expected images instead of hashes. allow fuzzy matches
feature: more consistent seeds
2 years ago
Bryce 4ba1965db8 feature: k-diff sampler img2img and masking 2 years ago
Bryce 281d23adf2 refactor: prep for supporting img2img in k-samplers 2 years ago
Bryce e8bb3cf5fd refactor: consolidate masking logic 2 years ago
Bryce 72026c8c90 refactor: merge img2img and txt2img pipelines 2 years ago
Bryce a105dadbc4 refactor: combine identical schedules 2 years ago
Bryce 8d4b5cb9e1 refactor: standardize samplers more 2 years ago
Bryce 153c259ee4 fix: k-sampler methods were broken 2 years ago
Bryce 299687645b refactor: remove unused parameter 2 years ago
Bryce db5ebe9095 tests: tests can run without any network calls 2 years ago
Bryce b0123a8f43 refactor: remove unused parameters 2 years ago
Bryce 7ae77faf07 refactor: log indentation via formatter
Replace manual indentation with a context-aware logging formatter.
2 years ago
Bryce df3c752eb8 refactor: consolidate logging utils 2 years ago
Bryce 6a80759016 feature: improved safety filter
- provides more informative logs
- provides a detailed safety score object
- adds non-bypassable filter for extreme content
2 years ago
Bryce 0db5c329bb fix: prompt expansion bug 2 years ago
Bryce Drennan 31c2160e21
feature: prompt expansion (#51)
You can use `{}` to randomly pull values from lists.  A list of values separated by `|` and enclosed in `{ }` will be randomly drawn from in a non-repeating fashion. Values that are surrounded by `_ _` will pull from a phrase list of the same name.   Folders containing .txt phraselist files may be specified via
`--prompt_library_path`. The option may be specified multiple times.  Built-in categories:

      3d-term, adj-architecture, adj-beauty, adj-detailed, adj-emotion, adj-general, adj-horror, animal, art-movement,
      art-site, artist, artist-botanical, artist-surreal, aspect-ratio, bird, body-of-water, body-pose, camera-brand,
      camera-model, color, cosmic-galaxy, cosmic-nebula, cosmic-star, cosmic-term, dinosaur, eyecolor, f-stop,
      fantasy-creature, fantasy-setting, fish, flower, focal-length, food, fruit, games, gen-modifier, hair, hd,
      iso-stop, landscape-type, national-park, nationality, neg-weight, noun-beauty, noun-fantasy, noun-general,
      noun-horror, occupation, photo-term, pop-culture, pop-location, punk-style, quantity, rpg-item, scenario-desc,
      skin-color, spaceship, style, tree-species, trippy, world-heritage-site

   Examples:

   `imagine "a {red|black} dog" -r 2 --seed 0` will generate both "a red dog" and "a black dog"

   `imagine "a {_color_} dog" -r 4 --seed 0` will generate four, different colored dogs. The colors will eb pulled from an included
   phraselist of colors.

   `imagine "a {_spaceship_|_fruit_|hot air balloon}. low-poly" -r 4 --seed 0` will generate images of spaceships or fruits or a hot air balloon

   Credit to [noodle-soup-prompts](https://github.com/WASasquatch/noodle-soup-prompts/) where most, but not all, of the wordlists originate.
2 years ago
Bryce 9ba302a5f4 refactor: begin to standardize samplers 2 years ago
Bryce 62e4e9cc9d refactor: delete unused code 2 years ago
Bryce e5c5df6b3d tests: add some utils tests 2 years ago
Bryce beba2be6d5 fix: set fidelity default if None is passed in
Addresses #48
2 years ago
Bryce 2221d3d1c2 fix: handle small input images
If input images didn't need resizing because they were already smaller than max width/height then they didn't get normalized to a multiple of 64.  This caused an exception like the following:

```Sizes of tensors must match except in dimension 1. Expected size 4 but got size 3 for tensor number 1 in the list.
```
2 years ago
Bryce d3623882db fix: set default back to previous value
addresses #43
2 years ago
Bryce 340a90bacd feature: allow loading custom model weights at command line
Addresses #40
2 years ago
Bryce d689b06256 fix: ensure init-image-strength 0 is respected
addresses https://github.com/brycedrennan/imaginAIry/issues/38
2 years ago
Bryce 48117bbcb1 feature: face-fidelity is now configurable
remove face-fixing from upscaled version
2 years ago
Bryce f21c979f08 feature: better masking segmentation from clipseg 2 years ago
Bryce bc135724a3 fix: fix memory leak in face enhancer
thanks to @h4rk8s for discovering and finding a remedy

root cause was a model being instantiated inside
FaceRestoreHelper
2 years ago
Bryce 95a8fa31a9 fix: inpainting producing blurry images
while the previous version did produce much better blending it also makes images that lack detail for some reason.

tests: Added more tests to help catch this sort of thing earlies

fix: found that median blur is really slow, so I made sure we only do it on downsampled masks.  Was taking like 3 minutes to run on the large pearl girl picture on M1

- docs: update examples
2 years ago
Bryce 0fb03f2a1f fix/version: 2.0.1
quick fix for compatibility with Pillow < 9.1.0
https://stackoverflow.com/questions/71738218/module-pil-has-not-attribute-resampling
2 years ago
Bryce 6cae290038 fix: inpainting now matches photo at high generation strength
- 🎉 fix: inpainted areas correlate with surrounding image, even at 100% generation strength.  Previously if the generation strength was high enough the generated image
would be uncorrelated to the rest of the surrounding image.  It created terrible looking images.
 - fix: mask boundaries are more accurate
2 years ago
Bryce d563e0c7fb refactor: image version management
- mask_modify_original is now a prompt attribute
2 years ago
Bryce eaad0a15e4 ci: add automated testing/linting
- fix bugs
- disable some tests from running in CPU only mode since github actions can't handle it
2 years ago
Bryce 2f959c7394 docs: complete sentence 2 years ago
Bryce d832f15297 fix: masking now works properly at strengths 0 and 1 2 years ago
Bryce b69072d382 fix: various bugfixes 2 years ago
Bryce 2eec756fab feature: have initial generated images in their own folder 2 years ago
Bryce 30a80faf47 fix: use better rescale 2 years ago
Bryce b69b4c770e feature: interactive prompt
- add quiet flag
- add mask-modify-original flag
2 years ago
Bryce 69af07ab67 style: fix lint issues 2 years ago
Bryce 38c7f88950 feature: boolean logic masks
Specify advanced text based masks using boolean logic and strength modifiers. Mask descriptions must be lowercase. Keywords uppercase.
Valid symbols: `AND`, `OR`, `NOT`, `()`, and mask strength modifier `{*1.5}` where `+` can be any of `+ - * /`. Single-character boolean
operators also work.  When writing strength modifies know that pixel values are between 0 and 1.

 - feature: apply mask edits to original files
 - feature: auto-rotate images if exif data specifies to do so
 - fix: accept mask images in command line
2 years ago
Bryce Drennan d090f9d072
fix: unneeded argument 2 years ago
Bryce Drennan eb54b9ca7f
Merge pull request #22 from brycedrennan/pylama_lint_updates
refactor: implements changes to comply with pylama
2 years ago
Bryce a3a0de08e9 autoformat 2 years ago
Christian Käser 9fdd38fc11
Fix loading mask image from command line 2 years ago
Jay Drennan df28bf8805 refactor: implements changes to comply with pylama 2 years ago
Bryce cc014685bd fix: leave sample in float32 for all final processing 2 years ago
Bryce 9614a82f12 fix: use float32 at image render time for wider cpu compatibility
If the x_sample was a bfloat on the gpu but the cpu doesn't support bfloat, that can cause a TypeError
```
  File "/home/stdiff/.local/lib/python3.10/site-packages/imaginairy/api.py", line 292, in imagine
    x_sample.cpu().numpy(), "c h w -> h w c"

TypeError: Got unsupported ScalarType BFloat16`
```
2 years ago
Bryce cdfeaa4c6f tests: add docker image for testing environment. minor test improvements 2 years ago
Bryce 09bc1c70e6 fix: try to address #13 BFloat16 issue
Seems to be caused by incompatible types in group_norm when we use autocast.

Patch group_norm to cast the weights to the same type as the inputs

From what I can understand all the other repos just switch to full precision instead
of addressing this.  I think this would make things slower but I'm not sure. So maybe
the patching solution I'm doing is better?

https://github.com/pytorch/pytorch/pull/81852
2 years ago
Bryce e23e363bf5 lint 2 years ago
Bryce ff7fc0dab7 feature: tile mode can now be specified per-prompt 2 years ago
Bryce 6f77c23c1d version 1.5.4
minor changes to help with google colab compat
2 years ago
Bryce a46424c673 feature: img2img now supported with PLMS (instead of just DDIM)
Kinda hacky copy/pasting from ddim.  Need to cleanup
2 years ago
Bryce 4705d182d5 feature: generate captions for images
- add wip functionality for negative masks
- ci: add code linter that removes unused imports
- add instructions to install rust on osx
2 years ago
Bryce f040e3bffe feature: allow multiple additive targets for text masking targets 2 years ago
Bryce 930295d840 feature: txt2mask - automated text replacement
from https://github.com/timojl/clipseg
2 years ago
Bryce 7087c4a680 feature: automatic mask generation
mask generation working but not integrated
2 years ago
Bryce 8238e59067 tests: add more tests 2 years ago
Bryce d7cbf6e416 refactor: cleanup ddim
- delete more unused code
- fix some lints
2 years ago
Bryce 6307a0daf5 refactor: cleanup ddim 2 years ago
Bryce 89908603cf fix: don't repeatedly download the same url 2 years ago
Bryce 59648dbe61 test: add some tests/logging
add some experiments
2 years ago
Bryce 19d0b563ac style: lint fixes. remove unused code 2 years ago
Bryce c7a822d701 feature: urls as init images
- --init-image accepts urls
- cleanup command line code
2 years ago
Bryce 23f0e2be12 fix: select ddim for img2img 2 years ago
wseagar 56fc414724 fix: is_nsfw_img is None rather than false 2 years ago
Bryce fa3673ef56 fix: use context manager syntax compatible with python 3.8
parentheses supported in python 3.10
2 years ago
Bryce 51a8b1b8d8 fix: filter logic was wrong 2 years ago
Bryce 967eb76365 refactor/test: logging suppression + hashed image test
- simpler logging suppression for `transformers` library
- suppress logging noise for running tests
- get test running for all samplers on mps and cuda platforms
- refactor safety model env variable to allow classification
2 years ago
Bryce bb665b9eb6 fix: make k-diffusion samplers deterministic
- add test for hashes on mps.  images look same on CUDA but are slightly different.
2 years ago
Bryce b4a3b8c2b3 feature: k-diffusion samplers
- improved image logging functionality. can just stick log_latent wherever you want
- improved some variable naming
- moved all the samplers together
- vendored k-diffusion library
2 years ago
Bryce bb7eaa47f6 docs: small doc updates 2 years ago
Bryce ff7455034d docs and lint 2 years ago
Bryce 541ecb9701 feature: face enhancement and upscaling!! 2 years ago
Bryce 14a06e160d build: vendor clip
it's not on pypi
https://github.com/openai/CLIP/issues/141
2 years ago
Bryce 6ac3d40009 docs: update readme. add docs to package
Clean up logging some more
2 years ago
Bryce 292d1bcab5 perf: get "half" mode working when running on cuda 2 years ago
Bryce b9c00dd8de fix: util functions in wrong place
add tile example in readme
2 years ago
Bryce 84a73cb5a2 feature: (wip) better image to image
I tried it with the DDIM sampler and it didn't work.

Probably need to use the k-diffusion sampler with it
from a846393251/find_noise.py

needs https://github.com/crowsonkb/k-diffusion
2 years ago
Bryce 438c2868ad refactor: run import sorter 2 years ago
Bryce 3bdf2dc3ec feature: tile mode
from https://github.com/replicate/cog-stable-diffusion/compare/main...TomMoore515:material_stable_diffusion:main
2 years ago
Bryce 0bb5b6b345 perf: performance optimizations from Doggettx
https://github.com/CompVis/stable-diffusion/compare/main...Doggettx:stable-diffusion:autocast-improvements#
https://www.reddit.com/r/StableDiffusion/comments/xalaws/test_update_for_less_memory_usage_and_higher/
2 years ago
Bryce 910b7b4180 refactor: simplify structure 2 years ago
Bryce f1b1e1c1c8 feature: add nsfw image filter 2 years ago
Bryce 7a33ee2480 feature: cleaned up logging
- cleans up all the logging. hide most of it
 - create better readme. show example images
 - save metadata into image
2 years ago
Bryce 6d1d0622eb feature: Mac M1 Support out of box
- auto-downloads checkpoints
- fixes bug in torch
- autoset environment variable
2 years ago
Bryce 66c640ce7b feature: add ImageResult. step output option
remove verbose args
2 years ago
Bryce 47c6bcee59 refactor: move commands to entrypoints 2 years ago
Bryce a26e002a86 refactor: use logging instead of prints 2 years ago
Bryce f782fac570 feature: image prompts 2 years ago
Bryce 0835b2db16 first commit 2 years ago