Skip to content

Commit 671d504

Browse files
katzdavekatzdave
committed
Fmt
1 parent 896ac38 commit 671d504

File tree

9 files changed

+41
-38
lines changed

9 files changed

+41
-38
lines changed

‎crates/goose-acp/src/server.rs‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -740,8 +740,7 @@ impl GooseAcpAgent {
740740
let provider_name = config
741741
.get_goose_provider()
742742
.map_err(|_| anyhow::anyhow!("No provider configured"))?;
743-
goose::model::ModelConfig::new(&model_id)?
744-
.with_canonical_limits(&provider_name)
743+
goose::model::ModelConfig::new(&model_id)?.with_canonical_limits(&provider_name)
745744
}
746745
};
747746
let provider = (self.provider_factory)(model_config).await?;
@@ -966,12 +965,11 @@ impl GooseAcpAgent {
966965
let provider_name = config.get_goose_provider().map_err(|_| {
967966
sacp::Error::internal_error().data("No provider configured".to_string())
968967
})?;
969-
let model_config =
970-
goose::model::ModelConfig::new(model_id)
971-
.map_err(|e| {
972-
sacp::Error::invalid_params().data(format!("Invalid model config: {}", e))
973-
})?
974-
.with_canonical_limits(&provider_name);
968+
let model_config = goose::model::ModelConfig::new(model_id)
969+
.map_err(|e| {
970+
sacp::Error::invalid_params().data(format!("Invalid model config: {}", e))
971+
})?
972+
.with_canonical_limits(&provider_name);
975973
let provider = (self.provider_factory)(model_config).await.map_err(|e| {
976974
sacp::Error::internal_error().data(format!("Failed to create provider: {}", e))
977975
})?;

‎crates/goose-cli/src/commands/web.rs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -168,8 +168,7 @@ fn get_provider_and_model() -> (String, String) {
168168
}
169169

170170
async fn create_agent(provider_name: &str, model: &str) -> Result<Agent> {
171-
let model_config =
172-
goose::model::ModelConfig::new(model)?.with_canonical_limits(provider_name);
171+
let model_config = goose::model::ModelConfig::new(model)?.with_canonical_limits(provider_name);
173172

174173
let agent = Agent::new();
175174

‎crates/goose/src/agents/summon_extension.rs‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1327,14 +1327,10 @@ impl SummonClient {
13271327
.or_else(|| session.provider_name.clone())
13281328
.ok_or_else(|| anyhow::anyhow!("No provider configured"))?;
13291329

1330-
let mut model_config = session
1331-
.model_config
1332-
.clone()
1333-
.map(Ok)
1334-
.unwrap_or_else(|| {
1335-
crate::model::ModelConfig::new("default")
1336-
.map(|c| c.with_canonical_limits(&provider_name))
1337-
})?;
1330+
let mut model_config = session.model_config.clone().map(Ok).unwrap_or_else(|| {
1331+
crate::model::ModelConfig::new("default")
1332+
.map(|c| c.with_canonical_limits(&provider_name))
1333+
})?;
13381334

13391335
if let Some(model) = &params.model {
13401336
model_config.model_name = model.clone();

‎crates/goose/src/model.rs‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -75,10 +75,7 @@ impl ModelConfig {
7575

7676
/// Internal base constructor: parses env vars and predefined request_params.
7777
/// Does NOT do canonical lookup (that requires a provider).
78-
fn new_base(
79-
model_name: String,
80-
context_env_var: Option<&str>,
81-
) -> Result<Self, ConfigError> {
78+
fn new_base(model_name: String, context_env_var: Option<&str>) -> Result<Self, ConfigError> {
8279
// Priority 1: Check env vars first (highest priority)
8380
let context_limit = if let Some(env_var) = context_env_var {
8481
if let Ok(val) = std::env::var(env_var) {
@@ -262,8 +259,7 @@ impl ModelConfig {
262259
provider_name: &str,
263260
) -> Result<Self, ConfigError> {
264261
// Create a full ModelConfig for the fast model with proper canonical lookup
265-
let fast_config =
266-
ModelConfig::new(fast_model_name)?.with_canonical_limits(provider_name);
262+
let fast_config = ModelConfig::new(fast_model_name)?.with_canonical_limits(provider_name);
267263
self.fast_model_config = Some(Box::new(fast_config));
268264
Ok(self)
269265
}

‎crates/goose/src/providers/claude_code.rs‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -943,7 +943,9 @@ mod tests {
943943
fn make_provider() -> ClaudeCodeProvider {
944944
ClaudeCodeProvider {
945945
command: PathBuf::from("claude"),
946-
model: ModelConfig::new(CLAUDE_CODE_DEFAULT_MODEL).unwrap().with_canonical_limits(CLAUDE_CODE_PROVIDER_NAME),
946+
model: ModelConfig::new(CLAUDE_CODE_DEFAULT_MODEL)
947+
.unwrap()
948+
.with_canonical_limits(CLAUDE_CODE_PROVIDER_NAME),
947949
name: "claude-code".to_string(),
948950
cli_process: tokio::sync::OnceCell::new(),
949951
}

‎crates/goose/src/providers/databricks.rs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,8 @@ impl DatabricksProvider {
150150
fast_retry_config,
151151
name: DATABRICKS_PROVIDER_NAME.to_string(),
152152
};
153-
provider.model = model.with_fast(DATABRICKS_DEFAULT_FAST_MODEL, DATABRICKS_PROVIDER_NAME)?;
153+
provider.model =
154+
model.with_fast(DATABRICKS_DEFAULT_FAST_MODEL, DATABRICKS_PROVIDER_NAME)?;
154155
Ok(provider)
155156
}
156157

‎crates/goose/src/providers/formats/snowflake.rs‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -564,7 +564,8 @@ data: {"id":"a9537c2c-2017-4906-9817-2456168d89fa","model":"claude-sonnet-4-2025
564564
use crate::conversation::message::Message;
565565
use crate::model::ModelConfig;
566566

567-
let model_config = ModelConfig::new_or_fail("claude-4-sonnet").with_canonical_limits("snowflake");
567+
let model_config =
568+
ModelConfig::new_or_fail("claude-4-sonnet").with_canonical_limits("snowflake");
568569

569570
let system = "You are a helpful assistant that can use tools to get information.";
570571
let messages = vec![Message::user().with_text("What is the stock price of Nvidia?")];
@@ -673,7 +674,8 @@ data: {"id":"a9537c2c-2017-4906-9817-2456168d89fa","model":"claude-sonnet-4-2025
673674
use crate::conversation::message::Message;
674675
use crate::model::ModelConfig;
675676

676-
let model_config = ModelConfig::new_or_fail("claude-4-sonnet").with_canonical_limits("snowflake");
677+
let model_config =
678+
ModelConfig::new_or_fail("claude-4-sonnet").with_canonical_limits("snowflake");
677679
let system = "Reply with only a description in four words or less";
678680
let messages = vec![Message::user().with_text("Test message")];
679681
let tools = vec![Tool::new(

‎crates/goose/src/providers/init.rs‎

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -247,9 +247,12 @@ mod tests {
247247
("OPENAI_CUSTOM_HEADERS", Some("")),
248248
]);
249249

250-
let provider = create("openai", ModelConfig::new_or_fail("gpt-4o-mini").with_canonical_limits("openai"))
251-
.await
252-
.unwrap();
250+
let provider = create(
251+
"openai",
252+
ModelConfig::new_or_fail("gpt-4o-mini").with_canonical_limits("openai"),
253+
)
254+
.await
255+
.unwrap();
253256
let lw = provider.as_lead_worker().unwrap();
254257
let (lead, worker) = lw.get_model_info();
255258
assert_eq!(lead, "gpt-4o");
@@ -272,9 +275,12 @@ mod tests {
272275
("OPENAI_CUSTOM_HEADERS", Some("")),
273276
]);
274277

275-
let provider = create("openai", ModelConfig::new_or_fail("gpt-4o-mini").with_canonical_limits("openai"))
276-
.await
277-
.unwrap();
278+
let provider = create(
279+
"openai",
280+
ModelConfig::new_or_fail("gpt-4o-mini").with_canonical_limits("openai"),
281+
)
282+
.await
283+
.unwrap();
278284
assert!(provider.as_lead_worker().is_none());
279285
assert_eq!(provider.get_model_config().model_name, "gpt-4o-mini");
280286
}
@@ -292,8 +298,9 @@ mod tests {
292298
("GOOSE_CONTEXT_LIMIT", global_limit),
293299
]);
294300

295-
let default_model =
296-
ModelConfig::new_or_fail("gpt-3.5-turbo").with_canonical_limits("openai").with_context_limit(Some(16_000));
301+
let default_model = ModelConfig::new_or_fail("gpt-3.5-turbo")
302+
.with_canonical_limits("openai")
303+
.with_context_limit(Some(16_000));
297304

298305
let result = create_worker_model_config(&default_model, "openai").unwrap();
299306
assert_eq!(result.context_limit, Some(expected_limit));

‎crates/goose/tests/tetrate_streaming.rs‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@ mod tetrate_streaming_tests {
1515

1616
async fn create_test_provider() -> Result<TetrateProvider> {
1717
// Create a test provider with the default model
18-
let model_config = ModelConfig::new("claude-3-5-sonnet-latest")?.with_canonical_limits("tetrate");
18+
let model_config =
19+
ModelConfig::new("claude-3-5-sonnet-latest")?.with_canonical_limits("tetrate");
1920
TetrateProvider::from_env(model_config).await
2021
}
2122

@@ -237,7 +238,8 @@ mod tetrate_streaming_tests {
237238
// Test with invalid API key to ensure error handling works
238239
std::env::set_var("TETRATE_API_KEY", "invalid-key-for-testing");
239240

240-
let model_config = ModelConfig::new("claude-3-5-sonnet-latest")?.with_canonical_limits("tetrate");
241+
let model_config =
242+
ModelConfig::new("claude-3-5-sonnet-latest")?.with_canonical_limits("tetrate");
241243
let provider = TetrateProvider::from_env(model_config).await?;
242244

243245
let messages = vec![Message::user().with_text("Hello")];

0 commit comments

Comments
 (0)