Simplify if logic and nesting

microsoft · Nov 21, 2024 · 540c833 · 540c833
1 parent 5da2f35
commit 540c833
Showing 1 changed file with 19 additions and 27 deletions.
diff --git a/dotnet/src/SemanticKernel.Core/Functions/KernelFunctionFromMethod.cs b/dotnet/src/SemanticKernel.Core/Functions/KernelFunctionFromMethod.cs
@@ -726,40 +726,32 @@ private static (Func<KernelFunction, Kernel, KernelArguments, CancellationToken,
 
             object? Process(object? value)
             {
-                if (!type.IsAssignableFrom(value?.GetType()))
+                if (type.IsAssignableFrom(value?.GetType()))
                 {
-                    if (parameter?.ParameterType is null)
-                    {
-                        return value;
-                    }
+                    return value;
+                }
 
-                    if (value is not JsonElement or JsonDocument or JsonNode)
+                if (converter is not null && value is not JsonElement or JsonDocument or JsonNode)
+                {
+                    try
                     {
-                        if (converter is not null)
-                        {
-                            try
-                            {
-                                return converter(value, kernel.Culture);
-                            }
-                            catch (Exception e) when (!e.IsCriticalException())
-                            {
-                                throw new ArgumentOutOfRangeException(name, value, e.Message);
-                            }
-                        }
+                        return converter(value, kernel.Culture);
                     }
-
-                    if (value is JsonElement element && element.ValueKind == JsonValueKind.String)
+                    catch (Exception e) when (!e.IsCriticalException())
                     {
-                        if (jsonStringParsers.TryGetValue(type, out var jsonStringParser))
-                        {
-                            return jsonStringParser(element.GetString()!);
-                        }
+                        throw new ArgumentOutOfRangeException(name, value, e.Message);
                     }
+                }
 
-                    if (value is not null && TryToDeserializeValue(value, type, jsonSerializerOptions, out var deserializedValue))
-                    {
-                        return deserializedValue;
-                    }
+                if (value is JsonElement element && element.ValueKind == JsonValueKind.String
+                    && jsonStringParsers.TryGetValue(type, out var jsonStringParser))
+                {
+                    return jsonStringParser(element.GetString()!);
+                }
+
+                if (value is not null && TryToDeserializeValue(value, type, jsonSerializerOptions, out var deserializedValue))
+                {
+                    return deserializedValue;
                 }
 
                 return value;