fix: error handling in frontend

Azure-Samples · Apr 4, 2024 · 9f53ec7 · 9f53ec7
1 parent c8e7b56
commit 9f53ec7
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 7 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -9,4 +9,4 @@
       "preLaunchTask": "func: host start"
     }
   ]
-}
+}
diff --git a/packages/webapp/src/api.ts b/packages/webapp/src/api.ts
@@ -13,16 +13,21 @@ export async function getCompletion(options: ChatRequestOptions) {
     }),
   });
 
-  if (options.stream) {
-    return getChunksFromResponse<ChatResponseChunk>(response, options.chunkIntervalMs);
+  if (response.status > 299 || !response.ok) {
+    let json: ChatResponse | undefined;
+    try {
+      json = await response.json();
+    } catch {}
+
+    const error = json?.error ?? response.statusText;
+    throw new Error(error);
   }
 
-  const json: ChatResponse = await response.json();
-  if (response.status > 299 || !response.ok) {
-    throw new Error(json.error ?? 'Unknown error');
+  if (options.stream) {
+    return getChunksFromResponse<ChatResponseChunk>(response, options.chunkIntervalMs);
   }
 
-  return json;
+  return response.json();
 }
 
 export function getCitationUrl(citation: string): string {