Merge branch 'main' of https://github.com/lobehub/lobe-chat

123hi123 · Nov 11, 2024 · ce616f6 · ce616f6
2 parents 75597bb + c209c17
commit ce616f6
Show file tree

Hide file tree

Showing 47 changed files with 2,071 additions and 7 deletions.
diff --git a/.env.example b/.env.example
@@ -112,6 +112,11 @@ OPENAI_API_KEY=sk-xxxxxxxxx
 
 # QWEN_API_KEY=sk-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 
+### Cloudflare Workers AI  ####
+
+# CLOUDFLARE_API_KEY=xxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+# CLOUDFLARE_BASE_URL_OR_ACCOUNT_ID=xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+
 ### SiliconCloud AI  ####
 
 # SILICONCLOUD_API_KEY=sk-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,56 @@
 
 # Changelog
 
+## [Version 1.31.0](https://github.com/lobehub/lobe-chat/compare/v1.30.0...v1.31.0)
+
+<sup>Released on **2024-11-11**</sup>
+
+#### ✨ Features
+
+- **misc**: Add support xAI provider.
+
+<br/>
+
+<details>
+<summary><kbd>Improvements and Fixes</kbd></summary>
+
+#### What's improved
+
+- **misc**: Add support xAI provider, closes [#4627](https://github.com/lobehub/lobe-chat/issues/4627) ([49e1e08](https://github.com/lobehub/lobe-chat/commit/49e1e08))
+
+</details>
+
+<div align="right">
+
+[![](https://img.shields.io/badge/-BACK_TO_TOP-151515?style=flat-square)](#readme-top)
+
+</div>
+
+## [Version 1.30.0](https://github.com/lobehub/lobe-chat/compare/v1.29.6...v1.30.0)
+
+<sup>Released on **2024-11-11**</sup>
+
+#### ✨ Features
+
+- **misc**: Support Cloudflare Workers AI.
+
+<br/>
+
+<details>
+<summary><kbd>Improvements and Fixes</kbd></summary>
+
+#### What's improved
+
+- **misc**: Support Cloudflare Workers AI, closes [#3402](https://github.com/lobehub/lobe-chat/issues/3402) [/github.com/vercel/next.js/issues/38736#issuecomment-1278917422](https://github.com//github.com/vercel/next.js/issues/38736/issues/issuecomment-1278917422) ([efb7adf](https://github.com/lobehub/lobe-chat/commit/efb7adf))
+
+</details>
+
+<div align="right">
+
+[![](https://img.shields.io/badge/-BACK_TO_TOP-151515?style=flat-square)](#readme-top)
+
+</div>
+
 ### [Version 1.29.6](https://github.com/lobehub/lobe-chat/compare/v1.29.5...v1.29.6)
 
 <sup>Released on **2024-11-10**</sup>

diff --git a/Dockerfile b/Dockerfile
@@ -200,6 +200,8 @@ ENV \
     UPSTAGE_API_KEY="" UPSTAGE_MODEL_LIST="" \
     # Wenxin
     WENXIN_ACCESS_KEY="" WENXIN_SECRET_KEY="" WENXIN_MODEL_LIST="" \
+    # xAI
+    XAI_API_KEY="" XAI_MODEL_LIST="" \
     # 01.AI
     ZEROONE_API_KEY="" ZEROONE_MODEL_LIST="" \
     # Zhipu

diff --git a/Dockerfile.database b/Dockerfile.database
@@ -235,6 +235,8 @@ ENV \
     UPSTAGE_API_KEY="" UPSTAGE_MODEL_LIST="" \
     # Wenxin
     WENXIN_ACCESS_KEY="" WENXIN_SECRET_KEY="" WENXIN_MODEL_LIST="" \
+    # xAI
+    XAI_API_KEY="" XAI_MODEL_LIST="" \
     # 01.AI
     ZEROONE_API_KEY="" ZEROONE_MODEL_LIST="" \
     # Zhipu

diff --git a/docs/usage/features/database.zh-CN.mdx b/docs/usage/features/database.zh-CN.mdx
@@ -32,12 +32,12 @@ tags:
 
 ## 服务端数据库：便捷与高效的使用体验
 
-对于追求便捷使用体验的用户，LobeChat 支持 PostgreSQL 作为服务端数据库。通过 Dirzzle ORM 管理数据，结合 Clerk 进行身份验证，LobeChat 能够为用户提供高效、可靠的服务端数据管理方案。
+对于追求便捷使用体验的用户，LobeChat 支持 PostgreSQL 作为服务端数据库。通过 Drizzle ORM 管理数据，结合 Clerk 进行身份验证，LobeChat 能够为用户提供高效、可靠的服务端数据管理方案。
 
 ### 服务端数据库技术栈
 
 - **DB**: PostgreSQL（默认使用 Neon）
-- **ORM**: Dirzzle ORM
+- **ORM**: Drizzle ORM
 - **Auth**: Clerk
 - **Server Router**: tRPC
 
@@ -51,4 +51,4 @@ tags:
 
 服务端数据库方案则适合那些希望简化数据管理流程，享受便捷使用体验的用户。通过服务端数据库与用户身份验证，LobeChat 能够确保数据的安全性与高效性。如果您希望了解如何配置服务端数据库，请参考我们的[详细文档](/zh/docs/self-hosting/advanced/server-database)。
 
-无论选择本地数据库还是服务端数据库，LobeChat 都能为你提供卓越的用户体验。
+无论选择本地数据库还是服务端数据库，LobeChat 都能为你提供卓越的用户体验。
diff --git a/locales/ar/modelProvider.json b/locales/ar/modelProvider.json
@@ -51,6 +51,18 @@
       "title": "استخدام معلومات المصادقة الخاصة بـ Bedrock المخصصة"
     }
   },
+  "cloudflare": {
+    "apiKey": {
+      "desc": "يرجى ملء Cloudflare API Key",
+      "placeholder": "Cloudflare API Key",
+      "title": "Cloudflare API Key"
+    },
+    "baseURLOrAccountID": {
+      "desc": "أدخل رقم حساب Cloudflare أو عنوان URL API المخصص",
+      "placeholder": "رقم حساب Cloudflare / عنوان URL API المخصص",
+      "title": "رقم حساب Cloudflare / عنوان URL API"
+    }
+  },
   "github": {
     "personalAccessToken": {
       "desc": "أدخل رمز الوصول الشخصي الخاص بك على Github، انقر [هنا](https://github.com/settings/tokens) لإنشاء واحد",

diff --git a/locales/bg-BG/modelProvider.json b/locales/bg-BG/modelProvider.json
@@ -51,6 +51,18 @@
       "title": "Използване на персонализирана информация за удостоверяване на Bedrock"
     }
   },
+  "cloudflare": {
+    "apiKey": {
+      "desc": "Моля, въведете Cloudflare API Key",
+      "placeholder": "Cloudflare API Key",
+      "title": "Cloudflare API Key"
+    },
+    "baseURLOrAccountID": {
+      "desc": "Въведете ID на Cloudflare или личен API адрес",
+      "placeholder": "ID на Cloudflare / личен API адрес",
+      "title": "ID на Cloudflare / API адрес"
+    }
+  },
   "github": {
     "personalAccessToken": {
       "desc": "Въведете вашия GitHub PAT, кликнете [тук](https://github.com/settings/tokens), за да създадете",

diff --git a/locales/de-DE/modelProvider.json b/locales/de-DE/modelProvider.json
@@ -51,6 +51,18 @@
       "title": "Verwenden Sie benutzerdefinierte Bedrock-Authentifizierungsinformationen"
     }
   },
+  "cloudflare": {
+    "apiKey": {
+      "desc": "Bitte füllen Sie die Cloudflare API Key",
+      "placeholder": "Cloudflare API Key",
+      "title": "Cloudflare API Key"
+    },
+    "baseURLOrAccountID": {
+      "desc": "Eingeben Sie die Cloudflare-Kundenkennung oder die benutzerdefinierte API-Adresse",
+      "placeholder": "Cloudflare-Kundenkennung / benutzerdefinierte API-Adresse",
+      "title": "Cloudflare-Kundenkennung / API-Adresse"
+    }
+  },
   "github": {
     "personalAccessToken": {
       "desc": "Geben Sie Ihr GitHub-PAT ein und klicken Sie [hier](https://github.com/settings/tokens), um eines zu erstellen.",

diff --git a/locales/en-US/modelProvider.json b/locales/en-US/modelProvider.json
@@ -51,6 +51,18 @@
       "title": "Use Custom Bedrock Authentication Information"
     }
   },
+  "cloudflare": {
+    "apiKey": {
+      "desc": "Please enter Cloudflare API Key",
+      "placeholder": "Cloudflare API Key",
+      "title": "Cloudflare API Key"
+    },
+    "baseURLOrAccountID": {
+      "desc": "Enter your Cloudflare account ID or custom API address",
+      "placeholder": "Cloudflare Account ID / custom API URL",
+      "title": "Cloudflare Account ID / API Address"
+    }
+  },
   "github": {
     "personalAccessToken": {
       "desc": "Enter your GitHub PAT. Click [here](https://github.com/settings/tokens) to create one.",

diff --git a/locales/es-ES/modelProvider.json b/locales/es-ES/modelProvider.json
@@ -51,6 +51,18 @@
       "title": "Usar información de autenticación de Bedrock personalizada"
     }
   },
+  "cloudflare": {
+    "apiKey": {
+      "desc": "Por favor complete la Cloudflare API Key",
+      "placeholder": "Cloudflare API Key",
+      "title": "Cloudflare API Key"
+    },
+    "baseURLOrAccountID": {
+      "desc": "Ingrese el ID de cuenta de Cloudflare o la dirección URL personalizada de API",
+      "placeholder": "ID de cuenta de Cloudflare / URL de API personalizada",
+      "title": "ID de cuenta de Cloudflare / dirección URL de API"
+    }
+  },
   "github": {
     "personalAccessToken": {
       "desc": "Introduce tu PAT de Github, haz clic [aquí](https://github.com/settings/tokens) para crear uno",

diff --git a/locales/fr-FR/modelProvider.json b/locales/fr-FR/modelProvider.json
@@ -51,6 +51,18 @@
       "title": "Utiliser des informations d'authentification Bedrock personnalisées"
     }
   },
+  "cloudflare": {
+    "apiKey": {
+      "desc": "Veuillez remplir l'Cloudflare API Key",
+      "placeholder": "Cloudflare API Key",
+      "title": "Cloudflare API Key"
+    },
+    "baseURLOrAccountID": {
+      "desc": "Saisir l'ID de compte Cloudflare ou l'adresse API personnalisée",
+      "placeholder": "ID de compte Cloudflare / URL API personnalisée",
+      "title": "ID de compte Cloudflare / adresse API"
+    }
+  },
   "github": {
     "personalAccessToken": {
       "desc": "Entrez votre PAT GitHub, cliquez [ici](https://github.com/settings/tokens) pour en créer un.",

diff --git a/locales/it-IT/modelProvider.json b/locales/it-IT/modelProvider.json
@@ -51,6 +51,18 @@
       "title": "Usa le informazioni di autenticazione Bedrock personalizzate"
     }
   },
+  "cloudflare": {
+    "apiKey": {
+      "desc": "Compila l'Cloudflare API Key",
+      "placeholder": "Cloudflare API Key",
+      "title": "Cloudflare API Key"
+    },
+    "baseURLOrAccountID": {
+      "desc": "Inserisci l'ID dell'account Cloudflare o l'indirizzo API personalizzato",
+      "placeholder": "ID account Cloudflare / URL API personalizzato",
+      "title": "ID account Cloudflare / indirizzo API"
+    }
+  },
   "github": {
     "personalAccessToken": {
       "desc": "Inserisci il tuo PAT di Github, clicca [qui](https://github.com/settings/tokens) per crearne uno",

diff --git a/locales/ja-JP/modelProvider.json b/locales/ja-JP/modelProvider.json
@@ -51,6 +51,18 @@
       "title": "使用カスタム Bedrock 認証情報"
     }
   },
+  "cloudflare": {
+    "apiKey": {
+      "desc": "Cloudflare API Key を入力してください",
+      "placeholder": "Cloudflare API Key",
+      "title": "Cloudflare API Key"
+    },
+    "baseURLOrAccountID": {
+      "desc": "Cloudflare アカウント ID またはカスタム API アドレスを入力してください。",
+      "placeholder": "Cloudflare アカウント ID / カスタム API URL",
+      "title": "Cloudflare アカウント ID / API アドレス"
+    }
+  },
   "github": {
     "personalAccessToken": {
       "desc": "あなたのGithub PATを入力してください。[こちら](https://github.com/settings/tokens)をクリックして作成します",

diff --git a/locales/ko-KR/modelProvider.json b/locales/ko-KR/modelProvider.json
@@ -51,6 +51,18 @@
       "title": "사용자 정의 Bedrock 인증 정보 사용"
     }
   },
+  "cloudflare": {
+    "apiKey": {
+      "desc": "Cloudflare API Key 를 작성해 주세요.",
+      "placeholder": "Cloudflare API Key",
+      "title": "Cloudflare API Key"
+    },
+    "baseURLOrAccountID": {
+      "desc": "클라우드 플레어 계정 ID 또는 사용자 지정 API 주소 입력",
+      "placeholder": "클라우드 플레어 계정 ID / 사용자 지정 API 주소",
+      "title": "클라우드 플레어 계정 ID / API 주소"
+    }
+  },
   "github": {
     "personalAccessToken": {
       "desc": "당신의 Github PAT를 입력하세요. [여기](https://github.com/settings/tokens)를 클릭하여 생성하세요.",

diff --git a/locales/nl-NL/modelProvider.json b/locales/nl-NL/modelProvider.json
@@ -51,6 +51,18 @@
       "title": "Gebruik aangepaste Bedrock-verificatiegegevens"
     }
   },
+  "cloudflare": {
+    "apiKey": {
+      "desc": "Voer Cloudflare API Key in",
+      "placeholder": "Cloudflare API Key",
+      "title": "Cloudflare API Key"
+    },
+    "baseURLOrAccountID": {
+      "desc": "Voer uw Cloudflare-account ID of een custom API-URL in",
+      "placeholder": "Cloudflare-account ID / custom API-URL",
+      "title": "Cloudflare-account ID / API-URL"
+    }
+  },
   "github": {
     "personalAccessToken": {
       "desc": "Vul je Github PAT in, klik [hier](https://github.com/settings/tokens) om er een te maken",

diff --git a/locales/pl-PL/modelProvider.json b/locales/pl-PL/modelProvider.json
@@ -51,6 +51,18 @@
       "title": "Użyj niestandardowych informacji uwierzytelniających Bedrock"
     }
   },
+  "cloudflare": {
+    "apiKey": {
+      "desc": "Wprowadź klucz Cloudflare API Key",
+      "placeholder": "Cloudflare API Key",
+      "title": "Cloudflare API Key"
+    },
+    "baseURLOrAccountID": {
+      "desc": "Wprowadź ID konta Cloudflare lub adres API niestandardowy",
+      "placeholder": "ID konta Cloudflare / adres API niestandardowy",
+      "title": "ID konta Cloudflare / adres API"
+    }
+  },
   "github": {
     "personalAccessToken": {
       "desc": "Wprowadź swój osobisty token dostępu GitHub (PAT), kliknij [tutaj](https://github.com/settings/tokens), aby go utworzyć",

diff --git a/locales/pt-BR/modelProvider.json b/locales/pt-BR/modelProvider.json
@@ -51,6 +51,18 @@
       "title": "Usar informações de autenticação Bedrock personalizadas"
     }
   },
+  "cloudflare": {
+    "apiKey": {
+      "desc": "Insira o Cloudflare API Key",
+      "placeholder": "Cloudflare API Key",
+      "title": "Cloudflare API Key"
+    },
+    "baseURLOrAccountID": {
+      "desc": "Insira o ID da conta do Cloudflare ou o endereço da API personalizado",
+      "placeholder": "ID da conta do Cloudflare / URL da API personalizada",
+      "title": "ID da conta do Cloudflare / Endereço da API"
+    }
+  },
   "github": {
     "personalAccessToken": {
       "desc": "Insira seu PAT do Github, clique [aqui](https://github.com/settings/tokens) para criar",

diff --git a/locales/ru-RU/modelProvider.json b/locales/ru-RU/modelProvider.json
@@ -51,6 +51,18 @@
       "title": "Использовать пользовательскую информацию аутентификации Bedrock"
     }
   },
+  "cloudflare": {
+    "apiKey": {
+      "desc": "Пожалуйста, заполните Cloudflare API Key",
+      "placeholder": "Cloudflare API Key",
+      "title": "Cloudflare API Key"
+    },
+    "baseURLOrAccountID": {
+      "desc": "Введите ID аккаунта Cloudflare или адрес API по умолчанию",
+      "placeholder": "ID аккаунта Cloudflare / адрес API по умолчанию",
+      "title": "ID аккаунта Cloudflare / адрес API"
+    }
+  },
   "github": {
     "personalAccessToken": {
       "desc": "Введите ваш персональный токен доступа GitHub (PAT), нажмите [здесь](https://github.com/settings/tokens), чтобы создать его",

diff --git a/locales/tr-TR/modelProvider.json b/locales/tr-TR/modelProvider.json
@@ -51,6 +51,18 @@
       "title": "Özel Bedrock Kimlik Bilgilerini Kullan"
     }
   },
+  "cloudflare": {
+    "apiKey": {
+      "desc": "Lütfen doldurun Cloudflare API Key",
+      "placeholder": "Cloudflare API Key",
+      "title": "Cloudflare API Key"
+    },
+    "baseURLOrAccountID": {
+      "desc": "Cloudflare hesabınızın ID'sini veya özel API adresinizi girin",
+      "placeholder": "Cloudflare Hesap ID / Özel API Adresi",
+      "title": "Cloudflare Hesap ID / API Adresi"
+    }
+  },
   "github": {
     "personalAccessToken": {
       "desc": "Github PAT'nizi girin, [buraya](https://github.com/settings/tokens) tıklayarak oluşturun",

diff --git a/locales/vi-VN/modelProvider.json b/locales/vi-VN/modelProvider.json
@@ -51,6 +51,18 @@
       "title": "Sử dụng Thông tin Xác thực Bedrock tùy chỉnh"
     }
   },
+  "cloudflare": {
+    "apiKey": {
+      "desc": "Vui lòng nhập Cloudflare API Key",
+      "placeholder": "Cloudflare API Key",
+      "title": "Cloudflare API Key"
+    },
+    "baseURLOrAccountID": {
+      "desc": "Nhập ID tài khoản Cloudflare hoặc địa chỉ API tùy chỉnh",
+      "placeholder": "ID tài khoản Cloudflare / địa chỉ API tùy chỉnh",
+      "title": "ID tài khoản Cloudflare / địa chỉ API"
+    }
+  },
   "github": {
     "personalAccessToken": {
       "desc": "Nhập mã truy cập cá nhân Github của bạn, nhấp vào [đây](https://github.com/settings/tokens) để tạo",