feat: Added M.E.A.I. AIFunction Generation support #24
There are no files selected for viewing
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
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
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
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
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,69 @@ | ||
| using CSharpToJsonSchema.Generators.Models; | ||
|
|
||
| namespace CSharpToJsonSchema.Generators; | ||
|
|
||
| internal static partial class Sources | ||
| { | ||
| public static string GenerateMeaiFunctionToolForMethods(InterfaceData @interface) | ||
| { | ||
| if(@interface.Methods.Count == 0 || [email protected]) | ||
| return string.Empty; | ||
| var extensionsClassName = @interface.Name; | ||
|
|
||
| return @$" | ||
| #nullable enable | ||
|
|
||
| namespace {@interface.Namespace} | ||
| {{ | ||
| public partial class {extensionsClassName} | ||
| {{ | ||
| public static implicit operator global::System.Collections.Generic.List<global::Microsoft.Extensions.AI.AITool>? ({@interface.Namespace}.{extensionsClassName} tools) | ||
| {{ | ||
| return tools.AsMeaiTools(); | ||
| }} | ||
|
|
||
| public global::System.Collections.Generic.List<global::Microsoft.Extensions.AI.AITool> AsMeaiTools() | ||
| {{ | ||
| var lst = new global::System.Collections.Generic.List<global::Microsoft.Extensions.AI.AITool>(); | ||
| var tools = this.AsTools(); | ||
| var calls = this.AsCalls(); | ||
| foreach (var tool in tools) | ||
| {{ | ||
| var call = calls[tool.Name]; | ||
| lst.Add(new global::CSharpToJsonSchema.MeaiFunction(tool, call)); | ||
| }} | ||
| return lst; | ||
| }} | ||
| }} | ||
| }}"; | ||
| } | ||
|
|
||
| public static string GenerateMeaiFunctionToolForInterface(InterfaceData @interface) | ||
| { | ||
| if([email protected]) | ||
| return string.Empty; | ||
| var extensionsClassName = @interface.Name.Substring(startIndex: 1) + "Extensions"; | ||
|
|
||
| return @$" | ||
| #nullable enable | ||
|
|
||
| namespace {@interface.Namespace} | ||
| {{ | ||
| public partial class {extensionsClassName} | ||
| {{ | ||
| public static global::System.Collections.Generic.List<global::Microsoft.Extensions.AI.AITool> AsMeaiTools(this {@interface.Name} service) | ||
| {{ | ||
| var lst = new global::System.Collections.Generic.List<global::Microsoft.Extensions.AI.AITool>(); | ||
| var tools = service.AsTools(); | ||
| var calls = service.AsCalls(); | ||
| foreach (var tool in tools) | ||
| {{ | ||
| var call = calls[tool.Name]; | ||
| lst.Add(new global::CSharpToJsonSchema.MeaiFunction(tool, call)); | ||
| }} | ||
| return lst; | ||
| }} | ||
| }} | ||
| }}"; | ||
| } | ||
| } |
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
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,61 @@ | ||
| using System.Text.Json; | ||
| using System.Text.Json.Nodes; | ||
| using Microsoft.Extensions.AI; | ||
|
|
||
| namespace CSharpToJsonSchema; | ||
|
|
||
| public partial class MeaiFunction : AIFunction | ||
| { | ||
| private readonly Tool _tool; | ||
| private readonly Func<string, CancellationToken, Task<string>> _call; | ||
|
|
||
| private JsonElement _jsonSchema; | ||
| public override JsonElement JsonSchema => _jsonSchema; | ||
| public override string Name => _tool.Name; | ||
| public override string Description => _tool.Description; | ||
|
|
||
| public MeaiFunction(Tool tool, Func<string, CancellationToken, Task<string>> call) | ||
| { | ||
| this._tool = tool; | ||
| this._call = call; | ||
|
|
||
| _jsonSchema = JsonSerializer.Deserialize<JsonElement>(JsonSerializer.Serialize(tool.Parameters, OpenApiSchemaJsonContext.Default.OpenApiSchema),OpenApiSchemaJsonContext.Default.JsonElement); | ||
| } | ||
| protected override async Task<object?> InvokeCoreAsync(IEnumerable<KeyValuePair<string, object?>> arguments, | ||
| CancellationToken cancellationToken) | ||
| { | ||
| try | ||
| { | ||
| var json = GetArgsString(arguments); | ||
|
|
||
| var call = await _call(json, cancellationToken); | ||
|
|
||
| return JsonSerializer.Deserialize(call, OpenApiSchemaJsonContext.Default.JsonElement); | ||
| }catch(Exception e) | ||
| { | ||
| return e.Message; | ||
| } | ||
| } | ||
|
|
||
| private string GetArgsString(IEnumerable<KeyValuePair<string, object?>> arguments) | ||
| { | ||
| var jsonObject = new JsonObject(); | ||
|
|
||
| foreach (var args in arguments) | ||
| { | ||
| if (args.Value is JsonElement element) | ||
| { | ||
| if(element.ValueKind == JsonValueKind.Array) | ||
| jsonObject[args.Key] = JsonArray.Create(element); | ||
| else if(element.ValueKind == JsonValueKind.Object) | ||
| jsonObject[args.Key] = JsonObject.Create(element); | ||
| } | ||
| else if (args.Value is JsonNode node) | ||
| { | ||
| jsonObject[args.Key] = node; | ||
| } | ||
| } | ||
|
|
||
| return jsonObject.ToJsonString(); | ||
| } | ||
| } | ||
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
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
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -110,39 +110,49 @@ public static OpenApiSchema ConvertToSchema<T>(JsonSerializerOptions? jsonOption | |||||
| public static OpenApiSchema ConvertToSchema(JsonTypeInfo type, string descriptionString) | ||||||
| { | ||||||
| var typeInfo = type; | ||||||
|
|
||||||
| var dics = JsonSerializer.Deserialize(descriptionString, | ||||||
| OpenApiSchemaJsonContext.Default.IDictionaryStringString); | ||||||
| List<string> required = new List<string>(); | ||||||
| var x = ConvertToCompatibleSchemaSubset(typeInfo.GetJsonSchemaAsNode( | ||||||
| exporterOptions: new JsonSchemaExporterOptions() | ||||||
| { | ||||||
| TransformSchemaNode = (a, b) => | ||||||
| { | ||||||
| if (a.TypeInfo.Type.IsEnum) | ||||||
| { | ||||||
| b["type"] = "string"; | ||||||
| } | ||||||
|
|
||||||
| if (a.PropertyInfo == null) | ||||||
| return b; | ||||||
| var propName = ToCamelCase(a.PropertyInfo.Name); | ||||||
| if (dics.ContainsKey(propName)) | ||||||
| { | ||||||
| b["description"] = dics[propName]; | ||||||
| } | ||||||
|
|
||||||
| return b; | ||||||
| }, | ||||||
| })); | ||||||
|
|
||||||
|
|
||||||
| foreach (var re in x.Properties) | ||||||
| { | ||||||
| required.Add(re.Key); | ||||||
| } | ||||||
|
|
||||||
|
|
||||||
| var mainDescription = x.Description ?? dics["mainFunction_Desc"]; | ||||||
|
||||||
| var mainDescription = x.Description ?? dics["mainFunction_Desc"]; | |
| var mainDescription = x.Description ?? (dics.TryGetValue("mainFunction_Desc", out var desc) ? desc : ""); |
Oops, something went wrong.
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
🛠️ Refactor suggestion
Consider unifying or clarifying the return type of
InvokeCoreAsync.Currently, when the call succeeds, the method returns a
JsonElement, but in the catch block, it returns a string holding the exception message. Mixing these return types (both raw JSON and a string) might create ambiguity for consumers of this method if they expect a consistent data structure. Additionally, returning the full exception message could expose internal information.📝 Committable suggestion