* update version number
* print version number at startup
* move version number into ldm/invoke/_version.py
* bump version to 2.2.6+a0
* handle whitespace better
* resolve issues raised by mauwii during PR review
- Fixed codeformer module so that the facexlib files are downloaded
into their pre-stored location in models/gfpgan/weights (shared
with the GFPGAN module)
* installer tweaks in preparation for v2.2.5
- pin numpy to 1.23.* to avoid requirements conflict with numba
- update.sh and update.bat now accept a tag or branch string, not a URL
- update scripts download latest requirements-base before updating.
* update.bat.in debugged and working
* update pulls from "latest" now
* bump version number
* fix permissions on create_installer.sh
* give Linux user option of installing ROCm or CUDA
* rc2.2.5 (install.sh) relative path fixes (#2155)
* (installer) fix bug in resolution of relative paths in linux install script
point installer at 2.2.5-rc1
selecting ~/Data/myapps/ as location would create a ./~/Data/myapps
instead of expanding the ~/ to the value of ${HOME}
also, squash the trailing slash in path, if it was entered by the user
* (installer) add option to automatically start the app after install
also: when exiting, print the command to get back into the app
* remove extraneous whitespace
* model_cache applies rootdir to config path
* bring installers up to date with 2.2.5-rc2
* bump rc version
* create_installer now adds version number
* rebuild frontend
* bump rc#
* add locales to frontend dist package
- bump to patchlevel 6
* bump patchlevel
* use invoke-ai version of GFPGAN
- This version is very slightly modified to allow weights files
to be pre-downloaded by the configure script.
* fix formatting error during startup
* bump patch level
* workaround #2 for GFPGAN facexlib() weights downloading
* bump patch
* ready for merge and release
* remove extraneous comment
* set PYTORCH_ENABLE_MPS_FALLBACK directly in invoke.py
Co-authored-by: Eugene Brodsky <ebr@users.noreply.github.com>
- A couple of users have reported that switching back and forth
between ckpt models is causing a "GPU out of memory" crash.
Traceback suggests there is actually a CPU RAM issue.
- This speculative test simply performs a round of garbage collection
before the point where the crash occurs.
* add example of using -from_file to read from a script
Addresses #1654, #473, #566, #1008 at least partially.
* fix bug in code example
* improve docs for !fetch and !replay
* enable rendering of images in GH WebUI
also fix indention in some bullet lists
Co-authored-by: mauwii <Mauwii@outlook.de>
When using the inpainting model, the following sequence of events
would cause a predictable crash:
1. Use unified canvas to outcrop a portion of the image.
2. Accept outcropped image and import into img2img
3. Try any img2img operation
This closes#1596.
The crash was:
```
operands could not be broadcast together with shapes (320,512) (512,576)
Traceback (most recent call last):
File "/data/lstein/InvokeAI/backend/invoke_ai_web_server.py", line 1125, in generate_images
self.generate.prompt2image(
File "/data/lstein/InvokeAI/ldm/generate.py", line 492, in prompt2image
results = generator.generate(
File "/data/lstein/InvokeAI/ldm/invoke/generator/base.py", line 98, in generate
image = make_image(x_T)
File "/data/lstein/InvokeAI/ldm/invoke/generator/omnibus.py", line 138, in make_image
return self.sample_to_image(samples)
File "/data/lstein/InvokeAI/ldm/invoke/generator/omnibus.py", line 173, in sample_to_image
corrected_result = super(Img2Img, self).repaste_and_color_correct(gen_result, self.pil_image, self.pil_mask, self.mask_blur_radius)
File "/data/lstein/InvokeAI/ldm/invoke/generator/base.py", line 148, in repaste_and_color_correct
mask_pixels = init_a_pixels * init_mask_pixels > 0
ValueError: operands could not be broadcast together with shapes (320,512) (512,576)
```
This error was caused by the image and its mask not being of identical
size due to the outcropping operation. The ultimate cause of this
error has something to do with different code paths being followed in
the `inpaint` vs the `omnibus` modules.
Since omnibus will be obsoleted by diffusers, I have chosen just to
work around the problem rather than track it down to its source. The
only ill effect is that color correction will not be applied to the
first image created by `img2img` after applying the outcrop and
immediately importing into the img2img canvas. Since the inpainting
model has less of a color drift problem than the standard model, this
is unlikely to be problematic.
* defer patchmatch loading
Because of the way that patchmatch was loaded early at import time, it
was impossible to turn off the attempted loading with --no-patchmatch.
In addition, the patchmatch loading messages appear early on during
initialization, interfering with ability to print out the version
cleanly when --version provided to invoke script.
This commit creates a thin wrapper class for patch_match that is only
loaded when needed, solving both problems.
* create a singleton patchmatch object for use in inpainting
This creates a thin wrapper to patchmatch which loads the module
on demand, respecting the global "trypatchmatch" option.
* address 2d round of issues in PR 2039 comments
* Patchmatch->PatchMatch and misc cleanup
* add --version to invoke.py arguments
This commit allows invoke.py to print out its name and version
number when given the --version argument. I had to move some
status messages around in order to make the output clean.
There is still an early message about initializing patchmatch
that interferes with a clean print of the version, and in fact the
--no-patchmatch argument is not doing anything. This will be the
subject of a subsequent PR.
* export APP_ID and APP_VERSION
Needed to support the web backend.
* (config) handle huggingface token more gracefully
* (docs) document HuggingFace token requirement for Concepts
* (cli) deprecate the --(no)-interactive CLI flag
It was previously only used to skip the SD weights download, and therefore
the prompt for Huggingface token (the "interactive" part).
Now that we don't need a Huggingface token
to download the SD weights at all, we can replace this flag with
"--skip-sd-weights", to clearly describe its purpose
The `--(no)-interactive` flag still functions the same, but shows a deprecation message
* (cli) fix emergency_model_reconfigure argument parsing
* (config) fix installation issues on systems with non-UTF8 locale
Co-authored-by: Matthias Wild <40327258+mauwii@users.noreply.github.com>
Before making a concept download request to HuggingFace, the concepts
library module now checks the concept name against a downloaded list
of all the concepts currently known to HuggingFace. If the requested
concept is not on the list, then no download request is made.
* add an argument that lets user specify folders to scan for weights
This PR adds a `--weight_folders` argument to invoke.py. Using
argparse, it adds a "weight_folders" attribute to the Args object, and
can be used like this:
```
'''test.py'''
from ldm.invoke.args import Args
args = Args().parse_args()
for folder in args.weight_folders:
print(folder)
```
Example output:
```
python test.py --weight_folders /tmp/weights /home/fred/invokeai/weights "./my folder with spaces/weight files"
/tmp/weights
/home/fred/invokeai/weights
./my folder with spaces/weight files
```
* change --weight_folders to --weight_dirs
* Add Embedding Parsing
* Add Embedding Parsing
* Return token_dim in embedding_info
* fixes to handle other variants
1. Handle the case of a .bin file being mislabeled .pt (seen in the
wild at https://cyberes.github.io/stable-diffusion-textual-inversion-models/)
2. Handle the "broken" .pt files reported by https://github.com/invoke-ai/InvokeAI/issues/1829
3. When token name is not available, use the basename of the pt or bin file rather than the
whole path.
fixes#1829
* remove whitespace
Co-authored-by: Lincoln Stein <lincoln.stein@gmail.com>
* Correct timestep for img2img initial noise addition
* apply fix to inpaint and txt2img2img as well
Co-authored-by: Lincoln Stein <lincoln.stein@gmail.com>
- The invoke.py script now checks that the root (runtime) directory contains
the expected config/models.yaml file and if it doesn't exits with a helpful
error message about how to set the proper root.
- Formerly the script would fail with a "bad model" message and try to redownload
its models, which is not helpful in the case that the root is missing or
damaged.
* Push dockerfile (#18)
* update build-container.yml
* add login step to build-container.yml
* update job name
* update matrix: add registry and platforms
also set latest only for cuda image
* quote string
* use latest for amd and cuda image
* separate images for cuda and amd
* change latest from auto to true
* configure_invoke -y instead of --interactive
* fix argument to --yes
* update matrix:
- use flavor instead of pip-requirements
- add flavor `cloud`
- add `dockerfile`
* introduce INVOKE_MODEL_RECONFIGURE
* add `--cap-add=sys_nice` to run.sh
* update Dockerfile: install wheel
* only have main branch in action again
* disable push of cloud image for now
since it still has it's own workflow, but PoC succeeded
* remove now untrue comments in top
* install pip, setuptools and wheel in sep. step
* add labels to the image
* remove doubled installation of wheel
This commit fixes the root search logic to be as follows:
1) The `--root_dir` command line argument
2) The contents of environment variable INVOKEAI_ROOT
3) The VIRTUAL_ENV environment variable, plus '..'
4) $HOME/invokeai
(3) is the new feature. Since we are now recommending to install
InvokeAI and its dependencies into the .venv in the root directory,
this should be a reliable choice.
- Using relative root addresses was causing problems when the
current working directory was changed after start time.
- This commit makes the root address absolute at start time, such
that changing the working directory later on doesn't break anything.
* partially working simple installer
* works on linux
* fix linux requirements files
* read root environment variable in right place
* fix cat invokeai.init in test workflows
* fix classical cp error in test-invoke-pip.yml
* respect --root argument now
* untested bat installers added
* windows install.bat now working
fix logic to find frontend files
* rename simple_install to "installer"
1. simple_install => 'installer'
2. source and binary install directories are removed
* enable update scripts to update requirements
- Also pin requirements to known working commits.
- This may be a breaking change; exercise with caution
- No functional testing performed yet!
* update docs and installation requirements
NOTE: This may be a breaking commit! Due to the way the installer
works, I have to push to a public branch in order to do full end-to-end
testing.
- Updated installation docs, removing binary and source installers and
substituting the "simple" unified installer.
- Pin requirements for the "http:" downloads to known working commits.
- Removed as much as possible the invoke-ai forks of others' repos.
* fix directory path for installer
* correct requirement/environment errors
* exclude zip files in .gitignore
* possible fix for dockerbuild
* ready for torture testing
- final Windows bat file tweaks
- copy environments-and-requirements to the runtime directory so that
the `update.sh` script can run.
This is not ideal, since we lose control over the
requirements. Better for the update script to pull the proper
updated requirements script from the repository.
* allow update.sh/update.bat to install arbitrary InvokeAI versions
- Can pass the zip file path to any InvokeAI release, branch, commit or tag,
and the installer will try to install it.
- Updated documentation
- Added Linux Python install hints.
* use binary installer's :err_exit function
* user diffusers 0.10.0
* added logic for CPPFLAGS on mac
* improve windows install documentation
- added information on a couple of gotchas I experienced during
windows installation, including DLL loading errors experienced
when Visual Studio C++ Redistributable was not present.
* tagged to pull from 2.2.4-rc1
- also fix error of shell window closing immediately if suitable
python not found
Co-authored-by: mauwii <Mauwii@outlook.de>
* attention maps saving to /tmp
* tidy up diffusers branch backporting of cross attention refactoring
* base64-encoding the attention maps image for generationResult
* cleanup/refactor conditioning.py
* attention maps and tokens being sent to web UI
* attention maps: restrict count to actual token count and improve robustness
* add argument type hint to image_to_dataURL function
Co-authored-by: psychedelicious <4822129+psychedelicious@users.noreply.github.com>
Co-authored-by: damian <git@damianstewart.com>
Co-authored-by: psychedelicious <4822129+psychedelicious@users.noreply.github.com>
In the event where no `init_mask` is given and `invert_mask` is set to True, the script will raise the following error:
```bash
AttributeError: 'NoneType' object has no attribute 'mode'
```
The new implementation will only run inversion when both variables are valid.
prompt token sequences begin with a "beginning-of-sequence" marker <bos> and end with a repeated "end-of-sequence" marker <eos> - to make a default prompt length of <bos> + 75 prompt tokens + <eos>. the .swap() code was failing to take the column for <bos> at index 0 into account. the changes here do that, and also add extra handling for a single <eos> (which may be redundant but which is included for completeness).
based on my understanding and some assumptions about how this all works, the reason .swap() nevertheless seemed to do the right thing, to some extent, is because over multiple steps the conditioning process in Stable Diffusion operates as a feedback loop. a change to token n-1 has flow-on effects to how the [1x4x64x64] latent tensor is modified by all the tokens after it, - and as the next step is processed, all the tokens before it as well. intuitively, a token's conditioning effects "echo" throughout the whole length of the prompt. so even though the token at n-1 was being edited when what the user actually wanted was to edit the token at n, it nevertheless still had some non-negligible effect, in roughly the right direction, often enough that it seemed like it was working properly.
Some users have been complaining that the CLI "freezes" for a while
before the invoke> prompt appears. I believe this is due to internet
delay while the concepts library names are downloaded by the autocompleter.
I have changed logic so that the concepts are downloaded the first time
the user types a < and tabs.
- make the warnings about patchmatch less redundant
- only warn about being unable to load concepts from Hugging Face
library once
- do not crash when unable to load concepts from Hugging Face
due to network connectivity issues
* Fixes inpainting + code cleanup
* Disable stage info in Inpainting Tab
* Mask Brush Preview now always at 0.5 opacity
The new mask is only visible properly at max opacity but at max opacity the brush preview becomes fully opaque blocking the view. So the mask brush preview no remains at 0.5 no matter what the Brush opacity is.
* Remove save button from Canvas Controls (cleanup)
* Implements invert mask
* Changes "Invert Mask" to "Preserve Masked Areas"
* Fixes (?) spacebar issues
* Patches redux-persist and redux-deep-persist with debounced persists
Our app changes redux state very, very often. As our undo/redo history grows, the calls to persist state start to take in the 100ms range, due to a the deep cloning of the history. This causes very noticeable performance lag.
The deep cloning is required because we need to blacklist certain items in redux from being persisted (e.g. the app's connection status).
Debouncing the whole process of persistence is a simple and effective solution. Unfortunately, `redux-persist` dropped `debounce` between v4 and v5, replacing it with `throttle`. `throttle`, instead of delaying the expensive action until a period of X ms of inactivity, simply ensures the action is executed at least every X ms. Of course, this does not fix our performance issue.
The patch is very simple. It adds a `debounce` argument - a number of milliseconds - and debounces `redux-persist`'s `update()` method (provided by `createPersistoid`) by that many ms.
Before this, I also tried writing a custom storage adapter for `redux-persist` to debounce the calls to `localStorage.setItem()`. While this worked and was far less invasive, it doesn't actually address the issue. It turns out `setItem()` is a very fast part of the process.
We use `redux-deep-persist` to simplify the `redux-persist` configuration, which can get complicated when you need to blacklist or whitelist deeply nested state. There is also a patch here for that library because it uses the same types as `redux-persist`.
Unfortunately, the last release of `redux-persist` used a package `flat-stream` which was malicious and has been removed from npm. The latest commits to `redux-persist` (about 1 year ago) do not build; we cannot use the master branch. And between the last release and last commit, the changes have all been breaking.
Patching this last release (about 3 years old at this point) directly is far simpler than attempting to fix the upstream library's master branch or figuring out an alternative to the malicious and now non-existent dependency.
* Adds debouncing
* Fixes AttributeError: 'dict' object has no attribute 'invert_mask'
* Updates package.json to use redux-persist patches
* Attempts to fix redux-persist debounce patch
* Fixes undo/redo
* Fixes invert mask
* Debounce > 300ms
* Limits history to 256 for each of undo and redo
* Canvas styling
* Hotkeys improvement
* Add Metadata To Viewer
* Increases CFG Scale max to 200
* Fix gallery width size for Outpainting
Also fixes the canvas resizing failing n fast pushes
* Fixes disappearing canvas grid lines
* Adds staging area
* Fixes "use all" not setting variationAmount
Now sets to 0 when the image had variations.
* Builds fresh bundle
* Outpainting tab loads to empty canvas instead of upload
* Fixes wonky canvas layer ordering & compositing
* Fixes error on inpainting paste back
`TypeError: 'float' object cannot be interpreted as an integer`
* Hides staging area outline on mouseover prev/next
* Fixes inpainting not doing img2img when no mask
* Fixes bbox not resizing in outpainting if partially off screen
* Fixes crashes during iterative outpaint. Still doesn't work correctly though.
* Fix iterative outpainting by restoring original images
* Moves image uploading to HTTP
- It all seems to work fine
- A lot of cleanup is still needed
- Logging needs to be added
- May need types to be reviewed
* Fixes: outpainting temp images show in gallery
* WIP refactor to unified canvas
* Removes console.log from redux-persist patch
* Initial unification of canvas
* Removes all references to split inpainting/outpainting canvas
* Add patchmatch and infill_method parameter to prompt2image (options are 'patchmatch' or 'tile').
* Fixes app after removing in/out-painting refs
* Rebases on dev, updates new env files w/ patchmatch
* Organises features/canvas
* Fixes bounding box ending up offscreen
* Organises features/canvas
* Stops unnecessary canvas rescales on gallery state change
* Fixes 2px layout shift on toggle canvas lock
* Clips lines drawn while canvas locked
When drawing with the locked canvas, if a brush stroke gets too close to the edge of the canvas and its stroke would extend past the edge of the canvas, the edge of that stroke will be seen after unlocking the canvas.
This could cause a problem if you unlock the canvas and now have a bunch of strokes just outside the init image area, which are far back in undo history and you cannot easily erase.
With this change, lines drawn while the canvas is locked get clipped to the initial image bbox, fixing this issue.
Additionally, the merge and save to gallery functions have been updated to respect the initial image bbox so they function how you'd expect.
* Fixes reset canvas view when locked
* Fixes send to buttons
* Fixes bounding box not being rounded to 64
* Abandons "inpainting" canvas lock
* Fixes save to gallery including empty area, adds download and copy image
* Fix Current Image display background going over image bounds
* Sets status immediately when clicking Invoke
* Adds hotkeys and refactors sharing of konva instances
Adds hotkeys to canvas. As part of this change, the access to konva instance objects was refactored:
Previously closure'd refs were used to indirectly get access to the konva instances outside of react components.
Now, a getter and setter function are used to provide access directly to the konva objects.
* Updates hotkeys
* Fixes canvas showing spinner on first load
Also adds good default canvas scale and positioning when no image is on it
* Fixes possible hang on MaskCompositer
* Improves behaviour when setting init canvas image/reset view
* Resets bounding box coords/dims when no image present
* Disables canvas actions which cannot be done during processing
* Adds useToastWatcher hook
- Dispatch an `addToast` action with standard Chakra toast options object to add a toast to the toastQueue
- The hook is called in App.tsx and just useEffect's w/ toastQueue as dependency to create the toasts
- So now you can add toasts anywhere you have access to `dispatch`, which includes middleware and thunks
- Adds first usage of this for the save image buttons in canvas
* Update Hotkey Info
Add missing tooltip hotkeys and update the hotkeys modal to reflect the new hotkeys for the Unified Canvas.
* Fix theme changer not displaying current theme on page refresh
* Fix tab count in hotkeys panel
* Unify Brush and Eraser Sizes
* Fix staging area display toggle not working
* Staging Area delete button is now red
So it doesnt feel blended into to the rest of them.
* Revert "Fix theme changer not displaying current theme on page refresh"
This reverts commit 903edfb803e743500242589ff093a8a8a0912726.
* Add arguments to use SSL to webserver
* Integrates #1487 - touch events
Need to add:
- Pinch zoom
- Touch-specific handling (some things aren't quite right)
* Refactors upload-related async thunks
- Now standard thunks instead of RTK createAsyncThunk()
- Adds toasts for all canvas upload-related actions
* Reorganises app file structure
* Fixes Canvas Auto Save to Gallery
* Fixes staging area outline
* Adds staging area hotkeys, disables gallery left/right when staging
* Fixes Use All Parameters
* Fix metadata viewer image url length when viewing intermediate
* Fixes intermediate images being tiny in txt2img/img2img
* Removes stale code
* Improves canvas status text and adds option to toggle debug info
* Fixes paste image to upload
* Adds model drop-down to site header
* Adds theme changer popover
* Fix missing key on ThemeChanger map
* Fixes stage position changing on zoom
* Hotkey Cleanup
- Viewer is now Z
- Canvas Move tool is V - sync with PS
- Removed some unused hotkeys
* Fix canvas resizing when both options and gallery are unpinned
* Implements thumbnails for gallery
- Thumbnails are saved whenever an image is saved, and when gallery requests images from server
- Thumbnails saved at original image aspect ratio with width of 128px as WEBP
- If the thumbnail property of an image is unavailable for whatever reason, the image's full size URL is used instead
* Saves thumbnails to separate thumbnails directory
* Thumbnail size = 256px
* Fix Lightbox Issues
* Disables canvas image saving functions when processing
* Fix index error on going past last image in Gallery
* WIP - Lightbox Fixes
Still need to fix the images not being centered on load when the image res changes
* Fixes another similar index error, simplifies logic
* Reworks canvas toolbar
* Fixes canvas toolbar upload button
* Cleans up IAICanvasStatusText
* Improves metadata handling, fixes#1450
- Removes model list from metadata
- Adds generation's specific model to metadata
- Displays full metadata in JSON viewer
* Gracefully handles corrupted images; fixes#1486
- App does not crash if corrupted image loaded
- Error is displayed in the UI console and CLI output if an image cannot be loaded
* Adds hotkey to reset canvas interaction state
If the canvas' interaction state (e.g. isMovingBoundingBox, isDrawing, etc) get stuck somehow, user can press Escape to reset the state.
* Removes stray console.log()
* Fixes bug causing gallery to close on context menu open
* Minor bugfixes
- When doing long-running canvas image exporting actions, display indeterminate progress bar
- Fix staging area image outline not displaying after committing/discarding results
* Removes unused imports
* Fixes repo root .gitignore ignoring frontend things
* Builds fresh bundle
* Styling updates
* Removes reasonsWhyNotReady
The popover doesn't play well with the button being disabled, and I don't think adds any value.
* Image gallery resize/style tweaks
* Styles buttons for clearing canvas history and mask
* First pass on Canvas options panel
* Fixes bug where discarding staged images results in loss of history
* Adds Save to Gallery button to staging toolbar
* Rearrange some canvas toolbar icons
Put brush stuff together and canvas movement stuff together
* Fix gallery maxwidth on unified canvas
* Update Layer hotkey display to UI
* Adds option to crop to bounding box on save
* Masking option tweaks
* Crop to Bounding Box > Save Box Region Only
* Adds clear temp folder
* Updates mask options popover behavior
* Builds fresh bundle
* Fix styling on alert modals
* Fix input checkbox styling being incorrect on light theme
* Styling fixes
* Improves gallery resize behaviour
* Cap gallery size on canvas tab so it doesnt overflow
* Fixes bug when postprocessing image with no metadata
* Adds IAIAlertDialog component
* Moves Loopback to app settings
* Fixes metadata viewer not showing metadata after refresh
Also adds Dream-style prompt to metadata
* Adds outpainting specific options
* Linting
* Fixes gallery width on lightbox, fixes gallery button expansion
* Builds fresh bundle
* Fix Lightbox images of different res not centering
* Update feature tooltip text
* Highlight mask icon when on mask layer
* Fix gallery not resizing correctly on open and close
* Add loopback to just img2img. Remove from settings.
* Fix to gallery resizing
* Removes Advanced checkbox, cleans up options panel for unified canvas
* Minor styling fixes to new options panel layout
* Styling Updates
* Adds infill method
* Tab Styling Fixes
* memoize outpainting options
* Fix unnecessary gallery re-renders
* Isolate Cursor Pos debug text on canvas to prevent rerenders
* Fixes missing postprocessed image metadata before refresh
* Builds fresh bundle
* Fix rerenders on model select
* Floating panel re-render fix
* Simplify fullscreen hotkey selector
* Add Training WIP Tab
* Adds Training icon
* Move full screen hotkey to floating to prevent tab rerenders
* Adds single-column gallery layout
* Fixes crash on cancel with intermediates enabled, fixes#1416
* Updates npm dependencies
* Fixes img2img attempting inpaint when init image has transparency
* Fixes missing threshold and perlin parameters in metadata viewer
* Renames "Threshold" > "Noise Threshold"
* Fixes postprocessing not being disabled when clicking use all
* Builds fresh bundle
* Adds color picker
* Lints & builds fresh bundle
* Fixes iterations being disabled when seed random & variations are off
* Un-floors cursor position
* Changes color picker preview to circles
* Fixes variation params not set correctly when recalled
* Fixes invoke hotkey not working in input fields
* Simplifies Accordion
Prep for adding reset buttons for each section
* Fixes mask brush preview color
* Committing color picker color changes tool to brush
* Color picker does not overwrite user-selected alpha
* Adds brush color alpha hotkey
* Lints
* Removes force_outpaint param
* Add inpaint size options to inpaint at a larger size than the actual inpaint image, then scale back down for recombination
* Bug fix for inpaint size
* Adds inpaint size (as scale bounding box) to UI
* Adds auto-scaling for inpaint size
* Improves scaled bbox display logic
* Fixes bug with clear mask and history
* Fixes shouldShowStagingImage not resetting to true on commit
* Builds fresh bundle
* Fixes canvas failing to scale on first run
* Builds fresh bundle
* Fixes unnecessary canvas scaling
* Adds gallery drag and drop to img2img/canvas
* Builds fresh bundle
* Fix desktop mode being broken with new versions of flaskwebgui
* Fixes canvas dimensions not setting on first load
* Builds fresh bundle
* stop crash on !import_models call on model inside rootdir
- addresses bug report #1546
* prevent "!switch state gets confused if model switching fails"
- If !switch were to fail on a particular model, then generate got
confused and wouldn't try again until you switch to a different working
model and back again.
- This commit fixes and closes#1547
* Revert "make the docstring more readable and improve the list_models logic"
This reverts commit 248068fe5d.
* fix model cache path
* also set fail-fast to it's default (true)
in this way the whole action fails if one job fails
this should unblock the runners!!!
* fix output path for Archive results
* disable checks for python 3.9
* Update-requirements and test-invoke-pip workflow (#1574)
* update requirements files
* update test-invoke-pip workflow
* move requirements-mkdocs.txt to docs folder (#1575)
* move requirements-mkdocs.txt to docs folder
* update copyright
* Fixes outpainting with resized inpaint size
* Interactive configuration (#1517)
* Update scripts/configure_invokeai.py
prevent crash if output exists
Co-authored-by: psychedelicious <4822129+psychedelicious@users.noreply.github.com>
* implement changes requested by reviews
* default to correct root and output directory on Windows systems
- Previously the script was relying on the readline buffer editing
feature to set up the correct default. But this feature doesn't
exist on windows.
- This commit detects when user typed return with an empty directory
value and replaces with the default directory.
* improved readability of directory choices
* Update scripts/configure_invokeai.py
Co-authored-by: psychedelicious <4822129+psychedelicious@users.noreply.github.com>
* better error reporting at startup
- If user tries to run the script outside of the repo or runtime directory,
a more informative message will appear explaining the problem.
Co-authored-by: psychedelicious <4822129+psychedelicious@users.noreply.github.com>
* Embedding merging (#1526)
* add whole <style token> to vocab for concept library embeddings
* add ability to load multiple concept .bin files
* make --log_tokenization respect custom tokens
* start working on concept downloading system
* preliminary support for dynamic loading and merging of multiple embedded models
- The embedding_manager is now enhanced with ldm.invoke.concepts_lib,
which handles dynamic downloading and caching of embedded models from
the Hugging Face concepts library (https://huggingface.co/sd-concepts-library)
- Downloading of a embedded model is triggered by the presence of one or more
<concept> tags in the prompt.
- Once the embedded model is downloaded, its trigger phrase will be loaded
into the embedding manager and the prompt's <concept> tag will be replaced
with the <trigger_phrase>
- The downloaded model stays on disk for fast loading later.
- The CLI autocomplete will complete partial <concept> tags for you. Type a
'<' and hit tab to get all ~700 concepts.
BUGS AND LIMITATIONS:
- MODEL NAME VS TRIGGER PHRASE
You must use the name of the concept embed model from the SD
library, and not the trigger phrase itself. Usually these are the
same, but not always. For example, the model named "hoi4-leaders"
corresponds to the trigger "<HOI4-Leader>"
One reason for this design choice is that there is no apparent
constraint on the uniqueness of the trigger phrases and one trigger
phrase may map onto multiple models. So we use the model name
instead.
The second reason is that there is no way I know of to search
Hugging Face for models with certain trigger phrases. So we'd have
to download all 700 models to index the phrases.
The problem this presents is that this may confuse users, who will
want to reuse prompts from distributions that use the trigger phrase
directly. Usually this will work, but not always.
- WON'T WORK ON A FIREWALLED SYSTEM
If the host running IAI has no internet connection, it can't
download the concept libraries. I will add a script that allows
users to preload a list of concept models.
- BUG IN PROMPT REPLACEMENT WHEN MODEL NOT FOUND
There's a small bug that occurs when the user provides an invalid
model name. The <concept> gets replaced with <None> in the prompt.
* fix loading .pt embeddings; allow multi-vector embeddings; warn on dupes
* simplify replacement logic and remove cuda assumption
* download list of concepts from hugging face
* remove misleading customization of '*' placeholder
the existing code as-is did not do anything; unclear what it was supposed to do.
the obvious alternative -- setting using 'placeholder_strings' instead of
'placeholder_tokens' to match model.params.personalization_config.params.placeholder_strings --
caused a crash. i think this is because the passed string also needed to be handed over
on init of the PersonalizedBase as the 'placeholder_token' argument.
this is weird config dict magic and i don't want to touch it. put a
breakpoint in personalzied.py line 116 (top of PersonalizedBase.__init__) if
you want to have a crack at it yourself.
* address all the issues raised by damian0815 in review of PR #1526
* actually resize the token_embeddings
* multiple improvements to the concept loader based on code reviews
1. Activated the --embedding_directory option (alias --embedding_path)
to load a single embedding or an entire directory of embeddings at
startup time.
2. Can turn off automatic loading of embeddings using --no-embeddings.
3. Embedding checkpoints are scanned with the pickle scanner.
4. More informative error messages when a concept can't be loaded due
either to a 404 not found error or a network error.
* autocomplete terms end with ">" now
* fix startup error and network unreachable
1. If the .invokeai file does not contain the --root and --outdir options,
invoke.py will now fix it.
2. Catch and handle network problems when downloading hugging face textual
inversion concepts.
* fix misformatted error string
Co-authored-by: Damian Stewart <d@damianstewart.com>
* model_cache.py: fix list_models
Signed-off-by: devops117 <55235206+devops117@users.noreply.github.com>
* add statement of values (#1584)
* this adds the Statement of Values
Google doc source = https://docs.google.com/document/d/1-PrUKDJcxy8OyNGc8CyiHhv2VgLvjt7LRGlEpbg1nmQ/edit?usp=sharing
* Fix heading
* Update InvokeAI_Statement_of_Values.md
* Update InvokeAI_Statement_of_Values.md
* Update InvokeAI_Statement_of_Values.md
* Update InvokeAI_Statement_of_Values.md
* Update InvokeAI_Statement_of_Values.md
* add keturn and mauwii to the team member list
* Fix punctuation
* this adds the Statement of Values
Google doc source = https://docs.google.com/document/d/1-PrUKDJcxy8OyNGc8CyiHhv2VgLvjt7LRGlEpbg1nmQ/edit?usp=sharing
* add keturn and mauwii to the team member list
* fix formating
- make sub bullets use * (decide to all use - or *)
- indent sub bullets
Sorry, first only looked at the code version and found this only after
looking at the markdown rendered version
* use multiparagraph numbered sections
* Break up Statement Of Values as per comments on #1584
* remove duplicated word, reduce vagueness
it's important not to overstate how many artists we are consulting.
* fix typo (sorry blessedcoolant)
Co-authored-by: mauwii <Mauwii@outlook.de>
Co-authored-by: damian <git@damianstewart.com>
* update dockerfile (#1551)
* update dockerfile
* remove not existing file from .dockerignore
* remove bloat and unecesary step
also use --no-cache-dir for pip install
image is now close to 2GB
* make Dockerfile a variable
* set base image to `ubuntu:22.10`
* add build-essential
* link outputs folder for persistence
* update tag variable
* update docs
* fix not customizeable build args, add reqs output
* !model_import autocompletes in ROOTDIR
* Adds psychedelicious to statement of values signature (#1602)
* add a --no-patchmatch option to disable patchmatch loading (#1598)
This feature was added to prevent the CI Macintosh tests from erroring
out when patchmatch is unable to retrieve its shared library from
github assets.
* Fix#1599 by relaxing the `match_trigger` regex (#1601)
* Fix#1599 by relaxing the `match_trigger` regex
Also simplify logic and reduce duplication.
* restrict trigger regex again (but not so far)
* make concepts library work with Web UI
This PR makes it possible to include a Hugging Face concepts library
<style-or-subject-trigger> in the WebUI prompt. The metadata seems
to be correctly handled.
* documentation enhancements (#1603)
- Add documentation for the Hugging Face concepts library and TI embedding.
- Fixup index.md to point to each of the feature documentation files,
including ones that are pending.
* tweak setup and environment files for linux & pypatchmatch (#1580)
* tweak setup and environment files for linux & pypatchmatch
- Downgrade python requirements to 3.9 because 3.10 is not supported
on Ubuntu 20.04 LTS (widely-used distro)
- Use our github pypatchmatch 0.1.3 in order to install Makefile
where it needs to be.
- Restored "-e ." as the last install step on pip installs. Hopefully
this will not trigger the high-CPU hang we've previously experienced.
* keep windows on basicsr 1.4.1
* keep windows on basicsr 1.4.1
* bump pypatchmatch requirement to 0.1.4
- This brings in a version of pypatchmatch that will gracefully
handle internet connection not available at startup time.
- Also refactors and simplifies the handling of gfpgan's basicsr requirement
across various platforms.
* revert to older version of list_models() (#1611)
This restores the correct behavior of list_models() and quenches
the bug of list_models() returning a single model entry named "name".
I have not investigated what was wrong with the new version, but I
think it may have to do with changes to the behavior in dict.update()
* Fixes for #1604 (#1605)
* Converts ESRGAN image input to RGB
- Also adds typing for image input.
- Partially resolves#1604
* ensure there are unmasked pixels before color matching
Co-authored-by: Kyle Schouviller <kyle0654@hotmail.com>
* update index.md (#1609)
- comment out non existing link
- fix indention
- add seperator between feature categories
* Debloat-docker (#1612)
* debloat Dockerfile
- less options more but more userfriendly
- better Entrypoint to simulate CLI usage
- without command the container still starts the web-host
* debloat build.sh
* better syntax in run.sh
* update Docker docs
- fix description of VOLUMENAME
- update run script example to reflect new entrypoint
* Test installer (#1618)
* test linux install
* try removing http from parsed requirements
* pip install confirmed working on linux
* ready for linux testing
- rebuilt py3.10-linux-x86_64-cuda-reqs.txt to include pypatchmatch
dependency.
- point install.sh and install.bat to test-installer branch.
* Updates MPS reqs
* detect broken readline history files
* fix download.pytorch.org URL
* Test installer (Win 11) (#1620)
Co-authored-by: Cyrus Chan <cyruswkc@hku.hk>
* Test installer (MacOS 13.0.1 w/ torch==1.12.0) (#1621)
* Test installer (Win 11)
* Test installer (MacOS 13.0.1 w/ torch==1.12.0)
Co-authored-by: Cyrus Chan <cyruswkc@hku.hk>
* change sourceball to development for testing
* Test installer (MacOS 13.0.1 w/ torch==1.12.1 & torchvision==1.13.1) (#1622)
* Test installer (Win 11)
* Test installer (MacOS 13.0.1 w/ torch==1.12.0)
* Test installer (MacOS 13.0.1 w/ torch==1.12.1 & torchvision==1.13.1)
Co-authored-by: Cyrus Chan <cyruswkc@hku.hk>
Co-authored-by: psychedelicious <4822129+psychedelicious@users.noreply.github.com>
Co-authored-by: Cyrus Chan <82143712+cyruschan360@users.noreply.github.com>
Co-authored-by: Cyrus Chan <cyruswkc@hku.hk>
* 2.2 Doc Updates (#1589)
* Unified Canvas Docs & Assets
Unified Canvas draft
Advanced Tools Updates
Doc Updates (lstein feedback)
* copy edits to Unified Canvas docs
- consistent capitalisation and feature naming
- more intimate address (replace "the user" with "you") for improved User
Engagement(tm)
- grammatical massaging and *poesie*
Co-authored-by: Lincoln Stein <lincoln.stein@gmail.com>
Co-authored-by: damian <git@damianstewart.com>
* include a step after config to `cat ~/.invokeai` (#1629)
* disable patchmatch in CI actions (#1626)
* disable patchmatch in CI actions
* fix indention
* replace tab with spaces
Co-authored-by: Matthias Wild <40327258+mauwii@users.noreply.github.com>
Co-authored-by: mauwii <Mauwii@outlook.de>
* Fix installer script for macOS. (#1630)
* refer to the platform as 'osx' instead of 'mac', otherwise the
composed URL to micromamba is wrong.
* move the `-O` option to `tar` to be grouped with the other tar flags
to avoid the `-O` being interpreted as something to unarchive.
* Removes symlinked environment.yaml (#1631)
Was unintentionally added in #1621
* Fix inpainting with iterations (#1635)
* fix error when inpainting using runwayml inpainting model (#1634)
- error was "Omnibus object has no attribute pil_image"
- closes#1596
* add k_dpmpp_2_a and k_dpmpp_2 solvers options (#1389)
* add k_dpmpp_2_a and k_dpmpp_2 solvers options
* update frontend
Co-authored-by: Victor <victorca25@users.noreply.github.com>
Co-authored-by: Lincoln Stein <lincoln.stein@gmail.com>
* add .editorconfig (#1636)
* Web UI 2.2 bugfixes (#1572)
* Fixes bug preventing multiple images from being generated
* Fixes valid seam strength value range
* Update Delete Alert Text
Indicates to the user that images are not permanently deleted.
* Fixes left/right arrows not working on gallery
* Fixes initial image on load erroneously set to a user uploaded image
Should be a result gallery image.
* Lightbox Fixes
- Lightbox is now a button in the current image buttons
- Lightbox is also now available in the gallery context menu
- Lightbox zoom issues fixed
- Lightbox has a fade in animation.
* Fix image display wrapper in current preview not overflow bounds
* Revert "Fix image display wrapper in current preview not overflow bounds"
This reverts commit 5511c82714dbf1d1999d64e8bc357bafa34ddf37.
* Change Staging Area discard icon from Bin to X
* Expose Snap Threshold and Move Snap Settings to BBox Panel
* Changes img2img strength default to 0.75
* Fixes drawing triggering when mouse enters canvas w/ button down
When we only supported inpainting and no zoom, this was useful. It allowed the cursor to leave the canvas (which was easy to do given the limited canvas dimensions) and without losing the "I am drawing" state.
With a zoomable canvas this is no longer as useful.
Additionally, we have more popovers and tools (like the color pickers) which result in unexpected brush strokes. This fixes that issue.
* Revert "Expose Snap Threshold and Move Snap Settings to BBox Panel"
We will handle this a bit differently - by allowing the grid origin to be moved. I will dig in at some point.
This reverts commit 33c92ecf4da724c2f17d9d91c7ea31a43a2f6deb.
* Adds Limit Strokes to Box
* Adds fill bounding box button
* Adds erase bounding box button
* Changes Staging area discard icon to match others
* Fixes right click breaking move tool
* Fixes brush preview visibility issue with "darken outside box"
* Fixes history bugs with addFillRect, addEraseRect, and other actions
* Adds missing `key`
* Fixes postprocessing being applied to canvas generations
* Fixes bbox not getting scaled in various situations
* Fixes staging area show image toggle not resetting on accept/discard
* Locks down canvas while generating/staging
* Fixes move tool breaking when canvas loses focus during move/transform
* Hides cursor when restrict strokes is on and mouse outside bbox
* Lints
* Builds fresh bundle
* Fix overlapping hotkey for Fill Bounding Box
* Build Fresh Bundle
* Fixes bug with mask and bbox overlay
* Builds fresh bundle
Co-authored-by: blessedcoolant <54517381+blessedcoolant@users.noreply.github.com>
Co-authored-by: Lincoln Stein <lincoln.stein@gmail.com>
* disable NSFW checker loading during the CI tests (#1641)
* disable NSFW checker loading during the CI tests
The NSFW filter apparently causes invoke.py to crash during CI testing,
possibly due to out of memory errors. This workaround disables NSFW
model loading.
* doc change
* fix formatting errors in yml files
* Configure the NSFW checker at install time with default on (#1624)
* configure the NSFW checker at install time with default on
1. Changes the --safety_checker argument to --nsfw_checker and
--no-nsfw_checker. The original argument is recognized for backward
compatibility.
2. The configure script asks users whether to enable the checker
(default yes). Also offers users ability to select default sampler and
number of generation steps.
3.Enables the pasting of the caution icon on blurred images when
InvokeAI is installed into the package directory.
4. Adds documentation for the NSFW checker, including caveats about
accuracy, memory requirements, and intermediate image dispaly.
* use better fitting icon
* NSFW defaults false for testing
* set default back to nsfw active
Co-authored-by: Matthias Wild <40327258+mauwii@users.noreply.github.com>
Co-authored-by: mauwii <Mauwii@outlook.de>
Signed-off-by: devops117 <55235206+devops117@users.noreply.github.com>
Co-authored-by: psychedelicious <4822129+psychedelicious@users.noreply.github.com>
Co-authored-by: blessedcoolant <54517381+blessedcoolant@users.noreply.github.com>
Co-authored-by: Kyle Schouviller <kyle0654@hotmail.com>
Co-authored-by: javl <mail@jaspervanloenen.com>
Co-authored-by: Kent Keirsey <31807370+hipsterusername@users.noreply.github.com>
Co-authored-by: mauwii <Mauwii@outlook.de>
Co-authored-by: Matthias Wild <40327258+mauwii@users.noreply.github.com>
Co-authored-by: Damian Stewart <d@damianstewart.com>
Co-authored-by: DevOps117 <55235206+devops117@users.noreply.github.com>
Co-authored-by: damian <git@damianstewart.com>
Co-authored-by: Damian Stewart <null@damianstewart.com>
Co-authored-by: Cyrus Chan <82143712+cyruschan360@users.noreply.github.com>
Co-authored-by: Cyrus Chan <cyruswkc@hku.hk>
Co-authored-by: Andre LaBranche <dre@mac.com>
Co-authored-by: victorca25 <41912303+victorca25@users.noreply.github.com>
Co-authored-by: Victor <victorca25@users.noreply.github.com>
Squashed commit of the following:
commit 9a1fe8e7fb
Author: Lincoln Stein <lincoln.stein@gmail.com>
Date: Sat Nov 12 17:07:40 2022 +0000
swap in release URLs for installers
commit ff56f5251b
Author: Lincoln Stein <lincoln.stein@gmail.com>
Date: Sat Nov 12 17:03:21 2022 +0000
fix up bad unicode chars in invoke.py
commit ed943bd6c7
Author: Lincoln Stein <lincoln.stein@gmail.com>
Date: Sat Nov 12 16:05:45 2022 +0000
outcrop improvements, hand-added
commit 7ad2355b1d
Author: Lincoln Stein <lincoln.stein@gmail.com>
Date: Sat Nov 12 15:14:33 2022 +0000
documentation fixes
commit 66c920fc19
Author: Lincoln Stein <lincoln.stein@gmail.com>
Date: Thu Nov 10 16:49:25 2022 -0500
Revert "Resize hires as an image"
This reverts commit d05b1b3544.
commit 3fc5cb09f8
Author: Lincoln Stein <lincoln.stein@gmail.com>
Date: Sat Nov 12 12:43:17 2022 +0000
fix incorrect link in install
commit 1345ec77ab
Author: tildebyte <337875+tildebyte@users.noreply.github.com>
Date: Sun Nov 6 19:07:31 2022 -0500
toil(repo): add tildebyte as owner of installer/ directory
commit b116715490
Author: Kyle Schouviller <kyle0654@hotmail.com>
Date: Thu Nov 10 21:43:56 2022 -0800
Fix performance issue introduced by torch cuda cache clear during generation
commit fa3670270e
Author: mauwii <Mauwii@outlook.de>
Date: Fri Nov 11 12:42:03 2022 +0100
small update to dockers huggingface section
commit c304250ef6
Author: mauwii <Mauwii@outlook.de>
Date: Fri Nov 11 12:19:27 2022 +0100
fix format and Link in INSTALL_INVOKE.md
commit 802ce5dde5
Author: mauwii <Mauwii@outlook.de>
Date: Fri Nov 11 11:17:49 2022 +0100
small fixex to format and a link in INSTALL_MANUAL
commit 311ee320ec
Author: Lincoln Stein <lincoln.stein@gmail.com>
Date: Fri Nov 11 07:23:35 2022 +0000
ignore installer intermediate files
commit e9df17b374
Author: Lincoln Stein <lincoln.stein@gmail.com>
Date: Fri Nov 11 07:19:25 2022 +0000
fix backslash-related syntax error
commit 061fb4ef00
Merge: 52be0d234095acd1
Author: Lincoln Stein <lincoln.stein@gmail.com>
Date: Fri Nov 11 06:50:04 2022 +0000
Merge branch 'release-candidate-2-1-3' of github.com:/invoke-ai/InvokeAI into release-candidate-2-1-3
commit 52be0d2396
Author: Lincoln Stein <lincoln.stein@gmail.com>
Date: Fri Nov 11 06:49:45 2022 +0000
add WindowsLongFileName batfile to source installer
commit 4095acd10e
Author: mauwii <Mauwii@outlook.de>
Date: Fri Nov 11 07:05:17 2022 +0100
Doc Updates
A lot of re-formating of new Installation Docs
also some content updates/corrections
commit 201eb22d76
Author: Lincoln Stein <lincoln.stein@gmail.com>
Date: Fri Nov 11 04:41:02 2022 +0000
prevent two models from being marked default in models.yaml
commit 17ab982200
Author: Lincoln Stein <lincoln.stein@gmail.com>
Date: Fri Nov 11 03:56:54 2022 +0000
installers download branch HEAD not tag
commit a04965b0e9
Author: Lincoln Stein <lincoln.stein@gmail.com>
Date: Fri Nov 11 03:48:21 2022 +0000
improve messaging during installation process
commit 0b529f0c57
Author: Lincoln Stein <lincoln.stein@gmail.com>
Date: Tue Nov 8 15:22:32 2022 +0000
enable outcropping of random JPG/PNG images
- Works best with runwayML inpainting model
- Numerous code changes required to propagate seed to final metadata.
Original code predicated on the image being generated within InvokeAI.
commit 6f9f848345
Author: Lincoln Stein <lincoln.stein@gmail.com>
Date: Tue Nov 8 17:27:42 2022 +0000
enhance outcropping with ability to direct contents of new regions
- When outcropping an image you can now add a `--new_prompt` option, to specify
a new prompt to be used instead of the original one used to generate the image.
- Similarly you can provide a new seed using `--seed` (or `-S`). A seed of zero
will pick one randomly.
- This PR also fixes the crash that happened when trying to outcrop an image
that does not contain InvokeAI metadata.
commit 918c1589ef
Author: Lincoln Stein <lincoln.stein@gmail.com>
Date: Thu Nov 10 20:16:47 2022 +0000
fix#1402
commit 116415b3fc
Author: Lincoln Stein <lincoln.stein@gmail.com>
Date: Thu Nov 10 21:27:25 2022 +0000
fix invoke.py crash if no models.yaml file present
- Script will now offer the user the ability to create a
minimal models.yaml and then gracefully exit.
- Closes#1420
commit b4b6eabaac
Author: Lincoln Stein <lincoln.stein@gmail.com>
Date: Thu Nov 10 16:49:25 2022 -0500
Revert "Log strength with hires"
This reverts commit 82d4904c07.
commit 4ef1f4a854
Author: Lincoln Stein <lincoln.stein@gmail.com>
Date: Thu Nov 10 20:01:49 2022 +0000
remove temporary directory from repo
commit 510fc4ebaa
Author: Lincoln Stein <lincoln.stein@gmail.com>
Date: Thu Nov 10 19:59:03 2022 +0000
remove -e from clipseg load in installer
commit a20914434b
Author: Lincoln Stein <lincoln.stein@gmail.com>
Date: Thu Nov 10 19:37:07 2022 +0000
change clipseg repo branch to avoid clipseg not found error
commit 0d134195fd
Author: Lincoln Stein <lincoln.stein@gmail.com>
Date: Thu Nov 10 18:39:29 2022 +0000
update repo URL to point to rc
commit 649d8c8573
Author: Lincoln Stein <lincoln.stein@gmail.com>
Date: Thu Nov 10 18:13:28 2022 +0000
integrate tildebyte installer
commit a358d370a0
Author: Lincoln Stein <lincoln.stein@gmail.com>
Date: Thu Nov 10 17:48:14 2022 +0000
add @tildebyte compiled pip installer
commit 94a9033c4f
Author: Lincoln Stein <lincoln.stein@gmail.com>
Date: Thu Nov 10 14:52:00 2022 +0000
ignore source installer zip files
commit 18a947c503
Author: Lincoln Stein <lincoln.stein@gmail.com>
Date: Thu Nov 10 14:46:36 2022 +0000
documentation and environment file fixes
- Have clarified the relationship between the @tildebyte and @cmdr2 installers;
However, @tildebyte installer merge is still a WIP due to conflicts over
such things as `invoke.sh`.
- Rechristened 1click installer as "source" installer. @tildebyte installer will be
"the" installer. (We'll see which one generates the least support requests and
maintenance work.)
- Sync'd `environment-mac.yml` with `development`. The former was failing with a
taming-transformers error as per https://discord.com/channels/@me/1037201214154231899/1040060947378749460
commit a23b031895
Author: Mike DiGiovanni <vinblau@gmail.com>
Date: Wed Nov 9 16:44:59 2022 -0500
Fixes typos in README.md
commit 23af68c7d7
Author: Lincoln Stein <lincoln.stein@gmail.com>
Date: Thu Nov 10 07:02:27 2022 -0500
downgrade win installs to basicsr==1.4.1
commit e258beeb51
Merge: 7460c069e481bfac
Author: Lincoln Stein <lincoln.stein@gmail.com>
Date: Thu Nov 10 06:37:45 2022 -0500
Merge branch 'release-candidate-2-1-3' of github.com:invoke-ai/InvokeAI into release-candidate-2-1-3
commit 7460c069b8
Author: Lincoln Stein <lincoln.stein@gmail.com>
Date: Thu Nov 10 06:36:48 2022 -0500
remove --prefer-binary from requirements-base.txt
It appears that some versions of pip do not recognize this option
when it appears in the requirements file. Did not explore this further
but recommend --prefer-binary in the manual install instructions on
the command line.
commit e481bfac61
Merge: 5040747cd1ab65a4
Author: Lincoln Stein <lincoln.stein@gmail.com>
Date: Thu Nov 10 11:21:56 2022 +0000
Merge branch 'release-candidate-2-1-3' of github.com:/invoke-ai/InvokeAI into release-candidate-2-1-3
commit 5040747c67
Author: Lincoln Stein <lincoln.stein@gmail.com>
Date: Thu Nov 10 11:21:43 2022 +0000
fix windows install instructions & bat file
commit d1ab65a431
Author: mauwii <Mauwii@outlook.de>
Date: Thu Nov 10 07:18:59 2022 +0100
update WEBUIHOTKEYS.md
commit af4ee7feb8
Author: mauwii <Mauwii@outlook.de>
Date: Thu Nov 10 06:33:49 2022 +0100
update INSTALL_DOCKER.md
commit 764fb29ade
Author: mauwii <Mauwii@outlook.de>
Date: Thu Nov 10 06:30:15 2022 +0100
fix formatting in INSTALL.md
commit 1014d3ba44
Author: mauwii <Mauwii@outlook.de>
Date: Thu Nov 10 06:29:14 2022 +0100
fix build.sh invokeai_conda_env_file default value
commit 40a48aca88
Author: mauwii <Mauwii@outlook.de>
Date: Thu Nov 10 05:25:30 2022 +0100
fix environment-mac.yml
moved taming-transformers-rom1504 to pip dependencies
commit 92abc00f16
Author: mauwii <Mauwii@outlook.de>
Date: Thu Nov 10 05:19:52 2022 +0100
fix test-invoke-conda
- copy required conda environment yaml
- use environment.yml
- I use cp instead of ln since would be compatible for windows runners
commit a5719aabf8
Author: mauwii <Mauwii@outlook.de>
Date: Thu Nov 10 04:14:35 2022 +0100
update Dockerfile
- link environment.yml from new environemnts path
- change default conda_env_file
- quote all variables to avoid splitting
- also remove paths from conda-env-files in build-container.yml
commit 44a18511fa
Author: Lincoln Stein <lincoln.stein@gmail.com>
Date: Wed Nov 9 20:51:06 2022 +0000
update paths in container build workflow
commit b850dbadaf
Author: Lincoln Stein <lincoln.stein@gmail.com>
Date: Wed Nov 9 20:16:57 2022 +0000
finished reorganization of install docs
commit 9ef8b944d5
Author: Lincoln Stein <lincoln.stein@gmail.com>
Date: Wed Nov 9 18:50:58 2022 +0000
tweaks to manual install documentation
--prefer-binary is an iffy option in the requirements file. It isn't
supported by some versions of pip, so I removed it from
requirements-base.txt and inserted it into the manual install
instructions where it seems to do what it is supposed to.
commit efc5a98488
Author: Lincoln Stein <lincoln.stein@gmail.com>
Date: Wed Nov 9 18:20:03 2022 +0000
manual installation documentation tested on Linux
commit 1417c87928
Author: Lincoln Stein <lincoln.stein@gmail.com>
Date: Wed Nov 9 17:37:06 2022 +0000
change name of requirements.txt to avoid confusion
commit 2dd6fc2b93
Merge: 2221361271ee44a8
Author: Lincoln Stein <lincoln.stein@gmail.com>
Date: Wed Nov 9 17:26:24 2022 +0000
Merge branch 'release-candidate-2-1-3' of github.com:/invoke-ai/InvokeAI into release-candidate-2-1-3
commit 22213612a0
Author: Lincoln Stein <lincoln.stein@gmail.com>
Date: Wed Nov 9 17:25:59 2022 +0000
directory cleanup; working on install docs
commit 71ee44a827
Author: Lincoln Stein <lincoln.stein@gmail.com>
Date: Wed Nov 9 02:07:13 2022 +0000
prevent crash when switching to an invalid model
commit b17ca0a5e7
Author: damian0815 <null@damianstewart.com>
Date: Tue Nov 8 14:28:38 2022 +0100
don't suppress exceptions when doing cross-attention control
commit 71bbfe4a1a
Author: damian0815 <null@damianstewart.com>
Date: Tue Nov 8 12:59:34 2022 +0100
Fix#1362 by improving VRAM usage patterns when doing .swap()
commit ef3f7a26e242b73c2beb0195c7fd8f654ef47f55
Author: damian0815 <null@damianstewart.com>
Date: Tue Nov 8 12:18:37 2022 +0100
remove log spam
commit 7189d649622d4668b120b0dd278388ad672142c4
Author: damian0815 <null@damianstewart.com>
Date: Tue Nov 8 12:10:28 2022 +0100
change the way saved slicing strategy is applied
commit 01c40f751ab72955140165c16f95ae411732265b
Author: damian0815 <null@damianstewart.com>
Date: Tue Nov 8 12:04:43 2022 +0100
fix slicing_strategy_getter callsite
commit f8cfe25150a346958903316bc710737d99839923
Author: damian0815 <null@damianstewart.com>
Date: Tue Nov 8 11:56:22 2022 +0100
cleanup, consistent dim=0 also tested
commit 5bf9b1e890d48e962afd4a668a219b68271e5dc1
Author: damian0815 <null@damianstewart.com>
Date: Tue Nov 8 11:34:09 2022 +0100
refactored context, tested with non-sliced cross attention control
commit d58a46e39bf562e7459290d2444256e8c08ad0b6
Author: damian0815 <null@damianstewart.com>
Date: Sun Nov 6 00:41:52 2022 +0100
cleanup
commit 7e2c658b4c06fe239311b65b9bb16fa3adec7fd7
Author: damian0815 <null@damianstewart.com>
Date: Sat Nov 5 22:57:31 2022 +0100
disable logs
commit 20ee89d93841b070738b3d8a4385c93b097d92eb
Author: damian0815 <null@damianstewart.com>
Date: Sat Nov 5 22:36:58 2022 +0100
slice saved attention if necessary
commit 0a7684a22c880ec0f48cc22bfed4526358f71546
Author: damian0815 <null@damianstewart.com>
Date: Sat Nov 5 22:32:38 2022 +0100
raise instead of asserting
commit 7083104c7f3a0d8fd96e94a2f391de50a3c942e4
Author: damian0815 <null@damianstewart.com>
Date: Sat Nov 5 22:31:00 2022 +0100
store dim when saving slices
commit f7c0808ed383ec1dc70645288a798ed2aa4fa85c
Author: damian0815 <null@damianstewart.com>
Date: Sat Nov 5 22:27:16 2022 +0100
don't retry on exception
commit 749a721e939b3fe7c1741e7998dab6bd2c85a0cb
Author: damian0815 <null@damianstewart.com>
Date: Sat Nov 5 22:24:50 2022 +0100
stuff
commit 032ab90e9533be8726301ec91b97137e2aadef9a
Author: damian0815 <null@damianstewart.com>
Date: Sat Nov 5 22:20:17 2022 +0100
more logging
commit 3dc34b387f033482305360e605809d95a40bf6f8
Author: damian0815 <null@damianstewart.com>
Date: Sat Nov 5 22:16:47 2022 +0100
logs
commit 901c4c1aa4b9bcef695a6551867ec8149e6e6a93
Author: damian0815 <null@damianstewart.com>
Date: Sat Nov 5 22:12:39 2022 +0100
actually set save_slicing_strategy to True
commit f780e0a0a7c6b6a3db320891064da82589358c8a
Author: damian0815 <null@damianstewart.com>
Date: Sat Nov 5 22:10:35 2022 +0100
store slicing strategy
commit 93bb6d566fd18c5c69ef7dacc8f74ba2cf671cb7
Author: damian <git@damianstewart.com>
Date: Sat Nov 5 20:43:48 2022 +0100
still not it
commit 5e3a9541f8ae00bde524046963910323e20c40b7
Author: damian <git@damianstewart.com>
Date: Sat Nov 5 17:20:02 2022 +0100
wip offloading attention slices on-demand
commit 4c2966aa856b6f3b446216da3619ae931552ef08
Author: damian0815 <null@damianstewart.com>
Date: Sat Nov 5 15:47:40 2022 +0100
pre-emptive offloading, idk if it works
commit 572576755e9f0a878d38e8173e485126c0efbefb
Author: root <you@example.com>
Date: Sat Nov 5 11:25:32 2022 +0000
push attention slices to cpu. slow but saves memory.
commit b57c83a68f2ac03976ebc89ce2ff03812d6d185f
Author: damian0815 <null@damianstewart.com>
Date: Sat Nov 5 12:04:22 2022 +0100
verbose logging
commit 3a5dae116f110a96585d9eb71d713b5ed2bc3d2b
Author: damian0815 <null@damianstewart.com>
Date: Sat Nov 5 11:50:48 2022 +0100
wip fixing mem strategy crash (4 test on runpod)
commit 3cf237db5fae0c7b0b4cc3c47c81830bdb2ae7de
Author: damian0815 <null@damianstewart.com>
Date: Fri Nov 4 09:02:40 2022 +0100
wip, only works on cuda
commit 5702271991
Author: Lincoln Stein <lincoln.stein@gmail.com>
Date: Wed Nov 9 14:09:36 2022 +0000
speculative reorganization of the requirements & environment files
- This is only a test!
- The various environment*.yml and requirements*.txt files have all
been moved into a directory named "environments-and-requirements".
- The idea is to clean up our root directory so that the github home
page is tidy.
- The manual install instructions will start with the instructions to
create a symbolic link from environment.yml to the appropriate file
for OS and GPU.
- The 1-click installers have been updated to accommodate this change.
commit 10781e7dc4
Author: Lincoln Stein <lincoln.stein@gmail.com>
Date: Wed Nov 9 01:59:45 2022 +0000
refactoring requirements
commit 099d1157c5
Author: mauwii <Mauwii@outlook.de>
Date: Wed Nov 9 00:16:18 2022 +0100
better way to make sure if conda is useable
commit ab825bf7ee
Author: Lincoln Stein <lincoln.stein@gmail.com>
Date: Tue Nov 8 22:05:33 2022 +0000
add back --prefer-binaries to requirements
commit 10cfeb5ada
Author: mauwii <Mauwii@outlook.de>
Date: Tue Nov 8 22:27:19 2022 +0100
add quotes to set and use `$environment_file`
commit e97515d045
Author: mauwii <Mauwii@outlook.de>
Date: Tue Nov 8 22:24:21 2022 +0100
set environment file for conda update
commit 0f04bc5789
Author: mauwii <Mauwii@outlook.de>
Date: Tue Nov 8 22:21:25 2022 +0100
use conda env update
commit 3f74aabecd
Author: mauwii <Mauwii@outlook.de>
Date: Tue Nov 8 22:20:44 2022 +0100
use command instead of hash
commit b1a99a51b7
Author: Lincoln Stein <lincoln.stein@gmail.com>
Date: Tue Nov 8 14:44:44 2022 -0500
remove --global git config from 1-click installers
commit 8004f8a6d9
Author: Lincoln Stein <lincoln.stein@gmail.com>
Date: Mon Nov 7 09:07:20 2022 -0500
Revert "Use array slicing to calc ddim timesteps"
This reverts commit 1f0c5b4cf1.
commit ff8ff2212a
Merge: 8e5363cd636620b1
Author: Lincoln Stein <lincoln.stein@gmail.com>
Date: Tue Nov 8 14:01:40 2022 +0000
add initfile support from PR #1386
commit 8e5363cd83
Author: Lincoln Stein <lincoln.stein@gmail.com>
Date: Tue Nov 8 13:26:18 2022 +0000
move 'installer/' to '1-click-installer' to make room for tildebyte installer
commit 1450779146
Author: Lincoln Stein <lincoln.stein@gmail.com>
Date: Tue Nov 8 12:56:36 2022 +0000
update branch for installer to pull against
commit 8cd5d95b8a
Author: Lincoln Stein <lincoln.stein@gmail.com>
Date: Tue Nov 8 05:30:20 2022 +0000
move all models into subdirectories of ./models
- this required an update to the invoke-ai fork of gfpgan
- simultaneously reverted consolidation of environment and
requirements files, as their presence in a directory
triggered setup.py to try to install a sub-package.
commit abd6407394
Author: Lincoln Stein <lincoln.stein@gmail.com>
Date: Tue Nov 8 03:52:46 2022 +0000
leave a copy of environment-cuda.yml at top level
- named it environment.yml
- need to avoid a big change for users and breaking older support
instructions.
commit 734dacfbe9
Author: Lincoln Stein <lincoln.stein@gmail.com>
Date: Tue Nov 8 03:50:07 2022 +0000
consolidate environment files
- starting to remove unneeded entries and pins
- no longer require -e in front of github dependencies
- update setup.py with release number
- update manual installation instructions
commit 636620b1d5
Author: Lincoln Stein <lincoln.stein@gmail.com>
Date: Tue Nov 8 03:26:16 2022 +0000
change initfile to ~/.invokeai
- adjust documentation
- also fix 'clipseg_models' to 'clipseg', which seems to be working now
commit 1fe41146f0
Author: Lincoln Stein <lincoln.stein@gmail.com>
Date: Sat Nov 5 14:28:01 2022 -0400
add support for an initialization file, invokeai.init
- Place preferred startup command switches in a file named
"invokeai.init". The file can consist of a single line of switches
such as "--web --steps=28", a series of switches on each
line, or any combination of the two.
Example:
```
--web
--host=0.0.0.0
--steps=28
--grid
-f 0.6 -C 11.0 -A k_euler_a
```
- The following options, which were previously only available within
the CLI, are now available on the command line as well:
--steps
--strength
--cfg_scale
--width
--height
--fit
commit 2ad6ef355a
Merge: 865502ee8b47c829
Author: Lincoln Stein <lincoln.stein@gmail.com>
Date: Sun Nov 6 18:08:36 2022 +0000
update discord link
commit 865502ee4f
Author: mauwii <Mauwii@outlook.de>
Date: Sun Nov 6 18:00:16 2022 +0100
update changelog
commit c7984f3299
Author: mauwii <Mauwii@outlook.de>
Date: Sun Nov 6 17:07:27 2022 +0100
update TROUBLESHOOT.md
commit 7f150ed833
Author: mauwii <Mauwii@outlook.de>
Date: Sun Nov 6 16:56:58 2022 +0100
remove `:`from headlines in CONTRIBUTORS.md
commit badf4e256c
Author: mauwii <Mauwii@outlook.de>
Date: Sun Nov 6 16:56:37 2022 +0100
enable navigation tabs
Since the docs are growing, this way they look cleaner
commit e64c60bbb3
Author: mauwii <Mauwii@outlook.de>
Date: Sun Nov 6 16:18:59 2022 +0100
remove preflight checks from assets
seems like somebody executed tests and commited them
commit 1780618543
Author: mauwii <Mauwii@outlook.de>
Date: Sun Nov 6 16:15:06 2022 +0100
update INSTALLING_MODELS.md
commit f91fd27624
Author: Kyle Schouviller <kyle0654@hotmail.com>
Date: Sat Nov 5 14:47:53 2022 -0700
Bug fix for inpaint size
commit 09e41e8f76
Author: Kyle Schouviller <kyle0654@hotmail.com>
Date: Sat Nov 5 14:34:52 2022 -0700
Add inpaint size options to inpaint at a larger size than the actual inpaint image, then scale back down for recombination
commit 6eeb2107b3
Author: mauwii <Mauwii@outlook.de>
Date: Sat Nov 5 21:01:14 2022 +0100
remove create-caches.yml since not used anywhere
commit 17053ad8b7
Author: Lincoln Stein <lincoln.stein@gmail.com>
Date: Sat Nov 5 16:01:55 2022 -0400
fix duplicated argument introduced by conflict resolution
commit fefb4dc1f8
Merge: 762ca60ad05b1b35
Author: Lincoln Stein <lincoln.stein@gmail.com>
Date: Sat Nov 5 12:47:35 2022 -0700
Merge branch 'development' into fix_generate.py
commit d05b1b3544
Author: Craig <cwallen@users.noreply.github.com>
Date: Sat Oct 29 20:40:30 2022 -0400
Resize hires as an image
commit 82d4904c07
Author: Craig <cwallen@users.noreply.github.com>
Date: Sat Oct 29 20:37:40 2022 -0400
Log strength with hires
commit 1cdcf33cfa
Merge: 6616fa83cbc029c6
Author: Lincoln Stein <lincoln.stein@gmail.com>
Date: Sat Nov 5 09:57:38 2022 -0400
Merge branch 'main' into development
- this synchronizes recent document fixes by mauwii
commit 6616fa835a
Author: Lincoln Stein <lincoln.stein@gmail.com>
Date: Fri Nov 4 00:47:03 2022 -0400
fix Windows library dependency issues
This commit addresses two bugs:
1) invokeai.py crashes immediately with a message about an undefined
attritube sigKILL (closes#1288). The fix is to pin torch at 1.12.1.
2) Version 1.4.2 of basicsr fails to load properly on Windows, and is
a requirement of realesrgan, however 1.4.1 works. Pinning basicsr
in our requirements file resulted in a dependency conflict, so I
ended up cloning realesrgan into the invoke-ai Git space and changing
the requirements file there.
If there is a more elegant solution, please advise.
commit 7b9a4564b1
Author: Matthias Wild <40327258+mauwii@users.noreply.github.com>
Date: Sat Nov 5 14:36:45 2022 +0100
Update-docs (#1382)
* update IMG2IMG.md
* update INPAINTING.md
* update WEBUIHOTKEYS.md
* more doc updates (mostly fix formatting):
- OUTPAINTING.md
- POSTPROCESS.md
- PROMPTS.md
- VARIATIONS.md
- WEB.md
- WEBUIHOTKEYS.md
commit fcdefa0620
Author: Matthias Wild <40327258+mauwii@users.noreply.github.com>
Date: Fri Nov 4 20:47:31 2022 +0100
Hotifx docs (#1376) (#1377)
commit ef8b3ce639
Merge: b704209536870a8f
Author: Lincoln Stein <lincoln.stein@gmail.com>
Date: Fri Nov 4 12:08:44 2022 -0400
Merge-main-into-development (#1373)
To get the rid of the difference between main and development.
Since otherwise it will be a pain to start fixing the documentatino
(when the state between main and development is not the same ...)
Also this should fix the problem of all tests failing since environment
yamls get updated.
commit 36870a8f53
Merge: 6b89adfab7042095
Author: Matthias Wild <40327258+mauwii@users.noreply.github.com>
Date: Fri Nov 4 16:25:00 2022 +0100
Merge branch 'development' into merge-main-into-development
commit b70420951d
Author: damian0815 <null@damianstewart.com>
Date: Thu Nov 3 12:39:45 2022 +0100
fix parsing error doing eg `forest ().swap(in winter)`
commit 1f0c5b4cf1
Author: wfng92 <43742196+wfng92@users.noreply.github.com>
Date: Thu Nov 3 17:13:52 2022 +0800
Use array slicing to calc ddim timesteps
commit 8648da8111
Author: mauwii <Mauwii@outlook.de>
Date: Fri Nov 4 00:06:19 2022 +0100
update environment-linux-aarch64 to use python 3.9
commit 45b4593563
Author: mauwii <Mauwii@outlook.de>
Date: Thu Nov 3 22:31:46 2022 +0100
update environment-linux-aarch64.yml
- move getpass_asterisk to pip
commit 41b04316cf
Author: mauwii <Mauwii@outlook.de>
Date: Thu Nov 3 20:40:08 2022 +0100
rename job, remove debug branch from triggers
commit e97c6db2a3
Author: mauwii <Mauwii@outlook.de>
Date: Thu Nov 3 20:34:01 2022 +0100
include build matrix to build x86_64 and aarch64
commit 896820a349
Author: mauwii <Mauwii@outlook.de>
Date: Tue Nov 1 05:01:15 2022 +0100
disable caching
commit 06c8f468bf
Author: mauwii <Mauwii@outlook.de>
Date: Tue Nov 1 04:26:39 2022 +0100
disable PR-Validation
since there are no files passed from context this is unecesarry
commit 61920e2701
Author: mauwii <Mauwii@outlook.de>
Date: Tue Nov 1 04:09:39 2022 +0100
update action to use current branch
also update build-args of dockerfile and build.sh
commit f34ba7ca70
Author: mauwii <Mauwii@outlook.de>
Date: Tue Nov 1 02:30:24 2022 +0100
remove unecesarry mkdir command again
commit c30ef0895d
Author: mauwii <Mauwii@outlook.de>
Date: Tue Nov 1 01:51:12 2022 +0100
remove symlink to GFPGANv1.4
also re-add mkdir to prevent action from failing
commit aa3a774f73
Author: mauwii <Mauwii@outlook.de>
Date: Tue Nov 1 01:48:59 2022 +0100
update build-container.yml to use cachev3
commit 2c30555b84
Author: mauwii <Mauwii@outlook.de>
Date: Tue Nov 1 01:34:20 2022 +0100
update Dockerfile
- create models.yaml from models.yaml.example
- run preload_models.py with --no-interactive
commit 743f605773
Author: mauwii <Mauwii@outlook.de>
Date: Tue Nov 1 01:21:15 2022 +0100
update build.sh to download sd-v1.5 model
commit 519c661abb
Author: mauwii <Mauwii@outlook.de>
Date: Tue Oct 25 01:26:50 2022 +0200
replace old fashined markdown templates with forms
this will help the readability of issues a lot 🤓
commit 22c956c75f
Merge: 13696adc0196571a
Author: Lincoln Stein <lincoln.stein@gmail.com>
Date: Thu Nov 3 10:20:21 2022 -0400
Merge branch 'development' of github.com:invoke-ai/InvokeAI into development
commit 13696adc3a
Author: Lincoln Stein <lincoln.stein@gmail.com>
Date: Thu Nov 3 10:20:10 2022 -0400
speculative change to solve windows esrgan issues
commit 0196571a12
Author: Lincoln Stein <lincoln.stein@gmail.com>
Date: Wed Nov 2 22:39:35 2022 -0400
remove merge markers from preload_models.py
commit 9666f466ab
Author: Lincoln Stein <lincoln.stein@gmail.com>
Date: Wed Nov 2 18:29:34 2022 -0400
use refined model by default
commit 240e5486c8
Merge: 8164b6b9aa247e68
Author: Lincoln Stein <lincoln.stein@gmail.com>
Date: Wed Nov 2 18:35:00 2022 -0400
Merge branch 'spezialspezial-patch-9' into development
commit 8164b6b9cf
Merge: 4fc82d55dd5a88dc
Author: Lincoln Stein <lincoln.stein@gmail.com>
Date: Wed Nov 2 17:06:46 2022 -0400
Merge branch 'development' of github.com:invoke-ai/InvokeAI into development
commit 4fc82d554f
Author: blessedcoolant <54517381+blessedcoolant@users.noreply.github.com>
Date: Thu Nov 3 04:17:28 2022 +1300
[WebUI] Final 2.1 Release Build
commit 96b34c0f85
Author: damian0815 <null@damianstewart.com>
Date: Wed Nov 2 09:08:11 2022 +0100
Final WebUI build for Release 2.1
- squashed commit of 52 commits from PR #1327
don't log base64 progress images
Fresh Build For WebUI
[WebUI] Loopback Default False
Fixes bugs/styling
- Fixes missing web app state on new version:
Adds stateReconciler to redux-persist.
When we add more values to the state and then release the update app, they will be automatically merged in.
Reseting web UI will be needed far less.
7159ec
- Fixes console z-index
- Moves reset web UI button to visible area
Decreases gallery width on inpainting
Increases workarea split padding to 1rem
Adds missing tooltips to site header
Changes inpainting controls settings to hover
Fixes hotkeys and settings buttons not working
Improves bounding box interactions
- Bounding box can now be moved by dragging any of its edges
- Bounding box does not affect drawing if already drawing a stroke
- Can lock bounding box to draw directly on the bounding box edges
- Removes spacebar-hold behaviour due to technical issues
Fixes silent crash when init image too large
To send the mask to the server, the UI rendered the mask onto the init image and sent the whole image. The mask was then cropped by the server.
If the image was too large, the app silently failed. Maybe it exceeds the websocket size limit.
Fixed by cropping the mask in the UI layer, sending only bounding-box-sized mask image data.
Disabled bounding box settings when locked
Styles image uploader
Builds fresh bundle
Improves bounding box interaction
Added spacebar-hold-to-transform back.
Address bounding box feedback
- Adds back toggle to hide bounding box
- Box quick toggle = q, normal toggle = shift + q
- Styles canvas alert icons
Adds hints when unable to invoke
- Popover on Invoke button indicates why exactly it is disabled, e.g. prompt is empty, something else is processing, etc.
- There may be more than one reason; all are displayed.
Fix Inpainting Alerts Styling
Preventing unnecessary re-renders across the app
Code Split Inpaint Options
Isolate features to their own components so they dont re-render the other stuff each time.
[TESTING] Remove global isReady checking
I dont believe this is need at all because the isready state is constantly updated when needed and tracked real time in the Redux store. This causes massive re-renders. @psychedelicious If this is absolutely essential for a reason that I do not see, please hit me up on Discord.
Fresh Bundle
Fix Bounding Box Settings re-rendering on brush stroke
[Code Splitting] Bounding Box Options
Isolated all bounding box components to trigger unnecessary re-renders. Still need to fix bounding box triggering re-renders on the control panel inside the canvas itself. But the options panel should be a good to go with this change.
Inpainting Controls Code Spitting and Performance
Codesplit the entirety of the inpainting controls. Created new selectors for each and every component to ensure there are no unnecessary re-renders. App feels a lot smoother.
Fixes rerenders on ClearBrushHistory
Fixes crash when requesting post-generation upscale/face restoration
- Moves the inpainting paste to before the postprocessing.
Removes unused isReady state
Changes Report Bug icon to a bug
Restores shift+q bounding box shortcut
Adds alert for bounding box size to status icons
Adds asCheckbox to IAIIconButton
Rough draft of this. Not happy with the styling but it's clearer than having them look just like buttons.
Fixes crash related to old value of progress_latents in state
Styling changes and settings modal minor refactor
Fixes: uploaded JPG images not loading
Reworks CurrentImageButtons.tsx
- Change all icons to FA iconset for consistency
- Refactors IAIIconButton, IAIButton, IAIPopover to handle ref forwarding
- Redesigns buttons into group
Only generate 1 iteration when seed fixed & variations disabled
Fixes progress images select
Fixes edge case: upload over gets stuck while alt tabbing
- Press esc to close it now
Fixes display progress images select typing
Fixes current image button rerenders
Adds min width to ImageUploader
Makes fast-latents in progress default
Update Icon Button Checkbox Style Styling
Fixes next/prev image buttons
Refactor canvas buttons + more
Add Save Intermediates Step Count
For accurate mode only.
Co-Authored-By: Richard Macarthy <richardmacarthy@protonmail.com>
Restores "initial image" text
Address feedback
- moves mask clear button
- fixes intermediates
- shrinks inpainting icons by 10%
Fix Loopback Styling
Adds escape hotkey to close floating panels
Readd Hotkey for Dual Display
Updated Current Image Button Styling
commit dd5a88dcee
Author: blessedcoolant <54517381+blessedcoolant@users.noreply.github.com>
Date: Thu Nov 3 04:17:28 2022 +1300
[WebUI] Final 2.1 Release Build
commit 95ed56bf82
Author: blessedcoolant <54517381+blessedcoolant@users.noreply.github.com>
Date: Thu Nov 3 04:16:31 2022 +1300
Updated Current Image Button Styling
commit 1ae80f5ab9
Author: blessedcoolant <54517381+blessedcoolant@users.noreply.github.com>
Date: Thu Nov 3 04:07:57 2022 +1300
Readd Hotkey for Dual Display
commit 1f0bd3ca6c
Author: psychedelicious <4822129+psychedelicious@users.noreply.github.com>
Date: Thu Nov 3 02:07:00 2022 +1100
Adds escape hotkey to close floating panels
commit a1971f6830
Author: blessedcoolant <54517381+blessedcoolant@users.noreply.github.com>
Date: Thu Nov 3 03:38:15 2022 +1300
Fix Loopback Styling
commit c6118e8898
Author: psychedelicious <4822129+psychedelicious@users.noreply.github.com>
Date: Thu Nov 3 01:29:51 2022 +1100
Address feedback
- moves mask clear button
- fixes intermediates
- shrinks inpainting icons by 10%
commit 7ba958cf7f
Author: psychedelicious <4822129+psychedelicious@users.noreply.github.com>
Date: Thu Nov 3 01:10:38 2022 +1100
Restores "initial image" text
commit 383905d5d2
Author: blessedcoolant <54517381+blessedcoolant@users.noreply.github.com>
Date: Thu Nov 3 02:59:11 2022 +1300
Add Save Intermediates Step Count
For accurate mode only.
Co-Authored-By: Richard Macarthy <richardmacarthy@protonmail.com>
commit 6173e3e9ca
Author: psychedelicious <4822129+psychedelicious@users.noreply.github.com>
Date: Thu Nov 3 00:53:53 2022 +1100
Refactor canvas buttons + more
commit 3feb7d8922
Author: psychedelicious <4822129+psychedelicious@users.noreply.github.com>
Date: Thu Nov 3 00:49:23 2022 +1100
Fixes next/prev image buttons
commit 1d9edbd0dd
Author: blessedcoolant <54517381+blessedcoolant@users.noreply.github.com>
Date: Thu Nov 3 00:50:44 2022 +1300
Update Icon Button Checkbox Style Styling
commit d439abdb89
Author: psychedelicious <4822129+psychedelicious@users.noreply.github.com>
Date: Wed Nov 2 21:37:24 2022 +1100
Makes fast-latents in progress default
commit ee47ea0c89
Author: psychedelicious <4822129+psychedelicious@users.noreply.github.com>
Date: Wed Nov 2 21:37:09 2022 +1100
Adds min width to ImageUploader
commit 300bb2e627
Author: psychedelicious <4822129+psychedelicious@users.noreply.github.com>
Date: Wed Nov 2 21:28:22 2022 +1100
Fixes current image button rerenders
commit ccf8593501
Author: psychedelicious <4822129+psychedelicious@users.noreply.github.com>
Date: Wed Nov 2 21:27:43 2022 +1100
Fixes display progress images select typing
commit 0fda612f3f
Author: psychedelicious <4822129+psychedelicious@users.noreply.github.com>
Date: Wed Nov 2 21:02:01 2022 +1100
Fixes edge case: upload over gets stuck while alt tabbing
- Press esc to close it now
commit 5afff65b71
Author: psychedelicious <4822129+psychedelicious@users.noreply.github.com>
Date: Wed Nov 2 20:33:19 2022 +1100
Fixes progress images select
commit 7e55bdefce
Author: psychedelicious <4822129+psychedelicious@users.noreply.github.com>
Date: Wed Nov 2 20:27:47 2022 +1100
Only generate 1 iteration when seed fixed & variations disabled
commit 620cf84d3d
Author: psychedelicious <4822129+psychedelicious@users.noreply.github.com>
Date: Wed Nov 2 19:51:38 2022 +1100
Reworks CurrentImageButtons.tsx
- Change all icons to FA iconset for consistency
- Refactors IAIIconButton, IAIButton, IAIPopover to handle ref forwarding
- Redesigns buttons into group
commit cfe567c62a
Author: psychedelicious <4822129+psychedelicious@users.noreply.github.com>
Date: Wed Nov 2 16:14:50 2022 +1100
Fixes: uploaded JPG images not loading
commit cefe12f1df
Author: psychedelicious <4822129+psychedelicious@users.noreply.github.com>
Date: Wed Nov 2 15:31:18 2022 +1100
Styling changes and settings modal minor refactor
commit 1e51c39928
Author: psychedelicious <4822129+psychedelicious@users.noreply.github.com>
Date: Wed Nov 2 15:27:46 2022 +1100
Fixes crash related to old value of progress_latents in state
commit 42a02bbb80
Author: psychedelicious <4822129+psychedelicious@users.noreply.github.com>
Date: Wed Nov 2 13:15:06 2022 +1100
Adds asCheckbox to IAIIconButton
Rough draft of this. Not happy with the styling but it's clearer than having them look just like buttons.
commit f1ae6dae4c
Author: psychedelicious <4822129+psychedelicious@users.noreply.github.com>
Date: Wed Nov 2 13:13:56 2022 +1100
Adds alert for bounding box size to status icons
commit 6195579910
Author: psychedelicious <4822129+psychedelicious@users.noreply.github.com>
Date: Wed Nov 2 11:52:19 2022 +1100
Restores shift+q bounding box shortcut
commit 16c8b23b34
Author: psychedelicious <4822129+psychedelicious@users.noreply.github.com>
Date: Wed Nov 2 11:32:07 2022 +1100
Changes Report Bug icon to a bug
commit 07ae626b22
Author: psychedelicious <4822129+psychedelicious@users.noreply.github.com>
Date: Wed Nov 2 11:17:16 2022 +1100
Removes unused isReady state
commit 8d171bb044
Author: psychedelicious <4822129+psychedelicious@users.noreply.github.com>
Date: Wed Nov 2 11:13:26 2022 +1100
Fixes crash when requesting post-generation upscale/face restoration
- Moves the inpainting paste to before the postprocessing.
commit 6e33ca7e9e
Author: psychedelicious <4822129+psychedelicious@users.noreply.github.com>
Date: Wed Nov 2 10:59:01 2022 +1100
Fixes rerenders on ClearBrushHistory
commit db46e12f2b
Author: blessedcoolant <54517381+blessedcoolant@users.noreply.github.com>
Date: Wed Nov 2 11:36:28 2022 +1300
Inpainting Controls Code Spitting and Performance
Codesplit the entirety of the inpainting controls. Created new selectors for each and every component to ensure there are no unnecessary re-renders. App feels a lot smoother.
commit 868e4b2db8
Author: blessedcoolant <54517381+blessedcoolant@users.noreply.github.com>
Date: Wed Nov 2 07:40:31 2022 +1300
[Code Splitting] Bounding Box Options
Isolated all bounding box components to trigger unnecessary re-renders. Still need to fix bounding box triggering re-renders on the control panel inside the canvas itself. But the options panel should be a good to go with this change.
commit 2e562742c1
Author: blessedcoolant <54517381+blessedcoolant@users.noreply.github.com>
Date: Wed Nov 2 06:40:27 2022 +1300
Fix Bounding Box Settings re-rendering on brush stroke
commit 68e6958009
Author: blessedcoolant <54517381+blessedcoolant@users.noreply.github.com>
Date: Wed Nov 2 06:28:34 2022 +1300
Fresh Bundle
commit ea6e3a7949
Author: blessedcoolant <54517381+blessedcoolant@users.noreply.github.com>
Date: Wed Nov 2 06:26:56 2022 +1300
[TESTING] Remove global isReady checking
I dont believe this is need at all because the isready state is constantly updated when needed and tracked real time in the Redux store. This causes massive re-renders. @psychedelicious If this is absolutely essential for a reason that I do not see, please hit me up on Discord.
commit b2879ca99f
Author: blessedcoolant <54517381+blessedcoolant@users.noreply.github.com>
Date: Wed Nov 2 06:08:59 2022 +1300
Code Split Inpaint Options
Isolate features to their own components so they dont re-render the other stuff each time.
commit 4e911566c3
Author: blessedcoolant <54517381+blessedcoolant@users.noreply.github.com>
Date: Wed Nov 2 03:50:56 2022 +1300
Preventing unnecessary re-renders across the app
commit 9bafda6a15
Author: blessedcoolant <54517381+blessedcoolant@users.noreply.github.com>
Date: Wed Nov 2 03:02:35 2022 +1300
Fix Inpainting Alerts Styling
commit 871a8a5375
Author: psychedelicious <4822129+psychedelicious@users.noreply.github.com>
Date: Tue Nov 1 23:52:07 2022 +1100
Adds hints when unable to invoke
- Popover on Invoke button indicates why exactly it is disabled, e.g. prompt is empty, something else is processing, etc.
- There may be more than one reason; all are displayed.
commit 0eef74bc00
Author: psychedelicious <4822129+psychedelicious@users.noreply.github.com>
Date: Tue Nov 1 23:40:11 2022 +1100
Address bounding box feedback
- Adds back toggle to hide bounding box
- Box quick toggle = q, normal toggle = shift + q
- Styles canvas alert icons
commit 423ae32097
Author: psychedelicious <4822129+psychedelicious@users.noreply.github.com>
Date: Tue Nov 1 17:06:07 2022 +1100
Improves bounding box interaction
Added spacebar-hold-to-transform back.
commit 8282e5d045
Author: psychedelicious <4822129+psychedelicious@users.noreply.github.com>
Date: Tue Nov 1 16:57:07 2022 +1100
Builds fresh bundle
commit 19305cdbdf
Author: psychedelicious <4822129+psychedelicious@users.noreply.github.com>
Date: Tue Nov 1 16:51:11 2022 +1100
Styles image uploader
commit eb9028ab30
Author: psychedelicious <4822129+psychedelicious@users.noreply.github.com>
Date: Tue Nov 1 16:51:03 2022 +1100
Disabled bounding box settings when locked
commit 21483f5d07
Author: psychedelicious <4822129+psychedelicious@users.noreply.github.com>
Date: Tue Nov 1 16:50:24 2022 +1100
Fixes silent crash when init image too large
To send the mask to the server, the UI rendered the mask onto the init image and sent the whole image. The mask was then cropped by the server.
If the image was too large, the app silently failed. Maybe it exceeds the websocket size limit.
Fixed by cropping the mask in the UI layer, sending only bounding-box-sized mask image data.
commit 82dcbac28f
Author: psychedelicious <4822129+psychedelicious@users.noreply.github.com>
Date: Tue Nov 1 16:28:30 2022 +1100
Improves bounding box interactions
- Bounding box can now be moved by dragging any of its edges
- Bounding box does not affect drawing if already drawing a stroke
- Can lock bounding box to draw directly on the bounding box edges
- Removes spacebar-hold behaviour due to technical issues
commit d43bd4625d
Author: psychedelicious <4822129+psychedelicious@users.noreply.github.com>
Date: Tue Nov 1 15:10:49 2022 +1100
Fixes hotkeys and settings buttons not working
commit ea891324a2
Author: psychedelicious <4822129+psychedelicious@users.noreply.github.com>
Date: Tue Nov 1 11:04:02 2022 +1100
Changes inpainting controls settings to hover
commit 8fd9ea2193
Author: psychedelicious <4822129+psychedelicious@users.noreply.github.com>
Date: Tue Nov 1 11:03:41 2022 +1100
Adds missing tooltips to site header
commit fb02666856
Author: psychedelicious <4822129+psychedelicious@users.noreply.github.com>
Date: Tue Nov 1 11:03:25 2022 +1100
Increases workarea split padding to 1rem
commit f6f5c2731b
Author: psychedelicious <4822129+psychedelicious@users.noreply.github.com>
Date: Tue Nov 1 11:03:10 2022 +1100
Decreases gallery width on inpainting
commit b4e3f771e0
Author: psychedelicious <4822129+psychedelicious@users.noreply.github.com>
Date: Tue Nov 1 10:54:59 2022 +1100
Fixes bugs/styling
- Fixes missing web app state on new version:
Adds stateReconciler to redux-persist.
When we add more values to the state and then release the update app, they will be automatically merged in.
Reseting web UI will be needed far less.
7159ec
- Fixes console z-index
- Moves reset web UI button to visible area
commit 99bb9491ac
Author: blessedcoolant <54517381+blessedcoolant@users.noreply.github.com>
Date: Tue Nov 1 08:35:45 2022 +1300
[WebUI] Loopback Default False
commit 0453f21127
Author: blessedcoolant <54517381+blessedcoolant@users.noreply.github.com>
Date: Wed Nov 2 23:23:51 2022 +1300
Fresh Build For WebUI
commit 9fc09aa4bd
Author: damian0815 <null@damianstewart.com>
Date: Wed Nov 2 09:08:11 2022 +0100
don't log base64 progress images
commit 5e87062cf8
Author: spezialspezial <75758219+spezialspezial@users.noreply.github.com>
Date: Wed Nov 2 00:21:27 2022 +0100
Option to directly invert the grayscale heatmap - fix
commit 3e7a459990
Author: spezialspezial <75758219+spezialspezial@users.noreply.github.com>
Date: Tue Nov 1 21:37:33 2022 +0100
Update txt2mask.py
commit bbf4c03e50
Author: spezialspezial <75758219+spezialspezial@users.noreply.github.com>
Date: Tue Nov 1 21:11:19 2022 +0100
Option to directly invert the grayscale heatmap
Theoretically less work inverting the image while it's small but I can't measure a significant difference. Though, handy option to have in some cases.
commit 611a3a9753
Author: mauwii <Mauwii@outlook.de>
Date: Wed Nov 2 02:23:09 2022 +0100
fix name of caching step
commit 1611f0d181
Author: mauwii <Mauwii@outlook.de>
Date: Wed Nov 2 02:18:46 2022 +0100
readd caching of sd-models
- this would remove the necesarrity of the secret availability in PRs
commit 08835115e4
Author: Lincoln Stein <lincoln.stein@gmail.com>
Date: Tue Nov 1 22:10:12 2022 -0400
pin pytorch_lightning to 1.7.7, issue #1331
commit 2d84e28d32
Merge: 533fd04eef17aae8
Author: Lincoln Stein <lincoln.stein@gmail.com>
Date: Tue Nov 1 22:11:04 2022 -0400
Merge branch 'development' of github.com:invoke-ai/InvokeAI into development
commit ef17aae8ab
Author: damian0815 <null@damianstewart.com>
Date: Wed Nov 2 00:39:48 2022 +0100
add damian0815 to contributors list
commit 0cc39f01a3
Author: damian0815 <null@damianstewart.com>
Date: Wed Nov 2 01:18:50 2022 +0100
report full size for fast latents and update conversion matrix for v1.5
commit 688d7258f1
Author: damian0815 <null@damianstewart.com>
Date: Wed Nov 2 00:33:00 2022 +0100
fix a bug that broke cross attention control index mapping
commit 4513320bf1
Author: damian0815 <null@damianstewart.com>
Date: Wed Nov 2 00:31:58 2022 +0100
save VRAM by not recombining tensors that have been sliced to save VRAM
commit 533fd04ef0
Merge: 6215592bdff5681c
Author: Lincoln Stein <lincoln.stein@gmail.com>
Date: Tue Nov 1 17:40:36 2022 -0400
Merge branch 'development' of github.com:invoke-ai/InvokeAI into development
commit dff5681cf0
Author: damian0815 <d@d.com>
Date: Tue Nov 1 13:56:03 2022 +0100
shorter strings
commit 5a2790a69b
Author: damian0815 <d@d.com>
Date: Tue Nov 1 13:19:20 2022 +0100
convert progress display to a drop-down
commit 7c5305ccba
Author: damian0815 <d@d.com>
Date: Tue Nov 1 12:54:46 2022 +0100
do not try to save base64 intermediates in gallery on cancellation
commit 4013e8ad6f
Author: psychedelicious <4822129+psychedelicious@users.noreply.github.com>
Date: Tue Nov 1 21:54:35 2022 +1100
Fixes b64 image sending and displaying
commit d1dfd257f9
Author: damian <d@d.com>
Date: Tue Nov 1 11:40:40 2022 +0100
wip base64
commit 5322d735ee
Author: damian <d@d.com>
Date: Tue Nov 1 11:31:42 2022 +0100
update frontend
commit cdb107dcda
Author: damian <d@d.com>
Date: Tue Nov 1 11:17:43 2022 +0100
add option to show intermediate latent space
commit be1393a41c
Author: damian <d@d.com>
Date: Tue Nov 1 10:16:55 2022 +0100
ensure existing exception handling code also handles new exception class
commit e554c2607f
Author: Damian at mba <damian@frey.NOSPAMco.nz>
Date: Tue Nov 1 10:08:42 2022 +0100
Rebuilt prompt parsing logic
Complete re-write of the prompt parsing logic to be more readable and
logical, and therefore also hopefully easier to debug, maintain, and
augment.
In the process it has also become more robust to badly-formed prompts.
Squashed commit of the following:
commit 8fcfa88a16e1390d41717e940d72aed64712171c
Author: Damian at mba <damian@frey.NOSPAMco.nz>
Date: Sun Oct 30 17:05:57 2022 +0100
further cleanup
commit 1a1fd78bcfeb49d072e3e6d5808aa8df15441629
Author: Damian at mba <damian@frey.NOSPAMco.nz>
Date: Sun Oct 30 16:07:57 2022 +0100
cleanup and document
commit 099c9659fa8b8135876f9a5a50fe80b20bc0635c
Author: Damian at mba <damian@frey.NOSPAMco.nz>
Date: Sun Oct 30 15:54:58 2022 +0100
works fully
commit 5e6887ea8c25a1e21438ff6defb381fd027d25fd
Author: Damian at mba <damian@frey.NOSPAMco.nz>
Date: Sun Oct 30 15:24:31 2022 +0100
further...
commit 492fda120844d9bc1ad4ec7dd408a3374762d0ff
Author: Damian at mba <damian@frey.NOSPAMco.nz>
Date: Sun Oct 30 14:08:57 2022 +0100
getting there...
commit c6aab05a8450cc3c95c8691daf38fdc64c74f52d
Author: Damian at mba <damian@frey.NOSPAMco.nz>
Date: Fri Oct 28 14:29:03 2022 +0200
wip doesn't compile
commit 5e533f731cfd20cd435330eeb0012e5689e87e81
Author: Damian at mba <damian@frey.NOSPAMco.nz>
Date: Fri Oct 28 13:21:43 2022 +0200
working with CrossAttentionCtonrol but no Attention support yet
commit 9678348773431e500e110e8aede99086bb7b5955
Author: Damian at mba <damian@frey.NOSPAMco.nz>
Date: Fri Oct 28 13:04:52 2022 +0200
wip rebuiling prompt parser
commit 6215592b12
Merge: ef24d76a349cc254
Author: Lincoln Stein <lincoln.stein@gmail.com>
Date: Tue Nov 1 17:34:55 2022 -0400
Merge branch 'development' of github.com:invoke-ai/InvokeAI into development
commit 349cc25433
Author: damian0815 <d@d.com>
Date: Tue Nov 1 20:08:52 2022 +0100
fix crash (be a little less aggressive clearing out the attention slice)
commit 214d276379
Author: damian0815 <d@d.com>
Date: Tue Nov 1 19:57:55 2022 +0100
be more aggressive at clearing out saved_attn_slice
commit ef24d76adc
Author: Lincoln Stein <lincoln.stein@gmail.com>
Date: Tue Nov 1 14:34:23 2022 -0400
fix library problems in preload_modules
commit ab2b5a691d
Author: Lincoln Stein <lincoln.stein@gmail.com>
Date: Tue Nov 1 17:22:48 2022 -0400
fix model_cache memory management issues
commit c7de2b2801
Author: mauwii <Mauwii@outlook.de>
Date: Tue Nov 1 02:02:14 2022 +0100
disable checks with sd-V1.4 model...
...to save some resources, since V1.5 is the default now
commit e8075658ac
Author: mauwii <Mauwii@outlook.de>
Date: Mon Oct 31 22:20:51 2022 +0100
update test-invoke-conda.yml
- fix model dl path for sd-v1-4.ckpt
- copy configs/models.yaml.example to configs/models.yaml
commit 4202dabee1
Author: mauwii <Mauwii@outlook.de>
Date: Mon Oct 31 22:17:21 2022 +0100
fix models example weights for sd-v1.4
commit d67db2bcf1
Author: blessedcoolant <54517381+blessedcoolant@users.noreply.github.com>
Date: Tue Nov 1 08:35:45 2022 +1300
[WebUI] Loopback Default False
commit 7159ec885f
Author: Lincoln Stein <lincoln.stein@gmail.com>
Date: Mon Oct 31 11:33:05 2022 -0400
further improvements to preload_models.py
- Faster startup for command line switch processing
- Specify configuration file to modify using --config option:
./scripts/preload_models.ply --config models/my-models-file.yaml
commit b5cf734ba9
Author: Lincoln Stein <lincoln.stein@gmail.com>
Date: Mon Oct 31 11:08:19 2022 -0400
improve behavior of preload_models.py
- NEVER overwrite user's existing models.yaml
- Instead, merge its contents into new config file,
and rename original to models.yaml.orig (with
message)
- models.yaml has been removed from repository and renamed
models.yaml.example
commit f7dc8eafee
Author: Lincoln Stein <lincoln.stein@gmail.com>
Date: Mon Oct 31 10:47:35 2022 -0400
restore models.yaml to virgin state
commit 762ca60a30
Author: Lincoln Stein <lincoln.stein@gmail.com>
Date: Tue Oct 4 22:55:10 2022 -0400
Update INPAINTING.md
commit e7fb9f342c
Author: Hideyuki Katsushiro <h.katsushiro@qualia.tokyo.jp>
Date: Wed Oct 5 10:08:53 2022 +0900
add argument --outdir
- Due to misuse of rebase command, main was transiently
in an inconsistent state.
- This repairs the damage, and adds a few post-release
patches that ensure stable conda installs on Mac and Windows.
- ldm.generate.Generator() now takes an argument named `max_load_models`.
This is an integer that limits the model cache size. When the cache
reaches the limit, it will start purging older models from cache.
- CLI takes an argument --max_load_models, default to 2. This will keep
one model in GPU and the other in CPU and switch back and forth
quickly.
- To not cache models at all, pass --max_load_models=1
- ldm.generate.Generator() now takes an argument named `max_load_models`.
This is an integer that limits the model cache size. When the cache
reaches the limit, it will start purging older models from cache.
- CLI takes an argument --max_load_models, default to 2. This will keep
one model in GPU and the other in CPU and switch back and forth
quickly.
- To not cache models at all, pass --max_load_models=1
- user can select which weight files to download using huggingface cache
- user must log in to huggingface, generate an access token, and accept
license terms the very first time this is run. After that, everything
works automatically.
- added placeholder for docs for installing models
- also got rid of unused config files. hopefully they weren't needed
for textual inversion, but I don't think so.
The Args object would crap out when trying to retrieve metadata from
an image file that did not contain InvokeAI-generated metadata, such
as a JPG. This corrects that and returns dummy values (seed of zero,
prompt of '') to avoid downstream breakage.
The k_samplers come with a "karras" noise schedule which performs
very well at low step counts but becomes noisy at higher ones.
This commit introduces a threshold (currently 30 steps) at which the
k samplers will switch over from using karras to the older model
noise schedule.
- This sets a step switchover point at which the k-samplers stop using the
Karras noise schedule and start using the LatentDiffusion noise schedule.
The advantage of this is that the Karras schedule produces excellent
results at low step counts but starts to become unstable at high
steps.
- A new command argument --karras_max, lets the user set where the
switchover occurs. Default is 29 steps (1-29 steps Karras),
(30 or greater LDM)
- Tildebyte, sorry to do a fast forward three-way merge for this
but rebasing was just too painful due to extensive recent
changes to the diffuser code.
This was a difficult merge because both PR #1108 and #1243 made
changes to obscure parts of the diffusion code.
- prompt weighting, merging and cross-attention working
- cross-attention does not work with runwayML inpainting
model, but weighting and merging are tested and working
- CLI command parsing code rewritten in order to get embedded
quotes right
- --hires now works with runwayML inpainting
- --embiggen does not work with runwayML and will give an error
- Added an --invert option to invert masks applied to inpainting
- Updated documentation
- change default model back to 1.4
- remove --fnformat from canonicalized dream prompt arguments
(not needed for image reproducibility)
- add -tm to canonicalized dream prompt arguments
(definitely needed for image reproducibility)
- The plms sampler now works with custom inpainting model
- Quashed bug that was causing generation on normal models to fail (oops!)
- Can now generate non-square images with custom inpainting model
Credits for advice and assistance during porting:
@any-winter-4079 (http://github.com/any-winter-4079)
@db3000 (Danny Beer http://github.com/db3000)
This is still a work in progress but seems functional. It supports
inpainting, txt2img and img2img on the ddim and k* samplers (plms
still needs work, but I know what to do).
To test this, get the file `sd-v1-5-inpainting.ckpt' from
https://huggingface.co/runwayml/stable-diffusion-inpainting and place it
at `models/ldm/stable-diffusion-v1/sd-v1-5-inpainting.ckpt`
Launch invoke.py with --model inpainting-1.5 and proceed as usual.
Caveats:
1. The inpainting model takes about 800 Mb more memory than the standard
1.5 model. This model will not work on 4 GB cards.
2. The inpainting model is temperamental. It wants you to describe the
entire scene and not just the masked area to replace. So if you want
to replace the parrot on a man's shoulder with a crow, the prompt
"crow" may fail. Try "man with a crow on shoulder" instead. The
symptom of a failed inpainting is that the area will be erased and
replaced with background.
3. This has not been tested well. Please report bugs.
- This is a merge of the final version of PR #1218 "Inpainting
Improvements"
Various merge conflicts made it easier to commit directly.
Author: Kyle0654
Co-Author: lstein
- This is a merge of the final version of PR #1218 "Inpainting
Improvements"
Various merge conflicts made it easier to commit directly.
Author: Kyle0654
Co-Author: lstein
Now you can activate the Hugging Face `diffusers` library safety check
for NSFW and other potentially disturbing imagery.
To turn on the safety check, pass --safety_checker at the command
line. For developers, the flag is `safety_checker=True` passed to
ldm.generate.Generate(). Once the safety checker is turned on, it
cannot be turned off unless you reinitialize a new Generate object.
When the safety checker is active, suspect images will be blurred and
a warning icon is added. There is also a warning message printed in
the CLI, but it can be a little hard to see because of its positioning
in the output stream.
There is a slight but noticeable delay when the safety checker runs.
Note that invisible watermarking is *not* currently implemented. The
watermark code distributed by the CompViz distribution uses a library
that does not seem to be able to retrieve the watermarks it creates,
and it does not appear that Hugging Face `diffusers` or other SD
distributions are doing any watermarking.
1. If tensors are passed to inpaint as init_image and/or init_mask, then
the post-generation image fixup code will be skipped.
2. Post-generation image fixup will work with either a black and white "L"
or "RGB" mask, or an "RGBA" mask.
- pass a PIL.Image to img2img and inpaint rather than tensor
- To support clipseg, inpaint needs to accept an "L" or "1" format
mask. Made the appropriate change.
To add a VAE autoencoder to an existing model:
1. Download the appropriate autoencoder and put it into
models/ldm/stable-diffusion
Note that you MUST use a VAE that was written for the
original CompViz Stable Diffusion codebase. For v1.4,
that would be the file named vae-ft-mse-840000-ema-pruned.ckpt
that you can download from https://huggingface.co/stabilityai/sd-vae-ft-mse-original
2. Edit config/models.yaml to contain the following stanza, modifying `weights`
and `vae` as required to match the weights and vae model file names. There is
no requirement to rename the VAE file.
~~~
stable-diffusion-1.4:
weights: models/ldm/stable-diffusion-v1/sd-v1-4.ckpt
description: Stable Diffusion v1.4
config: configs/stable-diffusion/v1-inference.yaml
vae: models/ldm/stable-diffusion-v1/vae-ft-mse-840000-ema-pruned.ckpt
width: 512
height: 512
~~~
3. Alternatively from within the `invoke.py` CLI, you may use the command
`!editmodel stable-diffusion-1.4` to bring up a simple editor that will
allow you to add the path to the VAE.
4. If you are just installing InvokeAI for the first time, you can also
use `!import_model models/ldm/stable-diffusion/sd-v1.4.ckpt` instead
to create the configuration from scratch.
5. That's it!
* Removed duplicate fix_func for MPS
* add support for loading VAE autoencoders
To add a VAE autoencoder to an existing model:
1. Download the appropriate autoencoder and put it into
models/ldm/stable-diffusion
Note that you MUST use a VAE that was written for the
original CompViz Stable Diffusion codebase. For v1.4,
that would be the file named vae-ft-mse-840000-ema-pruned.ckpt
that you can download from https://huggingface.co/stabilityai/sd-vae-ft-mse-original
2. Edit config/models.yaml to contain the following stanza, modifying `weights`
and `vae` as required to match the weights and vae model file names. There is
no requirement to rename the VAE file.
~~~
stable-diffusion-1.4:
weights: models/ldm/stable-diffusion-v1/sd-v1-4.ckpt
description: Stable Diffusion v1.4
config: configs/stable-diffusion/v1-inference.yaml
vae: models/ldm/stable-diffusion-v1/vae-ft-mse-840000-ema-pruned.ckpt
width: 512
height: 512
~~~
3. Alternatively from within the `invoke.py` CLI, you may use the command
`!editmodel stable-diffusion-1.4` to bring up a simple editor that will
allow you to add the path to the VAE.
4. If you are just installing InvokeAI for the first time, you can also
use `!import_model models/ldm/stable-diffusion/sd-v1.4.ckpt` instead
to create the configuration from scratch.
5. That's it!
* ported code refactor changes from PR #1221
- pass a PIL.Image to img2img and inpaint rather than tensor
- To support clipseg, inpaint needs to accept an "L" or "1" format
mask. Made the appropriate change.
* minor fixes to inpaint code
1. If tensors are passed to inpaint as init_image and/or init_mask, then
the post-generation image fixup code will be skipped.
2. Post-generation image fixup will work with either a black and white "L"
or "RGB" mask, or an "RGBA" mask.
Co-authored-by: wfng92 <43742196+wfng92@users.noreply.github.com>
The k_samplers come with a "karras" noise schedule which performs
very well at low step counts but becomes noisy at higher ones.
This commit introduces a threshold (currently 30 steps) at which the
k samplers will switch over from using karras to the older model
noise schedule.
To add a VAE autoencoder to an existing model:
1. Download the appropriate autoencoder and put it into
models/ldm/stable-diffusion
Note that you MUST use a VAE that was written for the
original CompViz Stable Diffusion codebase. For v1.4,
that would be the file named vae-ft-mse-840000-ema-pruned.ckpt
that you can download from https://huggingface.co/stabilityai/sd-vae-ft-mse-original
2. Edit config/models.yaml to contain the following stanza, modifying `weights`
and `vae` as required to match the weights and vae model file names. There is
no requirement to rename the VAE file.
~~~
stable-diffusion-1.4:
weights: models/ldm/stable-diffusion-v1/sd-v1-4.ckpt
description: Stable Diffusion v1.4
config: configs/stable-diffusion/v1-inference.yaml
vae: models/ldm/stable-diffusion-v1/vae-ft-mse-840000-ema-pruned.ckpt
width: 512
height: 512
~~~
3. Alternatively from within the `invoke.py` CLI, you may use the command
`!editmodel stable-diffusion-1.4` to bring up a simple editor that will
allow you to add the path to the VAE.
4. If you are just installing InvokeAI for the first time, you can also
use `!import_model models/ldm/stable-diffusion/sd-v1.4.ckpt` instead
to create the configuration from scratch.
5. That's it!
Ironically, the black and white mask file generated by the
`invoke> !mask` command could not be passed as the mask to
`img2img`. This is now fixed and the documentation updated.
- code for committing config changes to models.yaml now in module
rather than in invoke script
- model marked "default" is now loaded if model not specified on
command line
- uncache changed models when edited, so that they reload properly
- removed liaon from models.yaml and added stable-diffusion-1.5
- The !mask command takes an image path, a text prompt, and
(optionally) a masking threshold. It creates a mask over the region
indicated by the prompt, and outputs several files that show which
regions will be masked by the chosen prompt and threshold.
- The mask images should not be passed directly to img2img because
they are designed for visualization only. Instead, use the
--text_mask option to pass the selected prompt and threshold.
- See docs/features/INPAINTING.md for details.
- The directory "models" in the main InvokeAI directory was conflicting
with loading "models.clipseg". To fix this issue, I have renamed the
models.clipseg to clipseg_models.clipseg, and applied this change to
the 'models-rename' branch of invoke-ai's fork of clipseg.
attention is parsed but ignored, blends old syntax doesn't work,
conjunctions are parsed but ignored, the only part that's used
here is the new .blend() syntax and cross-attention control
using .swap()
commit 9bb0b5d0036c4dffbb72ce11e097fae4ab63defd
Author: Damian at mba <damian@frey.NOSPAMco.nz>
Date: Sat Oct 15 23:43:41 2022 +0200
undo local_files_only stuff
commit eed93f5d30c34cfccaf7497618ae9af17a5ecfbb
Author: Damian at mba <damian@frey.NOSPAMco.nz>
Date: Sat Oct 15 23:40:37 2022 +0200
Revert "Merge branch 'development-invoke' into fix-prompts"
This reverts commit 7c40892a9f184f7e216f14d14feb0411c5a90e24, reversing
changes made to e3f2dd62b0548ca6988818ef058093a4f5b022f2.
commit f06d6024e345c69e6d5a91ab5423925a68ee95a7
Author: Damian at mba <damian@frey.NOSPAMco.nz>
Date: Thu Oct 13 23:30:16 2022 +0200
more efficiently handle multiple conditioning
commit 5efdfcbcd980ce6202ab74e7f90e7415ce7260da
Merge: b9c0dc5 ac08bb6
Author: Damian at mba <damian@frey.NOSPAMco.nz>
Date: Thu Oct 13 14:51:01 2022 +0200
Merge branch 'optional-disable-karras-schedule' into fix-prompts
commit ac08bb6fd25e19a9d35cf6c199e66500fb604af1
Author: Damian at mba <damian@frey.NOSPAMco.nz>
Date: Thu Oct 13 14:50:43 2022 +0200
append '*use_model_sigmas*' to prompt string to use model sigmas
commit 70d8c05a3ff329409f76204f4af94e55d468ab8b
Author: Damian at mba <damian@frey.NOSPAMco.nz>
Date: Thu Oct 13 12:12:17 2022 +0200
make karras scheduling switchable
commit d60df54f69 replaced the model's
own scheduling with karras scheduling. this has changed image generation
(seems worse now?)
this commit wraps the change in a bool.
commit b9c0dc5f1a658a0e6c3936000e9ae559e1c7a1db
Author: Damian at mba <damian@frey.NOSPAMco.nz>
Date: Wed Oct 12 20:16:00 2022 +0200
add test of more complex conjunction
commit 9ac0c15cc0d7b5f6df3289d3ad474260972a17be
Author: Damian at mba <damian@frey.NOSPAMco.nz>
Date: Wed Oct 12 17:18:25 2022 +0200
improve comments
commit ad33bce60590b87b2a93e90f16dc9d3e935d04a5
Author: Damian at mba <damian@frey.NOSPAMco.nz>
Date: Wed Oct 12 17:04:46 2022 +0200
put back thresholding stuff
commit 4852c698a325049834ba0d4b358f07210bc7171a
Author: Damian at mba <damian@frey.NOSPAMco.nz>
Date: Wed Oct 12 14:25:02 2022 +0200
notes on improving conjunction efficiency
commit a53bb1e5b68025d09642b935ae6a9a015cfaf2d6
Author: Damian at mba <damian@frey.NOSPAMco.nz>
Date: Wed Oct 12 14:14:33 2022 +0200
optional weights support for Conjunction
commit fec79ab15e4f0c84dd61cb1b45a5e6a72ae4aaeb
Author: Damian at mba <damian@frey.NOSPAMco.nz>
Date: Wed Oct 12 12:07:27 2022 +0200
fix blend error and log parsing output
commit 1f751c2a039f9c97af57b18e0f019512631d5a25
Author: Damian at mba <damian@frey.NOSPAMco.nz>
Date: Wed Oct 12 10:33:33 2022 +0200
fix broken euler sampler
commit 02f8148d17efe4b6bde8d29b827092a0626363ee
Author: Damian at mba <damian@frey.NOSPAMco.nz>
Date: Wed Oct 12 10:24:20 2022 +0200
cleanup prompt parser
commit 8028d49ae6c16c0d6ec9c9de9c12d56c32201421
Author: Damian at mba <damian@frey.NOSPAMco.nz>
Date: Wed Oct 12 10:14:18 2022 +0200
explicit conjunction, improve flattening logic
commit 8a1710892185f07eb77483f7edae0fc4d6bbb250
Author: Damian at mba <damian@frey.NOSPAMco.nz>
Date: Tue Oct 11 22:59:30 2022 +0200
adapt multi-conditioning to also work with ddim
commit 53802a839850d0d1ff017c6bafe457c4bed750b0
Author: Damian at mba <damian@frey.NOSPAMco.nz>
Date: Tue Oct 11 22:31:42 2022 +0200
unconditioning is also fancy-prompt-syntaxable
commit 7c40892a9f184f7e216f14d14feb0411c5a90e24
Merge: e3f2dd6 dbe0da4
Author: Damian at mba <damian@frey.NOSPAMco.nz>
Date: Tue Oct 11 21:39:54 2022 +0200
Merge branch 'development-invoke' into fix-prompts
commit e3f2dd62b0548ca6988818ef058093a4f5b022f2
Merge: eef0e48 06f542e
Author: Damian at mba <damian@frey.NOSPAMco.nz>
Date: Tue Oct 11 21:38:09 2022 +0200
Merge remote-tracking branch 'upstream/development' into fix-prompts
commit eef0e484c2eaa1bd4e0e0b1d3f8d7bba38478144
Author: Damian at mba <damian@frey.NOSPAMco.nz>
Date: Tue Oct 11 21:26:25 2022 +0200
fix run-on paren-less attention, add some comments
commit fd29afdf0e9f5e0cdc60239e22480c36ca0aaeca
Author: Damian at mba <damian@frey.NOSPAMco.nz>
Date: Tue Oct 11 21:03:02 2022 +0200
python 3.9 compatibility
commit 26f7646eef7f39bc8f7ce805e747df0f723464da
Author: Damian at mba <damian@frey.NOSPAMco.nz>
Date: Tue Oct 11 20:58:42 2022 +0200
first pass connecting PromptParser to conditioning
commit ae53dff3796d7b9a5e7ed30fa1edb0374af6cd8d
Author: Damian at mba <damian@frey.NOSPAMco.nz>
Date: Tue Oct 11 20:51:15 2022 +0200
update frontend dist
commit 9be4a59a2d76f49e635474b5984bfca826a5dab4
Author: Damian at mba <damian@frey.NOSPAMco.nz>
Date: Tue Oct 11 19:01:39 2022 +0200
fix issues with correctness checking FlattenedPrompt
commit 3be212323eab68e72a363a654124edd9809e4cf0
Author: Damian at mba <damian@frey.NOSPAMco.nz>
Date: Tue Oct 11 18:43:16 2022 +0200
parsing nested seems to work pretty ok
commit acd73eb08cf67c27cac8a22934754321256f56a9
Author: Damian at mba <damian@frey.NOSPAMco.nz>
Date: Tue Oct 11 18:26:17 2022 +0200
wip introducing FlattenedPrompt class
commit 71698d5c7c2ac855b690d8ef67e8830148c59eda
Author: Damian at mba <damian@frey.NOSPAMco.nz>
Date: Tue Oct 11 15:59:42 2022 +0200
recursive attention weighting seems to actually work
commit a4e1ec6b20deb7cc0cd12737bdbd266e56144709
Author: Damian at mba <damian@frey.NOSPAMco.nz>
Date: Tue Oct 11 15:06:24 2022 +0200
now apparently almost supported nested attention
commit da76fd1ddf22a3888cdc08fd4fed38d8b178e524
Author: Damian at mba <damian@frey.NOSPAMco.nz>
Date: Tue Oct 11 13:23:37 2022 +0200
wip prompt parsing
commit dbe0da4572c2ac22f26a7afd722349a5680a9e47
Author: Kyle Schouviller <kyle0654@hotmail.com>
Date: Mon Oct 10 22:32:35 2022 -0700
Adding node-based invocation apps
commit 8f2a2ffc083366de74d7dae471b50b6f98a7c5f8
Author: Damian at mba <damian@frey.NOSPAMco.nz>
Date: Mon Oct 10 19:03:18 2022 +0200
fix merge issues
commit 73118dee2a8f4891700756e014caf1c9ca629267
Merge: fd00844 12413b0
Author: Damian at mba <damian@frey.NOSPAMco.nz>
Date: Mon Oct 10 12:42:48 2022 +0200
Merge remote-tracking branch 'upstream/development' into fix-prompts
commit fd0084413541013c2cf71e006af0392719bef53d
Author: Damian at mba <damian@frey.NOSPAMco.nz>
Date: Mon Oct 10 12:39:38 2022 +0200
wip prompt parsing
commit 0be9363db9307859d2b65cffc6af01f57d7873a4
Author: Damian at mba <damian@frey.NOSPAMco.nz>
Date: Mon Oct 10 03:20:06 2022 +0200
better +/- attention parsing
commit 5383f691874a58ab01cda1e4fac6cf330146526a
Author: Damian at mba <damian@frey.NOSPAMco.nz>
Date: Mon Oct 10 02:27:47 2022 +0200
prompt parser seems to work
commit 591d098a33ce35462428d8c169501d8ed73615ab
Author: Damian at mba <damian@frey.NOSPAMco.nz>
Date: Sun Oct 9 20:25:37 2022 +0200
supports weighting unconditioning, cross-attention with |
commit 7a7220563aa05a2980235b5b908362f66b728309
Author: Damian at mba <damian@frey.NOSPAMco.nz>
Date: Sun Oct 9 18:15:56 2022 +0200
i think cross attention might be working?
commit 951ed391e7126bff228c18b2db304ad28d59644a
Author: Damian at mba <damian@frey.NOSPAMco.nz>
Date: Sun Oct 9 16:04:54 2022 +0200
weighted CFG denoiser working with a single item
commit ee532a0c2827368c9e45a6a5f3975666402873da
Author: Damian at mba <damian@frey.NOSPAMco.nz>
Date: Sun Oct 9 06:33:40 2022 +0200
wip probably doesn't work or compile
commit 14654bcbd207b9ca28a6cbd37dbd967d699b062d
Author: Damian at mba <damian@frey.NOSPAMco.nz>
Date: Fri Oct 7 18:11:48 2022 +0200
use tan() to calculate embedding weight for <1 attentions
commit 1a8e76b31aa5abf5150419ebf3b29d4658d07f2b
Author: Damian at mba <damian@frey.NOSPAMco.nz>
Date: Fri Oct 7 16:14:54 2022 +0200
fix bad math.max reference
commit f697ff896875876ccaa1e5527405bdaa7ed27cde
Author: Damian at mba <damian@frey.NOSPAMco.nz>
Date: Fri Oct 7 15:55:57 2022 +0200
respect http[s]x protocol when making socket.io middleware
commit 41d3dd4eeae8d4efb05dfb44fc6d8aac5dc468ab
Author: Damian at mba <damian@frey.NOSPAMco.nz>
Date: Fri Oct 7 13:29:54 2022 +0200
fractional weighting works, by blending with prompts excluding the word
commit 087fb6dfb3e8f5e84de8c911f75faa3e3fa3553c
Author: Damian at mba <damian@frey.NOSPAMco.nz>
Date: Fri Oct 7 10:52:03 2022 +0200
wip doing weights <1 by averaging with conditioning absent the lower-weighted fragment
commit 3c49e3f3ec7c18dc60f3e18ed2f7f0d97aad3a47
Author: Damian at mba <damian@frey.NOSPAMco.nz>
Date: Fri Oct 7 10:36:15 2022 +0200
notate CFGDenoiser, perhaps
commit d2bcf1bb522026ebf209ad0103f6b370383e5070
Author: Damian at mba <damian@frey.NOSPAMco.nz>
Date: Thu Oct 6 05:04:47 2022 +0200
hack blending syntax to test attention weighting more extensively
commit 94904ef2cf917f74ec23ef7a570e12ff8255b048
Author: Damian at mba <damian@frey.NOSPAMco.nz>
Date: Thu Oct 6 04:56:37 2022 +0200
conditioning works, apparently
commit 7c6663ddd70f665fd1308b6dd74f92ca393a8df5
Author: Damian at mba <damian@frey.NOSPAMco.nz>
Date: Thu Oct 6 02:20:24 2022 +0200
attention weighting, definitely works in positive direction
commit 5856d453a9b020bc1a28ff643ae1f58c12c9be73
Author: Damian at mba <damian@frey.NOSPAMco.nz>
Date: Tue Oct 4 19:02:14 2022 +0200
wip bubbling weights down
commit a2ed14fd9b7d3cb36b6c5348018b364c76d1e892
Author: Damian at mba <damian@frey.NOSPAMco.nz>
Date: Tue Oct 4 17:35:39 2022 +0200
bring in changes from PC
test prompt:
"a cat sitting on a car {a dog sitting on a car}" -W 384 -H 256 -s 10 -S 12346 -A k_euler
note that substition of dog for cat is currently hard-coded (ksampler.py
line 43-44)
On the command line, the new option is --text_mask or -tm.
Example:
```
invoke> a baseball -I /path/to/still_life.png -tm orange
```
This will find the orange fruit in the still life painting and replace
it with an image of a baseball.
- In CLI: the argument is --png_compression <0..9> (-z<0..9>)
- In API, pass `compress_level` to PngWriter.save_image_and_prompt_to_png()
Compression ranges from 0 (no compression) to 9 (maximum compression).
Default value is 6 (as specified by Pillow package).
This addresses an issue first raised in #652.
- --inpaint_replace 0.X will cause inpainting to ignore what is under
the masked region with a strength ranging from 0 (don't ignore at all)
to 1.0 (ignore completely)
- sync with upstream development
- update docs
- add a `--inpaint_replace` option that fills masked regions with
latent noise. This allows radical changes to inpainted regions
at the cost of losing context.
- fix up readline, arg processing and metadata writing to accommodate
this change
- fixed bug in storage and retrieval of variations, discovered incidentally
during testing
- update documentation
- Error checks for invalid model
- Add !del_model command to invoke.py
- Add del_model() method to model_cache
- Autocompleter kept in sync with model addition/subtraction.
At step counts greater than ~75, the ksamplers start producing noisy
images when using the Karras noise schedule. This PR reverts to using
the model's own noise schedule, which eliminates the problem at the
cost of slowing convergence at lower step counts.
This PR also introduces a new CLI `--save_intermediates <n>' argument,
which will save every nth intermediate image into a subdirectory
named `intermediates/<image_prefix>'.
Addresses issue #1083.
At step counts greater than ~75, the ksamplers start producing noisy
images when using the Karras noise schedule. This PR reverts to using
the model's own noise schedule, which eliminates the problem at the
cost of slowing convergence at lower step counts.
This PR also introduces a new CLI `--save_intermediates <n>' argument,
which will save every nth intermediate image into a subdirectory
named `intermediates/<image_prefix>'.
Addresses issue #1083.
- !import_model <path/to/model/weights> will import a new model,
prompt the user for its name and description, write it to the
models.yaml file, and load it.
- !edit_model <model_name> will bring up a previously-defined model
and prompt the user to edit its descriptive fields.
Example of !import_model
<pre>
invoke> <b>!import_model models/ldm/stable-diffusion-v1/model-epoch08-float16.ckpt</b>
>> Model import in process. Please enter the values needed to configure this model:
Name for this model: <b>waifu-diffusion</b>
Description of this model: <b>Waifu Diffusion v1.3</b>
Configuration file for this model: <b>configs/stable-diffusion/v1-inference.yaml</b>
Default image width: <b>512</b>
Default image height: <b>512</b>
>> New configuration:
waifu-diffusion:
config: configs/stable-diffusion/v1-inference.yaml
description: Waifu Diffusion v1.3
height: 512
weights: models/ldm/stable-diffusion-v1/model-epoch08-float16.ckpt
width: 512
OK to import [n]? <b>y</b>
>> Caching model stable-diffusion-1.4 in system RAM
>> Loading waifu-diffusion from models/ldm/stable-diffusion-v1/model-epoch08-float16.ckpt
| LatentDiffusion: Running in eps-prediction mode
| DiffusionWrapper has 859.52 M params.
| Making attention of type 'vanilla' with 512 in_channels
| Working with z of shape (1, 4, 32, 32) = 4096 dimensions.
| Making attention of type 'vanilla' with 512 in_channels
| Using faster float16 precision
</pre>
Example of !edit_model
<pre>
invoke> <b>!edit_model waifu-diffusion</b>
>> Editing model waifu-diffusion from configuration file ./configs/models.yaml
description: <b>Waifu diffusion v1.4beta</b>
weights: models/ldm/stable-diffusion-v1/<b>model-epoch10-float16.ckpt</b>
config: configs/stable-diffusion/v1-inference.yaml
width: 512
height: 512
>> New configuration:
waifu-diffusion:
config: configs/stable-diffusion/v1-inference.yaml
description: Waifu diffusion v1.4beta
weights: models/ldm/stable-diffusion-v1/model-epoch10-float16.ckpt
height: 512
width: 512
OK to import [n]? y
>> Caching model stable-diffusion-1.4 in system RAM
>> Loading waifu-diffusion from models/ldm/stable-diffusion-v1/model-epoch10-float16.ckpt
...
</pre>
This commit "reverts" the new API changes by extracting the old
functionality into new files.
The work is based on the commit `803a51d5adca7e6e28491fc414fd3937bee7cb79`
PngWriter regained PromptFormatter as old server used that.
`server_legacy.py` is the old server that `dream.py` used.
Finally `legacy_api.py` is what `dream.py` used to be at the mentioned
commit.
One manually run test has been added in order to be able to test
compatibility with the old API, currently just testing that the API
endpoint works the same way + the image hash is the same as it used to
be before.
- This PR enables two new commands in the invoke.py script
!models -- list the available models and their cache status
!switch <model> -- switch to the indicated model
Example:
invoke> !models
laion400m not loaded Latent Diffusion LAION400M model
stable-diffusion-1.4 active Stable Diffusion inference model version 1.4
waifu-1.3 cached Waifu anime model version 1.3
invoke> !switch waifu-1.3
>> Caching model stable-diffusion-1.4 in system RAM
>> Retrieving model waifu-1.3 from system RAM cache
The name and descriptions of the models are taken from
`config/models.yaml`. A future enhancement to `model_cache.py` will be
to enable new model stanzas to be added to the file
programmatically. This will be useful for the WebGUI.
More details:
- Use fast switching algorithm described in PR #948
- Models are selected using their configuration stanza name
given in models.yaml.
- To avoid filling up CPU RAM with cached models, this PR
implements an LRU cache that monitors available CPU RAM.
- The caching code allows the minimum value of available RAM
to be adjusted, but invoke.py does not currently have a
command-line argument that allows you to set it. The
minimum free RAM is arbitrarily set to 2 GB.
- Add optional description field to configs/models.yaml
Unrelated fixes:
- Added ">>" to CompViz model loading messages in order to make user experience
more consistent.
- When generating an image greater than defaults, will only warn about possible
VRAM filling the first time.
- Fixed bug that was causing help message to be printed twice. This involved
moving the import line for the web backend into the section where it is
called.
Coauthored by: @ArDiouscuros
- the prompt argument comes before the optional arguments
- usage statement shows 'invoke>' rather than 'invoke.py'
- use pydoc pager to help display long help message
- the prompt argument comes before the optional arguments
- usage statement shows 'invoke>' rather than 'invoke.py'
- use pydoc pager to help display long help message
- rename dream.py to invoke.py
- create a compatibility script named dream.py that execs() invoke.py
- redo documentation
- change help message in args
- this does **not** rename the libraries, which are still ldm.dream.util, etc
This reverts commit 5f42d08945.
This fix was intended to solve issue #939, in which ESRGAN generates
dark images when upscaling 4X on certain GTX cards. However, the fix
apparently causes conflicts with some versions of the ESRGAN library,
and this fix will have to wait until after release of 2.0.
- txt2img2img back to using DDIM as img2img sampler; results produced
by some k* samplers are just not reliable enough for good user
experience
- img2img progress message clarifies why img2img steps taken != steps requested
- warn of potential problems when user tries to run img2img on a small init image
- Added support for pyreadline3 so that Window users can benefit.
- Added the !search command to search the history for a matching string:
~~~
!search puppies
[20] puppies at the food bowl -Ak_lms
[54] house overrun by hungry puppies -C20 -s100
~~~
- Added the !clear command to clear the in-memory and on-disk
command history.
- embiggen needs to use ddim sampler due to low step count
- --hires_fix option needs to be written to log and command string
- fix call signature of _init_image_mask()
- img2img confirmed working with all samplers
- inpainting working on ddim & plms. Changes to k-diffusion
module seem to be needed for inpainting support.
- switched k-diffuser noise schedule to original karras schedule,
which reduces the step number needed for good results
-if readline.set_auto_history() is not implemented, as in pyreadline3, will fall
back gracefully to automatic history saving. The only issue with this is that
-!history commands will be recorded in the history.
-!fetch on missing file no longer crashes script
-!history is now one of the autocomplete commands
-.dream_history now stored in output directory rather than ~user directory.
An important limitation of the last feature is that the history is
loaded and saved to the .dream_history file in the --outdir directory
specified at script launch time. It is not swapped around when the
--outdir is changed during the session.
Add message about interpolation size
Fix crash if sampler not set to DDIM, change parameter name to hires_fix
Hi res mode fix duplicates with img2img scaling
-if readline.set_auto_history() is not implemented, as in pyreadline3, will fall
back gracefully to automatic history saving. The only issue with this is that
-!history commands will be recorded in the history.
-!fetch on missing file no longer crashes script
-!history is now one of the autocomplete commands
-.dream_history now stored in output directory rather than ~user directory.
An important limitation of the last feature is that the history is
loaded and saved to the .dream_history file in the --outdir directory
specified at script launch time. It is not swapped around when the
--outdir is changed during the session.
- When --save_orig *not* provided during image generation with
upscaling/face fixing, an extra image file was being created. This
PR fixes the problem.
- Also generalizes the tab autocomplete for image paths such that
autocomplete searches the output directory for all path-modifying
options except for --outdir.
- normalized how filenames are written out when postprocessing invoked
- various fixes of bugs encountered during testing
- updated documentation
- updated help text
- Enhance tab completion functionality
- Each of the switches that read a filepath (e.g. --init_img) will trigger file path completion. The
-S switch will display a list of recently-used seeds.
- Added new !fetch command to retrieve the metadata from a previously-generated image and populate the
readline linebuffer with the appropriate editable command to regenerate.
- Added new !history command to display previous commands and reload them for modification.
- The !fetch and !fix commands both autocomplete *and* search automatically through the current
outdir for files.
- The completer maintains a list of recently used seeds and will try to autocomplete them.
- normalized how filenames are written out when postprocessing invoked
- various fixes of bugs encountered during testing
- updated documentation
- updated help text
- Enhance tab completion functionality
- Each of the switches that read a filepath (e.g. --init_img) will trigger file path completion. The
-S switch will display a list of recently-used seeds.
- Added new !fetch command to retrieve the metadata from a previously-generated image and populate the
readline linebuffer with the appropriate editable command to regenerate.
- Added new !history command to display previous commands and reload them for modification.
- The !fetch and !fix commands both autocomplete *and* search automatically through the current
outdir for files.
- The completer maintains a list of recently used seeds and will try to autocomplete them.
- args.py will now attempt to return a metadata-containing Args
object using the following methods:
1. By looking for the 'sd-metadata' tag in the PNG info
2. By looking from the 'Dream' tag
3. As a last resort, fetch the seed from the filename and assume
defaults for all other options.
Build the base generator in same place and way as other generators to reduce the chance of missed arguments in the future.
Fixes crash with display in-progress images, though note the feature still doesn't work for other reasons.
