Replace JsonSchema.Net with NJsonSchema

Libraries/Microsoft.Teams.AI.Models.OpenAI/Extensions/ChatTool.cs

@@ -1,10 +1,6 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-using System.Text.Json;
-
-using Json.Schema;
-
 using OpenAI.Chat;
 
 namespace Microsoft.Teams.AI.Models.OpenAI;
@@ -18,7 +14,7 @@ public static IFunction ToTeams(this ChatTool tool)
         return new Function(
             tool.FunctionName,
             tool.FunctionDescription,
-            JsonSchema.FromText(parameters == string.Empty ? "{}" : parameters),
+            JsonSchemaWrapper.FromJson(parameters == string.Empty ? "{}" : parameters),
             () => Task.FromResult<object?>(null)
         );
     }
@@ -28,7 +24,7 @@ public static ChatTool ToOpenAI(this IFunction function)
         return ChatTool.CreateFunctionTool(
             function.Name,
             function.Description,
-            function.Parameters is null ? null : BinaryData.FromString(JsonSerializer.Serialize(function.Parameters)),
+            function.Parameters is null ? null : BinaryData.FromString(function.Parameters.ToJson()),
             false
         );
     }

Libraries/Microsoft.Teams.AI/Function.cs

@@ -3,12 +3,8 @@
 
 using System.Reflection;
 using System.Text.Json;
-using System.Text.Json.Nodes;
 using System.Text.Json.Serialization;
 
-using Json.Schema;
-using Json.Schema.Generation;
-
 using Microsoft.Teams.AI.Annotations;
 using Microsoft.Teams.AI.Messages;
 using Microsoft.Teams.Common.Extensions;
@@ -38,7 +34,7 @@ public interface IFunction
     /// the Json Schema representing what
     /// parameters the function accepts
     /// </summary>
-    public JsonSchema? Parameters { get; }
+    public IJsonSchema? Parameters { get; }
 }
 
 /// <summary>
@@ -57,7 +53,7 @@ public class Function : IFunction
 
     [JsonPropertyName("parameters")]
     [JsonPropertyOrder(2)]
-    public JsonSchema? Parameters { get; set; }
+    public IJsonSchema? Parameters { get; set; }
 
     [JsonIgnore]
     public Delegate Handler { get; set; }
@@ -70,7 +66,7 @@ public Function(string name, string? description, Delegate handler)
         Parameters = GenerateParametersSchema(handler);
     }
 
-    public Function(string name, string? description, JsonSchema parameters, Delegate handler)
+    public Function(string name, string? description, IJsonSchema parameters, Delegate handler)
     {
         Name = name;
         Description = description;
@@ -82,13 +78,13 @@ public Function(string name, string? description, JsonSchema parameters, Delegat
     {
         if (call.Arguments is not null && Parameters is not null)
         {
-            var valid = Parameters.Evaluate(JsonNode.Parse(call.Arguments), new() { EvaluateAs = SpecVersion.DraftNext });
+            var result = Parameters.Validate(call.Arguments);
 
-            if (!valid.IsValid)
+            if (!result.IsValid)
             {
-                Console.WriteLine(JsonSerializer.Serialize(valid));
+                Console.WriteLine(string.Join("\n", result.Errors.Select(e => $"{e.Path} => {e.Message}")));
                 throw new ArgumentException(
-                    string.Join("\n", valid.Errors?.Select(e => $"{e.Key} => {e.Value}") ?? [])
+                    string.Join("\n", result.Errors.Select(e => $"{e.Path} => {e.Message}"))
                 );
             }
         }
@@ -128,7 +124,7 @@ public override string ToString()
     /// <summary>
     /// Generates a JsonSchema for the parameters of a delegate handler using reflection
     /// </summary>
-    private static JsonSchema? GenerateParametersSchema(Delegate handler)
+    private static IJsonSchema? GenerateParametersSchema(Delegate handler)
     {
         var method = handler.GetMethodInfo();
         var methodParams = method.GetParameters();
@@ -141,15 +137,11 @@ public override string ToString()
         var parameters = methodParams.Select(p =>
         {
             var paramName = p.GetCustomAttribute<ParamAttribute>()?.Name ?? p.Name ?? p.Position.ToString();
-            var schema = new JsonSchemaBuilder().FromType(p.ParameterType).Build();
+            var schema = JsonSchemaWrapper.FromType(p.ParameterType);
             var required = !p.IsOptional;
             return (paramName, schema, required);
-        });
+        }).ToArray();
 
-        return new JsonSchemaBuilder()
-            .Type(SchemaValueType.Object)
-            .Properties(parameters.Select(item => (item.paramName, item.schema)).ToArray())
-            .Required(parameters.Where(item => item.required).Select(item => item.paramName))
-            .Build();
+        return JsonSchemaWrapper.CreateObjectSchema(parameters);
     }
 }

Libraries/Microsoft.Teams.AI/Microsoft.Teams.AI.csproj

@@ -21,8 +21,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="JsonSchema.Net" Version="7.3.4" />
-    <PackageReference Include="JsonSchema.Net.Generation" Version="5.0.0" />
+    <PackageReference Include="Humanizer.Core" Version="2.14.1" />
+    <PackageReference Include="NJsonSchema" Version="11.1.0" />
   </ItemGroup>
 
 </Project>

Libraries/Microsoft.Teams.AI/Prompts/ChatPrompt/ChatPrompt.Chain.cs

@@ -1,8 +1,6 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-using Json.Schema;
-
 namespace Microsoft.Teams.AI.Prompts;
 
 public partial class ChatPrompt<TOptions>
@@ -17,8 +15,8 @@ public ChatPrompt<TOptions> Chain(IChatPrompt<TOptions> prompt)
         Functions.Add(new Function(
             prompt.Name,
             prompt.Description,
-            new JsonSchemaBuilder().Properties(
-                ("text", new JsonSchemaBuilder().Type(SchemaValueType.String).Description("text to send"))
+            JsonSchemaWrapper.CreateObjectSchema(
+                ("text", JsonSchemaWrapper.String("text to send"), true)
             ),
             async (string text) =>
             {

Libraries/Microsoft.Teams.AI/Prompts/ChatPrompt/ChatPrompt.Functions.cs

@@ -3,8 +3,6 @@
 
 using Humanizer;
 
-using Json.Schema;
-
 using Microsoft.Teams.AI.Messages;
 
 namespace Microsoft.Teams.AI.Prompts;
@@ -26,7 +24,7 @@ public ChatPrompt<TOptions> Function(string name, string? description, Delegate
         return this;
     }
 
-    public ChatPrompt<TOptions> Function(string name, string? description, JsonSchema parameters, Delegate handler)
+    public ChatPrompt<TOptions> Function(string name, string? description, IJsonSchema parameters, Delegate handler)
     {
         var func = new Function(name, description, parameters, handler);
         Functions.Add(func);

Libraries/Microsoft.Teams.AI/Schema/IJsonSchema.cs

@@ -0,0 +1,43 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+namespace Microsoft.Teams.AI;
+
+/// <summary>
+/// Abstraction for JSON schema validation, decoupling from specific schema library implementations.
+/// </summary>
+public interface IJsonSchema
+{
+    /// <summary>
+    /// Validates a JSON string against this schema.
+    /// </summary>
+    JsonSchemaValidationResult Validate(string json);
+
+    /// <summary>
+    /// Serializes this schema to a JSON string.
+    /// </summary>
+    string ToJson();
+}
+
+/// <summary>
+/// Result of validating JSON against a schema.
+/// </summary>
+public class JsonSchemaValidationResult
+{
+    /// <summary>
+    /// Whether the JSON is valid against the schema.
+    /// </summary>
+    public bool IsValid { get; init; }
+
+    /// <summary>
+    /// List of validation errors, if any.
+    /// </summary>
+    public IReadOnlyList<JsonSchemaValidationError> Errors { get; init; } = [];
+}
+
+/// <summary>
+/// Represents a validation error from schema validation.
+/// </summary>
+/// <param name="Path">The JSON path where the error occurred.</param>
+/// <param name="Message">The error message.</param>
+public record JsonSchemaValidationError(string Path, string Message);

Libraries/Microsoft.Teams.AI/Schema/JsonSchemaWrapper.cs

@@ -0,0 +1,89 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+using NJsonSchema;
+
+namespace Microsoft.Teams.AI;
+
+/// <summary>
+/// NJsonSchema-based implementation of IJsonSchema.
+/// </summary>
+public class JsonSchemaWrapper : IJsonSchema
+{
+    private readonly JsonSchema _schema;
+
+    private JsonSchemaWrapper(JsonSchema schema) => _schema = schema;
+
+    /// <summary>
+    /// Creates a schema from a .NET type using reflection.
+    /// </summary>
+    public static IJsonSchema FromType(Type type)
+    {
+        var schema = JsonSchema.FromType(type);
+        return new JsonSchemaWrapper(schema);
+    }
+
+    /// <summary>
+    /// Creates a schema from a JSON schema string.
+    /// </summary>
+    public static IJsonSchema FromJson(string json)
+    {
+        var schema = JsonSchema.FromJsonAsync(json).GetAwaiter().GetResult();
+        return new JsonSchemaWrapper(schema);
+    }
+
+    /// <summary>
+    /// Creates an object schema with the specified properties.
+    /// </summary>
+    public static IJsonSchema CreateObjectSchema(params (string name, IJsonSchema schema, bool required)[] properties)
+    {
+        var resultSchema = new JsonSchema { Type = JsonObjectType.Object };
+
+        foreach (var (name, propSchema, required) in properties)
+        {
+            if (propSchema is JsonSchemaWrapper wrapper)
+            {
+                var property = new JsonSchemaProperty
+                {
+                    Type = wrapper._schema.Type,
+                    Description = wrapper._schema.Description
+                };
+                resultSchema.Properties.Add(name, property);
+            }
+
+            if (required)
+            {
+                resultSchema.RequiredProperties.Add(name);
+            }
+        }
+
+        return new JsonSchemaWrapper(resultSchema);
+    }
+
+    /// <summary>
+    /// Creates a string schema.
+    /// </summary>
+    public static IJsonSchema String(string? description = null)
+    {
+        var schema = new JsonSchema
+        {
+            Type = JsonObjectType.String,
+            Description = description
+        };
+        return new JsonSchemaWrapper(schema);
+    }
+
+    /// <inheritdoc/>
+    public JsonSchemaValidationResult Validate(string json)
+    {
+        var errors = _schema.Validate(json);
+        return new JsonSchemaValidationResult
+        {
+            IsValid = errors.Count == 0,
+            Errors = errors.Select(e => new JsonSchemaValidationError(e.Path ?? string.Empty, e.Kind.ToString())).ToList()
+        };
+    }
+
+    /// <inheritdoc/>
+    public string ToJson() => _schema.ToJson();
+}

Libraries/Microsoft.Teams.Apps/Annotations/ContextAttribute.cs

@@ -8,7 +8,6 @@
 using Microsoft.Teams.Api.Auth;
 using Microsoft.Teams.Api.Clients;
 using Microsoft.Teams.Apps.Plugins;
-using Microsoft.Teams.Common.Extensions;
 using Microsoft.Teams.Common.Logging;
 using Microsoft.Teams.Common.Storage;
 

Libraries/Microsoft.Teams.Plugins/Microsoft.Teams.Plugins.External/Microsoft.Teams.Plugins.External.McpClient/McpClientPlugin.cs

@@ -1,5 +1,3 @@
-using Json.Schema;
-
 using Microsoft.Teams.AI;
 using Microsoft.Teams.AI.Prompts;
 using Microsoft.Teams.Common.Logging;
@@ -220,7 +218,7 @@ internal AI.Function CreateFunctionFromTool(Uri url, McpToolDetails tool, McpCli
         return new AI.Function(
             tool.Name,
             tool.Description,
-            JsonSchema.FromText(tool.InputSchema?.GetRawText() ?? "{}"),
+            JsonSchemaWrapper.FromJson(tool.InputSchema?.GetRawText() ?? "{}"),
             async (IDictionary<string, object?> args) =>
             {
                 try

Samples/Samples.BotBuilder/Program.cs

@@ -22,4 +22,4 @@
     await context.Send("hi from teams...");
 });
 
-app.Run();
+app.Run();

Samples/Samples.Cards/Program.cs

@@ -1,6 +1,5 @@
 using System.Text.Json;
 
-using Microsoft.Teams.Api.Activities.Invokes;
 using Microsoft.Teams.Api.AdaptiveCards;
 using Microsoft.Teams.Apps.Activities;
 using Microsoft.Teams.Apps.Activities.Invokes;
@@ -355,4 +354,4 @@ static Microsoft.Teams.Cards.AdaptiveCard CreateCardFromJson()
             }
         };
     }
-}
+}

Samples/Samples.Dialogs/Program.cs

@@ -310,4 +310,4 @@ static Microsoft.Teams.Api.TaskModules.Response CreateMixedExampleDialog()
     };
 
     return new Microsoft.Teams.Api.TaskModules.Response(new Microsoft.Teams.Api.TaskModules.ContinueTask(taskInfo));
-}
+}

Samples/Samples.Lights/Program.cs

@@ -40,4 +40,4 @@
     state.Save(context);
 });
 
-app.Run();
+app.Run();

Samples/Samples.Meetings/Program.cs

@@ -22,7 +22,7 @@
     {
         await context.Next();
     }
-    catch(Exception e)
+    catch (Exception e)
     {
         context.Log.Error(e);
         context.Log.Error("error occurred during activity processing");
@@ -127,4 +127,4 @@
     await context.Send($"you said '{context.Activity.Text}'");
 });
 
-app.Run();
+app.Run();

Samples/Samples.MessageExtensions/Program.cs

@@ -507,4 +507,4 @@ function cancelSettings() {
 </body>
 </html>
 """;
-}
+}