Merge pull request #365 from iceljc/features/refine-breakpoint

Oceania2018 · web-flow · commit de2f4ee5b143 · 2024-03-27T06:49:38.000-05:00
refine state
diff --git a/src/Infrastructure/BotSharp.Abstraction/Conversations/Models/ConversationState.cs b/src/Infrastructure/BotSharp.Abstraction/Conversations/Models/ConversationState.cs
@@ -1,6 +1,6 @@
 namespace BotSharp.Abstraction.Conversations.Models;
 
-public class ConversationState : Dictionary<string, List<StateValue>>
+public class ConversationState : Dictionary<string, StateKeyValue>
 {
     public ConversationState()
     {
@@ -11,7 +11,7 @@ public ConversationState(List<StateKeyValue> pairs)
     {
         foreach (var pair in pairs)
         {
-            this[pair.Key] = pair.Values;
+            this[pair.Key] = pair;
         }
     }
 }
diff --git a/src/Infrastructure/BotSharp.Abstraction/Conversations/Models/StateKeyValue.cs b/src/Infrastructure/BotSharp.Abstraction/Conversations/Models/StateKeyValue.cs
@@ -3,6 +3,7 @@ namespace BotSharp.Abstraction.Conversations.Models;
 public class StateKeyValue
 {
     public string Key { get; set; }
+    public bool Versioning { get; set; }
     public List<StateValue> Values { get; set; } = new List<StateValue>();
 
     public StateKeyValue()
@@ -20,6 +21,13 @@ public StateKeyValue(string key, List<StateValue> values)
 public class StateValue
 {
     public string Data { get; set; }
+
+    [JsonPropertyName("message_id")]
+    public string MessageId { get; set; }
+
+    public bool Active { get; set; }
+
+    [JsonPropertyName("update_time")]
     public DateTime UpdateTime { get; set; }
 
     public StateValue()
diff --git a/src/Infrastructure/BotSharp.Core/Conversations/Services/ConversationService.SendMessage.cs b/src/Infrastructure/BotSharp.Core/Conversations/Services/ConversationService.SendMessage.cs
@@ -27,6 +27,7 @@ public async Task<bool> SendMessage(string agentId,
 #endif
 
         message.CurrentAgentId = agent.Id;
+        message.CreatedAt = DateTime.UtcNow;
         if (string.IsNullOrEmpty(message.SenderId))
         {
             message.SenderId = _user.Id;
diff --git a/src/Infrastructure/BotSharp.Core/Conversations/Services/ConversationStateService.cs b/src/Infrastructure/BotSharp.Core/Conversations/Services/ConversationStateService.cs
@@ -1,3 +1,5 @@
+using BotSharp.Abstraction.Conversations.Models;
+
 namespace BotSharp.Core.Conversations.Services;
 
 /// <summary>
@@ -42,32 +44,42 @@ public IConversationStateService SetState<T>(string name, T value, bool isNeedVe
         var currentValue = value.ToString();
         var hooks = _services.GetServices<IConversationHook>();
 
-        if (_states.TryGetValue(name, out var values))
+        if (ContainsState(name) && _states.TryGetValue(name, out var pair))
         {
-            preValue = values?.LastOrDefault()?.Data ?? string.Empty;
+            preValue = pair?.Values.LastOrDefault()?.Data ?? string.Empty;
         }
 
-        if (!_states.ContainsKey(name) || preValue != currentValue)
+        if (!ContainsState(name) || preValue != currentValue)
         {
             _logger.LogInformation($"[STATE] {name} = {value}");
             foreach (var hook in hooks)
             {
                 hook.OnStateChanged(name, preValue, currentValue).Wait();
             }
 
-            var stateValue = new StateValue
+            var routingCtx = _services.GetRequiredService<IRoutingContext>();
+            var newPair = new StateKeyValue
+            {
+                Key = name,
+                Versioning = isNeedVersion
+            };
+
+            var newValue = new StateValue
             {
                 Data = currentValue,
-                UpdateTime = DateTime.UtcNow
+                MessageId = routingCtx.MessageId,
+                Active = true,
+                UpdateTime = DateTime.UtcNow,
             };
 
-            if (!_states.ContainsKey(name) || !isNeedVersion)
+            if (!isNeedVersion || !_states.ContainsKey(name))
             {
-                _states[name] = new List<StateValue> { stateValue };
+                newPair.Values = new List<StateValue> { newValue };
+                _states[name] = newPair;
             }
             else
             {
-                _states[name].Add(stateValue);
+                _states[name].Values.Add(newValue);
             }
         }
 
@@ -85,9 +97,12 @@ public Dictionary<string, string> Load(string conversationId)
         {
             foreach (var state in _states)
             {
-                var value = state.Value?.LastOrDefault()?.Data ?? string.Empty;
-                curStates[state.Key] = value;
-                _logger.LogInformation($"[STATE] {state.Key} : {value}");
+                var value = state.Value?.Values?.LastOrDefault();
+                if (value == null || !value.Active) continue;
+
+                var data = value.Data ?? string.Empty;
+                curStates[state.Key] = data;
+                _logger.LogInformation($"[STATE] {state.Key} : {data}");
             }
         }
 
@@ -112,7 +127,7 @@ public void Save()
 
         foreach (var dic in _states)
         {
-            states.Add(new StateKeyValue(dic.Key, dic.Value));
+            states.Add(dic.Value);
         }
 
         _db.UpdateConversationStates(_conversationId, states);
@@ -121,27 +136,46 @@ public void Save()
 
     public void CleanStates()
     {
-        _states.Clear();
+        var utcNow = DateTime.UtcNow;
+        foreach (var key in _states.Keys)
+        {
+            var value = _states[key];
+            if (value == null || !value.Versioning || value.Values.IsNullOrEmpty()) continue;
+
+            var lastValue = value.Values.LastOrDefault();
+            if (lastValue == null || !lastValue.Active) continue;
+
+            value.Values.Add(new StateValue
+            {
+                Data = lastValue.Data,
+                MessageId = lastValue.MessageId,
+                Active = false,
+                UpdateTime = utcNow
+            });
+        }
     }
 
     public Dictionary<string, string> GetStates()
     {
         var curStates = new Dictionary<string, string>();
         foreach (var state in _states)
         {
-            curStates[state.Key] = state.Value?.LastOrDefault()?.Data ?? string.Empty;
+            var value = state.Value?.Values?.LastOrDefault();
+            if (value == null || !value.Active) continue;
+
+            curStates[state.Key] = value.Data ?? string.Empty;
         }
         return curStates;
     }
 
     public string GetState(string name, string defaultValue = "")
     {
-        if (!_states.ContainsKey(name) || _states[name].IsNullOrEmpty())
+        if (!_states.ContainsKey(name) || _states[name].Values.IsNullOrEmpty() || !_states[name].Values.Last().Active)
         {
             return defaultValue;
         }
 
-        return _states[name].Last().Data;
+        return _states[name].Values.Last().Data;
     }
 
     public void Dispose()
@@ -152,8 +186,9 @@ public void Dispose()
     public bool ContainsState(string name)
     {
         return _states.ContainsKey(name)
-            && !_states[name].IsNullOrEmpty()
-            && !string.IsNullOrEmpty(_states[name].Last().Data);
+            && !_states[name].Values.IsNullOrEmpty()
+            && _states[name].Values.LastOrDefault()?.Active == true
+            && !string.IsNullOrEmpty(_states[name].Values.Last().Data);
     }
 
     public void SaveStateByArgs(JsonDocument args)
diff --git a/src/Infrastructure/BotSharp.Core/Conversations/Services/ConversationStorage.cs b/src/Infrastructure/BotSharp.Core/Conversations/Services/ConversationStorage.cs
@@ -46,7 +46,7 @@ public void Append(string conversationId, RoleDialogModel dialog)
                 AgentId = agentId,
                 MessageId = dialog.MessageId,
                 FunctionName = dialog.FunctionName,
-                CreateTime = DateTime.UtcNow
+                CreateTime = dialog.CreatedAt
             }; 
             
             var content = dialog.Content.RemoveNewLine();
@@ -65,7 +65,7 @@ public void Append(string conversationId, RoleDialogModel dialog)
                 MessageId = dialog.MessageId,
                 SenderId = dialog.SenderId,
                 FunctionName = dialog.FunctionName,
-                CreateTime = DateTime.UtcNow
+                CreateTime = dialog.CreatedAt
             };
             
             var content = dialog.Content.RemoveNewLine();
diff --git a/src/Infrastructure/BotSharp.Core/Repository/FileRepository/FileRepository.Conversation.cs b/src/Infrastructure/BotSharp.Core/Repository/FileRepository/FileRepository.Conversation.cs
@@ -481,7 +481,7 @@ public bool TruncateConversation(string conversationId, string messageId, bool c
             var refTime = dialogs.ElementAt(foundIdx).MetaData.CreateTime;
             var stateDir = Path.Combine(convDir, STATE_FILE);
             var states = CollectConversationStates(stateDir);
-            isSaved = HandleTruncatedStates(stateDir, states, refTime);
+            isSaved = HandleTruncatedStates(stateDir, states, messageId, refTime);
 
             // Handle truncated breakpoints
             var breakpointDir = Path.Combine(convDir, BREAKPOINT_FILE);
@@ -597,12 +597,20 @@ private bool HandleTruncatedDialogs(string convDir, string dialogDir, List<Dialo
             return isSaved;
         }
 
-        private bool HandleTruncatedStates(string stateDir, List<StateKeyValue> states, DateTime refTime)
+        private bool HandleTruncatedStates(string stateDir, List<StateKeyValue> states, string refMsgId, DateTime refTime)
         {
             var truncatedStates = new List<StateKeyValue>();
             foreach (var state in states)
             {
-                var values = state.Values.Where(x => x.UpdateTime < refTime).ToList();
+                if (!state.Versioning)
+                {
+                    truncatedStates.Add(state);
+                    continue;
+                }
+
+                var values = state.Values.Where(x => x.MessageId != refMsgId)
+                                         .Where(x => x.UpdateTime < refTime)
+                                         .ToList();
                 if (values.Count == 0) continue;
 
                 state.Values = values;
diff --git a/src/Infrastructure/BotSharp.Core/Repository/FileRepository/FileRepository.Log.cs b/src/Infrastructure/BotSharp.Core/Repository/FileRepository/FileRepository.Log.cs
@@ -71,11 +71,7 @@ public void SaveConversationContentLog(ContentLogOutputModel log)
             log.MessageId = log.MessageId.IfNullOrEmptyAs(Guid.NewGuid().ToString());
 
             var convDir = FindConversationDirectory(log.ConversationId);
-            if (string.IsNullOrEmpty(convDir))
-            {
-                convDir = Path.Combine(_dbSettings.FileRepository, _conversationSettings.DataDir, log.ConversationId);
-                Directory.CreateDirectory(convDir);
-            }
+            if (string.IsNullOrEmpty(convDir)) return;
 
             var logDir = Path.Combine(convDir, "content_log");
             if (!Directory.Exists(logDir))
@@ -120,11 +116,7 @@ public void SaveConversationStateLog(ConversationStateLogModel log)
             log.MessageId = log.MessageId.IfNullOrEmptyAs(Guid.NewGuid().ToString());
 
             var convDir = FindConversationDirectory(log.ConversationId);
-            if (string.IsNullOrEmpty(convDir))
-            {
-                convDir = Path.Combine(_dbSettings.FileRepository, _conversationSettings.DataDir, log.ConversationId);
-                Directory.CreateDirectory(convDir);
-            }
+            if (string.IsNullOrEmpty(convDir)) return;
 
             var logDir = Path.Combine(convDir, "state_log");
             if (!Directory.Exists(logDir))
diff --git a/src/Infrastructure/BotSharp.OpenAPI/BackgroundServices/ConversationTimeoutService.cs b/src/Infrastructure/BotSharp.OpenAPI/BackgroundServices/ConversationTimeoutService.cs
@@ -36,7 +36,6 @@ private async Task DoWork(CancellationToken stoppingToken)
                     try
                     {
                         await CleanIdleConversationsAsync();
-                        await CloseIdleConversationsAsync(TimeSpan.FromMinutes(10));
                     }
                     catch (Exception ex)
                     {
@@ -54,37 +53,6 @@ public override async Task StopAsync(CancellationToken stoppingToken)
             await base.StopAsync(stoppingToken);
         }
 
-        private async Task CloseIdleConversationsAsync(TimeSpan conversationIdleTimeout)
-        {
-            using var scope = _services.CreateScope();
-            var conversationService = scope.ServiceProvider.GetRequiredService<IConversationService>();
-            var hooks = scope.ServiceProvider.GetServices<IConversationHook>()
-                .OrderBy(x => x.Priority)
-                .ToList();
-            var moment = DateTime.UtcNow.Add(-conversationIdleTimeout);
-            var conversations = (await conversationService.GetLastConversations()).Where(c => c.CreatedTime <= moment);
-            foreach (var conversation in conversations)
-            {
-                try
-                {
-                    var response = new RoleDialogModel(AgentRole.Assistant, "End the conversation due to timeout.")
-                    {
-                        StopCompletion = true,
-                        FunctionName = "conversation_end"
-                    };
-
-                    foreach (var hook in hooks)
-                    {
-                        await hook.OnConversationEnding(response);
-                    }
-                }
-                catch (Exception ex)
-                {
-                    _logger.LogError(ex, $"Error occurred closing conversation #{conversation.Id}.");
-                }
-            }
-        }
-
         private async Task CleanIdleConversationsAsync()
         {
             using var scope = _services.CreateScope();
diff --git a/src/Infrastructure/BotSharp.OpenAPI/Controllers/ConversationController.cs b/src/Infrastructure/BotSharp.OpenAPI/Controllers/ConversationController.cs
@@ -1,3 +1,4 @@
+using BotSharp.Abstraction.Routing;
 using BotSharp.Abstraction.Users.Models;
 
 namespace BotSharp.OpenAPI.Controllers;
@@ -161,6 +162,9 @@ public async Task<ChatResponseModel> SendMessage([FromRoute] string agentId,
         }
 
         var inputMsg = new RoleDialogModel(AgentRole.User, input.Text);
+        var routing = _services.GetRequiredService<IRoutingService>();
+        routing.Context.SetMessageId(conversationId, inputMsg.MessageId);
+
         conv.SetConversationId(conversationId, input.States);
         conv.States.SetState("channel", input.Channel)
                    .SetState("provider", input.Provider)
diff --git a/src/Plugins/BotSharp.Plugin.ChatHub/Hooks/StreamingLogHook.cs b/src/Plugins/BotSharp.Plugin.ChatHub/Hooks/StreamingLogHook.cs
@@ -345,7 +345,7 @@ private string BuildContentLog(ContentLogInputModel input)
             Role = input.Message.Role,
             Content = input.Log,
             Source = input.Source,
-            CreateTime = DateTime.UtcNow
+            CreateTime = input.Message.CreatedAt
         };
 
         var json = JsonSerializer.Serialize(output, _options.JsonSerializerOptions);
@@ -367,7 +367,7 @@ private string BuildStateLog(string conversationId, Dictionary<string, string> s
             ConversationId = conversationId,
             MessageId = message.MessageId,
             States = states,
-            CreateTime = DateTime.UtcNow
+            CreateTime = message.CreatedAt
         };
 
         var convSettings = _services.GetRequiredService<ConversationSetting>();
diff --git a/src/Plugins/BotSharp.Plugin.MongoStorage/Models/StateMongoElement.cs b/src/Plugins/BotSharp.Plugin.MongoStorage/Models/StateMongoElement.cs
@@ -5,13 +5,15 @@ namespace BotSharp.Plugin.MongoStorage.Models;
 public class StateMongoElement
 {
     public string Key { get; set; }
+    public bool Versioning { get; set; }
     public List<StateValueMongoElement> Values { get; set; }
 
     public static StateMongoElement ToMongoElement(StateKeyValue state)
     {
         return new StateMongoElement
         {
             Key = state.Key,
+            Versioning = state.Versioning,
             Values = state.Values?.Select(x => StateValueMongoElement.ToMongoElement(x))?.ToList() ?? new List<StateValueMongoElement>()
         };
     }
@@ -21,6 +23,7 @@ public static StateKeyValue ToDomainElement(StateMongoElement state)
         return new StateKeyValue
         {
             Key = state.Key,
+            Versioning = state.Versioning,
             Values = state.Values?.Select(x => StateValueMongoElement.ToDomainElement(x))?.ToList() ?? new List<StateValue>()
         };
     }
@@ -29,13 +32,17 @@ public static StateKeyValue ToDomainElement(StateMongoElement state)
 public class StateValueMongoElement
 {
     public string Data { get; set; }
+    public string MessageId { get; set; }
+    public bool Active { get; set; }
     public DateTime UpdateTime { get; set; }
 
     public static StateValueMongoElement ToMongoElement(StateValue element)
     {
         return new StateValueMongoElement
         {
             Data = element.Data,
+            MessageId = element.MessageId,
+            Active = element.Active,
             UpdateTime = element.UpdateTime
         };
     }
@@ -45,6 +52,8 @@ public static StateValue ToDomainElement(StateValueMongoElement element)
         return new StateValue
         {
             Data = element.Data,
+            MessageId = element.MessageId,
+            Active = element.Active,
             UpdateTime = element.UpdateTime
         };
     }
diff --git a/src/Plugins/BotSharp.Plugin.MongoStorage/Repository/MongoRepository.Conversation.cs b/src/Plugins/BotSharp.Plugin.MongoStorage/Repository/MongoRepository.Conversation.cs
diff --git a/src/Plugins/BotSharp.Plugin.MongoStorage/Repository/MongoRepository.Log.cs b/src/Plugins/BotSharp.Plugin.MongoStorage/Repository/MongoRepository.Log.cs

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`namespace BotSharp.Abstraction.Conversations.Models;`
`2`	`2`
`3`		`-public class ConversationState : Dictionary<string, List<StateValue>>`
	`3`	`+public class ConversationState : Dictionary<string, StateKeyValue>`
`4`	`4`	`{`
`5`	`5`	`public ConversationState()`
`6`	`6`	`{`
`@@ -11,7 +11,7 @@ public ConversationState(List<StateKeyValue> pairs)`
`11`	`11`	`{`
`12`	`12`	`foreach (var pair in pairs)`
`13`	`13`	`{`
`14`		`- this[pair.Key] = pair.Values;`
	`14`	`+ this[pair.Key] = pair;`
`15`	`15`	`}`
`16`	`16`	`}`
`17`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,7 @@ public async Task<bool> SendMessage(string agentId,`
`27`	`27`	`#endif`
`28`	`28`
`29`	`29`	`message.CurrentAgentId = agent.Id;`
	`30`	`+ message.CreatedAt = DateTime.UtcNow;`
`30`	`31`	`if (string.IsNullOrEmpty(message.SenderId))`
`31`	`32`	`{`
`32`	`33`	`message.SenderId = _user.Id;`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+using BotSharp.Abstraction.Conversations.Models;`
	`2`	`+`
`1`	`3`	`namespace BotSharp.Core.Conversations.Services;`
`2`	`4`
`3`	`5`	`/// <summary>`
`@@ -42,32 +44,42 @@ public IConversationStateService SetState<T>(string name, T value, bool isNeedVe`
`42`	`44`	`var currentValue = value.ToString();`
`43`	`45`	`var hooks = _services.GetServices<IConversationHook>();`
`44`	`46`
`45`		`- if (_states.TryGetValue(name, out var values))`
	`47`	`+ if (ContainsState(name) && _states.TryGetValue(name, out var pair))`
`46`	`48`	`{`
`47`		`- preValue = values?.LastOrDefault()?.Data ?? string.Empty;`
	`49`	`+ preValue = pair?.Values.LastOrDefault()?.Data ?? string.Empty;`
`48`	`50`	`}`
`49`	`51`
`50`		`- if (!_states.ContainsKey(name) \|\| preValue != currentValue)`
	`52`	`+ if (!ContainsState(name) \|\| preValue != currentValue)`
`51`	`53`	`{`
`52`	`54`	`_logger.LogInformation($"[STATE] {name} = {value}");`
`53`	`55`	`foreach (var hook in hooks)`
`54`	`56`	`{`
`55`	`57`	`hook.OnStateChanged(name, preValue, currentValue).Wait();`
`56`	`58`	`}`
`57`	`59`
`58`		`- var stateValue = new StateValue`
	`60`	`+ var routingCtx = _services.GetRequiredService<IRoutingContext>();`
	`61`	`+ var newPair = new StateKeyValue`
	`62`	`+ {`
	`63`	`+ Key = name,`
	`64`	`+ Versioning = isNeedVersion`
	`65`	`+ };`
	`66`	`+`
	`67`	`+ var newValue = new StateValue`
`59`	`68`	`{`
`60`	`69`	`Data = currentValue,`
`61`		`- UpdateTime = DateTime.UtcNow`
	`70`	`+ MessageId = routingCtx.MessageId,`
	`71`	`+ Active = true,`
	`72`	`+ UpdateTime = DateTime.UtcNow,`
`62`	`73`	`};`
`63`	`74`
`64`		`- if (!_states.ContainsKey(name) \|\| !isNeedVersion)`
	`75`	`+ if (!isNeedVersion \|\| !_states.ContainsKey(name))`
`65`	`76`	`{`
`66`		`- _states[name] = new List<StateValue> { stateValue };`
	`77`	`+ newPair.Values = new List<StateValue> { newValue };`
	`78`	`+ _states[name] = newPair;`
`67`	`79`	`}`
`68`	`80`	`else`
`69`	`81`	`{`
`70`		`- _states[name].Add(stateValue);`
	`82`	`+ _states[name].Values.Add(newValue);`
`71`	`83`	`}`
`72`	`84`	`}`
`73`	`85`
`@@ -85,9 +97,12 @@ public Dictionary<string, string> Load(string conversationId)`
`85`	`97`	`{`
`86`	`98`	`foreach (var state in _states)`
`87`	`99`	`{`
`88`		`- var value = state.Value?.LastOrDefault()?.Data ?? string.Empty;`
`89`		`- curStates[state.Key] = value;`
`90`		`- _logger.LogInformation($"[STATE] {state.Key} : {value}");`
	`100`	`+ var value = state.Value?.Values?.LastOrDefault();`
	`101`	`+ if (value == null \|\| !value.Active) continue;`
	`102`	`+`
	`103`	`+ var data = value.Data ?? string.Empty;`
	`104`	`+ curStates[state.Key] = data;`
	`105`	`+ _logger.LogInformation($"[STATE] {state.Key} : {data}");`
`91`	`106`	`}`
`92`	`107`	`}`
`93`	`108`
`@@ -112,7 +127,7 @@ public void Save()`
`112`	`127`
`113`	`128`	`foreach (var dic in _states)`
`114`	`129`	`{`
`115`		`- states.Add(new StateKeyValue(dic.Key, dic.Value));`
	`130`	`+ states.Add(dic.Value);`
`116`	`131`	`}`
`117`	`132`
`118`	`133`	`_db.UpdateConversationStates(_conversationId, states);`
`@@ -121,27 +136,46 @@ public void Save()`
`121`	`136`
`122`	`137`	`public void CleanStates()`
`123`	`138`	`{`
`124`		`- _states.Clear();`
	`139`	`+ var utcNow = DateTime.UtcNow;`
	`140`	`+ foreach (var key in _states.Keys)`
	`141`	`+ {`
	`142`	`+ var value = _states[key];`
	`143`	`+ if (value == null \|\| !value.Versioning \|\| value.Values.IsNullOrEmpty()) continue;`
	`144`	`+`
	`145`	`+ var lastValue = value.Values.LastOrDefault();`
	`146`	`+ if (lastValue == null \|\| !lastValue.Active) continue;`
	`147`	`+`
	`148`	`+ value.Values.Add(new StateValue`
	`149`	`+ {`
	`150`	`+ Data = lastValue.Data,`
	`151`	`+ MessageId = lastValue.MessageId,`
	`152`	`+ Active = false,`
	`153`	`+ UpdateTime = utcNow`
	`154`	`+ });`
	`155`	`+ }`
`125`	`156`	`}`
`126`	`157`
`127`	`158`	`public Dictionary<string, string> GetStates()`
`128`	`159`	`{`
`129`	`160`	`var curStates = new Dictionary<string, string>();`
`130`	`161`	`foreach (var state in _states)`
`131`	`162`	`{`
`132`		`- curStates[state.Key] = state.Value?.LastOrDefault()?.Data ?? string.Empty;`
	`163`	`+ var value = state.Value?.Values?.LastOrDefault();`
	`164`	`+ if (value == null \|\| !value.Active) continue;`
	`165`	`+`
	`166`	`+ curStates[state.Key] = value.Data ?? string.Empty;`
`133`	`167`	`}`
`134`	`168`	`return curStates;`
`135`	`169`	`}`
`136`	`170`
`137`	`171`	`public string GetState(string name, string defaultValue = "")`
`138`	`172`	`{`
`139`		`- if (!_states.ContainsKey(name) \|\| _states[name].IsNullOrEmpty())`
	`173`	`+ if (!_states.ContainsKey(name) \|\| _states[name].Values.IsNullOrEmpty() \|\| !_states[name].Values.Last().Active)`
`140`	`174`	`{`
`141`	`175`	`return defaultValue;`
`142`	`176`	`}`
`143`	`177`
`144`		`- return _states[name].Last().Data;`
	`178`	`+ return _states[name].Values.Last().Data;`
`145`	`179`	`}`
`146`	`180`
`147`	`181`	`public void Dispose()`
`@@ -152,8 +186,9 @@ public void Dispose()`
`152`	`186`	`public bool ContainsState(string name)`
`153`	`187`	`{`
`154`	`188`	`return _states.ContainsKey(name)`
`155`		`- && !_states[name].IsNullOrEmpty()`
`156`		`- && !string.IsNullOrEmpty(_states[name].Last().Data);`
	`189`	`+ && !_states[name].Values.IsNullOrEmpty()`
	`190`	`+ && _states[name].Values.LastOrDefault()?.Active == true`
	`191`	`+ && !string.IsNullOrEmpty(_states[name].Values.Last().Data);`
`157`	`192`	`}`
`158`	`193`
`159`	`194`	`public void SaveStateByArgs(JsonDocument args)`
Original file line number	Diff line number	Diff line change
`@@ -5,13 +5,15 @@ namespace BotSharp.Plugin.MongoStorage.Models;`
`5`	`5`	`public class StateMongoElement`
`6`	`6`	`{`
`7`	`7`	`public string Key { get; set; }`
	`8`	`+ public bool Versioning { get; set; }`
`8`	`9`	`public List<StateValueMongoElement> Values { get; set; }`
`9`	`10`
`10`	`11`	`public static StateMongoElement ToMongoElement(StateKeyValue state)`
`11`	`12`	`{`
`12`	`13`	`return new StateMongoElement`
`13`	`14`	`{`
`14`	`15`	`Key = state.Key,`
	`16`	`+ Versioning = state.Versioning,`
`15`	`17`	`Values = state.Values?.Select(x => StateValueMongoElement.ToMongoElement(x))?.ToList() ?? new List<StateValueMongoElement>()`
`16`	`18`	`};`
`17`	`19`	`}`
`@@ -21,6 +23,7 @@ public static StateKeyValue ToDomainElement(StateMongoElement state)`
`21`	`23`	`return new StateKeyValue`
`22`	`24`	`{`
`23`	`25`	`Key = state.Key,`
	`26`	`+ Versioning = state.Versioning,`
`24`	`27`	`Values = state.Values?.Select(x => StateValueMongoElement.ToDomainElement(x))?.ToList() ?? new List<StateValue>()`
`25`	`28`	`};`
`26`	`29`	`}`
`@@ -29,13 +32,17 @@ public static StateKeyValue ToDomainElement(StateMongoElement state)`
`29`	`32`	`public class StateValueMongoElement`
`30`	`33`	`{`
`31`	`34`	`public string Data { get; set; }`
	`35`	`+ public string MessageId { get; set; }`
	`36`	`+ public bool Active { get; set; }`
`32`	`37`	`public DateTime UpdateTime { get; set; }`
`33`	`38`
`34`	`39`	`public static StateValueMongoElement ToMongoElement(StateValue element)`
`35`	`40`	`{`
`36`	`41`	`return new StateValueMongoElement`
`37`	`42`	`{`
`38`	`43`	`Data = element.Data,`
	`44`	`+ MessageId = element.MessageId,`
	`45`	`+ Active = element.Active,`
`39`	`46`	`UpdateTime = element.UpdateTime`
`40`	`47`	`};`
`41`	`48`	`}`
`@@ -45,6 +52,8 @@ public static StateValue ToDomainElement(StateValueMongoElement element)`
`45`	`52`	`return new StateValue`
`46`	`53`	`{`
`47`	`54`	`Data = element.Data,`
	`55`	`+ MessageId = element.MessageId,`
	`56`	`+ Active = element.Active,`
`48`	`57`	`UpdateTime = element.UpdateTime`
`49`	`58`	`};`
`50`	`59`	`}`