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

resolve conflict

Browse source
This commit is contained in:
Jicheng Lu 2025-07-24 15:15:53 -05:00
parent 35652a7b71
commit 957a3e51a8
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/Plugins/BotSharp.Plugin.ChatHub/Observers/ChatHubObserver.cs
View file

@ -136,7 +136,7 @@ public class ChatHubObserver : IObserver<HubObserveData>
private bool AllowSendingMessage() private bool AllowSendingMessage()
{ {
var sidecar = _services.GetService<IConversationSideCar>(); var sidecar = _services.GetService<IConversationSideCar>();
return sidecar == null || !sidecar.IsEnabled(); return sidecar == null || !sidecar.IsEnabled;
} }
private async Task GenerateSenderAction(string conversationId, ConversationSenderActionModel action) private async Task GenerateSenderAction(string conversationId, ConversationSenderActionModel action)

6
src/Plugins/BotSharp.Plugin.OpenAI/Providers/Chat/ChatCompletionProvider.cs
View file

@ -259,10 +259,10 @@ public class ChatCompletionProvider : IChatCompletion
var functionName = meta?.FunctionName; var functionName = meta?.FunctionName;
var toolCallId = meta?.ToolCallId; var toolCallId = meta?.ToolCallId;
var args = toolCalls.Where(x => x.FunctionArgumentsUpdate != null).Select(x => x.FunctionArgumentsUpdate.ToString()).ToList(); var args = toolCalls.Where(x => x.FunctionArgumentsUpdate != null).Select(x => x.FunctionArgumentsUpdate.ToString()).ToList();
var functionArgument = string.Join(string.Empty, args); var functionArguments = string.Join(string.Empty, args);
#if DEBUG #if DEBUG
_logger.LogCritical($"Tool Call (id: {toolCallId}) => {functionName}({functionArgument})"); _logger.LogCritical($"Tool Call (id: {toolCallId}) => {functionName}({functionArguments})");
#endif #endif
responseMessage = new RoleDialogModel(AgentRole.Function, string.Empty) responseMessage = new RoleDialogModel(AgentRole.Function, string.Empty)
@ -271,7 +271,7 @@ public class ChatCompletionProvider : IChatCompletion
MessageId = messageId, MessageId = messageId,
ToolCallId = toolCallId, ToolCallId = toolCallId,
FunctionName = functionName, FunctionName = functionName,
FunctionArgs = functionArgument FunctionArgs = functionArguments
}; };
} }
else if (choice.FinishReason.HasValue) else if (choice.FinishReason.HasValue)