From ba49e672ceb351b34249f7c4ba32126cb0840ea8 Mon Sep 17 00:00:00 2001
From: hchen <hchen@smsassist.com>
Date: Tue, 19 Sep 2023 13:05:51 -0500
Subject: [PATCH] Fix instruction mode.

---
 .../Controllers/InstructModeController.cs              | 10 +++++++---
 .../ViewModels/Instructs/InstructMessageModel.cs       |  2 +-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/Infrastructure/BotSharp.OpenAPI/Controllers/InstructModeController.cs b/src/Infrastructure/BotSharp.OpenAPI/Controllers/InstructModeController.cs
index 3eeac672..d29fc4f2 100644
--- a/src/Infrastructure/BotSharp.OpenAPI/Controllers/InstructModeController.cs
+++ b/src/Infrastructure/BotSharp.OpenAPI/Controllers/InstructModeController.cs
@@ -20,7 +20,7 @@ public class InstructModeController : ControllerBase, IApiAdapter
     }
 
     [HttpPost("/instruct/{agentId}")]
-    public async Task<InstructResult> NewConversation([FromRoute] string agentId,
+    public async Task<InstructResult> InstructCompletion([FromRoute] string agentId,
         [FromBody] InstructMessageModel input)
     {
         var instructor = _services.GetRequiredService<IInstructService>();
@@ -28,13 +28,17 @@ public class InstructModeController : ControllerBase, IApiAdapter
         Agent agent = await agentService.LoadAgent(agentId);
 
         // switch to different instruction template
-        if (!string.IsNullOrEmpty(input.TemplateName))
+        if (!string.IsNullOrEmpty(input.Template))
         {
             var agentSettings = _services.GetRequiredService<AgentSettings>();
-            var filePath = Path.Combine(agentService.GetAgentDataDir(agentId), $"{input.TemplateName}.{agentSettings.TemplateFormat}");
+            var filePath = Path.Combine(agentService.GetAgentDataDir(agentId), $"{input.Template}.{agentSettings.TemplateFormat}");
             agent.Instruction = System.IO.File.ReadAllText(filePath);
         }
 
+        var conv = _services.GetRequiredService<IConversationService>();
+        conv.States.SetState("provider", input.Provider)
+            .SetState("model", input.Model);
+
         return await instructor.ExecuteInstruction(agent,
             new RoleDialogModel(AgentRole.User, input.Text),
             fn => Task.CompletedTask,
diff --git a/src/Infrastructure/BotSharp.OpenAPI/ViewModels/Instructs/InstructMessageModel.cs b/src/Infrastructure/BotSharp.OpenAPI/ViewModels/Instructs/InstructMessageModel.cs
index c11494bf..6da68895 100644
--- a/src/Infrastructure/BotSharp.OpenAPI/ViewModels/Instructs/InstructMessageModel.cs
+++ b/src/Infrastructure/BotSharp.OpenAPI/ViewModels/Instructs/InstructMessageModel.cs
@@ -4,5 +4,5 @@ namespace BotSharp.OpenAPI.ViewModels.Instructs;
 public class InstructMessageModel : IncomingMessageModel
 {
     public override string Channel { get; set; } = "openapi";
-    public string? TemplateName { get; set; }
+    public string? Template { get; set; }
 }