bug fixes

app.py

@@ -27,25 +27,12 @@ warnings.filterwarnings("ignore")
 
 dbCreds = DataWrapper(DB_CREDS_DATA)
 dbEngine = DbEngine(dbCreds)
-dbEngine.connect()
 
 tablesAndCols = getAllTablesInfo(dbEngine, SCHEMA_NAME)
 metadataLayout = MetaDataLayout(schemaName=SCHEMA_NAME, allTablesAndCols=tablesAndCols)
 metadataLayout.setSelection(DEFAULT_TABLES_COLS)
 
 selectedTablesAndCols = metadataLayout.getSelectedTablesAndCols()
-
-def getSampleDataForTablesAndCols(dbEngine, schemaName, tablesAndCols, maxRows):
-    data = {}
-    conn = dbEngine.connection
-    for table in tablesAndCols.keys():
-      try:
-        sqlQuery = f"""select * from {schemaName}.{table} limit {maxRows}"""
-        data[table] = pd.read_sql_query(sqlQuery, con=conn)
-      except Exception as e:
-        print(e)
-        print(f"couldn't read table data. Table: {table}")
-    return data
   
 
 openAIClient = OpenAI(api_key=OPENAI_API_KEY)

gptManager.py

@@ -67,6 +67,10 @@ class ChatgptManager:
     if newMessage!=None:
       messages.append(newMessage)
 
-    combinedContent = " ".join(msg["content"] for msg in messages)
+    if len(messages)!=0:
+      combinedContent = " ".join(msg["content"] for msg in messages)
+    else:
+      combinedContent = ""
+      
     currentTokensInMessages = getWordsCount(combinedContent)
     return currentTokensInMessages

utils.py

@@ -1,5 +1,6 @@
 import psycopg2
 import re
+import pandas as pd
 
 class DataWrapper:
   def __init__(self, data):
@@ -53,23 +54,33 @@ class MetaDataLayout:
 class DbEngine:
   def __init__(self, dbCreds):
     self.dbCreds = dbCreds
-    self.connection = None
+    self._connection = None
 
   def connect(self):
     dbCreds = self.dbCreds
-    if self.connection is None or self.connection.closed != 0:
-      self.connection = psycopg2.connect(database=dbCreds.database, user = dbCreds.user,
+    if self._connection is None or self._connection.closed != 0:
+      self._connection = psycopg2.connect(database=dbCreds.database, user = dbCreds.user,
                   password = dbCreds.password, host = dbCreds.host,
                   port = dbCreds.port)
+      
+  def getConnection(self):
+    if self._connection is None or self._connection.closed != 0:
+      self.connect()
+    return self._connection
+
 
   def disconnect(self):
-    if self.connection is not None and self.connection.closed == 0:
-      self.connection.close()
+    if self._connection is not None and self._connection.closed == 0:
+      self._connection.close()
 
   def execute_query(self, query):
-    with self.connection.cursor() as cursor:
-      cursor.execute(query)
-      result = cursor.fetchall()
+    try:
+      self.connect()
+      with self._connection.cursor() as cursor:
+        cursor.execute(query)
+        result = cursor.fetchall()
+    except Exception as e:
+      raise Exception(e)
     return result
 
   
@@ -78,7 +89,8 @@ def executeQuery(dbEngine, query):
   return result
 
 def executeColumnsQuery(dbEngine, columnQuery):
-  with dbEngine.connection.cursor() as cursor:
+  dbEngine.connect()
+  with dbEngine._connection.cursor() as cursor:
     cursor.execute(columnQuery)
     columns = [desc[0] for desc in cursor.description]
   return columns
@@ -99,9 +111,9 @@ def getAllTablesInfo(dbEngine, schemaName):
   return tablesAndCols
 
 def getSampleDataForTablesAndCols(dbEngine, schemaName, tablesAndCols, maxRows):
-
     data = {}
-    conn = dbEngine.connection
+    dbEngine.connect()
+    conn = dbEngine.getConnection()
     for table in tablesAndCols.keys():
       try:
         sqlQuery = f"""select * from {schemaName}.{table} limit {maxRows}"""
@@ -138,7 +150,7 @@ def extractSqlFromGptResponse(gptReponse):
 def addSchemaToTableInSQL(sqlQuery, schemaName, tablesList):
 
   for table in tablesList:
-    pattern = re.compile(rf'(?<![a-zA-Z0-9_]){re.escape(table)}(?![a-zA-Z0-9_])', re.IGNORECASE)
+    pattern = re.compile(rf'(?<!\S){re.escape(table)}(?!\S)', re.IGNORECASE)
     replacement = f'{schemaName}.{table}'
     sqlQuery = re.sub(pattern, replacement, sqlQuery)
   return sqlQuery