From 0cad204e7493e44770a73df865dd3d71de4468f5 Mon Sep 17 00:00:00 2001
From: psychedelicious <4822129+psychedelicious@users.noreply.github.com>
Date: Sat, 29 Apr 2023 19:10:32 +1000
Subject: [PATCH] feat(ui): add error handling for linear graph generation

---
 invokeai/frontend/web/package.json            |  1 +
 .../web/src/services/thunks/session.ts        | 37 +++++++++++++------
 invokeai/frontend/web/yarn.lock               | 12 ++++++
 3 files changed, 38 insertions(+), 12 deletions(-)

diff --git a/invokeai/frontend/web/package.json b/invokeai/frontend/web/package.json
index 6ee6a9c8f4..684c56451c 100644
--- a/invokeai/frontend/web/package.json
+++ b/invokeai/frontend/web/package.json
@@ -95,6 +95,7 @@
     "redux-dynamic-middlewares": "^2.2.0",
     "redux-persist": "^6.0.0",
     "roarr": "^7.15.0",
+    "serialize-error": "^11.0.0",
     "socket.io-client": "^4.6.0",
     "use-image": "^1.1.0",
     "uuid": "^9.0.0"
diff --git a/invokeai/frontend/web/src/services/thunks/session.ts b/invokeai/frontend/web/src/services/thunks/session.ts
index 0641437d52..af03045967 100644
--- a/invokeai/frontend/web/src/services/thunks/session.ts
+++ b/invokeai/frontend/web/src/services/thunks/session.ts
@@ -4,28 +4,41 @@ import { buildLinearGraph as buildGenerateGraph } from 'features/nodes/util/line
 import { isAnyOf, isFulfilled } from '@reduxjs/toolkit';
 import { buildNodesGraph } from 'features/nodes/util/nodesGraphBuilder/buildNodesGraph';
 import { log } from 'app/logging/useLogger';
+import { serializeError } from 'serialize-error';
 
 const sessionLog = log.child({ namespace: 'session' });
 
 export const generateGraphBuilt = createAppAsyncThunk(
   'api/generateGraphBuilt',
-  async (_, { dispatch, getState }) => {
-    const graph = buildGenerateGraph(getState());
-
-    dispatch(sessionCreated({ graph }));
-
-    return graph;
+  async (_, { dispatch, getState, rejectWithValue }) => {
+    try {
+      const graph = buildGenerateGraph(getState());
+      dispatch(sessionCreated({ graph }));
+      return graph;
+    } catch (err: any) {
+      sessionLog.error(
+        { error: serializeError(err) },
+        'Problem building graph'
+      );
+      return rejectWithValue(err.message);
+    }
   }
 );
 
 export const nodesGraphBuilt = createAppAsyncThunk(
   'api/nodesGraphBuilt',
-  async (_, { dispatch, getState }) => {
-    const graph = buildNodesGraph(getState());
-
-    dispatch(sessionCreated({ graph }));
-
-    return graph;
+  async (_, { dispatch, getState, rejectWithValue }) => {
+    try {
+      const graph = buildNodesGraph(getState());
+      dispatch(sessionCreated({ graph }));
+      return graph;
+    } catch (err: any) {
+      sessionLog.error(
+        { error: serializeError(err) },
+        'Problem building graph'
+      );
+      return rejectWithValue(err.message);
+    }
   }
 );
 
diff --git a/invokeai/frontend/web/yarn.lock b/invokeai/frontend/web/yarn.lock
index f117d4f2de..bece7f0829 100644
--- a/invokeai/frontend/web/yarn.lock
+++ b/invokeai/frontend/web/yarn.lock
@@ -5779,6 +5779,13 @@ semver@~7.3.0:
   dependencies:
     lru-cache "^6.0.0"
 
+serialize-error@^11.0.0:
+  version "11.0.0"
+  resolved "https://registry.yarnpkg.com/serialize-error/-/serialize-error-11.0.0.tgz#0129f2b07b19b09bc7a5f2d850ffe9cd2d561582"
+  integrity sha512-YKrURWDqcT3VGX/s/pCwaWtpfJEEaEw5Y4gAnQDku92b/HjVj4r4UhA5QrMVMFotymK2wIWs5xthny5SMFu7Vw==
+  dependencies:
+    type-fest "^2.12.2"
+
 shebang-command@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-2.0.0.tgz#ccd0af4f8835fbdc265b82461aaf0c36663f34ea"
@@ -6253,6 +6260,11 @@ type-fest@^0.21.3:
   resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.21.3.tgz#d260a24b0198436e133fa26a524a6d65fa3b2e37"
   integrity sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==
 
+type-fest@^2.12.2:
+  version "2.19.0"
+  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-2.19.0.tgz#88068015bb33036a598b952e55e9311a60fd3a9b"
+  integrity sha512-RAH822pAdBgcNMAfWnCBU3CFZcfZ/i1eZjwFU/dsLKumyuuP3niueg2UAukXYF0E2AAoc82ZSSf9J0WQBinzHA==
+
 typed-array-length@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/typed-array-length/-/typed-array-length-1.0.4.tgz#89d83785e5c4098bec72e08b319651f0eac9c1bb"