updating with local dev

app.py

@@ -83,33 +83,32 @@ def preProcessSQL(sql):
     disclaimerOutputStripping = """Results are stripped to show only top 5 rows.
 Please add your custom limit to get extend result.
 eg\n select * from schema.table limit 20\n\n"""
-  # sql = str(sql)
-  # sql = sqlparse.format(sql, reindent=True, keyword_case='upper')
+  sql = str(sql)
+  sql = sqlparse.format(sql, reindent=True, keyword_case='upper')
   return sql, disclaimerOutputStripping
 
 def testSQL(sql):
-  global dbCreds, queryHelper
-  dbEngine2 = DbEngine(dbCreds)
+  global dbEngine, queryHelper
 
   sql, disclaimerOutputStripping = preProcessSQL(sql=sql)
   if not isDataQuery(sql):
     return "Sorry not allowed to run. As the query modifies the data."
   try:
-    dbEngine2.connect()
-    conn = dbEngine2.getConnection()
+    dbEngine.connect()
+    conn = dbEngine.getConnection()
     df = pd.read_sql_query(sql, con=conn)       
-    dbEngine2.disconnect()
     return disclaimerOutputStripping + str(pd.DataFrame(df))
   except Exception as e:
       errorMessage = {"function":"testSQL","error":str(e), "userInput":sql}
       saveLog(errorMessage, 'error')
+      
       print(f"Error occured during running the query {sql}.\n and the error is {str(e)}")
-      # prompt = f"Please correct the following sql query, also it has to be run on {PLATFORM}. sql query is \n {sql}. the error occured is {str(e)}."
-      # modifiedSql = queryHelper.modifySqlQueryEnteredByUser(prompt)
-      # logMessage = {"function":"queryHelper.modifySqlQueryEnteredByUser", "sqlQuery":sql, "modifiedSQLQuery":modifiedSql}
-      # saveLog(logMessage, 'info')
-      dbEngine2.disconnect()
-      return f"The query you entered throws some error. Here is the error. Please try different query\n {str(e)}"
+        
+      prompt = f"Please correct the following sql query, also it has to be run on {PLATFORM}. sql query is \n {sql}. the error occured is {str(e)}."
+      modifiedSql = queryHelper.modifySqlQueryEnteredByUser(prompt)
+      logMessage = {"function":"queryHelper.modifySqlQueryEnteredByUser", "sqlQuery":sql, "modifiedSQLQuery":modifiedSql}
+      saveLog(logMessage, 'info')
+      return f"The query you entered throws some error. Here is modified version. Please try this.\n {modifiedSql}"
 
 
 def onSelectedTablesChange(tablesSelected):

config.py

@@ -1,2 +1,2 @@
-# from configLocal import *
-from configProd import *
+from configLocal import *
+# from configProd import *

configProd.py

@@ -18,4 +18,9 @@ HUGGING_FACE_TOKEN = os.getenv("HUGGING_FACE_TOKEN")
 ADMIN = os.getenv("admin")
 PASSWD = os.getenv("passwd")
 
-DB_CREDS_DATA = ({"database":dbName, "user":userDB, "password":pwdDB, "host":host, "port":port})
+DB_CREDS_DATA = ({"database":dbName, "user":userDB, "password":pwdDB, "host":host, "port":port})
+
+
+logsDir = os.getenv("HF_HOME", "/data")
+
+TABLES_DATA_DIR = os.path.join(os.getenv("HF_HOME", "/data"), "tablesData")

persistStorage.py

@@ -3,15 +3,10 @@ import sqlite3
 from datetime import datetime, timedelta
 import pytz
 import os 
-from config import HUGGING_FACE_TOKEN
+from config import HUGGING_FACE_TOKEN, TABLES_DATA_DIR, logsDir
 import pandas as pd
 import csv 
 
-
-logsDir = os.getenv("HF_HOME", "/data")
-
-TABLES_DATA_DIR = os.path.join(os.getenv("HF_HOME", "/data"), "tablesData")
-
 try:
     os.makedirs(TABLES_DATA_DIR, exist_ok=True)
 except: