Merge branch 'main' of https://github.com/openai/openai-dotnet into shreja/AddServiceTier

Author: ShivangiReja

api/OpenAI.net8.0.cs

@@ -33,7 +33,6 @@ protected override void Configure()
             AddVisitor(new OpenAILibraryVisitor());
             AddVisitor(new VirtualMessageCreationVisitor());
             AddVisitor(new ProhibitedNamespaceVisitor());
-            AddVisitor(new ExplicitConversionFromClientResultVisitor());
             AddVisitor(new ImplicitConversionToBinaryContentVisitor());
             AddVisitor(new ModelSerializationVisitor());
             AddVisitor(new ExperimentalAttributeVisitor());

api/OpenAI.netstandard2.0.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,35 @@ public class PaginationVisitor : ScmLibraryVisitor
         },
         {
             "GetChatCompletionMessages",
-            ("ChatCompletionMessageListDatum", "ChatCompletionCollectionOptions", _chatParamsToReplace)
+            ("ChatCompletionMessageListDatum", "ChatCompletionMessageCollectionOptions", _chatParamsToReplace)
         },
         {
             "GetChatCompletionMessagesAsync",
             ("ChatCompletionMessageListDatum", "ChatCompletionMessageCollectionOptions", _chatParamsToReplace)
+        },
+        {
+            "GetContainers",
+            ("ContainerResource", "ContainerCollectionOptions", _chatParamsToReplace)
+        },
+        {
+            "GetContainersAsync",
+            ("ContainerResource", "ContainerCollectionOptions", _chatParamsToReplace)
+        },
+        {
+            "GetContainerFiles",
+            ("ContainerFileResource", "ContainerFileCollectionOptions", _chatParamsToReplace)
+        },
+        {
+            "GetContainerFilesAsync",
+            ("ContainerFileResource", "ContainerFileCollectionOptions", _chatParamsToReplace)
+        },
+        {
+            "GetInputItems",
+            ("ResponseItem", "ResponseItemCollectionOptions", _chatParamsToReplace)
+        },
+        {
+            "GetInputItemsAsync",
+            ("ResponseItem", "ResponseItemCollectionOptions", _chatParamsToReplace)
         }
     };
 

codegen/generator/src/OpenAILibraryGenerator.cs

@@ -13,13 +13,13 @@ model ContainerFileListResource {
   object: "list";
 
   /** A list of container files. */
-  data: ContainerFileResource[];
+  @pageItems data: ContainerFileResource[];
 
   /** The ID of the first file in the list. */
   first_id: string;
 
   /** The ID of the last file in the list. */
-  last_id: string;
+  @continuationToken last_id: string;
 
   /** Whether there are more files available. */
   has_more: boolean;
@@ -59,13 +59,13 @@ model ContainerListResource {
   object: "list";
 
   /** A list of containers. */
-  data: ContainerResource[];
+  @pageItems data: ContainerResource[];
 
   /** The ID of the first container in the list. */
   first_id: string;
 
   /** The ID of the last container in the list. */
-  last_id: string;
+  @continuationToken last_id: string;
 
   /** Whether there are more containers available. */
   has_more: boolean;

codegen/generator/src/Visitors/ExplicitConversionFromClientResultVisitor.cs

@@ -14,6 +14,7 @@ namespace OpenAI;
 interface Containers {
   @get
   @operationId("ListContainers")
+  @list
   listContainers(
     ...PageLimitQueryParameter,
     ...PageOrderQueryParameter,
@@ -64,6 +65,7 @@ interface Containers {
   @get
   @route("{container_id}/files")
   @operationId("ListContainerFiles")
+  @list
   listContainerFiles(
     @path
     container_id: string,

codegen/generator/src/Visitors/PaginationVisitor.cs

@@ -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/containers/models.tsp

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

specification/base/typespec/containers/operations.tsp

@@ -4,16 +4,6 @@ import "@azure-tools/typespec-client-generator-core";
 using OpenAI;
 using Azure.ClientGenerator.Core;
 
-@@convenientAPI(Containers.listContainers, false);
-@@convenientAPI(Containers.createContainer, false);
-@@convenientAPI(Containers.retrieveContainer, false);
-@@convenientAPI(Containers.deleteContainer, false);
-@@convenientAPI(Containers.createContainerFile, false);
-@@convenientAPI(Containers.listContainerFiles, false);
-@@convenientAPI(Containers.retrieveContainerFile, false);
-@@convenientAPI(Containers.deleteContainerFile, false);
-@@convenientAPI(Containers.retrieveContainerFileContent, false);
-
 @@clientName(Containers.retrieveContainer, "GetContainer");
 @@clientName(Containers.retrieveContainerFile, "GetContainerFile");
 @@clientName(Containers.retrieveContainerFileContent, "GetContainerFileContent");