feat: ollama tool shim (#1448)
Co-authored-by: Alice Hau <ahau@squareup.com>
This commit is contained in:
@@ -21,6 +21,10 @@ pub struct ModelConfig {
|
||||
pub temperature: Option<f32>,
|
||||
/// Optional maximum tokens to generate
|
||||
pub max_tokens: Option<i32>,
|
||||
/// Whether to interpret tool calls with toolshim
|
||||
pub toolshim: bool,
|
||||
/// Model to use for toolshim (optional as a default exists)
|
||||
pub toolshim_model: Option<String>,
|
||||
}
|
||||
|
||||
impl ModelConfig {
|
||||
@@ -34,12 +38,20 @@ impl ModelConfig {
|
||||
let context_limit = Self::get_model_specific_limit(&model_name);
|
||||
let tokenizer_name = Self::infer_tokenizer_name(&model_name);
|
||||
|
||||
let toolshim = std::env::var("GOOSE_TOOLSHIM")
|
||||
.map(|val| val == "1" || val.to_lowercase() == "true")
|
||||
.unwrap_or(false);
|
||||
|
||||
let toolshim_model = std::env::var("GOOSE_TOOLSHIM_OLLAMA_MODEL").ok();
|
||||
|
||||
Self {
|
||||
model_name,
|
||||
tokenizer_name: tokenizer_name.to_string(),
|
||||
context_limit,
|
||||
temperature: None,
|
||||
max_tokens: None,
|
||||
toolshim,
|
||||
toolshim_model,
|
||||
}
|
||||
}
|
||||
|
||||
@@ -96,7 +108,19 @@ impl ModelConfig {
|
||||
self
|
||||
}
|
||||
|
||||
// Get the tokenizer name
|
||||
/// Set whether to interpret tool calls
|
||||
pub fn with_toolshim(mut self, toolshim: bool) -> Self {
|
||||
self.toolshim = toolshim;
|
||||
self
|
||||
}
|
||||
|
||||
/// Set the tool call interpreter model
|
||||
pub fn with_toolshim_model(mut self, model: Option<String>) -> Self {
|
||||
self.toolshim_model = model;
|
||||
self
|
||||
}
|
||||
|
||||
/// Get the tokenizer name
|
||||
pub fn tokenizer_name(&self) -> &str {
|
||||
&self.tokenizer_name
|
||||
}
|
||||
@@ -142,4 +166,20 @@ mod tests {
|
||||
assert_eq!(config.max_tokens, Some(1000));
|
||||
assert_eq!(config.context_limit, Some(50_000));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_model_config_tool_interpretation() {
|
||||
// Test without env vars - should be false
|
||||
let config = ModelConfig::new("test-model".to_string());
|
||||
assert!(!config.toolshim);
|
||||
|
||||
// Test with tool interpretation setting
|
||||
let config = ModelConfig::new("test-model".to_string()).with_toolshim(true);
|
||||
assert!(config.toolshim);
|
||||
|
||||
// Test tool interpreter model
|
||||
let config = ModelConfig::new("test-model".to_string())
|
||||
.with_toolshim_model(Some("mistral-nemo".to_string()));
|
||||
assert_eq!(config.toolshim_model, Some("mistral-nemo".to_string()));
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user