Update duckdb-nsql/eval/prompt_formatters.py

duckdb-nsql/eval/prompt_formatters.py

@@ -105,7 +105,7 @@ class RajkumarFormatter:
 
         # If SQL blocks found, use the last one
         if sql_blocks:
-            return ensure_semicolon(clean_code_block(sql_blocks[-1]))
+            return ensure_semicolon(clean_code_block(sql_blocks[-1])).replace('```sql','').replace('```','').strip()
 
         # If no SQL blocks, look for generic code blocks
         generic_blocks = []
@@ -127,17 +127,15 @@ class RajkumarFormatter:
 
         # If generic blocks found, use the last one
         if generic_blocks:
-            return ensure_semicolon(clean_code_block(generic_blocks[-1]))
+            return ensure_semicolon(clean_code_block(generic_blocks[-1])).replace('```sql','').replace('```','').strip()
 
         # If no code blocks found at all, take everything up to first semicolon
         semicolon_pos = output_sql.find(';')
         if semicolon_pos != -1:
-            return ensure_semicolon(output_sql[:semicolon_pos].strip())
+            return ensure_semicolon(output_sql[:semicolon_pos].strip()).replace('```sql','').replace('```','').strip()
 
         # If no semicolon found, use the entire text
-        extracted = ensure_semicolon(output_sql.strip())
-        extracted = extracted.replace('```sql','').replace('```','').strip()
-        return extracted
+        return ensure_semicolon(output_sql.strip()).replace('```sql','').replace('```','').strip()
 
     @classmethod
     def format_gold_output(cls, output_sql: str) -> str: