From 7bd644451bbedb558bf5fcdcfb52c26b84b78b84 Mon Sep 17 00:00:00 2001
From: Teo <cheesen.xu@gmail.com>
Date: Tue, 18 Feb 2025 17:26:28 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=A7=A3=E5=86=B3=E7=94=9F=E6=88=90?=
 =?UTF-8?q?=E8=BF=87=E7=A8=8B=E4=B8=AD=E5=87=BA=E7=8E=B0=E9=94=99=E8=AF=AF?=
 =?UTF-8?q?=E5=86=85=E5=AE=B9=E8=A2=AB=E6=B8=85=E7=A9=BA=E8=A6=86=E7=9B=96?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/pages/home/Messages/MessageError.tsx        | 13 +++++++++++--
 src/renderer/src/services/ApiService.ts             |  3 +--
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/renderer/src/pages/home/Messages/MessageError.tsx b/src/renderer/src/pages/home/Messages/MessageError.tsx
index 0a7085f8..9b2da544 100644
--- a/src/renderer/src/pages/home/Messages/MessageError.tsx
+++ b/src/renderer/src/pages/home/Messages/MessageError.tsx
@@ -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'
@@ -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} />
     </>
   )
 }
@@ -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;
 `
diff --git a/src/renderer/src/services/ApiService.ts b/src/renderer/src/services/ApiService.ts
index 7700d540..daf7b4fb 100644
--- a/src/renderer/src/services/ApiService.ts
+++ b/src/renderer/src/services/ApiService.ts
@@ -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'
@@ -94,7 +94,6 @@ export async function fetchChatCompletion({
     }
   } catch (error: any) {
     message.status = 'error'
-    message.content = formatErrorMessage(error)
     message.error = formatMessageError(error)
   }