* Allow expressing alternative possible context fetches in `Expected Context` section * Allow marking a subset of lines as "required" in `Expected Context`. We still need to improve how we display the results. I've removed the context pass/fail pretty printing for now, because it would need to be rethought to work with the new structure, but for now I think we should focus on getting basic predictions to run. But this is progress toward a better structure for eval examples. Release Notes: - N/A --------- Co-authored-by: Oleksiy Syvokon <oleksiy.syvokon@gmail.com> Co-authored-by: Ben Kunkle <ben@zed.dev> Co-authored-by: Agus Zubiaga <agus@zed.dev>
299 lines
8.6 KiB
Rust
299 lines
8.6 KiB
Rust
use std::{
|
|
fs,
|
|
io::IsTerminal,
|
|
path::{Path, PathBuf},
|
|
sync::Arc,
|
|
};
|
|
|
|
use anyhow::Result;
|
|
use clap::Args;
|
|
use collections::HashSet;
|
|
use gpui::AsyncApp;
|
|
use zeta2::udiff::DiffLine;
|
|
|
|
use crate::{
|
|
example::{Example, NamedExample},
|
|
headless::ZetaCliAppState,
|
|
paths::CACHE_DIR,
|
|
predict::{PredictionDetails, zeta2_predict},
|
|
};
|
|
|
|
#[derive(Debug, Args)]
|
|
pub struct EvaluateArguments {
|
|
example_paths: Vec<PathBuf>,
|
|
#[clap(long)]
|
|
re_run: bool,
|
|
}
|
|
|
|
pub async fn run_evaluate(
|
|
args: EvaluateArguments,
|
|
app_state: &Arc<ZetaCliAppState>,
|
|
cx: &mut AsyncApp,
|
|
) {
|
|
let example_len = args.example_paths.len();
|
|
let all_tasks = args.example_paths.into_iter().map(|path| {
|
|
let app_state = app_state.clone();
|
|
cx.spawn(async move |cx| run_evaluate_one(&path, args.re_run, app_state.clone(), cx).await)
|
|
});
|
|
let all_results = futures::future::try_join_all(all_tasks).await.unwrap();
|
|
|
|
let aggregated_result = EvaluationResult {
|
|
context: Scores::aggregate(all_results.iter().map(|r| &r.context)),
|
|
edit_prediction: Scores::aggregate(all_results.iter().map(|r| &r.edit_prediction)),
|
|
};
|
|
|
|
if example_len > 1 {
|
|
println!("\n{}", "-".repeat(80));
|
|
println!("# TOTAL SCORES:");
|
|
println!("{}", aggregated_result.to_markdown());
|
|
}
|
|
}
|
|
|
|
pub async fn run_evaluate_one(
|
|
example_path: &Path,
|
|
re_run: bool,
|
|
app_state: Arc<ZetaCliAppState>,
|
|
cx: &mut AsyncApp,
|
|
) -> Result<EvaluationResult> {
|
|
let example = NamedExample::load(&example_path).unwrap();
|
|
let example_cache_path = CACHE_DIR.join(&example_path.file_name().unwrap());
|
|
|
|
let predictions = if !re_run && example_cache_path.exists() {
|
|
let file_contents = fs::read_to_string(&example_cache_path)?;
|
|
let as_json = serde_json::from_str::<PredictionDetails>(&file_contents)?;
|
|
log::debug!(
|
|
"Loaded predictions from cache: {}",
|
|
example_cache_path.display()
|
|
);
|
|
as_json
|
|
} else {
|
|
zeta2_predict(example.clone(), &app_state, cx)
|
|
.await
|
|
.unwrap()
|
|
};
|
|
|
|
if !example_cache_path.exists() {
|
|
fs::create_dir_all(&*CACHE_DIR).unwrap();
|
|
fs::write(
|
|
example_cache_path,
|
|
serde_json::to_string(&predictions).unwrap(),
|
|
)
|
|
.unwrap();
|
|
}
|
|
|
|
let evaluation_result = evaluate(&example.example, &predictions);
|
|
|
|
println!(
|
|
"## Expected edit prediction:\n\n```diff\n{}\n```\n",
|
|
compare_diffs(&example.example.expected_patch, &predictions.diff)
|
|
);
|
|
println!(
|
|
"## Actual edit prediction:\n\n```diff\n{}\n```\n",
|
|
compare_diffs(&predictions.diff, &example.example.expected_patch)
|
|
);
|
|
|
|
println!("{}", evaluation_result.to_markdown());
|
|
|
|
anyhow::Ok(evaluation_result)
|
|
}
|
|
|
|
#[derive(Debug, Default)]
|
|
pub struct EvaluationResult {
|
|
pub edit_prediction: Scores,
|
|
pub context: Scores,
|
|
}
|
|
|
|
#[derive(Default, Debug)]
|
|
pub struct Scores {
|
|
pub true_positives: usize,
|
|
pub false_positives: usize,
|
|
pub false_negatives: usize,
|
|
}
|
|
|
|
impl Scores {
|
|
pub fn new(expected: &HashSet<String>, actual: &HashSet<String>) -> Scores {
|
|
let true_positives = expected.intersection(actual).count();
|
|
let false_positives = actual.difference(expected).count();
|
|
let false_negatives = expected.difference(actual).count();
|
|
|
|
Scores {
|
|
true_positives,
|
|
false_positives,
|
|
false_negatives,
|
|
}
|
|
}
|
|
|
|
pub fn to_markdown(&self) -> String {
|
|
format!(
|
|
"
|
|
Precision : {:.4}
|
|
Recall : {:.4}
|
|
F1 Score : {:.4}
|
|
True Positives : {}
|
|
False Positives : {}
|
|
False Negatives : {}",
|
|
self.precision(),
|
|
self.recall(),
|
|
self.f1_score(),
|
|
self.true_positives,
|
|
self.false_positives,
|
|
self.false_negatives
|
|
)
|
|
}
|
|
|
|
pub fn aggregate<'a>(scores: impl Iterator<Item = &'a Scores>) -> Scores {
|
|
let mut true_positives = 0;
|
|
let mut false_positives = 0;
|
|
let mut false_negatives = 0;
|
|
|
|
for score in scores {
|
|
true_positives += score.true_positives;
|
|
false_positives += score.false_positives;
|
|
false_negatives += score.false_negatives;
|
|
}
|
|
|
|
Scores {
|
|
true_positives,
|
|
false_positives,
|
|
false_negatives,
|
|
}
|
|
}
|
|
|
|
pub fn precision(&self) -> f64 {
|
|
if self.true_positives + self.false_positives == 0 {
|
|
0.0
|
|
} else {
|
|
self.true_positives as f64 / (self.true_positives + self.false_positives) as f64
|
|
}
|
|
}
|
|
|
|
pub fn recall(&self) -> f64 {
|
|
if self.true_positives + self.false_negatives == 0 {
|
|
0.0
|
|
} else {
|
|
self.true_positives as f64 / (self.true_positives + self.false_negatives) as f64
|
|
}
|
|
}
|
|
|
|
pub fn f1_score(&self) -> f64 {
|
|
let recall = self.recall();
|
|
let precision = self.precision();
|
|
if precision + recall == 0.0 {
|
|
0.0
|
|
} else {
|
|
2.0 * precision * recall / (precision + recall)
|
|
}
|
|
}
|
|
}
|
|
|
|
impl EvaluationResult {
|
|
pub fn to_markdown(&self) -> String {
|
|
format!(
|
|
r#"
|
|
### Context Scores
|
|
{}
|
|
|
|
### Edit Prediction Scores
|
|
{}
|
|
"#,
|
|
self.context.to_markdown(),
|
|
self.edit_prediction.to_markdown()
|
|
)
|
|
}
|
|
}
|
|
|
|
pub fn evaluate(example: &Example, preds: &PredictionDetails) -> EvaluationResult {
|
|
let mut eval_result = EvaluationResult::default();
|
|
|
|
let actual_context_lines: HashSet<_> = preds
|
|
.excerpts
|
|
.iter()
|
|
.flat_map(|excerpt| {
|
|
excerpt
|
|
.text
|
|
.lines()
|
|
.map(|line| format!("{}: {line}", excerpt.path.display()))
|
|
})
|
|
.collect();
|
|
|
|
let mut false_positive_lines = actual_context_lines.clone();
|
|
|
|
for entry in &example.expected_context {
|
|
let mut best_alternative_score = Scores::default();
|
|
|
|
for alternative in &entry.alternatives {
|
|
let expected: HashSet<_> = alternative
|
|
.excerpts
|
|
.iter()
|
|
.flat_map(|excerpt| {
|
|
excerpt
|
|
.text
|
|
.lines()
|
|
.map(|line| format!("{}: {line}", excerpt.path.display()))
|
|
})
|
|
.collect();
|
|
|
|
let scores = Scores::new(&expected, &actual_context_lines);
|
|
|
|
false_positive_lines.retain(|line| !actual_context_lines.contains(line));
|
|
|
|
if scores.recall() > best_alternative_score.recall() {
|
|
best_alternative_score = scores;
|
|
}
|
|
}
|
|
|
|
eval_result.context.false_negatives += best_alternative_score.false_negatives;
|
|
eval_result.context.true_positives += best_alternative_score.true_positives;
|
|
}
|
|
|
|
eval_result.context.false_positives = false_positive_lines.len();
|
|
|
|
// todo: alternatives for patches
|
|
let expected_patch_lines = example
|
|
.expected_patch
|
|
.lines()
|
|
.map(DiffLine::parse)
|
|
.filter(|line| matches!(line, DiffLine::Addition(_) | DiffLine::Deletion(_)))
|
|
.map(|line| line.to_string())
|
|
.collect();
|
|
|
|
let actual_patch_lines = preds
|
|
.diff
|
|
.lines()
|
|
.map(DiffLine::parse)
|
|
.filter(|line| matches!(line, DiffLine::Addition(_) | DiffLine::Deletion(_)))
|
|
.map(|line| line.to_string())
|
|
.collect();
|
|
|
|
eval_result.edit_prediction = Scores::new(&expected_patch_lines, &actual_patch_lines);
|
|
eval_result
|
|
}
|
|
|
|
/// Return annotated `patch_a` so that:
|
|
/// Additions and deletions that are not present in `patch_b` will be highlighted in red.
|
|
/// Additions and deletions that are present in `patch_b` will be highlighted in green.
|
|
pub fn compare_diffs(patch_a: &str, patch_b: &str) -> String {
|
|
let use_color = std::io::stdout().is_terminal();
|
|
let green = if use_color { "\x1b[32m✓ " } else { "" };
|
|
let red = if use_color { "\x1b[31m✗ " } else { "" };
|
|
let neutral = if use_color { " " } else { "" };
|
|
let reset = if use_color { "\x1b[0m" } else { "" };
|
|
let lines_a = patch_a.lines().map(DiffLine::parse);
|
|
let lines_b: Vec<_> = patch_b.lines().map(DiffLine::parse).collect();
|
|
|
|
let annotated = lines_a
|
|
.map(|line| match line {
|
|
DiffLine::Addition(_) | DiffLine::Deletion(_) => {
|
|
if lines_b.contains(&line) {
|
|
format!("{green}{line}{reset}")
|
|
} else {
|
|
format!("{red}{line}{reset}")
|
|
}
|
|
}
|
|
_ => format!("{neutral}{line}{reset}"),
|
|
})
|
|
.collect::<Vec<String>>();
|
|
|
|
annotated.join("\n")
|
|
}
|