Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion crates/goose/src/providers/anthropic.rs
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ impl Provider for AnthropicProvider {
let usage = get_usage(&response)?;

let model = get_model(&response);
emit_debug_trace(self, &payload, &response, &usage);
emit_debug_trace(&self.model, &payload, &response, &usage);
Ok((message, ProviderUsage::new(model, usage)))
}
}
2 changes: 1 addition & 1 deletion crates/goose/src/providers/azure.rs
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ impl Provider for AzureProvider {
Err(e) => return Err(e),
};
let model = get_model(&response);
emit_debug_trace(self, &payload, &response, &usage);
emit_debug_trace(&self.model, &payload, &response, &usage);
Ok((message, ProviderUsage::new(model, usage)))
}
}
2 changes: 1 addition & 1 deletion crates/goose/src/providers/databricks.rs
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,7 @@ impl Provider for DatabricksProvider {
Err(e) => return Err(e),
};
let model = get_model(&response);
super::utils::emit_debug_trace(self, &payload, &response, &usage);
super::utils::emit_debug_trace(&self.model, &payload, &response, &usage);

Ok((message, ProviderUsage::new(model, usage)))
}
Expand Down
2 changes: 1 addition & 1 deletion crates/goose/src/providers/gcpvertexai.rs
Original file line number Diff line number Diff line change
Expand Up @@ -501,7 +501,7 @@ impl Provider for GcpVertexAIProvider {
let response = self.post(request.clone(), &context).await?;
let usage = get_usage(&response, &context)?;

emit_debug_trace(self, &request, &response, &usage);
emit_debug_trace(&self.model, &request, &response, &usage);

// Convert response to message
let message = response_to_message(response, context)?;
Expand Down
2 changes: 1 addition & 1 deletion crates/goose/src/providers/google.rs
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ impl Provider for GoogleProvider {
Some(model_version) => model_version.as_str().unwrap_or_default().to_string(),
None => self.model.model_name.clone(),
};
emit_debug_trace(self, &payload, &response, &usage);
emit_debug_trace(&self.model, &payload, &response, &usage);
let provider_usage = ProviderUsage::new(model, usage);
Ok((message, provider_usage))
}
Expand Down
2 changes: 1 addition & 1 deletion crates/goose/src/providers/groq.rs
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ impl Provider for GroqProvider {
Err(e) => return Err(e),
};
let model = get_model(&response);
super::utils::emit_debug_trace(self, &payload, &response, &usage);
super::utils::emit_debug_trace(&self.model, &payload, &response, &usage);
Ok((message, ProviderUsage::new(model, usage)))
}
}
2 changes: 1 addition & 1 deletion crates/goose/src/providers/ollama.rs
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ impl Provider for OllamaProvider {
Err(e) => return Err(e),
};
let model = get_model(&response);
super::utils::emit_debug_trace(self, &payload, &response, &usage);
super::utils::emit_debug_trace(&self.model, &payload, &response, &usage);
Ok((message, ProviderUsage::new(model, usage)))
}
}
2 changes: 1 addition & 1 deletion crates/goose/src/providers/openai.rs
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ impl Provider for OpenAiProvider {
Err(e) => return Err(e),
};
let model = get_model(&response);
emit_debug_trace(self, &payload, &response, &usage);
emit_debug_trace(&self.model, &payload, &response, &usage);
Ok((message, ProviderUsage::new(model, usage)))
}
}
2 changes: 1 addition & 1 deletion crates/goose/src/providers/openrouter.rs
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,7 @@ impl Provider for OpenRouterProvider {
Err(e) => return Err(e),
};
let model = get_model(&response);
emit_debug_trace(self, &payload, &response, &usage);
emit_debug_trace(&self.model, &payload, &response, &usage);
Ok((message, ProviderUsage::new(model, usage)))
}
}
15 changes: 5 additions & 10 deletions crates/goose/src/providers/utils.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
use super::base::Usage;
use super::errors::GoogleErrorCode;
use crate::model::ModelConfig;
use anyhow::Result;
use base64::Engine;
use regex::Regex;
Expand Down Expand Up @@ -316,21 +317,15 @@ pub fn unescape_json_values(value: &Value) -> Value {
}
}

pub fn emit_debug_trace<T: serde::Serialize>(
model_config: &T,
payload: &impl serde::Serialize,
pub fn emit_debug_trace(
model_config: &ModelConfig,
payload: &Value,
response: &Value,
usage: &Usage,
) {
// Handle both Map<String, Value> and Value payload types
let payload_str = match serde_json::to_value(payload) {
Ok(value) => serde_json::to_string_pretty(&value).unwrap_or_default(),
Err(_) => serde_json::to_string_pretty(&payload).unwrap_or_default(),
};

tracing::debug!(
model_config = %serde_json::to_string_pretty(model_config).unwrap_or_default(),
input = %payload_str,
input = %serde_json::to_string_pretty(payload).unwrap_or_default(),
output = %serde_json::to_string_pretty(response).unwrap_or_default(),
input_tokens = ?usage.input_tokens.unwrap_or_default(),
output_tokens = ?usage.output_tokens.unwrap_or_default(),
Expand Down
Loading