@lobehub/chat 1.68.9 → 1.68.11

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

@@ -1,299 +1,12 @@
 // @vitest-environment node
-import OpenAI from 'openai';
-import { Mock, afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
+import { testProvider } from '@/libs/agent-runtime/providerTestUtils';
 
-import { ChatStreamCallbacks, LobeOpenAICompatibleRuntime } from '@/libs/agent-runtime';
-
-import * as debugStreamModule from '../utils/debugStream';
 import { LobeZeroOneAI } from './index';
 
-const provider = 'zeroone';
-const defaultBaseURL = 'https://api.lingyiwanwu.com/v1';
-
-const bizErrorType = 'ProviderBizError';
-const invalidErrorType = 'InvalidProviderAPIKey';
-
-// Mock the console.error to avoid polluting test output
-vi.spyOn(console, 'error').mockImplementation(() => {});
-
-let instance: LobeOpenAICompatibleRuntime;
-
-beforeEach(() => {
-  instance = new LobeZeroOneAI({ apiKey: 'test' });
-
-  // 使用 vi.spyOn 来模拟 chat.completions.create 方法
-  vi.spyOn(instance['client'].chat.completions, 'create').mockResolvedValue(
-    new ReadableStream() as any,
-  );
-});
-
-afterEach(() => {
-  vi.clearAllMocks();
-});
-
-describe('LobeZeroOneAI', () => {
-  describe('init', () => {
-    it('should correctly initialize with an API key', async () => {
-      const instance = new LobeZeroOneAI({ apiKey: 'test_api_key' });
-      expect(instance).toBeInstanceOf(LobeZeroOneAI);
-      expect(instance.baseURL).toEqual(defaultBaseURL);
-    });
-  });
-
-  describe('chat', () => {
-    it('should return a StreamingTextResponse on successful API call', async () => {
-      // Arrange
-      const mockStream = new ReadableStream();
-      const mockResponse = Promise.resolve(mockStream);
-
-      (instance['client'].chat.completions.create as Mock).mockResolvedValue(mockResponse);
-
-      // Act
-      const result = await instance.chat({
-        messages: [{ content: 'Hello', role: 'user' }],
-        model: 'yi-34b-chat-0205',
-        temperature: 0,
-      });
-
-      // Assert
-      expect(result).toBeInstanceOf(Response);
-    });
-
-    it('should call ZeroOne API with corresponding options', async () => {
-      // Arrange
-      const mockStream = new ReadableStream();
-      const mockResponse = Promise.resolve(mockStream);
-
-      (instance['client'].chat.completions.create as Mock).mockResolvedValue(mockResponse);
-
-      // Act
-      const result = await instance.chat({
-        max_tokens: 1024,
-        messages: [{ content: 'Hello', role: 'user' }],
-        model: 'yi-34b-chat-0205',
-        temperature: 0.7,
-        top_p: 1,
-      });
-
-      // Assert
-      expect(instance['client'].chat.completions.create).toHaveBeenCalledWith(
-        {
-          max_tokens: 1024,
-          messages: [{ content: 'Hello', role: 'user' }],
-          model: 'yi-34b-chat-0205',
-          temperature: 0.7,
-          stream: true,
-          top_p: 1,
-        },
-        { headers: { Accept: '*/*' } },
-      );
-      expect(result).toBeInstanceOf(Response);
-    });
-
-    describe('Error', () => {
-      it('should return ZeroOneBizError with an openai error response when OpenAI.APIError is thrown', async () => {
-        // Arrange
-        const apiError = new OpenAI.APIError(
-          400,
-          {
-            status: 400,
-            error: {
-              message: 'Bad Request',
-            },
-          },
-          'Error message',
-          {},
-        );
-
-        vi.spyOn(instance['client'].chat.completions, 'create').mockRejectedValue(apiError);
-
-        // Act
-        try {
-          await instance.chat({
-            messages: [{ content: 'Hello', role: 'user' }],
-            model: 'yi-34b-chat-0205',
-            temperature: 0,
-          });
-        } catch (e) {
-          expect(e).toEqual({
-            endpoint: defaultBaseURL,
-            error: {
-              error: { message: 'Bad Request' },
-              status: 400,
-            },
-            errorType: bizErrorType,
-            provider,
-          });
-        }
-      });
-
-      it('should throw AgentRuntimeError with InvalidZeroOneAPIKey if no apiKey is provided', async () => {
-        try {
-          new LobeZeroOneAI({});
-        } catch (e) {
-          expect(e).toEqual({ errorType: invalidErrorType });
-        }
-      });
-
-      it('should return ZeroOneBizError with the cause when OpenAI.APIError is thrown with cause', async () => {
-        // Arrange
-        const errorInfo = {
-          stack: 'abc',
-          cause: {
-            message: 'api is undefined',
-          },
-        };
-        const apiError = new OpenAI.APIError(400, errorInfo, 'module error', {});
-
-        vi.spyOn(instance['client'].chat.completions, 'create').mockRejectedValue(apiError);
-
-        // Act
-        try {
-          await instance.chat({
-            messages: [{ content: 'Hello', role: 'user' }],
-            model: 'yi-34b-chat-0205',
-            temperature: 0,
-          });
-        } catch (e) {
-          expect(e).toEqual({
-            endpoint: defaultBaseURL,
-            error: {
-              cause: { message: 'api is undefined' },
-              stack: 'abc',
-            },
-            errorType: bizErrorType,
-            provider,
-          });
-        }
-      });
-
-      it('should return ZeroOneBizError with an cause response with desensitize Url', async () => {
-        // Arrange
-        const errorInfo = {
-          stack: 'abc',
-          cause: { message: 'api is undefined' },
-        };
-        const apiError = new OpenAI.APIError(400, errorInfo, 'module error', {});
-
-        instance = new LobeZeroOneAI({
-          apiKey: 'test',
-
-          baseURL: 'https://api.abc.com/v1',
-        });
-
-        vi.spyOn(instance['client'].chat.completions, 'create').mockRejectedValue(apiError);
-
-        // Act
-        try {
-          await instance.chat({
-            messages: [{ content: 'Hello', role: 'user' }],
-            model: 'yi-34b-chat-0205',
-            temperature: 0,
-          });
-        } catch (e) {
-          expect(e).toEqual({
-            endpoint: 'https://api.***.com/v1',
-            error: {
-              cause: { message: 'api is undefined' },
-              stack: 'abc',
-            },
-            errorType: bizErrorType,
-            provider,
-          });
-        }
-      });
-
-      it('should throw an InvalidZeroOneAPIKey error type on 401 status code', async () => {
-        // Mock the API call to simulate a 401 error
-        const error = new Error('Unauthorized') as any;
-        error.status = 401;
-        vi.mocked(instance['client'].chat.completions.create).mockRejectedValue(error);
-
-        try {
-          await instance.chat({
-            messages: [{ content: 'Hello', role: 'user' }],
-            model: 'yi-34b-chat-0205',
-            temperature: 0,
-          });
-        } catch (e) {
-          // Expect the chat method to throw an error with InvalidMoonshotAPIKey
-          expect(e).toEqual({
-            endpoint: defaultBaseURL,
-            error: new Error('Unauthorized'),
-            errorType: invalidErrorType,
-            provider,
-          });
-        }
-      });
-
-      it('should return AgentRuntimeError for non-OpenAI errors', async () => {
-        // Arrange
-        const genericError = new Error('Generic Error');
-
-        vi.spyOn(instance['client'].chat.completions, 'create').mockRejectedValue(genericError);
-
-        // Act
-        try {
-          await instance.chat({
-            messages: [{ content: 'Hello', role: 'user' }],
-            model: 'yi-34b-chat-0205',
-            temperature: 0,
-          });
-        } catch (e) {
-          expect(e).toEqual({
-            endpoint: defaultBaseURL,
-            errorType: 'AgentRuntimeError',
-            provider,
-            error: {
-              name: genericError.name,
-              cause: genericError.cause,
-              message: genericError.message,
-              stack: genericError.stack,
-            },
-          });
-        }
-      });
-    });
-
-    describe('DEBUG', () => {
-      it('should call debugStream and return StreamingTextResponse when DEBUG_ZEROONE_CHAT_COMPLETION is 1', async () => {
-        // Arrange
-        const mockProdStream = new ReadableStream() as any; // 模拟的 prod 流
-        const mockDebugStream = new ReadableStream({
-          start(controller) {
-            controller.enqueue('Debug stream content');
-            controller.close();
-          },
-        }) as any;
-        mockDebugStream.toReadableStream = () => mockDebugStream; // 添加 toReadableStream 方法
-
-        // 模拟 chat.completions.create 返回值，包括模拟的 tee 方法
-        (instance['client'].chat.completions.create as Mock).mockResolvedValue({
-          tee: () => [mockProdStream, { toReadableStream: () => mockDebugStream }],
-        });
-
-        // 保存原始环境变量值
-        const originalDebugValue = process.env.DEBUG_ZEROONE_CHAT_COMPLETION;
-
-        // 模拟环境变量
-        process.env.DEBUG_ZEROONE_CHAT_COMPLETION = '1';
-        vi.spyOn(debugStreamModule, 'debugStream').mockImplementation(() => Promise.resolve());
-
-        // 执行测试
-        // 运行你的测试函数，确保它会在条件满足时调用 debugStream
-        // 假设的测试函数调用，你可能需要根据实际情况调整
-        await instance.chat({
-          messages: [{ content: 'Hello', role: 'user' }],
-          model: 'yi-34b-chat-0205',
-          temperature: 0,
-        });
-
-        // 验证 debugStream 被调用
-        expect(debugStreamModule.debugStream).toHaveBeenCalled();
-
-        // 恢复原始环境变量值
-        process.env.DEBUG_ZEROONE_CHAT_COMPLETION = originalDebugValue;
-      });
-    });
-  });
+testProvider({
+  Runtime: LobeZeroOneAI,
+  provider: 'zeroone',
+  defaultBaseURL: 'https://api.lingyiwanwu.com/v1',
+  chatDebugEnv: 'DEBUG_ZEROONE_CHAT_COMPLETION',
+  chatModel: 'yi-34b-chat-0205',
 });

package/src/locales/default/chat.ts

@@ -93,15 +93,19 @@ export default {
         inputMinutes: '${{amount}}/分钟',
         inputTokens: '输入 {{amount}}/积分 · ${{amount}}/M',
         outputTokens: '输出 {{amount}}/积分 · ${{amount}}/M',
+        writeCacheInputTokens: '缓存输入写入 {{amount}}/积分 · ${{amount}}/M',
       },
     },
     tokenDetails: {
+      average: '平均单价',
       input: '输入',
       inputAudio: '音频输入',
       inputCached: '输入缓存',
+      inputCitation: '引用输入',
       inputText: '文本输入',
       inputTitle: '输入明细',
       inputUncached: '输入未缓存',
+      inputWriteCached: '输入缓存写入',
       output: '输出',
       outputAudio: '音频输出',
       outputText: '文本输出',

package/src/types/message/base.ts

@@ -15,14 +15,24 @@ export interface ModelReasoning {
 
 export interface ModelTokensUsage {
   acceptedPredictionTokens?: number;
-  cachedTokens?: number;
   inputAudioTokens?: number;
   inputCacheMissTokens?: number;
-  inputTokens?: number;
+  inputCachedTokens?: number;
+  /**
+   * currently only pplx has citation_tokens
+   */
+  inputCitationTokens?: number;
+  /**
+   * user prompt input
+   */
+  inputTextTokens?: number;
+  inputWriteCacheTokens?: number;
   outputAudioTokens?: number;
-  outputTokens?: number;
-  reasoningTokens?: number;
+  outputReasoningTokens?: number;
+  outputTextTokens?: number;
   rejectedPredictionTokens?: number;
+  totalInputTokens?: number;
+  totalOutputTokens?: number;
   totalTokens?: number;
 }
 

package/src/utils/filter.test.ts

@@ -1,122 +0,0 @@
-import { test } from 'vitest';
-
-test('placeholder', () => {});
-// describe('filterWithKeywords', () => {
-//   const data: Record<string, BaseDataModel> = {
-//     1: {
-//       id: '1',
-//       meta: {
-//         title: 'hello world',
-//         description: 'test case',
-//         tag: ['a', 'b'],
-//       },
-//     },
-//     2: {
-//       id: '2',
-//       meta: {
-//         title: 'goodbye',
-//         description: 'hello world',
-//         tag: ['c', 'd'],
-//       },
-//     },
-//   };
-//
-//   it('should return an empty object if map is empty', () => {
-//     const result = filterWithKeywords({}, 'hello');
-//     expect(result).toEqual({});
-//   });
-//
-//   it('should return the original map if keywords is empty', () => {
-//     const result = filterWithKeywords(data, '');
-//     expect(result).toEqual(data);
-//   });
-//
-//   it('should return a filtered map if keywords is not empty', () => {
-//     const result = filterWithKeywords(data, 'world');
-//     expect(result).toEqual({
-//       1: {
-//         id: '1',
-//         meta: {
-//           title: 'hello world',
-//           description: 'test case',
-//           tag: ['a', 'b'],
-//         },
-//       },
-//       2: {
-//         id: '2',
-//         meta: {
-//           title: 'goodbye',
-//           description: 'hello world',
-//           tag: ['c', 'd'],
-//         },
-//       },
-//     });
-//   });
-//
-//   it('should only consider title, description and tag properties if extraSearchStr is not provided', () => {
-//     const result = filterWithKeywords(data, 'test');
-//     expect(result).toEqual({
-//       1: {
-//         id: '1',
-//         meta: {
-//           title: 'hello world',
-//           description: 'test case',
-//           tag: ['a', 'b'],
-//         },
-//       },
-//     });
-//   });
-//
-//   it('should consider extraSearchStr in addition to title, description and tag properties if provided', () => {
-//     const extraSearchStr = (item: BaseDataModel) => {
-//       return item.meta.avatar || '';
-//     };
-//     const data: Record<string, BaseDataModel> = {
-//       a: {
-//         id: 'a',
-//         meta: {
-//           title: 'hello world',
-//           description: 'test case',
-//           tag: ['a', 'b'],
-//           avatar: 'xxx',
-//         },
-//       },
-//       b: {
-//         id: 'b',
-//         meta: {
-//           title: 'goodbye',
-//           description: 'hello world',
-//           tag: ['c', 'd'],
-//           avatar: 'yyy',
-//         },
-//       },
-//     };
-//
-//     const result = filterWithKeywords(data, 'yyy', extraSearchStr);
-//     expect(result).toEqual({
-//       b: {
-//         id: 'b',
-//         meta: {
-//           title: 'goodbye',
-//           description: 'hello world',
-//           tag: ['c', 'd'],
-//           avatar: 'yyy',
-//         },
-//       },
-//     });
-//   });
-//
-//   it('should ensure that each filtered object has at least one property that includes the keyword or extraSearchStr', () => {
-//     const result = filterWithKeywords(data, 't');
-//     expect(result).toEqual({
-//       1: {
-//         id: '1',
-//         meta: {
-//           title: 'hello world',
-//           description: 'test case',
-//           tag: ['a', 'b'],
-//         },
-//       },
-//     });
-//   });
-// });

package/src/utils/filter.ts

@@ -1,29 +0,0 @@
-import { BaseDataModel } from '@/types/meta';
-
-export const filterWithKeywords = <T extends BaseDataModel>(
-  map: Record<string, T>,
-  keywords: string,
-  extraSearchStr?: (item: T) => string | string[],
-) => {
-  if (!keywords) return map;
-
-  return Object.fromEntries(
-    Object.entries(map).filter(([, item]) => {
-      const meta = item.meta;
-
-      const keyList = [meta.title, meta.description, meta.tags?.join('')].filter(
-        Boolean,
-      ) as string[];
-
-      const defaultSearchKey = keyList.join('');
-
-      let extraSearchKey: string = '';
-      if (extraSearchStr) {
-        const searchStr = extraSearchStr(item);
-        extraSearchKey = Array.isArray(searchStr) ? searchStr.join('') : searchStr;
-      }
-
-      return `${defaultSearchKey}${extraSearchKey}`.toLowerCase().includes(keywords.toLowerCase());
-    }),
-  );
-};