JsonContent<T>

Author: hchen2020

src/Infrastructure/BotSharp.Abstraction/Utilities/StringExtensions.cs

@@ -1,3 +1,4 @@
+using System.Text.Json;
 using System.Text.RegularExpressions;
 
 namespace BotSharp.Abstraction.Utilities;
@@ -27,4 +28,16 @@ public static bool IsEqualTo(this string str1, string str2, StringComparison opt
     {
         return str1.Equals(str2, option);
     }
+
+    public static string JsonContent(this string text)
+    {
+        var m = Regex.Match(text, @"\{(?:[^{}]|(?<open>\{)|(?<-open>\}))+(?(open)(?!))\}");
+        return m.Success ? m.Value : "{}";
+    }
+
+    public static T? JsonContent<T>(this string text)
+    {
+        text = JsonContent(text);
+        return JsonSerializer.Deserialize<T>(text);
+    }
 }

src/Infrastructure/BotSharp.Core/Routing/RoutingService.GetNextInstruction.cs

@@ -82,9 +82,7 @@ public async Task<FunctionCallFromLlm> GetNextInstruction()
                         new RoleDialogModel(AgentRole.User, content)
                     });
 
-                    var pattern = @"\{(?:[^{}]|(?<open>\{)|(?<-open>\}))+(?(open)(?!))\}";
-                    response.Content = Regex.Match(response.Content, pattern).Value;
-                    args = JsonSerializer.Deserialize<FunctionCallFromLlm>(response.Content);
+                    args = response.Content.JsonContent<FunctionCallFromLlm>();
                     break;
                 }
                 catch (Exception ex)

src/WebStarter/data/agents/01fcc3e5-9af7-49e6-ad7a-a760bd12dc4a/templates/next_step_prompt.liquid

@@ -1 +1 @@
-What is the next step based on the CONVERSATION? Response must be in appropriate JSON format. Route to the latest agent as much as possible.
+What is the next step based on the CONVERSATION? Response must be in appropriate JSON format.