chore: fixes nits

Signed-off-by: Vincent Biret <vibiret@microsoft.com>
microsoft · Dec 10, 2024 · c5c92d7 · c5c92d7
1 parent 56baeb3
commit c5c92d7
Showing 1 changed file with 15 additions and 3 deletions.
diff --git a/dotnet/src/Connectors/Connectors.OpenAI/Core/OpenAIFunction.cs b/dotnet/src/Connectors/Connectors.OpenAI/Core/OpenAIFunction.cs
@@ -221,13 +221,21 @@ private static KernelJsonSchema GetOptionalStringSchemaWithDescription(string de
         };
         return KernelJsonSchema.Parse(jObject.ToString());
     }
+
+    private static bool ShouldPropertiesBeRemoved(string[] names) => names.Length > 0;
+
+    private static bool DoesNullTypeNeedToBeAdded(bool shouldInsertNullType, KernelJsonSchema schema)
+    => shouldInsertNullType && schema.RootElement.TryGetProperty(TypeKey, out var typeElement) &&
+        // multiple types, but not null entry
+        (typeElement.ValueKind == JsonValueKind.Array && !typeElement.EnumerateArray().Any(static t => NullType.Equals(t.GetString(), StringComparison.OrdinalIgnoreCase)) ||
+        // single type which is not null
+        typeElement.ValueKind == JsonValueKind.String && typeElement.GetString() != NullType);
+
     private static KernelJsonSchema GetSanitizedSchemaForStrictMode(KernelJsonSchema schema, bool insertNullType)
     {
         var forbiddenPropertyNames = s_forbiddenKeywords.Where(k => schema.RootElement.TryGetProperty(k, out _)).ToArray();
 
-        if (forbiddenPropertyNames.Length > 0 || insertNullType && schema.RootElement.TryGetProperty(TypeKey, out var typeElement) &&
-            (typeElement.ValueKind == JsonValueKind.Array && !typeElement.EnumerateArray().Any(static t => NullType.Equals(t.GetString(), StringComparison.OrdinalIgnoreCase)) ||
-            typeElement.ValueKind == JsonValueKind.String && typeElement.GetString() != NullType))
+        if (ShouldPropertiesBeRemoved(forbiddenPropertyNames) || DoesNullTypeNeedToBeAdded(insertNullType, schema))
         {
             var originalSchema = JsonSerializer.Serialize(schema.RootElement);
             var parsedJson = JsonNode.Parse(originalSchema);
@@ -249,6 +257,7 @@ private static KernelJsonSchema GetSanitizedSchemaForStrictMode(KernelJsonSchema
         }
         return schema;
     }
+
     // https://platform.openai.com/docs/guides/structured-outputs#some-type-specific-keywords-are-not-yet-supported
     private static void InsertNullTypeIfRequired(bool insertNullType, JsonObject jsonObject)
     {
@@ -264,8 +273,11 @@ private static void InsertNullTypeIfRequired(bool insertNullType, JsonObject jso
             }
         }
     }
+
     private const string NullType = "null";
+
     private const string TypeKey = "type";
+
     // https://platform.openai.com/docs/guides/structured-outputs#some-type-specific-keywords-are-not-yet-supported
     private static readonly string[] s_forbiddenKeywords = [
         "contains",