@lobehub/chat 1.68.8 → 1.68.10

package/src/features/Conversation/Extras/Usage/UsageDetail/tokens.ts

@@ -11,43 +11,75 @@ export const getDetailsToken = (
   usage: ModelTokensUsage,
   modelCard?: LobeDefaultAiModelListItem,
 ) => {
-  const uncachedInputCredit = (
-    !!usage.inputTokens
-      ? calcCredit(usage.inputTokens - (usage.cachedTokens || 0), modelCard?.pricing?.input)
-      : 0
+  const inputTextTokens = usage.inputTextTokens || (usage as any).inputTokens || 0;
+  const totalInputTokens = usage.totalInputTokens || (usage as any).inputTokens || 0;
+
+  const totalOutputTokens = usage.totalOutputTokens || (usage as any).outputTokens || 0;
+
+  const outputReasoningTokens = usage.outputReasoningTokens || (usage as any).reasoningTokens || 0;
+
+  const outputTextTokens = usage.outputTextTokens
+    ? usage.outputTextTokens
+    : totalOutputTokens - outputReasoningTokens - (usage.outputAudioTokens || 0);
+
+  const inputWriteCacheTokens = usage.inputWriteCacheTokens || 0;
+  const inputCacheTokens = usage.inputCachedTokens || (usage as any).cachedTokens || 0;
+
+  const inputCacheMissTokens = usage?.inputCacheMissTokens
+    ? usage?.inputCacheMissTokens
+    : totalInputTokens - (inputCacheTokens || 0);
+
+  const inputCacheMissCredit = (
+    !!inputCacheMissTokens ? calcCredit(inputCacheMissTokens, modelCard?.pricing?.input) : 0
   ) as number;
 
-  const cachedInputCredit = (
-    !!usage.cachedTokens ? calcCredit(usage.cachedTokens, modelCard?.pricing?.cachedInput) : 0
+  const inputCachedCredit = (
+    !!inputCacheTokens ? calcCredit(inputCacheTokens, modelCard?.pricing?.cachedInput) : 0
   ) as number;
 
-  const totalOutput = (
-    !!usage.outputTokens ? calcCredit(usage.outputTokens, modelCard?.pricing?.output) : 0
+  const inputWriteCachedCredit = !!inputWriteCacheTokens
+    ? (calcCredit(inputWriteCacheTokens, modelCard?.pricing?.writeCacheInput) as number)
+    : 0;
+
+  const totalOutputCredit = (
+    !!totalOutputTokens ? calcCredit(totalOutputTokens, modelCard?.pricing?.output) : 0
   ) as number;
+  const totalInputCredit = (
+    !!totalInputTokens ? calcCredit(totalInputTokens, modelCard?.pricing?.output) : 0
+  ) as number;
+
+  const totalCredit =
+    inputCacheMissCredit + inputCachedCredit + inputWriteCachedCredit + totalOutputCredit;
 
-  const totalTokens = uncachedInputCredit + cachedInputCredit + totalOutput;
   return {
-    cachedInput: !!usage.cachedTokens
-      ? {
-          credit: cachedInputCredit,
-          token: usage.cachedTokens,
-        }
-      : undefined,
     inputAudio: !!usage.inputAudioTokens
       ? {
           credit: calcCredit(usage.inputAudioTokens, modelCard?.pricing?.audioInput),
           token: usage.inputAudioTokens,
         }
       : undefined,
-    inputText: !!usage.inputTokens
+    inputCacheMiss: !!inputCacheMissTokens
+      ? { credit: inputCacheMissCredit, token: inputCacheMissTokens }
+      : undefined,
+    inputCached: !!inputCacheTokens
+      ? { credit: inputCachedCredit, token: inputCacheTokens }
+      : undefined,
+    inputCachedWrite: !!inputWriteCacheTokens
+      ? { credit: inputWriteCachedCredit, token: inputWriteCacheTokens }
+      : undefined,
+    inputCitation: !!usage.inputCitationTokens
+      ? {
+          credit: calcCredit(usage.inputCitationTokens, modelCard?.pricing?.input),
+          token: usage.inputCitationTokens,
+        }
+      : undefined,
+    inputText: !!inputTextTokens
       ? {
-          credit: calcCredit(
-            usage.inputTokens - (usage.inputAudioTokens || 0),
-            modelCard?.pricing?.input,
-          ),
-          token: usage.inputTokens - (usage.inputAudioTokens || 0),
+          credit: calcCredit(inputTextTokens, modelCard?.pricing?.input),
+          token: inputTextTokens,
         }
       : undefined,
+
     outputAudio: !!usage.outputAudioTokens
       ? {
           credit: calcCredit(usage.outputAudioTokens, modelCard?.pricing?.audioOutput),
@@ -55,40 +87,27 @@ export const getDetailsToken = (
           token: usage.outputAudioTokens,
         }
       : undefined,
-
-    outputText: !!usage.outputTokens
+    outputReasoning: !!outputReasoningTokens
       ? {
-          credit: calcCredit(
-            usage.outputTokens - (usage.reasoningTokens || 0) - (usage.outputAudioTokens || 0),
-            modelCard?.pricing?.output,
-          ),
-          token: usage.outputTokens - (usage.reasoningTokens || 0) - (usage.outputAudioTokens || 0),
+          credit: calcCredit(outputReasoningTokens, modelCard?.pricing?.output),
+          token: outputReasoningTokens,
         }
       : undefined,
-    reasoning: !!usage.reasoningTokens
+    outputText: !!outputTextTokens
       ? {
-          credit: calcCredit(usage.reasoningTokens, modelCard?.pricing?.output),
-          token: usage.reasoningTokens,
+          credit: calcCredit(outputTextTokens, modelCard?.pricing?.output),
+          token: outputTextTokens,
         }
       : undefined,
 
-    totalOutput: !!usage.outputTokens
-      ? {
-          credit: totalOutput,
-          token: usage.outputTokens,
-        }
+    totalInput: !!totalInputTokens
+      ? { credit: totalInputCredit, token: totalInputTokens }
       : undefined,
-    totalTokens: !!usage.totalTokens
-      ? {
-          credit: totalTokens,
-          token: usage.totalTokens,
-        }
+    totalOutput: !!totalOutputTokens
+      ? { credit: totalOutputCredit, token: totalOutputTokens }
       : undefined,
-    uncachedInput: !!usage.inputTokens
-      ? {
-          credit: uncachedInputCredit,
-          token: usage.inputTokens - (usage.cachedTokens || 0),
-        }
+    totalTokens: !!usage.totalTokens
+      ? { credit: totalCredit, token: usage.totalTokens }
       : undefined,
   };
 };

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

@@ -1,5 +1,7 @@
 // @vitest-environment node
-import { ModelProvider } from '@/libs/agent-runtime';
+import { Mock } from 'vitest';
+
+import { LobeOpenAICompatibleRuntime, ModelProvider } from '@/libs/agent-runtime';
 
 import { testProvider } from '../providerTestUtils';
 import { LobeBaichuanAI } from './index';
@@ -10,4 +12,59 @@ testProvider({
   defaultBaseURL: 'https://api.baichuan-ai.com/v1',
   chatDebugEnv: 'DEBUG_BAICHUAN_CHAT_COMPLETION',
   chatModel: 'hunyuan-lite',
+  test: {
+    skipAPICall: true,
+  },
+});
+
+let instance: LobeOpenAICompatibleRuntime;
+
+beforeEach(() => {
+  instance = new LobeBaichuanAI({ apiKey: 'test' });
+
+  // 使用 vi.spyOn 来模拟 chat.completions.create 方法
+  vi.spyOn(instance['client'].chat.completions, 'create').mockResolvedValue(
+    new ReadableStream() as any,
+  );
+});
+
+afterEach(() => {
+  vi.clearAllMocks();
+});
+
+describe('specific LobeBaichuanAI tests', () => {
+  it(`should call 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: 'open-mistral-7b',
+      temperature: 0.7,
+      stream: true,
+      top_p: 1,
+    });
+
+    // Assert
+    expect(instance['client'].chat.completions.create).toHaveBeenCalledWith(
+      {
+        max_tokens: 1024,
+        messages: [{ content: 'Hello', role: 'user' }],
+        model: 'open-mistral-7b',
+        stream: true,
+        stream_options: {
+          include_usage: true,
+        },
+        temperature: 0.35,
+        top_p: 1,
+      },
+      { headers: { Accept: '*/*' } },
+    );
+    expect(result).toBeInstanceOf(Response);
+  });
 });

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

@@ -1,17 +1,18 @@
 // @vitest-environment node
-import OpenAI from 'openai';
-import { Mock, afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
 
 import { LobeOpenAICompatibleRuntime } from '@/libs/agent-runtime';
+import { testProvider } from '@/libs/agent-runtime/providerTestUtils';
 
-import * as debugStreamModule from '../utils/debugStream';
 import { LobeGroq } from './index';
 
-const provider = 'groq';
-const defaultBaseURL = 'https://api.groq.com/openai/v1';
-
-const bizErrorType = 'ProviderBizError';
-const invalidErrorType = 'InvalidProviderAPIKey';
+testProvider({
+  provider: 'groq',
+  defaultBaseURL: 'https://api.groq.com/openai/v1',
+  chatModel: 'mistralai/mistral-7b-instruct:free',
+  Runtime: LobeGroq,
+  chatDebugEnv: 'DEBUG_GROQ_CHAT_COMPLETION',
+});
 
 // Mock the console.error to avoid polluting test output
 vi.spyOn(console, 'error').mockImplementation(() => {});
@@ -31,295 +32,46 @@ afterEach(() => {
   vi.clearAllMocks();
 });
 
-describe('LobeGroqAI', () => {
-  describe('init', () => {
-    it('should correctly initialize with an API key', async () => {
-      const instance = new LobeGroq({ apiKey: 'test_api_key' });
-      expect(instance).toBeInstanceOf(LobeGroq);
-      expect(instance.baseURL).toEqual(defaultBaseURL);
-    });
-  });
-
-  describe('chat', () => {
-    it('should call chat 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: 'mistralai/mistral-7b-instruct:free',
-        temperature: 0.7,
-        top_p: 1,
-      });
-
-      // Assert
-      expect(instance['client'].chat.completions.create).toHaveBeenCalledWith(
-        {
-          max_tokens: 1024,
-          stream: true,
-          messages: [{ content: 'Hello', role: 'user' }],
-          model: 'mistralai/mistral-7b-instruct:free',
-          temperature: 0.7,
-          top_p: 1,
-        },
-        { headers: { Accept: '*/*' } },
-      );
-      expect(result).toBeInstanceOf(Response);
-    });
-
-    describe('handlePayload option', () => {
-      it('should set stream to false when payload contains tools', async () => {
-        const mockCreateMethod = vi
-          .spyOn(instance['client'].chat.completions, 'create')
-          .mockResolvedValue({
-            id: 'chatcmpl-8xDx5AETP8mESQN7UB30GxTN2H1SO',
-            object: 'chat.completion',
-            created: 1709125675,
-            model: 'mistralai/mistral-7b-instruct:free',
-            system_fingerprint: 'fp_86156a94a0',
-            choices: [
-              {
-                index: 0,
-                message: { role: 'assistant', content: 'hello', refusal: null },
-                logprobs: null,
-                finish_reason: 'stop',
-              },
-            ],
-          });
-
-        await instance.chat({
-          messages: [{ content: 'Hello', role: 'user' }],
+describe('LobeGroqAI Temperature Tests', () => {
+  describe('handlePayload option', () => {
+    it('should set stream to false when payload contains tools', async () => {
+      const mockCreateMethod = vi
+        .spyOn(instance['client'].chat.completions, 'create')
+        .mockResolvedValue({
+          id: 'chatcmpl-8xDx5AETP8mESQN7UB30GxTN2H1SO',
+          object: 'chat.completion',
+          created: 1709125675,
           model: 'mistralai/mistral-7b-instruct:free',
-          temperature: 0,
-          tools: [
+          system_fingerprint: 'fp_86156a94a0',
+          choices: [
             {
-              type: 'function',
-              function: { name: 'tool1', description: '', parameters: {} },
+              index: 0,
+              message: { role: 'assistant', content: 'hello', refusal: null },
+              logprobs: null,
+              finish_reason: 'stop',
             },
           ],
         });
 
-        expect(mockCreateMethod).toHaveBeenCalledWith(
-          expect.objectContaining({ stream: false }),
-          expect.anything(),
-        );
-      });
-    });
-
-    describe('Error', () => {
-      it('should return OpenRouterBizError with an openai error response when OpenAI.APIError is thrown', async () => {
-        // Arrange
-        const apiError = new OpenAI.APIError(
-          400,
+      await instance.chat({
+        messages: [{ content: 'Hello', role: 'user' }],
+        model: 'mistralai/mistral-7b-instruct:free',
+        temperature: 0,
+        tools: [
           {
-            status: 400,
-            error: {
-              message: 'Bad Request',
-            },
+            type: 'function',
+            function: { name: 'tool1', description: '', parameters: {} },
           },
-          'Error message',
-          {},
-        );
-
-        vi.spyOn(instance['client'].chat.completions, 'create').mockRejectedValue(apiError);
-
-        // Act
-        try {
-          await instance.chat({
-            messages: [{ content: 'Hello', role: 'user' }],
-            model: 'mistralai/mistral-7b-instruct:free',
-            temperature: 0,
-          });
-        } catch (e) {
-          expect(e).toEqual({
-            endpoint: defaultBaseURL,
-            error: {
-              error: { message: 'Bad Request' },
-              status: 400,
-            },
-            errorType: bizErrorType,
-            provider,
-          });
-        }
-      });
-
-      it('should throw AgentRuntimeError with InvalidOpenRouterAPIKey if no apiKey is provided', async () => {
-        try {
-          new LobeGroq({});
-        } catch (e) {
-          expect(e).toEqual({ errorType: invalidErrorType });
-        }
+        ],
       });
 
-      it('should return OpenRouterBizError 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: 'mistralai/mistral-7b-instruct:free',
-            temperature: 0,
-          });
-        } catch (e) {
-          expect(e).toEqual({
-            endpoint: defaultBaseURL,
-            error: {
-              cause: { message: 'api is undefined' },
-              stack: 'abc',
-            },
-            errorType: bizErrorType,
-            provider,
-          });
-        }
-      });
-
-      it('should return OpenRouterBizError 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 LobeGroq({
-          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: 'mistralai/mistral-7b-instruct:free',
-            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 InvalidOpenRouterAPIKey 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: 'mistralai/mistral-7b-instruct:free',
-            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: 'mistralai/mistral-7b-instruct:free',
-            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_OPENROUTER_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_GROQ_CHAT_COMPLETION;
-
-        // 模拟环境变量
-        process.env.DEBUG_GROQ_CHAT_COMPLETION = '1';
-        vi.spyOn(debugStreamModule, 'debugStream').mockImplementation(() => Promise.resolve());
-
-        // 执行测试
-        // 运行你的测试函数，确保它会在条件满足时调用 debugStream
-        // 假设的测试函数调用，你可能需要根据实际情况调整
-        await instance.chat({
-          messages: [{ content: 'Hello', role: 'user' }],
-          model: 'mistralai/mistral-7b-instruct:free',
-          temperature: 0,
-        });
-
-        // 验证 debugStream 被调用
-        expect(debugStreamModule.debugStream).toHaveBeenCalled();
-
-        // 恢复原始环境变量值
-        process.env.DEBUG_GROQ_CHAT_COMPLETION = originalDebugValue;
-      });
+      expect(mockCreateMethod).toHaveBeenCalledWith(
+        expect.objectContaining({ stream: false }),
+        expect.anything(),
+      );
     });
   });
-});
 
-describe('LobeGroqAI Temperature Tests', () => {
   it('should set temperature to 0.7', async () => {
     await instance.chat({
       messages: [{ content: 'Hello', role: 'user' }],