chore(completion): replace CRLF with LF for code completion LLM requests

crates/tabby/Cargo.toml

@@ -56,6 +56,7 @@ color-eyre = { version = "0.6.3" }
 reqwest.workspace = true
 async-openai.workspace = true
 spinners = "4.1.1"
+regex.workspace = true
 
 [dependencies.openssl]
 optional = true

crates/tabby/src/routes/completions.rs

@@ -36,38 +36,11 @@ pub async fn completions(
 
     let user_agent = user_agent.map(|x| x.0.to_string());
 
-    let mut use_crlf = false;
-    if let Some(segments) = request.segments {
-        let mut new_segments = segments.clone();
-        if segments.prefix.contains("\r\n") {
-            use_crlf = true;
-            new_segments.prefix = segments.prefix.replace("\r\n", "\n");
-        }
-        if let Some(suffix) = segments.suffix {
-            if suffix.contains("\r\n") {
-                use_crlf = true;
-                new_segments.suffix = Some(suffix.replace("\r\n", "\n"));
-            }
-        }
-        request.segments = Some(new_segments);
-    }
-
     match state
         .generate(&request, &allowed_code_repository, user_agent.as_deref())
         .await
     {
-        Ok(resp) => {
-            if use_crlf {
-                let mut response_crlf = resp.clone();
-                for (index, choice) in resp.choices.iter().enumerate() {
-                    response_crlf.choices[index].text = choice.text.replace("\n", "\r\n");
-                }
-
-                return Ok(Json(response_crlf));
-            }
-
-            Ok(Json(resp))
-        }
+        Ok(resp) => Ok(Json(resp)),
         Err(err) => {
             warn!("{}", err);
             Err(StatusCode::BAD_REQUEST)

crates/tabby/src/services/completion.rs

@@ -1,5 +1,6 @@
 mod completion_prompt;
 
+use regex::Regex;
 use std::sync::Arc;
 
 use serde::{Deserialize, Serialize};
@@ -321,35 +322,51 @@
             self.config.max_decoding_tokens,
         );
 
+        let mut use_crlf = false;
         let (prompt, segments, snippets) = if let Some(prompt) = request.raw_prompt() {
             (prompt, None, vec![])
         } else if let Some(segments) = request.segments.as_ref() {
+            let mut new_segments = segments.clone();
+            if segments.prefix.contains("\r\n") {
+                use_crlf = true;
+                new_segments.prefix = segments.prefix.replace("\r\n", "\n");
+            }
+            if let Some(suffix) = &segments.suffix {
+                if suffix.contains("\r\n") {
+                    use_crlf = true;
+                    new_segments.suffix = Some(suffix.replace("\r\n", "\n"));
+                }
+            }
+
             let snippets = self
                 .build_snippets(
                     &language,
-                    segments,
+                    &new_segments,
                     allowed_code_repository,
                     request.disable_retrieval_augmented_code_completion(),
                 )
                 .await;
             let prompt = self
                 .prompt_builder
-                .build(&language, segments.clone(), &snippets);
+                .build(&language, new_segments.clone(), &snippets);
             (prompt, Some(segments), snippets)
         } else {
             return Err(CompletionError::EmptyPrompt);
         };
 
-        let text = self.engine.generate(&prompt, options).await;
-        let segments = segments.cloned().map(|s| s.into());
+        let mut text = self.engine.generate(&prompt, options).await;
+        if use_crlf {
+            let re = Regex::new(r"([^\r])\n").unwrap(); // Match \n that is preceded by anything except \r
+            text = re.replace_all(&text, "$1\r\n").to_string() // Replace with captured character and \r\n
+        }
 
         self.logger.log(
             request.user.clone(),
             Event::Completion {
                 completion_id: completion_id.clone(),
                 language,
                 prompt: prompt.clone(),
-                segments,
+                segments: segments.cloned().map(|x| x.into()),
                 choices: vec![api::event::Choice {
                     index: 0,
                     text: text.clone(),