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

Merge branch 'master' of https://github.com/SciSharp/BotSharp into features/add-user-avatar

Browse source
This commit is contained in:
Jicheng Lu 2024-05-24 11:48:37 -05:00
parent 948a3981a6 d9fd6525dc
commit ca0d7c8f31
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -251,6 +251,8 @@ public class ConversationController : ControllerBase
await conv.TruncateConversation(conversationId, input.TruncateMessageId, inputMsg.MessageId); await conv.TruncateConversation(conversationId, input.TruncateMessageId, inputMsg.MessageId);
} }
var state = _services.GetRequiredService<IConversationStateService>();
var routing = _services.GetRequiredService<IRoutingService>(); var routing = _services.GetRequiredService<IRoutingService>();
routing.Context.SetMessageId(conversationId, inputMsg.MessageId); routing.Context.SetMessageId(conversationId, inputMsg.MessageId);
@ -278,6 +280,7 @@ public class ConversationController : ControllerBase
response.RichContent = msg.SecondaryRichContent ?? msg.RichContent; response.RichContent = msg.SecondaryRichContent ?? msg.RichContent;
response.Instruction = msg.Instruction; response.Instruction = msg.Instruction;
response.Data = msg.Data; response.Data = msg.Data;
response.States = state.GetStates();
await OnChunkReceived(Response, response); await OnChunkReceived(Response, response);
}, },
@ -290,6 +293,7 @@ public class ConversationController : ControllerBase
MessageId = msg.MessageId, MessageId = msg.MessageId,
Text = msg.Indication, Text = msg.Indication,
Function = "indicating", Function = "indicating",
States = new Dictionary<string, string>()
}; };
await OnChunkReceived(Response, indicator); await OnChunkReceived(Response, indicator);
}, },
@ -299,7 +303,6 @@ public class ConversationController : ControllerBase
}); });
var state = _services.GetRequiredService<IConversationStateService>();
response.States = state.GetStates(); response.States = state.GetStates();
response.MessageId = inputMsg.MessageId; response.MessageId = inputMsg.MessageId;
response.ConversationId = conversationId; response.ConversationId = conversationId;
@ -309,7 +312,10 @@ public class ConversationController : ControllerBase
private async Task OnChunkReceived(HttpResponse response, ChatResponseModel message) private async Task OnChunkReceived(HttpResponse response, ChatResponseModel message)
{ {
var json = JsonSerializer.Serialize(message); var json = JsonSerializer.Serialize(message, new JsonSerializerOptions
{
PropertyNamingPolicy = JsonNamingPolicy.CamelCase,
});
var buffer = Encoding.UTF8.GetBytes($"data:{json}\n"); var buffer = Encoding.UTF8.GetBytes($"data:{json}\n");
await response.Body.WriteAsync(buffer, 0, buffer.Length); await response.Body.WriteAsync(buffer, 0, buffer.Length);