@lobehub/chat 1.47.8 → 1.47.10

package/CHANGELOG.md

@@ -2,6 +2,56 @@
 
 # Changelog
 
+### [Version 1.47.10](https://github.com/lobehub/lobe-chat/compare/v1.47.9...v1.47.10)
+
+<sup>Released on **2025-01-21**</sup>
+
+#### 💄 Styles
+
+- **misc**: Support assistant blacklist.
+
+<br/>
+
+<details>
+<summary><kbd>Improvements and Fixes</kbd></summary>
+
+#### Styles
+
+- **misc**: Support assistant blacklist, closes [#5527](https://github.com/lobehub/lobe-chat/issues/5527) ([3534c0d](https://github.com/lobehub/lobe-chat/commit/3534c0d))
+
+</details>
+
+<div align="right">
+
+[![](https://img.shields.io/badge/-BACK_TO_TOP-151515?style=flat-square)](#readme-top)
+
+</div>
+
+### [Version 1.47.9](https://github.com/lobehub/lobe-chat/compare/v1.47.8...v1.47.9)
+
+<sup>Released on **2025-01-20**</sup>
+
+#### ♻ Code Refactoring
+
+- **misc**: Improve error code.
+
+<br/>
+
+<details>
+<summary><kbd>Improvements and Fixes</kbd></summary>
+
+#### Code refactoring
+
+- **misc**: Improve error code, closes [#5525](https://github.com/lobehub/lobe-chat/issues/5525) ([4fc4fa6](https://github.com/lobehub/lobe-chat/commit/4fc4fa6))
+
+</details>
+
+<div align="right">
+
+[![](https://img.shields.io/badge/-BACK_TO_TOP-151515?style=flat-square)](#readme-top)
+
+</div>
+
 ### [Version 1.47.8](https://github.com/lobehub/lobe-chat/compare/v1.47.7...v1.47.8)
 
 <sup>Released on **2025-01-20**</sup>

package/changelog/v1.json

@@ -1,4 +1,22 @@
 [
+  {
+    "children": {
+      "improvements": [
+        "Support assistant blacklist."
+      ]
+    },
+    "date": "2025-01-21",
+    "version": "1.47.10"
+  },
+  {
+    "children": {
+      "improvements": [
+        "Improve error code."
+      ]
+    },
+    "date": "2025-01-20",
+    "version": "1.47.9"
+  },
   {
     "children": {
       "improvements": [

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lobehub/chat",
-  "version": "1.47.8",
+  "version": "1.47.10",
   "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/(backend)/webapi/revalidate/route.ts

@@ -0,0 +1,24 @@
+import { revalidateTag } from 'next/cache';
+import { NextRequest, NextResponse } from 'next/server';
+
+export const GET = async (request: NextRequest) => {
+  if (!process.env.REVALIDATE_SECRET) {
+    return NextResponse.json('REVALIDATE_SECRET is not set', { status: 501 });
+  }
+
+  const authToken = request.headers.get('Authorization');
+
+  if (!authToken || authToken !== process.env.REVALIDATE_SECRET) {
+    return NextResponse.json('Unauthorized', { status: 401 });
+  }
+
+  const tag = request.nextUrl.searchParams.get('tag');
+
+  if (!tag) {
+    return NextResponse.json('tag query parameter is required', { status: 400 });
+  }
+
+  revalidateTag(tag);
+
+  return Response.json({ now: Date.now(), revalidated: true });
+};

package/src/database/schemas/user.ts

@@ -39,6 +39,9 @@ export const userSettings = pgTable('user_settings', {
     .primaryKey(),
 
   tts: jsonb('tts'),
+  /**
+   * @deprecated
+   */
   keyVaults: text('key_vaults'),
   general: jsonb('general'),
   languageModel: jsonb('language_model'),

package/src/server/globalConfig/genServerAiProviderConfig.ts

@@ -12,6 +12,12 @@ export const genServerAiProvidersConfig = (specificConfig: Record<any, any>) =>
     (config, provider) => {
       const providerUpperCase = provider.toUpperCase();
       const providerCard = AiModels[provider] as AiFullModelCard[];
+
+      if (!providerCard)
+        throw new Error(
+          `Provider [${provider}] not found in aiModels, please make sure you have exported the provider in the \`aiModels/index.ts\``,
+        );
+
       const providerConfig = specificConfig[provider as keyof typeof specificConfig] || {};
       const providerModelList =
         process.env[providerConfig.modelListKey ?? `${providerUpperCase}_MODEL_LIST`];

package/src/server/modules/AssistantStore/index.ts

@@ -5,6 +5,7 @@ import { DEFAULT_LANG, isLocaleNotSupport } from '@/const/locale';
 import { Locales, normalizeLocale } from '@/locales/resources';
 import { EdgeConfig } from '@/server/modules/EdgeConfig';
 import { AgentStoreIndex } from '@/types/discover';
+import { RevalidateTag } from '@/types/requestCache';
 
 export class AssistantStore {
   private readonly baseUrl: string;
@@ -29,10 +30,14 @@ export class AssistantStore {
     try {
       let res: Response;
 
-      res = await fetch(this.getAgentIndexUrl(locale as any), { next: { revalidate } });
+      res = await fetch(this.getAgentIndexUrl(locale as any), {
+        next: { revalidate, tags: [RevalidateTag.AgentIndex] },
+      });
 
       if (res.status === 404) {
-        res = await fetch(this.getAgentIndexUrl(DEFAULT_LANG), { next: { revalidate } });
+        res = await fetch(this.getAgentIndexUrl(DEFAULT_LANG), {
+          next: { revalidate, tags: [RevalidateTag.AgentIndex] },
+        });
       }
 
       if (!res.ok) {
@@ -42,14 +47,20 @@ export class AssistantStore {
 
       const data: AgentStoreIndex = await res.json();
 
-      // Get the assistant whitelist from Edge Config
-      const edgeConfig = new EdgeConfig();
+      if (EdgeConfig.isEnabled()) {
+        // Get the assistant whitelist from Edge Config
+        const edgeConfig = new EdgeConfig();
 
-      if (!!appEnv.VERCEL_EDGE_CONFIG) {
-        const assistantWhitelist = await edgeConfig.getAgentWhitelist();
+        const { whitelist, blacklist } = await edgeConfig.getAgentRestrictions();
 
-        if (assistantWhitelist && assistantWhitelist?.length > 0) {
-          data.agents = data.agents.filter((item) => assistantWhitelist.includes(item.identifier));
+        // use whitelist mode first
+        if (whitelist && whitelist?.length > 0) {
+          data.agents = data.agents.filter((item) => whitelist.includes(item.identifier));
+        }
+
+        // if no whitelist, use blacklist mode
+        else if (blacklist && blacklist?.length > 0) {
+          data.agents = data.agents.filter((item) => !blacklist.includes(item.identifier));
         }
       }
 

package/src/server/modules/EdgeConfig/index.ts

@@ -2,12 +2,16 @@ import { EdgeConfigClient, createClient } from '@vercel/edge-config';
 
 import { appEnv } from '@/config/app';
 
-enum EdgeConfigKeys {
+const EdgeConfigKeys = {
   /**
    * Assistant whitelist
    */
-  AssistantWhitelist = 'assistant_whitelist',
-}
+  AssistantBlacklist: 'assistant_blacklist',
+  /**
+   * Assistant whitelist
+   */
+  AssistantWhitelist: 'assistant_whitelist',
+};
 
 export class EdgeConfig {
   get client(): EdgeConfigClient {
@@ -17,7 +21,23 @@ export class EdgeConfig {
     return createClient(appEnv.VERCEL_EDGE_CONFIG);
   }
 
-  getAgentWhitelist = async (): Promise<string[] | undefined> => {
-    return this.client.get<string[]>(EdgeConfigKeys.AssistantWhitelist);
+  /**
+   * Check if Edge Config is enabled
+   */
+  static isEnabled() {
+    return !!appEnv.VERCEL_EDGE_CONFIG;
+  }
+
+  getAgentRestrictions = async () => {
+    const { assistant_blacklist: blacklist, assistant_whitelist: whitelist } =
+      await this.client.getAll([
+        EdgeConfigKeys.AssistantWhitelist,
+        EdgeConfigKeys.AssistantBlacklist,
+      ]);
+
+    return { blacklist, whitelist } as {
+      blacklist: string[] | undefined;
+      whitelist: string[] | undefined;
+    };
   };
 }

package/src/types/requestCache.ts

@@ -0,0 +1,3 @@
+export enum RevalidateTag {
+  AgentIndex = 'agent_index',
+}