Fix for 552

Author: BenjaminDavidPinter

.config/dotnet-tools.json

@@ -8,6 +8,13 @@
         "snippet-generator"
       ],
       "rollForward": false
+    },
+    "azure.sdk.tools.testproxy": {
+      "version": "1.0.0-dev.20250922.2",
+      "commands": [
+        "test-proxy"
+      ],
+      "rollForward": false
     }
   }
 }

.github/workflows/codegen-validation.yml

@@ -0,0 +1,67 @@
+# This workflow validates changes made to the codegen folder by running code generation
+# and ensuring the process completes successfully without errors.
+name: CodeGen Validation
+
+on:
+  pull_request:
+    paths:
+      - 'codegen/**'
+      - '.github/workflows/codegen-validation.yml'
+      - 'scripts/Invoke-CodeGen.ps1'
+    types: [opened, reopened, synchronize]
+  workflow_dispatch:
+
+jobs:
+  validate-codegen:
+    name: Validate Code Generation
+    runs-on: ubuntu-latest
+    
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: '22.x'
+          
+      - name: Setup .NET
+        uses: actions/setup-dotnet@v4
+        with:
+          # Use the version specified in global.json
+          global-json-file: global.json
+
+      - name: Run CodeGen Script
+        shell: pwsh
+        run: |
+          Write-Host "Running code generation validation..."
+          ./scripts/Invoke-CodeGen.ps1
+          
+          if ($LASTEXITCODE -ne 0) {
+            Write-Error "Code generation failed with exit code: $LASTEXITCODE"
+            exit $LASTEXITCODE
+          }
+          
+          Write-Host "Code generation completed successfully!"
+          
+      - name: Check for uncommitted changes
+        run: |
+          # Check if there are any changes to tracked files after code generation
+          if ! git diff --quiet; then
+            echo "::error::Code generation produced uncommitted changes. Please run the codegen script locally and commit the results."
+            echo "Changed files:"
+            git diff --name-only
+            echo "Diff details:"
+            git diff
+            exit 1
+          fi
+          
+          # Also check for untracked files that might have been generated
+          if [ -n "$(git ls-files --others --exclude-standard)" ]; then
+            echo "::error::Code generation produced untracked files. Please review and commit them if they should be included."
+            echo "Untracked files:"
+            git ls-files --others --exclude-standard
+            exit 1
+          fi
+          
+          echo "No uncommitted changes detected - code generation is up to date!"

CHANGELOG.md

@@ -1,5 +1,15 @@
 # Release History
 
+## 2.6.0-beta.1 (Unreleased)
+
+### Features Added
+
+- OpenAI.Chat:
+  - Added the `Minimal` property to `ChatReasoningEffortLevel`
+
+- OpenAI.Responses:
+  - Added the `Minimal` property to `ResponseReasoningEffortLevel`
+
 ## 2.5.0 (2025-09-23)
 
 ### Features Added

api/OpenAI.net8.0.cs

@@ -1,14 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
+        <TargetFramework>net9.0</TargetFramework>
         <Nullable>enable</Nullable>
         <RootNamespace>OpenAI.Microsoft.Generator.CSharp.ClientModel.Plugin</RootNamespace>
         <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
     </PropertyGroup>
 
     <ItemGroup>
-      <PackageReference Include="Microsoft.TypeSpec.Generator.ClientModel" Version="1.0.0-alpha.20250915.1" />
+      <PackageReference Include="Microsoft.TypeSpec.Generator.ClientModel" Version="1.0.0-alpha.20251001.2" />
     </ItemGroup>
 
   <!-- Copy output to package dist path for local execution and  -->
@@ -22,5 +22,3 @@
   </Target>
 
 </Project>
-
-

api/OpenAI.netstandard2.0.cs

@@ -1,4 +1,3 @@
-using System;
 using System.ComponentModel.Composition;
 using Microsoft.TypeSpec.Generator;
 using Microsoft.TypeSpec.Generator.ClientModel;
@@ -16,11 +15,12 @@ public OpenAILibraryGenerator(GeneratorContext context) : base(context) { }
         protected override void Configure()
         {
             base.Configure();
+            // This should be first, as it recomputes the type
+            AddVisitor(new NonAbstractPublicTypesVisitor());
             AddVisitor(new ConstructorFixupVisitor());
             AddVisitor(new KindRenameVisitor());
             AddVisitor(new VisibilityVisitor());
             AddVisitor(new ContentInnerCollectionDefinedVisitor());
-            AddVisitor(new NonAbstractPublicTypesVisitor());
             AddVisitor(new PageOrderRemovalVisitor(this));
             AddVisitor(new OmittedTypesVisitor());
             AddVisitor(new InvariantFormatAdditionalPropertiesVisitor());

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

@@ -49,10 +49,10 @@ public class OpenAILibraryVisitor : ScmLibraryVisitor
 
     protected override TypeProvider VisitType(TypeProvider type)
     {
-        if (type is ModelProvider { BaseModelProvider: null } && type.Fields.Count > 0)
+        var additionalPropertiesField = type.Fields.FirstOrDefault(f => f.Name == AdditionalPropertiesFieldName);
+        if (type is ModelProvider { BaseModelProvider: null } && additionalPropertiesField != null)
         {
             // Add an internal AdditionalProperties property to all base models
-            var additionalPropertiesField = type.Fields.Single(f => f.Name == AdditionalPropertiesFieldName);
             var properties = new List<PropertyProvider>(type.Properties)
             {
                 new PropertyProvider($"", MethodSignatureModifiers.Internal,

codegen/generator/src/OpenAILibraryGenerator.cs

@@ -618,6 +618,12 @@ public class ExperimentalAttributeVisitor : ScmLibraryVisitor
 
         protected override PropertyProvider? VisitProperty(PropertyProvider property)
         {
+            // Skip properties that are already marked as experimental
+            if (property.Attributes.Any(attr => attr.Type.Equals(typeof(ExperimentalAttribute))))
+            {
+                return base.VisitProperty(property);
+            }
+
             // Skip properties that are not public or are in non-stable classes
             if ((!property.Modifiers.HasFlag(MethodSignatureModifiers.Public) &&
                     !property.Modifiers.HasFlag(MethodSignatureModifiers.Protected)) ||

codegen/generator/src/OpenAILibraryVisitor.cs

@@ -1,7 +1,6 @@
 using Microsoft.TypeSpec.Generator.ClientModel;
 using Microsoft.TypeSpec.Generator.Primitives;
 using Microsoft.TypeSpec.Generator.Providers;
-using System.Reflection;
 
 namespace OpenAILibraryPlugin.Visitors;
 
@@ -17,16 +16,22 @@ protected override TypeProvider VisitType(TypeProvider type)
             && type.DeclarationModifiers.HasFlag(TypeSignatureModifiers.Abstract)
             && type.CustomCodeView?.DeclarationModifiers.HasFlag(TypeSignatureModifiers.Abstract) == false)
         {
+            var serializationProviders = type.SerializationProviders;
+
+            // ensure we build the serialization attributes before we change the modifiers
+            foreach (var serialization in serializationProviders)
+            {
+                _ = serialization.Attributes;
+            }
+
             // Keep types defined in custom code without 'abstract' non-abstract
+            type.Update(modifiers: type.DeclarationModifiers & ~TypeSignatureModifiers.Abstract);
 
-            // To do: replace with this line when dependencies updated to include modifier support
-            // type.Update(modifiers: type.DeclarationModifiers & ~TypeSignatureModifiers.Abstract);
-            // To do: remove this reflection-based workaround for the above:
-            FieldInfo privateModifiersInfo = typeof(TypeProvider)
-                .GetField("_declarationModifiers", BindingFlags.Instance | BindingFlags.NonPublic)!;
-            TypeSignatureModifiers privateValue = (TypeSignatureModifiers)privateModifiersInfo.GetValue(type)!;
-            privateValue &= ~TypeSignatureModifiers.Abstract;
-            privateModifiersInfo.SetValue(type, privateValue);
+            // reset the serialization to pick up the new modifiers while keeping any serialization attributes
+            foreach (var serialization in serializationProviders)
+            {
+                serialization.Update(attributes: serialization.Attributes, reset: true);
+            }
         }
         return type;
     }