@lobehub/chat 1.5.2 → 1.5.4

package/CHANGELOG.md

@@ -2,6 +2,57 @@
 
 # Changelog
 
+### [Version 1.5.4](https://github.com/lobehub/lobe-chat/compare/v1.5.3...v1.5.4)
+
+<sup>Released on **2024-07-17**</sup>
+
+#### 🐛 Bug Fixes
+
+- **misc**: Fix delete session group.
+
+<br/>
+
+<details>
+<summary><kbd>Improvements and Fixes</kbd></summary>
+
+#### What's fixed
+
+- **misc**: Fix delete session group, closes [#3245](https://github.com/lobehub/lobe-chat/issues/3245) ([8f7167d](https://github.com/lobehub/lobe-chat/commit/8f7167d))
+
+</details>
+
+<div align="right">
+
+[![](https://img.shields.io/badge/-BACK_TO_TOP-151515?style=flat-square)](#readme-top)
+
+</div>
+
+### [Version 1.5.3](https://github.com/lobehub/lobe-chat/compare/v1.5.2...v1.5.3)
+
+<sup>Released on **2024-07-17**</sup>
+
+#### 🐛 Bug Fixes
+
+- **misc**: Fix `OpenAI` deployment restrictions, fix cant duplicate assistant.
+
+<br/>
+
+<details>
+<summary><kbd>Improvements and Fixes</kbd></summary>
+
+#### What's fixed
+
+- **misc**: Fix `OpenAI` deployment restrictions, closes [#3206](https://github.com/lobehub/lobe-chat/issues/3206) ([3d7a35d](https://github.com/lobehub/lobe-chat/commit/3d7a35d))
+- **misc**: Fix cant duplicate assistant, closes [#3242](https://github.com/lobehub/lobe-chat/issues/3242) ([0edc851](https://github.com/lobehub/lobe-chat/commit/0edc851))
+
+</details>
+
+<div align="right">
+
+[![](https://img.shields.io/badge/-BACK_TO_TOP-151515?style=flat-square)](#readme-top)
+
+</div>
+
 ### [Version 1.5.2](https://github.com/lobehub/lobe-chat/compare/v1.5.1...v1.5.2)
 
 <sup>Released on **2024-07-17**</sup>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lobehub/chat",
-  "version": "1.5.2",
+  "version": "1.5.4",
   "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]/route.ts

@@ -1,4 +1,3 @@
-import { getPreferredRegion } from '@/app/api/config';
 import { createErrorResponse } from '@/app/api/errorResponse';
 import { AgentRuntime, ChatCompletionErrorPayload } from '@/libs/agent-runtime';
 import { ChatErrorType } from '@/types/fetch';
@@ -10,8 +9,6 @@ import { createTraceOptions, initAgentRuntimeWithUserPayload } from '../agentRun
 
 export const runtime = 'edge';
 
-export const preferredRegion = getPreferredRegion();
-
 export const POST = checkAuth(async (req: Request, { params, jwtPayload, createRuntime }) => {
   const { provider } = params;
 

package/src/app/api/chat/models/[provider]/route.ts

@@ -1,6 +1,5 @@
 import { NextResponse } from 'next/server';
 
-import { getPreferredRegion } from '@/app/api/config';
 import { createErrorResponse } from '@/app/api/errorResponse';
 import { ChatCompletionErrorPayload, ModelProvider } from '@/libs/agent-runtime';
 import { ChatErrorType } from '@/types/fetch';
@@ -10,8 +9,6 @@ import { initAgentRuntimeWithUserPayload } from '../../agentRuntime';
 
 export const runtime = 'edge';
 
-export const preferredRegion = getPreferredRegion();
-
 const noNeedAPIKey = (provider: string) =>
   [ModelProvider.OpenRouter, ModelProvider.TogetherAI].includes(provider as any);
 

package/src/app/api/chat/openai/route.test.ts

@@ -0,0 +1,28 @@
+// @vitest-environment edge-runtime
+import { describe, expect, it, vi } from 'vitest';
+
+import { POST as UniverseRoute } from '../[provider]/route';
+import { POST, preferredRegion, runtime } from './route';
+
+// 模拟 '../[provider]/route'
+vi.mock('../[provider]/route', () => ({
+  POST: vi.fn().mockResolvedValue('mocked response'),
+}));
+
+describe('Configuration tests', () => {
+  it('should have runtime set to "edge"', () => {
+    expect(runtime).toBe('edge');
+  });
+
+  it('should contain specific regions in preferredRegion', () => {
+    expect(preferredRegion).not.contain(['hkg1']);
+  });
+});
+
+describe('OpenAI POST function tests', () => {
+  it('should call UniverseRoute with correct parameters', async () => {
+    const mockRequest = new Request('https://example.com', { method: 'POST' });
+    await POST(mockRequest);
+    expect(UniverseRoute).toHaveBeenCalledWith(mockRequest, { params: { provider: 'openai' } });
+  });
+});

package/src/app/api/chat/openai/route.ts

@@ -0,0 +1,25 @@
+import { POST as UniverseRoute } from '../[provider]/route';
+
+export const runtime = 'edge';
+
+export const preferredRegion = [
+  'arn1',
+  'bom1',
+  'cdg1',
+  'cle1',
+  'cpt1',
+  'dub1',
+  'fra1',
+  'gru1',
+  'hnd1',
+  'iad1',
+  'icn1',
+  'kix1',
+  'lhr1',
+  'pdx1',
+  'sfo1',
+  'sin1',
+  'syd1',
+];
+
+export const POST = async (req: Request) => UniverseRoute(req, { params: { provider: 'openai' } });

package/src/app/api/openai/stt/route.ts

@@ -1,11 +1,29 @@
 import { OpenAISTTPayload } from '@lobehub/tts';
 import { createOpenaiAudioTranscriptions } from '@lobehub/tts/server';
 
-import { getPreferredRegion } from '../../config';
-import { createBizOpenAI } from '../createBizOpenAI';
+import { createBizOpenAI } from '@/app/api/openai/createBizOpenAI';
 
 export const runtime = 'edge';
-export const preferredRegion = getPreferredRegion();
+
+export const preferredRegion = [
+  'arn1',
+  'bom1',
+  'cdg1',
+  'cle1',
+  'cpt1',
+  'dub1',
+  'fra1',
+  'gru1',
+  'hnd1',
+  'iad1',
+  'icn1',
+  'kix1',
+  'lhr1',
+  'pdx1',
+  'sfo1',
+  'sin1',
+  'syd1',
+];
 
 export const POST = async (req: Request) => {
   const formData = await req.formData();

package/src/app/api/openai/tts/route.ts

@@ -1,11 +1,29 @@
 import { OpenAITTSPayload } from '@lobehub/tts';
 import { createOpenaiAudioSpeech } from '@lobehub/tts/server';
 
-import { getPreferredRegion } from '../../config';
-import { createBizOpenAI } from '../createBizOpenAI';
+import { createBizOpenAI } from '@/app/api/openai/createBizOpenAI';
 
 export const runtime = 'edge';
-export const preferredRegion = getPreferredRegion();
+
+export const preferredRegion = [
+  'arn1',
+  'bom1',
+  'cdg1',
+  'cle1',
+  'cpt1',
+  'dub1',
+  'fra1',
+  'gru1',
+  'hnd1',
+  'iad1',
+  'icn1',
+  'kix1',
+  'lhr1',
+  'pdx1',
+  'sfo1',
+  'sin1',
+  'syd1',
+];
 
 export const POST = async (req: Request) => {
   const payload = (await req.json()) as OpenAITTSPayload;

package/src/app/api/text-to-image/[provider]/route.ts

@@ -1,17 +1,33 @@
 import { NextResponse } from 'next/server';
 
-import { getPreferredRegion } from '@/app/api/config';
+import { initAgentRuntimeWithUserPayload } from '@/app/api/chat/agentRuntime';
 import { createErrorResponse } from '@/app/api/errorResponse';
+import { checkAuth } from '@/app/api/middleware/auth';
 import { ChatCompletionErrorPayload } from '@/libs/agent-runtime';
 import { TextToImagePayload } from '@/libs/agent-runtime/types';
 import { ChatErrorType } from '@/types/fetch';
 
-import { initAgentRuntimeWithUserPayload } from '../../chat/agentRuntime';
-import { checkAuth } from '../../middleware/auth';
-
 export const runtime = 'edge';
 
-export const preferredRegion = getPreferredRegion();
+export const preferredRegion = [
+  'arn1',
+  'bom1',
+  'cdg1',
+  'cle1',
+  'cpt1',
+  'dub1',
+  'fra1',
+  'gru1',
+  'hnd1',
+  'iad1',
+  'icn1',
+  'kix1',
+  'lhr1',
+  'pdx1',
+  'sfo1',
+  'sin1',
+  'syd1',
+];
 
 // return NextResponse.json(
 //   {

package/src/config/llm.ts

@@ -3,12 +3,6 @@ import { createEnv } from '@t3-oss/env-nextjs';
 import { z } from 'zod';
 
 export const getLLMConfig = () => {
-  // region format: iad1,sfo1
-  let regions: string[] = [];
-  if (process.env.OPENAI_FUNCTION_REGIONS) {
-    regions = process.env.OPENAI_FUNCTION_REGIONS.split(',');
-  }
-
   return createEnv({
     server: {
       API_KEY_SELECT_MODE: z.string().optional(),
@@ -17,7 +11,6 @@ export const getLLMConfig = () => {
       OPENAI_API_KEY: z.string().optional(),
       OPENAI_PROXY_URL: z.string().optional(),
       OPENAI_MODEL_LIST: z.string().optional(),
-      OPENAI_FUNCTION_REGIONS: z.array(z.string()),
 
       ENABLED_AZURE_OPENAI: z.boolean(),
       AZURE_API_KEY: z.string().optional(),
@@ -99,7 +92,6 @@ export const getLLMConfig = () => {
       OPENAI_API_KEY: process.env.OPENAI_API_KEY,
       OPENAI_PROXY_URL: process.env.OPENAI_PROXY_URL,
       OPENAI_MODEL_LIST: process.env.OPENAI_MODEL_LIST,
-      OPENAI_FUNCTION_REGIONS: regions as any,
 
       ENABLED_AZURE_OPENAI: !!process.env.AZURE_API_KEY,
       AZURE_API_KEY: process.env.AZURE_API_KEY,

package/src/database/server/models/__tests__/sessionGroup.test.ts

@@ -0,0 +1,156 @@
+// @vitest-environment node
+import { eq } from 'drizzle-orm';
+import { desc } from 'drizzle-orm/expressions';
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
+
+import { getTestDBInstance } from '@/database/server/core/dbForTest';
+
+import { sessionGroups, users } from '../../schemas/lobechat';
+import { SessionGroupModel } from '../sessionGroup';
+
+let serverDB = await getTestDBInstance();
+
+vi.mock('@/database/server/core/db', async () => ({
+  get serverDB() {
+    return serverDB;
+  },
+}));
+
+const userId = 'session-group-model-test-user-id';
+const sessionGroupModel = new SessionGroupModel(userId);
+
+beforeEach(async () => {
+  await serverDB.delete(users);
+  await serverDB.insert(users).values([{ id: userId }, { id: 'user2' }]);
+});
+
+afterEach(async () => {
+  await serverDB.delete(users).where(eq(users.id, userId));
+  await serverDB.delete(sessionGroups).where(eq(sessionGroups.userId, userId));
+});
+
+describe('SessionGroupModel', () => {
+  describe('create', () => {
+    it('should create a new session group', async () => {
+      const params = {
+        name: 'Test Group',
+        sort: 1,
+      };
+
+      const result = await sessionGroupModel.create(params);
+      expect(result.id).toBeDefined();
+      expect(result).toMatchObject({ ...params, userId });
+
+      const group = await serverDB.query.sessionGroups.findFirst({
+        where: eq(sessionGroups.id, result.id),
+      });
+      expect(group).toMatchObject({ ...params, userId });
+    });
+  });
+  describe('delete', () => {
+    it('should delete a session group by id', async () => {
+      const { id } = await sessionGroupModel.create({ name: 'Test Group' });
+
+      await sessionGroupModel.delete(id);
+
+      const group = await serverDB.query.sessionGroups.findFirst({
+        where: eq(sessionGroups.id, id),
+      });
+      expect(group).toBeUndefined();
+    });
+  });
+  describe('deleteAll', () => {
+    it('should delete all session groups for the user', async () => {
+      await sessionGroupModel.create({ name: 'Test Group 1' });
+      await sessionGroupModel.create({ name: 'Test Group 2' });
+
+      await sessionGroupModel.deleteAll();
+
+      const userGroups = await serverDB.query.sessionGroups.findMany({
+        where: eq(sessionGroups.userId, userId),
+      });
+      expect(userGroups).toHaveLength(0);
+    });
+    it('should only delete session groups for the user, not others', async () => {
+      await sessionGroupModel.create({ name: 'Test Group 1' });
+      await sessionGroupModel.create({ name: 'Test Group 333' });
+
+      const anotherSessionGroupModel = new SessionGroupModel('user2');
+      await anotherSessionGroupModel.create({ name: 'Test Group 2' });
+
+      await sessionGroupModel.deleteAll();
+
+      const userGroups = await serverDB.query.sessionGroups.findMany({
+        where: eq(sessionGroups.userId, userId),
+      });
+      const total = await serverDB.query.sessionGroups.findMany();
+      expect(userGroups).toHaveLength(0);
+      expect(total).toHaveLength(1);
+    });
+  });
+
+  describe('query', () => {
+    it('should query session groups for the user', async () => {
+      await sessionGroupModel.create({ name: 'Test Group 1', sort: 2 });
+      await sessionGroupModel.create({ name: 'Test Group 2', sort: 1 });
+
+      const userGroups = await sessionGroupModel.query();
+      expect(userGroups).toHaveLength(2);
+      expect(userGroups[0].name).toBe('Test Group 2');
+      expect(userGroups[1].name).toBe('Test Group 1');
+    });
+  });
+
+  describe('findById', () => {
+    it('should find a session group by id', async () => {
+      const { id } = await sessionGroupModel.create({ name: 'Test Group' });
+
+      const group = await sessionGroupModel.findById(id);
+      expect(group).toMatchObject({
+        id,
+        name: 'Test Group',
+        userId,
+      });
+    });
+  });
+
+  describe('update', () => {
+    it('should update a session group', async () => {
+      const { id } = await sessionGroupModel.create({ name: 'Test Group' });
+
+      await sessionGroupModel.update(id, { name: 'Updated Test Group', sort: 3 });
+
+      const updatedGroup = await serverDB.query.sessionGroups.findFirst({
+        where: eq(sessionGroups.id, id),
+      });
+      expect(updatedGroup).toMatchObject({
+        id,
+        name: 'Updated Test Group',
+        sort: 3,
+        userId,
+      });
+    });
+  });
+
+  describe('updateOrder', () => {
+    it('should update order of session groups', async () => {
+      const group1 = await sessionGroupModel.create({ name: 'Test Group 1', sort: 1 });
+      const group2 = await sessionGroupModel.create({ name: 'Test Group 2', sort: 2 });
+
+      await sessionGroupModel.updateOrder([
+        { id: group1.id, sort: 3 },
+        { id: group2.id, sort: 4 },
+      ]);
+
+      const updatedGroup1 = await serverDB.query.sessionGroups.findFirst({
+        where: eq(sessionGroups.id, group1.id),
+      });
+      const updatedGroup2 = await serverDB.query.sessionGroups.findFirst({
+        where: eq(sessionGroups.id, group2.id),
+      });
+
+      expect(updatedGroup1?.sort).toBe(3);
+      expect(updatedGroup2?.sort).toBe(4);
+    });
+  });
+});

package/src/database/server/models/session.ts

@@ -173,8 +173,11 @@ export class SessionModel {
     const { agent, ...session } = result;
     const sessionId = this.genId();
 
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    const { id: _, slug: __, ...config } = agent;
+
     return this.create({
-      config: agent,
+      config: config,
       id: sessionId,
       session: {
         ...session,

package/src/database/server/models/sessionGroup.ts

@@ -29,7 +29,7 @@ export class SessionGroupModel {
   };
 
   deleteAll = async () => {
-    return serverDB.delete(sessionGroups);
+    return serverDB.delete(sessionGroups).where(eq(sessionGroups.userId, this.userId));
   };
 
   query = async () => {

package/src/app/api/config.test.ts

@@ -1,43 +0,0 @@
-// @vitest-environment node
-import { describe, expect, it, vi } from 'vitest';
-
-import { getPreferredRegion } from './config';
-
-// Stub the global process object to safely mock environment variables
-vi.stubGlobal('process', {
-  ...process, // Preserve the original process object
-  env: { ...process.env }, // Clone the environment variables object for modification
-});
-
-describe('getPreferredRegion', () => {
-  beforeEach(() => {
-    // Reset environment variables before each test case
-    vi.restoreAllMocks();
-  });
-
-  it('returns default value when get config error', () => {
-    const originalProcess = global.process;
-    const originalError = console.error;
-    // @ts-ignore
-    global.process = undefined;
-    console.error = () => {};
-
-    const preferredRegion = getPreferredRegion();
-    expect(preferredRegion).toBe('auto');
-
-    global.process = originalProcess;
-    console.error = originalError;
-  });
-
-  it('return default value when preferredRegion is empty', () => {
-    process.env.OPENAI_FUNCTION_REGIONS = '';
-    const preferredRegion = getPreferredRegion();
-    expect(preferredRegion).toBe('auto');
-  });
-
-  it('return correct list values when preferredRegion is correctly passed', () => {
-    process.env.OPENAI_FUNCTION_REGIONS = 'ida1,sfo1';
-    const preferredRegion = getPreferredRegion();
-    expect(preferredRegion).toStrictEqual(['ida1', 'sfo1']);
-  });
-});

package/src/app/api/config.ts

@@ -1,14 +0,0 @@
-import { getLLMConfig } from '@/config/llm';
-
-export const getPreferredRegion = (region: string | string[] = 'auto') => {
-  try {
-    if (getLLMConfig().OPENAI_FUNCTION_REGIONS.length <= 0) {
-      return region;
-    }
-
-    return getLLMConfig().OPENAI_FUNCTION_REGIONS;
-  } catch (error) {
-    console.error('get server config failed, error:', error);
-    return region;
-  }
-};