Merge pull request #302 from rzubek/master

kayhantolga · web-flow · commit 987089eccaae · 2023-06-22T02:34:26.000+01:00
A couple of small fixes for the 7.1 beta
diff --git a/OpenAI.SDK/Managers/OpenAIChatCompletions.cs b/OpenAI.SDK/Managers/OpenAIChatCompletions.cs
@@ -108,6 +108,7 @@ public void Process(ChatCompletionCreateResponse block)
             if (firstChoice == null) { return; } // not a valid state? nothing to do
 
             var isStreamingFnCall = IsStreamingFunctionCall();
+            var justStarted = false;
 
             // If we're not yet assembling, and we just got a streaming block that has a function_call segment,
             // this is the beginning of a function call assembly.
@@ -116,10 +117,12 @@ public void Process(ChatCompletionCreateResponse block)
             {
                 FnCall = firstChoice.Message.FunctionCall;
                 firstChoice.Message.FunctionCall = null;
+                justStarted = true;
             }
 
             // As long as we're assembling, keep on appending those args
-            if (IsFnAssemblyActive)
+            // (Skip the first one, because it was already processed in the block above)
+            if (IsFnAssemblyActive && !justStarted)
             {
                 FnCall.Arguments += ExtractArgsSoFar();
             }
diff --git a/OpenAI.SDK/ObjectModels/RequestModels/ChatMessage.cs b/OpenAI.SDK/ObjectModels/RequestModels/ChatMessage.cs
@@ -169,6 +169,7 @@ public class FunctionParameterPropertyValue
     /// <summary>
     ///     Optional. List of allowed values for this argument.
     /// </summary>
+    [JsonPropertyName("enum")]
     public IList<string>? Enum { get; set; }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -108,6 +108,7 @@ public void Process(ChatCompletionCreateResponse block)`
`108`	`108`	`if (firstChoice == null) { return; } // not a valid state? nothing to do`
`109`	`109`
`110`	`110`	`var isStreamingFnCall = IsStreamingFunctionCall();`
	`111`	`+ var justStarted = false;`
`111`	`112`
`112`	`113`	`// If we're not yet assembling, and we just got a streaming block that has a function_call segment,`
`113`	`114`	`// this is the beginning of a function call assembly.`
`@@ -116,10 +117,12 @@ public void Process(ChatCompletionCreateResponse block)`
`116`	`117`	`{`
`117`	`118`	`FnCall = firstChoice.Message.FunctionCall;`
`118`	`119`	`firstChoice.Message.FunctionCall = null;`
	`120`	`+ justStarted = true;`
`119`	`121`	`}`
`120`	`122`
`121`	`123`	`// As long as we're assembling, keep on appending those args`
`122`		`- if (IsFnAssemblyActive)`
	`124`	`+ // (Skip the first one, because it was already processed in the block above)`
	`125`	`+ if (IsFnAssemblyActive && !justStarted)`
`123`	`126`	`{`
`124`	`127`	`FnCall.Arguments += ExtractArgsSoFar();`
`125`	`128`	`}`
Original file line number	Diff line number	Diff line change
`@@ -169,6 +169,7 @@ public class FunctionParameterPropertyValue`
`169`	`169`	`/// <summary>`
`170`	`170`	`/// Optional. List of allowed values for this argument.`
`171`	`171`	`/// </summary>`
	`172`	`+ [JsonPropertyName("enum")]`
`172`	`173`	`public IList<string>? Enum { get; set; }`
`173`	`174`	`}`
`174`	`175`