-
Notifications
You must be signed in to change notification settings - Fork 3
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* add rtests Signed-off-by: Jess Frazelle <github@jessfraz.com> * tests Signed-off-by: Jess Frazelle <github@jessfraz.com> * text-to-kcl edit in cli Signed-off-by: Jess Frazelle <github@jessfraz.com> * updates Signed-off-by: Jess Frazelle <github@jessfraz.com> * updates Signed-off-by: Jess Frazelle <github@jessfraz.com> * updates Signed-off-by: Jess Frazelle <github@jessfraz.com> * updates Signed-off-by: Jess Frazelle <github@jessfraz.com> --------- Signed-off-by: Jess Frazelle <github@jessfraz.com>
- Loading branch information
Showing
11 changed files
with
152,272 additions
and
8,246 deletions.
There are no files selected for viewing
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,162 @@ | ||
| use anyhow::Result; | ||
| use clap::Parser; | ||
|
|
||
| /// Edit a KCL file with machine learning. | ||
| #[derive(Parser, Debug, Clone)] | ||
| #[clap(verbatim_doc_comment)] | ||
| pub struct CmdKcl { | ||
| #[clap(subcommand)] | ||
| subcmd: SubCommand, | ||
| } | ||
|
|
||
| #[derive(Parser, Debug, Clone)] | ||
| enum SubCommand { | ||
| Edit(CmdKclEdit), | ||
| } | ||
|
|
||
| #[async_trait::async_trait(?Send)] | ||
| impl crate::cmd::Command for CmdKcl { | ||
| async fn run(&self, ctx: &mut crate::context::Context) -> Result<()> { | ||
| match &self.subcmd { | ||
| SubCommand::Edit(cmd) => cmd.run(ctx).await, | ||
| } | ||
| } | ||
| } | ||
|
|
||
| /// Edit a `kcl` file with a prompt. | ||
| /// | ||
| /// $ zoo ml kcl edit --prompt "Make it blue" | ||
| /// | ||
| /// This command outputs the edited `kcl` file to stdout. | ||
| #[derive(Parser, Debug, Clone)] | ||
| #[clap(verbatim_doc_comment)] | ||
| pub struct CmdKclEdit { | ||
| /// The path to the input file. | ||
| /// If you pass `-` as the path, the file will be read from stdin. | ||
| #[clap(name = "input", required = true)] | ||
| pub input: std::path::PathBuf, | ||
|
|
||
| /// Your prompt. | ||
| #[clap(name = "prompt", required = true)] | ||
| pub prompt: Vec<String>, | ||
|
|
||
| /// The source ranges to edit. This is optional. | ||
| /// If you don't pass this, the entire file will be edited. | ||
| #[clap(name = "source_range", long, short = 'r')] | ||
| pub source_range: Option<String>, | ||
| } | ||
|
|
||
| #[async_trait::async_trait(?Send)] | ||
| impl crate::cmd::Command for CmdKclEdit { | ||
| async fn run(&self, ctx: &mut crate::context::Context) -> Result<()> { | ||
| // Get the contents of the input file. | ||
| let input = ctx.read_file(self.input.to_str().unwrap_or(""))?; | ||
| // Parse the input as a string. | ||
| let input = std::str::from_utf8(&input)?; | ||
|
|
||
| let prompt = self.prompt.join(" "); | ||
|
|
||
| if prompt.is_empty() { | ||
| anyhow::bail!("prompt cannot be empty"); | ||
| } | ||
|
|
||
| let source_ranges = if let Some(source_range) = &self.source_range { | ||
| vec![kittycad::types::SourceRangePrompt { | ||
| range: convert_to_source_range(source_range)?, | ||
| prompt: prompt.clone(), | ||
| }] | ||
| } else { | ||
| Default::default() | ||
| }; | ||
|
|
||
| let body = kittycad::types::TextToCadIterationBody { | ||
| original_source_code: input.to_string(), | ||
| prompt: if source_ranges.is_empty() { Some(prompt) } else { None }, | ||
| source_ranges, | ||
| }; | ||
|
|
||
| let model = ctx.get_edit_for_prompt("", &body).await?; | ||
|
|
||
| // Print the output of the conversion. | ||
| writeln!(ctx.io.out, "{}", model.code)?; | ||
|
|
||
| Ok(()) | ||
| } | ||
| } | ||
|
|
||
| /// Convert from a string like "4:2-4:5" to a source range. | ||
| /// Where 4 is the line number and 2 and 5 are the column numbers. | ||
| fn convert_to_source_range(source_range: &str) -> Result<kittycad::types::SourceRange> { | ||
| let parts: Vec<&str> = source_range.split('-').collect(); | ||
| if parts.len() != 2 { | ||
| anyhow::bail!("source range must be in the format 'line:column-line:column'"); | ||
| } | ||
|
|
||
| let inner_parts_start = parts[0].split(':').collect::<Vec<&str>>(); | ||
| if inner_parts_start.len() != 2 { | ||
| anyhow::bail!("source range must be in the format 'line:column'"); | ||
| } | ||
|
|
||
| let inner_parts_end = parts[1].split(':').collect::<Vec<&str>>(); | ||
| if inner_parts_end.len() != 2 { | ||
| anyhow::bail!("source range must be in the format 'line:column'"); | ||
| } | ||
|
|
||
| let start = kittycad::types::SourcePosition { | ||
| line: inner_parts_start[0].parse::<u32>()?, | ||
| column: inner_parts_start[1].parse::<u32>()?, | ||
| }; | ||
| let end = kittycad::types::SourcePosition { | ||
| line: inner_parts_end[0].parse::<u32>()?, | ||
| column: inner_parts_end[1].parse::<u32>()?, | ||
| }; | ||
|
|
||
| Ok(kittycad::types::SourceRange { start, end }) | ||
| } | ||
|
|
||
| #[cfg(test)] | ||
| mod test { | ||
| use pretty_assertions::assert_eq; | ||
|
|
||
| use super::*; | ||
|
|
||
| #[test] | ||
| fn test_convert_to_source_range() { | ||
| let source_range = "4:2-4:5"; | ||
| let result = convert_to_source_range(source_range).unwrap(); | ||
| assert_eq!( | ||
| result, | ||
| kittycad::types::SourceRange { | ||
| start: kittycad::types::SourcePosition { line: 4, column: 2 }, | ||
| end: kittycad::types::SourcePosition { line: 4, column: 5 } | ||
| } | ||
| ); | ||
| } | ||
|
|
||
| #[test] | ||
| fn test_convert_to_source_range_invalid() { | ||
| let source_range = "4:2-4"; | ||
| let result = convert_to_source_range(source_range); | ||
| assert!(result.is_err()); | ||
| } | ||
|
|
||
| #[test] | ||
| fn test_convert_to_source_range_invalid_inner() { | ||
| let source_range = "4:2-4:5:6"; | ||
| let result = convert_to_source_range(source_range); | ||
| assert!(result.is_err()); | ||
| } | ||
|
|
||
| #[test] | ||
| fn test_convert_to_source_range_bigger() { | ||
| let source_range = "14:12-15:25"; | ||
| let result = convert_to_source_range(source_range).unwrap(); | ||
| assert_eq!( | ||
| result, | ||
| kittycad::types::SourceRange { | ||
| start: kittycad::types::SourcePosition { line: 14, column: 12 }, | ||
| end: kittycad::types::SourcePosition { line: 15, column: 25 } | ||
| } | ||
| ); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.