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
47 changes: 26 additions & 21 deletions src/client/models/run_template.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,18 +12,26 @@ fn truncate(s: &str, max: usize) -> String {
}
}

fn summarize_ids(ids: &[String]) -> String {
match ids.len() {
0 => String::new(),
1 => ids[0].clone(),
n => format!("{} (+{})", ids[0], n - 1),
}
}

#[derive(Debug, Clone, Serialize, Deserialize)]
pub struct RunTemplate {
pub id: String,
pub display_name: String,
#[serde(default)]
pub description: Option<String>,
#[serde(skip_serializing_if = "Option::is_none")]
pub agent_id: Option<String>,
#[serde(skip_serializing_if = "Option::is_none")]
pub persona_id: Option<String>,
#[serde(skip_serializing_if = "Option::is_none")]
pub test_set_id: Option<String>,
#[serde(default)]
pub agent_ids: Vec<String>,
#[serde(default)]
pub persona_ids: Vec<String>,
#[serde(default)]
pub test_set_ids: Vec<String>,
#[serde(default)]
pub metric_ids: Vec<String>,
#[serde(default)]
Expand All @@ -50,12 +58,9 @@ pub struct CreateRunTemplateRequest {
pub display_name: String,
#[serde(skip_serializing_if = "Option::is_none")]
pub description: Option<String>,
#[serde(skip_serializing_if = "Option::is_none")]
pub agent_id: Option<String>,
#[serde(skip_serializing_if = "Option::is_none")]
pub persona_id: Option<String>,
#[serde(skip_serializing_if = "Option::is_none")]
pub test_set_id: Option<String>,
pub agent_ids: Vec<String>,
pub persona_ids: Vec<String>,
pub test_set_ids: Vec<String>,
#[serde(skip_serializing_if = "Option::is_none")]
pub metric_ids: Option<Vec<String>>,
#[serde(skip_serializing_if = "Option::is_none")]
Expand All @@ -79,11 +84,11 @@ pub struct UpdateRunTemplateRequest {
#[serde(skip_serializing_if = "Option::is_none")]
pub description: Option<String>,
#[serde(skip_serializing_if = "Option::is_none")]
pub agent_id: Option<String>,
pub agent_ids: Option<Vec<String>>,
#[serde(skip_serializing_if = "Option::is_none")]
pub persona_id: Option<String>,
pub persona_ids: Option<Vec<String>>,
#[serde(skip_serializing_if = "Option::is_none")]
pub test_set_id: Option<String>,
pub test_set_ids: Option<Vec<String>>,
#[serde(skip_serializing_if = "Option::is_none")]
pub metric_ids: Option<Vec<String>>,
#[serde(skip_serializing_if = "Option::is_none")]
Expand Down Expand Up @@ -126,9 +131,9 @@ impl Tabular for RunTemplate {
vec![
"ID",
"NAME",
"AGENT",
"PERSONA",
"TEST SET",
"AGENTS",
"PERSONAS",
"TEST SETS",
"ITERATIONS",
"CONCURRENCY",
]
Expand All @@ -138,9 +143,9 @@ impl Tabular for RunTemplate {
vec![
self.id.clone(),
truncate(&self.display_name, 25),
self.agent_id.clone().unwrap_or_default(),
self.persona_id.clone().unwrap_or_default(),
self.test_set_id.clone().unwrap_or_default(),
summarize_ids(&self.agent_ids),
summarize_ids(&self.persona_ids),
summarize_ids(&self.test_set_ids),
self.iteration_count
.map(|c| c.to_string())
.unwrap_or_default(),
Expand Down
36 changes: 18 additions & 18 deletions src/commands/run_templates.rs
Original file line number Diff line number Diff line change
Expand Up @@ -55,12 +55,12 @@ pub struct CreateArgs {
name: Option<String>,
#[arg(long)]
description: Option<String>,
#[arg(long)]
agent_id: Option<String>,
#[arg(long)]
persona_id: Option<String>,
#[arg(long)]
test_set_id: Option<String>,
#[arg(long, value_delimiter = ',')]
agent_ids: Option<Vec<String>>,
#[arg(long, value_delimiter = ',')]
persona_ids: Option<Vec<String>>,
#[arg(long, value_delimiter = ',')]
test_set_ids: Option<Vec<String>>,
#[arg(long, value_delimiter = ',')]
metric_ids: Option<Vec<String>>,
#[arg(long, value_delimiter = ',')]
Expand All @@ -84,12 +84,12 @@ pub struct UpdateArgs {
name: Option<String>,
#[arg(long)]
description: Option<String>,
#[arg(long)]
agent_id: Option<String>,
#[arg(long)]
persona_id: Option<String>,
#[arg(long)]
test_set_id: Option<String>,
#[arg(long, value_delimiter = ',')]
agent_ids: Option<Vec<String>>,
#[arg(long, value_delimiter = ',')]
persona_ids: Option<Vec<String>>,
#[arg(long, value_delimiter = ',')]
test_set_ids: Option<Vec<String>>,
#[arg(long, value_delimiter = ',')]
metric_ids: Option<Vec<String>>,
#[arg(long, value_delimiter = ',')]
Expand Down Expand Up @@ -155,9 +155,9 @@ pub async fn execute(
let mut input = args.input_json.object()?;
input_json::insert(&mut input, "display_name", args.name)?;
input_json::insert(&mut input, "description", args.description)?;
input_json::insert(&mut input, "agent_id", args.agent_id)?;
input_json::insert(&mut input, "persona_id", args.persona_id)?;
input_json::insert(&mut input, "test_set_id", args.test_set_id)?;
input_json::insert(&mut input, "agent_ids", args.agent_ids)?;
input_json::insert(&mut input, "persona_ids", args.persona_ids)?;
input_json::insert(&mut input, "test_set_ids", args.test_set_ids)?;
input_json::insert(&mut input, "metric_ids", args.metric_ids)?;
input_json::insert(&mut input, "mutation_ids", args.mutation_ids)?;
input_json::insert(&mut input, "iteration_count", args.iteration_count)?;
Expand All @@ -178,9 +178,9 @@ pub async fn execute(
let mut input = args.input_json.object()?;
input_json::insert(&mut input, "display_name", args.name)?;
input_json::insert(&mut input, "description", args.description)?;
input_json::insert(&mut input, "agent_id", args.agent_id)?;
input_json::insert(&mut input, "persona_id", args.persona_id)?;
input_json::insert(&mut input, "test_set_id", args.test_set_id)?;
input_json::insert(&mut input, "agent_ids", args.agent_ids)?;
input_json::insert(&mut input, "persona_ids", args.persona_ids)?;
input_json::insert(&mut input, "test_set_ids", args.test_set_ids)?;
input_json::insert(&mut input, "metric_ids", args.metric_ids)?;
input_json::insert(&mut input, "mutation_ids", args.mutation_ids)?;
input_json::insert(&mut input, "iteration_count", args.iteration_count)?;
Expand Down
Loading