resolve conflict

Author: Jicheng Lu

src/Infrastructure/BotSharp.Core/data/agents/01fcc3e5-9af7-49e6-ad7a-a760bd12dc4a/instructions/instruction.liquid

@@ -38,3 +38,5 @@ Optional args:
 
 [CONVERSATION]
 {{ conversation }}
+
+Determine which function to call to proceed. Your output must be in JSON format.

src/Plugins/BotSharp.Plugin.KnowledgeBase/Graph/GraphKnowledgeService.cs

@@ -20,17 +20,9 @@ public GraphKnowledgeService(
 
     public async Task<GraphQueryResult> ExecuteQueryAsync(string query, GraphQueryOptions? options = null)
     {
-        try
-        {
-            var db = GetGraphDb(options?.Provider);
-            var result = await db.ExecuteQueryAsync(query, options);
-            return result;
-        }
-        catch (Exception ex)
-        {
-            _logger.LogError(ex, $"Error when searching graph knowledge (Query: {query}).");
-            return new GraphQueryResult();
-        }
+        var db = GetGraphDb(options?.Provider);
+        var result = await db.ExecuteQueryAsync(query, options);
+        return result;
     }
 
 

src/Plugins/BotSharp.Plugin.Membase/GraphDb/MembaseGraphDb.cs

@@ -56,7 +56,7 @@ public async Task<GraphQueryResult> ExecuteQueryAsync(string query, GraphQueryEx
         {
             var argLogs = args.Select(x => (new KeyValue(x.Key, x.Value.ConvertToString(BotSharpOptions.defaultJsonOptions))).ToString());
             _logger.LogError(ex, $"Error when executing query in {Provider} graph db. (Query: {query}), (Argments: \r\n{string.Join("\r\n", argLogs)})");
-            return new();
+            throw;
         }
     }
 }

src/Plugins/BotSharp.Plugin.Membase/MembasePlugin.cs

@@ -33,7 +33,7 @@ public void RegisterDI(IServiceCollection services, IConfiguration config)
                 .ConfigureHttpClient(c =>
                 {
                     c.BaseAddress = new Uri(settings.Host);
-                    c.Timeout = TimeSpan.FromSeconds(5);
+                    c.Timeout = TimeSpan.FromSeconds(settings.TimeoutSecond);
                 });
 
         services.AddScoped<IGraphDb, MembaseGraphDb>();

src/Plugins/BotSharp.Plugin.Membase/Settings/MembaseSettings.cs

@@ -7,5 +7,6 @@ public class MembaseSettings
     public string Host { get; set; } = "localhost";
     public string ProjectId { get; set; } = string.Empty;
     public string ApiKey { get; set; } = string.Empty;
+    public int TimeoutSecond { get; set; } = 10;
     public GraphInstance[] GraphInstances { get; set; } = [];
 }