Add registration of IOpenAiClient as a dependency

samples/ChatGpt.BlazorExample/Program.cs

@@ -10,7 +10,8 @@
 // make sure that you have added the OpenAICredentials:ApiKey to your secrets.json
 // or environment variables
 builder.Services.AddChatGptEntityFrameworkIntegration(
-    options => options.UseSqlite("Data Source=chats.db"));
+    options => options.UseSqlite("Data Source=chats.db"))
+    .AddServerSideBlazor();
 
 var app = builder.Build();
 

src/Directory.Build.props

@@ -1,6 +1,6 @@
 <Project>
     <PropertyGroup>
-        <Version>2.8.0</Version>
+        <Version>2.9.0</Version>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
         <LangVersion>12</LangVersion>

src/OpenAI.ChatGpt.AspNetCore/ChatGPTFactory.cs

@@ -7,10 +7,7 @@ namespace OpenAI.ChatGpt.AspNetCore;
 ///  Factory for creating <see cref="ChatGPT" /> instances from DI.
 /// </summary>
 /// <example>
-/// builder.Services.AddHttpClient&lt;ChatGPTFactory&lt;(client =>
-///     {
-///         client.DefaultRequestHeaders.Authorization = builder.Configuration["OpenAICredentials:ApiKey"];
-///     })
+/// builder.Services.AddHttpClient&lt;ChatGPTFactory&lt;("OpenAiClient")
 ///     .AddPolicyHandler(GetRetryPolicy())
 ///     .AddPolicyHandler(GetCircuitBreakerPolicy());
 /// </example>
@@ -72,7 +69,7 @@ private OpenAiClient CreateOpenAiClient(
         IHttpClientFactory httpClientFactory, 
         IOptions<OpenAICredentials> credentials)
     {
-        var httpClient = httpClientFactory.CreateClient(nameof(ChatGPTFactory));
+        var httpClient = httpClientFactory.CreateClient(OpenAiClient.HttpClientName);
         httpClient.DefaultRequestHeaders.Authorization = credentials.Value.GetAuthHeader();
         httpClient.BaseAddress = new Uri(credentials.Value.ApiHost);
         return new OpenAiClient(httpClient);

src/OpenAI.ChatGpt.AspNetCore/Extensions/ServiceCollectionExtensions.cs

@@ -13,6 +13,7 @@ public static class ServiceCollectionExtensions
     public static IServiceCollection AddChatGptInMemoryIntegration(
         this IServiceCollection services,
         bool injectInMemoryChatService = true,
+        bool injectOpenAiClient = true,
         string credentialsConfigSectionPath = CredentialsConfigSectionPathDefault,
         string completionsConfigSectionPath = ChatGPTConfigSectionPathDefault)
     {
@@ -27,12 +28,17 @@ public static IServiceCollection AddChatGptInMemoryIntegration(
             throw new ArgumentException("Value cannot be null or whitespace.",
                 nameof(completionsConfigSectionPath));
         }
-        services.AddChatGptIntegrationCore(credentialsConfigSectionPath, completionsConfigSectionPath);
+        services.AddChatGptIntegrationCore(
+            credentialsConfigSectionPath,
+            completionsConfigSectionPath, 
+            injectOpenAiClient: injectOpenAiClient
+        );
         services.AddSingleton<IChatHistoryStorage, InMemoryChatHistoryStorage>();
         if(injectInMemoryChatService)
         {
             services.AddScoped<ChatService>(CreateChatService);
         }
+
         return services;
     }
 
@@ -62,7 +68,8 @@ public static IServiceCollection AddChatGptIntegrationCore(
         this IServiceCollection services, 
         string credentialsConfigSectionPath = CredentialsConfigSectionPathDefault,
         string completionsConfigSectionPath = ChatGPTConfigSectionPathDefault,
-        ServiceLifetime serviceLifetime = ServiceLifetime.Scoped
+        ServiceLifetime serviceLifetime = ServiceLifetime.Scoped,
+        bool injectOpenAiClient = true
         )
     {
         ArgumentNullException.ThrowIfNull(services);
@@ -86,12 +93,34 @@ public static IServiceCollection AddChatGptIntegrationCore(
             .Configure(_ => { }) //optional
             .ValidateDataAnnotations()
             .ValidateOnStart();
-
-        services.AddHttpClient();
+
+        if (services.All(it => it.ServiceType != typeof(IHttpClientFactory)))
+        {
+            services.AddHttpClient(OpenAiClient.HttpClientName);
+        }
 
         services.AddSingleton<ITimeProvider, TimeProviderUtc>();
         services.Add(new ServiceDescriptor(typeof(ChatGPTFactory), typeof(ChatGPTFactory), serviceLifetime));
 
+        if (injectOpenAiClient)
+        {
+            AddOpenAiClient(services);
+        }
+
         return services;
     }
+
+    private static void AddOpenAiClient(IServiceCollection services)
+    {
+        services.AddSingleton<IOpenAiClient>(provider =>
+        {
+            var credentials = provider.GetRequiredService<IOptions<OpenAICredentials>>().Value;
+            var factory = provider.GetRequiredService<IHttpClientFactory>();
+            var httpClient = factory.CreateClient(OpenAiClient.HttpClientName);
+            httpClient.DefaultRequestHeaders.Authorization = credentials.GetAuthHeader();
+            httpClient.BaseAddress = new Uri(credentials.ApiHost);
+            var client = new OpenAiClient(httpClient);
+            return client;
+        });
+    }
 }

src/OpenAI.ChatGpt.EntityFrameworkCore/Extensions/ServiceCollectionExtensions.cs

@@ -14,7 +14,8 @@ public static IServiceCollection AddChatGptEntityFrameworkIntegration(
         Action<DbContextOptionsBuilder> optionsAction,
         string credentialsConfigSectionPath = CredentialsConfigSectionPathDefault,
         string completionsConfigSectionPath = ChatGPTConfigSectionPathDefault,
-        ServiceLifetime serviceLifetime = ServiceLifetime.Scoped)
+        ServiceLifetime serviceLifetime = ServiceLifetime.Scoped,
+        bool injectOpenAiClient = true)
     {
         ArgumentNullException.ThrowIfNull(services);
         ArgumentNullException.ThrowIfNull(optionsAction);
@@ -30,7 +31,7 @@ public static IServiceCollection AddChatGptEntityFrameworkIntegration(
         }
 
         services.AddChatGptIntegrationCore(
-            credentialsConfigSectionPath, completionsConfigSectionPath, serviceLifetime);
+            credentialsConfigSectionPath, completionsConfigSectionPath, serviceLifetime, injectOpenAiClient);
         services.AddDbContext<ChatGptDbContext>(optionsAction, serviceLifetime);
         switch (serviceLifetime)
         {

src/OpenAI.ChatGpt/OpenAI.ChatGpt.csproj

@@ -27,6 +27,7 @@
     <ItemGroup>
         <InternalsVisibleTo Include="OpenAI.ChatGpt.UnitTests" />
         <InternalsVisibleTo Include="OpenAI.ChatGpt.IntegrationTests" />
+        <InternalsVisibleTo Include="OpenAI.ChatGpt.AspNetCore" />
     </ItemGroup>
 
     <ItemGroup>

src/OpenAI.ChatGpt/OpenAiClient.cs

@@ -6,16 +6,15 @@
 using OpenAI.ChatGpt.Exceptions;
 using OpenAI.ChatGpt.Models.ChatCompletion;
 using OpenAI.ChatGpt.Models.ChatCompletion.Messaging;
-using OpenAI.ChatGpt.Models.Images;
 
 namespace OpenAI.ChatGpt;
 
 /// <summary> Thread-safe OpenAI client. </summary>
 [Fody.ConfigureAwait(false)]
 public class OpenAiClient : IOpenAiClient, IDisposable
 {
+    internal const string HttpClientName = "OpenAiClient";
     private const string DefaultHost = "https://api.openai.com/v1/";
-    private const string ImagesEndpoint = "images/generations";
     private const string ChatCompletionsEndpoint = "chat/completions";
 
     private static readonly Uri DefaultHostUri = new(DefaultHost);

tests/OpenAI.ChatGpt.UnitTests/DependencyInjectionTests/ChatGptServicesIntegrationTests.cs

@@ -28,6 +28,7 @@ public void AddChatGptCoreIntegration_added_expected_services()
 
         provider.GetRequiredService<IHttpClientFactory>();
         provider.GetRequiredService<ITimeProvider>();
+        provider.GetRequiredService<IOpenAiClient>();
     }
 
     [Fact]