Skip to content

Commit 2d8866a

Browse files
author
Haiping Chen
committed
Resolve conflict
2 parents a135387 + 9f31f84 commit 2d8866a

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

src/Plugins/BotSharp.Plugin.ChatHub/Hooks/StreamingLogHook.cs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -79,18 +79,18 @@ public async Task AfterGenerated(RoleDialogModel message, TokenStatsModel tokenS
7979
var conversationId = _state.GetConversationId();
8080
var agent = await agentService.LoadAgent(message.CurrentAgentId);
8181

82-
await _chatHub.Clients.User(_user.Id).SendAsync("OnConversationContentLogGenerated", BuildContentLog(conversationId, agent?.Name, tokenStats.Prompt, message));
83-
84-
// Log routing output
85-
try
82+
string log;
83+
if (message.Role == AgentRole.Function)
8684
{
87-
var inst = message.Content.JsonContent<FunctionCallFromLlm>();
88-
await _chatHub.Clients.User(_user.Id).SendAsync("OnConversationContentLogGenerated", BuildContentLog(conversationId, agent?.Name, message.Content, message));
85+
log = $"[{agent?.Name}]: {message.FunctionName}({message.FunctionArgs}) => {message.Content}";
86+
log += $"\r\n<== MessageId: {message.MessageId}";
8987
}
90-
catch
88+
else
9189
{
92-
// ignore
90+
log = tokenStats.Prompt;
9391
}
92+
93+
await _chatHub.Clients.User(_user.Id).SendAsync("OnConversationContentLogGenerated", BuildContentLog(conversationId, agent?.Name, log, message));
9494
}
9595

9696
/// <summary>

0 commit comments

Comments
 (0)