SemianiakaVY/BotSharp
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Merge pull request #148 from hchen2020/master

Browse source 
Fix instruction mode.
This commit is contained in:
Haiping 2023-09-19 16:56:22 -05:00 committed by GitHub
parent b35583912c 2819749e47
commit 3c0443afc1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/Infrastructure/BotSharp.OpenAPI/Controllers/InstructModeController.cs
View file

@ -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,

2
src/Infrastructure/BotSharp.OpenAPI/ViewModels/Instructs/InstructMessageModel.cs
View file

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