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 'main' into release/make-web-dist-startable

Browse Source
This commit is contained in:
psychedelicious 2023-05-26 18:04:09 +10:00 committed by GitHub
commit e1c85f1234
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
invokeai/frontend/web/src/app/store/middleware/listenerMiddleware/listeners/socketio/invocationComplete.ts
View File

@ -8,6 +8,7 @@ import {
} from 'services/thunks/image'; } from 'services/thunks/image';
import { sessionCanceled } from 'services/thunks/session'; import { sessionCanceled } from 'services/thunks/session';
import { isImageOutput } from 'services/types/guards'; import { isImageOutput } from 'services/types/guards';
import { progressImageSet } from 'features/system/store/systemSlice';
const moduleLog = log.child({ namespace: 'socketio' }); const moduleLog = log.child({ namespace: 'socketio' });
const nodeDenylist = ['dataURL_image']; const nodeDenylist = ['dataURL_image'];
@ -37,12 +38,6 @@ export const addInvocationCompleteListener = () => {
if (isImageOutput(result) && !nodeDenylist.includes(node.type)) { if (isImageOutput(result) && !nodeDenylist.includes(node.type)) {
const { image_name, image_type } = result.image; const { image_name, image_type } = result.image;
// Get its URLS
// TODO: is this extraneous? I think so...
dispatch(
imageUrlsReceived({ imageName: image_name, imageType: image_type })
);
// Get its metadata // Get its metadata
dispatch( dispatch(
imageMetadataReceived({ imageMetadataReceived({
@ -65,6 +60,8 @@ export const addInvocationCompleteListener = () => {
); );
dispatch(addImageToStagingArea(image)); dispatch(addImageToStagingArea(image));
} }
dispatch(progressImageSet(null));
} }
}, },
}); });

5
invokeai/frontend/web/src/features/system/store/systemSlice.ts
View File

@ -215,6 +215,9 @@ export const systemSlice = createSlice({
languageChanged: (state, action: PayloadAction<keyof typeof LANGUAGES>) => { languageChanged: (state, action: PayloadAction<keyof typeof LANGUAGES>) => {
state.language = action.payload; state.language = action.payload;
}, },
progressImageSet(state, action: PayloadAction<ProgressImage | null>) {
state.progressImage = action.payload;
},
}, },
extraReducers(builder) { extraReducers(builder) {
/** /**
@ -305,7 +308,6 @@ export const systemSlice = createSlice({
state.currentStep = 0; state.currentStep = 0;
state.totalSteps = 0; state.totalSteps = 0;
state.statusTranslationKey = 'common.statusProcessingComplete'; state.statusTranslationKey = 'common.statusProcessingComplete';
state.progressImage = null;
if (state.canceledSession === data.graph_execution_state_id) { if (state.canceledSession === data.graph_execution_state_id) {
state.isProcessing = false; state.isProcessing = false;
@ -438,6 +440,7 @@ export const {
isPersistedChanged, isPersistedChanged,
shouldAntialiasProgressImageChanged, shouldAntialiasProgressImageChanged,
languageChanged, languageChanged,
progressImageSet,
} = systemSlice.actions; } = systemSlice.actions;
export default systemSlice.reducer; export default systemSlice.reducer;