Skip to content
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

fix: 解决生成过程中出现错误内容被清空覆盖问题 #1918

Merged
merged 1 commit into from
Feb 18, 2025
Merged

fix: 解决生成过程中出现错误内容被清空覆盖问题 #1918

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 11 additions & 2 deletions src/renderer/src/pages/home/Messages/MessageError.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { Message } from '@renderer/types'
import { formatErrorMessage } from '@renderer/utils/error'
import { Alert as AntdAlert } from 'antd'
import { FC } from 'react'
import { useTranslation } from 'react-i18next'
Expand All @@ -8,8 +9,16 @@ import Markdown from '../Markdown/Markdown'
const MessageError: FC<{ message: Message }> = ({ message }) => {
return (
<>
<MessageErrorInfo message={message} />
<Markdown message={message} />
{message.error && (
<Markdown
message={{
...message,
content: formatErrorMessage(message.error)
}}
/>
)}
<MessageErrorInfo message={message} />
</>
)
}
Expand All @@ -27,7 +36,7 @@ const MessageErrorInfo: FC<{ message: Message }> = ({ message }) => {
}

const Alert = styled(AntdAlert)`
margin-bottom: 15px;
margin: 15px 0 8px;
padding: 10px;
font-size: 12px;
`
Expand Down
3 changes: 1 addition & 2 deletions src/renderer/src/services/ApiService.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import i18n from '@renderer/i18n'
import store from '@renderer/store'
import { setGenerating } from '@renderer/store/runtime'
import { Assistant, Message, Model, Provider, Suggestion } from '@renderer/types'
import { formatErrorMessage, formatMessageError } from '@renderer/utils/error'
import { formatMessageError } from '@renderer/utils/error'
import { isEmpty } from 'lodash'

import AiProvider from '../providers/AiProvider'
Expand Down Expand Up @@ -94,7 +94,6 @@ export async function fetchChatCompletion({
}
} catch (error: any) {
message.status = 'error'
message.content = formatErrorMessage(error)
message.error = formatMessageError(error)
}

Expand Down