Merged
Conversation
Review Summary by QodoAppend system prompts after conversation messages
WalkthroughsDescription• Reorder system message building to append after conversation messages • Move instruction, knowledge, and samples to end of message list • Ensure system prompts are appended after user/assistant conversation • Apply consistent message ordering across chat and realtime providers Diagramflowchart LR
A["Prepare Instructions<br/>and Functions"] --> B["Build Conversation<br/>Messages"]
B --> C["Build System<br/>Messages"]
C --> D["Build Function<br/>Tools"]
D --> E["Get Final<br/>Prompt"]
File Changes1. src/Plugins/BotSharp.Plugin.OpenAI/Providers/Chat/ChatCompletionProvider.cs
|
Code Review by Qodo
1. Samples/system appended after chat
|
![qodo-code-review[bot]](https://avatars.githubusercontent.com/in/484649?s=60&v=4){kind=small}
Comment on lines
+422
to
+457
| // Build system messages | ||
| if (!string.IsNullOrWhiteSpace(instruction)) | ||
| { | ||
| renderedInstructions.Add(instruction); | ||
| messages.Add(new SystemChatMessage(instruction)); | ||
| } | ||
|
|
||
| if (!string.IsNullOrEmpty(agent.Knowledges)) | ||
| { | ||
| messages.Add(new SystemChatMessage(agent.Knowledges)); | ||
| } | ||
|
|
||
| var samples = ProviderHelper.GetChatSamples(agent.Samples); | ||
| foreach (var sample in samples) | ||
| { | ||
| messages.Add(sample.Role == AgentRole.User ? new UserChatMessage(sample.Content) : new AssistantChatMessage(sample.Content)); | ||
| } | ||
|
|
||
| // Render functions | ||
| if (options.WebSearchOptions == null) | ||
| { | ||
| foreach (var function in functions) | ||
| { | ||
| if (!agentService.RenderFunction(agent, function, renderData)) | ||
| { | ||
| continue; | ||
| } | ||
|
|
||
| var property = agentService.RenderFunctionProperty(agent, function, renderData); | ||
|
|
||
| options.Tools.Add(ChatTool.CreateFunctionTool( | ||
| functionName: function.Name, | ||
| functionDescription: function.Description, | ||
| functionParameters: BinaryData.FromObjectAsJson(property))); | ||
| } | ||
| } |
There was a problem hiding this comment.
1. Samples/system appended after chat 🐞 Bug ✓ Correctness
PrepareOptions now appends system instruction/knowledges and few-shot samples after all conversation turns, so the final messages sent to OpenAI may no longer end with the latest user message (often ending with a system or assistant-sample message instead). This can cause the model to continue a sample exchange or otherwise respond off-context compared to the previous/expected ordering used elsewhere in the codebase.
Agent Prompt
## Issue description
`PrepareOptions` in the OpenAI ChatCompletionProvider appends system/knowledge and sample (few-shot) messages after the conversation messages. This changes the sequence sent to `chatClient.CompleteChat(...)` and can cause the model to respond to trailing system/sample content instead of the latest user input.
## Issue Context
Other providers in this repo (e.g., AzureOpenAI) build messages in the order: system instruction -> knowledges -> samples -> conversation turns. The OpenAI provider should match this pattern unless there is a deliberate and validated behavioral reason.
## Fix Focus Areas
- src/Plugins/BotSharp.Plugin.OpenAI/Providers/Chat/ChatCompletionProvider.cs[371-458]
- src/Plugins/BotSharp.Plugin.AzureOpenAI/Providers/Chat/ChatCompletionProvider.cs[382-419] (reference behavior)
ⓘ Copy this prompt and use it to remediate the issue with your preferred AI generation tools
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.