Renaming fields for clarity AOAI Inference (Azure#33871)

* Renamed fields added

* Removed empty comment line

* Renamed class file

* update generator and regen

* regen after merge

* update api

* revert unintended version change

---------

Co-authored-by: m-nash <prognash@gmail.com>

Author: jpalvarezl

eng/Packages.Data.props

@@ -160,7 +160,7 @@
     All should have PrivateAssets="All" set so they don't become package dependencies
   -->
   <ItemGroup>
-    <PackageReference Update="Microsoft.Azure.AutoRest.CSharp" Version="3.0.0-beta.20230203.2" PrivateAssets="All" />
+    <PackageReference Update="Microsoft.Azure.AutoRest.CSharp" Version="3.0.0-beta.20230203.3" PrivateAssets="All" />
     <PackageReference Update="Azure.ClientSdk.Analyzers" Version="0.1.1-dev.20230131.1" PrivateAssets="All" />
     <PackageReference Update="coverlet.collector" Version="1.3.0" PrivateAssets="All" />
     <PackageReference Update="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.3.1" PrivateAssets="All" />

eng/emitter-package.json

@@ -1,6 +1,6 @@
 {
     "main": "dist/src/index.js",
     "dependencies": {
-      "@azure-tools/cadl-csharp": "0.1.11-beta.20230203.2"
+      "@azure-tools/cadl-csharp": "0.1.11-beta.20230203.3"
     }
 }

sdk/openai/Azure.AI.OpenAI/api/Azure.AI.OpenAI.netstandard2.0.cs

@@ -5,7 +5,7 @@ public partial class Choice
         internal Choice() { }
         public string FinishReason { get { throw null; } }
         public int? Index { get { throw null; } }
-        public Azure.AI.OpenAI.CompletionsLogProbs Logprobs { get { throw null; } }
+        public Azure.AI.OpenAI.CompletionsLogProbability Logprobs { get { throw null; } }
         public string Text { get { throw null; } }
     }
     public partial class Completions
@@ -18,32 +18,32 @@ internal Completions() { }
         public string Object { get { throw null; } }
         public Azure.AI.OpenAI.CompletionsUsage Usage { get { throw null; } }
     }
-    public partial class CompletionsLogProbs
+    public partial class CompletionsLogProbability
     {
-        internal CompletionsLogProbs() { }
+        internal CompletionsLogProbability() { }
         public System.Collections.Generic.IReadOnlyList<int> TextOffset { get { throw null; } }
-        public System.Collections.Generic.IReadOnlyList<float> TokenLogprobs { get { throw null; } }
+        public System.Collections.Generic.IReadOnlyList<float> TokenLogProbability { get { throw null; } }
         public System.Collections.Generic.IReadOnlyList<string> Tokens { get { throw null; } }
-        public System.Collections.Generic.IReadOnlyList<System.Collections.Generic.IDictionary<string, float>> TopLogprobs { get { throw null; } }
+        public System.Collections.Generic.IReadOnlyList<System.Collections.Generic.IDictionary<string, float>> TopLogProbability { get { throw null; } }
     }
     public partial class CompletionsOptions
     {
         public CompletionsOptions() { }
-        public int? BestOf { get { throw null; } set { } }
         public int? CacheLevel { get { throw null; } set { } }
         public string CompletionConfig { get { throw null; } set { } }
         public bool? Echo { get { throw null; } set { } }
         public float? FrequencyPenalty { get { throw null; } set { } }
+        public int? GenerationSampleCount { get { throw null; } set { } }
         public System.Collections.Generic.IDictionary<string, int> LogitBias { get { throw null; } }
-        public int? Logprobs { get { throw null; } set { } }
+        public int? LogProbability { get { throw null; } set { } }
         public int? MaxTokens { get { throw null; } set { } }
         public string Model { get { throw null; } set { } }
-        public int? N { get { throw null; } set { } }
+        public float? NucleusSamplingFactor { get { throw null; } set { } }
         public float? PresencePenalty { get { throw null; } set { } }
         public System.Collections.Generic.IList<string> Prompt { get { throw null; } }
+        public int? SnippetCount { get { throw null; } set { } }
         public System.Collections.Generic.IList<string> Stop { get { throw null; } }
         public float? Temperature { get { throw null; } set { } }
-        public float? TopP { get { throw null; } set { } }
         public string User { get { throw null; } set { } }
     }
     public partial class CompletionsUsage

sdk/openai/Azure.AI.OpenAI/src/Custom/Choice.Serialization.cs

@@ -17,7 +17,7 @@ internal static Choice DeserializeChoice(JsonElement element)
         {
             Optional<string> text = default;
             Optional<int?> index = default;
-            Optional<CompletionsLogProbs> logprobs = default;
+            Optional<CompletionsLogProbability> logprobs = default;
             Optional<string> finishReason = default;
             foreach (var property in element.EnumerateObject())
             {
@@ -45,7 +45,7 @@ internal static Choice DeserializeChoice(JsonElement element)
                     }
                     else
                     {
-                        logprobs = CompletionsLogProbs.DeserializeCompletionsLogProbs(property.Value);
+                        logprobs = CompletionsLogProbability.DeserializeCompletionsLogProbability(property.Value);
                         continue;
                     }
                 }

sdk/openai/Azure.AI.OpenAI/src/Custom/CompletionsLogProbability.cs

@@ -0,0 +1,22 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+#nullable disable
+
+using System.Collections.Generic;
+using Azure.Core;
+
+namespace Azure.AI.OpenAI
+{
+    /// <summary> LogProbs model within completion choice. </summary>
+    [CodeGenModel("CompletionsLogProbs")]
+    public partial class CompletionsLogProbability
+    {
+        /// <summary> Log Probability of Tokens. </summary>
+        [CodeGenMember("TokenLogprobs")]
+        public IReadOnlyList<float> TokenLogProbability { get; }
+        /// <summary> Top Log Probabilities. </summary>
+        [CodeGenMember("TopLogprobs")]
+        public IReadOnlyList<IDictionary<string, float>> TopLogProbability { get; }
+    }
+}

sdk/openai/Azure.AI.OpenAI/src/Custom/CompletionsOptions.cs

@@ -0,0 +1,46 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+#nullable disable
+
+using System.Collections.Generic;
+using System.Linq;
+using Azure.Core;
+
+namespace Azure.AI.OpenAI
+{
+    public partial class CompletionsOptions
+    {
+        /// <summary>
+        /// An alternative to sampling with temperature, called nucleus sampling, where the
+        /// model considers the results of the tokens with top_p probability mass. So 0.1
+        /// means only the tokens comprising the top 10% probability mass are
+        /// considered.
+        /// We generally recommend using this or `temperature` but not
+        /// both.
+        /// Minimum of 0 and maximum of 1 allowed.
+        /// </summary>
+        [CodeGenMember("TopP")]
+        public float? NucleusSamplingFactor { get; set; }
+        /// <summary>
+        /// How many snippets to generate for each prompt. Minimum of 1 and maximum of 128
+        /// allowed.
+        /// </summary>
+        [CodeGenMember("N")]
+        public int? SnippetCount { get; set; }
+        /// <summary>
+        /// Include the log probabilities on the `logprobs` most likely tokens, as well the
+        /// chosen tokens. So for example, if `logprobs` is 10, the API will return a list
+        /// of the 10 most likely tokens. If `logprobs` is 0, only the chosen tokens will
+        /// have logprobs returned. Minimum of 0 and maximum of 100 allowed.
+        /// </summary>
+        [CodeGenMember("Logprobs")]
+        public int? LogProbability { get; set; }
+        /// <summary>
+        /// How many generations to create server side, and display only the best. Will not
+        /// stream intermediate progress if best_of &gt; 1. Has maximum value of 128.
+        /// </summary>
+        [CodeGenMember("BestOf")]
+        public int? GenerationSampleCount { get; set; }
+    }
+}