From 98307d5d857e24e6cf880393a8c5cd731bde5413 Mon Sep 17 00:00:00 2001
From: kangfenmao <kangfenmao@qq.com>
Date: Tue, 29 Oct 2024 02:26:10 +0800
Subject: [PATCH] feat: add chinese translations and improve ui

---
 src/renderer/src/i18n/zh-cn.json              |  3 ++-
 src/renderer/src/i18n/zh-tw.json              |  3 ++-
 src/renderer/src/pages/agents/AgentsPage.tsx  |  3 +--
 .../pages/home/Messages/MessageContent.tsx    | 14 ++-----------
 .../src/pages/home/Messages/MessageError.tsx  | 21 +++++++++++++++++++
 src/renderer/src/services/api.ts              |  6 +++++-
 6 files changed, 33 insertions(+), 17 deletions(-)
 create mode 100644 src/renderer/src/pages/home/Messages/MessageError.tsx

diff --git a/src/renderer/src/i18n/zh-cn.json b/src/renderer/src/i18n/zh-cn.json
index a0217ce8..f00339b1 100644
--- a/src/renderer/src/i18n/zh-cn.json
+++ b/src/renderer/src/i18n/zh-cn.json
@@ -169,7 +169,8 @@
       "edit.message.user.placeholder": "输入用户消息",
       "edit.message.empty.content": "会话输入内容不能为空",
       "edit.model.select.title": "选择模型",
-      "edit.settings.hide_preset_messages": "隐藏预设消息"
+      "edit.settings.hide_preset_messages": "隐藏预设消息",
+      "search.no_results": "没有找到相关智能体"
     },
     "minapp": {
       "title": "小程序"
diff --git a/src/renderer/src/i18n/zh-tw.json b/src/renderer/src/i18n/zh-tw.json
index 7269cf49..c3c5de29 100644
--- a/src/renderer/src/i18n/zh-tw.json
+++ b/src/renderer/src/i18n/zh-tw.json
@@ -169,7 +169,8 @@
       "edit.message.user.placeholder": "輸入用戶消息",
       "edit.message.empty.content": "會話輸入內容不能為空",
       "edit.model.select.title": "選擇模型",
-      "edit.settings.hide_preset_messages": "隱藏預設消息"
+      "edit.settings.hide_preset_messages": "隱藏預設消息",
+      "search.no_results": "沒有找到相關智能體"
     },
     "minapp": {
       "title": "小程序"
diff --git a/src/renderer/src/pages/agents/AgentsPage.tsx b/src/renderer/src/pages/agents/AgentsPage.tsx
index 8098cce1..946a1147 100644
--- a/src/renderer/src/pages/agents/AgentsPage.tsx
+++ b/src/renderer/src/pages/agents/AgentsPage.tsx
@@ -97,8 +97,7 @@ const AgentsPage: FC = () => {
 
   const tabItems = useMemo(() => {
     let groups = Object.keys(filteredAgentGroups)
-    groups = groups.filter((g) => g !== '办公')
-    groups = ['办公', ...groups]
+    groups = groups.includes('办公') ? ['办公', ...groups.filter((g) => g !== '办公')] : groups
     return groups.map((group, i) => {
       const id = String(i + 1)
       return {
diff --git a/src/renderer/src/pages/home/Messages/MessageContent.tsx b/src/renderer/src/pages/home/Messages/MessageContent.tsx
index 0a26d013..75040708 100644
--- a/src/renderer/src/pages/home/Messages/MessageContent.tsx
+++ b/src/renderer/src/pages/home/Messages/MessageContent.tsx
@@ -1,20 +1,17 @@
 import { SyncOutlined } from '@ant-design/icons'
 import { Message, Model } from '@renderer/types'
 import { getBriefInfo } from '@renderer/utils'
-import { Alert } from 'antd'
 import React from 'react'
-import { useTranslation } from 'react-i18next'
 import styled from 'styled-components'
 
 import Markdown from '../Markdown/Markdown'
 import MessageAttachments from './MessageAttachments'
+import MessageError from './MessageError'
 
 const MessageContent: React.FC<{
   message: Message
   model?: Model
 }> = ({ message, model }) => {
-  const { t } = useTranslation()
-
   if (message.status === 'sending') {
     return (
       <MessageContentLoading>
@@ -24,14 +21,7 @@ const MessageContent: React.FC<{
   }
 
   if (message.status === 'error') {
-    return (
-      <Alert
-        message={<div style={{ fontSize: 14 }}>{t('error.chat.response')}</div>}
-        description={<Markdown message={message} />}
-        type="error"
-        style={{ marginBottom: 15, padding: 10, fontSize: 12 }}
-      />
-    )
+    return <MessageError message={message} />
   }
 
   if (message.type === '@' && model) {
diff --git a/src/renderer/src/pages/home/Messages/MessageError.tsx b/src/renderer/src/pages/home/Messages/MessageError.tsx
new file mode 100644
index 00000000..d86c6352
--- /dev/null
+++ b/src/renderer/src/pages/home/Messages/MessageError.tsx
@@ -0,0 +1,21 @@
+import { Message } from '@renderer/types'
+import { Alert } from 'antd'
+import { t } from 'i18next'
+import { FC } from 'react'
+
+import Markdown from '../Markdown/Markdown'
+
+const MessageError: FC<{ message: Message }> = ({ message }) => {
+  return (
+    <>
+      <Alert
+        description={t('error.chat.response')}
+        type="error"
+        style={{ marginBottom: 15, padding: 10, fontSize: 12 }}
+      />
+      <Markdown message={message} />
+    </>
+  )
+}
+
+export default MessageError
diff --git a/src/renderer/src/services/api.ts b/src/renderer/src/services/api.ts
index 074f5972..72769c95 100644
--- a/src/renderer/src/services/api.ts
+++ b/src/renderer/src/services/api.ts
@@ -73,8 +73,12 @@ export async function fetchChatCompletion({
       })
     }
   } catch (error: any) {
-    message.content = `Error: ${error.message}`
     message.status = 'error'
+    try {
+      message.content = '```json\n' + JSON.stringify(error, null, 2) + '\n```'
+    } catch (e) {
+      message.content = 'Error: ' + error.message
+    }
   }
 
   timer && clearInterval(timer)