messages

Author: christothes

codegen/generator/src/Visitors/PaginationVisitor.cs

@@ -78,6 +78,14 @@ public class PaginationVisitor : ScmLibraryVisitor
             "GetAssistantsAsync",
             ("Assistant", "AssistantCollectionOptions", _paginationParamsToReplace)
         },
+        {
+            "GetMessages",
+            ("ThreadMessage", "MessageCollectionOptions", _paginationParamsToReplace)
+        },
+        {
+            "GetMessagesAsync",
+            ("ThreadMessage", "MessageCollectionOptions", _paginationParamsToReplace)
+        },
     };
 
     protected override MethodProvider? VisitMethod(MethodProvider method)

specification/base/typespec/messages/models.tsp

@@ -55,9 +55,9 @@ model ListMessagesResponse {
   // Tool customization: add a clear enum enforcement of constrained 'object' label
   object: "list";
 
-  data: MessageObject[];
+  @pageItems data: MessageObject[];
   first_id: string;
-  last_id: string;
+  @continuationToken last_id: string;
   has_more: boolean;
 }
 

specification/base/typespec/messages/operations.tsp

@@ -29,6 +29,7 @@ interface Messages {
   @operationId("listMessages")
   @tag("Assistants")
   @summary("Returns a list of messages for a given thread.")
+  @list
   listMessages(
     ...AcceptJsonHeader,
     ...AssistantsBetaHeader,

specification/client/models/assistants.models.tsp

@@ -28,3 +28,28 @@ model AssistantCollectionOptions {
   ...CollectionLimitQueryParameter,
   ...AssistantCollectionOrderQueryParameter,
 }
+
+
+
+alias MessageCollectionOrderQueryParameter = {
+  /**
+   * Sort order by the `created_at` timestamp of the objects. `asc` for ascending order and`desc`
+   * for descending order.
+   */
+  @query order?: MessageCollectionOrder;
+};
+
+union MessageCollectionOrder {
+  string,
+  Ascending: "asc",
+  Descending: "desc",
+}
+
+@access(Access.public)
+@usage(Usage.input)
+model MessageCollectionOptions {
+  ...CollectionAfterQueryParameter,
+  ...CollectionBeforeQueryParameter,
+  ...CollectionLimitQueryParameter,
+  ...MessageCollectionOrderQueryParameter,
+}

src/Custom/Assistants/AssistantClient.Protocol.cs

@@ -44,11 +44,7 @@ public virtual ClientResult CreateMessage(string threadId, BinaryContent content
     /// <exception cref="ClientResultException"> Service returned a non-success status code. </exception>
     /// <returns> A collection of service responses, each holding a page of values. </returns>
     public virtual AsyncCollectionResult GetMessagesAsync(string threadId, int? limit, string order, string after, string before, RequestOptions options)
-    {
-        Argument.AssertNotNullOrEmpty(threadId, nameof(threadId));
-
-        return new AsyncMessageCollectionResult(_messageSubClient, options, threadId, limit, order, after, before);
-    }
+        => _messageSubClient.GetMessagesAsync(threadId, limit, order, after, before, options);
 
     /// <summary>
     /// [Protocol Method] Returns a paginated collection of messages for a given thread.
@@ -78,11 +74,7 @@ public virtual AsyncCollectionResult GetMessagesAsync(string threadId, int? limi
     /// <exception cref="ClientResultException"> Service returned a non-success status code. </exception>
     /// <returns> A collection of service responses, each holding a page of values. </returns>
     public virtual CollectionResult GetMessages(string threadId, int? limit, string order, string after, string before, RequestOptions options)
-    {
-        Argument.AssertNotNullOrEmpty(threadId, nameof(threadId));
-
-        return new MessageCollectionResult(_messageSubClient, options, threadId, limit, order, after, before);
-    }
+        => _messageSubClient.GetMessages(threadId, limit, order, after, before, options);
 
     /// <inheritdoc cref="InternalAssistantMessageClient.GetMessageAsync"/>
     public virtual Task<ClientResult> GetMessageAsync(string threadId, string messageId, RequestOptions options)

src/Custom/Assistants/AssistantClient.cs

@@ -112,7 +112,7 @@ public virtual async Task<ClientResult<Assistant>> CreateAssistantAsync(string m
         options ??= new();
         options.Model = model;
 
-         ClientResult protocolResult = await CreateAssistantAsync(options?.ToBinaryContent(), cancellationToken.ToRequestOptions()).ConfigureAwait(false);
+        ClientResult protocolResult = await CreateAssistantAsync(options?.ToBinaryContent(), cancellationToken.ToRequestOptions()).ConfigureAwait(false);
         return ClientResult.FromValue((Assistant)protocolResult, protocolResult.GetRawResponse());
     }
 
@@ -128,7 +128,7 @@ public virtual ClientResult<Assistant> CreateAssistant(string model, AssistantCr
         options.Model = model;
 
         ClientResult protocolResult = CreateAssistant(options?.ToBinaryContent(), cancellationToken.ToRequestOptions());
-         return ClientResult.FromValue((Assistant)protocolResult, protocolResult.GetRawResponse());
+        return ClientResult.FromValue((Assistant)protocolResult, protocolResult.GetRawResponse());
     }
 
     /// <summary>
@@ -231,7 +231,7 @@ public virtual ClientResult<AssistantDeletionResult> DeleteAssistant(string assi
     public virtual async Task<ClientResult<AssistantThread>> CreateThreadAsync(ThreadCreationOptions options = null, CancellationToken cancellationToken = default)
     {
         ClientResult protocolResult = await CreateThreadAsync(options?.ToBinaryContent(), cancellationToken.ToRequestOptions()).ConfigureAwait(false);
-        return ClientResult.FromValue((AssistantThread)protocolResult, protocolResult.GetRawResponse());;
+        return ClientResult.FromValue((AssistantThread)protocolResult, protocolResult.GetRawResponse()); ;
     }
 
     /// <summary>
@@ -404,41 +404,7 @@ public virtual AsyncCollectionResult<ThreadMessage> GetMessagesAsync(
         string threadId,
         MessageCollectionOptions options = default,
         CancellationToken cancellationToken = default)
-    {
-        Argument.AssertNotNullOrEmpty(threadId, nameof(threadId));
-
-        AsyncCollectionResult result = GetMessagesAsync(threadId, options?.PageSizeLimit, options?.Order?.ToString(), options?.AfterId, options?.BeforeId, cancellationToken.ToRequestOptions());
-
-        if (result is not AsyncCollectionResult<ThreadMessage> collection)
-        {
-            throw new InvalidOperationException("Failed to cast protocol return type to expected collection type 'AsyncCollectionResult<ThreadMessage>'.");
-        }
-
-        return collection;
-    }
-
-    /// <summary>
-    /// Rehydrates a page collection of <see cref="ThreadMessage"/> instances from a page token.
-    /// </summary>
-    /// <param name="firstPageToken"> Page token corresponding to the first page of the collection to rehydrate. </param>
-    /// <param name="cancellationToken">A token that can be used to cancel this method call.</param>
-    /// <returns> A collection of <see cref="ThreadMessage"/>. </returns>
-    public virtual AsyncCollectionResult<ThreadMessage> GetMessagesAsync(
-        ContinuationToken firstPageToken,
-        CancellationToken cancellationToken = default)
-    {
-        Argument.AssertNotNull(firstPageToken, nameof(firstPageToken));
-
-        MessageCollectionPageToken pageToken = MessageCollectionPageToken.FromToken(firstPageToken);
-        AsyncCollectionResult result = GetMessagesAsync(pageToken?.ThreadId, pageToken?.Limit, pageToken?.Order, pageToken?.After, pageToken?.Before, cancellationToken.ToRequestOptions());
-
-        if (result is not AsyncCollectionResult<ThreadMessage> collection)
-        {
-            throw new InvalidOperationException("Failed to cast protocol return type to expected collection type 'AsyncCollectionResult<ThreadMessage>'.");
-        }
-
-        return collection;
-    }
+            => _messageSubClient.GetMessagesAsync(threadId, options, cancellationToken);
 
     /// <summary>
     /// Gets a page collection holding <see cref="ThreadMessage"/> instances from an existing <see cref="AssistantThread"/>.
@@ -451,42 +417,7 @@ public virtual CollectionResult<ThreadMessage> GetMessages(
         string threadId,
         MessageCollectionOptions options = default,
         CancellationToken cancellationToken = default)
-    {
-        Argument.AssertNotNullOrEmpty(threadId, nameof(threadId));
-
-        CollectionResult result = GetMessages(threadId, options?.PageSizeLimit, options?.Order?.ToString(), options?.AfterId, options?.BeforeId, cancellationToken.ToRequestOptions());
-
-        if (result is not CollectionResult<ThreadMessage> collection)
-        {
-            throw new InvalidOperationException("Failed to cast protocol return type to expected collection type 'CollectionResult<ThreadMessage>'.");
-        }
-
-        return collection;
-    }
-
-    /// <summary>
-    /// Rehydrates a page collection holding <see cref="ThreadMessage"/> instances from a page token.
-    /// </summary>
-    /// <param name="firstPageToken"> Page token corresponding to the first page of the collection to rehydrate. </param>
-    /// <param name="cancellationToken">A token that can be used to cancel this method call.</param>
-    /// <returns> A collection of <see cref="ThreadMessage"/>. </returns>
-    public virtual CollectionResult<ThreadMessage> GetMessages(
-        ContinuationToken firstPageToken,
-        CancellationToken cancellationToken = default)
-    {
-        Argument.AssertNotNull(firstPageToken, nameof(firstPageToken));
-
-        MessageCollectionPageToken pageToken = MessageCollectionPageToken.FromToken(firstPageToken);
-        CollectionResult result = GetMessages(pageToken?.ThreadId, pageToken?.Limit, pageToken?.Order, pageToken?.After, pageToken?.Before, cancellationToken.ToRequestOptions());
-
-        if (result is not CollectionResult<ThreadMessage> collection)
-        {
-            throw new InvalidOperationException("Failed to cast protocol return type to expected collection type 'CollectionResult<ThreadMessage>'.");
-        }
-
-        return collection;
-
-    }
+            => _messageSubClient.GetMessages(threadId, options, cancellationToken);
 
     /// <summary>
     /// Gets an existing <see cref="ThreadMessage"/> from a known <see cref="AssistantThread"/>.
@@ -629,7 +560,7 @@ public virtual ClientResult<ThreadRun> CreateRun(string threadId, string assista
         options.Stream = null;
 
         ClientResult protocolResult = CreateRun(threadId, options?.ToBinaryContent(), cancellationToken.ToRequestOptions());
-       return ClientResult.FromValue((ThreadRun)protocolResult, protocolResult.GetRawResponse());
+        return ClientResult.FromValue((ThreadRun)protocolResult, protocolResult.GetRawResponse());
     }
 
     /// <summary>

src/Custom/Assistants/GeneratorStubs.cs

@@ -16,6 +16,12 @@ public readonly partial struct AssistantCollectionOrder { }
 [CodeGenType("AssistantToolsCode")]
 public partial class CodeInterpreterToolDefinition { }
 
+[CodeGenType("MessageCollectionOptions")]
+public partial class MessageCollectionOptions { }
+
+[CodeGenType("MessageCollectionOrder")]
+public readonly partial struct MessageCollectionOrder { }
+
 [CodeGenType("MessageObjectStatus")]
 public readonly partial struct MessageStatus { }
 

src/Custom/Assistants/Internal/InternalAssistantMessageClient.cs

@@ -9,8 +9,6 @@ namespace OpenAI.Assistants;
 [CodeGenSuppress("InternalAssistantMessageClient", typeof(ClientPipeline), typeof(ApiKeyCredential), typeof(Uri))]
 [CodeGenSuppress("CreateMessageAsync", typeof(string), typeof(MessageCreationOptions), typeof(CancellationToken))]
 [CodeGenSuppress("CreateMessage", typeof(string), typeof(MessageCreationOptions), typeof(CancellationToken))]
-[CodeGenSuppress("GetMessagesAsync", typeof(string), typeof(int?), typeof(OpenAI.VectorStores.VectorStoreCollectionOrder?), typeof(string), typeof(string), typeof(CancellationToken))]
-[CodeGenSuppress("GetMessages", typeof(string), typeof(int?), typeof(OpenAI.VectorStores.VectorStoreCollectionOrder?), typeof(string), typeof(string), typeof(CancellationToken))]
 [CodeGenSuppress("GetMessageAsync", typeof(string), typeof(string), typeof(CancellationToken))]
 [CodeGenSuppress("GetMessage", typeof(string), typeof(string), typeof(CancellationToken))]
 [CodeGenSuppress("ModifyMessageAsync", typeof(string), typeof(string), typeof(MessageModificationOptions), typeof(CancellationToken))]