Merge branch 'main' into alexw/tlk-801-when-i-fill-in-the-env-variabl…

…es-i-dont-know-if-its-been

src/interfaces/assistants_web/src/cohere-client/client.ts

@@ -134,7 +134,24 @@ export class CohereClient {
       body: requestBody,
       signal,
       openWhenHidden: true, // When false, the requests will be paused when the tab is hidden and resume/retry when the tab is visible again
-      onopen: onOpen,
+      onopen: async (response: Response) => {
+        if (
+          response.status !== 200 &&
+          response.headers.get('content-type')?.includes('application/json')
+        ) {
+          await response
+            .json()
+            .catch((e) => {
+              throw new CohereNetworkError('Failed to decode error message JSON', response.status);
+            })
+            .then((data) => {
+              throw new CohereNetworkError(data.detail, response.status);
+            });
+        }
+        if (onOpen) {
+          onOpen(response);
+        }
+      },
       onmessage: onMessage,
       onclose: onClose,
       onerror: onError,

src/interfaces/assistants_web/src/components/MessageRow/MessageContent.tsx

@@ -39,7 +39,7 @@ export const MessageContent: React.FC<Props> = ({ isLast, message, onRetry }) =>
         <MessageInfo type="error">
           {message.error}
           {isLast && (
-            <button className="underline underline-offset-1" type="button" onClick={onRetry}>
+            <button className="ml-2 underline underline-offset-1" type="button" onClick={onRetry}>
               Retry?
             </button>
           )}