@lobehub/chat 1.9.1 → 1.9.3

package/.env.example

@@ -33,7 +33,7 @@ OPENAI_API_KEY=sk-xxxxxxxxx
 # AZURE_ENDPOINT=https://docs-test-001.openai.azure.com
 
 # Azure's API version, follows the YYYY-MM-DD format
-# AZURE_API_VERSION=2024-02-01
+# AZURE_API_VERSION=2024-06-01
 
 
 ### Anthropic Service ####

package/CHANGELOG.md

@@ -2,6 +2,56 @@
 
 # Changelog
 
+### [Version 1.9.3](https://github.com/lobehub/lobe-chat/compare/v1.9.2...v1.9.3)
+
+<sup>Released on **2024-08-06**</sup>
+
+#### ♻ Code Refactoring
+
+- **misc**: Refactor server db schema for better code organize.
+
+<br/>
+
+<details>
+<summary><kbd>Improvements and Fixes</kbd></summary>
+
+#### Code refactoring
+
+- **misc**: Refactor server db schema for better code organize, closes [#3410](https://github.com/lobehub/lobe-chat/issues/3410) ([4743bfd](https://github.com/lobehub/lobe-chat/commit/4743bfd))
+
+</details>
+
+<div align="right">
+
+[![](https://img.shields.io/badge/-BACK_TO_TOP-151515?style=flat-square)](#readme-top)
+
+</div>
+
+### [Version 1.9.2](https://github.com/lobehub/lobe-chat/compare/v1.9.1...v1.9.2)
+
+<sup>Released on **2024-08-05**</sup>
+
+#### 💄 Styles
+
+- **config**: Update Azure model and API versions.
+
+<br/>
+
+<details>
+<summary><kbd>Improvements and Fixes</kbd></summary>
+
+#### Styles
+
+- **config**: Update Azure model and API versions, closes [#3405](https://github.com/lobehub/lobe-chat/issues/3405) ([a4938eb](https://github.com/lobehub/lobe-chat/commit/a4938eb))
+
+</details>
+
+<div align="right">
+
+[![](https://img.shields.io/badge/-BACK_TO_TOP-151515?style=flat-square)](#readme-top)
+
+</div>
+
 ### [Version 1.9.1](https://github.com/lobehub/lobe-chat/compare/v1.9.0...v1.9.1)
 
 <sup>Released on **2024-08-05**</sup>

package/docs/self-hosting/examples/azure-openai.zh-CN.mdx

@@ -28,7 +28,7 @@ LobeChat 支持使用 [Azure OpenAI](https://learn.microsoft.com/zh-cn/azure/ai-
 
 - **APIKey**：你在 Azure OpenAI 账户页面申请的 API 密钥，可在 “密钥和终结点” 部分中找到此值
 - **API 地址**：Azure API 地址，从 Azure 门户检查资源时，可在 “密钥和终结点” 部分中找到此值
-- **Azure Api Version**： Azure 的 API 版本，遵循 YYYY-MM-DD 格式，查阅[最新版本](https://learn.microsoft.com/zh-cn/azure/ai-services/openai/reference#chat-completions)
+- **Azure API Version**： Azure 的 API 版本，遵循 YYYY-MM-DD 格式，查阅[最新版本](https://learn.microsoft.com/zh-cn/azure/ai-services/openai/reference#chat-completions)
 - **模型列表**： 用来控制模型列表，你可以自行配置你的部署模型。
 
 完成上述字段配置后，点击「检查」，如果提示「检查通过」，则说明配置成功。

package/drizzle.config.ts

@@ -24,6 +24,6 @@ export default {
   dialect: 'postgresql',
   out: './src/database/server/migrations',
 
-  schema: './src/database/server/schemas/lobechat.ts',
+  schema: './src/database/server/schemas/lobechat',
   strict: true,
 } satisfies Config;

package/locales/ar/modelProvider.json

@@ -3,7 +3,7 @@
     "azureApiVersion": {
       "desc": "نسخة API الخاصة بـ Azure، والتي تتبع تنسيق YYYY-MM-DD، راجع [الإصدارات الأحدث](https://learn.microsoft.com/zh-en/azure/ai-services/openai/reference#chat-completions)",
       "fetch": "جلب القائمة",
-      "title": "Azure Api Version"
+      "title": "Azure API Version"
     },
     "empty": "الرجاء إدخال معرف النموذج لإضافة أول نموذج",
     "endpoint": {

package/locales/bg-BG/modelProvider.json

@@ -3,7 +3,7 @@
     "azureApiVersion": {
       "desc": "Версия на Azure API, в формат YYYY-MM-DD, вижте [най-новата версия](https://learn.microsoft.com/zh-cn/azure/ai-services/openai/reference#chat-completions)",
       "fetch": "Извличане на списък",
-      "title": "Версия на Azure Api"
+      "title": "Версия на Azure API"
     },
     "empty": "Моля, въведете идентификатор на модела, за да добавите първия модел",
     "endpoint": {

package/locales/en-US/setting.json

@@ -51,7 +51,7 @@
     },
     "checker": {
       "button": "Check",
-      "desc": "Test if the Api Key and proxy address are filled in correctly",
+      "desc": "Test if the API Key and proxy address are filled in correctly",
       "pass": "Check Passed",
       "title": "Connectivity Check"
     },

package/locales/ja-JP/modelProvider.json

@@ -3,7 +3,7 @@
     "azureApiVersion": {
       "desc": "Azure の API バージョン、YYYY-MM-DD 形式に従う、[最新バージョン](https://learn.microsoft.com/zh-cn/azure/ai-services/openai/reference#chat-completions)を参照",
       "fetch": "リストを取得",
-      "title": "Azure Api Version"
+      "title": "Azure API Version"
     },
     "empty": "モデル ID を入力して最初のモデルを追加してください",
     "endpoint": {

package/locales/nl-NL/modelProvider.json

@@ -3,7 +3,7 @@
     "azureApiVersion": {
       "desc": "De API-versie van Azure, volgt het formaat YYYY-MM-DD, raadpleeg [de nieuwste versie](https://learn.microsoft.com/nl-nl/azure/ai-services/openai/reference#chat-completions)",
       "fetch": "Lijst ophalen",
-      "title": "Azure Api Versie"
+      "title": "Azure API Versie"
     },
     "empty": "Voer een model-ID in om het eerste model toe te voegen",
     "endpoint": {

package/locales/pl-PL/modelProvider.json

@@ -3,7 +3,7 @@
     "azureApiVersion": {
       "desc": "Wersja API Azure, stosuj format YYYY-MM-DD, zobacz [najnowszą wersję](https://learn.microsoft.com/pl-pl/azure/ai-services/openai/reference#chat-completions)",
       "fetch": "Pobierz listę",
-      "title": "Wersja Azure Api"
+      "title": "Wersja Azure API"
     },
     "empty": "Wprowadź identyfikator modelu, aby dodać pierwszy model",
     "endpoint": {

package/locales/pt-BR/setting.json

@@ -51,7 +51,7 @@
     },
     "checker": {
       "button": "Verificar",
-      "desc": "Verifica se a Api Key e o endereço do proxy estão preenchidos corretamente",
+      "desc": "Verifica se a API Key e o endereço do proxy estão preenchidos corretamente",
       "pass": "Verificação aprovada",
       "title": "Verificação de Conectividade"
     },

package/locales/tr-TR/modelProvider.json

@@ -3,7 +3,7 @@
     "azureApiVersion": {
       "desc": "Azure'un API versiyonu, YYYY-AA-GG formatına uygun, [en son versiyonu](https://learn.microsoft.com/zh-cn/azure/ai-services/openai/reference#chat-completions) kontrol edin",
       "fetch": "Listeyi al",
-      "title": "Azure Api Versiyonu"
+      "title": "Azure API Versiyonu"
     },
     "empty": "İlk modeli eklemek için model kimliğini girin",
     "endpoint": {

package/locales/tr-TR/setting.json

@@ -51,7 +51,7 @@
     },
     "checker": {
       "button": "Kontrol Et",
-      "desc": "Api Anahtarı ve vekil adresinin doğru şekilde doldurulup doldurulmadığını test eder",
+      "desc": "API Anahtarı ve vekil adresinin doğru şekilde doldurulup doldurulmadığını test eder",
       "pass": "Kontrol Başarılı",
       "title": "Bağlantı Kontrolü"
     },

package/locales/vi-VN/setting.json

@@ -51,7 +51,7 @@
     },
     "checker": {
       "button": "Kiểm tra",
-      "desc": "Kiểm tra xem Api Key và địa chỉ proxy đã được điền đúng chưa",
+      "desc": "Kiểm tra xem API Key và địa chỉ proxy đã được điền đúng chưa",
       "pass": "Kiểm tra thành công",
       "title": "Kiểm tra kết nối"
     },

package/locales/zh-CN/error.json

@@ -60,7 +60,7 @@
     "PluginManifestNotFound": "很抱歉，服务器没有找到该插件的描述清单 (manifest.json)，请检查插件描述文件地址是否正确",
     "PluginManifestInvalid": "很抱歉，该插件的描述清单校验未通过，请检查描述清单格式是否规范",
     "PluginApiNotFound": "很抱歉，插件描述清单中不存在该 API ，请检查你的请求方法与插件清单 API 是否匹配",
-    "PluginApiParamsError": "很抱歉，该插件请求的入参校验未通过，请检查入参与 Api 描述信息是否匹配",
+    "PluginApiParamsError": "很抱歉，该插件请求的入参校验未通过，请检查入参与 API 描述信息是否匹配",
     "PluginSettingsInvalid": "该插件需要正确配置后才可以使用，请检查你的配置是否正确",
     "PluginServerError": "插件服务端请求返回出错，请检查根据下面的报错信息检查你的插件描述文件、插件配置或服务端实现",
     "PluginGatewayError": "很抱歉，插件网关出现错误，请检查插件网关配置是否正确",

package/locales/zh-CN/modelProvider.json

@@ -3,7 +3,7 @@
     "azureApiVersion": {
       "desc": "Azure 的 API 版本，遵循 YYYY-MM-DD 格式，查阅[最新版本](https://learn.microsoft.com/zh-cn/azure/ai-services/openai/reference#chat-completions)",
       "fetch": "获取列表",
-      "title": "Azure Api Version"
+      "title": "Azure API Version"
     },
     "empty": "请输入模型 ID 添加第一个模型",
     "endpoint": {

package/locales/zh-CN/setting.json

@@ -51,7 +51,7 @@
     },
     "checker": {
       "button": "检查",
-      "desc": "测试 Api Key 与代理地址是否正确填写",
+      "desc": "测试 API Key 与代理地址是否正确填写",
       "pass": "检查通过",
       "title": "连通性检查"
     },

package/locales/zh-TW/modelProvider.json

@@ -3,7 +3,7 @@
     "azureApiVersion": {
       "desc": "Azure 的 API 版本，遵循 YYYY-MM-DD 格式，查閱[最新版本](https://learn.microsoft.com/zh-cn/azure/ai-services/openai/reference#chat-completions)",
       "fetch": "獲取列表",
-      "title": "Azure Api 版本"
+      "title": "Azure API 版本"
     },
     "empty": "請輸入模型 ID 添加第一個模型",
     "endpoint": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lobehub/chat",
-  "version": "1.9.1",
+  "version": "1.9.3",
   "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",
@@ -115,9 +115,9 @@
     "@khmyznikov/pwa-install": "^0.3.9",
     "@lobehub/chat-plugin-sdk": "^1.32.4",
     "@lobehub/chat-plugins-gateway": "^1.9.0",
-    "@lobehub/icons": "^1.27.0",
+    "@lobehub/icons": "^1.28.0",
     "@lobehub/tts": "^1.24.3",
-    "@lobehub/ui": "^1.146.9",
+    "@lobehub/ui": "^1.147.0",
     "@microsoft/fetch-event-source": "^2.0.1",
     "@neondatabase/serverless": "^0.9.4",
     "@next/third-parties": "^14.2.4",

package/src/app/(main)/settings/llm/ProviderList/Azure/index.tsx

@@ -77,7 +77,10 @@ export const useAzureProvider = (): ProviderItem => {
         children: (
           <AutoComplete
             options={[
+              '2024-06-01',
               '2024-02-01',
+              '2024-05-01-preview',
+              '2024-04-01-preview',
               '2024-03-01-preview',
               '2024-02-15-preview',
               '2023-10-01-preview',

package/src/app/api/chat/agentRuntime.test.ts

@@ -76,7 +76,7 @@ describe('initAgentRuntimeWithUserPayload method', () => {
       const jwtPayload: JWTPayload = {
         apiKey: 'user-azure-key',
         endpoint: 'user-azure-endpoint',
-        azureApiVersion: '2024-02-01',
+        azureApiVersion: '2024-06-01',
       };
       const runtime = await initAgentRuntimeWithUserPayload(ModelProvider.Azure, jwtPayload);
       expect(runtime).toBeInstanceOf(AgentRuntime);

package/src/config/modelProviders/ai360.ts

@@ -13,7 +13,6 @@ const Ai360: ModelProviderCard = {
     },
     {
       displayName: '360GPT Pro',
-      enabled: false,
       functionCall: false,
       id: '360gpt-pro',
       maxOutput: 7000,
@@ -21,7 +20,6 @@ const Ai360: ModelProviderCard = {
     },
     {
       displayName: '360GPT Pro Perf',
-      enabled: false,
       functionCall: false,
       id: '360gpt-pro-perf',
       maxOutput: 7000,
@@ -29,7 +27,6 @@ const Ai360: ModelProviderCard = {
     },
     {
       displayName: '360GPT Pro sc202401v3',
-      enabled: false,
       functionCall: false,
       id: '360gpt-pro-sc202401v3',
       maxOutput: 2048,
@@ -37,7 +34,6 @@ const Ai360: ModelProviderCard = {
     },
     {
       displayName: '360GPT Pro sc202401v2',
-      enabled: false,
       functionCall: false,
       id: '360gpt-pro-sc202401v2',
       maxOutput: 2048,
@@ -45,7 +41,6 @@ const Ai360: ModelProviderCard = {
     },
     {
       displayName: '360GPT Pro sc202401v1',
-      enabled: false,
       functionCall: false,
       id: '360gpt-pro-sc202401v1',
       maxOutput: 2048,
@@ -53,7 +48,6 @@ const Ai360: ModelProviderCard = {
     },
     {
       displayName: '360GPT Pro v2.0.3',
-      enabled: false,
       functionCall: false,
       id: '360gpt-pro-v2.0.3',
       maxOutput: 2048,
@@ -77,7 +71,6 @@ const Ai360: ModelProviderCard = {
     },
     {
       displayName: '360GPT Turbo 32K Responsibility 240530',
-      enabled: false,
       functionCall: false,
       id: '360gpt-turbo-32k-responsibility-240530',
       maxOutput: 32_000,
@@ -85,7 +78,6 @@ const Ai360: ModelProviderCard = {
     },
     {
       displayName: '360GPT Turbo 32K Responsibility 240516',
-      enabled: false,
       functionCall: false,
       id: '360gpt-turbo-32k-responsibility-240516',
       maxOutput: 32_000,
@@ -93,7 +85,6 @@ const Ai360: ModelProviderCard = {
     },
     {
       displayName: '360GPT_S1_QIYUAN',
-      enabled: false,
       functionCall: false,
       id: '360GPT_S1_QIYUAN',
       maxOutput: 2048,
@@ -101,7 +92,6 @@ const Ai360: ModelProviderCard = {
     },
     {
       displayName: '360GPT_S2_V9',
-      enabled: false,
       functionCall: false,
       id: '360GPT_S2_V9',
       maxOutput: 7000,

package/src/config/modelProviders/anthropic.ts

@@ -49,28 +49,25 @@ const Anthropic: ModelProviderCard = {
     },
     {
       displayName: 'Claude 2.1',
-      enabled: false,
       id: 'claude-2.1',
       maxOutput: 4096,
       tokens: 200_000,
     },
     {
       displayName: 'Claude 2.0',
-      enabled: false,
       id: 'claude-2.0',
       maxOutput: 4096,
       tokens: 100_000,
     },
     {
       displayName: 'Claude Instant 1.2',
-      enabled: false,
       id: 'claude-instant-1.2',
       maxOutput: 4096,
       tokens: 100_000,
     },
   ],
   checkModel: 'claude-3-haiku-20240307',
-  disableBrowserRequest: true,  
+  disableBrowserRequest: true,
   id: 'anthropic',
   name: 'Anthropic',
   proxyUrl: {

package/src/config/modelProviders/azure.ts

@@ -6,7 +6,7 @@ const Azure: ModelProviderCard = {
     {
       deploymentName: 'gpt-35-turbo',
       description: 'GPT 3.5 Turbo，适用于各种文本生成和理解任务',
-      displayName: 'GPT-3.5 Turbo',
+      displayName: 'GPT 3.5 Turbo',
       enabled: true,
       functionCall: true,
       id: 'gpt-35-turbo',
@@ -15,27 +15,46 @@ const Azure: ModelProviderCard = {
     },
     {
       deploymentName: 'gpt-35-turbo-16k',
-      displayName: 'GPT-3.5 Turbo',
+      displayName: 'GPT 3.5 Turbo',
       functionCall: true,
       id: 'gpt-35-turbo-16k',
       tokens: 16_384,
     },
     {
       deploymentName: 'gpt-4-turbo',
-      displayName: 'GPT-4 Turbo',
+      displayName: 'GPT 4 Turbo',
       enabled: true,
       functionCall: true,
       id: 'gpt-4',
       tokens: 128_000,
+      vision: true,
     },
     {
       deploymentName: 'gpt-4-vision',
       description: 'GPT-4 视觉预览版，支持视觉任务',
-      displayName: 'GPT-4 Turbo with Vision Preview',
+      displayName: 'GPT 4 Turbo with Vision Preview',
       id: 'gpt-4-vision-preview',
       tokens: 128_000,
       vision: true,
     },
+    {
+      deploymentName: 'gpt-4o-mini',
+      displayName: 'GPT 4o Mini',
+      enabled: true,
+      functionCall: true,
+      id: 'gpt-4o-mini',
+      tokens: 128_000,
+      vision: true,
+    },
+    {
+      deploymentName: 'gpt-4o',
+      displayName: 'GPT 4o',
+      enabled: true,
+      functionCall: true,
+      id: 'gpt-4o',
+      tokens: 128_000,
+      vision: true,
+    },
   ],
   defaultShowBrowserRequest: true,
   id: 'azure',

package/src/config/modelProviders/groq.ts

@@ -5,7 +5,6 @@ const Groq: ModelProviderCard = {
   chatModels: [
     {
       displayName: 'LLaMA3.1 405B (Preview)',
-      enabled: false,
       functionCall: true,
       id: 'llama-3.1-405b-reasoning',
       tokens: 16_000,

package/src/database/server/schemas/lobechat/_helpers.ts

@@ -0,0 +1,6 @@
+import { timestamp } from 'drizzle-orm/pg-core';
+
+export const timestamptz = (name: string) => timestamp(name, { withTimezone: true });
+
+export const createdAt = () => timestamptz('created_at').notNull().defaultNow();
+export const updatedAt = () => timestamptz('updated_at').notNull().defaultNow();

package/src/database/server/schemas/{lobechat.ts → lobechat/chat.ts}

@@ -1,6 +1,5 @@
 /* eslint-disable sort-keys-fix/sort-keys-fix  */
 import { LobeChatPluginManifest } from '@lobehub/chat-plugin-sdk';
-import { relations } from 'drizzle-orm';
 import {
   boolean,
   index,
@@ -8,177 +7,20 @@ import {
   jsonb,
   pgTable,
   primaryKey,
-  serial,
   text,
-  timestamp,
   unique,
   uniqueIndex,
   varchar,
 } from 'drizzle-orm/pg-core';
 import { createInsertSchema, createSelectSchema } from 'drizzle-zod';
 
-import { DEFAULT_PREFERENCE } from '@/const/user';
 import { LobeAgentChatConfig, LobeAgentTTSConfig } from '@/types/agent';
 import { CustomPluginParams } from '@/types/tool/plugin';
 
-import { idGenerator, randomSlug } from '../utils/idGenerator';
-
-// Schema for nextauth
-export * from './nextauth';
-
-const timestamptz = (name: string) => timestamp(name, { withTimezone: true });
-
-const createdAt = () => timestamptz('created_at').notNull().defaultNow();
-const updatedAt = () => timestamptz('updated_at').notNull().defaultNow();
-
-/**
- * This table stores users. Users are created in Clerk, then Clerk calls a
- * webhook at /api/webhook/clerk to inform this application a user was created.
- */
-export const users = pgTable('users', {
-  // The ID will be the user's ID from Clerk
-  id: text('id').primaryKey().notNull(),
-  username: text('username').unique(),
-  email: text('email'),
-
-  avatar: text('avatar'),
-  phone: text('phone'),
-  firstName: text('first_name'),
-  lastName: text('last_name'),
-  fullName: text('full_name'),
-
-  isOnboarded: boolean('is_onboarded').default(false),
-  // Time user was created in Clerk
-  clerkCreatedAt: timestamptz('clerk_created_at'),
-
-  // Required by nextauth, all null allowed
-  emailVerifiedAt: timestamptz('email_verified_at'),
-
-  preference: jsonb('preference').$defaultFn(() => DEFAULT_PREFERENCE),
-
-  createdAt: createdAt(),
-  updatedAt: updatedAt(),
-});
-
-export type NewUser = typeof users.$inferInsert;
-export type UserItem = typeof users.$inferSelect;
-
-export const userSubscriptions = pgTable('user_subscriptions', {
-  id: text('id').primaryKey().notNull(),
-  userId: text('user_id')
-    .references(() => users.id, { onDelete: 'cascade' })
-    .notNull(),
-  stripeId: text('stripe_id'),
-
-  currency: text('currency'),
-  pricing: integer('pricing'),
-  billingPaidAt: integer('billing_paid_at'),
-  billingCycleStart: integer('billing_cycle_start'),
-  billingCycleEnd: integer('billing_cycle_end'),
-
-  cancelAtPeriodEnd: boolean('cancel_at_period_end'),
-  cancelAt: integer('cancel_at'),
-
-  nextBilling: jsonb('next_billing'),
-
-  plan: text('plan'),
-  recurring: text('recurring'),
-
-  storageLimit: integer('storage_limit'),
-
-  status: integer('status'),
-  createdAt: createdAt(),
-  updatedAt: updatedAt(),
-});
-
-export type NewUserSubscription = typeof userSubscriptions.$inferInsert;
-export type UserSubscriptionItem = typeof userSubscriptions.$inferSelect;
-
-export const userBudgets = pgTable('user_budgets', {
-  id: text('id')
-    .primaryKey()
-    .references(() => users.id, { onDelete: 'cascade' })
-    .notNull(),
-
-  freeBudgetId: text('free_budget_id'),
-  freeBudgetKey: text('free_budget_key'),
-
-  subscriptionBudgetId: text('subscription_budget_id'),
-  subscriptionBudgetKey: text('subscription_budget_key'),
-
-  packageBudgetId: text('package_budget_id'),
-  packageBudgetKey: text('package_budget_key'),
-
-  createdAt: createdAt(),
-  updatedAt: updatedAt(),
-});
-
-export type NewUserBudgets = typeof userBudgets.$inferInsert;
-export type UserBudgetItem = typeof userBudgets.$inferSelect;
-
-export const userSettings = pgTable('user_settings', {
-  id: text('id')
-    .references(() => users.id, { onDelete: 'cascade' })
-    .primaryKey(),
-
-  tts: jsonb('tts'),
-  keyVaults: text('key_vaults'),
-  general: jsonb('general'),
-  languageModel: jsonb('language_model'),
-  systemAgent: jsonb('system_agent'),
-  defaultAgent: jsonb('default_agent'),
-  tool: jsonb('tool'),
-});
-
-export const tags = pgTable('tags', {
-  id: serial('id').primaryKey(),
-  slug: text('slug').notNull().unique(),
-  name: text('name'),
-
-  userId: text('user_id')
-    .references(() => users.id, { onDelete: 'cascade' })
-    .notNull(),
-
-  createdAt: createdAt(),
-  updatedAt: updatedAt(),
-});
-
-export const files = pgTable('files', {
-  id: text('id')
-    .$defaultFn(() => idGenerator('files'))
-    .primaryKey(),
-
-  userId: text('user_id')
-    .references(() => users.id, { onDelete: 'cascade' })
-    .notNull(),
-  fileType: varchar('file_type', { length: 255 }).notNull(),
-  name: text('name').notNull(),
-  size: integer('size').notNull(),
-  url: text('url').notNull(),
-
-  metadata: jsonb('metadata'),
-
-  createdAt: createdAt(),
-  updatedAt: updatedAt(),
-});
-
-export type NewFile = typeof files.$inferInsert;
-export type FileItem = typeof files.$inferSelect;
-
-export const plugins = pgTable('plugins', {
-  id: serial('id').primaryKey(),
-  identifier: text('identifier').notNull().unique(),
-
-  title: text('title').notNull(),
-  description: text('description'),
-  avatar: text('avatar'),
-  author: text('author'),
-
-  manifest: text('manifest').notNull(),
-  locale: text('locale').notNull(),
-  createdAt: createdAt(),
-  updatedAt: updatedAt(),
-});
+import { idGenerator, randomSlug } from '../../utils/idGenerator';
+import { createdAt, updatedAt } from './_helpers';
+import { files } from './file';
+import { users } from './user';
 
 export const installedPlugins = pgTable(
   'user_installed_plugins',
@@ -204,21 +46,6 @@ export const installedPlugins = pgTable(
 export type NewInstalledPlugin = typeof installedPlugins.$inferInsert;
 export type InstalledPluginItem = typeof installedPlugins.$inferSelect;
 
-export const pluginsTags = pgTable(
-  'plugins_tags',
-  {
-    pluginId: integer('plugin_id')
-      .notNull()
-      .references(() => plugins.id, { onDelete: 'cascade' }),
-    tagId: integer('tag_id')
-      .notNull()
-      .references(() => tags.id, { onDelete: 'cascade' }),
-  },
-  (t) => ({
-    pk: primaryKey({ columns: [t.pluginId, t.tagId] }),
-  }),
-);
-
 //  ======= agents ======= //
 export const agents = pgTable('agents', {
   id: text('id')
@@ -252,47 +79,11 @@ export const agents = pgTable('agents', {
   updatedAt: updatedAt(),
 });
 
-export const agentsTags = pgTable(
-  'agents_tags',
-  {
-    agentId: text('agent_id')
-      .notNull()
-      .references(() => agents.id, { onDelete: 'cascade' }),
-    tagId: integer('tag_id')
-      .notNull()
-      .references(() => tags.id, { onDelete: 'cascade' }),
-  },
-  (t) => ({
-    pk: primaryKey({ columns: [t.agentId, t.tagId] }),
-  }),
-);
 export const insertAgentSchema = createInsertSchema(agents);
 
 export type NewAgent = typeof agents.$inferInsert;
 export type AgentItem = typeof agents.$inferSelect;
 
-//  ======= market ======= //
-
-export const market = pgTable('market', {
-  id: serial('id').primaryKey(),
-
-  agentId: text('agent_id').references(() => agents.id, { onDelete: 'cascade' }),
-  pluginId: integer('plugin_id').references(() => plugins.id, { onDelete: 'cascade' }),
-
-  type: text('type', { enum: ['plugin', 'model', 'agent', 'group'] }).notNull(),
-
-  view: integer('view').default(0),
-  like: integer('like').default(0),
-  used: integer('used').default(0),
-
-  userId: text('user_id')
-    .references(() => users.id, { onDelete: 'cascade' })
-    .notNull(),
-
-  createdAt: createdAt(),
-  updatedAt: updatedAt(),
-});
-
 //  ======= sessionGroups ======= //
 
 export const sessionGroups = pgTable(
@@ -538,125 +329,3 @@ export const filesToAgents = pgTable(
     pk: primaryKey({ columns: [t.fileId, t.agentId] }),
   }),
 );
-
-export const filesRelations = relations(files, ({ many }) => ({
-  filesToMessages: many(filesToMessages),
-  filesToSessions: many(filesToSessions),
-  filesToAgents: many(filesToAgents),
-}));
-
-export const topicRelations = relations(topics, ({ one }) => ({
-  session: one(sessions, {
-    fields: [topics.sessionId],
-    references: [sessions.id],
-  }),
-}));
-
-export const pluginsRelations = relations(plugins, ({ many }) => ({
-  pluginsTags: many(pluginsTags),
-}));
-
-export const pluginsTagsRelations = relations(pluginsTags, ({ one }) => ({
-  plugin: one(plugins, {
-    fields: [pluginsTags.pluginId],
-    references: [plugins.id],
-  }),
-  tag: one(tags, {
-    fields: [pluginsTags.tagId],
-    references: [tags.id],
-  }),
-}));
-
-export const tagsRelations = relations(tags, ({ many }) => ({
-  agentsTags: many(agentsTags),
-  pluginsTags: many(pluginsTags),
-}));
-
-export const messagesRelations = relations(messages, ({ many, one }) => ({
-  filesToMessages: many(filesToMessages),
-
-  session: one(sessions, {
-    fields: [messages.sessionId],
-    references: [sessions.id],
-  }),
-
-  parent: one(messages, {
-    fields: [messages.parentId],
-    references: [messages.id],
-  }),
-
-  topic: one(topics, {
-    fields: [messages.topicId],
-    references: [topics.id],
-  }),
-}));
-
-export const agentsRelations = relations(agents, ({ many }) => ({
-  agentsToSessions: many(agentsToSessions),
-  filesToAgents: many(filesToAgents),
-  agentsTags: many(agentsTags),
-}));
-
-export const agentsToSessionsRelations = relations(agentsToSessions, ({ one }) => ({
-  session: one(sessions, {
-    fields: [agentsToSessions.sessionId],
-    references: [sessions.id],
-  }),
-  agent: one(agents, {
-    fields: [agentsToSessions.agentId],
-    references: [agents.id],
-  }),
-}));
-
-export const filesToAgentsRelations = relations(filesToAgents, ({ one }) => ({
-  agent: one(agents, {
-    fields: [filesToAgents.agentId],
-    references: [agents.id],
-  }),
-  file: one(files, {
-    fields: [filesToAgents.fileId],
-    references: [files.id],
-  }),
-}));
-
-export const filesToMessagesRelations = relations(filesToMessages, ({ one }) => ({
-  file: one(files, {
-    fields: [filesToMessages.fileId],
-    references: [files.id],
-  }),
-  message: one(messages, {
-    fields: [filesToMessages.messageId],
-    references: [messages.id],
-  }),
-}));
-
-export const filesToSessionsRelations = relations(filesToSessions, ({ one }) => ({
-  file: one(files, {
-    fields: [filesToSessions.fileId],
-    references: [files.id],
-  }),
-  session: one(sessions, {
-    fields: [filesToSessions.sessionId],
-    references: [sessions.id],
-  }),
-}));
-
-export const agentsTagsRelations = relations(agentsTags, ({ one }) => ({
-  agent: one(agents, {
-    fields: [agentsTags.agentId],
-    references: [agents.id],
-  }),
-  tag: one(tags, {
-    fields: [agentsTags.tagId],
-    references: [tags.id],
-  }),
-}));
-
-export const sessionsRelations = relations(sessions, ({ many, one }) => ({
-  filesToSessions: many(filesToSessions),
-  agentsToSessions: many(agentsToSessions),
-  group: one(sessionGroups, {
-    fields: [sessions.groupId],
-    references: [sessionGroups.id],
-  }),
-}));

package/src/database/server/schemas/lobechat/discover.ts

@@ -0,0 +1,84 @@
+/* eslint-disable sort-keys-fix/sort-keys-fix  */
+import { integer, pgTable, primaryKey, serial, text } from 'drizzle-orm/pg-core';
+
+import { createdAt, updatedAt } from './_helpers';
+import { agents } from './chat';
+import { users } from './user';
+
+export const tags = pgTable('tags', {
+  id: serial('id').primaryKey(),
+  slug: text('slug').notNull().unique(),
+  name: text('name'),
+
+  userId: text('user_id')
+    .references(() => users.id, { onDelete: 'cascade' })
+    .notNull(),
+
+  createdAt: createdAt(),
+  updatedAt: updatedAt(),
+});
+
+export const plugins = pgTable('plugins', {
+  id: serial('id').primaryKey(),
+  identifier: text('identifier').notNull().unique(),
+
+  title: text('title').notNull(),
+  description: text('description'),
+  avatar: text('avatar'),
+  author: text('author'),
+
+  manifest: text('manifest').notNull(),
+  locale: text('locale').notNull(),
+  createdAt: createdAt(),
+  updatedAt: updatedAt(),
+});
+
+export const pluginsTags = pgTable(
+  'plugins_tags',
+  {
+    pluginId: integer('plugin_id')
+      .notNull()
+      .references(() => plugins.id, { onDelete: 'cascade' }),
+    tagId: integer('tag_id')
+      .notNull()
+      .references(() => tags.id, { onDelete: 'cascade' }),
+  },
+  (t) => ({
+    pk: primaryKey({ columns: [t.pluginId, t.tagId] }),
+  }),
+);
+
+export const agentsTags = pgTable(
+  'agents_tags',
+  {
+    agentId: text('agent_id')
+      .notNull()
+      .references(() => agents.id, { onDelete: 'cascade' }),
+    tagId: integer('tag_id')
+      .notNull()
+      .references(() => tags.id, { onDelete: 'cascade' }),
+  },
+  (t) => ({
+    pk: primaryKey({ columns: [t.agentId, t.tagId] }),
+  }),
+);
+
+export const market = pgTable('market', {
+  id: serial('id').primaryKey(),
+
+  agentId: text('agent_id').references(() => agents.id, { onDelete: 'cascade' }),
+  pluginId: integer('plugin_id').references(() => plugins.id, { onDelete: 'cascade' }),
+
+  type: text('type', { enum: ['plugin', 'model', 'agent', 'group'] }).notNull(),
+
+  view: integer('view').default(0),
+  like: integer('like').default(0),
+  used: integer('used').default(0),
+
+  userId: text('user_id')
+    .references(() => users.id, { onDelete: 'cascade' })
+    .notNull(),
+
+  createdAt: createdAt(),
+  updatedAt: updatedAt(),
+});

package/src/database/server/schemas/lobechat/file.ts

@@ -0,0 +1,28 @@
+/* eslint-disable sort-keys-fix/sort-keys-fix  */
+import { integer, jsonb, pgTable, text, varchar } from 'drizzle-orm/pg-core';
+
+import { idGenerator } from '../../utils/idGenerator';
+import { createdAt, updatedAt } from './_helpers';
+import { users } from './user';
+
+export const files = pgTable('files', {
+  id: text('id')
+    .$defaultFn(() => idGenerator('files'))
+    .primaryKey(),
+
+  userId: text('user_id')
+    .references(() => users.id, { onDelete: 'cascade' })
+    .notNull(),
+  fileType: varchar('file_type', { length: 255 }).notNull(),
+  name: text('name').notNull(),
+  size: integer('size').notNull(),
+  url: text('url').notNull(),
+
+  metadata: jsonb('metadata'),
+
+  createdAt: createdAt(),
+  updatedAt: updatedAt(),
+});
+
+export type NewFile = typeof files.$inferInsert;
+export type FileItem = typeof files.$inferSelect;

package/src/database/server/schemas/lobechat/index.ts

@@ -0,0 +1,6 @@
+export * from './chat';
+export * from './discover';
+export * from './file';
+export * from './nextauth';
+export * from './relations';
+export * from './user';

package/src/database/server/schemas/{nextauth.ts → lobechat/nextauth.ts}

@@ -1,8 +1,7 @@
-//  ======= nextauth ======= //
 import { boolean, integer, pgTable, primaryKey, text, timestamp } from 'drizzle-orm/pg-core';
 import { AdapterAccount } from 'next-auth/adapters';
 
-import { users } from '@/database/server/schemas/lobechat';
+import { users } from './user';
 
 /**
  * This table stores nextauth accounts. This is used to link users to their sso profiles.

package/src/database/server/schemas/lobechat/relations.ts

@@ -0,0 +1,138 @@
+/* eslint-disable sort-keys-fix/sort-keys-fix  */
+import { relations } from 'drizzle-orm';
+
+import {
+  agents,
+  agentsToSessions,
+  filesToAgents,
+  filesToMessages,
+  filesToSessions,
+  messages,
+  sessionGroups,
+  sessions,
+  topics,
+} from './chat';
+import { agentsTags, plugins, pluginsTags, tags } from './discover';
+import { files } from './file';
+
+export const filesRelations = relations(files, ({ many }) => ({
+  filesToMessages: many(filesToMessages),
+  filesToSessions: many(filesToSessions),
+  filesToAgents: many(filesToAgents),
+}));
+
+export const topicRelations = relations(topics, ({ one }) => ({
+  session: one(sessions, {
+    fields: [topics.sessionId],
+    references: [sessions.id],
+  }),
+}));
+
+export const pluginsRelations = relations(plugins, ({ many }) => ({
+  pluginsTags: many(pluginsTags),
+}));
+
+export const pluginsTagsRelations = relations(pluginsTags, ({ one }) => ({
+  plugin: one(plugins, {
+    fields: [pluginsTags.pluginId],
+    references: [plugins.id],
+  }),
+  tag: one(tags, {
+    fields: [pluginsTags.tagId],
+    references: [tags.id],
+  }),
+}));
+
+export const tagsRelations = relations(tags, ({ many }) => ({
+  agentsTags: many(agentsTags),
+  pluginsTags: many(pluginsTags),
+}));
+
+export const messagesRelations = relations(messages, ({ many, one }) => ({
+  filesToMessages: many(filesToMessages),
+
+  session: one(sessions, {
+    fields: [messages.sessionId],
+    references: [sessions.id],
+  }),
+
+  parent: one(messages, {
+    fields: [messages.parentId],
+    references: [messages.id],
+  }),
+
+  topic: one(topics, {
+    fields: [messages.topicId],
+    references: [topics.id],
+  }),
+}));
+
+export const agentsRelations = relations(agents, ({ many }) => ({
+  agentsToSessions: many(agentsToSessions),
+  filesToAgents: many(filesToAgents),
+  agentsTags: many(agentsTags),
+}));
+
+export const agentsToSessionsRelations = relations(agentsToSessions, ({ one }) => ({
+  session: one(sessions, {
+    fields: [agentsToSessions.sessionId],
+    references: [sessions.id],
+  }),
+  agent: one(agents, {
+    fields: [agentsToSessions.agentId],
+    references: [agents.id],
+  }),
+}));
+
+export const filesToAgentsRelations = relations(filesToAgents, ({ one }) => ({
+  agent: one(agents, {
+    fields: [filesToAgents.agentId],
+    references: [agents.id],
+  }),
+  file: one(files, {
+    fields: [filesToAgents.fileId],
+    references: [files.id],
+  }),
+}));
+
+export const filesToMessagesRelations = relations(filesToMessages, ({ one }) => ({
+  file: one(files, {
+    fields: [filesToMessages.fileId],
+    references: [files.id],
+  }),
+  message: one(messages, {
+    fields: [filesToMessages.messageId],
+    references: [messages.id],
+  }),
+}));
+
+export const filesToSessionsRelations = relations(filesToSessions, ({ one }) => ({
+  file: one(files, {
+    fields: [filesToSessions.fileId],
+    references: [files.id],
+  }),
+  session: one(sessions, {
+    fields: [filesToSessions.sessionId],
+    references: [sessions.id],
+  }),
+}));
+
+export const agentsTagsRelations = relations(agentsTags, ({ one }) => ({
+  agent: one(agents, {
+    fields: [agentsTags.agentId],
+    references: [agents.id],
+  }),
+  tag: one(tags, {
+    fields: [agentsTags.tagId],
+    references: [tags.id],
+  }),
+}));
+
+export const sessionsRelations = relations(sessions, ({ many, one }) => ({
+  filesToSessions: many(filesToSessions),
+  agentsToSessions: many(agentsToSessions),
+  group: one(sessionGroups, {
+    fields: [sessions.groupId],
+    references: [sessionGroups.id],
+  }),
+}));

package/src/database/server/schemas/lobechat/user.ts

@@ -0,0 +1,111 @@
+/* eslint-disable sort-keys-fix/sort-keys-fix  */
+import {
+  boolean,
+  integer,
+  jsonb,
+  pgTable,
+  text,
+} from 'drizzle-orm/pg-core';
+
+import { DEFAULT_PREFERENCE } from '@/const/user';
+
+import { createdAt, timestamptz, updatedAt } from './_helpers';
+
+/**
+ * This table stores users. Users are created in Clerk, then Clerk calls a
+ * webhook at /api/webhook/clerk to inform this application a user was created.
+ */
+export const users = pgTable('users', {
+  // The ID will be the user's ID from Clerk
+  id: text('id').primaryKey().notNull(),
+  username: text('username').unique(),
+  email: text('email'),
+
+  avatar: text('avatar'),
+  phone: text('phone'),
+  firstName: text('first_name'),
+  lastName: text('last_name'),
+  fullName: text('full_name'),
+
+  isOnboarded: boolean('is_onboarded').default(false),
+  // Time user was created in Clerk
+  clerkCreatedAt: timestamptz('clerk_created_at'),
+
+  // Required by nextauth, all null allowed
+  emailVerifiedAt: timestamptz('email_verified_at'),
+
+  preference: jsonb('preference').$defaultFn(() => DEFAULT_PREFERENCE),
+
+  createdAt: createdAt(),
+  updatedAt: updatedAt(),
+});
+
+export type NewUser = typeof users.$inferInsert;
+export type UserItem = typeof users.$inferSelect;
+
+export const userSubscriptions = pgTable('user_subscriptions', {
+  id: text('id').primaryKey().notNull(),
+  userId: text('user_id')
+    .references(() => users.id, { onDelete: 'cascade' })
+    .notNull(),
+  stripeId: text('stripe_id'),
+
+  currency: text('currency'),
+  pricing: integer('pricing'),
+  billingPaidAt: integer('billing_paid_at'),
+  billingCycleStart: integer('billing_cycle_start'),
+  billingCycleEnd: integer('billing_cycle_end'),
+
+  cancelAtPeriodEnd: boolean('cancel_at_period_end'),
+  cancelAt: integer('cancel_at'),
+
+  nextBilling: jsonb('next_billing'),
+
+  plan: text('plan'),
+  recurring: text('recurring'),
+
+  storageLimit: integer('storage_limit'),
+
+  status: integer('status'),
+  createdAt: createdAt(),
+  updatedAt: updatedAt(),
+});
+
+export type NewUserSubscription = typeof userSubscriptions.$inferInsert;
+export type UserSubscriptionItem = typeof userSubscriptions.$inferSelect;
+
+export const userBudgets = pgTable('user_budgets', {
+  id: text('id')
+    .primaryKey()
+    .references(() => users.id, { onDelete: 'cascade' })
+    .notNull(),
+
+  freeBudgetId: text('free_budget_id'),
+  freeBudgetKey: text('free_budget_key'),
+
+  subscriptionBudgetId: text('subscription_budget_id'),
+  subscriptionBudgetKey: text('subscription_budget_key'),
+
+  packageBudgetId: text('package_budget_id'),
+  packageBudgetKey: text('package_budget_key'),
+
+  createdAt: createdAt(),
+  updatedAt: updatedAt(),
+});
+
+export type NewUserBudgets = typeof userBudgets.$inferInsert;
+export type UserBudgetItem = typeof userBudgets.$inferSelect;
+
+export const userSettings = pgTable('user_settings', {
+  id: text('id')
+    .references(() => users.id, { onDelete: 'cascade' })
+    .primaryKey(),
+
+  tts: jsonb('tts'),
+  keyVaults: text('key_vaults'),
+  general: jsonb('general'),
+  languageModel: jsonb('language_model'),
+  systemAgent: jsonb('system_agent'),
+  defaultAgent: jsonb('default_agent'),
+  tool: jsonb('tool'),
+});

package/src/libs/agent-runtime/AgentRuntime.test.ts

@@ -76,7 +76,7 @@ describe('AgentRuntime', () => {
         const jwtPayload = {
           apikey: 'user-azure-key',
           endpoint: 'user-azure-endpoint',
-          apiVersion: '2024-02-01',
+          apiVersion: '2024-06-01',
         };
 
         const runtime = await AgentRuntime.initializeWithProviderOptions(ModelProvider.Azure, {

package/src/locales/default/modelProvider.ts

@@ -3,7 +3,7 @@ export default {
     azureApiVersion: {
       desc: 'Azure 的 API 版本，遵循 YYYY-MM-DD 格式，查阅[最新版本](https://learn.microsoft.com/zh-cn/azure/ai-services/openai/reference#chat-completions)',
       fetch: '获取列表',
-      title: 'Azure Api Version',
+      title: 'Azure API Version',
     },
     empty: '请输入模型 ID 添加第一个模型',
     endpoint: {

package/src/services/__tests__/chat.test.ts

@@ -838,7 +838,7 @@ describe('AgentRuntimeOnClient', () => {
               azure: {
                 apiKey: 'user-azure-key',
                 endpoint: 'user-azure-endpoint',
-                apiVersion: '2024-02-01',
+                apiVersion: '2024-06-01',
               },
             },
           },

package/src/database/server/schemas/_id.ts

@@ -1,15 +0,0 @@
-// refs: https://unkey.dev/blog/uuid-ux
-
-// If I have 100 million users, each generating up to 1 million messages.
-// Then the total number of IDs that need to be generated: 100 million × 1 million = 10^14 (100 trillion)
-// 11-digit Nano ID: 36^11 ≈ 1.3 × 10^17 (130 trillion trillion)
-
-export const FILE_ID_LENGTH = 19; // 5 prefix + 14 random, e.g. file_ydGX5gmaxL32fh
-
-export const MESSAGE_ID_LENGTH = 18; // 4 prefix + 14 random, e.g. msg_GX5ymaxL3d2ds2
-
-export const SESSION_ID_LENGTH = 16; // 4 prefix + 12 random, e.g. ssn_GX5y3d2dmaxL
-
-export const TOPIC_ID_LENGTH = 16; // 4 prefix + 12 random, e.g. tpc_GX5ymd7axL3y
-
-export const USER_ID_LENGTH = 14; // 4 prefix + 10 random, e.g. user_GXyxLmd75a