tkmind/tkmind_go
1
0
Fork 0
Code Issues Pull Requests Actions 4 Packages Projects Releases Wiki Activity

Goose recipes have settings now (#2397)

Browse Source 
Co-authored-by: Douwe Osinga <douwe@squareup.com>
Co-authored-by: Lifei Zhou <lifei@squareup.com>
This commit is contained in:
Douwe Osinga
2025-06-12 21:32:01 -04:00
committed by GitHub
parent 9945e51d73
commit 78afaded33
8 changed files with 110 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/goose-cli/src/cli.rs
+41 -20
View File
@@ -19,7 +19,7 @@ use crate::commands::session::{handle_session_list, handle_session_remove};
use crate::logging::setup_logging;
use crate::recipes::recipe::{explain_recipe_with_parameters, load_recipe_as_template};
use crate::session;
use crate::session::{build_session, SessionBuilderConfig};
use crate::session::{build_session, SessionBuilderConfig, SessionSettings};
use goose_bench::bench_config::BenchRunConfig;
use goose_bench::runners::bench_runner::BenchRunner;
use goose_bench::runners::eval_runner::EvalRunner;
@@ -552,6 +552,7 @@ enum CliProviderVariant {
Ollama,
}
#[derive(Debug)]
struct InputConfig {
contents: Option<String>,
extensions_override: Option<Vec<ExtensionConfig>>,
@@ -630,6 +631,7 @@ pub async fn cli() -> Result<()> {
builtins,
extensions_override: None,
additional_system_prompt: None,
settings: None,
debug,
max_tool_repetitions,
interactive: true, // Session command is always interactive
@@ -676,18 +678,22 @@ pub async fn cli() -> Result<()> {
params,
explain,
}) => {
let input_config = match (instructions, input_text, recipe, explain) {
let (input_config, session_settings) = match (instructions, input_text, recipe, explain)
{
(Some(file), _, _, _) if file == "-" => {
let mut input = String::new();
std::io::stdin()
.read_to_string(&mut input)
.expect("Failed to read from stdin");
InputConfig {
contents: Some(input),
extensions_override: None,
additional_system_prompt: None,
}
(
InputConfig {
contents: Some(input),
extensions_override: None,
additional_system_prompt: None,
},
None,
)
}
(Some(file), _, _, _) => {
let contents = std::fs::read_to_string(&file).unwrap_or_else(|err| {
@@ -697,17 +703,23 @@ pub async fn cli() -> Result<()> {
);
std::process::exit(1);
});
(
InputConfig {
contents: Some(contents),
extensions_override: None,
additional_system_prompt: None,
},
None,
)
}
(_, Some(text), _, _) => (
InputConfig {
contents: Some(contents),
contents: Some(text),
extensions_override: None,
additional_system_prompt: None,
}
}
(_, Some(text), _, _) => InputConfig {
contents: Some(text),
extensions_override: None,
additional_system_prompt: None,
},
},
None,
),
(_, _, Some(recipe_name), explain) => {
if explain {
explain_recipe_with_parameters(&recipe_name, params)?;
@@ -718,11 +730,18 @@ pub async fn cli() -> Result<()> {
eprintln!("{}: {}", console::style("Error").red().bold(), err);
std::process::exit(1);
});
InputConfig {
contents: recipe.prompt,
extensions_override: recipe.extensions,
additional_system_prompt: recipe.instructions,
}
(
InputConfig {
contents: recipe.prompt,
extensions_override: recipe.extensions,
additional_system_prompt: recipe.instructions,
},
recipe.settings.map(|s| SessionSettings {
goose_provider: s.goose_provider,
goose_model: s.goose_model,
temperature: s.temperature,
}),
)
}
(None, None, None, _) => {
eprintln!("Error: Must provide either --instructions (-i), --text (-t), or --recipe. Use -i - for stdin.");
@@ -739,6 +758,7 @@ pub async fn cli() -> Result<()> {
builtins,
extensions_override: input_config.extensions_override,
additional_system_prompt: input_config.additional_system_prompt,
settings: session_settings,
debug,
max_tool_repetitions,
interactive, // Use the interactive flag from the Run command
@@ -854,6 +874,7 @@ pub async fn cli() -> Result<()> {
builtins: Vec::new(),
extensions_override: None,
additional_system_prompt: None,
settings: None::<SessionSettings>,
debug: false,
max_tool_repetitions: None,
interactive: true, // Default case is always interactive
crates/goose-cli/src/commands/bench.rs
+1
View File
@@ -40,6 +40,7 @@ pub async fn agent_generator(
builtins: requirements.builtin,
extensions_override: None,
additional_system_prompt: None,
settings: None,
debug: false,
max_tool_repetitions: None,
interactive: false, // Benchmarking is non-interactive
crates/goose-cli/src/session/builder.rs
+27 -7
View File
@@ -34,6 +34,8 @@ pub struct SessionBuilderConfig {
pub extensions_override: Option<Vec<ExtensionConfig>>,
/// Any additional system prompt to append to the default
pub additional_system_prompt: Option<String>,
/// Settings to override the global Goose settings
pub settings: Option<SessionSettings>,
/// Enable debug printing
pub debug: bool,
/// Maximum number of consecutive identical tool calls allowed
@@ -136,18 +138,35 @@ async fn offer_extension_debugging_help(
Ok(())
}
#[derive(Clone, Debug, Default)]
pub struct SessionSettings {
pub goose_model: Option<String>,
pub goose_provider: Option<String>,
pub temperature: Option<f32>,
}
pub async fn build_session(session_config: SessionBuilderConfig) -> Session {
// Load config and get provider/model
let config = Config::global();
let provider_name: String = config
.get_param("GOOSE_PROVIDER")
let provider_name = session_config
.settings
.as_ref()
.and_then(|s| s.goose_provider.clone())
.or_else(|| config.get_param("GOOSE_PROVIDER").ok())
.expect("No provider configured. Run 'goose configure' first");
let model: String = config
.get_param("GOOSE_MODEL")
let model_name = session_config
.settings
.as_ref()
.and_then(|s| s.goose_model.clone())
.or_else(|| config.get_param("GOOSE_MODEL").ok())
.expect("No model configured. Run 'goose configure' first");
let model_config = goose::model::ModelConfig::new(model.clone());
let temperature = session_config.settings.as_ref().and_then(|s| s.temperature);
let model_config =
goose::model::ModelConfig::new(model_name.clone()).with_temperature(temperature);
// Create the agent
let agent: Agent = Agent::new();
@@ -165,7 +184,7 @@ pub async fn build_session(session_config: SessionBuilderConfig) -> Session {
worker_model
);
} else {
tracing::info!("🤖 Using model: {}", model);
tracing::info!("🤖 Using model: {}", model_name);
}
agent
@@ -430,7 +449,7 @@ pub async fn build_session(session_config: SessionBuilderConfig) -> Session {
output::display_session_info(
session_config.resume,
&provider_name,
&model,
&model_name,
&session_file,
Some(&provider_for_display),
);
@@ -452,6 +471,7 @@ mod tests {
builtins: vec!["developer".to_string()],
extensions_override: None,
additional_system_prompt: Some("Test prompt".to_string()),
settings: None,
debug: true,
max_tool_repetitions: Some(5),
interactive: true,
crates/goose-cli/src/session/mod.rs
+1 -1
View File
@@ -7,7 +7,7 @@ mod prompt;
mod thinking;
pub use self::export::message_to_markdown;
pub use builder::{build_session, SessionBuilderConfig};
pub use builder::{build_session, SessionBuilderConfig, SessionSettings};
use console::Color;
use goose::agents::AgentEvent;
use goose::permission::permission_confirmation::PrincipalType;