fix: Fixed some issues with Source Generator.

Author: HavenDV

src/libs/OpenAI.Generators.Core/Conversion/ToModels.cs

@@ -12,37 +12,44 @@ public static InterfaceData PrepareData(
     {
         interfaceSymbol = interfaceSymbol ?? throw new ArgumentNullException(nameof(interfaceSymbol));
         attributeData = attributeData ?? throw new ArgumentNullException(nameof(attributeData));
-        
+
+        var isStrict = attributeData.NamedArguments.FirstOrDefault(x => x.Key == "Strict").Value.Value is bool strict &&
+                       strict;
         var methods = interfaceSymbol
             .GetMembers()
             .OfType<IMethodSymbol>()
             .Where(static x => x.MethodKind == MethodKind.Ordinary)
-            .Select(x => new MethodData(
-                Name: x.Name,
-                Description: GetDescription(x),
-                IsAsync: x.IsAsync || x.ReturnType.Name == "Task",
-                IsVoid: x.ReturnsVoid,
-                IsStrict: attributeData.NamedArguments.FirstOrDefault(x => x.Key == "Strict").Value.Value is bool strict && strict,
-                Parameters: new OpenApiSchema(
+            .Select(x =>
+            {
+                var parameters = x.Parameters
+                    .Where(static x => x.Type.MetadataName != "CancellationToken")
+                    .ToArray();
+                
+                return new MethodData(
                     Name: x.Name,
                     Description: GetDescription(x),
-                    Type: "object",
-                    SchemaType: "object",
-                    Properties:
-                    x.Parameters
-                        .Where(static x => x.Type.MetadataName != "CancellationToken")
-                        .Select(static x => ToParameterData(
-                            typeSymbol: x.Type,
-                            name: x.Name,
-                            description: GetDescription(x),
-                            isRequired: !x.IsOptional))
-                        .ToArray(),
-                    EnumValues: Array.Empty<string>(),
-                    IsNullable: false,
-                    IsRequired: true,
-                    Format: null,
-                    ArrayItem: Array.Empty<OpenApiSchema>(),
-                    DefaultValue: string.Empty)))
+                    IsAsync: x.IsAsync || x.ReturnType.Name == "Task",
+                    IsVoid: x.ReturnsVoid,
+                    IsStrict: isStrict,
+                    Parameters: new OpenApiSchema(
+                        Name: x.Name,
+                        Description: GetDescription(x),
+                        Type: "object",
+                        SchemaType: "object",
+                        Properties: parameters
+                            .Select(y => ToParameterData(
+                                typeSymbol: y.Type,
+                                name: y.Name,
+                                description: GetDescription(y),
+                                isRequired: isStrict || !y.IsOptional))
+                            .ToArray(),
+                        EnumValues: Array.Empty<string>(),
+                        IsNullable: false,
+                        IsRequired: true,
+                        Format: null,
+                        ArrayItem: Array.Empty<OpenApiSchema>(),
+                        DefaultValue: string.Empty));
+            })
             .ToArray();
 
         return new InterfaceData(

src/libs/OpenAI.Generators/Sources.Calls.cs

@@ -104,7 +104,8 @@ public class {method.Name}Args
             global::System.Threading.CancellationToken cancellationToken = default)
         {{
             var args = functions.As{method.Name}Args(json);
-            var jsonResult = await functions.{method.Name}({string.Join(", ", method.Parameters.Properties.Select(static parameter => $@"args.{parameter.Name.ToPropertyName()}"))}, cancellationToken);
+            var jsonResult = await functions.{method.Name}({string.Join(", ", method.Parameters.Properties
+                .Select(static parameter => $@"args.{parameter.Name.ToPropertyName()}").Append("cancellationToken"))});
 
             return global::System.Text.Json.JsonSerializer.Serialize(jsonResult, new global::System.Text.Json.JsonSerializerOptions
             {{

src/libs/OpenAI.Generators/Sources.Tools.cs

@@ -26,7 +26,7 @@ public static string GenerateOpenApiSchema(OpenApiSchema parameter, int depth =
 {indent}                        Items = {GenerateOpenApiSchema(parameter.ArrayItem.First(), depth: depth + 1)},
 {indent}                    }}";
         }
-        if (parameter.Properties.Count != 0)
+        if (parameter.SchemaType == "object")
         {
             return $@"new {name}
 {indent}                    {{
@@ -63,7 +63,7 @@ public static string GenerateOpenApiSchema(OpenApiSchema parameter, int depth =
     public static string GenerateClientImplementation(InterfaceData @interface)
     {
         var extensionsClassName = @interface.Name.Substring(startIndex: 1) + "Extensions";
-        
+
         return @$"
 #nullable enable