Tweak prompt and patch preprocessing

Author: rsdy

server/bleep/src/webserver/answer/prompts.rs

@@ -160,27 +160,21 @@ pub fn final_explanation_prompt(context: &str, query: &str, query_history: &str)
             example: Some(r#"The path is a relative path, with no leading slash. You must generate a trailing slash, for example: server/bleep/src/webserver/. On Windows, generate backslash separated components, for example: server\bleep\src\webserver\"#),
         },
         Rule {
-            title: "Write a new code file",
-            description: "Write a new code file that satisfies the query. Do not use this to demonstrate updating an existing file.",
-            schema: "[\"new\",LANGUAGE:STRING,CODE:STRING]",
-            note: "This object can occur multiple times",
-            example: None,
-        },
-        Rule {
-            title: "Update the code in an existing file",
-            description: "Edit an existing code file by generating the diff between old and new versions. Changes should be as small as possible.",
-            schema: "[\"mod\",PATH ALIAS:INT,LANGUAGE:STRING,DESCRIPTION:STRING,GIT DIFF WITHOUT LINE NUMBERS:STRING]",
+            title: "Write a new code file in a unified diff format",
+            description: "Write a new code file that satisfies the query.",
+            schema: "[\"mod\",null,LANGUAGE:STRING,DESCRIPTION:STRING,GIT DIFF WITHOUT LINE NUMBERS:STRING,NEW PATH:STRING]",
             note: "This object can occur multiple times",
             example: Some(r#"DESCRIPTION is a natural language description of the changes
+            NEW PATH: path for the newly created file.
             GIT DIFF WITHOUT LINE NUMBERS describes the unified diff for the file, including the git diff header. Do not include any line numbers
             For example:
             ```
 @@ -1,7 +1,6 @@
--The Way that can be told of is not the eternal Way;
--The name that can be named is not the eternal name.
+-   The Way that can be told of is not the eternal Way;
+-   The name that can be named is not the eternal name.
   The Nameless is the origin of Heaven and Earth;
--The Named is the mother of all things.
-+The named is the mother of all things.
+-   The Named is the mother of all things.
++   The named is the mother of all things.
 +
   Therefore let there always be non-being,
     so we may see their subtlety,
@@ -189,11 +183,19 @@ pub fn final_explanation_prompt(context: &str, query: &str, query_history: &str)
   The two are the same,
   But after they are produced,
     they have different names.
-+They both may be called deep and profound.
-+Deeper and more profound,
-+The door of all subtleties!
++ They both may be called deep and profound.
++ Deeper and more profound,
++ The door of all subtleties!
 ```"#),
         },
+        Rule {
+            title: "Update the code in an existing file",
+            description: "Edit an existing code file by generating the diff between old and new versions. Changes should be as small as possible.",
+            schema: "[\"mod\",PATH ALIAS:INT,LANGUAGE:STRING,DESCRIPTION:STRING,GIT DIFF WITHOUT LINE NUMBERS:STRING]",
+            note: "This object can occur multiple times",
+            example: Some(r#"DESCRIPTION is a natural language description of the changes
+            GIT DIFF WITHOUT LINE NUMBERS describes the unified diff for the file, including the git diff header. Do not include any line numbers."#),
+        },
         Rule {
             title: "Cite line ranges from the file",
             description: "START LINE and END LINE should focus on the code mentioned in the COMMENT. COMMENT should be a detailed explanation.",

server/bleep/src/webserver/answer/response.rs

@@ -172,6 +172,7 @@ pub struct ModifyResult {
     description: Option<String>,
     diff: Option<ModifyResultHunk>,
     raw: Option<String>,
+    new_file: Option<String>,
 }
 
 #[derive(serde::Serialize, serde::Deserialize, Default, Debug, Clone)]
@@ -285,31 +286,38 @@ impl ModifyResult {
             .and_then(serde_json::Value::as_str)
             .map(str::to_string);
 
+        let new_file = v
+            .get(4)
+            .and_then(serde_json::Value::as_str)
+            .map(str::to_string);
+
         Some(Self {
             path_alias,
             language,
             diff,
             raw,
+            new_file,
             ..Default::default()
         })
     }
 
     fn substitute_path_alias(mut self, path_aliases: &[String]) -> Self {
-        self.path = self
-            .path_alias
-            .as_ref()
-            .and_then(|alias| {
-                if let Some(p) = path_aliases.get(*alias as usize) {
-                    Some(p)
-                } else {
-                    tracing::warn!("no path found for alias `{alias}`");
-                    for (idx, p) in path_aliases.iter().enumerate() {
-                        tracing::warn!("we have {idx}. {p}");
+        self.path = self.new_file.clone().or_else(|| {
+            self.path_alias
+                .as_ref()
+                .and_then(|alias| {
+                    if let Some(p) = path_aliases.get(*alias as usize) {
+                        Some(p)
+                    } else {
+                        tracing::warn!("no path found for alias `{alias}`");
+                        for (idx, p) in path_aliases.iter().enumerate() {
+                            tracing::warn!("we have {idx}. {p}");
+                        }
+                        None
                     }
-                    None
-                }
-            })
-            .map(ToOwned::to_owned);
+                })
+                .map(ToOwned::to_owned)
+        });
         self
     }
 }

server/bleep/src/webserver/git.rs

@@ -296,6 +296,7 @@ impl<'a> Visit for CreateNewCommit<'a> {
                 let processed = process_patch(patch);
                 let base = String::from_utf8_lossy(&base);
                 println!("{base}");
+                println!("{processed}");
 
                 diffy::apply(base.as_ref(), &diffy::Patch::from_str(&processed).unwrap())
                     .unwrap()
@@ -331,9 +332,7 @@ fn process_patch(patch: &str) -> String {
             .skip_while(|line| empty_line.is_match(line))
             .collect::<Vec<_>>();
 
-        rev.into_iter()
-            .rev()
-            .skip_while(|line| empty_line.is_match(line))
+        rev.into_iter().rev()
     };
 
     let mut collected = vec![];