Merge branch 'openai:main' into addtestframeworktake2

m-redding · web-flow · commit d56bcb83258f · 2025-09-12T11:07:12.000-07:00
diff --git a/README.md b/README.md
@@ -1101,4 +1101,4 @@ By default, the client classes will automatically retry the following errors up
 
 ### Observability
 
-OpenAI .NET library supports experimental distributed tracing and metrics with OpenTelemetry. Check out [Observability with OpenTelemetry](./docs/observability.md) for more details.
+OpenAI .NET library supports experimental distributed tracing and metrics with OpenTelemetry. Check out [Observability with OpenTelemetry](./docs/Observability.md) for more details.
diff --git a/docs/guides/global.json b/docs/guides/global.json
@@ -1,5 +1,5 @@
 {
   "sdk": {
-    "version": "10.*-preview"
+    "version": "10.*-rc*"
   }
 }
diff --git a/docs/guides/text/chat/chat_instructions.cs b/docs/guides/text/chat/chat_instructions.cs
@@ -1,9 +1,9 @@
 // SAMPLE: Generate text with messages using different roles
-// GUIDANCE: Instructions to run this code: https://aka.ms/oai/net/start 
-#:package OpenAI@2.2.*-*
-#:property PublishAot false
+// GUIDANCE: Instructions to run this code: https://aka.ms/oai/net/start
+#:package OpenAI@2.*
+#:property PublishAot=false
 
-using OpenAI.Chat; 
+using OpenAI.Chat;
 
 string key = Environment.GetEnvironmentVariable("OPENAI_API_KEY")!;
 ChatClient client = new("gpt-4.1", key);
diff --git a/docs/guides/text/chat/chat_roles.cs b/docs/guides/text/chat/chat_roles.cs
@@ -1,9 +1,11 @@
 // SAMPLE: Generate text with messages using different roles
-// GUIDANCE: Instructions to run this code: https://aka.ms/oai/net/start 
-#:package OpenAI@2.2.*-*
-#:property PublishAot false
+// GUIDANCE: Instructions to run this code: https://aka.ms/oai/net/start
+#pragma warning disable OPENAI001
 
-using OpenAI.Chat; 
+#:package OpenAI@2.*
+#:property PublishAot=false
+
+using OpenAI.Chat;
 
 string key = Environment.GetEnvironmentVariable("OPENAI_API_KEY")!;
 ChatClient client = new("gpt-4.1", key);
diff --git a/docs/guides/text/chat/chat_simpleprompt.cs b/docs/guides/text/chat/chat_simpleprompt.cs
@@ -1,9 +1,9 @@
 // SAMPLE: Generate text from a simple prompt
-// GUIDANCE: Instructions to run this code: https://aka.ms/oai/net/start 
-#:package OpenAI@2.2.*-*
-#:property PublishAot false
+// GUIDANCE: Instructions to run this code: https://aka.ms/oai/net/start
+#:package OpenAI@2.*
+#:property PublishAot=false
 
-using OpenAI.Chat; 
+using OpenAI.Chat;
 
 string key = Environment.GetEnvironmentVariable("OPENAI_API_KEY")!;
 ChatClient client = new("gpt-4.1", key);
diff --git a/docs/guides/text/chat/chat_tools.cs b/docs/guides/text/chat/chat_tools.cs
@@ -1,9 +1,9 @@
 // SAMPLE: Generate text from a simple prompt
-// GUIDANCE: Instructions to run this code: https://aka.ms/oai/net/start 
-#:package OpenAI@2.2.*-*
+// GUIDANCE: Instructions to run this code: https://aka.ms/oai/net/start
+#:package OpenAI@2.*
 #:property PublishAot=false
 
-using OpenAI.Chat; 
+using OpenAI.Chat;
 
 string key = Environment.GetEnvironmentVariable("OPENAI_API_KEY")!;
 ChatClient client = new("gpt-4.1", key);
@@ -15,7 +15,7 @@
     functionParameters: BinaryData.FromObjectAsJson(new
     {
         type = "object",
-        properties = new 
+        properties = new
         {
             utc = new
             {
diff --git a/docs/guides/text/responses/responses_fileinput.cs b/docs/guides/text/responses/responses_fileinput.cs
@@ -1,7 +1,9 @@
 // SAMPLE: Prompt template with file input variable
-// GUIDANCE: Instructions to run this code: https://aka.ms/oai/net/start 
-#:package OpenAI@2.2.*-*
-#:property PublishAot false
+// GUIDANCE: Instructions to run this code: https://aka.ms/oai/net/start
+#pragma warning disable OPENAI001
+
+#:package OpenAI@2.*
+#:property PublishAot=false
 
 using OpenAI.Responses;
 using OpenAI.Files;
diff --git a/docs/guides/text/responses/responses_instructions.cs b/docs/guides/text/responses/responses_instructions.cs
@@ -1,9 +1,11 @@
 // SAMPLE: Generate text with instructions
-// GUIDANCE: Instructions to run this code: https://aka.ms/oai/net/start 
-#:package OpenAI@2.2.*-*
-#:property PublishAot false
+// GUIDANCE: Instructions to run this code: https://aka.ms/oai/net/start
+#pragma warning disable OPENAI001
 
-using OpenAI.Responses; 
+#:package OpenAI@2.*
+#:property PublishAot=false
+
+using OpenAI.Responses;
 
 string key = Environment.GetEnvironmentVariable("OPENAI_API_KEY")!;
 OpenAIResponseClient client = new("gpt-4.1", key);
diff --git a/docs/guides/text/responses/responses_prompttemplate.cs b/docs/guides/text/responses/responses_prompttemplate.cs
@@ -1,7 +1,9 @@
 // SAMPLE: Generate text with a prompt template
-// GUIDANCE: Instructions to run this code: https://aka.ms/oai/net/start 
-#:package OpenAI@2.2.*-*
-#:property PublishAot false
+// GUIDANCE: Instructions to run this code: https://aka.ms/oai/net/start
+#pragma warning disable OPENAI001
+
+#:package OpenAI@2.*
+#:property PublishAot=false
 
 using OpenAI.Responses;
 using System.ClientModel;
diff --git a/docs/guides/text/responses/responses_roles.cs b/docs/guides/text/responses/responses_roles.cs
@@ -1,9 +1,11 @@
 // SAMPLE: Generate text with messages using different roles
-// GUIDANCE: Instructions to run this code: https://aka.ms/oai/net/start 
-#:package OpenAI@2.2.*-*
-#:property PublishAot false
+// GUIDANCE: Instructions to run this code: https://aka.ms/oai/net/start
+#pragma warning disable OPENAI001
 
-using OpenAI.Responses; 
+#:package OpenAI@2.*
+#:property PublishAot=false
+
+using OpenAI.Responses;
 
 string key = Environment.GetEnvironmentVariable("OPENAI_API_KEY")!;
 OpenAIResponseClient client = new("gpt-4.1", key);
diff --git a/docs/guides/text/responses/responses_simpleprompt.cs b/docs/guides/text/responses/responses_simpleprompt.cs
@@ -1,9 +1,11 @@
 // SAMPLE: Generate text from a simple prompt
-// GUIDANCE: Instructions to run this code: https://aka.ms/oai/net/start 
-#:package OpenAI@2.2.*-*
-#:property PublishAot false
+// GUIDANCE: Instructions to run this code: https://aka.ms/oai/net/start
+#pragma warning disable OPENAI001
 
-using OpenAI.Responses; 
+#:package OpenAI@2.*
+#:property PublishAot=false
+
+using OpenAI.Responses;
 
 string key = Environment.GetEnvironmentVariable("OPENAI_API_KEY")!;
 OpenAIResponseClient client = new("gpt-4.1", key);
diff --git a/scripts/Invoke-CodeGen.ps1 b/scripts/Invoke-CodeGen.ps1
@@ -32,6 +32,22 @@ function Invoke-ScriptWithLogging {
     Write-Host ""
 }
 
+
+$script:startTime = Get-Date
+$scriptName = $MyInvocation.MyCommand.Name
+
+function Write-ElapsedTime {
+    [CmdletBinding()]
+    param(
+        [Parameter(Mandatory = $true)]
+        [string]$Message
+    )
+
+    $elapsedTime = [math]::Round(((Get-Date) - $script:startTime).TotalSeconds, 1)
+    Write-Host "[${scriptName}] ${Message}. Total elapsed time: $elapsedTime seconds."
+    Write-Host ""
+}
+
 function Get-GitHubApiHeaders {
     param(
         [Parameter(Mandatory = $false)]
@@ -265,6 +281,8 @@ else {
     }
 }
 
+Write-ElapsedTime "Spec retrieved"
+
 Push-Location $repoRootPath
 
 try {
@@ -273,10 +291,13 @@ try {
         exit $LASTEXITCODE
     }
 
+    Write-ElapsedTime "npm ci complete"
+
     Invoke-ScriptWithLogging { npm run build -w $codegenFolderPath }
     if ($LASTEXITCODE -ne 0) {
         exit $LASTEXITCODE
     }
+    Write-ElapsedTime "npm run build complete"
 
     Set-Location $specificationFolderPath
     Invoke-ScriptWithLogging { npx tsp compile . --stats --trace @typespec/http-client-csharp }
@@ -285,9 +306,4 @@ finally {
     Pop-Location
 }
 
-$scriptElapsed = $(Get-Date) - $scriptStartTime
-$scriptElapsedSeconds = [math]::Round($scriptElapsed.TotalSeconds, 1)
-$scriptName = $MyInvocation.MyCommand.Name
-
-Write-Host "${scriptName} completed. Time: ${scriptElapsedSeconds}s"
-Write-Host ""
+Write-ElapsedTime "Script completed"

Original file line number	Diff line number	Diff line change
`@@ -1101,4 +1101,4 @@ By default, the client classes will automatically retry the following errors up`
`1101`	`1101`
`1102`	`1102`	`### Observability`
`1103`	`1103`
`1104`		`-OpenAI .NET library supports experimental distributed tracing and metrics with OpenTelemetry. Check out [Observability with OpenTelemetry](./docs/observability.md) for more details.`
	`1104`	`+OpenAI .NET library supports experimental distributed tracing and metrics with OpenTelemetry. Check out [Observability with OpenTelemetry](./docs/Observability.md) for more details.`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`	`2`	`"sdk": {`
`3`		`- "version": "10.*-preview"`
	`3`	`+ "version": "10.-rc"`
`4`	`4`	`}`
`5`	`5`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,9 @@`
`1`	`1`	`// SAMPLE: Generate text from a simple prompt`
`2`		`-// GUIDANCE: Instructions to run this code: https://aka.ms/oai/net/start`
`3`		`-#:package OpenAI@2.2.-`
	`2`	`+// GUIDANCE: Instructions to run this code: https://aka.ms/oai/net/start`
	`3`	`+#:package OpenAI@2.*`
`4`	`4`	`#:property PublishAot=false`
`5`	`5`
`6`		`-using OpenAI.Chat;`
	`6`	`+using OpenAI.Chat;`
`7`	`7`
`8`	`8`	`string key = Environment.GetEnvironmentVariable("OPENAI_API_KEY")!;`
`9`	`9`	`ChatClient client = new("gpt-4.1", key);`
`@@ -15,7 +15,7 @@`
`15`	`15`	`functionParameters: BinaryData.FromObjectAsJson(new`
`16`	`16`	`{`
`17`	`17`	`type = "object",`
`18`		`- properties = new`
	`18`	`+ properties = new`
`19`	`19`	`{`
`20`	`20`	`utc = new`
`21`	`21`	`{`