Fix schema generation for Nullable<T> function parameters. - #6596
#6596Merged
eiriktsarpalis merged 9 commits intoJul 15, 2025
dotnet:maindotnet/extensions:mainfrom
eiriktsarpalis:fix/nullable-parameterseiriktsarpalis/extensions:fix/nullable-parametersCopy head branch name to clipboard
Merged
Fix schema generation for Nullable<T> function parameters.#6596eiriktsarpalis merged 9 commits intodotnet:maindotnet/extensions:mainfrom eiriktsarpalis:fix/nullable-parameterseiriktsarpalis/extensions:fix/nullable-parametersCopy head branch name to clipboard
eiriktsarpalis merged 9 commits into
dotnet:maindotnet/extensions:mainfrom
eiriktsarpalis:fix/nullable-parameterseiriktsarpalis/extensions:fix/nullable-parametersCopy head branch name to clipboard
Conversation
Contributor
There was a problem hiding this comment.
Pull Request Overview
This PR ensures that functions with Nullable<T> parameters generate correct JSON schemas (including null types and defaults) and updates related tests and utilities.
- Added a new test for nullable
int?andDateTime?parameters inAIFunctionFactoryTest. - Refactored
AssertExtensionsto centralize JSON schema/value comparisons. - Extended the schema generator in
AIJsonUtilitiesto includenullin type arrays forNullable<T>and skip uninitialized objects forNullable<T>defaults.
Reviewed Changes
Copilot reviewed 3 out of 3 changed files in this pull request and generated 1 comment.
| File | Description |
|---|---|
| test/Libraries/Microsoft.Extensions.AI.Tests/Functions/AIFunctionFactoryTest.cs | New AIFunctionFactory_NullableParameters test and added JsonSerializable for int?/DateTime?. |
| test/Libraries/Microsoft.Extensions.AI.Abstractions.Tests/AssertExtensions.cs | Introduced EqualJsonValues and updated helper for JSON comparisons. |
| src/Libraries/Microsoft.Extensions.AI.Abstractions/Utilities/AIJsonUtilities.Schema.Create.cs | Updated schema exporter to handle Nullable<T> types and default values correctly. |
Comments suppressed due to low confidence (3)
src/Libraries/Microsoft.Extensions.AI.Abstractions/Utilities/AIJsonUtilities.Schema.Create.cs:292
- There’s logic to handle nullable enum types but no corresponding unit test. Consider adding a test for a
Nullable<YourEnum>parameter to verify enum schemas include["string","null"].
if (Nullable.GetUnderlyingType(ctx.TypeInfo.Type) is Type nullableElement)
test/Libraries/Microsoft.Extensions.AI.Tests/Functions/AIFunctionFactoryTest.cs:861
- [nitpick] This assertion about
StructWithDefaultCtorisn’t related to validating nullable-parameter schemas and may be confusing. Consider removing or moving it to a dedicated test for struct default behavior.
Assert.NotEqual(new StructWithDefaultCtor().Value, default(StructWithDefaultCtor).Value);
src/Libraries/Microsoft.Extensions.AI.Abstractions/Utilities/AIJsonUtilities.Schema.Create.cs:300
- The
typeValuecomes from a non-nullableGetValue<string>()!call, so this null check is redundant and can be removed to simplify the logic.
if (typeValue is not null)
…IJsonUtilities.Schema.Create.cs Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
eiriktsarpalis
commented
Jul 10, 2025
…IJsonUtilities.Schema.Create.cs
stephentoub
reviewed
Jul 14, 2025
…IJsonUtilities.Schema.Create.cs
jeffhandley
approved these changes
Jul 14, 2025
eiriktsarpalis
enabled auto-merge (squash)
July 14, 2025 21:38
Member
Author
|
@jeffhandley we need a second approval from dotnet/dotnet-extensions-fundamentals because this PR is touching "shared" components. |
Member
|
I connected with @rosebyte to request a review from them or someone else on @dotnet/dotnet-extensions-fundamentals. |
evgenyfedorov2
approved these changes
Jul 15, 2025
evgenyfedorov2
left a comment
Member
There was a problem hiding this comment.
Approve for Fundamentals
jeffhandley
pushed a commit
to jeffhandley/extensions
that referenced
this pull request
Jul 15, 2025
* Fix schema generation for Nullable<T> function parameters. * Update src/Libraries/Microsoft.Extensions.AI.Abstractions/Utilities/AIJsonUtilities.Schema.Create.cs Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Update src/Libraries/Microsoft.Extensions.AI.Abstractions/Utilities/AIJsonUtilities.Schema.Create.cs * Incorporate fix from dotnet/runtime#117493. * Update src/Libraries/Microsoft.Extensions.AI.Abstractions/Utilities/AIJsonUtilities.Schema.Create.cs * Extend fix to include AllowReadingFromString. --------- Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
jeffhandley
pushed a commit
that referenced
this pull request
Jul 15, 2025
* Fix schema generation for Nullable<T> function parameters. * Update src/Libraries/Microsoft.Extensions.AI.Abstractions/Utilities/AIJsonUtilities.Schema.Create.cs Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Update src/Libraries/Microsoft.Extensions.AI.Abstractions/Utilities/AIJsonUtilities.Schema.Create.cs * Incorporate fix from dotnet/runtime#117493. * Update src/Libraries/Microsoft.Extensions.AI.Abstractions/Utilities/AIJsonUtilities.Schema.Create.cs * Extend fix to include AllowReadingFromString. --------- Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
This was referenced Aug 13, 2025
Merged
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Addresses modelcontextprotocol/csharp-sdk#601
Microsoft Reviewers: Open in CodeFlow