From 2bc07cb3df929ebe516c58dd0e2418641ff39317 Mon Sep 17 00:00:00 2001
From: ccnetcore <cc2016cc>
Date: Fri, 18 Jul 2025 00:14:19 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=AE=8C=E6=88=90=E9=94=99=E8=AF=AF?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AzureDatabricksChatCompletionsService.cs  | 19 ++++++++++---------
 ...eOpenAiChatCompletionCompletionsService.cs |  7 ++++---
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Domain/AiGateWay/Impl/ThorAzureDatabricks/Chats/AzureDatabricksChatCompletionsService.cs b/Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Domain/AiGateWay/Impl/ThorAzureDatabricks/Chats/AzureDatabricksChatCompletionsService.cs
index 4e31e1b0..0de17416 100644
--- a/Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Domain/AiGateWay/Impl/ThorAzureDatabricks/Chats/AzureDatabricksChatCompletionsService.cs
+++ b/Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Domain/AiGateWay/Impl/ThorAzureDatabricks/Chats/AzureDatabricksChatCompletionsService.cs
@@ -1,6 +1,7 @@
 using System.Diagnostics;
 using System.Net;
 using System.Net.Http.Json;
+using System.Runtime.CompilerServices;
 using System.Text.Json;
 using Microsoft.Extensions.Logging;
 using Yi.Framework.AiHub.Application.Contracts.Dtos.OpenAi;
@@ -12,19 +13,19 @@ namespace Yi.Framework.AiHub.Domain.AiGateWay.Impl.ThorAzureDatabricks.Chats;
 public class AzureDatabricksChatCompletionsService(ILogger<AzureDatabricksChatCompletionsService> logger)
     : IChatCompletionService
 {
-    private string GetAddress(AiModelDescribe? options)
+    private string GetAddress(AiModelDescribe? options, string model)
     {
         // This method should return the appropriate URL for the Azure Databricks API
         // based on the provided options and model.
         // For now, we will return a placeholder URL.
-        return $"{options?.Endpoint.TrimEnd('/')}/serving-endpoints/{options.ModelExtraInfo}/invocations";
+        return $"{options?.Endpoint.TrimEnd('/')}/serving-endpoints/{model}/invocations";
     }
 
     public async IAsyncEnumerable<ThorChatCompletionsResponse> CompleteChatStreamAsync(AiModelDescribe options,
         ThorChatCompletionsRequest chatCompletionCreate,
-        CancellationToken cancellationToken)
+        [EnumeratorCancellation] CancellationToken cancellationToken)
     {
-        var address = GetAddress(options);
+        var address = GetAddress(options, chatCompletionCreate.Model);
         using var openai =
             Activity.Current?.Source.StartActivity("OpenAI 对话流式补全");
 
@@ -60,7 +61,7 @@ public class AzureDatabricksChatCompletionsService(ILogger<AzureDatabricksChatCo
             logger.LogError("OpenAI对话异常 , StatusCode: {StatusCode} 错误响应内容：{Content}", response.StatusCode,
                 error);
 
-            throw new BusinessException("OpenAI对话异常：" + error, response.StatusCode.ToString());
+            throw new BusinessException(response.StatusCode.ToString(), "OpenAI对话异常：" + error);
         }
 
         using var stream = new StreamReader(await response.Content.ReadAsStreamAsync(cancellationToken));
@@ -78,7 +79,7 @@ public class AzureDatabricksChatCompletionsService(ILogger<AzureDatabricksChatCo
                 logger.LogInformation("OpenAI对话异常 , StatusCode: {StatusCode} Response: {Response}", response.StatusCode,
                     line);
 
-                throw new BusinessException("OpenAI对话异常", line);
+                throw new BusinessException("500", "OpenAI对话异常", line);
             }
 
             if (line.StartsWith(OpenAIConstant.Data))
@@ -143,7 +144,7 @@ public class AzureDatabricksChatCompletionsService(ILogger<AzureDatabricksChatCo
         ThorChatCompletionsRequest chatCompletionCreate,
         CancellationToken cancellationToken)
     {
-        var address = GetAddress(options);
+        var address = GetAddress(options, chatCompletionCreate.Model);
 
         using var openai =
             Activity.Current?.Source.StartActivity("OpenAI 对话补全");
@@ -157,7 +158,7 @@ public class AzureDatabricksChatCompletionsService(ILogger<AzureDatabricksChatCo
 
         if (response.StatusCode == HttpStatusCode.Unauthorized)
         {
-            throw new BusinessException("渠道未登录,请联系管理人员", "401");
+            throw new BusinessException("401", "渠道未登录,请联系管理人员");
         }
 
         // 如果限流则抛出限流异常
@@ -174,7 +175,7 @@ public class AzureDatabricksChatCompletionsService(ILogger<AzureDatabricksChatCo
                 options.Endpoint,
                 response.StatusCode, error);
 
-            throw new BusinessException("OpenAI对话异常", response.StatusCode.ToString());
+            throw new BusinessException(response.StatusCode.ToString(), "OpenAI对话异常");
         }
 
         var result =
diff --git a/Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Domain/AiGateWay/Impl/ThorAzureOpenAI/Chats/AzureOpenAiChatCompletionCompletionsService.cs b/Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Domain/AiGateWay/Impl/ThorAzureOpenAI/Chats/AzureOpenAiChatCompletionCompletionsService.cs
index 99367ab4..625421e1 100644
--- a/Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Domain/AiGateWay/Impl/ThorAzureOpenAI/Chats/AzureOpenAiChatCompletionCompletionsService.cs
+++ b/Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Domain/AiGateWay/Impl/ThorAzureOpenAI/Chats/AzureOpenAiChatCompletionCompletionsService.cs
@@ -1,6 +1,7 @@
 using System.Diagnostics;
 using System.Net;
 using System.Net.Http.Json;
+using System.Runtime.CompilerServices;
 using System.Text.Json;
 using Microsoft.Extensions.Logging;
 using Yi.Framework.AiHub.Application.Contracts.Dtos.OpenAi;
@@ -14,7 +15,7 @@ public class AzureOpenAiChatCompletionCompletionsService(ILogger<AzureOpenAiChat
 {
     public async IAsyncEnumerable<ThorChatCompletionsResponse> CompleteChatStreamAsync(AiModelDescribe options,
         ThorChatCompletionsRequest chatCompletionCreate,
-        CancellationToken cancellationToken)
+        [EnumeratorCancellation] CancellationToken cancellationToken)
     {
         using var openai =
             Activity.Current?.Source.StartActivity("Azure OpenAI 对话流式补全");
@@ -32,7 +33,7 @@ public class AzureOpenAiChatCompletionCompletionsService(ILogger<AzureOpenAiChat
             logger.LogError("Azure对话异常 , StatusCode: {StatusCode} 错误响应内容：{Content}", response.StatusCode,
                 error);
 
-            throw new BusinessException("AzureOpenAI对话异常：" + error, response.StatusCode.ToString());
+            throw new BusinessException(response.StatusCode.ToString(), "AzureOpenAI对话异常：" + error);
         }
 
         using StreamReader reader = new(await response.Content.ReadAsStreamAsync(cancellationToken));
@@ -48,7 +49,7 @@ public class AzureOpenAiChatCompletionCompletionsService(ILogger<AzureOpenAiChat
                     response.StatusCode,
                     line);
 
-                throw new BusinessException("AzureOpenAI对话异常", line);
+                throw new BusinessException("500", "AzureOpenAI对话异常", line);
             }
 
             if (line.StartsWith(OpenAIConstant.Data))