Skip to content

Feature/Prevent custom error message override rate limit err message #293

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
HenryHengZJ merged 2 commits into from
Feb 17, 2025
Merged

Feature/Prevent custom error message override rate limit err message #293

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
690f868
prevent custom error message override rate limit err message
HenryHengZJ Feb 17, 2025
46f9b5b
prevent custom error message override rate limit err message
HenryHengZJ Feb 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion dist/components/Bot.d.ts.map
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/web.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/web.umd.js
View file
Open in desktop

Large diffs are not rendered by default.

12 changes: 8 additions & 4 deletions src/components/Bot.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -475,9 +475,13 @@ export const Bot = (botProps: BotProps & { class?: string }) => {
};

// Handle errors
const handleError = (message = 'Oops! There seems to be an error. Please try again.') => {
const handleError = (message = 'Oops! There seems to be an error. Please try again.', preventOverride?: boolean) => {
let errMessage = message;
if (!preventOverride && props.errorMessage) {
errMessage = props.errorMessage;
}
setMessages((prevMessages) => {
const messages: MessageType[] = [...prevMessages, { message: props.errorMessage || message, type: 'apiMessage' }];
const messages: MessageType[] = [...prevMessages, { message: errMessage, type: 'apiMessage' }];
addChatMessage(messages);
return messages;
});
Expand Down Expand Up @@ -558,7 +562,7 @@ export const Bot = (botProps: BotProps & { class?: string }) => {
return; // everything's good
} else if (response.status === 429) {
const errMessage = (await response.text()) ?? 'Too many requests. Please try again later.';
handleError(errMessage);
handleError(errMessage, true);
throw new Error(errMessage);
} else if (response.status === 403) {
const errMessage = (await response.text()) ?? 'Unauthorized';
Expand Down Expand Up @@ -750,7 +754,7 @@ export const Bot = (botProps: BotProps & { class?: string }) => {
try {
uploads = await handleFileUploads(uploads);
} catch (error) {
handleError('Unable to upload documents');
handleError('Unable to upload documents', true);
return;
}

Expand Down