@lobehub/chat 1.6.3 → 1.6.5

package/CHANGELOG.md

@@ -2,6 +2,56 @@
 
 # Changelog
 
+### [Version 1.6.5](https://github.com/lobehub/lobe-chat/compare/v1.6.4...v1.6.5)
+
+<sup>Released on **2024-07-22**</sup>
+
+#### 🐛 Bug Fixes
+
+- **misc**: Content lost unexpectedly on Qwen provider when `finish_reason` is `stop`.
+
+<br/>
+
+<details>
+<summary><kbd>Improvements and Fixes</kbd></summary>
+
+#### What's fixed
+
+- **misc**: Content lost unexpectedly on Qwen provider when `finish_reason` is `stop`, closes [#3252](https://github.com/lobehub/lobe-chat/issues/3252) ([d35c5b0](https://github.com/lobehub/lobe-chat/commit/d35c5b0))
+
+</details>
+
+<div align="right">
+
+[![](https://img.shields.io/badge/-BACK_TO_TOP-151515?style=flat-square)](#readme-top)
+
+</div>
+
+### [Version 1.6.4](https://github.com/lobehub/lobe-chat/compare/v1.6.3...v1.6.4)
+
+<sup>Released on **2024-07-21**</sup>
+
+#### ♻ Code Refactoring
+
+- **misc**: Add trpc query client with react-query.
+
+<br/>
+
+<details>
+<summary><kbd>Improvements and Fixes</kbd></summary>
+
+#### Code refactoring
+
+- **misc**: Add trpc query client with react-query, closes [#3282](https://github.com/lobehub/lobe-chat/issues/3282) ([013ee54](https://github.com/lobehub/lobe-chat/commit/013ee54))
+
+</details>
+
+<div align="right">
+
+[![](https://img.shields.io/badge/-BACK_TO_TOP-151515?style=flat-square)](#readme-top)
+
+</div>
+
 ### [Version 1.6.3](https://github.com/lobehub/lobe-chat/compare/v1.6.2...v1.6.3)
 
 <sup>Released on **2024-07-21**</sup>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lobehub/chat",
-  "version": "1.6.3",
+  "version": "1.6.5",
   "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",
@@ -121,8 +121,10 @@
     "@next/third-parties": "^14.2.4",
     "@sentry/nextjs": "^7.118.0",
     "@t3-oss/env-nextjs": "^0.10.1",
+    "@tanstack/react-query": "^5.51.11",
     "@trpc/client": "next",
     "@trpc/next": "next",
+    "@trpc/react-query": "next",
     "@trpc/server": "next",
     "@vercel/analytics": "^1.3.1",
     "@vercel/speed-insights": "^1.0.12",
@@ -136,7 +138,7 @@
     "debug": "^4.3.5",
     "dexie": "^3.2.7",
     "diff": "^5.2.0",
-    "drizzle-orm": "^0.31.2",
+    "drizzle-orm": "^0.32.0",
     "drizzle-zod": "^0.5.1",
     "fast-deep-equal": "^3.1.3",
     "gpt-tokenizer": "^2.1.2",
@@ -239,7 +241,7 @@
     "consola": "^3.2.3",
     "dotenv": "^16.4.5",
     "dpdm": "^3.14.0",
-    "drizzle-kit": "^0.22.8",
+    "drizzle-kit": "^0.23.0",
     "eslint": "^8.57.0",
     "eslint-plugin-mdx": "^2.3.4",
     "fake-indexeddb": "^6.0.0",

package/src/layout/GlobalProvider/Query.tsx

@@ -0,0 +1,18 @@
+'use client';
+
+import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
+import React, { PropsWithChildren, useState } from 'react';
+
+import { lambdaQuery, lambdaQueryClient } from '@/libs/trpc/client';
+
+const QueryProvider = ({ children }: PropsWithChildren) => {
+  const [queryClient] = useState(() => new QueryClient());
+
+  return (
+    <lambdaQuery.Provider client={lambdaQueryClient} queryClient={queryClient}>
+      <QueryClientProvider client={queryClient}>{children}</QueryClientProvider>
+    </lambdaQuery.Provider>
+  );
+};
+
+export default QueryProvider;

package/src/layout/GlobalProvider/index.tsx

@@ -19,6 +19,7 @@ import { isMobileDevice } from '@/utils/responsive';
 
 import AppTheme from './AppTheme';
 import Locale from './Locale';
+import QueryProvider from './Query';
 import StoreInitialization from './StoreInitialization';
 import StyleRegistry from './StyleRegistry';
 
@@ -87,7 +88,7 @@ const GlobalLayout = async ({ children }: PropsWithChildren) => {
             isMobile={isMobile}
             serverConfig={serverConfig}
           >
-            {children}
+            <QueryProvider>{children}</QueryProvider>
             <StoreInitialization />
           </ServerConfigStoreProvider>
           <DebugUI />

package/src/libs/agent-runtime/qwen/index.test.ts

@@ -3,9 +3,7 @@ import OpenAI from 'openai';
 import { Mock, afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
 
 import Qwen from '@/config/modelProviders/qwen';
-import { LobeOpenAICompatibleRuntime } from '@/libs/agent-runtime';
-import { ModelProvider } from '@/libs/agent-runtime';
-import { AgentRuntimeErrorType } from '@/libs/agent-runtime';
+import { AgentRuntimeErrorType, ModelProvider } from '@/libs/agent-runtime';
 
 import * as debugStreamModule from '../utils/debugStream';
 import { LobeQwenAI } from './index';
@@ -134,19 +132,23 @@ describe('LobeQwenAI', () => {
         });
 
         const decoder = new TextDecoder();
-
         const reader = result.body!.getReader();
-        expect(decoder.decode((await reader.read()).value)).toContain(
-          'id: chatcmpl-fc539f49-51a8-94be-8061\n',
-        );
-        expect(decoder.decode((await reader.read()).value)).toContain('event: text\n');
-        expect(decoder.decode((await reader.read()).value)).toContain('data: "Hello"\n\n');
+        const stream: string[] = [];
 
-        expect(decoder.decode((await reader.read()).value)).toContain(
+        while (true) {
+          const { value, done } = await reader.read();
+          if (done) break;
+          stream.push(decoder.decode(value));
+        }
+
+        expect(stream).toEqual([
           'id: chatcmpl-fc539f49-51a8-94be-8061\n',
-        );
-        expect(decoder.decode((await reader.read()).value)).toContain('event: stop\n');
-        expect(decoder.decode((await reader.read()).value)).toContain('');
+          'event: text\n',
+          'data: "Hello"\n\n',
+          'id: chatcmpl-fc539f49-51a8-94be-8061\n',
+          'event: stop\n',
+          'data: "stop"\n\n',
+        ]);
 
         expect((await reader.read()).done).toBe(true);
       });

package/src/libs/agent-runtime/qwen/index.ts

@@ -123,6 +123,6 @@ export class LobeQwenAI extends LobeOpenAICompatibleRuntime implements LobeRunti
           'result_format',
           'top_p',
         )
-      : params;
+      : omit(params, 'frequency_penalty');
   }
 }

package/src/libs/agent-runtime/utils/openaiCompatibleFactory/index.test.ts

@@ -373,15 +373,23 @@ describe('LobeOpenAICompatibleFactory', () => {
         });
 
         const decoder = new TextDecoder();
-
         const reader = result.body!.getReader();
-        expect(decoder.decode((await reader.read()).value)).toContain('id: a\n');
-        expect(decoder.decode((await reader.read()).value)).toContain('event: text\n');
-        expect(decoder.decode((await reader.read()).value)).toContain('data: "Hello"\n\n');
+        const stream: string[] = [];
+
+        while (true) {
+          const { value, done } = await reader.read();
+          if (done) break;
+          stream.push(decoder.decode(value));
+        }
 
-        expect(decoder.decode((await reader.read()).value)).toContain('id: a\n');
-        expect(decoder.decode((await reader.read()).value)).toContain('event: text\n');
-        expect(decoder.decode((await reader.read()).value)).toContain('');
+        expect(stream).toEqual([
+          'id: a\n',
+          'event: text\n',
+          'data: "Hello"\n\n',
+          'id: a\n',
+          'event: stop\n',
+          'data: "stop"\n\n',
+        ]);
 
         expect((await reader.read()).done).toBe(true);
       });

package/src/libs/agent-runtime/utils/openaiCompatibleFactory/index.ts

@@ -89,7 +89,7 @@ export function transformResponseToStream(data: OpenAI.ChatCompletion) {
       controller.enqueue({
         choices: data.choices.map((choice: OpenAI.ChatCompletion.Choice) => ({
           delta: {
-            content: choice.message.content,
+            content: null,
             role: choice.message.role,
           },
           finish_reason: choice.finish_reason,

package/src/libs/agent-runtime/utils/streams/qwen.ts

@@ -62,14 +62,14 @@ export const transformQwenStream = (chunk: OpenAI.ChatCompletionChunk): StreamPr
     } as StreamProtocolToolCallChunk;
   }
 
-  if (item.finish_reason) {
-    return { data: item.finish_reason, id: chunk.id, type: 'stop' };
-  }
-
   if (typeof item.delta?.content === 'string') {
     return { data: item.delta.content, id: chunk.id, type: 'text' };
   }
 
+  if (item.finish_reason) {
+    return { data: item.finish_reason, id: chunk.id, type: 'stop' };
+  }
+
   if (item.delta?.content === null) {
     return { data: item.delta, id: chunk.id, type: 'data' };
   }

package/src/libs/trpc/client/edge.ts

@@ -0,0 +1,20 @@
+import { createTRPCClient, httpBatchLink } from '@trpc/client';
+import superjson from 'superjson';
+
+import type { EdgeRouter } from '@/server/routers/edge';
+import { withBasePath } from '@/utils/basePath';
+
+export const edgeClient = createTRPCClient<EdgeRouter>({
+  links: [
+    httpBatchLink({
+      headers: async () => {
+        // dynamic import to avoid circular dependency
+        const { createHeaderWithAuth } = await import('@/services/_auth');
+
+        return createHeaderWithAuth();
+      },
+      transformer: superjson,
+      url: withBasePath('/trpc/edge'),
+    }),
+  ],
+});

package/src/libs/trpc/client/index.ts

@@ -0,0 +1,2 @@
+export { edgeClient } from './edge';
+export * from './lambda';

package/src/libs/trpc/client/lambda.ts

@@ -0,0 +1,38 @@
+import { createTRPCClient, httpBatchLink } from '@trpc/client';
+import { createTRPCReact } from '@trpc/react-query';
+import superjson from 'superjson';
+
+import { fetchErrorNotification } from '@/components/FetchErrorNotification';
+import type { LambdaRouter } from '@/server/routers/lambda';
+
+import { ErrorResponse } from './types';
+
+const links = [
+  httpBatchLink({
+    fetch: async (input, init) => {
+      const response = await fetch(input, init);
+      if (response.ok) return response;
+
+      const errorRes: ErrorResponse = await response.clone().json();
+
+      errorRes.forEach((item) => {
+        const errorData = item.error.json;
+
+        const status = errorData.data.httpStatus;
+        fetchErrorNotification.error({ errorMessage: errorData.message, status });
+      });
+
+      return response;
+    },
+    transformer: superjson,
+    url: '/trpc/lambda',
+  }),
+];
+
+export const lambdaClient = createTRPCClient<LambdaRouter>({
+  links,
+});
+
+export const lambdaQuery = createTRPCReact<LambdaRouter>();
+
+export const lambdaQueryClient = lambdaQuery.createClient({ links });

package/src/libs/trpc/client/types.ts

@@ -0,0 +1,18 @@
+export type ErrorResponse = ErrorItem[];
+
+export interface ErrorItem {
+  error: {
+    json: {
+      code: number;
+      data: Data;
+      message: string;
+    };
+  };
+}
+
+export interface Data {
+  code: string;
+  httpStatus: number;
+  path: string;
+  stack: string;
+}

package/src/libs/trpc/client.ts

@@ -1,65 +0,0 @@
-import { createTRPCClient, httpBatchLink } from '@trpc/client';
-import superjson from 'superjson';
-
-import { fetchErrorNotification } from '@/components/FetchErrorNotification';
-import type { EdgeRouter } from '@/server/routers/edge';
-import type { LambdaRouter } from '@/server/routers/lambda';
-import { withBasePath } from '@/utils/basePath';
-
-export const edgeClient = createTRPCClient<EdgeRouter>({
-  links: [
-    httpBatchLink({
-      headers: async () => {
-        // dynamic import to avoid circular dependency
-        const { createHeaderWithAuth } = await import('@/services/_auth');
-
-        return createHeaderWithAuth();
-      },
-      transformer: superjson,
-      url: withBasePath('/trpc/edge'),
-    }),
-  ],
-});
-
-export type ErrorResponse = ErrorItem[];
-
-export interface ErrorItem {
-  error: {
-    json: {
-      code: number;
-      data: Data;
-      message: string;
-    };
-  };
-}
-
-export interface Data {
-  code: string;
-  httpStatus: number;
-  path: string;
-  stack: string;
-}
-
-export const lambdaClient = createTRPCClient<LambdaRouter>({
-  links: [
-    httpBatchLink({
-      fetch: async (input, init) => {
-        const response = await fetch(input, init);
-        if (response.ok) return response;
-
-        const errorRes: ErrorResponse = await response.clone().json();
-
-        errorRes.forEach((item) => {
-          const errorData = item.error.json;
-
-          const status = errorData.data.httpStatus;
-          fetchErrorNotification.error({ errorMessage: errorData.message, status });
-        });
-
-        return response;
-      },
-      transformer: superjson,
-      url: '/trpc/lambda',
-    }),
-  ],
-});