fb

Author: christothes

api/OpenAI.net8.0.cs

@@ -226,7 +226,7 @@ public virtual ClientResult<ChatCompletionResult> CompleteChat(CompleteChatOptio
     {
         Argument.AssertNotNull(options, nameof(options));
 
-        ClientResult result = this.CompleteChat(options.Body, cancellationToken.CanBeCanceled ? new RequestOptions { CancellationToken = cancellationToken } : null);
+        ClientResult result = this.CompleteChat(options, cancellationToken.CanBeCanceled ? new RequestOptions { CancellationToken = cancellationToken } : null);
         return ClientResult.FromValue((ChatCompletionResult)result.GetRawResponse().Content, result.GetRawResponse());
     }
 

api/OpenAI.netstandard2.0.cs

@@ -152,8 +152,8 @@ public static CompleteChatOptions Create(IEnumerable<ChatMessage> messages, Chat
 #pragma warning disable SCME0001 // Type is for evaluation purposes only and is subject to change or removal in future updates.
             request.ResponseFormat = options.ResponseFormat switch
             {
-                InternalDotNetChatResponseFormatText => new ResponseFormatText(),
-                InternalDotNetChatResponseFormatJsonObject => new ResponseFormatJsonObject(),
+                InternalDotNetChatResponseFormatText => new ResponseFormat(ResponseFormatType.Text),
+                InternalDotNetChatResponseFormatJsonObject => new ResponseFormat(ResponseFormatType.JsonObject),
                 InternalDotNetChatResponseFormatJsonSchema js => new ResponseFormatJsonSchema(new ResponseFormatJsonSchemaJsonSchema(js.JsonSchema.Name)),
                 _ => null,
             };

src/Custom/Chat/ChatClient.cs

@@ -178,6 +178,50 @@ public AssistantChatMessage(ChatCompletion chatCompletion)
         }
     }
 
+    /// <summary>
+    /// Creates a new instance of <see cref="AssistantChatMessage"/> from a <see cref="ChatCompletion"/> with
+    /// an <c>assistant</c> role response.
+    /// </summary>
+    /// <remarks>
+    ///     This constructor will copy the <c>content</c>, <c>tool_calls</c>, and <c>function_call</c> from a chat
+    ///     completion response into a new <c>assistant</c> role request message.
+    /// </remarks>
+    /// <param name="chatCompletionResult">
+    ///     The <see cref="ChatCompletion"/> from which the conversation history request message should be created.
+    /// </param>
+    /// <exception cref="ArgumentException">
+    ///     The <c>role</c> of the provided chat completion response was not <see cref="ChatMessageRole.Assistant"/>.
+    /// </exception>
+    public AssistantChatMessage(ChatCompletionResult chatCompletionResult)
+        : this(
+              content: chatCompletionResult.Choices[0].Message.Content is null
+                ? new()
+                : new(chatCompletionResult.Choices[0].Message.Content),
+              role: ChatMessageRole.Assistant,
+              patch: default,
+              refusal: chatCompletionResult.Choices[0].Message.Refusal,
+              participantName: null,
+              toolCalls: null,
+              functionCall: chatCompletionResult.Choices[0].Message.FunctionCall is null
+                ? null
+                : new(chatCompletionResult.Choices[0].Message.FunctionCall.Name, new(chatCompletionResult.Choices[0].Message.FunctionCall.Arguments)),
+              outputAudioReference: chatCompletionResult.Choices[0].Message.Audio is not null
+                ? new(chatCompletionResult.Choices[0].Message.Audio.Id)
+                : null)
+    {
+        Argument.AssertNotNull(chatCompletionResult, nameof(chatCompletionResult));
+
+        if (chatCompletionResult.Choices[0].Message.Role != ChatMessageRole.Assistant)
+        {
+            throw new NotSupportedException($"Cannot instantiate an {nameof(AssistantChatMessage)} from a {nameof(ChatCompletion)} with role: {chatCompletionResult.Choices[0].Message.Role}.");
+        }
+
+        foreach (ChatToolCall toolCall in chatCompletionResult.Choices[0].Message.ToolCalls ?? [])
+        {
+            ToolCalls.Add(toolCall);
+        }
+    }
+
     // CUSTOM: Renamed.
     /// <summary>
     /// An optional <c>name</c> associated with the assistant message. This is typically defined with a <c>system</c>

src/Custom/Chat/CompleteChatOptions.cs

@@ -128,6 +128,7 @@ internal ChatMessage(ChatMessageRole role)
 
     /// <inheritdoc cref="AssistantChatMessage(ChatCompletion)"/>
     public static AssistantChatMessage CreateAssistantMessage(ChatCompletion chatCompletion) => new(chatCompletion);
+    public static AssistantChatMessage CreateAssistantMessage(ChatCompletionResult chatCompletionResult) => new(chatCompletionResult);
 
     /// <inheritdoc cref="AssistantChatMessage(ChatOutputAudioReference)"/>
     [Experimental("OPENAI001")]

src/Custom/Chat/Messages/AssistantChatMessage.cs

@@ -6,7 +6,7 @@
 
 namespace OpenAI.Chat
 {
-    [PersistableModelProxy(typeof(UnknownResponseFormat))]
+    [PersistableModelProxy(typeof(ResponseFormat))]
     public partial class ResponseFormat : IJsonModel<ResponseFormat>
     {
         internal ResponseFormat()
@@ -52,17 +52,16 @@ internal static ResponseFormat DeserializeResponseFormat(JsonElement element, Bi
             }
             if (element.TryGetProperty("type"u8, out JsonElement discriminator))
             {
-                switch (discriminator.GetString())
+                var kind = discriminator.GetString();
+                switch (kind)
                 {
-                    case "text":
-                        return ResponseFormatText.DeserializeResponseFormatText(element, data, options);
-                    case "json_object":
-                        return ResponseFormatJsonObject.DeserializeResponseFormatJsonObject(element, data, options);
                     case "json_schema":
                         return ResponseFormatJsonSchema.DeserializeResponseFormatJsonSchema(element, data, options);
+                    default:
+                        return new ResponseFormat((ResponseFormatType)Enum.Parse(typeof(ResponseFormatType), kind));
                 }
             }
-            return UnknownResponseFormat.DeserializeUnknownResponseFormat(element, data, options);
+            return new ResponseFormat((ResponseFormatType)Enum.Parse(typeof(ResponseFormatType), "unknown"));
         }
 
         BinaryData IPersistableModel<ResponseFormat>.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options);

src/Custom/Chat/Messages/ChatMessage.cs

@@ -5,12 +5,12 @@
 namespace OpenAI.Chat
 {
     [Experimental("OPENAI001")]
-    public abstract partial class ResponseFormat
+    public partial class ResponseFormat
     {
         [Experimental("SCME0001")]
         private JsonPatch _patch;
 
-        private protected ResponseFormat(ResponseFormatType kind)
+        internal protected ResponseFormat(ResponseFormatType kind)
         {
             Kind = kind;
         }