Merge branch 'main' of https://huggingface.co/spaces/techconspartners/ConversAI

app.py

@@ -21,17 +21,17 @@ app.add_middleware(
     allow_headers=["*"],
 )
 
-
 app.include_router(speech_translator_router, prefix="/speech")
 
 
 @app.post("/signup")
-async def sign_up(email, password):
+async def sign_up(email, username, password):
     res, _ = supabase.auth.sign_up(
         {"email": email, "password": password, "role": "user"}
     )
     user_id = res[1].id
-    r_ = createUser(username=user_id)
+    r_ = createUser(user_id=user_id, username=username)
+
     response = {
         "status": "success",
         "code": 200,
@@ -47,6 +47,7 @@ async def check_session():
 
     return res
 
+
 @app.post("/login")
 async def sign_in(email, password):
     try:
@@ -56,54 +57,53 @@ async def sign_in(email, password):
         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()
-        try:
-            store_id = store_session_check[1][0]["StoreID"]
-        except:
-            store_id = None
+        store_id = None
 
-        if not store_id:
+        if store_session_check and store_session_check.data:
+            store_id = store_session_check.data[0].get("StoreID")
 
-            response, _ = (
+        if not store_id:
+            response = (
                 supabase.table("Stores").insert(
-                    {"AccessToken": access_token, "StoreID": user_id, "RefreshToken": refresh_token, }).execute())
+                    {
+                        "AccessToken": access_token,
+                        "StoreID": user_id,
+                        "RefreshToken": refresh_token,
+                    }
+                ).execute()
+            )
 
             message = {
-                "message": "success",
-                "code": 200,
-                "store_id": user_id,
+                "message": "Success",
+                "code": status.HTTP_200_OK,
+                "user_id": user_id,
                 "access_token": access_token,
-                "refresh_token": refresh_token}
-
+                "refresh_token": refresh_token
+            }
             return message
 
-
         elif store_id == user_id:
-            message = {
-                "message": "You are already signed in please sign out first to sign in again",
-                "code": 400,
-
-            }
-            return message
+            raise HTTPException(
+                status_code=status.HTTP_400_BAD_REQUEST,
+                detail="You are already signed in. Please sign out first to sign in again."
+            )
 
         else:
-            message = {
-                "message": "failed",
-                "code": 400,
-                "error": "Failed to sign in please check your credentials",
-            }
-
-        return message
-
-    except:
-        message = {
-            "message": "You are already signed in please sign out first to sign in again",
-            "code": 400,
-            "error": "Failed to sign in please check your credentials",
-        }
-
-        return message
-
+            raise HTTPException(
+                status_code=status.HTTP_400_BAD_REQUEST,
+                detail="Failed to sign in. Please check your credentials."
+            )
+
+    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("/set-session-data")
@@ -114,10 +114,17 @@ async def set_session_data(access_token, refresh_token):
 
 
 @app.post("/logout")
-async def sign_out():
-    res = supabase.auth.sign_out()
+async def sign_out(user_id):
+    try:
+        supabase.table("Stores").delete().eq(
+            "StoreID", user_id
+        ).execute()
+        res = supabase.auth.sign_out()
+        response = {"message": "success"}
 
-    return res
+        return response
+    except Exception as e:
+        raise HTTPException(status_code=400, detail=str(e))
 
 
 @app.post("/oauth")
@@ -137,7 +144,7 @@ async def newChatbot(chatbotName: str, username: str):
             "output": "CHATBOT LIMIT EXCEEDED"
         }
     client.table("ConversAI_ChatbotInfo").insert({"user_id": username, "chatbotname": chatbotName}).execute()
-    chatbotName = f"convai|{username}|{chatbotName}"
+    chatbotName = f"convai${username}${chatbotName}"
     return createTable(tablename=chatbotName)
 
 

functions.py

@@ -80,11 +80,11 @@ store = InMemoryStore()
 chatHistoryStore = dict()
 
 
-def createUser(username: str) -> dict:
+def createUser(user_id: str, username: str) -> dict:
     try:
         userData = client.table("ConversAI_UserInfo").select("*").execute().data
         if username not in [userData[x]["user_id"] for x in range(len(userData))]:
-            client.table("ConversAI_UserInfo").insert({"user_id": username, }).execute()
+            client.table("ConversAI_UserInfo").insert({"user_id": user_id, "username": username}).execute()
             client.table("ConversAI_UserConfig").insert({"user_id": username}).execute()
 
             return {
@@ -100,23 +100,6 @@ def createUser(username: str) -> dict:
         }
 
 
-# def matchPassword(username: str, password: str) -> str:
-#     response = (
-#         client.table("ConversAI_UserInfo")
-#         .select("*")
-#         .eq("user_id", username)
-#         .execute()
-#     )
-#     try:
-#         return {
-#             "output": password == response.data[0]["password"]
-#         }
-#     except:
-#         return {
-#             "output": "USER DOESN'T EXIST"
-#         }
-
-
 def createTable(tablename: str):
     global vectorEmbeddings
     global sparseEmbeddings