Skip to content

Commit 4dced15

Browse files
authored
Merge pull request #293 from FlowiseAI/feature/Prevent-Custom-Error-Message-Override
Feature/Prevent custom error message override rate limit err message
2 parents 0a59919 + 46f9b5b commit 4dced15

4 files changed

Lines changed: 11 additions & 7 deletions

File tree

dist/components/Bot.d.ts.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/web.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/web.umd.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/components/Bot.tsx

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -475,9 +475,13 @@ export const Bot = (botProps: BotProps & { class?: string }) => {
475475
};
476476

477477
// Handle errors
478-
const handleError = (message = 'Oops! There seems to be an error. Please try again.') => {
478+
const handleError = (message = 'Oops! There seems to be an error. Please try again.', preventOverride?: boolean) => {
479+
let errMessage = message;
480+
if (!preventOverride && props.errorMessage) {
481+
errMessage = props.errorMessage;
482+
}
479483
setMessages((prevMessages) => {
480-
const messages: MessageType[] = [...prevMessages, { message: props.errorMessage || message, type: 'apiMessage' }];
484+
const messages: MessageType[] = [...prevMessages, { message: errMessage, type: 'apiMessage' }];
481485
addChatMessage(messages);
482486
return messages;
483487
});
@@ -558,7 +562,7 @@ export const Bot = (botProps: BotProps & { class?: string }) => {
558562
return; // everything's good
559563
} else if (response.status === 429) {
560564
const errMessage = (await response.text()) ?? 'Too many requests. Please try again later.';
561-
handleError(errMessage);
565+
handleError(errMessage, true);
562566
throw new Error(errMessage);
563567
} else if (response.status === 403) {
564568
const errMessage = (await response.text()) ?? 'Unauthorized';
@@ -750,7 +754,7 @@ export const Bot = (botProps: BotProps & { class?: string }) => {
750754
try {
751755
uploads = await handleFileUploads(uploads);
752756
} catch (error) {
753-
handleError('Unable to upload documents');
757+
handleError('Unable to upload documents', true);
754758
return;
755759
}
756760

0 commit comments

Comments
 (0)