Mirrored_Repos/InvokeAI
1
0
Fork 0
mirror of https://github.com/invoke-ai/InvokeAI synced 2025-07-25 21:05:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main' into dev/diffusers

Browse Source
This commit is contained in:
Kevin Turner
2022-12-13 16:06:06 -08:00
parent 07ac88baed af3d72e001
commit 343216407d
11 changed files with 94 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/test-invoke-conda.yml vendored
View File

@ -6,6 +6,10 @@ on:
- 'development'
pull_request:
concurrency:
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
cancel-in-progress: true
jobs:
matrix:
strategy:

8
.github/workflows/test-invoke-pip.yml vendored
View File

@ -6,6 +6,10 @@ on:
- 'development'
pull_request:
concurrency:
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
cancel-in-progress: true
jobs:
matrix:
strategy:
@ -92,8 +96,8 @@ jobs:
# cache: 'pip'
# cache-dependency-path: ${{ matrix.requirements-file }}
# - name: install dependencies
# run: ${{ env.pythonLocation }}/bin/pip install --upgrade pip setuptools wheel
- name: install dependencies
run: pip3 install --upgrade pip setuptools wheel
- name: install requirements
run: pip3 install -r '${{ matrix.requirements-file }}'

111
docs/features/WEBUIHOTKEYS.md
View File

@ -4,59 +4,72 @@ title: WebUI Hotkey List
# :material-keyboard: **WebUI Hotkey List**
## General
## App Hotkeys
| Setting | Hotkey |
| ----------------- | ---------------------- |
| ++a++ | Set All Parameters |
| ++s++ | Set Seed |
| ++u++ | Upscale |
| ++r++ | Restoration |
| ++i++ | Show Metadata |
| ++d++ ++d++ ++l++ | Delete Image |
| ++alt+a++ | Focus prompt input |
| ++shift+i++ | Send To Image to Image |
| ++ctrl+enter++ | Start processing |
| ++shift+x++ | cancel Processing |
| ++shift+d++ | Toggle Dark Mode |
| ++"`"++ | Toggle console |
| Setting | Hotkey |
| -------------- | ------------------ |
| ++Ctrl+Enter++ | Invoke |
| ++Shift+X++ | Cancel |
| ++Alt+A++ | Focus Prompt |
| ++O++ | Toggle Options |
| ++Shift+O++ | Pin Options |
| ++Z++ | Toggle Viewer |
| ++G++ | Toggle Gallery |
| ++F++ | Maximize Workspace |
| ++1-5++ | Change Tabs |
| ++"`"++ | Toggle Console |
## Tabs
## General Hotkeys
| Setting | Hotkey |
| ------- | ------------------------- |
| ++1++ | Go to Text To Image Tab |
| ++2++ | Go to Image to Image Tab |
| ++3++ | Go to Inpainting Tab |
| ++4++ | Go to Outpainting Tab |
| ++5++ | Go to Nodes Tab |
| ++6++ | Go to Post Processing Tab |
| Setting | Hotkey |
| ----------- | ---------------------- |
| ++P++ | Set Prompt |
| ++S++ | Set Seed |
| ++A++ | Set Parameters |
| ++Shift+R++ | Restore Faces |
| ++Shift+U++ | Upscale |
| ++I++ | Show Info |
| ++Shift+I++ | Send To Image To Image |
| ++Del++ | Delete Image |
| ++Esc++ | Close Panels |
## Gallery
## Gallery Hotkeys
| Setting | Hotkey |
| -------------- | ------------------------------- |
| ++g++ | Toggle Gallery |
| ++left++ | Go to previous image in gallery |
| ++right++ | Go to next image in gallery |
| ++shift+p++ | Pin gallery |
| ++shift+up++ | Increase gallery image size |
| ++shift+down++ | Decrease gallery image size |
| ++shift+r++ | Reset image gallery size |
| Setting | Hotkey |
| --------------- | --------------------------- |
| ++Arrow Left++ | Previous Image |
| ++Arrow Right++ | Next Image |
| ++Shift+G++ | Toggle Gallery Pin |
| ++Shift+Up++ | Increase Gallery Image Size |
| ++Shift+Down++ | Decrease Gallery Image Size |
## Inpainting
## Unified Canvas Hotkeys
| Setting | Hotkey |
| ---------------------------- | --------------------- |
| ++"["++ | Decrease brush size |
| ++"]"++ | Increase brush size |
| ++alt+"["++ | Decrease mask opacity |
| ++alt+"]"++ | Increase mask opacity |
| ++b++ | Select brush |
| ++e++ | Select eraser |
| ++ctrl+z++ | Undo brush stroke |
| ++ctrl+shift+z++, ++ctrl+y++ | Redo brush stroke |
| ++h++ | Hide mask |
| ++shift+m++ | Invert mask |
| ++shift+c++ | Clear mask |
| ++shift+j++ | Expand canvas |
| Setting | Hotkey |
| ------------------------- | ---------------------- |
| ++B++ | Select Brush |
| ++E++ | Select Eraser |
| ++[++ | Decrease Brush Size |
| ++]++ | Increase Brush Size |
| ++Shift+[++ | Decrease Brush Opacity |
| ++Shift+]++ | Increase Brush Opacity |
| ++V++ | Move Tool |
| ++Shift+F++ | Fill Bounding Box |
| ++Delete/Backspace++ | Erase Bounding Box |
| ++C++ | Select Color Picker |
| ++N++ | Toggle Snap |
| ++Hold Space++ | Quick Toggle Move |
| ++Q++ | Toggle Layer |
| ++Shift+C++ | Clear Mask |
| ++H++ | Hide Mask |
| ++Shift+H++ | Show/Hide Bounding Box |
| ++Shift+M++ | Merge Visible |
| ++Shift+S++ | Save To Gallery |
| ++Ctrl+C++ | Copy To Clipboard |
| ++Shift+D++ | Download Image |
| ++Ctrl+Z++ | Undo |
| ++Ctrl+Y / Ctrl+Shift+Z++ | Redo |
| ++R++ | Reset View |
| ++Arrow Left++ | Previous Staging Image |
| ++Arrow Right++ | Next Staging Image |
| ++Enter++ | Accept Staging Image |

2
docs/installation/INSTALL_AUTOMATED.md
View File

@ -194,7 +194,7 @@ version of InvokeAI with the option to upgrade to experimental versions later.
12. You can launch InvokeAI with several different command-line arguments that
customize its behavior. For example, you can change the location of the
inage output directory, or select your favorite sampler. See the
image output directory, or select your favorite sampler. See the
[Command-Line Interface](../features/CLI.md) for a full list of the options.
- To set defaults that will take effect every time you launch InvokeAI,

4
frontend/dist/assets/index-legacy-f27062cd.js → frontend/dist/assets/index-legacy-1d92538f.js vendored
View File

File diff suppressed because one or more lines are too long

4
frontend/dist/assets/index.d8f54146.js → frontend/dist/assets/index.4a434b56.js vendored
View File

File diff suppressed because one or more lines are too long

4
frontend/dist/index.html vendored
View File

@ -8,7 +8,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>InvokeAI - A Stable Diffusion Toolkit</title>
<link rel="shortcut icon" type="icon" href="./assets/favicon.0d253ced.ico" />
<script type="module" crossorigin src="./assets/index.d8f54146.js"></script>
<script type="module" crossorigin src="./assets/index.4a434b56.js"></script>
<link rel="stylesheet" href="./assets/index.8ee30fa0.css">
<script type="module">try{import.meta.url;import("_").catch(()=>1);}catch(e){}window.__vite_is_modern_browser=true;</script>
<script type="module">!function(){if(window.__vite_is_modern_browser)return;console.warn("vite: loading legacy build because dynamic import or import.meta.url is unsupported, syntax error above should be ignored");var e=document.getElementById("vite-legacy-polyfill"),n=document.createElement("script");n.src=e.src,n.onload=function(){System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))},document.body.appendChild(n)}();</script>
@ -19,7 +19,7 @@
<script nomodule>!function(){var e=document,t=e.createElement("script");if(!("noModule"in t)&&"onbeforeload"in t){var n=!1;e.addEventListener("beforeload",(function(e){if(e.target===t)n=!0;else if(!e.target.hasAttribute("nomodule")||!n)return;e.preventDefault()}),!0),t.type="module",t.src=".",e.head.appendChild(t),t.remove()}}();</script>
<script nomodule crossorigin id="vite-legacy-polyfill" src="./assets/polyfills-legacy-dde3a68a.js"></script>
<script nomodule crossorigin id="vite-legacy-entry" data-src="./assets/index-legacy-f27062cd.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
<script nomodule crossorigin id="vite-legacy-entry" data-src="./assets/index-legacy-1d92538f.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
</body>
</html>

4
frontend/src/features/gallery/components/CurrentImageButtons.tsx
View File

@ -256,7 +256,7 @@ const CurrentImageButtons = () => {
};
useHotkeys(
'u',
'Shift+U',
() => {
if (
isESRGANAvailable &&
@ -290,7 +290,7 @@ const CurrentImageButtons = () => {
};
useHotkeys(
'r',
'Shift+R',
() => {
if (
isGFPGANAvailable &&

14
frontend/src/features/system/components/HotkeysModal/HotkeysModal.tsx
View File

@ -93,8 +93,12 @@ export default function HotkeysModal({ children }: HotkeysModalProps) {
desc: 'Use all parameters of the current image',
hotkey: 'A',
},
{ title: 'Restore Faces', desc: 'Restore the current image', hotkey: 'R' },
{ title: 'Upscale', desc: 'Upscale the current image', hotkey: 'U' },
{
title: 'Restore Faces',
desc: 'Restore the current image',
hotkey: 'Shift+R',
},
{ title: 'Upscale', desc: 'Upscale the current image', hotkey: 'Shift+U' },
{
title: 'Show Info',
desc: 'Show metadata info of the current image',
@ -254,17 +258,17 @@ export default function HotkeysModal({ children }: HotkeysModalProps) {
hotkey: 'R',
},
{
title: 'Previous Image',
title: 'Previous Staging Image',
desc: 'Previous Staging Area Image',
hotkey: 'Arrow Left',
},
{
title: 'Next Image',
title: 'Next Staging Image',
desc: 'Next Staging Area Image',
hotkey: 'Arrow Right',
},
{
title: 'Accept Image',
title: 'Accept Staging Image',
desc: 'Accept Current Staging Area Image',
hotkey: 'Enter',
},

6
installer/install.sh.in
View File

@ -110,12 +110,6 @@ if [ -z "$PYTHON" ]; then
exit -1
fi
if [ "$OS_NAME" == "osx" ]; then
xcode_path=$(xcode-select --print-path)
_err_exit $? "xcode_path command not found"
export CPPFLAGS="-I$xcode_path/Library/Frameworks/Python3.framework/Versions/Current/Headers"
echo "Will compile wheels with CPPFLAGS=$CPPFLAGS"
fi
ROOTDIR=""
while [ "$ROOTDIR" == "" ]

13
tests/preflight_prompts.txt
View File

@ -1,9 +1,4 @@
banana sushi -Ak_lms -S42
banana sushi -Addim -S42
banana sushi -Ak_lms -W640 -H480 -S42
banana sushi -Ak_lms -S42 -G1 -U 2 0.5
banana sushi -Ak_lms -S42 -v0.2 -n3
banana sushi -Ak_lms -S42 -V1349749425:0.1,4145759947:0.1
snake -I outputs/preflight/000006.4145759947.png -S42
snake -I outputs/preflight/000006.4145759947.png -S42 -W640 -H640 --fit
strawberry sushi -I./image-and-mask.png -S42 -f0.9 -s100 -C15
banana sushi -Ak_lms -W640 -H480 -S42 -s20
banana sushi -Ak_lms -S42 -G1 -U 2 0.5 -s20
banana sushi -Ak_lms -S42 -v0.2 -n3 -s20
banana sushi -Ak_lms -S42 -V1349749425:0.1,4145759947:0.1 -s20