Username for oauth+ set session + login with token

app.py

@@ -1,7 +1,8 @@
 import io
 import tempfile
-
+import jwt
 from click import option
+from jwt import ExpiredSignatureError, InvalidTokenError
 from starlette import status
 from functions import *
 import pandas as pd
@@ -140,67 +141,55 @@ async def sign_in(email, password):
         )
 
 
-@app.post('login_with_token')
-async def login_with_token(token):
+@app.post("/login_with_token")
+async def login_with_token(access_token: str, refresh_token: str):
     try:
-        res = supabase.auth.sign_in_with_id_token(token)
-        print(res)
-        user_id = res.user.id
-        access_token = res.session.access_token
-        refresh_token = res.session.refresh_token
-
-        store_session_check = supabase.table("Stores").select("*").filter("StoreID", "eq", user_id).execute()
-        store_id = None
-
-        if store_session_check and store_session_check.data:
-            store_id = store_session_check.data[0].get("StoreID")
-
-        if not store_id:
-            response = (
-                supabase.table("Stores").insert(
-                    {
-                        "AccessToken": access_token,
-                        "StoreID": user_id,
-                        "RefreshToken": refresh_token,
-                    }
-                ).execute()
-            )
+        decoded_token = jwt.decode(access_token, options={"verify_signature": False})
 
-            message = {
-                "message": "Success",
-                "code": status.HTTP_200_OK,
-                "user_id": user_id,
-                "access_token": access_token,
-                "refresh_token": refresh_token
-            }
-            return message
+        json = {
+            "code": status.HTTP_200_OK,
+            "user_id": decoded_token.get("sub"),
+            "email": decoded_token.get("email"),
+            "access_token": access_token,
+            "refresh_token": refresh_token,
+            "issued_at": decoded_token.get("iat"),
+            "expires_at": decoded_token.get("exp")
 
-        elif store_id == user_id:
-            raise HTTPException(
-                status_code=status.HTTP_400_BAD_REQUEST,
-                detail="You are already signed in. Please sign out first to sign in again."
-            )
+        }
+        return json
 
-        else:
-            raise HTTPException(
-                status_code=status.HTTP_400_BAD_REQUEST,
-                detail="Failed to sign in. Please check your credentials."
-            )
+    except (ExpiredSignatureError, InvalidTokenError) as e:
+        raise HTTPException(status_code=status.HTTP_401_UNAUTHORIZED, detail=str(e))
 
-    except HTTPException as http_exc:
-        raise http_exc
 
-    except Exception as e:
-        raise HTTPException(
-            status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,
-            detail=f"An unexpected error occurred during sign-in: {str(e)}"
-        )
+@app.post("/user_name")
+async def user_name_(username: str, user_id: str):
+    r_ = createUser(user_id=user_id, username=username)
+    return r_
 
 
 @app.post("/set-session-data")
-async def set_session_data(access_token, refresh_token):
+async def set_session_data(access_token, refresh_token, user_id):
     res = supabase.auth.set_session(access_token, refresh_token)
-
+    store_session_check = supabase.table("Stores").select("*").filter("StoreID", "eq", user_id).execute()
+    store_id = None
+    if store_session_check and store_session_check.data:
+        store_id = store_session_check.data[0].get("StoreID")
+    if not store_id:
+        response = (
+            supabase.table("Stores").insert(
+                {
+                    "AccessToken": access_token,
+                    "StoreID": user_id,
+                    "RefreshToken": refresh_token,
+                }
+            ).execute()
+        )
+    res = {
+        "message": "success",
+        "code": 200,
+        "session_data": res,
+    }
     return res
 
 
@@ -221,7 +210,7 @@ async def sign_out(user_id):
 @app.post("/oauth")
 async def oauth():
     res = supabase.auth.sign_in_with_oauth(
-        {"provider": "google", "options": {"redirect_to": "https://convers-ai-lac.vercel.app"}})
+        {"provider": "google", "options": {"redirect_to": "https://convers-ai-lac.vercel.app/"}})
     return res
 
 

functions.py

@@ -1,4 +1,4 @@
-import pymupdf 
+import pymupdf
 from concurrent.futures import ThreadPoolExecutor
 from langchain.retrievers.contextual_compression import ContextualCompressionRetriever
 from langchain_core.runnables import RunnablePassthrough, RunnableLambda
@@ -45,21 +45,18 @@ vectorEmbeddings = HuggingFaceEmbeddings(
     encode_kwargs=encode_kwargs
 )
 reader = easyocr.Reader(['en'], gpu=True, model_storage_directory="/app/EasyOCRModels")
-sparseEmbeddings = FastEmbedSparse(model="Qdrant/BM25", threads = 20 , parallel = 0)
+sparseEmbeddings = FastEmbedSparse(model="Qdrant/BM25", threads=20, parallel=0)
 prompt = """
 INSTRUCTIONS:
 =====================================
 ### Role
 **Primary Function**: You are an AI chatbot designed to provide accurate and efficient assistance to users based on provided context data. Your responses must be reliable, friendly, and directly address user inquiries or issues. Always clarify any unclear questions, and conclude responses positively.
-
 ### Constraints
 1. **No Data Disclosure**: Never reveal access to training data or any context explicitly.
 2. **Maintaining Focus**: Politely redirect any off-topic conversations back to relevant issues without breaking character.
 3. **Exclusive Reliance on Context Data**: Base all answers strictly on the provided context data. If the context doesn’t cover the query, use a fallback response. Always maintain a third-person perspective.
 4. **Restrictive Role Focus**: Do not engage in tasks or answer questions unrelated to your role or context data.
-
 Ensure all instructions are strictly followed. Responses must be meaningful and concise, within 512 words. Include sources to support your answers when possible.
-
 CONTEXT:
 =====================================
 {context}
@@ -67,11 +64,9 @@ CONTEXT:
 QUESTION:
 =====================================
 {question}
-
 CHAT HISTORY:
 =====================================
 {chatHistory}
-
 NOTE: Generate responses directly without using phrases like "Response:" or "Answer:". Do not mention the use of extracted context or provide unnecessary details.
 """
 prompt = ChatPromptTemplate.from_template(prompt)
@@ -270,7 +265,7 @@ def getLinks(url: str, timeout=30):
                 else:
                     pass
                 links = [link for link in links if "#" not in link]
-                links = list(set(links)) 
+                links = list(set(links))
             else:
                 continue
         return links
@@ -290,6 +285,7 @@ def getTextFromImagePDF(pdfBytes):
     def getText(image):
         global reader
         return "\n".join([text[1] for text in reader.readtext(np.array(image), paragraph=True)])
+
     allImages = convert_from_bytes(pdfBytes)
     texts = [getText(image) for image in allImages]
     return "\n\n\n".join(texts)
@@ -323,18 +319,19 @@ def analyzeData(query, dataframe):
         return response
 
 
-
 def extractTextFromPage(page):
     return page.get_text()
 
+
 def extractTextFromPdf(pdf_path):
     doc = pymupdf.open(pdf_path)
     pages = [doc.load_page(i) for i in range(len(doc))]
     with ThreadPoolExecutor() as executor:
         texts = list(executor.map(extractTextFromPage, pages))
-    doc.close()    
+    doc.close()
     return '.'.join(texts)
 
+
 def extractTextFromUrl(url):
     response = requests.get(url)
     response.raise_for_status()
@@ -342,7 +339,8 @@ def extractTextFromUrl(url):
     soup = BeautifulSoup(html, 'lxml')
     return soup.get_text(separator=' ', strip=True)
 
+
 def extractTextFromUrlList(urls):
     with ThreadPoolExecutor() as executor:
         texts = list(executor.map(extractTextFromUrl, urls))
-    return '.'.join(texts)
+    return '.'.join(texts)

requirements.txt

@@ -94,4 +94,5 @@ pandasai
 easyocr
 youtube-transcript-api
 pdf2image
-PyPDF2
+PyPDF2
+PyJWT