Merge pull request #482 from iceljc/master

fix user cache

Author: Oceania2018

src/Infrastructure/BotSharp.Core/Conversations/Services/ConversationService.Summary.cs

@@ -27,6 +27,8 @@ public async Task<string> GetConversationSummary(IEnumerable<string> conversatio
             contents.Add(content);
         }
 
+        if (contents.IsNullOrEmpty()) return string.Empty;
+
         var router = await agentService.LoadAgent(AIAssistant);
         var prompt = GetPrompt(router, contents);
         var summary = await Summarize(router, prompt);
@@ -97,7 +99,12 @@ private string GetConversationContent(List<RoleDialogModel> dialogs, int maxDial
         foreach (var dialog in dialogs.TakeLast(maxDialogCount))
         {
             var role = dialog.Role;
-            if (role != AgentRole.User && role != AgentRole.Assistant) continue;
+            if (role == AgentRole.Function) continue;
+
+            if (role != AgentRole.User)
+            {
+                role = AgentRole.Assistant;
+            }
 
             conversation += $"{role}: {dialog.Payload ?? dialog.Content}\r\n";
         }

src/Infrastructure/BotSharp.Core/Users/Services/UserService.cs

@@ -217,7 +217,7 @@ public async Task<User> GetMyProfile()
         return user;
     }
 
-    [MemoryCache(10 * 60)]
+    [MemoryCache(10 * 60, perInstanceCache: true)]
     public async Task<User> GetUser(string id)
     {
         var db = _services.GetRequiredService<IBotSharpRepository>();