Skip to content

Make CreateJsonSchema tolerate JSO inputs that don't have a resolver set. #6348

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 29, 2025
Merged

Make CreateJsonSchema tolerate JSO inputs that don't have a resolver set. #6348

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/Libraries/Microsoft.Extensions.AI.Abstractions/Utilities/AIJsonUtilities.Schema.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,6 +186,7 @@ private static JsonNode CreateJsonSchemaCore(
JsonSerializerOptions serializerOptions,
AIJsonSchemaCreateOptions inferenceOptions)
{
serializerOptions.TypeInfoResolver ??= DefaultOptions.TypeInfoResolver;
serializerOptions.MakeReadOnly();

if (type is null)
Expand Down
14 changes: 14 additions & 0 deletions test/Libraries/Microsoft.Extensions.AI.Abstractions.Tests/Utilities/AIJsonUtilitiesTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -443,6 +443,20 @@ public static void CreateJsonSchema_ValidateWithTestData(ITestData testData)
SchemaTestHelpers.AssertDocumentMatchesSchema(schemaAsNode, serializedValue);
}

[Fact]
public static void CreateJsonSchema_AcceptsOptionsWithoutResolver()
{
JsonSerializerOptions options = new() { WriteIndented = true };
Assert.Null(options.TypeInfoResolver);
Assert.False(options.IsReadOnly);

JsonElement schema = AIJsonUtilities.CreateJsonSchema(typeof(AIContent), serializerOptions: options);
Assert.Equal(JsonValueKind.Object, schema.ValueKind);

Assert.True(options.IsReadOnly);
Assert.Same(options.TypeInfoResolver, AIJsonUtilities.DefaultOptions.TypeInfoResolver);
}

[Fact]
public static void AddAIContentType_DerivedAIContent()
{
Expand Down
Loading