wip fix Content for ResponseContentPart

Author: christothes

codegen/generator/src/Visitors/PaginationVisitor.cs

@@ -22,7 +22,7 @@ public class PaginationVisitor : ScmLibraryVisitor
     private static readonly Dictionary<string, string> _paramReplacementMap = new()
     {
         { "after", "AfterId" },
-        { "before", "LastId" },
+        { "before", "BeforeId" },
         { "limit", "PageSizeLimit" },
         { "order", "Order" },
         { "model", "Model" },
@@ -40,11 +40,19 @@ public class PaginationVisitor : ScmLibraryVisitor
         },
         {
             "GetChatCompletionMessages",
-            ("ChatCompletionMessageListDatum", "ChatCompletionCollectionOptions", _chatParamsToReplace)
+            ("ChatCompletionMessageListDatum", "ChatCompletionMessageCollectionOptions", _chatParamsToReplace)
         },
         {
             "GetChatCompletionMessagesAsync",
             ("ChatCompletionMessageListDatum", "ChatCompletionMessageCollectionOptions", _chatParamsToReplace)
+        },
+        {
+            "GetInputItems",
+            ("ResponseItem", "ResponseItemCollectionOptions", _chatParamsToReplace)
+        },
+        {
+            "GetInputItemsAsync",
+            ("ResponseItem", "ResponseItemCollectionOptions", _chatParamsToReplace)
         }
     };
 

specification/base/typespec/responses/models.tsp

@@ -1272,7 +1272,7 @@ model ResponseItemList {
   object: "list";
 
   /** A list of items used to generate this response. */
-  data: ItemResource[];
+  @pageItems data: ItemResource[];
 
   /** Whether there are more items available. */
   has_more: boolean;
@@ -1281,7 +1281,7 @@ model ResponseItemList {
   first_id: string;
 
   /** The ID of the last item in the list. */
-  last_id: string;
+  @continuationToken last_id: string;
 }
 
 // Tool customization: Establish discriminated type base

specification/base/typespec/responses/operations.tsp

@@ -82,6 +82,7 @@ interface Responses {
   @operationId("listInputItems")
   @get
   @route("{response_id}/input_items")
+  @list
   listInputItems(
     @path
     @example("resp_677efb5139a88190b512bc3fef8e535d")

specification/client/models/common.models.tsp

@@ -144,4 +144,13 @@ alias CollectionAfterQueryParameter = {
    * subsequent call can include after=obj_foo in order to fetch the next page of the list.
    */
   @query @continuationToken afterId?: string;
+};
+
+alias CollectionBeforeQueryParameter = {
+  /**
+   * A cursor for use in pagination. `before` is an object ID that defines your place in the list.
+   * For instance, if you make a list request and receive 100 objects, starting with obj_foo, your
+   * subsequent call can include before=obj_foo in order to fetch the previous page of the list.
+   */
+  @query beforeId?: string;
 };

specification/client/models/responses.models.tsp

@@ -2,6 +2,7 @@ import "../../base/typespec/responses/main.tsp";
 import "@azure-tools/typespec-client-generator-core";
 
 using Azure.ClientGenerator.Core;
+using TypeSpec.Http;
 
 namespace OpenAI;
 
@@ -25,3 +26,26 @@ model DotNetItemReferenceItemResource extends ItemResource {
   type: ItemType.item_reference;
   ...ItemReferenceItemBase;
 }
+
+alias ResponseItemCollectionOrderQueryParameter = {
+  /**
+   * Sort order by the `created_at` timestamp of the objects. `asc` for ascending order and`desc`
+   * for descending order.
+   */
+  @query order?: ResponseItemCollectionOrder;
+};
+
+union ResponseItemCollectionOrder {
+  string,
+  Ascending: "asc",
+  Descending: "desc",
+}
+
+@access(Access.public)
+@usage(Usage.input)
+model ResponseItemCollectionOptions {
+  ...CollectionAfterQueryParameter,
+  ...CollectionBeforeQueryParameter,
+  ...CollectionLimitQueryParameter,
+  ...ResponseItemCollectionOrderQueryParameter,
+}

src/Custom/Responses/Items/Internal/InternalResponsesUserMessage.cs renamed to src/Custom/Responses/Items/Internal/ResponsesUserMessage.cs

@@ -3,14 +3,14 @@
 namespace OpenAI.Responses;
 
 [CodeGenType("ResponsesUserMessageItemResource")]
-internal partial class InternalResponsesUserMessage
+public partial class ResponsesUserMessage
 {
     // CUSTOM: Use generalized content type.
     [CodeGenMember("Content")]
-    public IList<ResponseContentPart> InternalContent { get; }
+    public IList<ResponseContentPart> Content { get; }
 
     // CUSTOM: For reuse as an input model
-    internal InternalResponsesUserMessage(IEnumerable<ResponseContentPart> internalContent)
+    internal ResponsesUserMessage(IEnumerable<ResponseContentPart> internalContent)
         : this(id: null, status: null, internalContent)
     { }
 }

src/Custom/Responses/Items/MessageResponseItem.cs

@@ -24,7 +24,7 @@ public MessageRole Role
 
     // CUSTOM: Recombined content from derived types.
     public IList<ResponseContentPart> Content
-        => (this as InternalResponsesUserMessage)?.InternalContent
+        => (this as ResponsesUserMessage)?.Content
         ?? (this as InternalResponsesDeveloperMessage)?.InternalContent
         ?? (this as InternalResponsesSystemMessage)?.InternalContent
         ?? (this as InternalResponsesAssistantMessage)?.InternalContent

src/Custom/Responses/Items/ResponseItem.cs

@@ -17,13 +17,13 @@ public partial class ResponseItem
     public static MessageResponseItem CreateUserMessageItem(IEnumerable<ResponseContentPart> contentParts)
     {
         Argument.AssertNotNullOrEmpty(contentParts, nameof(contentParts));
-        return new InternalResponsesUserMessage(contentParts);
+        return new ResponsesUserMessage(contentParts);
     }
 
     public static MessageResponseItem CreateUserMessageItem(string inputTextContent)
     {
         Argument.AssertNotNull(inputTextContent, nameof(inputTextContent));
-        return new InternalResponsesUserMessage(
+        return new ResponsesUserMessage(
             internalContent: [ResponseContentPart.CreateInputTextPart(inputTextContent)]);
     }
 

src/Custom/Responses/OpenAIResponseClient.Protocol.cs

@@ -8,8 +8,6 @@ namespace OpenAI.Responses;
 
 [CodeGenSuppress("GetResponse", typeof(string), typeof(string), typeof(IEnumerable<InternalIncludable>), typeof(bool?), typeof(int?), typeof(RequestOptions))]
 [CodeGenSuppress("GetResponseAsync", typeof(string), typeof(string), typeof(IEnumerable<InternalIncludable>), typeof(bool?), typeof(int?), typeof(RequestOptions))]
-[CodeGenSuppress("GetInputItems", typeof(string), typeof(int?), typeof(string), typeof(string), typeof(string), typeof(RequestOptions))]
-[CodeGenSuppress("GetInputItemsAsync", typeof(string), typeof(int?), typeof(string), typeof(string), typeof(string), typeof(RequestOptions))]
 [CodeGenSuppress("CancelResponse", typeof(string), typeof(IEnumerable<InternalIncludable>), typeof(bool?), typeof(int?), typeof(RequestOptions))]
 [CodeGenSuppress("CancelResponseAsync", typeof(string), typeof(IEnumerable<InternalIncludable>), typeof(bool?), typeof(int?), typeof(RequestOptions))]
 [CodeGenSuppress("GetResponse", typeof(string), typeof(IEnumerable<InternalIncludable>), typeof(bool?), typeof(int?), typeof(RequestOptions))]

src/Custom/Responses/OpenAIResponseClient.cs

@@ -16,8 +16,6 @@ namespace OpenAI.Responses;
 [CodeGenSuppress("CreateResponse", typeof(ResponseCreationOptions), typeof(CancellationToken))]
 [CodeGenSuppress("GetResponse", typeof(string), typeof(string), typeof(IEnumerable<InternalIncludable>), typeof(bool?), typeof(int?), typeof(CancellationToken))]
 [CodeGenSuppress("GetResponseAsync", typeof(string), typeof(string), typeof(IEnumerable<InternalIncludable>), typeof(bool?), typeof(int?), typeof(CancellationToken))]
-[CodeGenSuppress("GetInputItems", typeof(string), typeof(int?), typeof(OpenAI.VectorStores.VectorStoreCollectionOrder?), typeof(string), typeof(string), typeof(CancellationToken))]
-[CodeGenSuppress("GetInputItemsAsync", typeof(string), typeof(int?), typeof(OpenAI.VectorStores.VectorStoreCollectionOrder?), typeof(string), typeof(string), typeof(CancellationToken))]
 [CodeGenSuppress("DeleteResponse", typeof(string), typeof(string), typeof(CancellationToken))]
 [CodeGenSuppress("DeleteResponseAsync", typeof(string), typeof(string), typeof(CancellationToken))]
 [CodeGenSuppress("CancelResponse", typeof(string), typeof(IEnumerable<InternalIncludable>), typeof(bool?), typeof(int?), typeof(CancellationToken))]