Skip to content

Commit 741d3f6

Browse files
author
Jicheng Lu
committed
append system prompt
1 parent 1b141d3 commit 741d3f6

2 files changed

Lines changed: 73 additions & 66 deletions

File tree

‎src/Plugins/BotSharp.Plugin.OpenAI/Providers/Chat/ChatCompletionProvider.cs‎

Lines changed: 38 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -367,42 +367,8 @@ public async Task<RoleDialogModel> GetChatCompletionsStreamingAsync(Agent agent,
367367
// Prepare instruction and functions
368368
var renderData = agentService.CollectRenderData(agent);
369369
var (instruction, functions) = agentService.PrepareInstructionAndFunctions(agent, renderData);
370-
if (!string.IsNullOrWhiteSpace(instruction))
371-
{
372-
renderedInstructions.Add(instruction);
373-
messages.Add(new SystemChatMessage(instruction));
374-
}
375-
376-
// Render functions
377-
if (options.WebSearchOptions == null)
378-
{
379-
foreach (var function in functions)
380-
{
381-
if (!agentService.RenderFunction(agent, function, renderData))
382-
{
383-
continue;
384-
}
385-
386-
var property = agentService.RenderFunctionProperty(agent, function, renderData);
387-
388-
options.Tools.Add(ChatTool.CreateFunctionTool(
389-
functionName: function.Name,
390-
functionDescription: function.Description,
391-
functionParameters: BinaryData.FromObjectAsJson(property)));
392-
}
393-
}
394-
395-
if (!string.IsNullOrEmpty(agent.Knowledges))
396-
{
397-
messages.Add(new SystemChatMessage(agent.Knowledges));
398-
}
399-
400-
var samples = ProviderHelper.GetChatSamples(agent.Samples);
401-
foreach (var sample in samples)
402-
{
403-
messages.Add(sample.Role == AgentRole.User ? new UserChatMessage(sample.Content) : new AssistantChatMessage(sample.Content));
404-
}
405370

371+
// Build messages
406372
var filteredMessages = conversations.Select(x => x).ToList();
407373
var firstUserMsgIdx = filteredMessages.FindIndex(x => x.Role == AgentRole.User);
408374
if (firstUserMsgIdx > 0)
@@ -453,6 +419,43 @@ public async Task<RoleDialogModel> GetChatCompletionsStreamingAsync(Agent agent,
453419
}
454420
}
455421

422+
// Build system messages
423+
if (!string.IsNullOrWhiteSpace(instruction))
424+
{
425+
renderedInstructions.Add(instruction);
426+
messages.Add(new SystemChatMessage(instruction));
427+
}
428+
429+
if (!string.IsNullOrEmpty(agent.Knowledges))
430+
{
431+
messages.Add(new SystemChatMessage(agent.Knowledges));
432+
}
433+
434+
var samples = ProviderHelper.GetChatSamples(agent.Samples);
435+
foreach (var sample in samples)
436+
{
437+
messages.Add(sample.Role == AgentRole.User ? new UserChatMessage(sample.Content) : new AssistantChatMessage(sample.Content));
438+
}
439+
440+
// Render functions
441+
if (options.WebSearchOptions == null)
442+
{
443+
foreach (var function in functions)
444+
{
445+
if (!agentService.RenderFunction(agent, function, renderData))
446+
{
447+
continue;
448+
}
449+
450+
var property = agentService.RenderFunctionProperty(agent, function, renderData);
451+
452+
options.Tools.Add(ChatTool.CreateFunctionTool(
453+
functionName: function.Name,
454+
functionDescription: function.Description,
455+
functionParameters: BinaryData.FromObjectAsJson(property)));
456+
}
457+
}
458+
456459
var prompt = GetPrompt(messages, options);
457460
return (prompt, messages, options);
458461
}

‎src/Plugins/BotSharp.Plugin.OpenAI/Providers/Realtime/RealTimeCompletionProvider.cs‎

Lines changed: 35 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -575,37 +575,8 @@ private async Task<RoleDialogModel> OnUserAudioTranscriptionCompleted(RealtimeHu
575575
// Prepare instruction and functions
576576
var renderData = agentService.CollectRenderData(agent);
577577
var (instruction, functions) = agentService.PrepareInstructionAndFunctions(agent, renderData);
578-
if (!string.IsNullOrWhiteSpace(instruction))
579-
{
580-
messages.Add(new SystemChatMessage(instruction));
581-
}
582-
583-
foreach (var function in functions)
584-
{
585-
if (!agentService.RenderFunction(agent, function, renderData))
586-
{
587-
continue;
588-
}
589-
590-
var property = agentService.RenderFunctionProperty(agent, function, renderData);
591-
592-
options.Tools.Add(ChatTool.CreateFunctionTool(
593-
functionName: function.Name,
594-
functionDescription: function.Description,
595-
functionParameters: BinaryData.FromObjectAsJson(property)));
596-
}
597-
598-
if (!string.IsNullOrEmpty(agent.Knowledges))
599-
{
600-
messages.Add(new SystemChatMessage(agent.Knowledges));
601-
}
602-
603-
var samples = ProviderHelper.GetChatSamples(agent.Samples);
604-
foreach (var sample in samples)
605-
{
606-
messages.Add(sample.Role == AgentRole.User ? new UserChatMessage(sample.Content) : new AssistantChatMessage(sample.Content));
607-
}
608-
578+
579+
// Build messages
609580
var filteredMessages = conversations.Select(x => x).ToList();
610581
var firstUserMsgIdx = filteredMessages.FindIndex(x => x.Role == AgentRole.User);
611582
if (firstUserMsgIdx > 0)
@@ -634,6 +605,39 @@ private async Task<RoleDialogModel> OnUserAudioTranscriptionCompleted(RealtimeHu
634605
}
635606
}
636607

608+
// Build system messages
609+
if (!string.IsNullOrWhiteSpace(instruction))
610+
{
611+
messages.Add(new SystemChatMessage(instruction));
612+
}
613+
614+
if (!string.IsNullOrEmpty(agent.Knowledges))
615+
{
616+
messages.Add(new SystemChatMessage(agent.Knowledges));
617+
}
618+
619+
var samples = ProviderHelper.GetChatSamples(agent.Samples);
620+
foreach (var sample in samples)
621+
{
622+
messages.Add(sample.Role == AgentRole.User ? new UserChatMessage(sample.Content) : new AssistantChatMessage(sample.Content));
623+
}
624+
625+
// Build functions
626+
foreach (var function in functions)
627+
{
628+
if (!agentService.RenderFunction(agent, function, renderData))
629+
{
630+
continue;
631+
}
632+
633+
var property = agentService.RenderFunctionProperty(agent, function, renderData);
634+
635+
options.Tools.Add(ChatTool.CreateFunctionTool(
636+
functionName: function.Name,
637+
functionDescription: function.Description,
638+
functionParameters: BinaryData.FromObjectAsJson(property)));
639+
}
640+
637641
var prompt = GetPrompt(messages, options);
638642
return (prompt, messages, options);
639643
}

0 commit comments

Comments
 (0)