Fix problem with trying to access disposed HttpClient in some cases

Author: tomahg

src/Gulla.Episerver.Labs.LanguageManager.OpenAi.csproj

@@ -10,17 +10,17 @@
     <Title>Gulla.Episerver.Labs.LanguageManager.OpenAi</Title>
     <PackageId>Gulla.Episerver.Labs.LanguageManager.OpenAi</PackageId>
     <Authors>Tomas Hensrud Gulla</Authors>
-    <Version>1.0.0</Version>
-    <PackageVersion>1.0.0</PackageVersion>
-    <AssemblyVersion>1.0.0.0</AssemblyVersion>
-    <FileVersion>1.0.0.0</FileVersion>
+    <Version>1.0.1</Version>
+    <PackageVersion>1.0.1</PackageVersion>
+    <AssemblyVersion>1.0.1.0</AssemblyVersion>
+    <FileVersion>1.0.1.0</FileVersion>
     <Description>An addon for EPiServer.Labs.LanguageManager that enables translation using OpenAI.</Description>
     <PackageTags>Optimizely LanguageManager AI Translation OpenAI</PackageTags>
     <PackageProjectUrl>https://github.com/tomahg/Gulla.Episerver.Labs.LanguageManager.OpenAi/</PackageProjectUrl>
     <RepositoryUrl>https://github.com/tomahg/Gulla.Episerver.Labs.LanguageManager.OpenAi/</RepositoryUrl>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
-    <PackageReleaseNotes>Initial version</PackageReleaseNotes>
+    <PackageReleaseNotes>Fix problem with httpclient</PackageReleaseNotes>
   </PropertyGroup>
 
   <ItemGroup>

src/OpenAiService.cs renamed to src/LanguageManagerOpenAiService.cs

@@ -7,22 +7,19 @@
 
 namespace Gulla.Episerver.Labs.LanguageManager.OpenAi
 {
-    public class OpenAiService
+    public class LanguageManagerOpenAiService
     {
-        private readonly HttpClient _client;
         private readonly IOptions<LanguageManagerOpenAiOptions> _options;
         private readonly string _endpointCompletions = "https://api.openai.com/v1/chat/completions";
 
-        public OpenAiService(HttpClient httpClient, IOptions<LanguageManagerOpenAiOptions> options)
+        public LanguageManagerOpenAiService(IOptions<LanguageManagerOpenAiOptions> options)
         {
             if (options.Value.OpenAiApiKey == null)
             {
                 throw new ArgumentException("Missing OpenAI API Key for Gulla.Episerver.Labs.LanguageManager.OpenAi!");
             }
 
-            _options = options;
-            _client = httpClient;
-            _client.DefaultRequestHeaders.Add("Authorization", $"Bearer {_options.Value.OpenAiApiKey}");
+            _options = options;            
         }
 
         /// <summary>
@@ -34,6 +31,9 @@ public OpenAiService(HttpClient httpClient, IOptions<LanguageManagerOpenAiOption
         /// <returns></returns>
         public async Task<string> TranslateText(string input, string fromLanguageName, string toLanguageName)
         {
+            using var httpClient = new HttpClient();
+            httpClient.DefaultRequestHeaders.Add("Authorization", $"Bearer {_options.Value.OpenAiApiKey}");
+
             var prompt = $"Translate the following content from {fromLanguageName} to {toLanguageName}.";
             if (!string.IsNullOrEmpty(_options.Value.OpenAiExtraPrompt))
             {
@@ -46,7 +46,7 @@ public async Task<string> TranslateText(string input, string fromLanguageName, s
             var content = new StringContent(JsonConvert.SerializeObject(new { messages = messages, model = _options.Value.OpenAiModel, temperature = _options.Value.OpenAiTemperature }), Encoding.UTF8, "application/json");
             request.Content = content;
 
-            var response = await _client.SendAsync(request);
+            var response = await httpClient.SendAsync(request);
             var json = await response.Content.ReadAsStringAsync();
             var data = JsonConvert.DeserializeObject<dynamic>(json);
 

src/OpenAiTranslatorProvider.cs

@@ -8,7 +8,7 @@ namespace Gulla.Episerver.Labs.LanguageManager.OpenAi
 {
     public class OpenAiTranslatorProvider : IMachineTranslatorProvider
     {
-        private Injected<OpenAiService> _openAiService;
+        private Injected<LanguageManagerOpenAiService> _openAiService;
 
         public string DisplayName => "OpenAI Translator";
 

src/ServiceCollectionExtensions.cs

@@ -13,7 +13,7 @@ public static IServiceCollection AddLanguageManagerOpenAi(this IServiceCollectio
 
         public static IServiceCollection AddLanguageManagerOpenAi(this IServiceCollection services, Action<LanguageManagerOpenAiOptions> setupAction)
         {
-            services.AddTransient<OpenAiService, OpenAiService>();
+            services.AddTransient<LanguageManagerOpenAiService, LanguageManagerOpenAiService>();
 
             services.AddOptions<LanguageManagerOpenAiOptions>().Configure<IConfiguration>((options, configuration) =>
             {