Skip to content

Commit dac3c15

Browse files
committed
Merge branch 'main' into feat/preview_predicted_x0
- resolve conflicts with generate.py invocation - remove unused symbols that pyflakes complains about - add **untested** code for passing intermediate latent image to the step callback in the format expected.
2 parents 288cee9 + 17d8bbf commit dac3c15

96 files changed

Lines changed: 1232 additions & 937 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.coveragerc

Lines changed: 0 additions & 6 deletions
This file was deleted.

.github/CODEOWNERS

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
# continuous integration
2-
/.github/workflows/ @mauwii @lstein
2+
/.github/workflows/ @mauwii @lstein @blessedcoolant
33

44
# documentation
5-
/docs/ @lstein @mauwii @tildebyte
6-
/mkdocs.yml @lstein @mauwii
5+
/docs/ @lstein @mauwii @tildebyte @blessedcoolant
6+
/mkdocs.yml @lstein @mauwii @blessedcoolant
77

88
# nodes
99
/invokeai/app/ @Kyle0654 @blessedcoolant
1010

1111
# installation and configuration
1212
/pyproject.toml @mauwii @lstein @blessedcoolant
13-
/docker/ @mauwii @lstein
13+
/docker/ @mauwii @lstein @blessedcoolant
1414
/scripts/ @ebr @lstein
1515
/installer/ @lstein @ebr
1616
/invokeai/assets @lstein @ebr

.github/ISSUE_TEMPLATE/BUG_REPORT.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,16 @@ body:
6565
placeholder: 8GB
6666
validations:
6767
required: false
68+
69+
- type: input
70+
id: version-number
71+
attributes:
72+
label: What version did you experience this issue on?
73+
description: |
74+
Please share the version of Invoke AI that you experienced the issue on. If this is not the latest version, please update first to confirm the issue still exists. If you are testing main, please include the commit hash instead.
75+
placeholder: X.X.X
76+
validations:
77+
required: true
6878

6979
- type: textarea
7080
id: what-happened

.github/workflows/build-container.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,9 @@ on:
1616
- 'v*.*.*'
1717
workflow_dispatch:
1818

19+
permissions:
20+
contents: write
21+
1922
jobs:
2023
docker:
2124
if: github.event.pull_request.draft == false

.github/workflows/mkdocs-material.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@ on:
55
- 'main'
66
- 'development'
77

8+
permissions:
9+
contents: write
10+
811
jobs:
912
mkdocs-material:
1013
if: github.event.pull_request.draft == false

.github/workflows/test-invoke-pip-skip.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ on:
66
- '!pyproject.toml'
77
- '!invokeai/**'
88
- 'invokeai/frontend/web/**'
9-
- '!invokeai/frontend/web/dist/**'
109
merge_group:
1110
workflow_dispatch:
1211

.github/workflows/test-invoke-pip.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,11 @@ on:
77
- 'pyproject.toml'
88
- 'invokeai/**'
99
- '!invokeai/frontend/web/**'
10-
- 'invokeai/frontend/web/dist/**'
1110
pull_request:
1211
paths:
1312
- 'pyproject.toml'
1413
- 'invokeai/**'
1514
- '!invokeai/frontend/web/**'
16-
- 'invokeai/frontend/web/dist/**'
1715
types:
1816
- 'ready_for_review'
1917
- 'opened'

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ pip-delete-this-directory.txt
6363
htmlcov/
6464
.tox/
6565
.nox/
66+
.coveragerc
6667
.coverage
6768
.coverage.*
6869
.cache
@@ -73,6 +74,7 @@ cov.xml
7374
*.py,cover
7475
.hypothesis/
7576
.pytest_cache/
77+
.pytest.ini
7678
cover/
7779
junit/
7880

.pytest.ini

Lines changed: 0 additions & 5 deletions
This file was deleted.

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ not supported.
139139
_For Windows/Linux with an NVIDIA GPU:_
140140
141141
```terminal
142-
pip install InvokeAI[xformers] --use-pep517 --extra-index-url https://download.pytorch.org/whl/cu117
142+
pip install "InvokeAI[xformers]" --use-pep517 --extra-index-url https://download.pytorch.org/whl/cu117
143143
```
144144
145145
_For Linux with an AMD GPU:_

0 commit comments

Comments
 (0)