Skip to content

feat: cli can work with gui generated recipes #3254

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jsibbison-square merged 2 commits into from
Jul 7, 2025
Merged

feat: cli can work with gui generated recipes #3254

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
21526cf
feat: support gui generated recipe format in cli
jsibbison-square Jul 4, 2025
60727ec
Adds test for nested recipe loading
jsibbison-square Jul 4, 2025
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
46 changes: 42 additions & 4 deletions crates/goose/src/recipe/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,10 +265,18 @@ impl Recipe {
}
}
pub fn from_content(content: &str) -> Result<Self> {
if serde_json::from_str::<serde_json::Value>(content).is_ok() {
Ok(serde_json::from_str(content)?)
} else if serde_yaml::from_str::<serde_yaml::Value>(content).is_ok() {
Ok(serde_yaml::from_str(content)?)
if let Ok(json_value) = serde_json::from_str::<serde_json::Value>(content) {
Copy link
Collaborator

@DOsinga DOsinga Jul 4, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

hmm - @lifeizhou-ap does looks like we reverted the code to trying both json and yaml again. why is that? every json file is also a yaml file, so we shouldn't need to do this twice here

Copy link
Collaborator

@lifeizhou-ap lifeizhou-ap Jul 7, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more. 

 if serde_json::from_str::<serde_json::Value>(content).is_ok() {
            Ok(serde_json::from_str(content)?)
        } else if serde_yaml::from_str::<serde_yaml::Value>(content).is_ok() {
            Ok(serde_yaml::from_str(content)?)

yes, that was me. It was missed out during a refactoring a while ago. will update in another PR

if let Some(nested_recipe) = json_value.get("recipe") {
Ok(serde_json::from_value(nested_recipe.clone())?)
} else {
Ok(serde_json::from_str(content)?)
}
} else if let Ok(yaml_value) = serde_yaml::from_str::<serde_yaml::Value>(content) {
if let Some(nested_recipe) = yaml_value.get("recipe") {
Ok(serde_yaml::from_value(nested_recipe.clone())?)
} else {
Ok(serde_yaml::from_str(content)?)
}
} else {
Err(anyhow::anyhow!(
"Unsupported format. Expected JSON or YAML."
Expand Down Expand Up @@ -621,4 +629,34 @@ sub_recipes:
let activities = recipe.activities.unwrap();
assert_eq!(activities, vec!["activity1", "activity2"]);
}

#[test]
fn test_from_content_with_nested_recipe_yaml() {
let content = r#"name: test_recipe
recipe:
title: Nested Recipe Test
description: A test recipe with nested structure
instructions: Test instructions for nested recipe
activities:
- Test activity 1
- Test activity 2
prompt: Test prompt
extensions: []
isGlobal: true"#;

let recipe = Recipe::from_content(content).unwrap();
assert_eq!(recipe.title, "Nested Recipe Test");
assert_eq!(recipe.description, "A test recipe with nested structure");
assert_eq!(
recipe.instructions,
Some("Test instructions for nested recipe".to_string())
);
assert_eq!(recipe.prompt, Some("Test prompt".to_string()));
assert!(recipe.activities.is_some());
let activities = recipe.activities.unwrap();
assert_eq!(activities, vec!["Test activity 1", "Test activity 2"]);
assert!(recipe.extensions.is_some());
let extensions = recipe.extensions.unwrap();
assert_eq!(extensions.len(), 0);
}
}
Loading