Merge pull request #719 from betalgo/dev

9.0.4

Author: kayhantolga

.github/workflows/codeql-analysis.yml

@@ -1,75 +1,61 @@
-# For most projects, this workflow file will not need changing; you simply need
-# to commit it to your repository.
-#
-# You may wish to alter this file to override the set of languages analyzed,
-# or to provide custom queries or build logic.
-#
-# ******** NOTE ********
-# We have attempted to detect the languages in your repository. Please check
-# the `language` matrix defined below to confirm you have the correct set of
-# supported CodeQL languages.
-#
-name: "CodeQL"
+name: "CodeQL Auto Language"
 
 on:
   push:
-    branches: [ master ]
+    branches: [ master  ]
   pull_request:
-    # The branches below must be a subset of the branches above
-    branches: [ master ]
+    branches: [ master  ]
   schedule:
-    - cron: '34 21 * * 2'
+    - cron: '17 19 * * 6'
 
 jobs:
+  create-matrix:
+    runs-on: ubuntu-latest
+    outputs:
+      matrix: ${{ steps.set-matrix.outputs.languages }}
+    steps:
+      - name: Get languages from repo
+        id: set-matrix
+        uses: advanced-security/set-codeql-language-matrix@v1
+        with:
+          access-token: ${{ secrets.GITHUB_TOKEN }}
+          endpoint: ${{ github.event.repository.languages_url }}
+          
   analyze:
+    needs: create-matrix
+    if: ${{ needs.create-matrix.outputs.matrix != '[]' }}
     name: Analyze
-    runs-on: windows-latest
+    runs-on: ubuntu-latest
     permissions:
       actions: read
       contents: read
       security-events: write
 
     strategy:
       fail-fast: false
-      matrix:
-        language: [ 'csharp' ]
-        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
-        # Learn more about CodeQL language support at https://git.io/codeql-language-support
+      matrix: 
+        language: ${{ fromJSON(needs.create-matrix.outputs.matrix) }}
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v2
+      uses: github/codeql-action/init@v3
       with:
         languages: ${{ matrix.language }}
-        # If you wish to specify custom queries, you can do so here or in a config file.
-        # By default, queries listed here will override any specified in a config file.
-        # Prefix the list here with "+" to use these queries and those in the config file.
-        # queries: ./path/to/local/query, your-org/your-repo/queries@main
-
+        
     - name: Set up dotnet
       uses: actions/setup-dotnet@v1
       with:
         dotnet-version: '9.0.*'
-
+    
     # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
-    # If this step fails, then you should remove it and run the build manually (see below)
     - name: Autobuild
-      uses: github/codeql-action/autobuild@v2
-
-    # ℹ️ Command-line programs to run using the OS shell.
-    # 📚 https://git.io/JvXDl
-
-    # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
-    #    and modify them (or add more) to build your code if your project
-    #    uses a compiled language
-
-    #- run: |
-    #   make bootstrap
-    #   make release
+      uses: github/codeql-action/autobuild@v3
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v2
+      uses: github/codeql-action/analyze@v3
+      with:
+        category: "/language:${{matrix.language}}"

OpenAI.SDK/Betalgo.Ranul.OpenAI.csproj

@@ -10,7 +10,7 @@
 		<PackageIcon>Betalgo-Ranul-OpenAI-icon.png</PackageIcon>
 		<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
 		<Title>OpenAI SDK by Betalgo</Title>
-		<Version>9.0.3</Version>
+		<Version>9.0.4</Version>
 		<Authors>Tolga Kayhan, Betalgo</Authors>
 		<Company>Betalgo Up Ltd.</Company>
 		<Product>OpenAI .NET library by Betalgo Ranul</Product>
@@ -70,7 +70,7 @@
 		<PackageReference Include="System.Net.Http.Json" Version="9.0.0" />
 	</ItemGroup>
 	<ItemGroup>
-		<PackageReference Include="Microsoft.Extensions.AI.Abstractions" Version="9.4.0-preview.1.25207.5" />
+		<PackageReference Include="Microsoft.Extensions.AI.Abstractions" Version="9.5.0" />
 		<PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
 	</ItemGroup>
 </Project>

OpenAI.SDK/Managers/OpenAIChatClient.cs

@@ -11,6 +11,14 @@ namespace Betalgo.Ranul.OpenAI.Managers;
 
 public partial class OpenAIService : IChatClient
 {
+    private static readonly AIJsonSchemaTransformCache s_schemaTransformCache = new(new()
+    {
+        // https://platform.openai.com/docs/guides/structured-outputs?api-mode=responses#supported-schemas
+        DisallowAdditionalProperties = true,
+        RequireAllProperties = true,
+        MoveDefaultKeywordToDescription = true,
+    });
+
     private ChatClientMetadata? _chatMetadata;
 
     /// <inheritdoc />
@@ -43,7 +51,8 @@ async Task<ChatResponse> IChatClient.GetResponseAsync(IEnumerable<ChatMessage> m
             {
                 Role = new(choice.Message.Role),
                 AuthorName = choice.Message.Name,
-                RawRepresentation = choice
+                RawRepresentation = choice,
+                MessageId = response.Id
             };
 
             PopulateContents(choice.Message, m.Contents);
@@ -91,6 +100,7 @@ async IAsyncEnumerable<ChatResponseUpdate> IChatClient.GetStreamingResponseAsync
                     ModelId = response.Model,
                     RawRepresentation = response,
                     ResponseId = response.Id,
+                    MessageId = response.Id,
                     Role = choice.Delta.Role is not null ? new(choice.Delta.Role) : null
                 };
 
@@ -118,6 +128,7 @@ async IAsyncEnumerable<ChatResponseUpdate> IChatClient.GetStreamingResponseAsync
                         FinishReason = choice.FinishReason is not null ? new(choice.FinishReason) : null,
                         ModelId = response.Model,
                         ResponseId = response.Id,
+                        MessageId = response.Id,
                         Role = choice.Delta.Role is not null ? new(choice.Delta.Role) : null
                     };
                 }
@@ -150,12 +161,12 @@ private ChatCompletionCreateRequest CreateRequest(IEnumerable<ChatMessage> chatM
             request.PresencePenalty = options.PresencePenalty;
             request.Seed = (int?)options.Seed;
             request.StopAsList = options.StopSequences;
+            request.ParallelToolCalls = options.AllowMultipleToolCalls;
 
             // Non-strongly-typed properties from additional properties
             request.LogitBias = options.AdditionalProperties?.TryGetValue(nameof(request.LogitBias), out var logitBias) is true ? logitBias : null;
             request.LogProbs = options.AdditionalProperties?.TryGetValue(nameof(request.LogProbs), out bool logProbs) is true ? logProbs : null;
             request.N = options.AdditionalProperties?.TryGetValue(nameof(request.N), out int n) is true ? n : null;
-            request.ParallelToolCalls = options.AdditionalProperties?.TryGetValue(nameof(request.ParallelToolCalls), out bool parallelToolCalls) is true ? parallelToolCalls : null;
             request.ServiceTier = options.AdditionalProperties?.TryGetValue(nameof(request.ServiceTier), out string? serviceTier) is true ? serviceTier : null!;
             request.User = options.AdditionalProperties?.TryGetValue(nameof(request.User), out string? user) is true ? user : null!;
             request.TopLogprobs = options.AdditionalProperties?.TryGetValue(nameof(request.TopLogprobs), out int topLogprobs) is true ? topLogprobs : null;
@@ -309,7 +320,8 @@ private ChatCompletionCreateRequest CreateRequest(IEnumerable<ChatMessage> chatM
 
     private static PropertyDefinition CreateParameters(AIFunction f)
     {
-        return JsonSerializer.Deserialize<PropertyDefinition>(f.JsonSchema) ?? new();
+        JsonElement openAISchema = s_schemaTransformCache.GetOrCreateTransformedSchema(f);
+        return JsonSerializer.Deserialize<PropertyDefinition>(openAISchema) ?? new();
     }
 
     private static void PopulateContents(ObjectModels.RequestModels.ChatMessage source, IList<AIContent> destination)

Readme.md

@@ -117,6 +117,9 @@ Due to time constraints, not all methods have been thoroughly tested or fully do
 Needless to say, I cannot accept responsibility for any damage caused by using the library.
 
 ## Changelog
+### 9.0.4
+- Updated `Microsoft.Extensions.AI` to version `9.5.0`  
+
 ### 9.0.3
 - Updated `Microsoft.Extensions.AI` to version `9.4.0-preview.1.25207.5`  
 - Added new models to the model list