OpenAI: investigation for StreamingClientResult<T>

.dotnet/CONTRIBUTING.md

@@ -0,0 +1,16 @@
+# CONTRIBUTING
+
+## How to run code generation
+
+1. Run the following command to install the necessary tools:
+    `npm install`
+1. Regenerate the OpenAPI spec by running the following command:
+    `npx tsp compile .\openai-in-typespec\main.tsp --emit @typespec/openapi3`
+1. Regenerate the library by running the following command:
+    `npx tsp compile .\openai-in-typespec\main.tsp --emit @azure-tools/typespec-csharp --option @azure-tools/typespec-csharp.emitter-output-dir=.\openai-in-typespec\.dotnet`
+1. Run the following script:
+    `.\openai-in-typespec\.dotnet\scripts\Update-ClientModel.ps1`
+1. Run the following script:
+    `.\openai-in-typespec\.dotnet\scripts\ConvertTo-Internal.ps1`
+1. Run the following script:
+    `.\openai-in-typespec\.dotnet\scripts\Add-Customizations.ps1`

.dotnet/OpenAI.sln

@@ -0,0 +1,36 @@
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 17
+VisualStudioVersion = 17.9.34701.34
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenAI", "src\OpenAI.csproj", "{28FF4005-4467-4E36-92E7-DEA27DEB1519}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenAI.Tests", "tests\OpenAI.Tests.csproj", "{1F1CD1D4-9932-4B73-99D8-C252A67D4B46}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.ClientModel", "..\..\azure-sdk-for-net\sdk\core\System.ClientModel\src\System.ClientModel.csproj", "{297DA5FF-1CD7-4183-8C13-45987286D33F}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.Build.0 = Release|Any CPU
+		{297DA5FF-1CD7-4183-8C13-45987286D33F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{297DA5FF-1CD7-4183-8C13-45987286D33F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{297DA5FF-1CD7-4183-8C13-45987286D33F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{297DA5FF-1CD7-4183-8C13-45987286D33F}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {A97F4B90-2591-4689-B1F8-5F21FE6D6CAE}
+	EndGlobalSection
+EndGlobal

.dotnet/nuget.config

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <packageSources>
+    <!--To inherit the global NuGet package sources remove the <clear/> line below -->
+    <clear />
+    <add key="nuget" value="https://api.nuget.org/v3/index.json" />
+    <add key="DevelopmentFeed" value="https://pkgs.dev.azure.com/azure-sdk/public/_packaging/azure-sdk-for-net/nuget/v3/index.json" />
+  </packageSources>
+</configuration>

.dotnet/scripts/Add-Customizations.ps1

@@ -0,0 +1,62 @@
+function Update-SystemTextJsonPackage {
+    $current = Get-Location
+    $root = Split-Path $PSScriptRoot -Parent
+
+    # Update System.Text.Json package to 8.0.2 in OpenAI.csproj
+    $directory = Join-Path -Path $root -ChildPath "src"
+    Set-Location -Path $directory
+    dotnet remove "OpenAI.csproj" package "System.Text.Json"
+    dotnet add "OpenAI.csproj" package "System.Text.Json" --version "8.0.2"
+
+    Set-Location -Path $current
+}
+
+function Update-MicrosoftBclAsyncInterfacesPackage {
+    $current = Get-Location
+    $root = Split-Path $PSScriptRoot -Parent
+
+    # Update Microsoft.Bcl.AsyncInterfaces package to 8.0.0 in OpenAI.Tests.csproj
+    $directory = Join-Path -Path $root -ChildPath "tests"
+    Set-Location -Path $directory
+    dotnet remove "OpenAI.Tests.csproj" package "Microsoft.Bcl.AsyncInterfaces"
+    dotnet add "OpenAI.Tests.csproj" package "Microsoft.Bcl.AsyncInterfaces" --version "8.0.0"
+
+    Set-Location -Path $current
+}
+
+function Set-LangVersionToLatest {
+    $root = Split-Path $PSScriptRoot -Parent
+    $filePath = Join-Path -Path $root -ChildPath "tests\OpenAI.Tests.csproj"
+    $xml = [xml](Get-Content -Path $filePath)
+
+    $xml.Project.PropertyGroup.TargetFramework = "net8.0"
+
+    $element = $xml.CreateElement("LangVersion")
+    $element.InnerText = "latest"
+    $xml.Project.PropertyGroup.AppendChild($element) | Out-Null
+
+    $xml.Save($filePath)
+}
+
+function Edit-RunObjectSerialization {
+    $root = Split-Path $PSScriptRoot -Parent
+    $directory = Join-Path -Path $root -ChildPath "src\Generated\Models"
+
+    $file = Get-ChildItem -Path $directory -Filter "RunObject.Serialization.cs"
+    $content = Get-Content -Path $file -Raw
+
+    Write-Output "Editing $($file.FullName)"
+
+    $content = $content -creplace "expiresAt = property\.Value\.GetDateTimeOffset\(`"O`"\);", "// BUG: https://github.com/Azure/autorest.csharp/issues/4296`r`n                    // expiresAt = property.Value.GetDateTimeOffset(`"O`");`r`n                    expiresAt = DateTimeOffset.FromUnixTimeSeconds(property.Value.GetInt64());"
+    $content = $content -creplace "startedAt = property\.Value\.GetDateTimeOffset\(`"O`"\);", "// BUG: https://github.com/Azure/autorest.csharp/issues/4296`r`n                    // startedAt = property.Value.GetDateTimeOffset(`"O`");`r`n                    startedAt = DateTimeOffset.FromUnixTimeSeconds(property.Value.GetInt64());"
+    $content = $content -creplace "cancelledAt = property\.Value\.GetDateTimeOffset\(`"O`"\);", "// BUG: https://github.com/Azure/autorest.csharp/issues/4296`r`n                    // cancelledAt = property.Value.GetDateTimeOffset(`"O`");`r`n                    cancelledAt = DateTimeOffset.FromUnixTimeSeconds(property.Value.GetInt64());"
+    $content = $content -creplace "failedAt = property\.Value\.GetDateTimeOffset\(`"O`"\);", "// BUG: https://github.com/Azure/autorest.csharp/issues/4296`r`n                    // failedAt = property.Value.GetDateTimeOffset(`"O`");`r`n                    failedAt = DateTimeOffset.FromUnixTimeSeconds(property.Value.GetInt64());"
+    $content = $content -creplace "completedAt = property\.Value\.GetDateTimeOffset\(`"O`"\);", "// BUG: https://github.com/Azure/autorest.csharp/issues/4296`r`n                    // completedAt = property.Value.GetDateTimeOffset(`"O`");`r`n                    completedAt = DateTimeOffset.FromUnixTimeSeconds(property.Value.GetInt64());"
+
+    $content | Set-Content -Path $file.FullName -NoNewline
+}
+
+Update-SystemTextJsonPackage
+Update-MicrosoftBclAsyncInterfacesPackage
+Set-LangVersionToLatest
+Edit-RunObjectSerialization

.dotnet/scripts/ConvertTo-Internal.ps1

@@ -0,0 +1,75 @@
+function Edit-GeneratedOpenAIClient {
+    $root = Split-Path $PSScriptRoot -Parent
+
+    $directory = Join-Path -Path $root -ChildPath "src\Generated"
+    $file = Get-ChildItem -Path $directory -Filter "OpenAIClient.cs"
+
+    $content = Get-Content -Path $file -Raw
+
+    Write-Output "Editing $($file.FullName)"
+
+    $content = $content -creplace "public partial class", "internal partial class"
+    $content = $content -creplace "public readonly partial struct", "internal readonly partial struct"
+    $content = $content -creplace "public static partial class", "internal static partial class"
+    $content = $content -creplace "namespace OpenAI", "namespace OpenAI.Internal"
+    $content = $content -creplace "using OpenAI.Models;", "using OpenAI.Internal.Models;"
+    $content = $content -creplace "private (OpenAI.)?(?<var>\w+) _cached(\w+);", "private OpenAI.Internal.`${var} _cached`${var};"
+    $content = $content -creplace "public virtual (OpenAI.)?(?<var>\w+) Get(\w+)Client", "public virtual OpenAI.Internal.`${var} Get`${var}Client"
+    $content = $content -creplace "ref _cached(\w+), new (OpenAI.)?(?<var>\w+)", "ref _cached`${var}, new OpenAI.Internal.`${var}"
+
+    $content | Set-Content -Path $file.FullName -NoNewline
+}
+
+function Edit-GeneratedSubclients {
+    $root = Split-Path $PSScriptRoot -Parent
+
+    $directory = Join-Path -Path $root -ChildPath "src\Generated"
+    $files = Get-ChildItem -Path $($directory + "\*") -Include "*.cs" -Exclude "OpenAIClient.cs"
+
+    foreach ($file in $files) {
+        $content = Get-Content -Path $file -Raw
+
+        Write-Output "Editing $($file.FullName)"
+
+        $content = $content -creplace "public partial class", "internal partial class"
+        $content = $content -creplace "public readonly partial struct", "internal readonly partial struct"
+        $content = $content -creplace "public static partial class", "internal static partial class"
+        $content = $content -creplace "namespace OpenAI", "namespace OpenAI.Internal"
+        $content = $content -creplace "using OpenAI.Models;", "using OpenAI.Internal.Models;"
+
+        $content | Set-Content -Path $file.FullName -NoNewline
+    }
+}
+
+function Edit-GeneratedModels {
+    $root = Split-Path $PSScriptRoot -Parent
+
+    $directory = Join-Path -Path $root -ChildPath "src\Generated\Models"
+    $files = Get-ChildItem -Path $($directory + "\*") -Include "*.cs"
+
+    foreach ($file in $files) {
+        $content = Get-Content -Path $file -Raw
+
+        Write-Output "Editing $($file.FullName)"
+
+        $content = $content -creplace "public partial class", "internal partial class"
+        $content = $content -creplace "public readonly partial struct", "internal readonly partial struct"
+        $content = $content -creplace "public static partial class", "internal static partial class"
+        $content = $content -creplace "namespace OpenAI", "namespace OpenAI.Internal"
+        $content = $content -creplace "using OpenAI.Models;", "using OpenAI.Internal.Models;"
+
+        $content | Set-Content -Path $file.FullName -NoNewline
+    }
+}
+
+function Remove-GeneratedTests {
+    $root = Split-Path $PSScriptRoot -Parent
+
+    $directory = Join-Path -Path $root -ChildPath "tests\Generated"
+    Remove-Item -LiteralPath $directory -Recurse -Force
+}
+
+Edit-GeneratedOpenAIClient
+Edit-GeneratedSubclients
+Edit-GeneratedModels
+Remove-GeneratedTests

.dotnet/scripts/Update-Client.ps1

@@ -0,0 +1,21 @@
+$repoRoot = Join-Path $PSScriptRoot .. .. -Resolve
+$dotnetFolder = Join-Path $repoRoot .dotnet
+
+function Invoke([scriptblock]$script) {
+  $scriptString = $script | Out-String
+  Write-Host "--------------------------------------------------------------------------------`n> $scriptString"
+  & $script
+}
+
+Push-Location $repoRoot
+try {
+  Invoke { npm ci }
+  Invoke { npm exec --no -- tsp compile main.tsp --emit @typespec/openapi3 }
+  Invoke { npm exec --no -- tsp compile main.tsp --emit @azure-tools/typespec-csharp --option @azure-tools/typespec-csharp.emitter-output-dir="$dotnetFolder" }
+  Invoke { .dotnet\scripts\Update-ClientModel.ps1 }
+  Invoke { .dotnet\scripts\ConvertTo-Internal.ps1 }
+  Invoke { .dotnet\scripts\Add-Customizations.ps1 }
+}
+finally {
+  Pop-Location
+}