Merge pull request #573 from yileicn/master

optimize paramter type check

Author: Oceania2018

src/Infrastructure/BotSharp.Core/Agents/Services/AgentService.LoadAgent.cs

@@ -1,7 +1,12 @@
+using BotSharp.Abstraction.Routing.Models;
+using System.Collections.Concurrent;
+
 namespace BotSharp.Core.Agents.Services;
 
 public partial class AgentService
 {
+    public static ConcurrentDictionary<string, Dictionary<string,string>> AgentParameterTypes = new();
+
     [MemoryCache(10 * 60, perInstanceCache: true)]
     public async Task<Agent> LoadAgent(string id)
     {
@@ -49,6 +54,7 @@ public async Task<Agent> LoadAgent(string id)
                 agent.Instruction = inheritedAgent.Instruction;
             }
         }
+        AddOrUpdateParameters(agent);
 
         agent.TemplateDict = new Dictionary<string, object>();
 
@@ -96,4 +102,43 @@ private void PopulateState(Dictionary<string, object> dict)
             dict[t.Key] = t.Value;
         }
     }
+
+    private void AddOrUpdateParameters(Agent agent)
+    {
+        var agentId = agent.Id ?? agent.Name;
+        if (AgentParameterTypes.ContainsKey(agentId)) return;
+        
+        AddOrUpdateRoutesParameters(agentId, agent.RoutingRules);
+        AddOrUpdateFunctionsParameters(agentId, agent.Functions);
+    }
+
+    private void AddOrUpdateRoutesParameters(string agentId, List<RoutingRule> routingRules)
+    {
+        if(!AgentParameterTypes.TryGetValue(agentId, out var parameterTypes)) parameterTypes = new();
+        foreach (var rule in routingRules.Where(x => x.Required))
+        {
+            if (string.IsNullOrEmpty(rule.FieldType)) continue;
+            parameterTypes.TryAdd(rule.Field, rule.FieldType);
+        }
+        AgentParameterTypes.TryAdd(agentId, parameterTypes);
+    }
+
+    private void AddOrUpdateFunctionsParameters(string agentId, List<FunctionDef> functions)
+    {
+        if (!AgentParameterTypes.TryGetValue(agentId, out var parameterTypes)) parameterTypes = new(); 
+        var parameters = functions.Select(p => p.Parameters);
+        foreach (var param in parameters)
+        {
+            foreach (JsonProperty prop in param.Properties.RootElement.EnumerateObject())
+            {
+                var name = prop.Name;
+                var node = prop.Value;
+                if (node.TryGetProperty("type", out var type))
+                {
+                    parameterTypes.TryAdd(name, type.GetString());
+                }
+            }
+        }
+        AgentParameterTypes.TryAdd(agentId, parameterTypes);
+    }
 }

src/Infrastructure/BotSharp.Core/Conversations/Services/ConversationStateService.cs

@@ -360,9 +360,28 @@ public void SaveStateByArgs(JsonDocument args)
                         stateValue = stateValue?.ToLower();
                     }
 
-                    SetState(property.Name, stateValue, source: StateSource.Application);
+                    if (CheckArgType(property.Name, stateValue))
+                    {
+                        SetState(property.Name, stateValue, source: StateSource.Application);
+                    }
                 }
             }
         }
     }
+
+    private bool CheckArgType(string name, string value)
+    {
+        var agentTypes = AgentService.AgentParameterTypes.SelectMany(p => p.Value).ToList();
+        var filed = agentTypes.FirstOrDefault(t => t.Key == name); 
+        if (filed.Key != null)
+        {
+            return filed.Value switch
+            {
+                "boolean" => bool.TryParse(value, out _),
+                "number" => long.TryParse(value, out _),
+                _ => true,
+            };
+        }
+        return true;
+    }
 }