diff --git a/invokeai/frontend/web/public/locales/en.json b/invokeai/frontend/web/public/locales/en.json index a27ca4e36d..7a73bae411 100644 --- a/invokeai/frontend/web/public/locales/en.json +++ b/invokeai/frontend/web/public/locales/en.json @@ -551,7 +551,6 @@ }, "toast": { "serverError": "Server Error", - "serverWarning": "Server Warning", "disconnected": "Disconnected from Server", "connected": "Connected to Server", "canceled": "Processing Canceled", diff --git a/invokeai/frontend/web/src/app/store/middleware/listenerMiddleware/index.ts b/invokeai/frontend/web/src/app/store/middleware/listenerMiddleware/index.ts index e230a83112..8c073e81d6 100644 --- a/invokeai/frontend/web/src/app/store/middleware/listenerMiddleware/index.ts +++ b/invokeai/frontend/web/src/app/store/middleware/listenerMiddleware/index.ts @@ -73,7 +73,6 @@ import { addImageCategoriesChangedListener } from './listeners/imageCategoriesCh import { addControlNetImageProcessedListener } from './listeners/controlNetImageProcessed'; import { addControlNetAutoProcessListener } from './listeners/controlNetAutoProcess'; import { addUpdateImageUrlsOnConnectListener } from './listeners/updateImageUrlsOnConnect'; -import { addInvocationWarningEventListener } from './listeners/socketio/socketInvocationWarning'; export const listenerMiddleware = createListenerMiddleware(); @@ -150,7 +149,6 @@ addGeneratorProgressListener(); addGraphExecutionStateCompleteListener(); addInvocationCompleteListener(); addInvocationErrorListener(); -addInvocationWarningEventListener(); addInvocationStartedListener(); addSocketConnectedListener(); addSocketDisconnectedListener(); diff --git a/invokeai/frontend/web/src/app/store/middleware/listenerMiddleware/listeners/socketio/socketInvocationWarning.ts b/invokeai/frontend/web/src/app/store/middleware/listenerMiddleware/listeners/socketio/socketInvocationWarning.ts deleted file mode 100644 index 51d1d08778..0000000000 --- a/invokeai/frontend/web/src/app/store/middleware/listenerMiddleware/listeners/socketio/socketInvocationWarning.ts +++ /dev/null @@ -1,21 +0,0 @@ -import { startAppListening } from '../..'; -import { log } from 'app/logging/useLogger'; -import { - appSocketInvocationWarning, - socketInvocationWarning, -} from 'services/events/actions'; - -const moduleLog = log.child({ namespace: 'socketio' }); - -export const addInvocationWarningEventListener = () => { - startAppListening({ - actionCreator: socketInvocationWarning, - effect: (action, { dispatch, getState }) => { - moduleLog.warn( - action.payload, - `Invocation warning (${action.payload.data.node.type})` - ); - dispatch(appSocketInvocationWarning(action.payload)); - }, - }); -}; diff --git a/invokeai/frontend/web/src/features/system/store/systemSlice.ts b/invokeai/frontend/web/src/features/system/store/systemSlice.ts index ae849a62a3..b17f497f6c 100644 --- a/invokeai/frontend/web/src/features/system/store/systemSlice.ts +++ b/invokeai/frontend/web/src/features/system/store/systemSlice.ts @@ -23,7 +23,6 @@ import { appSocketInvocationComplete, appSocketInvocationError, appSocketInvocationStarted, - appSocketInvocationWarning, appSocketSubscribed, appSocketUnsubscribed, } from 'services/events/actions'; @@ -335,20 +334,6 @@ export const systemSlice = createSlice({ ); }); - /** - * Invocation Warning - */ - builder.addCase(appSocketInvocationWarning, (state, action) => { - const { data } = action.payload; - state.toastQueue.push( - makeToast({ - title: t('toast.serverWarning'), - description: data.warning, - status: 'warning', - }) - ); - }); - /** * Graph Execution State Complete */ diff --git a/invokeai/frontend/web/src/features/ui/store/tabMap.ts b/invokeai/frontend/web/src/features/ui/store/tabMap.ts index 925f2c455d..becf52886e 100644 --- a/invokeai/frontend/web/src/features/ui/store/tabMap.ts +++ b/invokeai/frontend/web/src/features/ui/store/tabMap.ts @@ -6,7 +6,6 @@ export const tabMap = [ 'nodes', // 'postprocessing', // 'training', - 'prompt', ] as const; export type InvokeTabName = (typeof tabMap)[number]; diff --git a/invokeai/frontend/web/src/services/events/actions.ts b/invokeai/frontend/web/src/services/events/actions.ts index 31c77bb5ca..5832cb24b1 100644 --- a/invokeai/frontend/web/src/services/events/actions.ts +++ b/invokeai/frontend/web/src/services/events/actions.ts @@ -5,7 +5,6 @@ import { InvocationCompleteEvent, InvocationErrorEvent, InvocationStartedEvent, - InvocationWarningEvent, } from 'services/events/types'; // Common socket action payload data @@ -132,24 +131,6 @@ export const appSocketInvocationError = createAction< BaseSocketPayload & { data: InvocationErrorEvent } >('socket/appSocketInvocationError'); -/** - * Socket.IO Invocation Warning - * - * Do not use. Only for use in middleware. - */ -export const socketInvocationWarning = createAction< - BaseSocketPayload & { data: InvocationWarningEvent } ->('socket/socketInvocationWarning'); - -/** - * Socket.IO Invocation Warning - * - * Do not use. Only for use in middleware. - */ -export const appSocketInvocationWarning = createAction< - BaseSocketPayload & { data: InvocationWarningEvent } ->('socket/appSocketInvocationWarning'); - /** * Socket.IO Graph Execution State Complete * diff --git a/invokeai/frontend/web/src/services/events/types.ts b/invokeai/frontend/web/src/services/events/types.ts index fa50b867f7..2577b7fe92 100644 --- a/invokeai/frontend/web/src/services/events/types.ts +++ b/invokeai/frontend/web/src/services/events/types.ts @@ -63,18 +63,6 @@ export type InvocationErrorEvent = { error: string; }; -/** - * A `invocation_warning` socket.io event. - * - * @example socket.on('invocation_warning', (data: InvocationWarningEvent) => { ... } - */ -export type InvocationWarningEvent = { - graph_execution_state_id: string; - node: BaseNode; - source_node_id: string; - warning: string; -}; - /** * A `invocation_started` socket.io event. * @@ -107,7 +95,6 @@ export type ServerToClientEvents = { generator_progress: (payload: GeneratorProgressEvent) => void; invocation_complete: (payload: InvocationCompleteEvent) => void; invocation_error: (payload: InvocationErrorEvent) => void; - invocation_warning: (payload: InvocationWarningEvent) => void; invocation_started: (payload: InvocationStartedEvent) => void; graph_execution_state_complete: ( payload: GraphExecutionStateCompleteEvent diff --git a/invokeai/frontend/web/src/services/events/util/setEventListeners.ts b/invokeai/frontend/web/src/services/events/util/setEventListeners.ts index f97127d770..2c4cba510a 100644 --- a/invokeai/frontend/web/src/services/events/util/setEventListeners.ts +++ b/invokeai/frontend/web/src/services/events/util/setEventListeners.ts @@ -11,7 +11,6 @@ import { socketConnected, socketDisconnected, socketSubscribed, - socketInvocationWarning, } from '../actions'; import { ClientToServerEvents, ServerToClientEvents } from '../types'; import { Logger } from 'roarr'; @@ -95,13 +94,6 @@ export const setEventListeners = (arg: SetEventListenersArg) => { dispatch(socketInvocationError({ data, timestamp: getTimestamp() })); }); - /** - * Invocation warning - */ - socket.on('invocation_warning', (data) => { - dispatch(socketInvocationWarning({ data, timestamp: getTimestamp() })); - }); - /** * Invocation complete */