Set model in conversation state.

Oceania2018 · Oceania2018 · commit 17bfcb25185d · 2023-09-13T20:41:51.000-05:00
diff --git a/BotSharp.sln b/BotSharp.sln
@@ -241,6 +241,7 @@ Global
 		{631D9C12-86C4-44F0-99C3-D32C0754BF37} = {51AFE054-AE99-497D-A593-69BAEFB5106F}
 		{4F346DCE-087F-4368-AF88-EE9C720D0E69} = {2635EC9B-2E5F-4313-AC21-0B847F31F36C}
 		{298AC787-A104-414C-B114-82BE764FBD9C} = {4F346DCE-087F-4368-AF88-EE9C720D0E69}
+		{5CD330E1-9E5A-4112-8346-6E31CA98EF78} = {2635EC9B-2E5F-4313-AC21-0B847F31F36C}
 		{DB3DE37B-1208-4ED3-9615-A52AD0AAD69C} = {5CD330E1-9E5A-4112-8346-6E31CA98EF78}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -2,7 +2,7 @@
  <PropertyGroup>
    <LangVersion>10.0</LangVersion>
    <OutputPath>..\..\..\packages</OutputPath>
-   <PackageVersion>0.12.0</PackageVersion>
+   <PackageVersion>0.12.1</PackageVersion>
    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
  </PropertyGroup>
 </Project>
diff --git a/src/Infrastructure/BotSharp.Abstraction/Conversations/IConversationService.cs b/src/Infrastructure/BotSharp.Abstraction/Conversations/IConversationService.cs
@@ -4,7 +4,7 @@ public interface IConversationService
 {
     IConversationStateService States { get; }
     Task<Conversation> NewConversation(Conversation conversation);
-    void SetConversationId(string conversationId, string channel);
+    void SetConversationId(string conversationId, List<string> states);
     Task<Conversation> GetConversation(string id);
     Task<List<Conversation>> GetConversations();
     Task DeleteConversation(string id);
diff --git a/src/Infrastructure/BotSharp.Abstraction/Conversations/IConversationStateService.cs b/src/Infrastructure/BotSharp.Abstraction/Conversations/IConversationStateService.cs
@@ -6,7 +6,7 @@ namespace BotSharp.Abstraction.Conversations;
 public interface IConversationStateService
 {
     ConversationState Load(string conversationId);
-    string GetState(string name);
+    string GetState(string name, string defaultValue = "");
     ConversationState GetStates();
     void SetState(string name, string value);
     void CleanState();
diff --git a/src/Infrastructure/BotSharp.Abstraction/Conversations/Models/RoleDialogModel.cs b/src/Infrastructure/BotSharp.Abstraction/Conversations/Models/RoleDialogModel.cs
@@ -11,9 +11,6 @@ public class RoleDialogModel
     public DateTime CreatedAt { get; set; } = DateTime.UtcNow;
     public string Content { get; set; }
     public string CurrentAgentId { get; set; }
-    public string ModelName { get; set; } = "gpt-3.5-turbo";
-    public float Temperature { get; set; } = 0.5f;
-    public float SamplingFactor { get; set; } = 0.5f;
 
     /// <summary>
     /// Function name if LLM response function call
@@ -43,11 +40,6 @@ public class RoleDialogModel
     /// </summary>
     public bool StopCompletion { get; set; }
 
-    /// <summary>
-    /// Channel name
-    /// </summary>
-    public string Channel { get; set; }
-
     public RoleDialogModel(string role, string text)
     {
         Role = role;
diff --git a/src/Infrastructure/BotSharp.Core/Conversations/Services/ConversationService.GetChatCompletionsAsyncRecursively.cs b/src/Infrastructure/BotSharp.Core/Conversations/Services/ConversationService.GetChatCompletionsAsyncRecursively.cs
@@ -1,7 +1,5 @@
 using BotSharp.Abstraction.Agents.Enums;
 using BotSharp.Abstraction.Agents.Models;
-using BotSharp.Abstraction.Conversations.Models;
-using BotSharp.Abstraction.MLTasks;
 using BotSharp.Abstraction.Templating;
 
 namespace BotSharp.Core.Conversations.Services;
@@ -16,7 +14,7 @@ private async Task<bool> GetChatCompletionsAsyncRecursively(Agent agent,
         Func<RoleDialogModel, Task> onFunctionExecuting,
         Func<RoleDialogModel, Task> onFunctionExecuted)
     {
-        var chatCompletion = CompletionProvider.GetChatCompletion(_services, wholeDialogs.Last().ModelName);
+        var chatCompletion = CompletionProvider.GetChatCompletion(_services);
 
         currentRecursiveDepth++;
         if (currentRecursiveDepth > _settings.MaxRecursiveDepth)
@@ -32,10 +30,7 @@ private async Task<bool> GetChatCompletionsAsyncRecursively(Agent agent,
 
             await HandleAssistantMessage(agent, new RoleDialogModel(AgentRole.Assistant, text)
             {
-                CurrentAgentId = agent.Id,
-                Channel = wholeDialogs.Last().Channel,
-                Temperature = wholeDialogs.Last().Temperature,
-                SamplingFactor = wholeDialogs.Last().SamplingFactor
+                CurrentAgentId = agent.Id
             }, onMessageReceived);
 
             return false;
@@ -55,10 +50,7 @@ private async Task<bool> GetChatCompletionsAsyncRecursively(Agent agent,
             {
                 await HandleAssistantMessage(agent, new RoleDialogModel(AgentRole.Assistant, fn.Content)
                 {
-                    CurrentAgentId = fn.CurrentAgentId,
-                    Channel = fn.Channel,
-                    Temperature = fn.Temperature,
-                    SamplingFactor = fn.SamplingFactor
+                    CurrentAgentId = fn.CurrentAgentId
                 }, onMessageReceived);
 
                 return;
@@ -68,11 +60,8 @@ private async Task<bool> GetChatCompletionsAsyncRecursively(Agent agent,
                 await HandleAssistantMessage(agent, new RoleDialogModel(AgentRole.Assistant, fn.Content)
                 {
                     CurrentAgentId = fn.CurrentAgentId,
-                    Channel = fn.Channel,
                     ExecutionData = fn.ExecutionData,
-                    ExecutionResult = fn.ExecutionResult,
-                    Temperature = fn.Temperature,
-                    SamplingFactor = fn.SamplingFactor
+                    ExecutionResult = fn.ExecutionResult
                 }, onMessageReceived);
 
                 return;
@@ -106,10 +95,7 @@ await GetChatCompletionsAsyncRecursively(agent,
                 {
                     await HandleAssistantMessage(agent, new RoleDialogModel(AgentRole.Assistant, response)
                     {
-                        CurrentAgentId = agent.Id,
-                        Channel = wholeDialogs.Last().Channel,
-                        Temperature = wholeDialogs.Last().Temperature,
-                        SamplingFactor = wholeDialogs.Last().SamplingFactor
+                        CurrentAgentId = agent.Id
                     }, onMessageReceived);
 
                     return;
diff --git a/src/Infrastructure/BotSharp.Core/Conversations/Services/ConversationService.SendMessage.cs b/src/Infrastructure/BotSharp.Core/Conversations/Services/ConversationService.SendMessage.cs
@@ -43,10 +43,7 @@ public async Task<bool> SendMessage(string agentId,
             {
                 var message = new RoleDialogModel(AgentRole.Assistant, lastDialog.Content)
                 {
-                    CurrentAgentId = agent.Id,
-                    Channel = lastDialog.Channel,
-                    Temperature = lastDialog.Temperature,
-                    SamplingFactor = lastDialog.SamplingFactor
+                    CurrentAgentId = agent.Id
                 };
                 await onMessageReceived(message);
                 _storage.Append(_conversationId, message);
@@ -65,10 +62,7 @@ public async Task<bool> SendMessage(string agentId,
             {
                 await HandleAssistantMessage(agent, new RoleDialogModel(AgentRole.Assistant, reasonedContext.Content)
                 {
-                    CurrentAgentId = agent.Id,
-                    Channel = lastDialog.Channel,
-                    Temperature = lastDialog.Temperature,
-                    SamplingFactor = lastDialog.SamplingFactor
+                    CurrentAgentId = agent.Id
                 }, onMessageReceived);
 
                 return true;
@@ -77,10 +71,7 @@ public async Task<bool> SendMessage(string agentId,
             {
                 await HandleAssistantMessage(agent, new RoleDialogModel(AgentRole.Assistant, reasonedContext.Content)
                 {
-                    CurrentAgentId = agent.Id,
-                    Channel = lastDialog.Channel,
-                    Temperature = lastDialog.Temperature,
-                    SamplingFactor = lastDialog.SamplingFactor
+                    CurrentAgentId = agent.Id
                 }, onMessageReceived);
 
                 return true;
diff --git a/src/Infrastructure/BotSharp.Core/Conversations/Services/ConversationService.cs b/src/Infrastructure/BotSharp.Core/Conversations/Services/ConversationService.cs
@@ -1,5 +1,4 @@
 using BotSharp.Abstraction.Repositories;
-using BotSharp.Abstraction.Repositories.Records;
 
 namespace BotSharp.Core.Conversations.Services;
 
@@ -82,10 +81,10 @@ public List<RoleDialogModel> GetDialogHistory(int lastCount = 20)
             .ToList();
     }
 
-    public void SetConversationId(string conversationId, string channel)
+    public void SetConversationId(string conversationId, List<string> states)
     {
         _conversationId = conversationId;
         _state.Load(_conversationId);
-        _state.SetState("channel", channel);
+        states.ForEach(x => _state.SetState(x.Split('=')[0], x.Split('=')[1]));
     }
 }
diff --git a/src/Infrastructure/BotSharp.Core/Conversations/Services/ConversationStateService.cs b/src/Infrastructure/BotSharp.Core/Conversations/Services/ConversationStateService.cs
@@ -112,11 +112,11 @@ private string GetStorageFile(string conversationId)
     public ConversationState GetStates()
         => _states;
 
-    public string GetState(string name)
+    public string GetState(string name, string defaultValue = "")
     {
         if (!_states.ContainsKey(name))
         {
-            _states[name] = "";
+            _states[name] = defaultValue ?? "";
         }
         return _states[name];
     }
diff --git a/src/Infrastructure/BotSharp.Core/Infrastructures/CompletionProvider.cs b/src/Infrastructure/BotSharp.Core/Infrastructures/CompletionProvider.cs
@@ -4,11 +4,13 @@ namespace BotSharp.Core.Infrastructures;
 
 public class CompletionProvider
 {
-    public static IChatCompletion GetChatCompletion(IServiceProvider services, string modelName = "gpt-3.5-turbo")
+    public static IChatCompletion GetChatCompletion(IServiceProvider services)
     {
         var completions = services.GetServices<IChatCompletion>();
-        var settings = services.GetRequiredService<ConversationSetting>();
+        // var settings = services.GetRequiredService<ConversationSetting>();
         // completions.FirstOrDefault(x => x.GetType().FullName.EndsWith(settings.ChatCompletion));
-        return completions.FirstOrDefault(x => x.ModelName == modelName);
+        var state = services.GetRequiredService<IConversationStateService>();
+        var model = state.GetState("model", "gpt-3.5-turbo");
+        return completions.FirstOrDefault(x => x.ModelName == model);
     }
 }
diff --git a/src/Infrastructure/BotSharp.Core/Instructs/InstructService.cs b/src/Infrastructure/BotSharp.Core/Instructs/InstructService.cs
@@ -71,7 +71,7 @@ private async Task<bool> ExecuteInstructionRecursively(Agent agent,
         Func<RoleDialogModel, Task> onFunctionExecuting, 
         Func<RoleDialogModel, Task> onFunctionExecuted)
     {
-        var chatCompletion = CompletionProvider.GetChatCompletion(_services, wholeDialogs.Last().ModelName);
+        var chatCompletion = CompletionProvider.GetChatCompletion(_services);
 
         var result = await chatCompletion.GetChatCompletionsAsync(agent, wholeDialogs, async msg =>
         {
diff --git a/src/Infrastructure/BotSharp.Core/Routing/Simulator.cs b/src/Infrastructure/BotSharp.Core/Routing/Simulator.cs
@@ -64,7 +64,7 @@ private async Task<RoleDialogModel> SendMessageToReasoner(Agent reasoner)
             new RoleDialogModel(AgentRole.User, @"What's the next step,  your response must be in JSON format with ""function"" and ""parameters"". ")
         };
 
-        var chatCompletion = CompletionProvider.GetChatCompletion(_services, "gpt-4");
+        var chatCompletion = CompletionProvider.GetChatCompletion(_services);
 
         RoleDialogModel response = null;
         await chatCompletion.GetChatCompletionsAsync(reasoner, wholeDialogs, async msg
@@ -111,7 +111,7 @@ private async Task<RoleDialogModel> SendMessageToAgent(string agentId, List<Role
         var agentService = _services.GetRequiredService<IAgentService>();
         var agent = await agentService.LoadAgent(agentId);
 
-        var chatCompletion = CompletionProvider.GetChatCompletion(_services, wholeDialogs.Last().ModelName);
+        var chatCompletion = CompletionProvider.GetChatCompletion(_services);
 
         RoleDialogModel response = null;
         await chatCompletion.GetChatCompletionsAsync(agent, wholeDialogs, async msg
diff --git a/src/Infrastructure/BotSharp.OpenAPI/Controllers/ConversationController.cs b/src/Infrastructure/BotSharp.OpenAPI/Controllers/ConversationController.cs
@@ -43,20 +43,17 @@ public async Task<MessageResponseModel> SendMessage([FromRoute] string agentId,
         [FromBody] NewMessageModel input)
     {
         var conv = _services.GetRequiredService<IConversationService>();
-        conv.SetConversationId(conversationId, input.Channel);
-        input.States.ForEach(x => conv.States.SetState(x.Split('=')[0], x.Split('=')[1]));
-        
+        conv.SetConversationId(conversationId, input.States);
+        conv.States.SetState("channel", input.Channel);
+        conv.States.SetState("model", input.ModelName);
+        conv.States.SetState("temperature", input.Temperature.ToString());
+        conv.States.SetState("sampling_factor", input.SamplingFactor.ToString());
+
         var response = new MessageResponseModel();
         var stackMsg = new List<RoleDialogModel>();
 
         await conv.SendMessage(agentId,
-            new RoleDialogModel("user", input.Text)
-            {
-                Channel = input.Channel,
-                ModelName = input.ModelName,
-                Temperature = input.Temperature,
-                SamplingFactor = input.SamplingFactor
-            },
+            new RoleDialogModel("user", input.Text),
             async msg =>
             {
                 stackMsg.Add(msg);
diff --git a/src/Infrastructure/BotSharp.OpenAPI/Controllers/InstructModeController.cs b/src/Infrastructure/BotSharp.OpenAPI/Controllers/InstructModeController.cs
@@ -36,10 +36,7 @@ public async Task<InstructResult> NewConversation([FromRoute] string agentId,
         }
 
         return await instructor.ExecuteInstruction(agent,
-            new RoleDialogModel(AgentRole.User, input.Text)
-            {
-                ModelName = input.ModelName
-            },
+            new RoleDialogModel(AgentRole.User, input.Text),
             fn => Task.CompletedTask,
             fn => Task.CompletedTask,
             fn => Task.CompletedTask);
diff --git a/src/Infrastructure/BotSharp.OpenAPI/ViewModels/Instructs/InstructMessageModel.cs b/src/Infrastructure/BotSharp.OpenAPI/ViewModels/Instructs/InstructMessageModel.cs
@@ -1,8 +1,8 @@
-using BotSharp.OpenAPI.ViewModels.Conversations;
-
+using BotSharp.Abstraction.Conversations.Models;
 namespace BotSharp.OpenAPI.ViewModels.Instructs;
 
-public class InstructMessageModel : NewMessageModel
+public class InstructMessageModel : IncomingMessageModel
 {
+    public override string Channel { get; set; } = "openapi";
     public string? TemplateName { get; set; }
 }
diff --git a/src/Plugins/BotSharp.Plugin.AzureOpenAI/Providers/ChatCompletionProvider.cs b/src/Plugins/BotSharp.Plugin.AzureOpenAI/Providers/ChatCompletionProvider.cs
@@ -2,6 +2,7 @@
 using Azure.AI.OpenAI;
 using BotSharp.Abstraction.Agents.Enums;
 using BotSharp.Abstraction.Agents.Models;
+using BotSharp.Abstraction.Conversations;
 using BotSharp.Abstraction.Conversations.Models;
 using BotSharp.Abstraction.Conversations.Settings;
 using BotSharp.Abstraction.Functions.Models;
@@ -104,10 +105,7 @@ public async Task<bool> GetChatCompletionsAsync(Agent agent,
             {
                 CurrentAgentId = agent.Id,
                 FunctionName = message.FunctionCall.Name,
-                FunctionArgs = message.FunctionCall.Arguments,
-                Channel = conversations.Last().Channel,
-                Temperature = conversations.Last().Temperature,
-                SamplingFactor = conversations.Last().SamplingFactor
+                FunctionArgs = message.FunctionCall.Arguments
             };
 
             // Somethings LLM will generate a function name with agent name.
@@ -125,10 +123,7 @@ public async Task<bool> GetChatCompletionsAsync(Agent agent,
 
             var msg = new RoleDialogModel(AgentRole.Assistant, message.Content)
             {
-                CurrentAgentId= agent.Id,
-                Channel = conversations.Last().Channel,
-                Temperature = conversations.Last().Temperature,
-                SamplingFactor = conversations.Last().SamplingFactor
+                CurrentAgentId= agent.Id
             };
 
             // Text response received
@@ -230,8 +225,11 @@ protected ChatCompletionsOptions PrepareOptions(Agent agent, List<RoleDialogMode
         }
 
         // https://community.openai.com/t/cheat-sheet-mastering-temperature-and-top-p-in-chatgpt-api-a-few-tips-and-tricks-on-controlling-the-creativity-deterministic-output-of-prompt-responses/172683
-        chatCompletionsOptions.Temperature = conversations.Last().Temperature;
-        chatCompletionsOptions.NucleusSamplingFactor = conversations.Last().SamplingFactor;
+        var state = _services.GetRequiredService<IConversationStateService>();
+        var temperature = float.Parse(state.GetState("temperature", "0.5"));
+        var samplingFactor = float.Parse(state.GetState("sampling_factor", "0.5"));
+        chatCompletionsOptions.Temperature = temperature;
+        chatCompletionsOptions.NucleusSamplingFactor = samplingFactor;
 
         var convSetting = _services.GetRequiredService<ConversationSetting>();
         if (convSetting.ShowVerboseLog)
diff --git a/src/Plugins/BotSharp.Plugin.ChatbotUI/ChatbotUiController.cs b/src/Plugins/BotSharp.Plugin.ChatbotUI/ChatbotUiController.cs
@@ -69,20 +69,17 @@ public async Task SendMessage([FromBody] OpenAiMessageInput input)
         Response.Headers.Add(HeaderNames.Connection, "keep-alive");
         var outputStream = Response.Body;
 
-        var channel = "webchat";
         var message = input.Messages
             .Where(x => x.Role == AgentRole.User)
-            .Select(x => new RoleDialogModel(x.Role, x.Content)
-            {
-                Channel = channel,
-                ModelName = input.ModelName,
-                Temperature = input.Temperature,
-                SamplingFactor = input.SamplingFactor
-            }).Last();
+            .Select(x => new RoleDialogModel(x.Role, x.Content))
+            .Last();
 
         var conv = _services.GetRequiredService<IConversationService>();
-        conv.SetConversationId(input.ConversationId, channel);
-        input.States.ForEach(x => conv.States.SetState(x.Split('=')[0], x.Split('=')[1]));
+        conv.SetConversationId(input.ConversationId, input.States);
+        conv.States.SetState("model", input.ModelName);
+        conv.States.SetState("channel", "webchat");
+        conv.States.SetState("temperature", "0.5");
+        conv.States.SetState("sampling_factor", "0.5");
 
         var result = await conv.SendMessage(input.AgentId, 
             message, 
diff --git a/src/Plugins/BotSharp.Plugin.MetaMessenger/Controllers/WebhookController.cs b/src/Plugins/BotSharp.Plugin.MetaMessenger/Controllers/WebhookController.cs
@@ -98,12 +98,12 @@ public async Task<ActionResult<WebhookResponse>> Messages([FromRoute] string age
 
                 // Go to LLM
                 var conv = _services.GetRequiredService<IConversationService>();
-                conv.SetConversationId(senderId, "messenger");
+                conv.SetConversationId(senderId, new List<string> 
+                { 
+                    "channel=messenger" 
+                });
 
-                var result = await conv.SendMessage(agentId, new RoleDialogModel("user", input)
-                {
-                    Channel = "messenger"
-                }, async msg =>
+                var result = await conv.SendMessage(agentId, new RoleDialogModel("user", input), async msg =>
                 {
                     reply.Text = msg.Content;
                 }, async functionExecuting =>
diff --git a/src/Plugins/BotSharp.Plugin.WeChat/WeChatBackgroundService.cs b/src/Plugins/BotSharp.Plugin.WeChat/WeChatBackgroundService.cs

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ public interface IConversationService`
`4`	`4`	`{`
`5`	`5`	`IConversationStateService States { get; }`
`6`	`6`	`Task<Conversation> NewConversation(Conversation conversation);`
`7`		`- void SetConversationId(string conversationId, string channel);`
	`7`	`+ void SetConversationId(string conversationId, List<string> states);`
`8`	`8`	`Task<Conversation> GetConversation(string id);`
`9`	`9`	`Task<List<Conversation>> GetConversations();`
`10`	`10`	`Task DeleteConversation(string id);`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ namespace BotSharp.Abstraction.Conversations;`
`6`	`6`	`public interface IConversationStateService`
`7`	`7`	`{`
`8`	`8`	`ConversationState Load(string conversationId);`
`9`		`- string GetState(string name);`
	`9`	`+ string GetState(string name, string defaultValue = "");`
`10`	`10`	`ConversationState GetStates();`
`11`	`11`	`void SetState(string name, string value);`
`12`	`12`	`void CleanState();`
Original file line number	Diff line number	Diff line change
`@@ -43,10 +43,7 @@ public async Task<bool> SendMessage(string agentId,`
`43`	`43`	`{`
`44`	`44`	`var message = new RoleDialogModel(AgentRole.Assistant, lastDialog.Content)`
`45`	`45`	`{`
`46`		`- CurrentAgentId = agent.Id,`
`47`		`- Channel = lastDialog.Channel,`
`48`		`- Temperature = lastDialog.Temperature,`
`49`		`- SamplingFactor = lastDialog.SamplingFactor`
	`46`	`+ CurrentAgentId = agent.Id`
`50`	`47`	`};`
`51`	`48`	`await onMessageReceived(message);`
`52`	`49`	`_storage.Append(_conversationId, message);`
`@@ -65,10 +62,7 @@ public async Task<bool> SendMessage(string agentId,`
`65`	`62`	`{`
`66`	`63`	`await HandleAssistantMessage(agent, new RoleDialogModel(AgentRole.Assistant, reasonedContext.Content)`
`67`	`64`	`{`
`68`		`- CurrentAgentId = agent.Id,`
`69`		`- Channel = lastDialog.Channel,`
`70`		`- Temperature = lastDialog.Temperature,`
`71`		`- SamplingFactor = lastDialog.SamplingFactor`
	`65`	`+ CurrentAgentId = agent.Id`
`72`	`66`	`}, onMessageReceived);`
`73`	`67`
`74`	`68`	`return true;`
`@@ -77,10 +71,7 @@ public async Task<bool> SendMessage(string agentId,`
`77`	`71`	`{`
`78`	`72`	`await HandleAssistantMessage(agent, new RoleDialogModel(AgentRole.Assistant, reasonedContext.Content)`
`79`	`73`	`{`
`80`		`- CurrentAgentId = agent.Id,`
`81`		`- Channel = lastDialog.Channel,`
`82`		`- Temperature = lastDialog.Temperature,`
`83`		`- SamplingFactor = lastDialog.SamplingFactor`
	`74`	`+ CurrentAgentId = agent.Id`
`84`	`75`	`}, onMessageReceived);`
`85`	`76`
`86`	`77`	`return true;`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`using BotSharp.Abstraction.Repositories;`
`2`		`-using BotSharp.Abstraction.Repositories.Records;`
`3`	`2`
`4`	`3`	`namespace BotSharp.Core.Conversations.Services;`
`5`	`4`
`@@ -82,10 +81,10 @@ public List<RoleDialogModel> GetDialogHistory(int lastCount = 20)`
`82`	`81`	`.ToList();`
`83`	`82`	`}`
`84`	`83`
`85`		`- public void SetConversationId(string conversationId, string channel)`
	`84`	`+ public void SetConversationId(string conversationId, List<string> states)`
`86`	`85`	`{`
`87`	`86`	`_conversationId = conversationId;`
`88`	`87`	`_state.Load(_conversationId);`
`89`		`- _state.SetState("channel", channel);`
	`88`	`+ states.ForEach(x => _state.SetState(x.Split('=')[0], x.Split('=')[1]));`
`90`	`89`	`}`
`91`	`90`	`}`
Original file line number	Diff line number	Diff line change
`@@ -112,11 +112,11 @@ private string GetStorageFile(string conversationId)`
`112`	`112`	`public ConversationState GetStates()`
`113`	`113`	`=> _states;`
`114`	`114`
`115`		`- public string GetState(string name)`
	`115`	`+ public string GetState(string name, string defaultValue = "")`
`116`	`116`	`{`
`117`	`117`	`if (!_states.ContainsKey(name))`
`118`	`118`	`{`
`119`		`- _states[name] = "";`
	`119`	`+ _states[name] = defaultValue ?? "";`
`120`	`120`	`}`
`121`	`121`	`return _states[name];`
`122`	`122`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,11 +4,13 @@ namespace BotSharp.Core.Infrastructures;`
`4`	`4`
`5`	`5`	`public class CompletionProvider`
`6`	`6`	`{`
`7`		`- public static IChatCompletion GetChatCompletion(IServiceProvider services, string modelName = "gpt-3.5-turbo")`
	`7`	`+ public static IChatCompletion GetChatCompletion(IServiceProvider services)`
`8`	`8`	`{`
`9`	`9`	`var completions = services.GetServices<IChatCompletion>();`
`10`		`- var settings = services.GetRequiredService<ConversationSetting>();`
	`10`	`+ // var settings = services.GetRequiredService<ConversationSetting>();`
`11`	`11`	`// completions.FirstOrDefault(x => x.GetType().FullName.EndsWith(settings.ChatCompletion));`
`12`		`- return completions.FirstOrDefault(x => x.ModelName == modelName);`
	`12`	`+ var state = services.GetRequiredService<IConversationStateService>();`
	`13`	`+ var model = state.GetState("model", "gpt-3.5-turbo");`
	`14`	`+ return completions.FirstOrDefault(x => x.ModelName == model);`
`13`	`15`	`}`
`14`	`16`	`}`