Merge pull request #148 from hchen2020/master

Fix instruction mode.

Author: Oceania2018

src/Infrastructure/BotSharp.OpenAPI/Controllers/InstructModeController.cs

@@ -20,21 +20,25 @@ public InstructModeController(IServiceProvider services)
     }
 
     [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>();
         var agentService = _services.GetRequiredService<IAgentService>();
         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,

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; }
 }