merge

Author: christothes

.config/dotnet-tools.json

@@ -0,0 +1,13 @@
+{
+  "version": 1,
+  "isRoot": true,
+  "tools": {
+    "Azure.Sdk.Tools.SnippetGenerator": {
+      "version": "1.0.0-dev.20241213.1",
+      "commands": [
+        "snippet-generator"
+      ],
+      "rollForward": false
+    }
+  }
+}

.github/workflows/update-generator.yml

@@ -0,0 +1,76 @@
+name: Update TypeSpec Generator Version
+
+on:
+  schedule:
+    # Run weekly on Mondays at 9 AM UTC
+    - cron: '0 9 * * 1'
+  workflow_dispatch:
+    # Allow manual triggering
+  repository_dispatch:
+    # Allow triggering from TypeSpec repository on new releases
+    types: [typespec-release]
+
+jobs:
+  update-generator:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+      pull-requests: write
+    
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: '22.x'
+          
+      - name: Setup .NET
+        uses: actions/setup-dotnet@v4
+        with:
+          # Automatically read .NET SDK version from global.json to stay in sync
+          global-json-file: global.json
+          
+      - name: Check for generator updates
+        id: check-updates
+        run: |
+          # Get current version from the OpenAI package.json file
+          CURRENT_VERSION=$(node -p "require('./codegen/package.json').dependencies['@typespec/http-client-csharp']" 2>/dev/null || echo "unknown")
+          
+          echo "Current OpenAI version: $CURRENT_VERSION"
+          
+          # Get latest version from npm registry
+          LATEST_VERSION=$(npm view @typespec/http-client-csharp version 2>/dev/null || echo "unknown")
+          echo "Latest version from npm: $LATEST_VERSION"
+          
+          # Validate we got valid versions
+          if [ "$CURRENT_VERSION" = "unknown" ] || [ "$LATEST_VERSION" = "unknown" ]; then
+            echo "Error: Failed to get version information"
+            echo "Current: $CURRENT_VERSION, Latest: $LATEST_VERSION"
+            exit 1
+          fi
+          
+          # Compare versions (simple string comparison for alpha versions)
+          if [ "$CURRENT_VERSION" != "$LATEST_VERSION" ]; then
+            echo "Update needed: $CURRENT_VERSION -> $LATEST_VERSION"
+            echo "needs-update=true" >> $GITHUB_OUTPUT
+            echo "current-version=$CURRENT_VERSION" >> $GITHUB_OUTPUT
+            echo "latest-version=$LATEST_VERSION" >> $GITHUB_OUTPUT
+          else
+            echo "No update needed - already at latest version: $CURRENT_VERSION"
+            echo "needs-update=false" >> $GITHUB_OUTPUT
+          fi
+          
+      - name: Update generator version and create PR
+        if: steps.check-updates.outputs.needs-update == 'true'
+        run: |
+          LATEST_VERSION="${{ steps.check-updates.outputs.latest-version }}"
+          
+          # Use the PowerShell script to handle the entire update process (following TypeSpec pattern)
+          pwsh ./scripts/Submit-GeneratorUpdatePr.ps1 \
+            -PackageVersion "$LATEST_VERSION" \
+            -AuthToken "${{ secrets.GITHUB_TOKEN }}" \
+            -RepoPath "."

README.md

@@ -519,14 +519,19 @@ await foreach (StreamingResponseUpdate update
             },
         }))
 {
-    if (update is StreamingResponseItemUpdate itemUpdate
+    if (update is StreamingResponseOutputItemAddedUpdate itemUpdate
         && itemUpdate.Item is ReasoningResponseItem reasoningItem)
     {
         Console.WriteLine($"[Reasoning] ({reasoningItem.Status})");
     }
-    else if (update is StreamingResponseContentPartDeltaUpdate deltaUpdate)
+    else if (update is StreamingResponseOutputItemAddedUpdate itemDone
+        && itemDone.Item is ReasoningResponseItem reasoningDone)
     {
-        Console.Write(deltaUpdate.Text);
+        Console.WriteLine($"[Reasoning DONE] ({reasoningDone.Status})");
+    }
+    else if (update is StreamingResponseOutputTextDeltaUpdate delta)
+    {
+        Console.Write(delta.Delta);
     }
 }
 ```

api/OpenAI.net8.0.cs

@@ -8,7 +8,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-      <PackageReference Include="Microsoft.TypeSpec.Generator.ClientModel" Version="1.0.0-alpha.20250626.7" />
+      <PackageReference Include="Microsoft.TypeSpec.Generator.ClientModel" Version="1.0.0-alpha.20250827.2" />
     </ItemGroup>
 
   <!-- Copy output to package dist path for local execution and  -->

api/OpenAI.netstandard2.0.cs

@@ -10,14 +10,8 @@ namespace OpenAILibraryPlugin
     [ExportMetadata("GeneratorName", nameof(OpenAILibraryGenerator))]
     public class OpenAILibraryGenerator : ScmCodeModelGenerator
     {
-        private static OpenAILibraryGenerator? s_instance;
-        internal static OpenAILibraryGenerator Instance => s_instance ?? throw new InvalidOperationException("OpenAILibraryGenerator was not initialized.");
-
         [ImportingConstructor]
-        public OpenAILibraryGenerator(GeneratorContext context) : base(context)
-        {
-            s_instance = this;
-        }
+        public OpenAILibraryGenerator(GeneratorContext context) : base(context) { }
 
         protected override void Configure()
         {
@@ -33,7 +27,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());

codegen/generator/src/OpenAI.Library.Plugin.csproj

@@ -17,7 +17,7 @@ public class ContentInnerCollectionDefinedVisitor : ScmLibraryVisitor
 {
     private const string Comment = "Plugin customization: add Content.IsInnerCollectionDefined() check";
 
-    protected override MethodProvider VisitMethod(MethodProvider method)
+    protected override MethodProvider? VisitMethod(MethodProvider method)
     {
         if (method.Signature.Name != "JsonModelWriteCore"
             || method.BodyStatements is not MethodBodyStatements methodBodyStatements)

codegen/generator/src/OpenAILibraryGenerator.cs

@@ -612,7 +612,7 @@ public class ExperimentalAttributeVisitor : ScmLibraryVisitor
             "ComputerCallResponseItem",
             "ComputerCallSafetyCheck",
             "ComputerCallStatus",
-            "ComputerOutput",
+            "ComputerCallOutput",
             "ComputerToolEnvironment",
         };