fix: only mock the fetch function when necessary.

adolphnov · Nov 10, 2024 · f9960eb · f9960eb
1 parent 77a9802
commit f9960eb
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 13 deletions.
diff --git a/dist/buildinfo.json b/dist/buildinfo.json
diff --git a/dist/index.js b/dist/index.js
diff --git a/dist/timestamp b/dist/timestamp
diff --git a/src/agent/openai.ts b/src/agent/openai.ts
@@ -49,16 +49,17 @@ export class OpenAI extends OpenAIBase implements ChatAgent {
     };
 
     readonly request = async (params: LLMChatParams, context: AgentUserConfig, onStream: ChatStreamTextHandler | null): Promise<ResponseMessage[]> => {
+        const userMessage = params.messages.at(-1) as CoreUserMessage;
+        const originalModel = this.model(context, userMessage);
+        const transformedModel = this.transformModel(originalModel, context);
         const provider = createOpenAI({
             baseURL: context.OPENAI_API_BASE,
             apiKey: this.apikey(context),
             compatibility: 'strict',
-            fetch: this.fetch,
+            fetch: originalModel === transformedModel ? undefined : this.fetch,
         });
 
-        const userMessage = params.messages.at(-1) as CoreUserMessage;
-        const originalModel = this.model(context, userMessage);
-        const languageModelV1 = provider.languageModel(this.transformModel(originalModel, context), undefined);
+        const languageModelV1 = provider.languageModel(transformedModel, undefined);
         const { messages, onStream: newOnStream } = this.extraHandle(originalModel, params.messages, context, onStream);
 
         return requestChatCompletionsV2(await warpLLMParams({

diff --git a/src/telegram/utils/md2tgmd.ts b/src/telegram/utils/md2tgmd.ts
@@ -65,7 +65,6 @@ export function escape(text: string): string {
     }
     const regexp = /^LOGSTART\s(.*?)LOGEND/s;
     return result.join('\n')
-        // extra \n to avoid markdown render error
         .replace(regexp, '**$1||')
         .replace(new RegExp(Object.values(escapedChars).join('|'), 'g'), match => escapedCharsReverseMap.get(match) ?? match);
 }