Skip to content

Commit f0c0b46

Browse files
committed
[sidecar] fix cargo check errors
1 parent 8ae9b64 commit f0c0b46

File tree

4 files changed

+35
-13
lines changed

4 files changed

+35
-13
lines changed

llm_client/src/clients/anthropic.rs

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -246,10 +246,21 @@ impl AnthropicRequest {
246246
completion_request: LLMClientCompletionRequest,
247247
model_str: String,
248248
) -> Self {
249-
let temperature = completion_request.temperature();
249+
let model = completion_request.model();
250+
let temperature = if model == &LLMType::ClaudeSonnet3_7 {
251+
1.0
252+
} else {
253+
completion_request.temperature()
254+
};
250255
let max_tokens = match completion_request.get_max_tokens() {
251256
Some(tokens) => Some(tokens),
252-
None => Some(8192),
257+
None => {
258+
if model == &LLMType::ClaudeSonnet3_7 {
259+
Some(64_000)
260+
} else {
261+
Some(8192)
262+
}
263+
}
253264
};
254265
let messages = completion_request.messages();
255266
// grab the tools over here ONLY from the system message
@@ -937,4 +948,4 @@ impl LLMClient for AnthropicClient {
937948

938949
Ok(buffered_string)
939950
}
940-
}
951+
}

llm_client/src/clients/types.rs

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,8 @@ pub enum LLMType {
6565
ClaudeOpus,
6666
/// Claude Sonnet model
6767
ClaudeSonnet,
68+
// Claude Sonnet 3.7 model
69+
ClaudeSonnet3_7,
6870
/// Claude Haiku model
6971
ClaudeHaiku,
7072
/// PPLX Sonnet Small model
@@ -197,7 +199,10 @@ impl LLMType {
197199
pub fn is_anthropic(&self) -> bool {
198200
matches!(
199201
self,
200-
LLMType::ClaudeOpus | LLMType::ClaudeSonnet | LLMType::ClaudeSonnet3_7 | LLMType::ClaudeHaiku
202+
LLMType::ClaudeOpus
203+
| LLMType::ClaudeSonnet
204+
| LLMType::ClaudeSonnet3_7
205+
| LLMType::ClaudeHaiku
201206
)
202207
}
203208

@@ -1050,4 +1055,4 @@ mod tests {
10501055
let str_llm_type = serde_json::to_string(&llm_type).expect("to work");
10511056
assert_eq!(str_llm_type, "");
10521057
}
1053-
}
1058+
}

sidecar/src/agentic/tool/session/tool_use_agent.rs

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1422,7 +1422,7 @@ You accomplish a given task iteratively, breaking it down into clear steps and w
14221422
}
14231423

14241424
// If original LLM (Sonnet3.7) failed, try with sonnet3.5 first
1425-
if llm_properties.llm() == &LLMType::ClaudeSonnet37 {
1425+
if llm_properties.llm() == &LLMType::ClaudeSonnet3_7 {
14261426
println!("sonnet37_failed::failing_back_to_sonnet35");
14271427
let sonnet35_properties = llm_properties.clone().set_llm(LLMType::ClaudeSonnet);
14281428
if let Ok(Some(result)) = self
@@ -1450,7 +1450,9 @@ You accomplish a given task iteratively, breaking it down into clear steps and w
14501450
}
14511451

14521452
// If sonnet3.5 failed or if using a different model, try with gemini-flash-2.0
1453-
if llm_properties.llm() == &LLMType::ClaudeSonnet37 || llm_properties.llm() == &LLMType::ClaudeSonnet {
1453+
if llm_properties.llm() == &LLMType::ClaudeSonnet3_7
1454+
|| llm_properties.llm() == &LLMType::ClaudeSonnet
1455+
{
14541456
println!("sonnet_failed::failing_back_to_gemini-2.0-flash");
14551457
let gemini_pro_properties = llm_properties.clone().set_llm(LLMType::Gemini2_0Flash);
14561458
if let Ok(Some(result)) = self
@@ -1479,7 +1481,9 @@ You accomplish a given task iteratively, breaking it down into clear steps and w
14791481
}
14801482

14811483
// If gemini-pro-1.5 failed, try with gemini-pro-1.5
1482-
if llm_properties.llm() == &LLMType::ClaudeSonnet {
1484+
if llm_properties.llm() == &LLMType::ClaudeSonnet
1485+
|| llm_properties.llm() == &LLMType::ClaudeSonnet3_7
1486+
{
14831487
println!("sonnet_failed::failing_back_to_gemini-pro");
14841488
let gemini_pro_properties = llm_properties.clone().set_llm(LLMType::GeminiPro);
14851489
if let Ok(Some(result)) = self
@@ -1507,7 +1511,9 @@ You accomplish a given task iteratively, breaking it down into clear steps and w
15071511
}
15081512
}
15091513

1510-
if llm_properties.llm() == &LLMType::ClaudeSonnet {
1514+
if llm_properties.llm() == &LLMType::ClaudeSonnet
1515+
|| llm_properties.llm() == &LLMType::ClaudeSonnet3_7
1516+
{
15111517
println!("sonnet_failed::failing_back_to_gpt4o");
15121518
let gpt4o_properties = llm_properties.clone().set_llm(LLMType::Gpt4O);
15131519
if let Ok(Some(result)) = self
@@ -2898,4 +2904,4 @@ To get the current time in Timbuktu, Mali, I'll need to use the mcp::time::get_c
28982904
let tool_use_possible = tool_use_generator.tool_input_partial;
28992905
assert!(tool_use_possible.is_some());
29002906
}
2901-
}
2907+
}

sidecar/src/bin/agent_bin.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
141141
let llm_model = if let Some(model_name) = args.model_name {
142142
LLMType::Custom(model_name)
143143
} else {
144-
LLMType::ClaudeSonnet37
144+
LLMType::ClaudeSonnet3_7
145145
};
146146

147147
let llm_provider = LLMProperties::new(
@@ -213,9 +213,9 @@ Your thinking should be thorough and so it's fine if it's very long."#,
213213
Some(args.repo_name.clone()),
214214
message_properties,
215215
false, // not in devtools context
216-
None, // No context crunching LLM for agent_bin
216+
None, // No context crunching LLM for agent_bin
217217
)
218218
.await;
219219
println!("agent::tool_use::end");
220220
Ok(())
221-
}
221+
}

0 commit comments

Comments
 (0)