🐛 fix: fix azure tools calling (#3046)

* 🐛 fix: desensitized azure endpoint * 🐛 fix: fix azure tool calling * ✅ test: fix test * ✅ test: fix test
lobehub · Jun 26, 2024 · b929985 · b929985
1 parent a5c348d
commit b929985
Show file tree

Hide file tree

Showing 5 changed files with 643 additions and 5 deletions.
diff --git a/src/libs/agent-runtime/azureOpenai/index.test.ts b/src/libs/agent-runtime/azureOpenai/index.test.ts
@@ -226,7 +226,7 @@ describe('LobeAzureOpenAI', () => {
         } catch (e) {
           // Assert
           expect(e).toEqual({
-            endpoint: 'https://test.openai.azure.com/',
+            endpoint: 'https://***.openai.azure.com/',
             error: {
               code: 'DeploymentNotFound',
               message: 'Deployment not found',
@@ -254,7 +254,7 @@ describe('LobeAzureOpenAI', () => {
         } catch (e) {
           // Assert
           expect(e).toEqual({
-            endpoint: 'https://test.openai.azure.com/',
+            endpoint: 'https://***.openai.azure.com/',
             errorType: 'AgentRuntimeError',
             provider: 'azure',
             error: {

diff --git a/src/libs/agent-runtime/azureOpenai/index.ts b/src/libs/agent-runtime/azureOpenai/index.ts
@@ -11,7 +11,7 @@ import { ChatCompetitionOptions, ChatStreamPayload, ModelProvider } from '../typ
 import { AgentRuntimeError } from '../utils/createError';
 import { debugStream } from '../utils/debugStream';
 import { StreamingResponse } from '../utils/response';
-import { OpenAIStream } from '../utils/streams';
+import { AzureOpenAIStream } from '../utils/streams';
 
 export class LobeAzureOpenAI implements LobeRuntimeAI {
   client: OpenAIClient;
@@ -47,7 +47,7 @@ export class LobeAzureOpenAI implements LobeRuntimeAI {
         debugStream(debug).catch(console.error);
       }
 
-      return StreamingResponse(OpenAIStream(prod, options?.callback), {
+      return StreamingResponse(AzureOpenAIStream(prod, options?.callback), {
         headers: options?.headers,
       });
     } catch (e) {
@@ -72,7 +72,7 @@ export class LobeAzureOpenAI implements LobeRuntimeAI {
         : AgentRuntimeErrorType.AgentRuntimeError;
 
       throw AgentRuntimeError.chat({
-        endpoint: this.baseURL,
+        endpoint: this.maskSensitiveUrl(this.baseURL),
         error,
         errorType,
         provider: ModelProvider.Azure,
@@ -103,4 +103,15 @@ export class LobeAzureOpenAI implements LobeRuntimeAI {
       .toLowerCase()
       .replaceAll(/(_[a-z])/g, (group) => group.toUpperCase().replace('_', ''));
   };
+
+  private maskSensitiveUrl = (url: string) => {
+    // 使用正则表达式匹配 'https://' 后面和 '.openai.azure.com/' 前面的内容
+    const regex = /^(https:\/\/)([^.]+)(\.openai\.azure\.com\/.*)$/;
+
+    // 使用替换函数
+    return url.replace(regex, (match, protocol, subdomain, rest) => {
+      // 将子域名替换为 '***'
+      return `${protocol}***${rest}`;
+    });
+  };
 }