Merge pull request #17 from YarikVor/main

Added FileManager and Moderation

Author: Abaxoth

.gitignore

@@ -863,4 +863,9 @@ FodyWeavers.xsd
 ### VisualStudio Patch ###
 # Additional files built by Visual Studio
 
-# End of https://www.toptal.com/developers/gitignore/api/windows,linux,macos,visualstudio,visualstudiocode,intellij,intellij+all,rider,angular,dotnetcore,aspnetcore,xamarinstudio
+# End of https://www.toptal.com/developers/gitignore/api/windows,linux,macos,visualstudio,visualstudiocode,intellij,intellij+all,rider,angular,dotnetcore,aspnetcore,xamarinstudio
+
+
+
+# Ignore fields
+ManagedCode.OpenAI.Client.Experiments/

ManagedCode.OpenAI.Tests/FileTest.cs

@@ -0,0 +1,123 @@
+using System.Diagnostics;
+using ManagedCode.OpenAI.Client;
+using ManagedCode.OpenAI.Files.Abstractions;
+using Xunit;
+using Xunit.Abstractions;
+
+namespace ManagedCode.OpenAI.Tests;
+
+
+
+public class FileTest
+{
+    private readonly ITestOutputHelper _output;
+    private readonly IGptClient _client = Mocks.Client();
+    private readonly IFileManager _fileManager;
+    
+    
+    private const string fileContent = 
+        @"{""prompt"":""This is a test"", ""completion"":""This is a test""}";
+    
+    
+    public FileTest(ITestOutputHelper output)
+    {
+        _output = output;
+        _fileManager = _client.FileManager();
+    }
+
+    [Fact]
+    public async Task UploadFile_Success()
+    {
+        const string fileName = "test.txt";
+        
+        
+        var file = await _fileManager.CreateFileAsync(fileContent, fileName);
+        
+        Log($"File id: {file.Id}");
+
+        Assert.False(string.IsNullOrWhiteSpace(file.Id));
+        Assert.Equal(fileName, file.Filename);
+        Assert.Equal(fileContent.Length, file.Bytes);
+    }
+
+    
+    // Needs premium account
+    // [Fact]
+    public async Task ContentFile_Success()
+    {
+        string fileId = await _fileManager.FileListAsync()
+            .ContinueWith(t => t.Result[0].Id);
+        
+        var content = await _fileManager.FileContentAsync(fileId);
+        
+        Log($"File content: {content}");
+        
+        Assert.Equal(fileContent, content);
+    }
+    
+    [Fact]
+    public async Task FileList_Success()
+    {
+        const string fileName = "test.txt";
+        
+        var newFile = await _fileManager.CreateFileAsync(fileContent, fileName);
+        Assert.NotNull(newFile);
+        
+        var files = await _fileManager.FileListAsync();
+        Assert.NotEmpty(files);
+        
+        
+        foreach (var file in files)
+        {
+            Log($"File: {file.Id} - {file.Filename}");
+        }
+        
+        var lastFiles = files.First(e => e.Id == newFile.Id);
+
+        Assert.Equal(newFile.Id, lastFiles.Id);
+        Assert.Equal(newFile.Filename, lastFiles.Filename);
+        Assert.Equal(newFile.Bytes, lastFiles.Bytes);
+    }
+    
+    [Fact]
+    public async Task DeleteFile_Success()
+    {
+        const string fileName = "test.txt";
+        
+        var newFile = await _fileManager.CreateFileAsync(fileContent, fileName);
+        Assert.NotNull(newFile);
+        
+        //Waiting for file to be deleted
+        Thread.Sleep(5000);
+
+        var deleted = await _fileManager.DeleteFileAsync(newFile);
+        Log(deleted.ToString());
+        Assert.True(deleted);
+        
+        var files = await _fileManager.FileListAsync();
+        Assert.NotEqual(newFile.Id, files.Last().Id);
+    }
+    
+    [Fact]
+    public async Task FileInfo_Success()
+    {
+        const string fileName = "test.txt";
+        
+        var newFile = await _fileManager.CreateFileAsync(fileContent, fileName);
+        Assert.NotNull(newFile);
+
+        var fileInfo = await _fileManager.FileInfoAsync(newFile.Id);
+        Assert.NotNull(fileInfo);
+        
+        Assert.Equal(newFile.Id, fileInfo.Id);
+        Assert.Equal(newFile.Filename, fileInfo.Filename);
+        Assert.Equal(newFile.Bytes, fileInfo.Bytes);
+    }
+
+
+
+    void Log(string log)
+    {
+        _output.WriteLine(log);
+    }
+}

ManagedCode.OpenAI.Tests/Mocks.cs

@@ -4,7 +4,7 @@ namespace ManagedCode.OpenAI.Tests
 {
     internal static class Mocks
     {
-        private const string API_KEY = "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";
+        private const string API_KEY = "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";
 
         public static IGptClient Client()
         {

ManagedCode.OpenAI.Tests/ModerationTests.cs

@@ -0,0 +1,63 @@
+using ManagedCode.OpenAI.Client;
+using ManagedCode.OpenAI.Files.Abstractions;
+using ManagedCode.OpenAI.Moderations.Abstractions;
+using Newtonsoft.Json;
+using Xunit;
+using Xunit.Abstractions;
+
+namespace ManagedCode.OpenAI.Tests;
+
+public class ModerationTests
+{
+    private readonly ITestOutputHelper _output;
+    private readonly IGptClient _client = Mocks.Client();
+    private IModerationBuilder ModerationBuilder => _client.ModerationBuilder();
+
+    public ModerationTests(ITestOutputHelper output)
+    {
+        _output = output;
+    }
+    
+    [Fact]
+    public async Task CreateModeration_Success()
+    {
+        var moderation = await ModerationBuilder
+            .AddInput("I kill you")
+            .ExecuteAsync();
+
+        Assert.NotNull(moderation);
+
+        Assert.NotNull(moderation.Categories);
+        Assert.NotNull(moderation.CateroryScores);
+
+        Log("Moderation has next content:");
+        Log(ToJson(moderation));
+    }
+
+    [Fact]
+    public async Task CreateMultipleModeration_Success()
+    {
+        var moderations = await ModerationBuilder
+            .AddInput("I kill you")
+            .AddInput("You are a bad man")
+            .ExecuteMultipleAsync();
+
+        Assert.NotNull(moderations);
+
+        Assert.Equal(2, moderations.Length);
+        
+        Log("Moderations have next content:");
+        Log(ToJson(moderations));
+    }
+
+
+
+
+
+
+    void Log(object obj) => Log(obj.ToString());
+
+    void Log(string str) => _output.WriteLine(str);
+
+    string ToJson(object obj) => JsonConvert.SerializeObject(obj, Formatting.Indented);
+}

ManagedCode.OpenAI/API/Abstractions/IOpenAiWebClient.cs

@@ -1,5 +1,7 @@
 using ManagedCode.OpenAI.API.Edit;
 using ManagedCode.OpenAI.API.Image;
+using ManagedCode.OpenAI.API.Moderations;
+using ManagedCode.OpenAI.Files.Models;
 
 namespace ManagedCode.OpenAI.API
 {
@@ -18,5 +20,27 @@ internal interface IOpenAiWebClient : IDisposable
         Task<ImageResponseDto> GenerateImageAsync(GenerateImageRequestDto request);
         Task<ImageResponseDto> EditImageAsync(EditImageRequestDto request);
         Task<ImageResponseDto> VariationImageAsync(VariationImageRequestDto request);
+
+        #region Files
+
+        Task<FilesInfoResponseDto> FilesInfoAsync();
+        Task<FileInfoDto> CreateFileAsync(string content, string fileName, string purpose = "fine-tune");
+        Task<FileInfoDto> CreateFileAsync(Stream content, string fileName, string purpose = "fine-tune");
+        Task<FileInfoDto> CreateFileAsync(byte[] content, string fileName, string purpose = "fine-tune");
+        Task<FileInfoDto> CreateFileAsync(ReadOnlyMemory<byte> content, string fileName, string purpose = "fine-tune");
+        Task<FileDeleteResponseDto> DeleteFileAsync(string fileId);
+        Task<FileInfoDto> FileInfoAsync(string fileId);
+        
+        // TODO: This may be a stream
+        // I don't know what response type is returned here
+        Task<string> GetContentFromFileAsync(string fileId);
+
+        #endregion
+        
+        #region Moderations
+        
+        Task<ModerationResponseDto> ModerationAsync(ModerationRequestDto request);
+        
+        #endregion
     }
-}
+}

ManagedCode.OpenAI/API/Chat/ChatChoiceDto.cs

@@ -12,13 +12,4 @@ public class ChatChoiceDto
 
     [JsonPropertyName("finish_reason")]
     public string FinishReason { get; set; }
-}
-
-public class MessageDto
-{
-    [JsonPropertyName("role")]
-    public string Role { get; set; }
-
-    [JsonPropertyName("content")]
-    public string Content { get; set; }
 }

ManagedCode.OpenAI/API/Chat/MessageDto.cs

@@ -0,0 +1,12 @@
+using System.Text.Json.Serialization;
+
+namespace ManagedCode.OpenAI.API;
+
+public class MessageDto
+{
+    [JsonPropertyName("role")]
+    public string Role { get; set; }
+
+    [JsonPropertyName("content")]
+    public string Content { get; set; }
+}

ManagedCode.OpenAI/Files/Models/FileDeleteResult.cs renamed to ManagedCode.OpenAI/API/File/FileDeleteResponseDto.cs

@@ -2,7 +2,7 @@
 
 namespace ManagedCode.OpenAI.Files.Models;
 
-public class FileDeleteResult
+internal class FileDeleteResponseDto
 {
     [JsonPropertyName("id")] 
     public string Id  { get; set; }

ManagedCode.OpenAI/Files/Models/FileInfo.cs renamed to ManagedCode.OpenAI/API/File/FileInfoDto.cs

@@ -2,7 +2,7 @@
 
 namespace ManagedCode.OpenAI.Files.Models;
 
-public class FileInfo
+internal class FileInfoDto
 {
     [JsonPropertyName("id")]
     public string Id  { get; set; }

ManagedCode.OpenAI/API/File/FilesInfoResponseDto.cs

@@ -0,0 +1,13 @@
+using System.Text.Json.Serialization;
+using ManagedCode.OpenAI.Files.Abstractions;
+
+namespace ManagedCode.OpenAI.Files.Models;
+
+internal class FilesInfoResponseDto
+{
+    [JsonPropertyName("data")]
+    public FileInfoDto[] Data { get; set; }
+
+    [JsonPropertyName("object")]
+    public string Object { get; set; }
+}

ManagedCode.OpenAI/API/Moderations/CategoryDto.cs

@@ -0,0 +1,27 @@
+using System.Text.Json.Serialization;
+
+namespace ManagedCode.OpenAI.API.Moderations;
+
+public class CategoryDto<TResult> where TResult : struct
+{
+    [JsonPropertyName("hate")]
+    public TResult Hate { get; set; }
+
+    [JsonPropertyName("hate/threatening")]
+    public TResult HateThreatening { get; set; }
+
+    [JsonPropertyName("self-harm")]
+    public TResult SelfHarm { get; set; }
+
+    [JsonPropertyName("sexual")]
+    public TResult Sexual { get; set; }
+
+    [JsonPropertyName("sexual/minors")]
+    public TResult SexualMinors { get; set; }
+
+    [JsonPropertyName("violence")]
+    public TResult Violence { get; set; }
+
+    [JsonPropertyName("violence/graphic")]
+    public TResult ViolenceGraphic { get; set; }
+}

ManagedCode.OpenAI/API/Moderations/CategoryResultDto.cs

@@ -0,0 +1,15 @@
+using System.Text.Json.Serialization;
+
+namespace ManagedCode.OpenAI.API.Moderations;
+
+public class CategoryResultDto
+{
+    [JsonPropertyName("categories")]
+    public CategoryDto<bool> Categories { get; set; }
+    
+    [JsonPropertyName("category_scores")]
+    public CategoryDto<float> CategoryScores { get; set; }
+    
+    [JsonPropertyName("flagged")]
+    public bool Flagged { get; set; }
+}

ManagedCode.OpenAI/API/Moderations/ModerationRequestDto.cs

@@ -0,0 +1,13 @@
+using System.Text.Json.Serialization;
+
+namespace ManagedCode.OpenAI.API;
+
+internal class ModerationRequestDto
+{
+    [JsonPropertyName("input")]
+    public List<string> Input { get; set; } = new List<string>();
+
+    [JsonPropertyName("model")]
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    public string Model { get; set; }
+}

ManagedCode.OpenAI/API/Moderations/ModerationResponseDto.cs

@@ -0,0 +1,15 @@
+using System.Text.Json.Serialization;
+
+namespace ManagedCode.OpenAI.API.Moderations;
+
+public class ModerationResponseDto
+{
+    [JsonPropertyName("id")]
+    public string Id { get; set; }
+    
+    [JsonPropertyName("model")]
+    public string Model { get; set; }
+    
+    [JsonPropertyName("results")]
+    public CategoryResultDto[] Results { get; set; }
+}