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

ShivangiReja · ShivangiReja · commit 2d4929811a53 · 2025-10-23T15:46:51.000-07:00
diff --git a/codegen/generator/src/OpenAI.Library.Plugin.csproj b/codegen/generator/src/OpenAI.Library.Plugin.csproj
@@ -8,7 +8,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-      <PackageReference Include="Microsoft.TypeSpec.Generator.ClientModel" Version="1.0.0-alpha.20251020.2" />
+      <PackageReference Include="Microsoft.TypeSpec.Generator.ClientModel" Version="1.0.0-alpha.20251021.4" />
     </ItemGroup>
 
   <!-- Copy output to package dist path for local execution and  -->
diff --git a/codegen/generator/src/Visitors/MetadataQueryParamVisitor.cs b/codegen/generator/src/Visitors/MetadataQueryParamVisitor.cs
@@ -92,7 +92,7 @@ dictionaryExpression.Original is VariableExpression variable &&
                     if (statement is ExpressionStatement expressionStatement3 &&
                         expressionStatement3.Expression is InvokeMethodExpression invokeMethodExpression &&
                         invokeMethodExpression.MethodName == "AppendQueryDelimited" &&
-                        invokeMethodExpression.Arguments.Count == 5 &&
+                        invokeMethodExpression.Arguments.Count == 4 &&
                         invokeMethodExpression.Arguments[0].ToDisplayString() == "\"metadata\"")
                     {
                         return new SingleLineCommentStatement("Plugin customization: remove unnecessary AppendQueryDelimited for metadata");
diff --git a/codegen/package.json b/codegen/package.json
@@ -30,7 +30,7 @@
   "dependencies": {
     "@open-ai/plugin": "file:",
     "@azure-tools/typespec-client-generator-core": "0.61.0",
-    "@typespec/http-client-csharp": "1.0.0-alpha.20251020.2",
+    "@typespec/http-client-csharp": "1.0.0-alpha.20251021.4",
     "@typespec/http": "1.5.0",
     "@typespec/openapi": "1.5.0"
   },
diff --git a/package-lock.json b/package-lock.json
diff --git a/scripts/Export-Api.ps1 b/scripts/Export-Api.ps1
@@ -107,7 +107,7 @@ function Invoke-GenAPI {
     Write-Output ""
 
     # System.ClientModel
-    $systemClientModelPath = Join-Path $nugetPackagesPath "system.clientmodel\1.6.1"
+    $systemClientModelPath = Join-Path $nugetPackagesPath "system.clientmodel\1.7.0"
     $systemClientModelRef = $null
     if (Test-Path $systemClientModelPath) {
         $systemClientModelRef = Get-ChildItem `
@@ -121,6 +121,21 @@ function Invoke-GenAPI {
     Write-Output "    $($systemClientModelRef)"
     Write-Output ""
 
+    # System.Net.ServerSentEvents
+    $systemNetServerSentEventsPath = Join-Path $nugetPackagesPath "system.net.serversentevents\9.0.9"
+    $systemNetServerSentEventsRef = $null
+    if (Test-Path $systemNetServerSentEventsPath) {
+        $systemNetServerSentEventsRef = Get-ChildItem `
+            -Path $systemNetServerSentEventsPath `
+            -Include $(($TargetFramework -eq "netstandard2.0") ? "netstandard2.0" : "net8.0") `
+            -Recurse |
+                Select-Object -Last 1
+    }
+
+    Write-Output "  * System.Net.ServerSentEvents:"
+    Write-Output "    $($systemNetServerSentEventsRef)"
+    Write-Output ""
+
     # Microsoft.Extensions.Logging.Abstractions
     $microsoftExtensionsLoggingAbstractionsPath = Join-Path $nugetPackagesPath "microsoft.extensions.logging.abstractions\8.0.3"
     $microsoftExtensionsLoggingAbstractionsRef = $null
@@ -209,6 +224,7 @@ function Invoke-GenAPI {
     
     if ($netRef) { $genapiArgs += @("--assembly-reference", $netRef) }
     if ($systemClientModelRef) { $genapiArgs += @("--assembly-reference", $systemClientModelRef) }
+    if ($systemNetServerSentEventsRef) { $genapiArgs += @("--assembly-reference", $systemNetServerSentEventsRef) }
     if ($microsoftExtensionsLoggingAbstractionsRef) { $genapiArgs += @("--assembly-reference", $microsoftExtensionsLoggingAbstractionsRef) }
     if ($microsoftExtensionsDependencyInjectionAbstractionsRef) { $genapiArgs += @("--assembly-reference", $microsoftExtensionsDependencyInjectionAbstractionsRef) }
     if ($systemMemoryDataRef) { $genapiArgs += @("--assembly-reference", $systemMemoryDataRef) }
diff --git a/src/Generated/AssistantClient.RestClient.cs b/src/Generated/AssistantClient.RestClient.cs
@@ -21,7 +21,7 @@ internal virtual PipelineMessage CreateGetAssistantsRequest(int? limit, string o
             uri.AppendPath("/assistants", false);
             if (limit != null)
             {
-                uri.AppendQuery("limit", TypeFormatters.ConvertToString(limit, null), true);
+                uri.AppendQuery("limit", TypeFormatters.ConvertToString(limit), true);
             }
             if (order != null)
             {
diff --git a/src/Generated/BatchClient.RestClient.cs b/src/Generated/BatchClient.RestClient.cs
@@ -39,7 +39,7 @@ internal virtual PipelineMessage CreateGetBatchesRequest(string after, int? limi
             }
             if (limit != null)
             {
-                uri.AppendQuery("limit", TypeFormatters.ConvertToString(limit, null), true);
+                uri.AppendQuery("limit", TypeFormatters.ConvertToString(limit), true);
             }
             PipelineMessage message = Pipeline.CreateMessage(uri.ToUri(), "GET", PipelineMessageClassifier200);
             PipelineRequest request = message.Request;
diff --git a/src/Generated/ChatClient.RestClient.cs b/src/Generated/ChatClient.RestClient.cs
@@ -26,7 +26,7 @@ internal virtual PipelineMessage CreateGetChatCompletionsRequest(string after, i
             }
             if (limit != null)
             {
-                uri.AppendQuery("limit", TypeFormatters.ConvertToString(limit, null), true);
+                uri.AppendQuery("limit", TypeFormatters.ConvertToString(limit), true);
             }
             if (order != null)
             {
@@ -121,7 +121,7 @@ internal virtual PipelineMessage CreateGetChatCompletionMessagesRequest(string c
             }
             if (limit != null)
             {
-                uri.AppendQuery("limit", TypeFormatters.ConvertToString(limit, null), true);
+                uri.AppendQuery("limit", TypeFormatters.ConvertToString(limit), true);
             }
             if (order != null)
             {
diff --git a/src/Generated/ContainerClient.RestClient.cs b/src/Generated/ContainerClient.RestClient.cs
@@ -21,7 +21,7 @@ internal virtual PipelineMessage CreateGetContainersRequest(int? limit, string o
             uri.AppendPath("/containers", false);
             if (limit != null)
             {
-                uri.AppendQuery("limit", TypeFormatters.ConvertToString(limit, null), true);
+                uri.AppendQuery("limit", TypeFormatters.ConvertToString(limit), true);
             }
             if (order != null)
             {
@@ -103,7 +103,7 @@ internal virtual PipelineMessage CreateGetContainerFilesRequest(string container
             uri.AppendPath("/files", false);
             if (limit != null)
             {
-                uri.AppendQuery("limit", TypeFormatters.ConvertToString(limit, null), true);
+                uri.AppendQuery("limit", TypeFormatters.ConvertToString(limit), true);
             }
             if (order != null)
             {
diff --git a/src/Generated/EvaluationClient.RestClient.cs b/src/Generated/EvaluationClient.RestClient.cs
@@ -28,7 +28,7 @@ internal virtual PipelineMessage CreateGetEvalsRequest(string after, int? limit,
             }
             if (limit != null)
             {
-                uri.AppendQuery("limit", TypeFormatters.ConvertToString(limit, null), true);
+                uri.AppendQuery("limit", TypeFormatters.ConvertToString(limit), true);
             }
             if (order != null)
             {
@@ -113,7 +113,7 @@ internal virtual PipelineMessage CreateGetEvalRunsRequest(string evalId, string
             }
             if (limit != null)
             {
-                uri.AppendQuery("limit", TypeFormatters.ConvertToString(limit, null), true);
+                uri.AppendQuery("limit", TypeFormatters.ConvertToString(limit), true);
             }
             if (order != null)
             {
@@ -206,7 +206,7 @@ internal virtual PipelineMessage CreateGetEvalRunOutputItemsRequest(string evalI
             }
             if (limit != null)
             {
-                uri.AppendQuery("limit", TypeFormatters.ConvertToString(limit, null), true);
+                uri.AppendQuery("limit", TypeFormatters.ConvertToString(limit), true);
             }
             if (status != null)
             {
diff --git a/src/Generated/FineTuningClient.RestClient.cs b/src/Generated/FineTuningClient.RestClient.cs
@@ -27,7 +27,7 @@ internal virtual PipelineMessage CreateGetFineTuningCheckpointPermissionsRequest
             }
             if (limit != null)
             {
-                uri.AppendQuery("limit", TypeFormatters.ConvertToString(limit, null), true);
+                uri.AppendQuery("limit", TypeFormatters.ConvertToString(limit), true);
             }
             if (order != null)
             {
@@ -100,7 +100,7 @@ internal virtual PipelineMessage CreateGetPaginatedFineTuningJobsRequest(string
             }
             if (limit != null)
             {
-                uri.AppendQuery("limit", TypeFormatters.ConvertToString(limit, null), true);
+                uri.AppendQuery("limit", TypeFormatters.ConvertToString(limit), true);
             }
             PipelineMessage message = Pipeline.CreateMessage(uri.ToUri(), "GET", PipelineMessageClassifier200);
             PipelineRequest request = message.Request;
@@ -149,7 +149,7 @@ internal virtual PipelineMessage CreateGetFineTuningJobCheckpointsRequest(string
             }
             if (limit != null)
             {
-                uri.AppendQuery("limit", TypeFormatters.ConvertToString(limit, null), true);
+                uri.AppendQuery("limit", TypeFormatters.ConvertToString(limit), true);
             }
             PipelineMessage message = Pipeline.CreateMessage(uri.ToUri(), "GET", PipelineMessageClassifier200);
             PipelineRequest request = message.Request;
@@ -171,7 +171,7 @@ internal virtual PipelineMessage CreateGetFineTuningEventsRequest(string fineTun
             }
             if (limit != null)
             {
-                uri.AppendQuery("limit", TypeFormatters.ConvertToString(limit, null), true);
+                uri.AppendQuery("limit", TypeFormatters.ConvertToString(limit), true);
             }
             PipelineMessage message = Pipeline.CreateMessage(uri.ToUri(), "GET", PipelineMessageClassifier200);
             PipelineRequest request = message.Request;
diff --git a/src/Generated/Internal/ClientUriBuilder.cs b/src/Generated/Internal/ClientUriBuilder.cs
@@ -54,17 +54,17 @@ public void AppendPath(string value, bool escape)
 
         public void AppendPath(int value, bool escape = true) => AppendPath(TypeFormatters.ConvertToString(value), escape);
 
-        public void AppendPath(byte[] value, string format, bool escape = true) => AppendPath(TypeFormatters.ConvertToString(value, format), escape);
+        public void AppendPath(byte[] value, SerializationFormat format = SerializationFormat.Default, bool escape = true) => AppendPath(TypeFormatters.ConvertToString(value, format), escape);
 
-        public void AppendPath(DateTimeOffset value, string format, bool escape = true) => AppendPath(TypeFormatters.ConvertToString(value, format), escape);
+        public void AppendPath(DateTimeOffset value, SerializationFormat format = SerializationFormat.Default, bool escape = true) => AppendPath(TypeFormatters.ConvertToString(value, format), escape);
 
-        public void AppendPath(TimeSpan value, string format, bool escape = true) => AppendPath(TypeFormatters.ConvertToString(value, format), escape);
+        public void AppendPath(TimeSpan value, SerializationFormat format = SerializationFormat.Default, bool escape = true) => AppendPath(TypeFormatters.ConvertToString(value, format), escape);
 
         public void AppendPath(Guid value, bool escape = true) => AppendPath(TypeFormatters.ConvertToString(value), escape);
 
         public void AppendPath(long value, bool escape = true) => AppendPath(TypeFormatters.ConvertToString(value), escape);
 
-        public void AppendPathDelimited<T>(IEnumerable<T> value, string delimiter, string format = null, bool escape = true)
+        public void AppendPathDelimited<T>(IEnumerable<T> value, string delimiter, SerializationFormat format = SerializationFormat.Default, bool escape = true)
         {
             delimiter ??= ",";
             IEnumerable<string> stringValues = value.Select(v => TypeFormatters.ConvertToString(v, format));
@@ -90,9 +90,9 @@ public void AppendQuery(string name, string value, bool escape)
 
         public void AppendQuery(string name, float value, bool escape = true) => AppendQuery(name, TypeFormatters.ConvertToString(value), escape);
 
-        public void AppendQuery(string name, DateTimeOffset value, string format, bool escape = true) => AppendQuery(name, TypeFormatters.ConvertToString(value, format), escape);
+        public void AppendQuery(string name, DateTimeOffset value, SerializationFormat format = SerializationFormat.Default, bool escape = true) => AppendQuery(name, TypeFormatters.ConvertToString(value, format), escape);
 
-        public void AppendQuery(string name, TimeSpan value, string format, bool escape = true) => AppendQuery(name, TypeFormatters.ConvertToString(value, format), escape);
+        public void AppendQuery(string name, TimeSpan value, SerializationFormat format = SerializationFormat.Default, bool escape = true) => AppendQuery(name, TypeFormatters.ConvertToString(value, format), escape);
 
         public void AppendQuery(string name, double value, bool escape = true) => AppendQuery(name, TypeFormatters.ConvertToString(value), escape);
 
@@ -104,11 +104,11 @@ public void AppendQuery(string name, string value, bool escape)
 
         public void AppendQuery(string name, TimeSpan value, bool escape = true) => AppendQuery(name, TypeFormatters.ConvertToString(value), escape);
 
-        public void AppendQuery(string name, byte[] value, string format, bool escape = true) => AppendQuery(name, TypeFormatters.ConvertToString(value, format), escape);
+        public void AppendQuery(string name, byte[] value, SerializationFormat format = SerializationFormat.Default, bool escape = true) => AppendQuery(name, TypeFormatters.ConvertToString(value, format), escape);
 
         public void AppendQuery(string name, Guid value, bool escape = true) => AppendQuery(name, TypeFormatters.ConvertToString(value), escape);
 
-        public void AppendQueryDelimited<T>(string name, IEnumerable<T> value, string delimiter, string format = null, bool escape = true)
+        public void AppendQueryDelimited<T>(string name, IEnumerable<T> value, string delimiter, SerializationFormat format = SerializationFormat.Default, bool escape = true)
         {
             delimiter ??= ",";
             IEnumerable<string> stringValues = value.Select(v => TypeFormatters.ConvertToString(v, format));
diff --git a/src/Generated/Internal/PipelineRequestHeadersExtensions.cs b/src/Generated/Internal/PipelineRequestHeadersExtensions.cs
@@ -16,7 +16,7 @@ public static void SetDelimited<T>(this PipelineRequestHeaders headers, string n
             headers.Set(name, string.Join(delimiter, stringValues));
         }
 
-        public static void SetDelimited<T>(this PipelineRequestHeaders headers, string name, IEnumerable<T> value, string delimiter, string format)
+        public static void SetDelimited<T>(this PipelineRequestHeaders headers, string name, IEnumerable<T> value, string delimiter, SerializationFormat format)
         {
             IEnumerable<string> stringValues = value.Select(v => TypeFormatters.ConvertToString(v, format));
             headers.Set(name, string.Join(delimiter, stringValues));
diff --git a/src/Generated/Internal/SerializationFormat.cs b/src/Generated/Internal/SerializationFormat.cs
@@ -0,0 +1,28 @@
+// <auto-generated/>
+
+#nullable disable
+
+namespace OpenAI
+{
+    internal enum SerializationFormat
+    {
+        Default = 0,
+        DateTime_RFC1123 = 1,
+        DateTime_RFC3339 = 2,
+        DateTime_RFC7231 = 3,
+        DateTime_ISO8601 = 4,
+        DateTime_Unix = 5,
+        Date_ISO8601 = 6,
+        Duration_ISO8601 = 7,
+        Duration_Constant = 8,
+        Duration_Seconds = 9,
+        Duration_Seconds_Float = 10,
+        Duration_Seconds_Double = 11,
+        Duration_Milliseconds = 12,
+        Duration_Milliseconds_Float = 13,
+        Duration_Milliseconds_Double = 14,
+        Time_ISO8601 = 15,
+        Bytes_Base64Url = 16,
+        Bytes_Base64 = 17
+    }
+}
diff --git a/src/Generated/Internal/TypeFormatters.cs b/src/Generated/Internal/TypeFormatters.cs
diff --git a/src/Generated/InternalAssistantMessageClient.RestClient.cs b/src/Generated/InternalAssistantMessageClient.RestClient.cs
diff --git a/src/Generated/InternalAssistantRunClient.RestClient.cs b/src/Generated/InternalAssistantRunClient.RestClient.cs
diff --git a/src/Generated/OpenAIResponseClient.RestClient.cs b/src/Generated/OpenAIResponseClient.RestClient.cs
diff --git a/src/Generated/VectorStoreClient.RestClient.cs b/src/Generated/VectorStoreClient.RestClient.cs

Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,7 @@ dictionaryExpression.Original is VariableExpression variable &&`
`92`	`92`	`if (statement is ExpressionStatement expressionStatement3 &&`
`93`	`93`	`expressionStatement3.Expression is InvokeMethodExpression invokeMethodExpression &&`
`94`	`94`	`invokeMethodExpression.MethodName == "AppendQueryDelimited" &&`
`95`		`- invokeMethodExpression.Arguments.Count == 5 &&`
	`95`	`+ invokeMethodExpression.Arguments.Count == 4 &&`
`96`	`96`	`invokeMethodExpression.Arguments[0].ToDisplayString() == "\"metadata\"")`
`97`	`97`	`{`
`98`	`98`	`return new SingleLineCommentStatement("Plugin customization: remove unnecessary AppendQueryDelimited for metadata");`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ internal virtual PipelineMessage CreateGetAssistantsRequest(int? limit, string o`
`21`	`21`	`uri.AppendPath("/assistants", false);`
`22`	`22`	`if (limit != null)`
`23`	`23`	`{`
`24`		`- uri.AppendQuery("limit", TypeFormatters.ConvertToString(limit, null), true);`
	`24`	`+ uri.AppendQuery("limit", TypeFormatters.ConvertToString(limit), true);`
`25`	`25`	`}`
`26`	`26`	`if (order != null)`
`27`	`27`	`{`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ internal virtual PipelineMessage CreateGetBatchesRequest(string after, int? limi`
`39`	`39`	`}`
`40`	`40`	`if (limit != null)`
`41`	`41`	`{`
`42`		`- uri.AppendQuery("limit", TypeFormatters.ConvertToString(limit, null), true);`
	`42`	`+ uri.AppendQuery("limit", TypeFormatters.ConvertToString(limit), true);`
`43`	`43`	`}`
`44`	`44`	`PipelineMessage message = Pipeline.CreateMessage(uri.ToUri(), "GET", PipelineMessageClassifier200);`
`45`	`45`	`PipelineRequest request = message.Request;`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ internal virtual PipelineMessage CreateGetChatCompletionsRequest(string after, i`
`26`	`26`	`}`
`27`	`27`	`if (limit != null)`
`28`	`28`	`{`
`29`		`- uri.AppendQuery("limit", TypeFormatters.ConvertToString(limit, null), true);`
	`29`	`+ uri.AppendQuery("limit", TypeFormatters.ConvertToString(limit), true);`
`30`	`30`	`}`
`31`	`31`	`if (order != null)`
`32`	`32`	`{`
`@@ -121,7 +121,7 @@ internal virtual PipelineMessage CreateGetChatCompletionMessagesRequest(string c`
`121`	`121`	`}`
`122`	`122`	`if (limit != null)`
`123`	`123`	`{`
`124`		`- uri.AppendQuery("limit", TypeFormatters.ConvertToString(limit, null), true);`
	`124`	`+ uri.AppendQuery("limit", TypeFormatters.ConvertToString(limit), true);`
`125`	`125`	`}`
`126`	`126`	`if (order != null)`
`127`	`127`	`{`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ internal virtual PipelineMessage CreateGetEvalsRequest(string after, int? limit,`
`28`	`28`	`}`
`29`	`29`	`if (limit != null)`
`30`	`30`	`{`
`31`		`- uri.AppendQuery("limit", TypeFormatters.ConvertToString(limit, null), true);`
	`31`	`+ uri.AppendQuery("limit", TypeFormatters.ConvertToString(limit), true);`
`32`	`32`	`}`
`33`	`33`	`if (order != null)`
`34`	`34`	`{`
`@@ -113,7 +113,7 @@ internal virtual PipelineMessage CreateGetEvalRunsRequest(string evalId, string`
`113`	`113`	`}`
`114`	`114`	`if (limit != null)`
`115`	`115`	`{`
`116`		`- uri.AppendQuery("limit", TypeFormatters.ConvertToString(limit, null), true);`
	`116`	`+ uri.AppendQuery("limit", TypeFormatters.ConvertToString(limit), true);`
`117`	`117`	`}`
`118`	`118`	`if (order != null)`
`119`	`119`	`{`
`@@ -206,7 +206,7 @@ internal virtual PipelineMessage CreateGetEvalRunOutputItemsRequest(string evalI`
`206`	`206`	`}`
`207`	`207`	`if (limit != null)`
`208`	`208`	`{`
`209`		`- uri.AppendQuery("limit", TypeFormatters.ConvertToString(limit, null), true);`
	`209`	`+ uri.AppendQuery("limit", TypeFormatters.ConvertToString(limit), true);`
`210`	`210`	`}`
`211`	`211`	`if (status != null)`
`212`	`212`	`{`