Mirrored_Repos/InvokeAI
1
0
Fork 0
mirror of https://github.com/invoke-ai/InvokeAI synced 2024-08-30 20:32:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'development' into vite-relative-paths

Browse Source
This commit is contained in:
Lincoln Stein 2022-10-20 22:12:52 -04:00 committed by GitHub
commit 9980c4baf9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 713 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

690
frontend/dist/assets/index.b06af007.js vendored Normal file
View File

File diff suppressed because one or more lines are too long

17
frontend/src/features/gallery/gallerySlice.ts
View File

@ -72,7 +72,13 @@ export const gallerySlice = createSlice({
}, },
addImage: (state, action: PayloadAction<InvokeAI.Image>) => { addImage: (state, action: PayloadAction<InvokeAI.Image>) => {
const newImage = action.payload; const newImage = action.payload;
const { uuid, mtime } = newImage; const { uuid, url, mtime } = newImage;
// Do not add duplicate images
if (state.images.find((i) => i.url === url && i.mtime === mtime)) {
return;
}
state.images.unshift(newImage); state.images.unshift(newImage);
state.currentImageUuid = uuid; state.currentImageUuid = uuid;
state.intermediateImage = undefined; state.intermediateImage = undefined;
@ -120,8 +126,15 @@ export const gallerySlice = createSlice({
) => { ) => {
const { images, areMoreImagesAvailable } = action.payload; const { images, areMoreImagesAvailable } = action.payload;
if (images.length > 0) { if (images.length > 0) {
// Filter images that already exist in the gallery
const newImages = images.filter(
(newImage) =>
!state.images.find(
(i) => i.url === newImage.url && i.mtime === newImage.mtime
)
);
state.images = state.images state.images = state.images
.concat(images) .concat(newImages)
.sort((a, b) => b.mtime - a.mtime); .sort((a, b) => b.mtime - a.mtime);
if (!state.currentImage) { if (!state.currentImage) {

2
frontend/src/features/options/MainOptions/MainCFGScale.tsx
View File

@ -15,7 +15,7 @@ export default function MainCFGScale() {
label="CFG Scale" label="CFG Scale"
step={0.5} step={0.5}
min={1} min={1}
max={200} max={30}
onChange={handleChangeCfgScale} onChange={handleChangeCfgScale}
value={cfgScale} value={cfgScale}
width={inputWidth} width={inputWidth}

2
ldm/generate.py
View File

@ -728,7 +728,7 @@ class Generate:
seed_everything(random.randrange(0, np.iinfo(np.uint32).max)) seed_everything(random.randrange(0, np.iinfo(np.uint32).max))
if self.embedding_path is not None: if self.embedding_path is not None:
model.embedding_manager.load( self.model.embedding_manager.load(
self.embedding_path, self.precision == 'float32' or self.precision == 'autocast' self.embedding_path, self.precision == 'float32' or self.precision == 'autocast'
) )

8
ldm/invoke/restoration/realesrgan.py
View File

@ -61,13 +61,17 @@ class ESRGAN():
f'>> Real-ESRGAN Upscaling seed:{seed} : scale:{upsampler_scale}x' f'>> Real-ESRGAN Upscaling seed:{seed} : scale:{upsampler_scale}x'
) )
# REALSRGAN expects a BGR np array; make array and flip channels
bgr_image_array = np.array(image, dtype=np.uint8)[...,::-1]
output, _ = upsampler.enhance( output, _ = upsampler.enhance(
np.array(image, dtype=np.uint8), bgr_image_array,
outscale=upsampler_scale, outscale=upsampler_scale,
alpha_upsampler='realesrgan', alpha_upsampler='realesrgan',
) )
res = Image.fromarray(output) # Flip the channels back to RGB
res = Image.fromarray(output[...,::-1])
if strength < 1.0: if strength < 1.0:
# Resize the image to the new image if the sizes have changed # Resize the image to the new image if the sizes have changed