diff --git a/src/renderer/src/pages/home/Messages/Blocks/ErrorBlock.tsx b/src/renderer/src/pages/home/Messages/Blocks/ErrorBlock.tsx index f55a3ab6b1..5a1f597ede 100644 --- a/src/renderer/src/pages/home/Messages/Blocks/ErrorBlock.tsx +++ b/src/renderer/src/pages/home/Messages/Blocks/ErrorBlock.tsx @@ -11,22 +11,25 @@ interface Props { const ErrorBlock: React.FC = ({ block }) => { return } + const MessageErrorInfo: React.FC<{ block: ErrorMessageBlock }> = ({ block }) => { const { t, i18n } = useTranslation() const HTTP_ERROR_CODES = [400, 401, 403, 404, 429, 500, 502, 503, 504] + if (block.error && HTTP_ERROR_CODES.includes(block.error?.status)) { return } + if (block?.error?.message) { const errorKey = `error.${block.error.message}` const pauseErrorLanguagePlaceholder = i18n.exists(errorKey) ? t(errorKey) : block.error.message - return } return } + const Alert = styled(AntdAlert)` margin: 15px 0 8px; padding: 10px; diff --git a/src/renderer/src/pages/home/Messages/Blocks/ThinkingBlock.tsx b/src/renderer/src/pages/home/Messages/Blocks/ThinkingBlock.tsx index 6911250e9b..212ee53ee9 100644 --- a/src/renderer/src/pages/home/Messages/Blocks/ThinkingBlock.tsx +++ b/src/renderer/src/pages/home/Messages/Blocks/ThinkingBlock.tsx @@ -136,7 +136,6 @@ const ThinkingBlock: React.FC = ({ block }) => { const CollapseContainer = styled(Collapse)` margin-bottom: 15px; - max-width: 960px; ` const MessageTitleLabel = styled.div` diff --git a/src/renderer/src/store/thunk/messageThunk.ts b/src/renderer/src/store/thunk/messageThunk.ts index a98b69f39d..4e631bba65 100644 --- a/src/renderer/src/store/thunk/messageThunk.ts +++ b/src/renderer/src/store/thunk/messageThunk.ts @@ -989,8 +989,11 @@ export const regenerateAssistantResponseThunk = // 5. Reset the message entity in Redux const resetAssistantMsg = resetAssistantMessage(messageToResetEntity, { status: AssistantMessageStatus.PENDING, - updatedAt: new Date().toISOString() + updatedAt: new Date().toISOString(), + model: assistant.model, + modelId: assistant?.model?.id }) + dispatch( newMessagesActions.updateMessage({ topicId, diff --git a/src/renderer/src/utils/messageUtils/create.ts b/src/renderer/src/utils/messageUtils/create.ts index c9b3bbbfd4..1a7450aad7 100644 --- a/src/renderer/src/utils/messageUtils/create.ts +++ b/src/renderer/src/utils/messageUtils/create.ts @@ -388,7 +388,7 @@ export function resetMessage( */ export const resetAssistantMessage = ( originalMessage: Message, - updates?: Partial> // Primarily allow updating status + updates?: Partial> // Primarily allow updating status ): Message => { // Ensure we are only resetting assistant messages if (originalMessage.role !== 'assistant') {