Minor changes in the session check and oauth

app.py

@@ -1,5 +1,7 @@
 import io
 import tempfile
+
+from click import option
 from starlette import status
 from functions import *
 import pandas as pd
@@ -13,7 +15,6 @@ import nltk
 import time
 import uuid
 
-
 nltk.download('punkt_tab')
 
 app = FastAPI(title="ConversAI", root_path="/api/v1")
@@ -48,11 +49,24 @@ async def sign_up(email, username, password):
 
 
 @app.post("/session-check")
-async def check_session():
+async def check_session(user_id: str):
     res = supabase.auth.get_session()
+    if res == None:
+        try:
+            supabase.table("Stores").delete().eq(
+                "StoreID", user_id
+            ).execute()
+            resp = supabase.auth.sign_out()
+
+            response = {"message": "success", "code": 200, "Session": res}
+
+            return response
+        except Exception as e:
+            raise HTTPException(status_code=400, detail=str(e))
 
     return res
 
+
 @app.post("/get-user")
 async def get_user(access_token):
     res = supabase.auth.get_user(jwt=access_token)
@@ -65,7 +79,6 @@ async def refresh_token(refresh_token):
     return res
 
 
-
 @app.post("/login")
 async def sign_in(email, password):
     try:
@@ -184,7 +197,6 @@ async def login_with_token(token):
         )
 
 
-
 @app.post("/set-session-data")
 async def set_session_data(access_token, refresh_token):
     res = supabase.auth.set_session(access_token, refresh_token)
@@ -207,8 +219,9 @@ async def sign_out(user_id):
 
 
 @app.post("/oauth")
-async def oauth(provider):
-    res = supabase.auth.sign_in_with_oauth({"provider": provider})
+async def oauth():
+    res = supabase.auth.sign_in_with_oauth(
+        {"provider": "google", "options": {"redirect_to": "https://convers-ai-lac.vercel.app"}})
     return res
 
 
@@ -259,7 +272,8 @@ async def addPDFData(vectorstore: str, pdf: UploadFile = File(...)):
         with open(f"{fileId}.txt", "w") as file:
             file.write(newText)
         with open(f"{fileId}.txt", "rb") as f:
-            supabase.storage.from_("ConversAI").upload(file = f, path = os.path.join("/", f.name), file_options={"content-type": "text/plain"})
+            supabase.storage.from_("ConversAI").upload(file=f, path=os.path.join("/", f.name),
+                                                       file_options={"content-type": "text/plain"})
         os.remove(f"{fileId}.txt")
         output["supabaseFileName"] = f"{fileId}.txt"
         return output
@@ -280,7 +294,7 @@ async def returnText(pdf: UploadFile = File(...)):
     return {
         "source": source,
         "extractionTime": timeTaken,
-        "output": text 
+        "output": text
     }
 
 
@@ -307,7 +321,8 @@ async def addText(vectorstore: str, text: str, source: str | None = None):
         with open(f"{fileId}.txt", "w") as file:
             file.write(newText)
         with open(f"{fileId}.txt", "rb") as f:
-            supabase.storage.from_("ConversAI").upload(file = f, path = os.path.join("/", f.name), file_options={"content-type": "text/plain"})
+            supabase.storage.from_("ConversAI").upload(file=f, path=os.path.join("/", f.name),
+                                                       file_options={"content-type": "text/plain"})
         os.remove(f"{fileId}.txt")
         output["supabaseFileName"] = f"{fileId}.txt"
         return output
@@ -345,13 +360,14 @@ async def addQAPairData(addQaPair: AddQAPair):
 @app.post("/addWebsite")
 async def addWebsite(vectorstore: str, websiteUrls: list[str]):
     start = time.time()
-    text = extractTextFromUrlList(urls = websiteUrls)
+    text = extractTextFromUrlList(urls=websiteUrls)
     textExtraction = time.time()
     username, chatbotname = vectorstore.split("$")[1], vectorstore.split("$")[2]
     df = pd.DataFrame(supabase.table("ConversAI_ChatbotInfo").select("*").execute().data)
     currentCount = df[(df["user_id"] == username) & (df["chatbotname"] == chatbotname)]["charactercount"].iloc[0]
     newCount = currentCount + len(text)
-    limit = supabase.table("ConversAI_UserConfig").select("tokenLimit").eq("user_id", username).execute().data[0]["tokenLimit"]
+    limit = supabase.table("ConversAI_UserConfig").select("tokenLimit").eq("user_id", username).execute().data[0][
+        "tokenLimit"]
     if newCount < int(limit):
         supabase.table("ConversAI_ChatbotInfo").update({"charactercount": str(newCount)}).eq("user_id", username).eq(
             "chatbotname", chatbotname).execute()
@@ -364,12 +380,14 @@ async def addWebsite(vectorstore: str, websiteUrls: list[str]):
         tokenizer = nltk.tokenize.RegexpTokenizer(r"\w+")
         wordCount = f"WORD COUNT: {len(tokenizer.tokenize(text))}" + "\n"
         links = "LINKS:\n" + "\n".join(websiteUrls) + "\n"
-        newText = ("=" * 75 + "\n").join([timeTaken, uploadTime, wordCount, tokenCount, links, "TEXT: \n" + text + "\n"])
+        newText = ("=" * 75 + "\n").join(
+            [timeTaken, uploadTime, wordCount, tokenCount, links, "TEXT: \n" + text + "\n"])
         fileId = str(uuid.uuid4())
         with open(f"{fileId}.txt", "w") as file:
             file.write(newText)
         with open(f"{fileId}.txt", "rb") as f:
-            supabase.storage.from_("ConversAI").upload(file = f, path = os.path.join("/", f.name), file_options={"content-type": "text/plain"})
+            supabase.storage.from_("ConversAI").upload(file=f, path=os.path.join("/", f.name),
+                                                       file_options={"content-type": "text/plain"})
         os.remove(f"{fileId}.txt")
         output["supabaseFileName"] = f"{fileId}.txt"
         return output
@@ -385,7 +403,8 @@ async def answerQuestion(query: str, vectorstore: str, llmModel: str = "llama3-7
     output = answerQuery(query=query, vectorstore=vectorstore, llmModel=llmModel)
     response = (
         supabase.table("ConversAI_ChatHistory")
-        .insert({"username": username, "chatbotName": chatbotName, "llmModel": llmModel, "question": query, "response": output["output"]})
+        .insert({"username": username, "chatbotName": chatbotName, "llmModel": llmModel, "question": query,
+                 "response": output["output"]})
         .execute()
     )
     return output
@@ -450,5 +469,7 @@ async def analyzeAndAnswer(query: str, file: UploadFile = File(...)):
 @app.post("/getChatHistory")
 async def chatHistory(vectorstore: str):
     username, chatbotName = vectorstore.split("$")[1], vectorstore.split("$")[2]
-    response = supabase.table("ConversAI_ChatHistory").select("timestamp", "question", "response").eq("username", username).eq("chatbotName", chatbotName).execute().data
-    return response
+    response = supabase.table("ConversAI_ChatHistory").select("timestamp", "question", "response").eq("username",
+                                                                                                      username).eq(
+        "chatbotName", chatbotName).execute().data
+    return response