Merge pull request #49 from GarageGroup/feature/use-gpt-azure

pmosk · web-flow · commit 46e5d9451888 · 2023-11-11T16:07:53.000Z
Use Azure GPT
diff --git a/src/app/AzureFunc/Applicaton/Applicaton.cs b/src/app/AzureFunc/Applicaton/Applicaton.cs
@@ -14,6 +14,12 @@ internal static partial class Application
 {
     private const string DataverseSectionName = "Dataverse";
 
+    private const string GptApiSectionName = "GptApi";
+
+    private const string GptApiAzureSectionName = "Azure";
+
+    private const string IncidentCompleteSectionName = "IncidentComplete";
+
     private static Dependency<HttpMessageHandler> UseHttpMessageHandlerStandard(string loggerCategoryName)
         =>
         PrimaryHandler.UseStandardSocketsHttpHandler()
diff --git a/src/app/AzureFunc/Applicaton/BotFlow/Flow.IncidentCreate.cs b/src/app/AzureFunc/Applicaton/BotFlow/Flow.IncidentCreate.cs
@@ -9,10 +9,6 @@ namespace GarageGroup.Internal.Support;
 
 partial class Application
 {
-    private const string GptApiSectionName = "GptApi";
-
-    private const string IncidentCompleteSectionName = "IncidentComplete";
-
     private static IBotBuilder UseIncidentCreateFlow(this IBotBuilder botBuilder)
         =>
         Dependency.From(
@@ -53,37 +49,76 @@ private static SupportGptApiOption ResolveSupportGptApiOption(IServiceProvider s
         var gptApiSection = configuration.GetRequiredSection(GptApiSectionName);
         var incidentCompleteSection = gptApiSection.GetRequiredSection(IncidentCompleteSectionName);
 
+        var incidentComplete = new IncidentCompleteOption(
+            chatMessages: new(
+                new(
+                    role: "system",
+                    contentTemplate: incidentCompleteSection["SystemTemplate"].OrEmpty()),
+                new(
+                    role: "user",
+                    contentTemplate: incidentCompleteSection["UserTemplate"].OrEmpty())))
+        {
+            MaxTokens = incidentCompleteSection.GetValue<int?>("MaxTokens"),
+            Temperature = incidentCompleteSection.GetValue<decimal?>("Temperature")
+        };
+
+        if (configuration.IsAzureGpt() is false)
+        {
+            return new(
+                apiKey: gptApiSection["Key"].OrEmpty(),
+                model: gptApiSection["Model"].OrEmpty(),
+                incidentComplete: incidentComplete);
+        }
+
+        var azureSection = gptApiSection.GetRequiredSection(GptApiAzureSectionName);
         return new(
-            apiKey: gptApiSection["Key"].OrEmpty(),
-            incidentComplete: new IncidentCompleteOption(
-                model: incidentCompleteSection["Model"].OrEmpty())
-            {
-                MaxTokens = incidentCompleteSection.GetValue<int?>("MaxTokens"),
-                Temperature = incidentCompleteSection.GetValue<decimal?>("Temperature"),
-                ChatMessages = new(
-                    new(
-                        role: "system",
-                        contentTemplate: incidentCompleteSection["SystemTemplate"].OrEmpty()),
-                    new(
-                        role: "user",
-                        contentTemplate: incidentCompleteSection["UserTemplate"].OrEmpty()))
-            });
+            apiKey: azureSection["Key"].OrEmpty(),
+            azureGpt: new(
+                resourceName: azureSection["ResourceName"].OrEmpty(),
+                deploymentId: azureSection["DeploymentId"].OrEmpty(),
+                apiVersion: azureSection["ApiVersion"].OrEmpty()),
+            incidentComplete: incidentComplete);
     }
 
     private static FlatArray<KeyValuePair<string, string>> GetGptTraceData(this IConfiguration configuration)
     {
-        var section = configuration.GetRequiredSection(GptApiSectionName).GetRequiredSection(IncidentCompleteSectionName);
+        var gptApiSection = configuration.GetRequiredSection(GptApiSectionName);
         var traceData = new Dictionary<string, string>();
 
+        traceData.AppendSectionValues(gptApiSection);
+
+        if (configuration.IsAzureGpt())
+        {
+            traceData.AppendSectionValues(gptApiSection.GetSection(GptApiAzureSectionName));
+        }
+
+        traceData.AppendSectionValues(gptApiSection.GetSection(IncidentCompleteSectionName));
+        return traceData.ToFlatArray();
+    }
+
+    private static bool IsAzureGpt(this IConfiguration configuration)
+        =>
+        string.IsNullOrEmpty(configuration[$"{GptApiSectionName}:Model"]);
+
+    private static void AppendSectionValues(this Dictionary<string, string> traceData, IConfigurationSection section)
+    {
+        if (section.Exists() is false)
+        {
+            return;
+        }
+
         foreach (var child in section.GetChildren())
         {
+            if (string.Equals("key", child.Key, StringComparison.InvariantCultureIgnoreCase))
+            {
+                continue;
+            }
+
             if (string.IsNullOrEmpty(child.Value) is false)
             {
                 traceData[child.Key.FromLowerCase()] = child.Value;
             }
         }
-
-        return traceData.ToFlatArray();
     }
 
     private static string FromLowerCase(this string source)
diff --git a/src/app/AzureFunc/appsettings.json b/src/app/AzureFunc/appsettings.json
@@ -28,9 +28,15 @@
   },
   "GptApi": {
     "Key": "",
+    "Model": "",
+    "Version": "v2",
+    "Azure": {
+      "Key": "",
+      "ResourceName": "ai-garage-gpt-dev-02",
+      "DeploymentId": "garage-support-bot",
+      "ApiVersion": "2023-07-01-preview"
+    },
     "IncidentComplete": {
-      "Version": "v1",
-      "Model": "gpt-3.5-turbo",
       "MaxTokens": 200,
       "Temperature": 0,
       "SystemTemplate": "Ты выделяешь краткий заголовок без деталей (не больше 125 символов) из обращений к поддержке ИТ компании",
diff --git a/src/service/CrmContact/Test/Test.csproj b/src/service/CrmContact/Test/Test.csproj
@@ -16,7 +16,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
     <PackageReference Include="Moq" Version="4.20.69" />
     <PackageReference Include="xunit" Version="2.6.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.5.3">
diff --git a/src/service/CrmCustomer/Test/Test.csproj b/src/service/CrmCustomer/Test/Test.csproj
@@ -16,7 +16,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
     <PackageReference Include="Moq" Version="4.20.69" />
     <PackageReference Include="xunit" Version="2.6.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.5.3">
diff --git a/src/service/CrmIncident/Test/Test.csproj b/src/service/CrmIncident/Test/Test.csproj
@@ -16,7 +16,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
     <PackageReference Include="Moq" Version="4.20.69" />
     <PackageReference Include="xunit" Version="2.6.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.5.3">
diff --git a/src/service/CrmOwner/Test/Test.csproj b/src/service/CrmOwner/Test/Test.csproj
@@ -16,7 +16,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
     <PackageReference Include="Moq" Version="4.20.69" />
     <PackageReference Include="xunit" Version="2.6.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.5.3">
diff --git a/src/service/Gpt/Api/Api.csproj b/src/service/Gpt/Api/Api.csproj
@@ -17,7 +17,6 @@
   <ItemGroup>
     <PackageReference Include="PrimeFuncPack.Core.FlatArray" Version="1.2.1" />
     <PackageReference Include="PrimeFuncPack.Dependency.Core" Version="2.0.2" />
-    <PackageReference Include="PrimeFuncPack.Primitives.Strings" Version="2.0.2" />
   </ItemGroup>
 
 </Project>
diff --git a/src/service/Gpt/Api/Api/Api.CompleteIncident.cs b/src/service/Gpt/Api/Api/Api.CompleteIncident.cs
@@ -1,8 +1,9 @@
 using System;
 using System.Net;
 using System.Net.Http;
+using System.Net.Http.Headers;
+using System.Net.Http.Json;
 using System.Net.Mime;
-using System.Text;
 using System.Text.Json;
 using System.Threading;
 using System.Threading.Tasks;
@@ -35,32 +36,35 @@ private async ValueTask<Result<IncidentCompleteOut, Failure<IncidentCompleteFail
         var sourceMessage = input.Message.Trim();
         var jsonIn = new ChatGptJsonIn
         {
-            Model = option.IncidentComplete.Model,
+            Model = option.Model,
             MaxTokens = option.IncidentComplete.MaxTokens,
             Temperature = option.IncidentComplete.Temperature,
             Top = 1,
             Messages = option.IncidentComplete.ChatMessages.Map(CreateChatMessageJson)
         };
 
-        var json = JsonSerializer.Serialize(jsonIn);
-        using var content = new StringContent(json, Encoding.UTF8, MediaTypeNames.Application.Json);
-
         using var httpClient = CreateHttpClient();
+        using var httpRequest = new HttpRequestMessage
+        {
+            Method = HttpMethod.Post,
+            Content = JsonContent.Create(jsonIn, new MediaTypeHeaderValue(MediaTypeNames.Application.Json))
+        };
 
-        using var httpResponse = await httpClient.PostAsync(OpenAiCompletionsUrl, content, cancellationToken).ConfigureAwait(false);
+        using var httpResponse = await httpClient.SendAsync(httpRequest, cancellationToken).ConfigureAwait(false);
         var httpResponseText = await httpResponse.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false);
 
         if (httpResponse.StatusCode is HttpStatusCode.TooManyRequests)
         {
-            var errorMessage = ReadErrorMessage(httpResponseText);
-            return Failure.Create(IncidentCompleteFailureCode.TooManyRequests, errorMessage);
+            return Failure.Create(
+                failureCode: IncidentCompleteFailureCode.TooManyRequests,
+                failureMessage: ReadErrorMessage(httpResponseText));
         }
 
         if (httpResponse.IsSuccessStatusCode is false)
         {
             return Failure.Create(
-                IncidentCompleteFailureCode.Unknown,
-                $"An unexpected http status code: {httpResponse.StatusCode}. Body: {httpResponseText}");
+                failureCode: IncidentCompleteFailureCode.Unknown,
+                failureMessage: $"An unexpected http status code: {httpResponse.StatusCode}. Body: '{httpResponseText}'");
         }
 
         var jsonOut = JsonSerializer.Deserialize<ChatGptJsonOut>(httpResponseText);
@@ -69,15 +73,15 @@ private async ValueTask<Result<IncidentCompleteOut, Failure<IncidentCompleteFail
         {
             return Failure.Create(
                 IncidentCompleteFailureCode.Unknown,
-                $"GPT result choices are absent. Body: {httpResponseText}");
+                $"GPT result choices are absent. Body: '{httpResponseText}'");
         }
 
         var choice = jsonOut.Choices[0];
         if (string.Equals(choice.FinishReason, "stop", StringComparison.InvariantCultureIgnoreCase) is false)
         {
             return Failure.Create(
                 IncidentCompleteFailureCode.Unknown,
-                $"An unexpected GPT finish reason: {choice.FinishReason}. Body: {httpResponseText}");
+                $"An unexpected GPT finish reason: '{choice.FinishReason}'. Body: '{httpResponseText}'");
         }
 
         return new IncidentCompleteOut
diff --git a/src/service/Gpt/Api/Api/SupportGptApi.cs b/src/service/Gpt/Api/Api/SupportGptApi.cs
@@ -5,9 +5,13 @@ namespace GarageGroup.Internal.Support;
 
 internal sealed partial class SupportGptApi : ISupportGptApi
 {
-    private const string OpenAiBaseAddressUrl = "https://api.openai.com/";
+    private const string OpenAiUrl = "https://api.openai.com/v1/chat/completions";
 
-    private const string OpenAiCompletionsUrl = "/v1/chat/completions";
+    private const string AzureAiUrlTemplate
+        =
+        "https://{0}.openai.azure.com/openai/deployments/{1}/chat/completions?api-version={2}";
+
+    private const string AzureAiApiKeyHeaderName = "api-key";
 
     private readonly HttpMessageHandler httpMessageHandler;
 
@@ -21,12 +25,20 @@ internal SupportGptApi(HttpMessageHandler httpMessageHandler, SupportGptApiOptio
 
     private HttpClient CreateHttpClient()
     {
-        var httpClient = new HttpClient(httpMessageHandler, false)
+        var httpClient = new HttpClient(httpMessageHandler, false);
+        var azure = option.AzureGpt;
+
+        if (azure is null)
         {
-            BaseAddress = new(OpenAiBaseAddressUrl)
-        };
+            httpClient.BaseAddress = new(OpenAiUrl);
+            httpClient.DefaultRequestHeaders.Add("Authorization", $"Bearer {option.ApiKey}");
+        }
+        else
+        {
+            httpClient.BaseAddress = new(string.Format(AzureAiUrlTemplate, azure.ResourceName, azure.DeploymentId, azure.ApiVersion));
+            httpClient.DefaultRequestHeaders.Add(AzureAiApiKeyHeaderName, option.ApiKey);
+        }
 
-        httpClient.DefaultRequestHeaders.Add("Authorization", $"Bearer {option.ApiKey}");
         return httpClient;
     }
 
diff --git a/src/service/Gpt/Api/Json/ChatGptJsonIn.cs b/src/service/Gpt/Api/Json/ChatGptJsonIn.cs
@@ -9,6 +9,7 @@ internal sealed record class ChatGptJsonIn
     public FlatArray<ChatMessageJson> Messages { get; init; }
 
     [JsonPropertyName("model")]
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     public string? Model { get; init; }
 
     [JsonPropertyName("max_tokens")]
diff --git a/src/service/Gpt/Api/Option/IncidentCompleteOption.cs b/src/service/Gpt/Api/Option/IncidentCompleteOption.cs
@@ -4,13 +4,11 @@ namespace GarageGroup.Internal.Support;
 
 public sealed record class IncidentCompleteOption
 {
-    public IncidentCompleteOption(string model)
+    public IncidentCompleteOption(FlatArray<ChatMessageOption> chatMessages)
         =>
-        Model = model.OrEmpty();
+        ChatMessages = chatMessages;
 
-    public string Model { get; }
-
-    public required FlatArray<ChatMessageOption> ChatMessages { get; init; }
+    public FlatArray<ChatMessageOption> ChatMessages { get; }
 
     public int? MaxTokens { get; init; }
 
diff --git a/src/service/Gpt/Api/Option/SupportAzureGptApiOption.cs b/src/service/Gpt/Api/Option/SupportAzureGptApiOption.cs
@@ -0,0 +1,19 @@
+﻿using System;
+
+namespace GarageGroup.Internal.Support;
+
+public sealed record class SupportAzureGptApiOption
+{
+    public SupportAzureGptApiOption(string resourceName, string deploymentId, string apiVersion)
+    {
+        ResourceName = resourceName.OrEmpty();
+        DeploymentId = deploymentId.OrEmpty();
+        ApiVersion = apiVersion.OrEmpty();
+    }
+
+    public string ResourceName { get; }
+
+    public string DeploymentId { get; }
+
+    public string ApiVersion { get; }
+}
diff --git a/src/service/Gpt/Api/Option/SupportGptApiOption.cs b/src/service/Gpt/Api/Option/SupportGptApiOption.cs
@@ -4,13 +4,25 @@ namespace GarageGroup.Internal.Support;
 
 public sealed record class SupportGptApiOption
 {
-    public SupportGptApiOption(string apiKey, IncidentCompleteOption incidentComplete)
+    public SupportGptApiOption(string apiKey, string model, IncidentCompleteOption incidentComplete)
     {
         ApiKey = apiKey.OrEmpty();
+        Model = model.OrEmpty();
+        IncidentComplete = incidentComplete;
+    }
+
+    public SupportGptApiOption(string apiKey, SupportAzureGptApiOption azureGpt, IncidentCompleteOption incidentComplete)
+    {
+        ApiKey = apiKey.OrEmpty();
+        AzureGpt = azureGpt;
         IncidentComplete = incidentComplete;
     }
 
     public string ApiKey { get; }
 
+    public string? Model { get; }
+
+    public SupportAzureGptApiOption? AzureGpt { get; }
+
     public IncidentCompleteOption IncidentComplete { get; }
 }
diff --git a/src/service/Gpt/Contract/Contract.csproj b/src/service/Gpt/Contract/Contract.csproj
@@ -13,6 +13,7 @@
   <ItemGroup>
     <PackageReference Include="PrimeFuncPack.Core.Failure" Version="2.0.1" />
     <PackageReference Include="PrimeFuncPack.Core.Result" Version="2.0.2" />
+    <PackageReference Include="PrimeFuncPack.Primitives.Strings" Version="2.0.2" />
   </ItemGroup>
 
 </Project>
diff --git a/src/service/Gpt/Contract/IncidentComplete/IncidentCompleteIn.cs b/src/service/Gpt/Contract/IncidentComplete/IncidentCompleteIn.cs
@@ -1,10 +1,12 @@
+using System;
+
 namespace GarageGroup.Internal.Support;
 
 public sealed record class IncidentCompleteIn
 {
     public IncidentCompleteIn(string message)
         =>
-        Message = message ?? string.Empty;
+        Message = message.OrEmpty();
 
     public string Message { get; }
 }
diff --git a/src/service/Gpt/Test/Source.Api/Source.In.Azure.cs b/src/service/Gpt/Test/Source.Api/Source.In.Azure.cs
diff --git a/src/service/Gpt/Test/Source.Api/Source.In.OpenAi.cs b/src/service/Gpt/Test/Source.Api/Source.In.OpenAi.cs
diff --git a/src/service/Gpt/Test/Source.Api/Source.Out.Failure.cs b/src/service/Gpt/Test/Source.Api/Source.Out.Failure.cs
diff --git a/src/service/Gpt/Test/Source.Api/Source.Out.Success.cs b/src/service/Gpt/Test/Source.Api/Source.Out.Success.cs
diff --git a/src/service/Gpt/Test/Stub/StubGptJsonIn.cs b/src/service/Gpt/Test/Stub/StubGptJsonIn.cs
diff --git a/src/service/Gpt/Test/Test.Api/SupportGptApiTest.cs b/src/service/Gpt/Test/Test.Api/SupportGptApiTest.cs
diff --git a/src/service/Gpt/Test/Test.Api/Test.CompleteIncident.cs b/src/service/Gpt/Test/Test.Api/Test.CompleteIncident.cs
diff --git a/src/service/Gpt/Test/Test.csproj b/src/service/Gpt/Test/Test.csproj
