Added ORGANIZATION constructor parameter for OpenAiWebClient

Added FileClient & ImageClient as parameters for GptClient
ModerationBuilder modified to include required parameters

Author: Abaxoth

ManagedCode.OpenAI.Tests/FileTest.cs

@@ -22,7 +22,7 @@ public class FileTest
     public FileTest(ITestOutputHelper output)
     {
         _output = output;
-        _fileClient = _client.FileManager();
+        _fileClient = _client.FileClient;
     }
 
     [Fact]

ManagedCode.OpenAI.Tests/ImageTests.cs

@@ -23,7 +23,7 @@ public ImageTests(ITestOutputHelper output)
         [Fact]
         public async Task GenerateImage_Success()
         {
-            var image = await _client.GenerateImage("Red dragon")
+            var image = await _client.ImageClient.GenerateImage("Red dragon")
                 .SetImageResolution(ImageResolution._512x512).GenerateAsync();
 
             Log($"Image url: {image.Content}");
@@ -34,7 +34,7 @@ public async Task GenerateImage_Success()
         public async Task EditImage_Success()
         {
            var edited = await _client
-               .EditImage("change color to blue",
+               .ImageClient.EditImage("change color to blue",
                    x=> x.FromBytes(Properties.Resources.Dog))
                .AsUrl()
                .EditAsync();

ManagedCode.OpenAI.Tests/ModerationTests.cs

@@ -10,7 +10,7 @@ public class ModerationTests
 {
     private readonly ITestOutputHelper _output;
     private readonly IGptClient _client = Mocks.Client();
-    private IModerationBuilder ModerationBuilder => _client.ModerationBuilder();
+    private IModerationBuilder ModerationBuilder => _client.Moderation();
 
     public ModerationTests(ITestOutputHelper output)
     {
@@ -21,8 +21,7 @@ public ModerationTests(ITestOutputHelper output)
     public async Task CreateModeration_Success()
     {
         var moderation = await ModerationBuilder
-            .AddInput("I kill you")
-            .ExecuteAsync();
+            .ExecuteAsync("I kill you");
 
         Assert.NotNull(moderation);
 
@@ -36,17 +35,15 @@ public async Task CreateModeration_Success()
     [Fact]
     public async Task CreateMultipleModeration_Success()
     {
-        var moderations = await ModerationBuilder
-            .AddInput("I kill you")
-            .AddInput("You are a bad man")
-            .ExecuteMultipleAsync();
+        var moderation = await ModerationBuilder
+            .ExecuteMultipleAsync("I kill you", "You are a bad man");
 
-        Assert.NotNull(moderations);
+        Assert.NotNull(moderation);
 
-        Assert.Equal(2, moderations.Length);
+        Assert.Equal(2, moderation.Length);
 
         Log("Moderations have next content:");
-        Log(ToJson(moderations));
+        Log(ToJson(moderation));
     }
 
 

ManagedCode.OpenAI/API/OpenAIWebClient.cs

@@ -24,13 +24,13 @@ internal class OpenAiWebClient : IOpenAiWebClient
     private const string URL_IMAGE_GENERATION = "images/generations";
     private const string URL_IMAGE_EDIT = "images/edits";
     private const string URL_IMAGE_VARIATION = "images/variations";
-    
+
     private const string URL_FILES = "files";
     private const string URL_FILE = "files/{0}";
     private const string URL_FILE_CONTEXT = "files/{0}/content";
 
     private const string URL_MODERATION = "moderations";
-    
+
 
     private readonly HttpClient _httpClient;
 
@@ -43,6 +43,16 @@ public OpenAiWebClient(string apiKey)
         _httpClient.BaseAddress = new Uri(URL_BASE);
     }
 
+    public OpenAiWebClient(string apiKey, string organization)
+    {
+        _httpClient = new HttpClient();
+        _httpClient.DefaultRequestHeaders.Add(AUTHORIZATION,
+            string.Format(AUTHORIZATION_FORMAT, apiKey));
+
+        _httpClient.DefaultRequestHeaders.Add(ORGANIZATION, organization);
+        _httpClient.BaseAddress = new Uri(URL_BASE);
+    }
+
 
     public async Task<ModelsResponseDto> ModelsAsync()
     {
@@ -100,7 +110,6 @@ public async Task<ImageResponseDto> EditImageAsync(EditImageRequestDto request)
 
         form.Add(new StringContent(request.Description), "prompt");
 
-
         var response = await _httpClient.PostAsync(URL_IMAGE_EDIT, form);
         return await ReadAsync<ImageResponseDto>(response);
     }
@@ -121,7 +130,6 @@ public async Task<ImageResponseDto> VariationImageAsync(VariationImageRequestDto
         return await ReadAsync<ImageResponseDto>(response);
     }
 
-
     public void Dispose()
     {
         _httpClient.Dispose();
@@ -152,24 +160,20 @@ private Dictionary<StringContent, string> ToImageRequestParameters(BaseImageRequ
         if (!string.IsNullOrWhiteSpace(request.Size))
             result.Add(new StringContent(request.Size), "size");
 
-
         if (!string.IsNullOrWhiteSpace(request.ResponseFormat))
             result.Add(new StringContent(request.ResponseFormat), "response_format");
 
-
         if (!string.IsNullOrWhiteSpace(request.User))
             result.Add(new StringContent(request.User), "user");
 
-        //todo implement 'N' parameter 
-        //if (request.N.HasValue)
-        //    result.Add();
-
+        if (request.N.HasValue)
+            result.Add(new StringContent(request.N.Value.ToString()), "m");
         return result;
     }
 
     #region Files
 
-    
+
     public async Task<FilesInfoResponseDto> FilesInfoAsync()
     {
         var httpResponseMessage = await _httpClient.GetAsync(URL_FILES);
@@ -181,13 +185,13 @@ private async Task<FileInfoDto> CreateFileAsync(HttpContent content, string file
         MultipartFormDataContent multipartFormDataContent = new();
         multipartFormDataContent.Add(new StringContent(purpose), "purpose");
         multipartFormDataContent.Add(content, "file", fileName);
-        
+
         var httpResponseMessage = await _httpClient.PostAsync(URL_FILES, multipartFormDataContent);
 
         return await ReadAsync<FileInfoDto>(httpResponseMessage);
     }
 
-    public async Task<FileInfoDto> CreateFileAsync(Stream content, string fileName, string purpose = "fine-tune") 
+    public async Task<FileInfoDto> CreateFileAsync(Stream content, string fileName, string purpose = "fine-tune")
     {
         StreamContent streamContent = new(content);
         return await CreateFileAsync(streamContent, fileName, purpose);
@@ -198,27 +202,27 @@ public async Task<FileInfoDto> CreateFileAsync(string content, string fileName,
         StringContent stringContent = new(content);
         return await CreateFileAsync(stringContent, fileName, purpose);
     }
-    
+
     public async Task<FileInfoDto> CreateFileAsync(byte[] content, string fileName, string purpose = "fine-tune")
     {
         ByteArrayContent byteArrayContent = new(content);
         return await CreateFileAsync(byteArrayContent, fileName, purpose);
     }
-    
-    public async Task<FileInfoDto> CreateFileAsync(ReadOnlyMemory<byte> content, string fileName, string purpose = 
+
+    public async Task<FileInfoDto> CreateFileAsync(ReadOnlyMemory<byte> content, string fileName, string purpose =
     "fine-tune")
     {
         ReadOnlyMemoryContent readOnlyMemoryContent = new(content);
         return await CreateFileAsync(readOnlyMemoryContent, fileName, purpose);
     }
-    
-    
+
+
 
     public async Task<FileDeleteResponseDto> DeleteFileAsync(string fileId)
     {
         string resultUrl = string.Format(URL_FILE, fileId);
         var httpResponseMessage = await _httpClient.DeleteAsync(resultUrl);
-        
+
         return await ReadAsync<FileDeleteResponseDto>(httpResponseMessage);
     }
 
@@ -232,21 +236,21 @@ public async Task<FileInfoDto> FileInfoAsync(string fileId)
     }
 
 
-    
+
     // TODO: It is not known what the result of the query returns
     public async Task<string> GetContentFromFileAsync(string fileId)
     {
         string resultUrl = string.Format(URL_FILE_CONTEXT, fileId);
         var httpResponseMessage = await _httpClient.GetAsync(resultUrl);
-        
+
         OpenAIExceptions.ThrowsIfError(httpResponseMessage.StatusCode);
         return await httpResponseMessage.Content.ReadAsStringAsync();
     }
 
     #endregion
-    
+
     #region Moderations
-    
+
     public async Task<ModerationResponseDto> ModerationAsync(ModerationRequestDto request)
     {
         var httpResponseMessage = await _httpClient.PostAsJsonAsync(URL_MODERATION, request);

ManagedCode.OpenAI/Client/Abstractions/IGptClient.cs

@@ -11,26 +11,19 @@ namespace ManagedCode.OpenAI.Client
     public interface IGptClient
     {
         public IGptClientConfiguration Configuration { get; }
+
+        public IImageClient ImageClient { get; }
+        public IFileClient FileClient { get; }
+
         void Configure(IGptClientConfiguration configuration);
         void Configure(Func<IGptClientConfigurationBuilder, IGptClientConfiguration> configuration);
 
         public Task<IModel[]> GetModelsAsync();
         public Task<IModel> GetModelAsync(string modelId);
 
         IGptChat OpenChat(IChatMessageParameters defaultMessageParameters, IChatSession session);
-
         ICompletionBuilder Completion();
         IEditBuilder Edit(string input, string instruction);
-
-        IGenerateImageBuilder GenerateImage(string description);
-
-        IEditImageBuilder EditImage(string description, string imageBase64);
-
-        IVariationImageBuilder VariationImage(string imageBase64);
-
-        IFileClient FileManager();
-        
-        IModerationBuilder ModerationBuilder();
-
+        IModerationBuilder Moderation();
     }
 }

ManagedCode.OpenAI/Client/GptClient.cs

@@ -10,21 +10,46 @@ namespace ManagedCode.OpenAI.Client
 {
     public class GptClient : IGptClient
     {
-        private readonly IOpenAiWebClient _webClient;
+        private IOpenAiWebClient _webClient = null!;
 
         public GptClient(string apiKey)
         {
-            _webClient = new OpenAiWebClient(apiKey);
-            Configuration = new DefaultGptClientConfiguration();
+            Init(apiKey, default, new DefaultGptClientConfiguration());
         }
 
         public GptClient(string apiKey, IGptClientConfiguration configuration)
         {
-            _webClient = new OpenAiWebClient(apiKey);
+            Init(apiKey, default, configuration);
+        }
+
+        public GptClient(string apiKey, string organization)
+        {
+            Init(apiKey, organization, new DefaultGptClientConfiguration());
+        }
+
+        public GptClient(string apiKey, string organization, IGptClientConfiguration configuration)
+        {
+            Init(apiKey, organization, configuration);
+        }
+
+        private GptClient(){}
+
+        private void  Init(string apiKey, string? organization, IGptClientConfiguration configuration)
+        {
+            var webClient = string.IsNullOrWhiteSpace(organization) 
+                ? new OpenAiWebClient(apiKey) 
+                : new OpenAiWebClient(apiKey, organization);
+
+            _webClient = webClient;
             Configuration = configuration;
+            ImageClient = new ImageClient(_webClient);
+            FileClient = new FileClient(_webClient);
         }
 
-        public IGptClientConfiguration Configuration { get; private set; }
+
+        public IGptClientConfiguration Configuration { get; private set; } = null!;
+        public IImageClient ImageClient { get; private set; } = null!;
+        public IFileClient FileClient { get; private set; } = null!;
 
         public void Configure(IGptClientConfiguration configuration)
         {
@@ -49,7 +74,6 @@ public async Task<IModel> GetModelAsync(string modelId)
             return model.ToModel();
         }
 
-
         public IGptChat OpenChat(IChatMessageParameters defaultMessageParameters, IChatSession session)
         {
             return new GptChat(_webClient, session, defaultMessageParameters);
@@ -65,27 +89,7 @@ public IEditBuilder Edit(string input, string instruction)
             return new EditBuilder(_webClient, Configuration.ModelId, input, instruction);
         }
 
-        public IGenerateImageBuilder GenerateImage(string description)
-        {
-            return new GenerateImageBuilder(_webClient, description);
-        }
-
-        public IEditImageBuilder EditImage(string description, string imageBase64)
-        {
-            return new EditImageBuilder(_webClient, description, imageBase64);
-        }
-
-        public IVariationImageBuilder VariationImage(string imageBase64)
-        {
-            return new VariationImageBuilder(_webClient, imageBase64);
-        }
-
-        public IFileClient FileManager()
-        {
-            return new FileClient(_webClient);
-        }
-
-        public IModerationBuilder ModerationBuilder()
+        public IModerationBuilder Moderation()
         {
             return new ModerationBuilder(_webClient);
         }

ManagedCode.OpenAI/Image/Abstractions/IImageClient.cs

@@ -0,0 +1,12 @@
+namespace ManagedCode.OpenAI.Image
+{
+    public interface IImageClient
+    {
+        public IGenerateImageBuilder GenerateImage(string description);
+
+        public IEditImageBuilder EditImage(string description, string imageBase64);
+
+        public IVariationImageBuilder VariationImage(string imageBase64);
+
+    }
+}

ManagedCode.OpenAI/Image/Extensions/ImageClientEx.cs

@@ -4,14 +4,14 @@ namespace ManagedCode.OpenAI.Image
 {
     public static class ImageClientEx
     {
-        public static IEditImageBuilder EditImage(this IGptClient client, 
+        public static IEditImageBuilder EditImage(this IImageClient client, 
             string instruction, Func<IImageLoader, string> image)
         {
             var loader = new DefaultImageLoader();
             return client.EditImage(instruction, image.Invoke(loader));
         }
 
-        public static IVariationImageBuilder VariationImage(this IGptClient client,
+        public static IVariationImageBuilder VariationImage(this IImageClient client,
             Func<IImageLoader, string> image)
         {
             var loader = new DefaultImageLoader();