Upload 4 files

app.py

@@ -58,7 +58,10 @@ def respond(message, chatHistory):
   """gpt response handler for gradio ui"""
   global queryHelper
   try:
-      botMessage, prospectTablesAndCols  = queryHelper.getQueryForUserInput(message, chatHistory)
+      if "modify" in message:
+        botMessage, prospectTablesAndCols  = queryHelper.getQueryForUserInput(message, chatHistory)
+      else:
+         botMessage, prospectTablesAndCols  = queryHelper.getQueryForUserInput(message, [])
   except Exception as e:
       errorMessage = {"function":"queryHelper.getQueryForUserInput","error":str(e), "userInput":message}
       saveLog(errorMessage, 'error')
@@ -91,7 +94,8 @@ def testSQL(sql):
   if not isDataQuery(sql):
     return "Sorry not allowed to run. As the query modifies the data."
   try:
-    conn = dbEngine.connection
+    dbEngine.connect()
+    conn = dbEngine.getConnection()
     df = pd.read_sql_query(sql, con=conn)       
     return disclaimerOutputStripping + str(pd.DataFrame(df))
   except Exception as e:

configProd.py

@@ -7,8 +7,8 @@ userDB = os.getenv("user_db")
 pwdDB = os.getenv("pwd_db")
 host = os.getenv("host_db")
 port = os.getenv("port_db")
-# GPT_MODEL = "gpt-4" 
-GPT_MODEL = "gpt-3.5-turbo-1106"
+GPT_MODEL = "gpt-4" 
+# GPT_MODEL = "gpt-3.5-turbo-1106"
 
 HUGGING_FACE_TOKEN = os.getenv("HUGGING_FACE_TOKEN")
 

gptManager.py

@@ -1,10 +1,12 @@
 import re
+from persistStorage import saveLog
 
 class ChatgptManager:
-  def __init__(self, openAIClient, model="gpt-3.5-turbo-1106", tokenLimit=8000):
+  def __init__(self, openAIClient, model="gpt-3.5-turbo-1106", tokenLimit=8000, throwError=False):
     self.client = openAIClient
     self.tokenLimit = tokenLimit
     self.model = model
+    self.throwError = throwError
   
   def _chatHistoryToGptMessages(self, chatHistory=[]):
     messages = []
@@ -39,14 +41,19 @@ class ChatgptManager:
     #   messages=self.messages,
     #   temperature=0,
     # )
-    
-    completion = self.client.chat.completions.create(
-      model=self.model,
-      messages=self.messages,
-      temperature=0,
-    )
+    try:
+      completion = self.client.chat.completions.create(
+        model=self.model,
+        messages=self.messages,
+        temperature=0,
+      )
+      gptResponse = completion.choices[0].message.content
+    except Exception as e:
+      if not self.throwError:
+        gptResponse = "Error while connecting with gpt " + str(e)[:50] + "..."
+
 
-    gptResponse = completion.choices[0].message.content
+    
 
     self.messages.append({"role": "assistant", "content": gptResponse})
     return gptResponse
@@ -71,6 +78,6 @@ class ChatgptManager:
       combinedContent = " ".join(msg["content"] for msg in messages)
     else:
       combinedContent = ""
-      
+
     currentTokensInMessages = getWordsCount(combinedContent)
     return currentTokensInMessages