Removed useless namespaces

Some names was changed
All dto models switched to Internal scope

Author: Abaxoth

ManagedCode.OpenAI.Tests/ChatTests.cs

@@ -1,9 +1,7 @@
 using System.ComponentModel.DataAnnotations;
 using ManagedCode.OpenAI.API;
 using ManagedCode.OpenAI.Chat;
-using ManagedCode.OpenAI.Chat.Extensions;
 using ManagedCode.OpenAI.Client;
-using ManagedCode.OpenAI.Client.Extensions;
 using Xunit;
 using Xunit.Abstractions;
 using static System.String;

ManagedCode.OpenAI.Tests/FileTest.cs

@@ -1,6 +1,6 @@
 using System.Diagnostics;
 using ManagedCode.OpenAI.Client;
-using ManagedCode.OpenAI.Files.Abstractions;
+using ManagedCode.OpenAI.Files;
 using Xunit;
 using Xunit.Abstractions;
 
@@ -12,7 +12,7 @@ public class FileTest
 {
     private readonly ITestOutputHelper _output;
     private readonly IGptClient _client = Mocks.Client();
-    private readonly IFileManager _fileManager;
+    private readonly IFileClient _fileClient;
 
 
     private const string fileContent = 
@@ -22,7 +22,7 @@ public class FileTest
     public FileTest(ITestOutputHelper output)
     {
         _output = output;
-        _fileManager = _client.FileManager();
+        _fileClient = _client.FileManager();
     }
 
     [Fact]
@@ -31,7 +31,7 @@ public async Task UploadFile_Success()
         const string fileName = "test.txt";
 
 
-        var file = await _fileManager.CreateFileAsync(fileContent, fileName);
+        var file = await _fileClient.CreateFileAsync(fileContent, fileName);
 
         Log($"File id: {file.Id}");
 
@@ -45,10 +45,10 @@ public async Task UploadFile_Success()
     // [Fact]
     public async Task ContentFile_Success()
     {
-        string fileId = await _fileManager.FileListAsync()
+        string fileId = await _fileClient.FileListAsync()
             .ContinueWith(t => t.Result[0].Id);
 
-        var content = await _fileManager.FileContentAsync(fileId);
+        var content = await _fileClient.FileContentAsync(fileId);
 
         Log($"File content: {content}");
 
@@ -60,10 +60,10 @@ public async Task FileList_Success()
     {
         const string fileName = "test.txt";
 
-        var newFile = await _fileManager.CreateFileAsync(fileContent, fileName);
+        var newFile = await _fileClient.CreateFileAsync(fileContent, fileName);
         Assert.NotNull(newFile);
 
-        var files = await _fileManager.FileListAsync();
+        var files = await _fileClient.FileListAsync();
         Assert.NotEmpty(files);
 
 
@@ -84,17 +84,17 @@ public async Task DeleteFile_Success()
     {
         const string fileName = "test.txt";
 
-        var newFile = await _fileManager.CreateFileAsync(fileContent, fileName);
+        var newFile = await _fileClient.CreateFileAsync(fileContent, fileName);
         Assert.NotNull(newFile);
 
         //Waiting for file to be deleted
         Thread.Sleep(5000);
 
-        var deleted = await _fileManager.DeleteFileAsync(newFile);
+        var deleted = await _fileClient.DeleteFileAsync(newFile);
         Log(deleted.ToString());
         Assert.True(deleted);
 
-        var files = await _fileManager.FileListAsync();
+        var files = await _fileClient.FileListAsync();
         Assert.NotEqual(newFile.Id, files.Last().Id);
     }
 
@@ -103,10 +103,10 @@ public async Task FileInfo_Success()
     {
         const string fileName = "test.txt";
 
-        var newFile = await _fileManager.CreateFileAsync(fileContent, fileName);
+        var newFile = await _fileClient.CreateFileAsync(fileContent, fileName);
         Assert.NotNull(newFile);
 
-        var fileInfo = await _fileManager.FileInfoAsync(newFile.Id);
+        var fileInfo = await _fileClient.FileInfoAsync(newFile.Id);
         Assert.NotNull(fileInfo);
 
         Assert.Equal(newFile.Id, fileInfo.Id);

ManagedCode.OpenAI.Tests/ImageTests.cs

@@ -7,7 +7,6 @@
 using ManagedCode.OpenAI.Image;
 using Xunit;
 using Xunit.Abstractions;
-using ManagedCode.OpenAI.Image.Extensions;
 
 namespace ManagedCode.OpenAI.Tests
 {

ManagedCode.OpenAI.Tests/ModerationTests.cs

@@ -1,6 +1,5 @@
 using ManagedCode.OpenAI.Client;
-using ManagedCode.OpenAI.Files.Abstractions;
-using ManagedCode.OpenAI.Moderations.Abstractions;
+using ManagedCode.OpenAI.Moderation;
 using Newtonsoft.Json;
 using Xunit;
 using Xunit.Abstractions;
@@ -28,7 +27,7 @@ public async Task CreateModeration_Success()
         Assert.NotNull(moderation);
 
         Assert.NotNull(moderation.Categories);
-        Assert.NotNull(moderation.CateroryScores);
+        Assert.NotNull(moderation.CategoryScores);
 
         Log("Moderation has next content:");
         Log(ToJson(moderation));

ManagedCode.OpenAI/API/Abstractions/IOpenAiWebClient.cs

@@ -1,7 +1,7 @@
 using ManagedCode.OpenAI.API.Edit;
+using ManagedCode.OpenAI.API.File;
 using ManagedCode.OpenAI.API.Image;
-using ManagedCode.OpenAI.API.Moderations;
-using ManagedCode.OpenAI.Files.Models;
+using ManagedCode.OpenAI.API.Moderation;
 
 namespace ManagedCode.OpenAI.API
 {

ManagedCode.OpenAI/API/Chat/ChatChoiceDto.cs

@@ -2,7 +2,7 @@
 
 namespace ManagedCode.OpenAI.API;
 
-public class ChatChoiceDto
+internal class ChatChoiceDto
 {
     [JsonPropertyName("index")]
     public int Index { get; set; }

ManagedCode.OpenAI/API/Chat/MessageDto.cs

@@ -2,7 +2,7 @@
 
 namespace ManagedCode.OpenAI.API;
 
-public class MessageDto
+internal class MessageDto
 {
     [JsonPropertyName("role")]
     public string Role { get; set; }

ManagedCode.OpenAI/API/Chat/UsageDto.cs

@@ -4,7 +4,7 @@
 
 namespace ManagedCode.OpenAI.API;
 
-public class UsageDto
+internal class UsageDto
 {
     [JsonPropertyName("prompt_tokens")]
     public int PromptTokens { get; set; }

ManagedCode.OpenAI/API/Completions/CompletionChoiceDto.cs

@@ -2,7 +2,7 @@
 
 namespace ManagedCode.OpenAI.API
 {
-    public class CompletionChoiceDto
+    internal class CompletionChoiceDto
     {
         [JsonPropertyName("text")]
         public string Text { get; set; }

ManagedCode.OpenAI/API/Completions/CompletionRequestDto.cs

@@ -3,7 +3,7 @@
 
 namespace ManagedCode.OpenAI.API;
 
-public class CompletionRequestDto
+internal class CompletionRequestDto
 {
     [JsonPropertyName("model")]
     public string Model { get; set; }