Merge remote-tracking branch 'upstream/main'

bentwnghk · Mar 10, 2024 · fcb7c86 · fcb7c86
2 parents 44ee6fc + 192688a
commit fcb7c86
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 10 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,32 @@
+<a name="readme-top"></a>
+
+# Changelog
+
+### [Version 0.133.2](https://github.com/lobehub/lobe-chat/compare/v0.133.1...v0.133.2)
+
+<sup>Released on **2024-03-10**</sup>
+
+#### 🐛 Bug Fixes
+
+- **misc**: Fix qwen model id and improve anthropic logo text color.
+
+<br/>
+
+<details>
+<summary><kbd>Improvements and Fixes</kbd></summary>
+
+#### What's fixed
+
+- **misc**: Fix qwen model id and improve anthropic logo text color, closes [#1524](https://github.com/lobehub/lobe-chat/issues/1524) ([c68f5da](https://github.com/lobehub/lobe-chat/commit/c68f5da))
+
+</details>
+
+<div align="right">
+
+[![](https://img.shields.io/badge/-BACK_TO_TOP-151515?style=flat-square)](#readme-top)
+
+</div>
+
 <a name="readme-top" />
 
 # Changelog

diff --git a/src/app/settings/llm/Anthropic/index.tsx b/src/app/settings/llm/Anthropic/index.tsx
@@ -1,4 +1,4 @@
-import { Anthropic } from '@lobehub/icons';
+import { Anthropic, Claude } from '@lobehub/icons';
 import { Input } from 'antd';
 import { useTheme } from 'antd-style';
 import { memo } from 'react';
@@ -41,7 +41,7 @@ const AnthropicProvider = memo(() => {
       provider={providerKey}
       title={
         <Anthropic.Text
-          color={theme.isDarkMode ? theme.colorText : Anthropic.colorPrimary}
+          color={theme.isDarkMode ? theme.colorText : Claude.colorPrimary}
           size={18}
         />
       }

diff --git a/src/app/settings/llm/index.tsx b/src/app/settings/llm/index.tsx
@@ -26,14 +26,14 @@ export default memo<{ showOllama: boolean }>(({ showOllama }) => {
       <PageTitle title={t('tab.llm')} />
       <OpenAI />
       {/*<AzureOpenAI />*/}
-      <Zhipu />
-      <Moonshot />
+      {showOllama && <Ollama />}
+      <Anthropic />
       <Google />
       <Bedrock />
       <Perplexity />
-      <Anthropic />
       <Mistral />
-      {showOllama && <Ollama />}
+      <Moonshot />
+      <Zhipu />
       <Footer>
         <Trans i18nKey="llm.waitingForMore" ns={'setting'}>
           更多模型正在

diff --git a/src/config/modelProviders/ollama.ts b/src/config/modelProviders/ollama.ts
@@ -88,23 +88,23 @@ const Ollama: ModelProviderCard = {
     {
       displayName: 'Qwen Chat 7B',
       functionCall: false,
-      id: 'qwen:7b-chat',
+      id: 'qwen:7b',
       tokens: 32_768,
       vision: false,
     },
     {
       displayName: 'Qwen Chat 14B',
       functionCall: false,
       hidden: true,
-      id: 'qwen:14b-chat',
+      id: 'qwen:14b',
       tokens: 32_768,
       vision: false,
     },
     {
-      displayName: 'Qwen Chat 70B',
+      displayName: 'Qwen Chat 72B',
       functionCall: false,
       hidden: true,
-      id: 'qwen:70b-chat',
+      id: 'qwen:72b',
       tokens: 32_768,
       vision: false,
     },