Refactor Assistants for better organization

src/Custom/Assistants/Internal/GeneratorStubs.Internal.cs

@@ -11,55 +11,55 @@ internal partial class InternalSubmitToolOutputsRunRequest { }
 internal readonly partial struct InternalCreateAssistantRequestModel { }
 
 [CodeGenModel("MessageContentTextObjectAnnotation")]
-internal partial class MessageContentTextObjectAnnotation { }
+internal partial class InternalMessageContentTextObjectAnnotation { }
 
 [CodeGenModel("MessageContentTextAnnotationsFileCitationObject")]
-internal partial class MessageContentTextAnnotationsFileCitationObject { }
+internal partial class InternalMessageContentTextAnnotationsFileCitationObject { }
 
 [CodeGenModel("MessageContentTextAnnotationsFilePathObject")]
-internal partial class MessageContentTextAnnotationsFilePathObject { }
+internal partial class InternalMessageContentTextAnnotationsFilePathObject { }
 
 [CodeGenModel("MessageDeltaContentImageFileObjectImageFile")]
-internal partial class MessageDeltaContentImageFileObjectImageFile
+internal partial class InternalMessageDeltaContentImageFileObjectImageFile
 {
     [CodeGenMember("Detail")]
     internal string Detail { get; set; }
 }
 
 [CodeGenModel("MessageDeltaContentImageUrlObjectImageUrl")]
-internal partial class MessageDeltaContentImageUrlObjectImageUrl
+internal partial class InternalMessageDeltaContentImageUrlObjectImageUrl
 {
     [CodeGenMember("Detail")]
     internal string Detail { get; }
 }
 
 [CodeGenModel("MessageDeltaContentImageFileObject")]
-internal partial class MessageDeltaContentImageFileObject { }
+internal partial class InternalMessageDeltaContentImageFileObject { }
 
 [CodeGenModel("MessageDeltaContentImageUrlObject")]
-internal partial class MessageDeltaContentImageUrlObject { }
+internal partial class InternalMessageDeltaContentImageUrlObject { }
 
 [CodeGenModel("MessageDeltaObjectDelta")]
-internal partial class MessageDeltaObjectDelta
+internal partial class InternalMessageDeltaObjectDelta
 {
     [CodeGenMember("Role")]
     internal MessageRole Role { get; }
 }
 
 [CodeGenModel("MessageDeltaContentTextObject")]
-internal partial class MessageDeltaContentTextObject { }
+internal partial class InternalMessageDeltaContentTextObject { }
 
 [CodeGenModel("MessageDeltaContentTextObjectText")]
-internal partial class MessageDeltaContentTextObjectText { }
+internal partial class InternalMessageDeltaContentTextObjectText { }
 
 [CodeGenModel("MessageDeltaContentTextAnnotationsFileCitationObject")]
-internal partial class MessageDeltaContentTextAnnotationsFileCitationObject { }
+internal partial class InternalMessageDeltaContentTextAnnotationsFileCitationObject { }
 
 [CodeGenModel("MessageDeltaTextContentAnnotation")]
-internal partial class MessageDeltaTextContentAnnotation { }
+internal partial class InternalMessageDeltaTextContentAnnotation { }
 
 [CodeGenModel("MessageDeltaContentTextAnnotationsFileCitationObjectFileCitation")]
-internal partial class MessageDeltaContentTextAnnotationsFileCitationObjectFileCitation { }
+internal partial class InternalMessageDeltaContentTextAnnotationsFileCitationObjectFileCitation { }
 
 [CodeGenModel("RunStepDeltaObject")]
 internal partial class InternalRunStepDelta { private readonly object Object; }
@@ -68,22 +68,13 @@ internal partial class InternalRunStepDelta { private readonly object Object; }
 internal partial class InternalRunStepDeltaObjectDelta { }
 
 [CodeGenModel("MessageDeltaContentTextAnnotationsFilePathObject")]
-internal partial class MessageDeltaContentTextAnnotationsFilePathObject { }
+internal partial class InternalMessageDeltaContentTextAnnotationsFilePathObject { }
 
 [CodeGenModel("MessageDeltaContentTextAnnotationsFilePathObjectFilePath")]
-internal partial class MessageDeltaContentTextAnnotationsFilePathObjectFilePath { }
-
-[CodeGenModel("UnknownMessageDeltaContent")]
-internal partial class UnknownMessageDeltaContent { }
-
-[CodeGenModel("UnknownAssistantToolDefinition")]
-internal partial class UnknownAssistantToolDefinition { }
-
-[CodeGenModel("UnknownRunStepDeltaStepDetailsToolCallsObjectToolCallsObject")]
-internal partial class UnknownRunStepDeltaStepDetailsToolCallsObjectToolCallsObject { }
+internal partial class InternalMessageDeltaContentTextAnnotationsFilePathObjectFilePath { }
 
 [CodeGenModel("MessageDeltaContent")]
-internal partial class MessageDeltaContent { }
+internal partial class InternalMessageDeltaContent { }
 
 [CodeGenModel("DeleteAssistantResponse")]
 internal partial class InternalDeleteAssistantResponse { }
@@ -127,25 +118,7 @@ internal partial class InternalMessageContentItemFileObjectImageFile
 }
 
 [CodeGenModel("MessageContentTextObjectText")]
-internal partial class MessageContentTextObjectText { }
-
-[CodeGenModel("UnknownMessageContentTextObjectAnnotation")]
-internal partial class UnknownMessageContentTextObjectAnnotation { }
-
-[CodeGenModel("UnknownMessageDeltaTextContentAnnotation")]
-internal partial class UnknownMessageDeltaTextContentAnnotation { }
-
-[CodeGenModel("UnknownRunStepDetails")]
-internal partial class UnknownRunStepDetails { }
-
-[CodeGenModel("UnknownRunStepObjectStepDetails")]
-internal partial class UnknownRunStepObjectStepDetails { }
-
-[CodeGenModel("UnknownRunStepDetailsToolCallsObjectToolCallsObject")]
-internal partial class UnknownRunStepDetailsToolCallsObjectToolCallsObject { }
-
-[CodeGenModel("UnknownRunStepDetailsToolCallsCodeObjectCodeInterpreterOutputsObject")]
-internal partial class UnknownRunStepDetailsToolCallsCodeObjectCodeInterpreterOutputsObject { }
+internal partial class InternalMessageContentTextObjectText { }
 
 [CodeGenModel("RunStepDetailsMessageCreationObjectMessageCreation")]
 internal partial class InternalRunStepDetailsMessageCreationObjectMessageCreation { }
@@ -256,12 +229,6 @@ internal partial class InternalRunStepDeltaStepDetailsToolCallsCodeOutputImageOb
 [CodeGenModel("RunStepDeltaStepDetails")]
 internal partial class InternalRunStepDeltaStepDetails { }
 
-[CodeGenModel("UnknownRunStepDeltaStepDetailsToolCallsCodeObjectCodeInterpreterOutputsObject")]
-internal partial class UnknownRunStepDeltaStepDetailsToolCallsCodeObjectCodeInterpreterOutputsObject { }
-
-[CodeGenModel("UnknownRunStepDeltaStepDetails")]
-internal partial class UnknownRunStepDeltaStepDetails { }
-
 [CodeGenModel("RunStepDeltaStepDetailsToolCallsFunctionObjectFunction")]
 internal partial class InternalRunStepDeltaStepDetailsToolCallsFunctionObjectFunction { }
 

src/Custom/Assistants/Internal/InternalResponseMessageTextContent.Serialization.cs

@@ -21,7 +21,7 @@ protected override void WriteCore(Utf8JsonWriter writer, ModelReaderWriterOption
         writer.WritePropertyName("type"u8);
         writer.WriteStringValue(_type);
         writer.WritePropertyName("text"u8);
-        writer.WriteObjectValue<MessageContentTextObjectText>(_text, options);
+        writer.WriteObjectValue<InternalMessageContentTextObjectText>(_text, options);
         writer.WriteSerializedAdditionalRawData(SerializedAdditionalRawData, options);
         writer.WriteEndObject();
     }

src/Custom/Assistants/Internal/InternalResponseMessageTextContent.cs

@@ -8,7 +8,7 @@ namespace OpenAI.Assistants;
 [CodeGenModel("MessageContentTextObject")]
 internal partial class InternalResponseMessageTextContent
 {
-    /// <inheritdoc cref="MessageContentTextObjectText.Value"/>
+    /// <inheritdoc cref="InternalMessageContentTextObjectText.Value"/>
     public string InternalText => _text.Value;
 
     public IReadOnlyList<TextAnnotation> InternalAnnotations => _annotations ??= WrapAnnotations();
@@ -17,14 +17,14 @@ internal partial class InternalResponseMessageTextContent
     private readonly string _type;
 
     [CodeGenMember("Text")]
-    private readonly MessageContentTextObjectText _text;
+    private readonly InternalMessageContentTextObjectText _text;
 
     private IReadOnlyList<TextAnnotation> _annotations;
 
     /// <summary> Initializes a new instance of <see cref="InternalResponseMessageTextContent"/>. </summary>
     /// <param name="internalText"></param>
     /// <exception cref="ArgumentNullException"> <paramref name="internalText"/> is null. </exception>
-    internal InternalResponseMessageTextContent(MessageContentTextObjectText internalText)
+    internal InternalResponseMessageTextContent(InternalMessageContentTextObjectText internalText)
     {
         Argument.AssertNotNull(internalText, nameof(internalText));
 
@@ -36,7 +36,7 @@ internal InternalResponseMessageTextContent(MessageContentTextObjectText interna
     private IReadOnlyList<TextAnnotation> WrapAnnotations()
     {
         List<TextAnnotation> annotations = [];
-        foreach (MessageContentTextObjectAnnotation internalAnnotation in _text?.Annotations ?? [])
+        foreach (InternalMessageContentTextObjectAnnotation internalAnnotation in _text?.Annotations ?? [])
         {
             annotations.Add(new(internalAnnotation));
         }

src/Custom/Assistants/Internal/UnknownAssistantToolDefinition.cs

@@ -0,0 +1,6 @@
+namespace OpenAI.Assistants;
+
+[CodeGenModel("UnknownAssistantToolDefinition")]
+internal partial class UnknownAssistantToolDefinition
+{
+}

src/Custom/Assistants/Internal/UnknownMessageContentTextObjectAnnotation.cs

@@ -0,0 +1,6 @@
+namespace OpenAI.Assistants;
+
+[CodeGenModel("UnknownMessageContentTextObjectAnnotation")]
+internal partial class UnknownMessageContentTextObjectAnnotation
+{
+}

src/Custom/Assistants/Internal/UnknownMessageDeltaContent.cs

@@ -0,0 +1,6 @@
+namespace OpenAI.Assistants;
+
+[CodeGenModel("UnknownMessageDeltaContent")]
+internal partial class UnknownMessageDeltaContent
+{
+}

src/Custom/Assistants/Internal/UnknownMessageDeltaTextContentAnnotation.cs

@@ -0,0 +1,6 @@
+namespace OpenAI.Assistants;
+
+[CodeGenModel("UnknownMessageDeltaTextContentAnnotation")]
+internal partial class UnknownMessageDeltaTextContentAnnotation
+{
+}

src/Custom/Assistants/Internal/UnknownRunStepDeltaStepDetails.cs

@@ -0,0 +1,6 @@
+namespace OpenAI.Assistants;
+
+[CodeGenModel("UnknownRunStepDeltaStepDetails")]
+internal partial class UnknownRunStepDeltaStepDetails
+{
+}

src/Custom/Assistants/Internal/UnknownRunStepDeltaStepDetailsToolCallsCodeObjectCodeInterpreterOutputsObject.cs

@@ -0,0 +1,6 @@
+namespace OpenAI.Assistants;
+
+[CodeGenModel("UnknownRunStepDeltaStepDetailsToolCallsCodeObjectCodeInterpreterOutputsObject")]
+internal partial class UnknownRunStepDeltaStepDetailsToolCallsCodeObjectCodeInterpreterOutputsObject
+{
+}

src/Custom/Assistants/Internal/UnknownRunStepDeltaStepDetailsToolCallsObjectToolCallsObject.cs

@@ -0,0 +1,6 @@
+namespace OpenAI.Assistants;
+
+[CodeGenModel("UnknownRunStepDeltaStepDetailsToolCallsObjectToolCallsObject")]
+internal partial class UnknownRunStepDeltaStepDetailsToolCallsObjectToolCallsObject
+{
+}

src/Custom/Assistants/Internal/UnknownRunStepDetails.cs

@@ -0,0 +1,6 @@
+namespace OpenAI.Assistants;
+
+[CodeGenModel("UnknownRunStepDetails")]
+internal partial class UnknownRunStepDetails
+{
+}

src/Custom/Assistants/Internal/UnknownRunStepDetailsToolCallsCodeObjectCodeInterpreterOutputsObject.cs

@@ -0,0 +1,6 @@
+namespace OpenAI.Assistants;
+
+[CodeGenModel("UnknownRunStepDetailsToolCallsCodeObjectCodeInterpreterOutputsObject")]
+internal partial class UnknownRunStepDetailsToolCallsCodeObjectCodeInterpreterOutputsObject
+{
+}

src/Custom/Assistants/Internal/UnknownRunStepDetailsToolCallsObjectToolCallsObject.cs

@@ -0,0 +1,6 @@
+namespace OpenAI.Assistants;
+
+[CodeGenModel("UnknownRunStepDetailsToolCallsObjectToolCallsObject")]
+internal partial class UnknownRunStepDetailsToolCallsObjectToolCallsObject
+{
+}

src/Custom/Assistants/Internal/UnknownRunStepObjectStepDetails.cs

@@ -0,0 +1,6 @@
+namespace OpenAI.Assistants;
+
+[CodeGenModel("UnknownRunStepObjectStepDetails")]
+internal partial class UnknownRunStepObjectStepDetails
+{
+}

src/Custom/Assistants/Streaming/MessageContentUpdate.cs

@@ -17,43 +17,43 @@ public partial class MessageContentUpdate : StreamingUpdate
     /// <inheritdoc cref="MessageDeltaObject.Id"/>
     public string MessageId => _delta.Id;
 
-    /// <inheritdoc cref="MessageDeltaContentImageFileObject.Index"/>
+    /// <inheritdoc cref="InternalMessageDeltaContentImageFileObject.Index"/>
     public int MessageIndex => _textContent?.Index
         ?? _imageFileContent?.Index
         ?? _imageUrlContent?.Index
         ?? TextAnnotation?.ContentIndex
         ?? 0;
 
-    /// <inheritdoc cref="MessageDeltaObjectDelta.Role"/>
+    /// <inheritdoc cref="InternalMessageDeltaObjectDelta.Role"/>
     public MessageRole? Role => _delta.Delta?.Role;
 
-    /// <inheritdoc cref="MessageDeltaContentImageFileObjectImageFile.FileId"/>
+    /// <inheritdoc cref="InternalMessageDeltaContentImageFileObjectImageFile.FileId"/>
     public string ImageFileId => _imageFileContent?.ImageFile?.FileId;
 
     /// <inheritdoc cref="MessageImageDetail"/>
     public MessageImageDetail? ImageDetail => _imageFileContent?.ImageFile?.Detail?.ToMessageImageDetail()
         ?? _imageUrlContent?.ImageUrl?.Detail?.ToMessageImageDetail();
 
-    /// <inheritdoc cref="MessageDeltaContentTextObjectText.Value"/>
+    /// <inheritdoc cref="InternalMessageDeltaContentTextObjectText.Value"/>
     public string Text => _textContent?.Text?.Value;
 
     /// <summary>
     /// An update to an annotation associated with a specific content item in the message's content items collection.
     /// </summary>
     public TextAnnotationUpdate TextAnnotation { get; }
 
-    private readonly MessageDeltaContentImageFileObject _imageFileContent;
-    private readonly MessageDeltaContentTextObject _textContent;
-    private readonly MessageDeltaContentImageUrlObject _imageUrlContent;
+    private readonly InternalMessageDeltaContentImageFileObject _imageFileContent;
+    private readonly InternalMessageDeltaContentTextObject _textContent;
+    private readonly InternalMessageDeltaContentImageUrlObject _imageUrlContent;
     private readonly InternalMessageDeltaObject _delta;
 
-    internal MessageContentUpdate(InternalMessageDeltaObject delta, MessageDeltaContent content)
+    internal MessageContentUpdate(InternalMessageDeltaObject delta, InternalMessageDeltaContent content)
         : base(StreamingUpdateReason.MessageUpdated)
     {
         _delta = delta;
-        _textContent = content as MessageDeltaContentTextObject;
-        _imageFileContent = content as MessageDeltaContentImageFileObject;
-        _imageUrlContent = content as MessageDeltaContentImageUrlObject;
+        _textContent = content as InternalMessageDeltaContentTextObject;
+        _imageFileContent = content as InternalMessageDeltaContentImageFileObject;
+        _imageUrlContent = content as InternalMessageDeltaContentImageUrlObject;
     }
 
     internal MessageContentUpdate(InternalMessageDeltaObject delta, TextAnnotationUpdate annotation)
@@ -70,12 +70,12 @@ internal static IEnumerable<MessageContentUpdate> DeserializeMessageContentUpdat
     {
         InternalMessageDeltaObject deltaObject = InternalMessageDeltaObject.DeserializeInternalMessageDeltaObject(element, options);
         List<MessageContentUpdate> updates = [];
-        foreach (MessageDeltaContent deltaContent in deltaObject.Delta.Content ?? [])
+        foreach (InternalMessageDeltaContent deltaContent in deltaObject.Delta.Content ?? [])
         {
             updates.Add(new(deltaObject, deltaContent));
-            if (deltaContent is MessageDeltaContentTextObject textContent)
+            if (deltaContent is InternalMessageDeltaContentTextObject textContent)
             {
-                foreach (MessageDeltaTextContentAnnotation internalAnnotation in textContent.Text.Annotations)
+                foreach (InternalMessageDeltaTextContentAnnotation internalAnnotation in textContent.Text.Annotations)
                 {
                     TextAnnotationUpdate annotation = new(internalAnnotation);
                     updates.Add(new(deltaObject, annotation));

src/Custom/Assistants/Streaming/TextAnnotationUpdate.cs

@@ -54,14 +54,14 @@ public string TextToReplace
     /// </summary>
     public string OutputFileId => _codeCitation?.FilePath?.FileId;
 
-    internal readonly MessageDeltaTextContentAnnotation _internalAnnotation;
-    private readonly MessageDeltaContentTextAnnotationsFileCitationObject _fileSearchCitation;
-    private readonly MessageDeltaContentTextAnnotationsFilePathObject _codeCitation;
+    internal readonly InternalMessageDeltaTextContentAnnotation _internalAnnotation;
+    private readonly InternalMessageDeltaContentTextAnnotationsFileCitationObject _fileSearchCitation;
+    private readonly InternalMessageDeltaContentTextAnnotationsFilePathObject _codeCitation;
 
-    internal TextAnnotationUpdate(MessageDeltaTextContentAnnotation internalAnnotation)
+    internal TextAnnotationUpdate(InternalMessageDeltaTextContentAnnotation internalAnnotation)
     {
         _internalAnnotation = internalAnnotation;
-        _fileSearchCitation = internalAnnotation as MessageDeltaContentTextAnnotationsFileCitationObject;
-        _codeCitation = internalAnnotation as MessageDeltaContentTextAnnotationsFilePathObject;
+        _fileSearchCitation = internalAnnotation as InternalMessageDeltaContentTextAnnotationsFileCitationObject;
+        _codeCitation = internalAnnotation as InternalMessageDeltaContentTextAnnotationsFilePathObject;
     }
 }

src/Custom/Assistants/TextAnnotation.cs

@@ -4,9 +4,9 @@ namespace OpenAI.Assistants;
 
 public class TextAnnotation
 {
-    internal readonly MessageContentTextObjectAnnotation _internalAnnotation;
-    private readonly MessageContentTextAnnotationsFileCitationObject _fileSearchCitation;
-    private readonly MessageContentTextAnnotationsFilePathObject _codeCitation;
+    internal readonly InternalMessageContentTextObjectAnnotation _internalAnnotation;
+    private readonly InternalMessageContentTextAnnotationsFileCitationObject _fileSearchCitation;
+    private readonly InternalMessageContentTextAnnotationsFilePathObject _codeCitation;
 
     /// <summary>
     /// The index in the message content at which the citation begins.
@@ -48,10 +48,10 @@ public int StartIndex
     /// </summary>
     public string OutputFileId => _codeCitation?.FilePath?.FileId;
 
-    internal TextAnnotation(MessageContentTextObjectAnnotation internalAnnotation)
+    internal TextAnnotation(InternalMessageContentTextObjectAnnotation internalAnnotation)
     {
         _internalAnnotation = internalAnnotation;
-        _fileSearchCitation = internalAnnotation as MessageContentTextAnnotationsFileCitationObject;
-        _codeCitation = internalAnnotation as MessageContentTextAnnotationsFilePathObject; ;
+        _fileSearchCitation = internalAnnotation as InternalMessageContentTextAnnotationsFileCitationObject;
+        _codeCitation = internalAnnotation as InternalMessageContentTextAnnotationsFilePathObject; ;
     }
 }

src/Custom/Common/CancellationTokenExtensions.cs → src/Custom/Internal/CancellationTokenExtensions.cs

@@ -1,6 +1,8 @@
 using System.ClientModel.Primitives;
 using System.Threading;
 
+namespace OpenAI;
+
 internal static class CancellationTokenExtensions
 {
     public static RequestOptions ToRequestOptions(this CancellationToken cancellationToken, bool streaming = false)