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

feat(ui): improve log messages

Browse Source
This commit is contained in:
psychedelicious
2023-04-29 17:20:49 +10:00
parent a4c258e9ec
commit bffdede0fa
8 changed files with 55 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
invokeai/frontend/web/src/services/events/actions.ts
View File

@ -1,6 +1,7 @@
import { createAction } from '@reduxjs/toolkit';
import {
GeneratorProgressEvent,
GraphExecutionStateCompleteEvent,
InvocationCompleteEvent,
InvocationErrorEvent,
InvocationStartedEvent,
@ -45,6 +46,10 @@ export const invocationError = createAction<
BaseSocketPayload & { data: InvocationErrorEvent }
>('socket/invocationError');
export const graphExecutionStateComplete = createAction<
BaseSocketPayload & { data: GraphExecutionStateCompleteEvent }
>('socket/graphExecutionStateComplete');
export const generatorProgress = createAction<
BaseSocketPayload & { data: GeneratorProgressEvent }
>('socket/generatorProgress');

13
invokeai/frontend/web/src/services/events/middleware.ts
View File

@ -118,7 +118,9 @@ export const socketMiddleware = () => {
if (system.sessionId) {
const sessionLog = moduleLog.child({ sessionId: system.sessionId });
sessionLog.debug('Re-subscribe');
sessionLog.debug(
`Subscribed to existing session (${system.sessionId})`
);
socket.emit('subscribe', { session: system.sessionId });
dispatch(
@ -158,9 +160,10 @@ export const socketMiddleware = () => {
// };
if (oldSessionId) {
sessionLog
.child({ oldSessionId })
.debug('Unsubscribe from old session');
sessionLog.debug(
{ oldSessionId },
`Unsubscribed from old session (${oldSessionId})`
);
// Unsubscribe when invocations complete
socket.emit('unsubscribe', {
session: oldSessionId,
@ -185,7 +188,7 @@ export const socketMiddleware = () => {
});
}
sessionLog.debug('Subscribe');
sessionLog.debug(`Subscribe to new session (${sessionId})`);
socket.emit('subscribe', { session: sessionId });
dispatch(
socketSubscribed({

18
invokeai/frontend/web/src/services/events/util/setEventListeners.ts
View File

@ -5,6 +5,7 @@ import { sessionCanceled } from 'services/thunks/session';
import { Socket } from 'socket.io-client';
import {
generatorProgress,
graphExecutionStateComplete,
invocationComplete,
invocationError,
invocationStarted,
@ -24,22 +25,22 @@ export const setEventListeners = (arg: SetEventListenersArg) => {
const { dispatch, getState } = store;
// Set up listeners for the present subscription
socket.on('invocation_started', (data) => {
sessionLog.child({ data }).info('Invocation started');
sessionLog.child({ data }).info(`Invocation started (${data.node.type})`);
dispatch(invocationStarted({ data, timestamp: getTimestamp() }));
});
socket.on('generator_progress', (data) => {
sessionLog.child({ data }).trace('Generator progress');
sessionLog.child({ data }).trace(`Generator progress (${data.node.type})`);
dispatch(generatorProgress({ data, timestamp: getTimestamp() }));
});
socket.on('invocation_error', (data) => {
sessionLog.child({ data }).error('Invocation error');
sessionLog.child({ data }).error(`Invocation error (${data.node.type})`);
dispatch(invocationError({ data, timestamp: getTimestamp() }));
});
socket.on('invocation_complete', (data) => {
sessionLog.child({ data }).info('Invocation complete');
sessionLog.child({ data }).info(`Invocation complete (${data.node.type})`);
const sessionId = data.graph_execution_state_id;
const { cancelType, isCancelScheduled } = getState().system;
@ -58,4 +59,13 @@ export const setEventListeners = (arg: SetEventListenersArg) => {
})
);
});
socket.on('graph_execution_state_complete', (data) => {
sessionLog
.child({ data })
.info(
`Graph execution state complete (${data.graph_execution_state_id})`
);
dispatch(graphExecutionStateComplete({ data, timestamp: getTimestamp() }));
});
};