feat(ui): improve session creation handling

invokeai/frontend/web/public/locales/en.json

@@ -546,6 +546,7 @@
         "availableSchedulers": "Available Schedulers"
     },
     "toast": {
+        "problemCreatingSession": "Problem Creating Session",
         "serverError": "Server Error",
         "disconnected": "Disconnected from Server",
         "connected": "Connected to Server",

invokeai/frontend/web/src/app/store/middleware/listenerMiddleware/index.ts

@@ -44,6 +44,11 @@ import {
   addImageUrlsReceivedFulfilledListener,
   addImageUrlsReceivedRejectedListener,
 } from './listeners/imageUrlsReceived';
+import {
+  addSessionCreatedFulfilledListener,
+  addSessionCreatedPendingListener,
+  addSessionCreatedRejectedListener,
+} from './listeners/sessionCreated';
 
 export const listenerMiddleware = createListenerMiddleware();
 
@@ -106,3 +111,8 @@ addSocketConnectedListener();
 addSocketDisconnectedListener();
 addSocketSubscribedListener();
 addSocketUnsubscribedListener();
+
+// Sessions
+addSessionCreatedPendingListener();
+addSessionCreatedFulfilledListener();
+addSessionCreatedRejectedListener();

invokeai/frontend/web/src/app/store/middleware/listenerMiddleware/listeners/sessionCreated.ts

@@ -0,0 +1,45 @@
+import { log } from 'app/logging/useLogger';
+import { startAppListening } from '..';
+import { sessionCreated } from 'services/thunks/session';
+import { serializeError } from 'serialize-error';
+
+const moduleLog = log.child({ namespace: 'session' });
+
+export const addSessionCreatedPendingListener = () => {
+  startAppListening({
+    actionCreator: sessionCreated.pending,
+    effect: (action, { getState, dispatch }) => {
+      //
+    },
+  });
+};
+
+export const addSessionCreatedFulfilledListener = () => {
+  startAppListening({
+    actionCreator: sessionCreated.fulfilled,
+    effect: (action, { getState, dispatch }) => {
+      const session = action.payload;
+      moduleLog.info({ data: { session } }, `Session created (${session.id})`);
+    },
+  });
+};
+
+export const addSessionCreatedRejectedListener = () => {
+  startAppListening({
+    actionCreator: sessionCreated.rejected,
+    effect: (action, { getState, dispatch }) => {
+      if (action.payload) {
+        const { arg, error } = action.payload;
+        moduleLog.error(
+          {
+            data: {
+              arg,
+              error: serializeError(error),
+            },
+          },
+          `Problem creating session`
+        );
+      }
+    },
+  });
+};

invokeai/frontend/web/src/features/system/store/systemSlice.ts

@@ -16,7 +16,11 @@ import {
 
 import { ProgressImage } from 'services/events/types';
 import { makeToast } from '../../../app/components/Toaster';
-import { sessionCanceled, sessionInvoked } from 'services/thunks/session';
+import {
+  sessionCanceled,
+  sessionCreated,
+  sessionInvoked,
+} from 'services/thunks/session';
 import { receivedModels } from 'services/thunks/model';
 import { parsedOpenAPISchema } from 'features/nodes/store/nodesSlice';
 import { LogLevelName } from 'roarr';
@@ -353,7 +357,7 @@ export const systemSlice = createSlice({
     });
 
     /**
-     * Session Canceled
+     * Session Canceled - FULFILLED
      */
     builder.addCase(sessionCanceled.fulfilled, (state, action) => {
       state.canceledSession = action.meta.arg.sessionId;
@@ -370,6 +374,23 @@ export const systemSlice = createSlice({
       );
     });
 
+    /**
+     * Session Created - REJECTED
+     */
+    builder.addCase(sessionCreated.rejected, (state, action) => {
+      state.isProcessing = false;
+      state.isCancelable = false;
+      state.isCancelScheduled = false;
+      state.currentStep = 0;
+      state.totalSteps = 0;
+      state.statusTranslationKey = 'common.statusConnected';
+      state.progressImage = null;
+
+      state.toastQueue.push(
+        makeToast({ title: t('toast.problemCreatingSession'), status: 'error' })
+      );
+    });
+
     /**
      * Session Canceled
      */

invokeai/frontend/web/src/services/events/middleware.ts

@@ -8,11 +8,7 @@ import {
 import { socketSubscribed, socketUnsubscribed } from './actions';
 import { AppThunkDispatch, RootState } from 'app/store/store';
 import { getTimestamp } from 'common/util/getTimestamp';
-import {
+import { sessionCreated } from 'services/thunks/session';
-  sessionInvoked,
-  sessionCreated,
-  sessionWithoutGraphCreated,
-} from 'services/thunks/session';
 import { OpenAPI } from 'services/api';
 import { setEventListeners } from 'services/events/util/setEventListeners';
 import { log } from 'app/logging/useLogger';
@@ -66,10 +62,7 @@ export const socketMiddleware = () => {
         socket.connect();
       }
 
-      if (
+      if (sessionCreated.fulfilled.match(action)) {
-        sessionCreated.fulfilled.match(action) ||
-        sessionWithoutGraphCreated.fulfilled.match(action)
-      ) {
         const sessionId = action.payload.id;
         const oldSessionId = getState().system.sessionId;
 

invokeai/frontend/web/src/services/thunks/session.ts

@@ -1,7 +1,6 @@
 import { createAppAsyncThunk } from 'app/store/storeUtils';
-import { SessionsService } from 'services/api';
+import { GraphExecutionState, SessionsService } from 'services/api';
 import { log } from 'app/logging/useLogger';
-import { serializeError } from 'serialize-error';
 
 const sessionLog = log.child({ namespace: 'session' });
 
@@ -11,51 +10,27 @@ type SessionCreatedArg = {
   >[0]['requestBody'];
 };
 
+type SessionCreatedThunkConfig = {
+  rejectValue: { arg: SessionCreatedArg; error: unknown };
+};
+
 /**
  * `SessionsService.createSession()` thunk
  */
-export const sessionCreated = createAppAsyncThunk(
+export const sessionCreated = createAppAsyncThunk<
-  'api/sessionCreated',
+  GraphExecutionState,
-  async (arg: SessionCreatedArg, { rejectWithValue }) => {
+  SessionCreatedArg,
+  SessionCreatedThunkConfig
+>('api/sessionCreated', async (arg: SessionCreatedArg, { rejectWithValue }) => {
   try {
     const response = await SessionsService.createSession({
       requestBody: arg.graph,
     });
-      sessionLog.info({ arg, response }, `Session created (${response.id})`);
     return response;
-    } catch (err: any) {
+  } catch (error) {
-      sessionLog.error(
+    return rejectWithValue({ arg, error });
-        {
-          error: serializeError(err),
-        },
-        'Problem creating session'
-      );
-      return rejectWithValue(err.message);
   }
-  }
+});
-);
-
-/**
- * `SessionsService.createSession()` without graph thunk
- */
-export const sessionWithoutGraphCreated = createAppAsyncThunk(
-  'api/sessionWithoutGraphCreated',
-  async (_, { rejectWithValue }) => {
-    try {
-      const response = await SessionsService.createSession({});
-      sessionLog.info({ response }, `Session created (${response.id})`);
-      return response;
-    } catch (err: any) {
-      sessionLog.error(
-        {
-          error: serializeError(err),
-        },
-        'Problem creating session'
-      );
-      return rejectWithValue(err.message);
-    }
-  }
-);
 
 type NodeAddedArg = Parameters<(typeof SessionsService)['addNode']>[0];