Merge pull request #113 from hchen2020/master

Allow agent redirect directly.

Author: Oceania2018

src/Infrastructure/BotSharp.Abstraction/Agents/Models/RoutingTable.cs

@@ -13,6 +13,9 @@ public class RoutingTable
     [JsonPropertyName("required")]
     public List<string> RequiredFields { get; set; }
 
+    [JsonPropertyName("redirect_to")]
+    public string RedirectTo { get; set; }
+
     public override string ToString()
     {
         return AgentName;

src/Infrastructure/BotSharp.Core/Functions/RouteToAgentFn.cs

@@ -28,7 +28,12 @@ public async Task<bool> Execute(RoleDialogModel message)
         }
         else
         {
-            if (!HasMissingRequiredField(message, out var agentId))
+            var missingfield = HasMissingRequiredField(message, out var agentId);
+            if (missingfield && message.CurrentAgentId != agentId)
+            {
+                message.CurrentAgentId = agentId;
+            }
+            else
             {
                 message.CurrentAgentId = agentId;
                 message.ExecutionResult = $"Routed to {args.AgentName}";
@@ -47,21 +52,21 @@ private bool HasMissingRequiredField(RoleDialogModel message, out string agentId
         var args = JsonSerializer.Deserialize<RoutingArgs>(message.FunctionArgs);
 
         var routes = GetRoutingTable();
-        var agent = routes.FirstOrDefault(x => x.AgentName.ToLower() == args.AgentName.ToLower());
+        var routingRule = routes.FirstOrDefault(x => x.AgentName.ToLower() == args.AgentName.ToLower());
 
-        if (agent == null)
+        if (routingRule == null)
         {
             agentId = message.CurrentAgentId;
             message.ExecutionResult = $"Can't find agent {args.AgentName}";
             return true;
         }
 
-        agentId = agent.AgentId;
+        agentId = routingRule.AgentId;
 
         // Check required fields
         var jo = JsonSerializer.Deserialize<object>(message.FunctionArgs);
         bool hasMissingField = false;
-        foreach (var field in agent.RequiredFields)
+        foreach (var field in routingRule.RequiredFields)
         {
             if (jo is JsonElement root)
             {
@@ -71,9 +76,21 @@ private bool HasMissingRequiredField(RoleDialogModel message, out string agentId
                     hasMissingField = true;
                     break;
                 }
+                else if (root.EnumerateObject().Any(x => x.Name == field) && 
+                    string.IsNullOrEmpty(root.EnumerateObject().FirstOrDefault(x => x.Name == field).Value.ToString()))
+                {
+                    message.ExecutionResult = $"missing {field}.";
+                    hasMissingField = true;
+                    break;
+                }
             }
         }
 
+        if (hasMissingField && !string.IsNullOrEmpty(routingRule.RedirectTo))
+        {
+            agentId = routingRule.RedirectTo;
+        }
+
         return hasMissingField;
     }