tests

Author: KSemenenko

Together.SemanticKernel/Extensions/KernelBuilderExtensions.cs

@@ -17,20 +17,20 @@ public static IKernelBuilder AddTogetherChatCompletion(
         this IKernelBuilder builder,
         string model,
         string apiKey,
-        string endpoint,
+        string? endpoint = null,
         HttpClient? httpClient = null,
         string? serviceId = null)
     {
         ArgumentException.ThrowIfNullOrWhiteSpace(model);
 
         builder.Services.AddKeyedSingleton<IChatCompletionService>(serviceId, (serviceProvider, _) =>
             new TogetherChatCompletionService(
-                new TogetherClient(GetHttpClient(httpClient, serviceProvider), apiKey, endpoint),
+                new TogetherClient(apiKey, GetHttpClient(httpClient, serviceProvider), endpoint),
                 model));
 
         builder.Services.AddKeyedSingleton<ITextGenerationService>(serviceId, (serviceProvider, _) =>
             new TogetherChatCompletionService(
-                new TogetherClient(GetHttpClient(httpClient, serviceProvider), apiKey, endpoint),
+                new TogetherClient(apiKey, GetHttpClient(httpClient, serviceProvider), endpoint),
                 model));
 
         return builder;
@@ -49,7 +49,7 @@ public static IKernelBuilder AddTogetherTextEmbeddingGeneration(
 
         builder.Services.AddKeyedSingleton<ITextEmbeddingGenerationService>(serviceId, (serviceProvider, _) =>
             new TogetherTextEmbeddingGenerationService(
-                new TogetherClient(GetHttpClient(httpClient, serviceProvider), apiKey, endpoint),
+                new TogetherClient(apiKey, GetHttpClient(httpClient, serviceProvider), endpoint),
                 model));
 
         return builder;
@@ -68,14 +68,14 @@ public static IKernelBuilder AddTogetherTextToImage(
 
         builder.Services.AddKeyedSingleton<ITextToImageService>(serviceId, (serviceProvider, _) =>
             new TogetherTextToImageService(
-                new TogetherClient(GetHttpClient(httpClient, serviceProvider), apiKey, endpoint),
+                new TogetherClient(apiKey, GetHttpClient(httpClient, serviceProvider), endpoint),
                 model));
 
         return builder;
     }
 
     private static HttpClient GetHttpClient(HttpClient? httpClient, IServiceProvider serviceProvider)
     {
-        return httpClient ?? serviceProvider.GetRequiredService<HttpClient>();
+        return httpClient ?? serviceProvider.GetService<HttpClient>() ?? new HttpClient();
     }
 }

Together.Tests/Together.Tests.csproj

@@ -17,6 +17,7 @@
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
+        <PackageReference Include="FluentAssertions" Version="7.0.0" />
         <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0"/>
         <PackageReference Include="System.Linq.Async" Version="6.0.1"/>
         <PackageReference Include="xunit" Version="2.9.3"/>

Together.Tests/TogetherClientIntegraionTests.cs

@@ -14,9 +14,7 @@ public class TogetherClientIntegraionTests
 
     private TogetherClient CreateTogetherClient()
     {
-        var httpClient = new HttpClient();
-        httpClient.Timeout = TimeSpan.FromSeconds(TogetherConstants.TIMEOUT_SECS);
-        return new TogetherClient(httpClient, API_KEY);
+        return new TogetherClient(API_KEY);
     }
 
     [Fact

Together/TogetherClient.cs

@@ -7,12 +7,17 @@ public class TogetherClient
     private readonly HttpClient _httpClient;
     private const string BaseUrl = "https://api.together.xyz/";
 
-    public TogetherClient(HttpClient httpClient, string apiKey, string baseUrl = null)
+    public TogetherClient(string apiKey) : this(apiKey, new HttpClient()
     {
-        _httpClient = new HttpClient
-        {
-            BaseAddress = new Uri(baseUrl ?? BaseUrl)
-        };
+        Timeout = TimeSpan.FromSeconds(TogetherConstants.TIMEOUT_SECS)
+    })
+    {
+    }
+
+    public TogetherClient(string apiKey, HttpClient httpClient,  string baseUrl = BaseUrl)
+    {
+        _httpClient = httpClient;
+        _httpClient.BaseAddress = new Uri(baseUrl);
         _httpClient.DefaultRequestHeaders.Add("Authorization", $"Bearer {apiKey}");
 
         Completions = new CompletionClient(_httpClient);