@lobehub/chat 0.133.5 → 0.134.0

package/CHANGELOG.md

@@ -2,6 +2,31 @@
 
 # Changelog
 
+## [Version 0.134.0](https://github.com/lobehub/lobe-chat/compare/v0.133.5...v0.134.0)
+
+<sup>Released on **2024-03-13**</sup>
+
+#### ✨ Features
+
+- **misc**: Support anthropic proxy url.
+
+<br/>
+
+<details>
+<summary><kbd>Improvements and Fixes</kbd></summary>
+
+#### What's improved
+
+- **misc**: Support anthropic proxy url, closes [#1529](https://github.com/lobehub/lobe-chat/issues/1529) ([a5a9257](https://github.com/lobehub/lobe-chat/commit/a5a9257))
+
+</details>
+
+<div align="right">
+
+[![](https://img.shields.io/badge/-BACK_TO_TOP-151515?style=flat-square)](#readme-top)
+
+</div>
+
 ### [Version 0.133.5](https://github.com/lobehub/lobe-chat/compare/v0.133.4...v0.133.5)
 
 <sup>Released on **2024-03-12**</sup>

package/locales/ar/setting.json

@@ -32,6 +32,11 @@
   },
   "llm": {
     "Anthropic": {
+      "endpoint": {
+        "desc": "بخلاف العنوان الافتراضي، يجب أن يتضمن http(s)://",
+        "placeholder": "https://api.anthropic.com",
+        "title": "عنوان وكيل الواجهة البرمجية للتطبيقات"
+      },
       "title": "أنثروبيك",
       "token": {
         "desc": "أدخل مفتاح API من أنثروبيك",
@@ -423,4 +428,4 @@
     },
     "title": "أدوات الامتداد"
   }
-}
+}

package/locales/de-DE/setting.json

@@ -32,6 +32,11 @@
   },
   "llm": {
     "Anthropic": {
+      "endpoint": {
+        "desc": "Muss die Standardadresse enthalten sowie http(s)://",
+        "placeholder": "https://api.anthropic.com",
+        "title": "API-Proxy-Adresse"
+      },
       "title": "Anthropic",
       "token": {
         "desc": "Geben Sie den API-Schlüssel von Anthropic ein",
@@ -423,4 +428,4 @@
     },
     "title": "Erweiterungswerkzeuge"
   }
-}
+}

package/locales/en-US/setting.json

@@ -32,6 +32,11 @@
   },
   "llm": {
     "Anthropic": {
+      "endpoint": {
+        "desc": "Must include http(s):// besides the default address",
+        "placeholder": "https://api.anthropic.com",
+        "title": "API Proxy Address"
+      },
       "title": "Anthropic",
       "token": {
         "desc": "Enter the API Key from Anthropic",
@@ -423,4 +428,4 @@
     },
     "title": "Extension Tools"
   }
-}
+}

package/locales/es-ES/setting.json

@@ -32,6 +32,11 @@
   },
   "llm": {
     "Anthropic": {
+      "endpoint": {
+        "desc": "Debe incluir http(s):// además de la dirección predeterminada",
+        "placeholder": "https://api.anthropic.com",
+        "title": "Dirección del proxy de la API"
+      },
       "title": "Anthropic",
       "token": {
         "desc": "Introduce la clave API de Anthropic",
@@ -423,4 +428,4 @@
     },
     "title": "Herramientas de extensión"
   }
-}
+}

package/locales/fr-FR/setting.json

@@ -32,6 +32,11 @@
   },
   "llm": {
     "Anthropic": {
+      "endpoint": {
+        "desc": "En dehors de l'adresse par défaut, doit inclure http(s)://",
+        "placeholder": "https://api.anthropic.com",
+        "title": "Adresse de l'API proxy"
+      },
       "title": "Anthropic",
       "token": {
         "desc": "Entrez votre clé API Anthropic",
@@ -423,4 +428,4 @@
     },
     "title": "Outils supplémentaires"
   }
-}
+}

package/locales/it-IT/setting.json

@@ -32,6 +32,11 @@
   },
   "llm": {
     "Anthropic": {
+      "endpoint": {
+        "desc": "Deve includere http(s):// oltre all'indirizzo predefinito",
+        "placeholder": "https://api.anthropic.com",
+        "title": "Indirizzo dell'API proxy"
+      },
       "title": "Anthropic",
       "token": {
         "desc": "Inserisci la chiave API di Anthropic",
@@ -423,4 +428,4 @@
     },
     "title": "Strumenti aggiuntivi"
   }
-}
+}

package/locales/ja-JP/setting.json

@@ -32,6 +32,11 @@
   },
   "llm": {
     "Anthropic": {
+      "endpoint": {
+        "desc": "デフォルトのアドレスに加えて、http(s)://を含める必要があります",
+        "placeholder": "https://api.anthropic.com",
+        "title": "APIプロキシアドレス"
+      },
       "title": "Anthropic",
       "token": {
         "desc": "Anthropic の API キーを入力してください",
@@ -423,4 +428,4 @@
     },
     "title": "拡張ツール"
   }
-}
+}

package/locales/ko-KR/setting.json

@@ -32,6 +32,11 @@
   },
   "llm": {
     "Anthropic": {
+      "endpoint": {
+        "desc": "기본 주소 이외에 http(s)://를 포함해야 합니다",
+        "placeholder": "https://api.anthropic.com",
+        "title": "API 프록시 주소"
+      },
       "title": "Anthropic",
       "token": {
         "desc": "Anthropic의 API 키를 입력하세요",
@@ -423,4 +428,4 @@
     },
     "title": "확장 도구"
   }
-}
+}

package/locales/nl-NL/setting.json

@@ -32,6 +32,11 @@
   },
   "llm": {
     "Anthropic": {
+      "endpoint": {
+        "desc": "除默认地址外，必须包含 http(s)://",
+        "placeholder": "https://api.anthropic.com",
+        "title": "API 代理地址"
+      },
       "title": "Anthropic",
       "token": {
         "desc": "Voer de API-sleutel van Anthropic in",
@@ -423,4 +428,4 @@
     },
     "title": "Uitbreidingsgereedschap"
   }
-}
+}

package/locales/pl-PL/setting.json

@@ -32,6 +32,11 @@
   },
   "llm": {
     "Anthropic": {
+      "endpoint": {
+        "desc": "除默认地址外，必须包含 http(s)://",
+        "placeholder": "https://api.anthropic.com",
+        "title": "API 代理地址"
+      },
       "title": "Antropijny",
       "token": {
         "desc": "Wprowadź klucz API z Anthropic",
@@ -423,4 +428,4 @@
     },
     "title": "Narzędzia rozszerzeń"
   }
-}
+}

package/locales/pt-BR/setting.json

@@ -32,6 +32,11 @@
   },
   "llm": {
     "Anthropic": {
+      "endpoint": {
+        "desc": "Além do endereço padrão, deve incluir http(s)://",
+        "placeholder": "https://api.anthropic.com",
+        "title": "Endereço do Proxy da API"
+      },
       "title": "Anthropic",
       "token": {
         "desc": "Insira a chave da API da Anthropic",
@@ -423,4 +428,4 @@
     },
     "title": "Ferramentas de Extensão"
   }
-}
+}

package/locales/ru-RU/setting.json

@@ -32,6 +32,11 @@
   },
   "llm": {
     "Anthropic": {
+      "endpoint": {
+        "desc": "除默认地址外，必须包含 http(s)://",
+        "placeholder": "https://api.anthropic.com",
+        "title": "API 代理地址"
+      },
       "title": "Антропный",
       "token": {
         "desc": "Введите ключ API от Anthropic",
@@ -423,4 +428,4 @@
     },
     "title": "Дополнительные инструменты"
   }
-}
+}

package/locales/tr-TR/setting.json

@@ -32,6 +32,11 @@
   },
   "llm": {
     "Anthropic": {
+      "endpoint": {
+        "desc": "默认地址以外，必须包含 http(s)://",
+        "placeholder": "https://api.anthropic.com",
+        "title": "API Proxy Adresi"
+      },
       "title": "Anthropic",
       "token": {
         "desc": "Anthropic 的 API 密钥",
@@ -423,4 +428,4 @@
     },
     "title": "Uzantı Araçları"
   }
-}
+}

package/locales/vi-VN/setting.json

@@ -32,6 +32,11 @@
   },
   "llm": {
     "Anthropic": {
+      "endpoint": {
+        "desc": "Ngoài địa chỉ mặc định, phải bao gồm http(s)://",
+        "placeholder": "https://api.anthropic.com",
+        "title": "Địa chỉ Proxy API"
+      },
       "title": "Anthropic",
       "token": {
         "desc": "Nhập API Key từ Anthropic",
@@ -423,4 +428,4 @@
     },
     "title": "Công cụ mở rộng"
   }
-}
+}

package/locales/zh-CN/setting.json

@@ -32,6 +32,11 @@
   },
   "llm": {
     "Anthropic": {
+      "endpoint": {
+        "desc": "除默认地址外，必须包含 http(s)://",
+        "placeholder": "https://api.anthropic.com",
+        "title": "API 代理地址"
+      },
       "title": "Anthropic",
       "token": {
         "desc": "填入来自 Anthropic 的 API Key",
@@ -423,4 +428,4 @@
     },
     "title": "扩展插件"
   }
-}
+}

package/locales/zh-TW/setting.json

@@ -32,6 +32,11 @@
   },
   "llm": {
     "Anthropic": {
+      "endpoint": {
+        "desc": "除預設地址外，必須包含 http(s)://",
+        "placeholder": "https://api.anthropic.com",
+        "title": "API 代理地址"
+      },
       "title": "Anthropic",
       "token": {
         "desc": "填入來自 Anthropic 的 API 金鑰",
@@ -423,4 +428,4 @@
     },
     "title": "擴展工具"
   }
-}
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lobehub/chat",
-  "version": "0.133.5",
+  "version": "0.134.0",
   "description": "Lobe Chat - an open-source, high-performance chatbot framework that supports speech synthesis, multimodal, and extensible Function Call plugin system. Supports one-click free deployment of your private ChatGPT/LLM web application.",
   "keywords": [
     "framework",

package/src/app/api/chat/[provider]/agentRuntime.ts

@@ -256,10 +256,10 @@ class AgentRuntime {
   }
 
   private static initAnthropic(payload: JWTPayload) {
-    const { ANTHROPIC_API_KEY } = getServerConfig();
+    const { ANTHROPIC_API_KEY, ANTHROPIC_PROXY_URL } = getServerConfig();
     const apiKey = apiKeyManager.pick(payload?.apiKey || ANTHROPIC_API_KEY);
-
-    return new LobeAnthropicAI({ apiKey });
+    const baseURL = payload?.endpoint || ANTHROPIC_PROXY_URL;
+    return new LobeAnthropicAI({ apiKey, baseURL });
   }
   
   private static initMistral(payload: JWTPayload) {

package/src/app/settings/llm/Anthropic/index.tsx

@@ -8,7 +8,11 @@ import { ModelProvider } from '@/libs/agent-runtime';
 
 import Checker from '../components/Checker';
 import ProviderConfig from '../components/ProviderConfig';
-import { LLMProviderApiTokenKey, LLMProviderConfigKey } from '../const';
+import {
+  LLMProviderApiTokenKey,
+  LLMProviderBaseUrlKey,
+  LLMProviderConfigKey
+} from '../const';
 
 const providerKey = 'anthropic';
 
@@ -31,6 +35,17 @@ const AnthropicProvider = memo(() => {
           label: t('llm.Anthropic.token.title'),
           name: [LLMProviderConfigKey, providerKey, LLMProviderApiTokenKey],
         },
+        {
+          children: (
+            <Input
+              allowClear
+              placeholder={t('llm.Anthropic.endpoint.placeholder')}
+            />
+          ),
+          desc: t('llm.Anthropic.endpoint.desc'),
+          label: t('llm.Anthropic.endpoint.title'),
+          name: [LLMProviderConfigKey, providerKey, LLMProviderBaseUrlKey],
+        },
         {
           children: <Checker model={'claude-2.1'} provider={ModelProvider.Anthropic} />,
           desc: t('llm.checker.desc'),

package/src/config/server/provider.ts

@@ -35,6 +35,7 @@ declare global {
 
       // Anthropic Provider
       ANTHROPIC_API_KEY?: string;
+      ANTHROPIC_PROXY_URL?: string;
       
       // Mistral Provider
       MISTRAL_API_KEY?: string;
@@ -94,6 +95,7 @@ export const getProviderConfig = () => {
 
     ENABLED_ANTHROPIC: !!ANTHROPIC_API_KEY,
     ANTHROPIC_API_KEY,
+    ANTHROPIC_PROXY_URL: process.env.ANTHROPIC_PROXY_URL,
     
     ENABLED_MISTRAL: !!MISTRAL_API_KEY,
     MISTRAL_API_KEY,

package/src/libs/agent-runtime/anthropic/index.test.ts

@@ -24,10 +24,19 @@ afterEach(() => {
 
 describe('LobeAnthropicAI', () => {
   describe('init', () => {
+
     it('should correctly initialize with an API key', async () => {
       const instance = new LobeAnthropicAI({ apiKey: 'test_api_key' });
       expect(instance).toBeInstanceOf(LobeAnthropicAI);
+      expect(instance.baseURL).toBe('https://api.anthropic.com');
+    });
+    
+    it('should correctly initialize with a baseURL', async () => {
+      const instance = new LobeAnthropicAI({ apiKey: 'test_api_key', baseURL: 'https://api.anthropic.proxy' });
+      expect(instance).toBeInstanceOf(LobeAnthropicAI);
+      expect(instance.baseURL).toBe('https://api.anthropic.proxy');
     });
+  
   });
 
   describe('chat', () => {
@@ -235,7 +244,12 @@ describe('LobeAnthropicAI', () => {
           });
         } catch (e) {
           // Assert
-          expect(e).toEqual({ errorType: 'InvalidAnthropicAPIKey', error: apiError, provider });
+          expect(e).toEqual({
+            endpoint: "https://api.anthropic.com",
+            error: apiError,
+            errorType: 'InvalidAnthropicAPIKey',
+            provider
+          });
         }
       });
       it('should throw BizError error', async () => {
@@ -261,7 +275,12 @@ describe('LobeAnthropicAI', () => {
           });
         } catch (e) {
           // Assert
-          expect(e).toEqual({ errorType: 'AnthropicBizError', error: apiError, provider });
+          expect(e).toEqual({
+            endpoint: "https://api.anthropic.com",
+            error: apiError,
+            errorType: 'AnthropicBizError',
+            provider
+          });
         }
       });
 

package/src/libs/agent-runtime/anthropic/index.ts

@@ -15,15 +15,21 @@ import {
 } from '../types';
 import { AgentRuntimeError } from '../utils/createError';
 import { debugStream } from '../utils/debugStream';
+import { desensitizeUrl } from '../utils/desensitizeUrl';
 import { parseDataUri } from '../utils/uriParser';
 
+const DEFAULT_BASE_URL = 'https://api.anthropic.com';
+
 export class LobeAnthropicAI implements LobeRuntimeAI {
   private client: Anthropic;
+  
+  baseURL: string;
 
-  constructor({ apiKey }: ClientOptions) {
+  constructor({ apiKey, baseURL = DEFAULT_BASE_URL }: ClientOptions) {
     if (!apiKey) throw AgentRuntimeError.createError(AgentRuntimeErrorType.InvalidAnthropicAPIKey);
-
-    this.client = new Anthropic({ apiKey });
+    
+    this.client = new Anthropic({ apiKey, baseURL });
+    this.baseURL = this.client.baseURL;
   }
 
   private buildAnthropicMessages = (
@@ -70,10 +76,17 @@ export class LobeAnthropicAI implements LobeRuntimeAI {
         headers: options?.headers,
       });
     } catch (error) {
+      let desensitizedEndpoint = this.baseURL;
+
+      if (this.baseURL !== DEFAULT_BASE_URL) {
+        desensitizedEndpoint = desensitizeUrl(this.baseURL);
+      }
+
       if ('status' in (error as any)) {
         switch ((error as Response).status) {
           case 401: {
             throw AgentRuntimeError.chat({
+              endpoint: desensitizedEndpoint,
               error: error as any,
               errorType: AgentRuntimeErrorType.InvalidAnthropicAPIKey,
               provider: ModelProvider.Anthropic,
@@ -85,6 +98,7 @@ export class LobeAnthropicAI implements LobeRuntimeAI {
         }
       }
       throw AgentRuntimeError.chat({
+        endpoint: desensitizedEndpoint,
         error: error as any,
         errorType: AgentRuntimeErrorType.AnthropicBizError,
         provider: ModelProvider.Anthropic,

package/src/locales/default/setting.ts

@@ -32,6 +32,11 @@ export default {
   },
   llm: {
     Anthropic: {
+      endpoint: {
+        desc: '除默认地址外，必须包含 http(s)://',
+        placeholder: 'https://api.anthropic.com',
+        title: 'API 代理地址',
+      },
       title: 'Anthropic',
       token: {
         desc: '填入来自 Anthropic 的 API Key',

package/src/services/_auth.ts

@@ -53,7 +53,9 @@ export const getProviderAuthPayload = (provider: string) => {
     }
 
     case ModelProvider.Anthropic: {
-      return { apiKey: modelProviderSelectors.anthropicAPIKey(useGlobalStore.getState()) };
+      const apiKey = modelProviderSelectors.anthropicAPIKey(useGlobalStore.getState());
+      const endpoint = modelProviderSelectors.anthropicProxyUrl(useGlobalStore.getState());
+      return { apiKey, endpoint };
     }
     
     case ModelProvider.Mistral: {

package/src/store/global/slices/settings/selectors/modelProvider.ts

@@ -59,6 +59,7 @@ const perplexityAPIKey = (s: GlobalStore) => modelProvider(s).perplexity.apiKey;
 
 const enableAnthropic = (s: GlobalStore) => modelProvider(s).anthropic.enabled;
 const anthropicAPIKey = (s: GlobalStore) => modelProvider(s).anthropic.apiKey;
+const anthropicProxyUrl = (s: GlobalStore) => modelProvider(s).anthropic.endpoint;
 
 // const azureModelList = (s: GlobalStore): ModelProviderCard => {
 //   const azure = azureConfig(s);
@@ -226,6 +227,7 @@ export const modelProviderSelectors = {
   // Anthropic
   enableAnthropic,
   anthropicAPIKey,
+  anthropicProxyUrl,
   
   // Mistral
   enableMistral,

package/src/types/settings/modelProvider.ts

@@ -63,6 +63,7 @@ export interface PerplexityConfig {
 export interface AnthropicConfig {
   apiKey?: string;
   enabled: boolean;
+  endpoint?: string;
 }
 
 export interface MistralConfig {