From ec7c037d3c24ccd20a1aade9264ab5181e8b7011 Mon Sep 17 00:00:00 2001 From: Alice Hau Date: Fri, 21 Mar 2025 16:47:20 -0700 Subject: [PATCH 1/2] fix multi selector --- crates/goose-bench/src/eval_suites/factory.rs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/crates/goose-bench/src/eval_suites/factory.rs b/crates/goose-bench/src/eval_suites/factory.rs index cc26b222f2f7..fd5ce8753683 100644 --- a/crates/goose-bench/src/eval_suites/factory.rs +++ b/crates/goose-bench/src/eval_suites/factory.rs @@ -49,6 +49,7 @@ impl EvaluationSuite { evals } pub fn select(selectors: Vec) -> HashMap> { + println!("Selecting evals with selectors: {:?}", selectors); let eval_name_pattern = Regex::new(r":\w+$").unwrap(); let grouped_by_suite: HashMap> = EvaluationSuite::registered_evals() @@ -83,8 +84,8 @@ fn matches_any_selectors(eval: &str, selectors: &Vec) -> bool { // selectors must prefix match exactly, no matching half-way in a word // remove one level of nesting at a time and check exact match let nesting_pattern = Regex::new(r":\w+$").unwrap(); - let mut level_up = eval.to_string(); for selector in selectors { + let mut level_up = eval.to_string(); while !level_up.is_empty() { if level_up == *selector { return true; From f0619073e6438a80f6764fae79cf6cb68e6f6091 Mon Sep 17 00:00:00 2001 From: Alice Hau Date: Fri, 21 Mar 2025 16:48:05 -0700 Subject: [PATCH 2/2] remove print --- crates/goose-bench/src/eval_suites/factory.rs | 1 - 1 file changed, 1 deletion(-) diff --git a/crates/goose-bench/src/eval_suites/factory.rs b/crates/goose-bench/src/eval_suites/factory.rs index fd5ce8753683..b19cb4967867 100644 --- a/crates/goose-bench/src/eval_suites/factory.rs +++ b/crates/goose-bench/src/eval_suites/factory.rs @@ -49,7 +49,6 @@ impl EvaluationSuite { evals } pub fn select(selectors: Vec) -> HashMap> { - println!("Selecting evals with selectors: {:?}", selectors); let eval_name_pattern = Regex::new(r":\w+$").unwrap(); let grouped_by_suite: HashMap> = EvaluationSuite::registered_evals()