public/galaxy
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Remove auto model routing; default to Claude Opus 4.6 on Bedrock; strip Oz tips

Browse Source
This commit is contained in:
Ryan Ward
2026-05-13 09:33:45 -05:00
parent e1c33317d3
commit 029e90be2b
6 changed files with 90 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/ai/bedrock/convert_request.rs
+18 -1
View File
@@ -18,6 +18,7 @@ pub fn extract_new_input_messages(request: &api::Request) -> Vec<ConversationMes
match input_type {
api::request::input::Type::UserInputs(user_inputs) => {
let mut tool_results: Vec<ConversationMessage> = Vec::new();
let mut user_queries: Vec<ConversationMessage> = Vec::new();
for user_input in &user_inputs.inputs {
match &user_input.input {
Some(api::request::input::user_inputs::user_input::Input::ToolCallResult(
@@ -39,7 +40,7 @@ pub fn extract_new_input_messages(request: &api::Request) -> Vec<ConversationMes
query,
)) => {
if !query.query.is_empty() {
results.push(ConversationMessage {
user_queries.push(ConversationMessage {
role: MessageRole::User,
content: MessageContent::Text(query.query.clone()),
});
@@ -48,6 +49,9 @@ pub fn extract_new_input_messages(request: &api::Request) -> Vec<ConversationMes
_ => {}
}
}
// Tool results MUST come before user queries so they pair with
// the preceding assistant tool_use messages (Bedrock requires
// tool_result immediately after the corresponding tool_use).
if !tool_results.is_empty() {
if tool_results.len() == 1 {
results.extend(tool_results);
@@ -67,6 +71,7 @@ pub fn extract_new_input_messages(request: &api::Request) -> Vec<ConversationMes
});
}
}
results.extend(user_queries);
}
#[allow(deprecated)]
api::request::input::Type::UserQuery(query) => {
@@ -458,6 +463,18 @@ pub fn extract_messages_from_request(request: &api::Request) -> Vec<Conversation
messages
}
/// Sanitizes a message list to satisfy Bedrock Converse API invariants:
/// 1. Messages must start with a user message.
/// 2. Every assistant tool_use must be immediately followed by a user
/// message containing the matching tool_result.
///
/// Call this on the combined (history + new input) messages before
/// sending to `build_converse_request`.
pub fn sanitize_messages_for_bedrock(messages: &mut Vec<ConversationMessage>) {
ensure_starts_with_user_message(messages);
ensure_tool_results_paired(messages);
}
fn ensure_starts_with_user_message(messages: &mut Vec<ConversationMessage>) {
if messages.is_empty() {
messages.push(ConversationMessage {
app/src/ai/bedrock/models.rs
+5
View File
@@ -7,6 +7,11 @@ pub struct DefaultModel {
}
pub const DEFAULT_BEDROCK_MODELS: &[DefaultModel] = &[
DefaultModel {
model_id: "anthropic.claude-opus-4-6",
display_name: "Claude Opus 4.6",
vision_supported: true,
},
DefaultModel {
model_id: "anthropic.claude-opus-4-7",
display_name: "Claude Opus 4.7",