chore: 删除requestChatCompletions废弃参数

TBXark · Nov 12, 2024 · 4d75571 · 4d75571
1 parent e1a0489
commit 4d75571
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 32 deletions.
diff --git a/dist/buildinfo.json b/dist/buildinfo.json
diff --git a/dist/index.js b/dist/index.js
diff --git a/src/adapter/next/next.ts b/src/adapter/next/next.ts
@@ -11,17 +11,16 @@ import { createOpenAI } from '@ai-sdk/openai';
 import { generateText, streamText } from 'ai';
 import { streamHandler } from '../../agent/request';
 
-export async function requestChatCompletionsV2(params: { model: LanguageModelV1; prompt?: string; messages: HistoryItem[] }, onStream: ChatStreamTextHandler | null, onResult: ChatStreamTextHandler | null = null): Promise<ChatAgentResponse> {
+export async function requestChatCompletionsV2(params: { model: LanguageModelV1; prompt?: string; messages: HistoryItem[] }, onStream: ChatStreamTextHandler | null): Promise<ChatAgentResponse> {
     if (onStream !== null) {
         const stream = await streamText({
             model: params.model,
             prompt: params.prompt,
             messages: params.messages,
         });
-        const contentFull = await streamHandler(stream.textStream, t => t, onStream);
-        onResult?.(contentFull);
+        await streamHandler(stream.textStream, t => t, onStream);
         return {
-            text: contentFull,
+            text: await stream.text,
             responses: (await stream.response).messages,
         };
     } else {
@@ -30,7 +29,6 @@ export async function requestChatCompletionsV2(params: { model: LanguageModelV1;
             prompt: params.prompt,
             messages: params.messages,
         });
-        onResult?.(result.text);
         return {
             text: result.text,
             responses: result.response.messages,

diff --git a/src/agent/anthropic.ts b/src/agent/anthropic.ts
@@ -122,7 +122,7 @@ export class Anthropic implements ChatAgent {
         options.errorExtractor = function (data: any) {
             return data?.error?.message;
         };
-        return convertStringToResponseMessages(requestChatCompletions(url, header, body, onStream, null, options));
+        return convertStringToResponseMessages(requestChatCompletions(url, header, body, onStream, options));
     };
 
     readonly modelList = async (context: AgentUserConfig): Promise<string[]> => {

diff --git a/src/agent/cohere.ts b/src/agent/cohere.ts
@@ -41,7 +41,7 @@ export class Cohere implements ChatAgent {
         options.errorExtractor = function (data: any) {
             return data?.message;
         };
-        return convertStringToResponseMessages(requestChatCompletions(url, header, body, onStream, null, options));
+        return convertStringToResponseMessages(requestChatCompletions(url, header, body, onStream, options));
     };
 
     readonly modelList = async (context: AgentUserConfig): Promise<string[]> => {

diff --git a/src/agent/request.ts b/src/agent/request.ts
@@ -73,7 +73,7 @@ export async function streamHandler<T>(stream: AsyncIterable<T>, contentExtracto
     return contentFull;
 }
 
-export async function requestChatCompletions(url: string, header: Record<string, string>, body: any, onStream: ChatStreamTextHandler | null, onResult: ChatStreamTextHandler | null = null, options: SseChatCompatibleOptions | null = null): Promise<string> {
+export async function requestChatCompletions(url: string, header: Record<string, string>, body: any, onStream: ChatStreamTextHandler | null, options: SseChatCompatibleOptions | null = null): Promise<string> {
     const controller = new AbortController();
     const { signal } = controller;
 
@@ -112,11 +112,5 @@ export async function requestChatCompletions(url: string, header: Record<string,
         throw new Error(options.errorExtractor?.(result) || 'Unknown error');
     }
 
-    try {
-        await onResult?.(result);
-        return options.fullContentExtractor?.(result) || '';
-    } catch (e) {
-        console.error(e);
-        throw new Error(JSON.stringify(result));
-    }
+    return options.fullContentExtractor?.(result) || '';
 }
diff --git a/src/agent/workersai.ts b/src/agent/workersai.ts
@@ -68,7 +68,7 @@ export class WorkersChat extends WorkerBase implements ChatAgent {
         options.errorExtractor = function (data: any) {
             return data?.errors?.at(0)?.message;
         };
-        return convertStringToResponseMessages(requestChatCompletions(url, header, body, onStream, null, options));
+        return convertStringToResponseMessages(requestChatCompletions(url, header, body, onStream, options));
     };
 
     readonly modelList = async (context: AgentUserConfig): Promise<string[]> => {

diff --git a/src/config/version.ts b/src/config/version.ts
@@ -1,2 +1,2 @@
-export const BUILD_TIMESTAMP = 1731399467;
-export const BUILD_VERSION = '926f2b5';
+export const BUILD_TIMESTAMP = 1731402552;
+export const BUILD_VERSION = 'e1a0489';