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 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 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 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