updated error message

app.py

@@ -6,7 +6,7 @@ import sys
 
 PROMPT_TEMPLATE = """### Instruction:\n{instruction}\n\n### Input:\n{input}\n### Question:\n{question}\n\n### Response (use duckdb shorthand if possible):\n"""
 INSTRUCTION_TEMPLATE = """Your task is to generate valid duckdb SQL to answer the following question{has_schema}"""  # noqa: E501
-ERROR_MESSAGE = ":red[ Quack! Much to our regret, SQL generation has gone a tad duck-side-down.\nThe model is currently not able to craft a correct SQL query for this request. \nSorry my duck friend. ]\n\n:red[ Try rephrasing the question/instruction. And if the question is about your own database, make sure to set the correct schema. ]\n\n```sql\n{sql_query}\n```\n\n```sql\n{error_msg}\n```"
+ERROR_MESSAGE = ":red[ Quack! Much to our regret, SQL generation has gone a tad duck-side-down.\nThe model is currently not able to craft a correct SQL query for this request. \nSorry my duck friend. ]\n\n:red[If the question is about your own database, make sure to set the correct schema. Otherwise, try to rephrase your request. ]\n\n```sql\n{sql_query}\n```\n\n```sql\n{error_msg}\n```"
 STOP_TOKENS = ["###", ";", "--", "```"]
 
 
@@ -66,8 +66,8 @@ def validate_sql(query, schema):
         )
         # Get output and potential parser, and binder error message
         stdout, stderr = process.communicate(timeout=0.5)
-        if stderr:
-            return False, stderr.decode('utf8')
+        if stdout != "":
+            return False, stdout.decode('utf8')
         return True, ""
     except subprocess.TimeoutExpired:
         process.kill()

validate_sql.py

@@ -5,7 +5,6 @@ from duckdb import ParserException, SyntaxException, BinderException, CatalogExc
 
 def validate_query(query, schemas):
     try:
-        print("Running query: ", query)
         with duckdb.connect(
                 ":memory:", config={"enable_external_access": False}
         ) as duckdb_conn:
@@ -15,14 +14,14 @@ def validate_query(query, schemas):
             cursor = duckdb_conn.cursor()
             cursor.execute(query)
     except ParserException as e:
-        raise e
+        print(str(e))
     except SyntaxException as e:
-        raise e
+        print(str(e))
     except BinderException as e:
-        raise e
+        print(str(e))
     except CatalogException as e:
         if not ("but it exists" in str(e) and "extension" in str(e)):
-            raise e
+            print(str(e))
     except Exception as e:
         return True
     return True