Refactor and rename types and properties for consistency and clarity (#225)

### Summary of Changes

This PR renames the following types and properties for consistency and clarity:

- **Types:**
  - `OpenAIFileInfo` → `OpenAIFile`
  - `OpenAIFileInfoCollection` → `OpenAIFileCollection`
  - `OpenAIModelInfo` → `OpenAIModel`
  - `OpenAIModelInfoCollection` → `OpenAIModelCollection`
  - `Embedding` → `OpenAIEmbedding`
  - `EmbeddingCollection` → `OpenAIEmbeddingCollection`

- **Properties and Methods:**
  - `ImageUrl` → `ImageUri` and method `FromImageUrl` → `FromImageUri` in `MessageContent`
  - `ParallelToolCallsEnabled` → `AllowParallelToolCalls` in `RunCreationOptions`, `ThreadRun`, and `ChatCompletionOptions`
  - `PromptTokens` → `InputTokenCount`, `CompletionTokens` → `OutputTokenCount`, and `TotalTokens` → `TotalTokenCount` in `RunTokenUsage`
  - `InputTokens` → `InputTokenCount` and `TotalTokens` → `TotalTokenCount` in `EmbeddingTokenUsage`

This PR also refactors the `ModerationResult` type to consolidate category-specific flags and scores into individual `ModerationCategory` properties, each containing `Flagged` and `Score` properties:

```csharp
public class ModerationResult {
    public bool Flagged { get; }
    public ModerationCategory Harassment { get; }
    public ModerationCategory HarassmentThreatening { get; }
    public ModerationCategory Hate { get; }
    public ModerationCategory HateThreatening { get; }
    public ModerationCategory SelfHarm { get; }
    public ModerationCategory SelfHarmInstructions { get; }
    public ModerationCategory SelfHarmIntent { get; }
    public ModerationCategory Sexual { get; }
    public ModerationCategory SexualMinors { get; }
    public ModerationCategory Violence { get; }
    public ModerationCategory ViolenceGraphic { get; }
}

public class ModerationCategory {
    public bool Flagged { get; }
    public float Score { get; }
}
```

Additionally, this PR includes smoke tests for the `ModerationResult` type.

Author: ShivangiReja

CHANGELOG.md

@@ -1,5 +1,24 @@
 # Release History
 
+## 2.0.0-beta.13 (Unreleased)
+
+### Features Added
+
+### Breaking Changes
+
+- Refactored `ModerationResult` by merging `ModerationCategories` and `ModerationCategoryScores` into individual `ModerationCategory` properties, each with `Flagged` and `Score` properties. (commit_hash)
+- Renamed type `OpenAIFileInfo` to `OpenAIFile` and `OpenAIFileInfoCollection` to `OpenAIFileCollection`. (commit_id)
+- Renamed type `OpenAIModelInfo` to `OpenAIModel` and `OpenAIModelInfoCollection` to `OpenAIModelCollection`. (commit_id)
+- Renamed type `Embedding` to `OpenAIEmbedding` and `EmbeddingCollection` to `OpenAIEmbeddingCollection`. (commit_id)
+- Renamed property `ImageUrl` to `ImageUri` and method `FromImageUrl` to `FromImageUri` in `MessageContent`. (commit_id)
+- Renamed property `ParallelToolCallsEnabled` to `AllowParallelToolCalls` in `RunCreationOptions`, `ThreadRun`, and `ChatCompletionOptions` types. (commit_id)
+- Renamed property `PromptTokens` to `InputTokenCount`, `CompletionTokens` to `OutputTokenCount`, and `TotalTokens` to `TotalTokenCount` in `RunTokenUsage`. (commit_id)
+- Renamed property `InputTokens` to `InputTokenCount` and `TotalTokens` to `TotalTokenCount` in `EmbeddingTokenUsage`. (commit_id)
+
+### Bugs Fixed
+
+### Other Changes
+
 ## 2.0.0-beta.12 (2024-09-20)
 
 ### Features Added

api/OpenAI.netstandard2.0.cs

@@ -49,7 +49,7 @@ public void Example01_RetrievalAugmentedGeneration()
             }
             """).ToStream();
 
-        OpenAIFileInfo salesFile = fileClient.UploadFile(
+        OpenAIFile salesFile = fileClient.UploadFile(
             document,
             "monthly_sales.json",
             FileUploadPurpose.Assistants);
@@ -129,7 +129,7 @@ CollectionResult<ThreadMessage> messages
                 }
                 if (!string.IsNullOrEmpty(contentItem.ImageFileId))
                 {
-                    OpenAIFileInfo imageInfo = fileClient.GetFile(contentItem.ImageFileId);
+                    OpenAIFile imageInfo = fileClient.GetFile(contentItem.ImageFileId);
                     BinaryData imageBytes = fileClient.DownloadFile(contentItem.ImageFileId);
                     using FileStream stream = File.OpenWrite($"{imageInfo.Filename}.png");
                     imageBytes.ToStream().CopyTo(stream);

examples/Assistants/Example01_RetrievalAugmentedGeneration.cs

@@ -50,7 +50,7 @@ public async Task Example01_RetrievalAugmentedGenerationAsync()
             }
             """).ToStream();
 
-        OpenAIFileInfo salesFile = await fileClient.UploadFileAsync(
+        OpenAIFile salesFile = await fileClient.UploadFileAsync(
             document,
             "monthly_sales.json",
             FileUploadPurpose.Assistants);
@@ -130,7 +130,7 @@ AsyncCollectionResult<ThreadMessage> messages
                 }
                 if (!string.IsNullOrEmpty(contentItem.ImageFileId))
                 {
-                    OpenAIFileInfo imageInfo = await fileClient.GetFileAsync(contentItem.ImageFileId);
+                    OpenAIFile imageInfo = await fileClient.GetFileAsync(contentItem.ImageFileId);
                     BinaryData imageBytes = await fileClient.DownloadFileAsync(contentItem.ImageFileId);
                     using FileStream stream = File.OpenWrite($"{imageInfo.Filename}.png");
                     imageBytes.ToStream().CopyTo(stream);

examples/Assistants/Example01_RetrievalAugmentedGenerationAsync.cs

@@ -44,7 +44,7 @@ static string GetNameOfFamilyMember(string relation)
 
         #region Upload a mock file for use with file search
         FileClient fileClient = new(Environment.GetEnvironmentVariable("OPENAI_API_KEY"));
-        OpenAIFileInfo favoriteNumberFile = fileClient.UploadFile(
+        OpenAIFile favoriteNumberFile = fileClient.UploadFile(
             BinaryData.FromString("""
                 This file contains the favorite numbers for individuals.
 

examples/Assistants/Example04_AllTheTools.cs

@@ -16,7 +16,7 @@ public void Example05_AssistantsWithVision()
         FileClient fileClient = openAIClient.GetFileClient();
         AssistantClient assistantClient = openAIClient.GetAssistantClient();
 
-        OpenAIFileInfo pictureOfAppleFile = fileClient.UploadFile(
+        OpenAIFile pictureOfAppleFile = fileClient.UploadFile(
             "picture-of-apple.jpg",
             FileUploadPurpose.Vision);
         Uri linkToPictureOfOrange = new("https://platform.openai.com/fictitious-files/picture-of-orange.png");
@@ -38,7 +38,7 @@ public void Example05_AssistantsWithVision()
                         [
                             "Hello, assistant! Please compare these two images for me:",
                             MessageContent.FromImageFileId(pictureOfAppleFile.Id),
-                            MessageContent.FromImageUrl(linkToPictureOfOrange),
+                            MessageContent.FromImageUri(linkToPictureOfOrange),
                         ]),
                 }
         });

examples/Assistants/Example05_AssistantsWithVision.cs

@@ -17,7 +17,7 @@ public async Task Example05_AssistantsWithVisionAsync()
         FileClient fileClient = openAIClient.GetFileClient();
         AssistantClient assistantClient = openAIClient.GetAssistantClient();
 
-        OpenAIFileInfo pictureOfAppleFile = await fileClient.UploadFileAsync(
+        OpenAIFile pictureOfAppleFile = await fileClient.UploadFileAsync(
             "picture-of-apple.jpg",
             FileUploadPurpose.Vision);
         Uri linkToPictureOfOrange = new("https://platform.openai.com/fictitious-files/picture-of-orange.png");
@@ -39,7 +39,7 @@ public async Task Example05_AssistantsWithVisionAsync()
                         [
                             "Hello, assistant! Please compare these two images for me:",
                             MessageContent.FromImageFileId(pictureOfAppleFile.Id),
-                            MessageContent.FromImageUrl(linkToPictureOfOrange),
+                            MessageContent.FromImageUri(linkToPictureOfOrange),
                         ]),
                 }
         });

examples/Assistants/Example05_AssistantsWithVisionAsync.cs

@@ -15,7 +15,7 @@ public void Example01_SimpleEmbedding()
             + " and a really helpful concierge. The location is perfect -- right downtown, close to all the tourist"
             + " attractions. We highly recommend this hotel.";
 
-        Embedding embedding = client.GenerateEmbedding(description);
+        OpenAIEmbedding embedding = client.GenerateEmbedding(description);
         ReadOnlyMemory<float> vector = embedding.ToFloats();
 
         Console.WriteLine($"Dimension: {vector.Length}");

examples/Embeddings/Example01_SimpleEmbedding.cs

@@ -16,7 +16,7 @@ public async Task Example01_SimpleEmbeddingAsync()
             + " and a really helpful concierge. The location is perfect -- right downtown, close to all the tourist"
             + " attractions. We highly recommend this hotel.";
 
-        Embedding embedding = await client.GenerateEmbeddingAsync(description);
+        OpenAIEmbedding embedding = await client.GenerateEmbeddingAsync(description);
         ReadOnlyMemory<float> vector = embedding.ToFloats();    
 
         Console.WriteLine($"Dimension: {vector.Length}");

examples/Embeddings/Example01_SimpleEmbeddingAsync.cs

@@ -17,7 +17,7 @@ public void Example02_EmbeddingWithOptions()
 
         EmbeddingGenerationOptions options = new() { Dimensions = 512 };
 
-        Embedding embedding = client.GenerateEmbedding(description, options);
+        OpenAIEmbedding embedding = client.GenerateEmbedding(description, options);
         ReadOnlyMemory<float> vector = embedding.ToFloats();
 
         Console.WriteLine($"Dimension: {vector.Length}");