Add usability overloads for List model client operations

Author: kzu

src/GrokClient/Extensions.cs

@@ -1,31 +1,32 @@
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.Threading;
 using System.Threading.Tasks;
 using Google.Protobuf.WellKnownTypes;
 
-namespace Devlooped.Grok
+namespace Devlooped.Grok;
+
+[EditorBrowsable(EditorBrowsableState.Never)]
+public static class GrpcExtensions
 {
-    public static class ModelsClientExtensions
+    extension(Models.ModelsClient client)
     {
-        extension(Models.ModelsClient client)
+        public async Task<IEnumerable<LanguageModel>> ListLanguageModelsAsync(CancellationToken cancellation = default)
         {
-            public async Task<IEnumerable<LanguageModel>> ListLanguageModelsAsync(CancellationToken cancellation = default)
-            {
-                var models = await client.ListLanguageModelsAsync(new Empty(), cancellationToken: cancellation);
-                return models.Models;
-            }
+            var models = await client.ListLanguageModelsAsync(new Empty(), cancellationToken: cancellation);
+            return models.Models;
         }
-    }
-}
 
-namespace Devlooped.Grok
-{
-    /// <summary>
-    /// An API service that let users get details of available models on the
-    /// platform.
-    /// </summary>
-    partial class Models
-    {
-        static Models() => __ServiceName = "xai_api.Models";
+        public async Task<IEnumerable<EmbeddingModel>> ListEmbeddingModelsAsync(CancellationToken cancellation)
+        {
+            var models = await client.ListEmbeddingModelsAsync(new Empty(), cancellationToken: cancellation);
+            return models.Models;
+        }
+
+        public async Task<IEnumerable<ImageGenerationModel>> ListImageGenerationModelsAsync(CancellationToken cancellation = default)
+        {
+            var models = await client.ListImageGenerationModelsAsync(new Empty(), cancellationToken: cancellation);
+            return models.Models;
+        }
     }
-}
+}

src/GrokClient/GrokServiceCollectionExtensions.cs

@@ -14,9 +14,7 @@ public static IServiceCollection AddGrokClient(this IServiceCollection services,
     {
         var address = new Uri("https://api.x.ai/");
 
-        Action<HttpClient> http = client => client.DefaultRequestHeaders.TryAddWithoutValidation("Authorization", $"Bearer {apiKey}");
-
-        services.AddGrpcClient<Auth.AuthClient>(options =>
+        var builder = services.AddGrpcClient<Auth.AuthClient>(options =>
         {
             options.Address = address;
             configureClient?.Invoke(options);
@@ -27,7 +25,9 @@ public static IServiceCollection AddGrokClient(this IServiceCollection services,
             return Task.CompletedTask;
         });
 
-        services.AddGrpcClient<Chat.ChatClient>(options =>
+        configureHttp?.Invoke(builder);
+
+        builder = services.AddGrpcClient<Chat.ChatClient>(options =>
         {
             options.Address = address;
             configureClient?.Invoke(options);
@@ -38,7 +38,9 @@ public static IServiceCollection AddGrokClient(this IServiceCollection services,
             return Task.CompletedTask;
         });
 
-        services.AddGrpcClient<Embedder.EmbedderClient>(options =>
+        configureHttp?.Invoke(builder);
+
+        builder = services.AddGrpcClient<Embedder.EmbedderClient>(options =>
         {
             options.Address = address;
             configureClient?.Invoke(options);
@@ -49,7 +51,9 @@ public static IServiceCollection AddGrokClient(this IServiceCollection services,
             return Task.CompletedTask;
         });
 
-        services.AddGrpcClient<Image.ImageClient>(options =>
+        configureHttp?.Invoke(builder);
+
+        builder = services.AddGrpcClient<Image.ImageClient>(options =>
         {
             options.Address = address;
             configureClient?.Invoke(options);
@@ -60,21 +64,22 @@ public static IServiceCollection AddGrokClient(this IServiceCollection services,
             return Task.CompletedTask;
         });
 
-        var builder = services.AddGrpcClient<Models.ModelsClient>(options =>
+        configureHttp?.Invoke(builder);
+
+        builder = services.AddGrpcClient<Models.ModelsClient>(options =>
         {
             options.Address = address;
             configureClient?.Invoke(options);
-        }).ConfigureHttpClient(http);
+        })
+        .AddCallCredentials((context, metadata) =>
+        {
+            metadata.Add("Authorization", $"Bearer {apiKey}");
+            return Task.CompletedTask;
+        });
 
         configureHttp?.Invoke(builder);
 
-        //.AddCallCredentials((context, metadata) =>
-        //{
-        //    metadata.Add("Authorization", $"Bearer {apiKey}");
-        //    return Task.CompletedTask;
-        //});
-
-        services.AddGrpcClient<Sample.SampleClient>(options =>
+        builder = services.AddGrpcClient<Sample.SampleClient>(options =>
         {
             options.Address = address;
             configureClient?.Invoke(options);
@@ -85,7 +90,9 @@ public static IServiceCollection AddGrokClient(this IServiceCollection services,
             return Task.CompletedTask;
         });
 
-        services.AddGrpcClient<Tokenize.TokenizeClient>(options =>
+        configureHttp?.Invoke(builder);
+
+        builder = services.AddGrpcClient<Tokenize.TokenizeClient>(options =>
         {
             options.Address = address;
             configureClient?.Invoke(options);
@@ -96,7 +103,9 @@ public static IServiceCollection AddGrokClient(this IServiceCollection services,
             return Task.CompletedTask;
         });
 
-        services.AddGrpcClient<Documents.DocumentsClient>(options =>
+        configureHttp?.Invoke(builder);
+
+        builder = services.AddGrpcClient<Documents.DocumentsClient>(options =>
         {
             options.Address = address;
             configureClient?.Invoke(options);
@@ -107,6 +116,8 @@ public static IServiceCollection AddGrokClient(this IServiceCollection services,
             return Task.CompletedTask;
         });
 
+        configureHttp?.Invoke(builder);
+
         return services;
     }
 }

src/Tests/ModelsTests.cs

@@ -14,7 +14,7 @@ public async Task ListModelsAsync()
             .BuildServiceProvider();
 
         var client = services.GetRequiredService<Models.ModelsClient>();
-
+        
         var models = await client.ListLanguageModelsAsync();
 
         Assert.NotNull(models);