@lobehub/chat 1.5.1 → 1.5.3

package/CHANGELOG.md

@@ -2,6 +2,57 @@
 
 # Changelog
 
+### [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>
+
+#### 🐛 Bug Fixes
+
+- **misc**: Fix session not reorder after send message.
+
+<br/>
+
+<details>
+<summary><kbd>Improvements and Fixes</kbd></summary>
+
+#### What's fixed
+
+- **misc**: Fix session not reorder after send message, closes [#3239](https://github.com/lobehub/lobe-chat/issues/3239) ([7245a08](https://github.com/lobehub/lobe-chat/commit/7245a08))
+
+</details>
+
+<div align="right">
+
+[![](https://img.shields.io/badge/-BACK_TO_TOP-151515?style=flat-square)](#readme-top)
+
+</div>
+
 ### [Version 1.5.1](https://github.com/lobehub/lobe-chat/compare/v1.5.0...v1.5.1)
 
 <sup>Released on **2024-07-17**</sup>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lobehub/chat",
-  "version": "1.5.1",
+  "version": "1.5.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",

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/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/services/session/client.test.ts

@@ -20,6 +20,7 @@ vi.mock('@/database/client/models/session', () => {
       update: vi.fn(),
       count: vi.fn(),
       batchCreate: vi.fn(),
+      findById: vi.fn(),
       isEmpty: vi.fn(),
       queryByKeyword: vi.fn(),
       updateConfig: vi.fn(),

package/src/services/session/client.ts

@@ -15,6 +15,7 @@ import {
   SessionGroupItem,
   SessionGroups,
 } from '@/types/session';
+import { merge } from '@/utils/merge';
 
 import { ISessionService } from './type';
 
@@ -94,7 +95,9 @@ export class ClientService implements ISessionService {
     data: Partial<Pick<LobeAgentSession, 'group' | 'meta' | 'pinned'>>,
   ) {
     const pinned = typeof data.pinned === 'boolean' ? (data.pinned ? 1 : 0) : undefined;
-    return SessionModel.update(id, { ...data, pinned });
+    const prev = await SessionModel.findById(id);
+
+    return SessionModel.update(id, merge(prev, { ...data, pinned }));
   }
 
   async updateSessionConfig(

package/src/services/session/server.ts

@@ -13,9 +13,9 @@ import {
   LobeAgentSession,
   LobeSessionType,
   LobeSessions,
-  SessionGroupId,
   SessionGroupItem,
   SessionGroups,
+  UpdateSessionParams,
 } from '@/types/session';
 
 import { ISessionService } from './type';
@@ -54,14 +54,11 @@ export class ServerService implements ISessionService {
     return lambdaClient.session.countSessions.query();
   }
 
-  updateSession(
-    id: string,
-    data: Partial<{ group?: SessionGroupId; meta?: any; pinned?: boolean }>,
-  ): Promise<any> {
-    const { group, pinned, meta } = data;
+  updateSession(id: string, data: Partial<UpdateSessionParams>): Promise<any> {
+    const { group, pinned, meta, updatedAt } = data;
     return lambdaClient.session.updateSession.mutate({
       id,
-      value: { groupId: group === 'default' ? null : group, pinned, ...meta },
+      value: { groupId: group === 'default' ? null : group, pinned, ...meta, updatedAt },
     });
   }
 

package/src/store/chat/slices/message/action.ts

@@ -19,6 +19,7 @@ import { agentSelectors } from '@/store/agent/selectors';
 import { chatHelpers } from '@/store/chat/helpers';
 import { messageMapKey } from '@/store/chat/slices/message/utils';
 import { ChatStore } from '@/store/chat/store';
+import { useSessionStore } from '@/store/session';
 import { ChatMessage, ChatMessageError, MessageToolCall } from '@/types/message';
 import { TraceEventPayloads } from '@/types/trace';
 import { setNamespace } from '@/utils/storeDebug';
@@ -319,6 +320,8 @@ export const chatMessage: StateCreator<
         }
       }
     }
+    //  update assistant update to make it rerank
+    useSessionStore.getState().triggerSessionUpdate(get().activeId);
 
     const id = await get().internal_createMessage(newMessage, {
       tempMessageId,

package/src/store/session/slices/session/action.ts

@@ -18,7 +18,7 @@ import {
   LobeSessionGroups,
   LobeSessionType,
   LobeSessions,
-  SessionGroupId,
+  UpdateSessionParams,
 } from '@/types/session';
 import { merge } from '@/utils/merge';
 import { setNamespace } from '@/utils/storeDebug';
@@ -52,6 +52,7 @@ export interface SessionAction {
     isSwitchSession?: boolean,
   ) => Promise<string>;
   duplicateSession: (id: string) => Promise<void>;
+  triggerSessionUpdate: (id: string) => Promise<void>;
   updateSessionGroupId: (sessionId: string, groupId: string) => Promise<void>;
   updateSessionMeta: (meta: Partial<MetaData>) => void;
 
@@ -75,10 +76,7 @@ export interface SessionAction {
   useSearchSessions: (keyword?: string) => SWRResponse<any>;
 
   internal_dispatchSessions: (payload: SessionDispatch) => void;
-  internal_updateSession: (
-    id: string,
-    data: Partial<{ group?: SessionGroupId; meta?: any; pinned?: boolean }>,
-  ) => Promise<void>;
+  internal_updateSession: (id: string, data: Partial<UpdateSessionParams>) => Promise<void>;
   internal_processSessions: (
     sessions: LobeSessions,
     customGroups: LobeSessionGroups,
@@ -117,7 +115,6 @@ export const createSessionSlice: StateCreator<
 
     return id;
   },
-
   duplicateSession: async (id) => {
     const { switchSession, refreshSessions } = get();
     const session = sessionSelectors.getSessionById(id)(get());
@@ -153,7 +150,6 @@ export const createSessionSlice: StateCreator<
   pinSession: async (id, pinned) => {
     await get().internal_updateSession(id, { pinned });
   },
-
   removeSession: async (sessionId) => {
     await sessionService.removeSession(sessionId);
     await get().refreshSessions();
@@ -170,6 +166,10 @@ export const createSessionSlice: StateCreator<
     set({ activeId: sessionId }, false, n(`activeSession/${sessionId}`));
   },
 
+  triggerSessionUpdate: async (id) => {
+    await get().internal_updateSession(id, { updatedAt: new Date() });
+  },
+
   updateSearchKeywords: (keywords) => {
     set(
       { isSearching: !!keywords, sessionSearchKeywords: keywords },

package/src/types/session/index.ts

@@ -1,5 +1,5 @@
 import { LobeSessions } from '@/types/session/agentSession';
-import { LobeSessionGroups } from '@/types/session/sessionGroup';
+import { LobeSessionGroups, SessionGroupId } from '@/types/session/sessionGroup';
 
 export * from './agentSession';
 export * from './sessionGroup';
@@ -8,3 +8,10 @@ export interface ChatSessionList {
   sessionGroups: LobeSessionGroups;
   sessions: LobeSessions;
 }
+
+export interface UpdateSessionParams {
+  group?: SessionGroupId;
+  meta?: any;
+  pinned?: boolean;
+  updatedAt: Date;
+}

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;
-  }
-};