UPDATE: QDRANT

app.py

@@ -17,28 +17,18 @@ app.add_middleware(
 @app.post("/signup")
 async def signup(username: str, password: str):
     response = createUser(username = username, password = password)
-    output = {
-        "output": response
-    }
-
-    return output
+    return response
 
 
 @app.post("/login")
 async def login(username: str, password: str):
     response = matchPassword(username = username, password = password)
-    output = {
-        "output": response
-    }
-    return output
+    return response
 
 
 @app.get("/newChatbot/{chatbotName}")
 async def newChatbot(chatbotName: str):
-    createTable(tablename = chatbotName)
-    return {
-        "output": "SUCCESS"
-    }
+    return createTable(tablename = chatbotName)
 
 
 @app.post("/addPDF")
@@ -48,47 +38,23 @@ async def addPDFData(vectorstore: str, pdf: UploadFile = File(...)):
     text = ""
     for page in reader.pages:
         text += page.extract_text()
-    addDocuments(text = text, vectorstore = vectorstore)
-    output = {
-        "output": "SUCCESS"
-    }
-
-    return output
-
+    return addDocuments(text = text, vectorstore = vectorstore)
 
 
 @app.post("/addText")
 async def addText(vectorstore: str, text: str):
-    addDocuments(text = text, vectorstore = vectorstore)
-    output = {
-        "output": "SUCCESS"
-    }
-    return output
+    return addDocuments(text = text, vectorstore = vectorstore)
 
 
 @app.get("/answerQuery")
 async def answerQuestion(query: str, vectorstore: str, llmModel: str = "llama3-70b-8192"):
-    response = answerQuery(query=query, vectorstore=vectorstore, llmModel=llmModel)
-    output = {
-        "output": response
-    }
+    return answerQuery(query=query, vectorstore=vectorstore, llmModel=llmModel)
 
-    return output
 
 @app.get("/deleteChatbot/{chatbotName}")
 async def delete(chatbotName: str):
-    deleteTable(tableName=chatbotName)
-    response = {
-        "output": "SUCCESS"
-    }
-    return response
-
+    return deleteTable(tableName=chatbotName)
 
 @app.get("/listChatbots/{username}")
 async def delete(username: str):
-    chatbots = listTables(username=username)
-    response = {
-        "output": chatbots
-    }
-
-    return response
+    return listTables(username=username)

functions.py

@@ -14,7 +14,7 @@ import os
 
 load_dotenv("secrets.env")
 client = create_client(os.environ["SUPABASE_URL"], os.environ["SUPABASE_KEY"])
-qdrantClient = QdrantClient(url=os.environ["QDRANT_URL"])
+qdrantClient = QdrantClient(url=os.environ["QDRANT_URL"], api_key=os.environ["QDRANT_API_KEY"])
 model_kwargs = {"device": "cuda"}
 encode_kwargs = {"normalize_embeddings": True}
 embeddings = HuggingFaceEmbeddings(
@@ -43,16 +43,25 @@ prompt = ChatPromptTemplate.from_template(prompt)
 
 
 def createUser(username: str, password: str) -> None:
-    userData = client.table("ConversAI_UserInfo").select("*").execute().data
-    if username not in [userData[x]["username"] for x in range(len(userData))]:
-        response = (
-        client.table("ConversAI_UserInfo")
-        .insert({"username": username, "password": password})
-        .execute()
-        )
-        return "done"
-    else: 
-        return "already exists"
+    try:
+        userData = client.table("ConversAI_UserInfo").select("*").execute().data
+        if username not in [userData[x]["username"] for x in range(len(userData))]:
+            response = (
+            client.table("ConversAI_UserInfo")
+            .insert({"username": username, "password": password})
+            .execute()
+            )
+            return {
+                "output": "SUCCESS"
+            }
+        else: 
+            return {
+                "output": "USER ALREADY EXISTS"
+            }
+    except Exception as e:
+        return {
+            "error": e
+        } 
 
 
 def matchPassword(username: str, password: str) -> str:
@@ -62,34 +71,54 @@ def matchPassword(username: str, password: str) -> str:
     .eq("username", username)
     .execute()
     )
-    try: return password == response.data[0]["password"]
-    except: return "user doesn't exist"
+    try: return {
+        "output": password == response.data[0]["password"]
+        }
+    except: return {
+        "output": "USER DOESN'T EXIST"
+        }
 
 
 def createTable(tablename: str):
-    qdrant = QdrantVectorStore.from_documents(
-        [],
-        embeddings,
-        url=os.environ["QDRANT_URL"],
-        prefer_grpc=True,
-        api_key=os.environ["QDRANT_API_KEY"],
-        collection_name=tablename
-    )
+    try:
+        qdrant = QdrantVectorStore.from_documents(
+            [],
+            embeddings,
+            url=os.environ["QDRANT_URL"],
+            prefer_grpc=True,
+            api_key=os.environ["QDRANT_API_KEY"],
+            collection_name=tablename
+        )
+        return {
+            "output": "SUCCESS"
+        }
+    except Exception as e: 
+        return {
+            "error": e 
+        }
 
 def addDocuments(text: str, vectorstore: str):
-    global embeddings
-    text_splitter = RecursiveCharacterTextSplitter(
-        chunk_size = 1024,
-        chunk_overlap = 200,
-        add_start_index = True
-    )
-    texts = text_splitter.create_documents([text])
-    vectorstore = QdrantVectorStore.from_existing_collection(
-        embedding = embeddings,
-        collection_name=vectorstore,
-        url=os.environ["QDRANT_URL"],
-    )
-    vectorstore.add_documents(documents = texts)
+    try:
+        global embeddings
+        text_splitter = RecursiveCharacterTextSplitter(
+            chunk_size = 1024,
+            chunk_overlap = 200,
+            add_start_index = True
+        )
+        texts = text_splitter.create_documents([text])
+        vectorstore = QdrantVectorStore.from_existing_collection(
+            embedding = embeddings,
+            collection_name=vectorstore,
+            url=os.environ["QDRANT_URL"],
+        )
+        vectorstore.add_documents(documents = texts)
+        return {
+            "output": "SUCCESS"
+        }
+    except Exception as e:
+        return {
+            "error": e
+        }
 
 
 def format_docs(docs: str):
@@ -99,31 +128,52 @@ def format_docs(docs: str):
     else: pass
     return context
 
-
 def answerQuery(query: str, vectorstore: str, llmModel: str = "llama3-70b-8192") -> str:
-    global prompt 
-    global client
-    global embeddings
-    vectorstore = QdrantVectorStore.from_existing_collection(
-        embedding = embeddings,
-        collection_name=vectorstore,
-        url=os.environ["QDRANT_URL"],
-    )
-    retriever = vectorstore.as_retriever()
-    chain = (
-        {"context": retriever | RunnableLambda(format_docs), "question": RunnablePassthrough(query)}
-        | prompt
-        | ChatGroq(model = llmModel, temperature = 0.3, max_tokens = 512)
-        | StrOutputParser()
+    try:
+        global prompt 
+        global client
+        global embeddings
+        vectorstore = QdrantVectorStore.from_existing_collection(
+            embedding = embeddings,
+            collection_name=vectorstore,
+            url=os.environ["QDRANT_URL"],
         )
-    return chain.invoke(query)
+        retriever = vectorstore.as_retriever()
+        chain = (
+            {"context": retriever | RunnableLambda(format_docs), "question": RunnablePassthrough(query)}
+            | prompt
+            | ChatGroq(model = llmModel, temperature = 0.3, max_tokens = 512)
+            | StrOutputParser()
+            )
+        return {
+            "output": chain.invoke(query)
+        }
+    except Exception as e:
+        return {
+            "error": e
+        }
 
 
 def deleteTable(tableName: str):
-    global qdrantClient
-    qdrantClient.delete_collection(collection_name=tableName)
+    try:
+        global qdrantClient
+        qdrantClient.delete_collection(collection_name=tableName)
+        return {
+            "output": "SUCCESS"
+        }
+    except Exception as e:
+        return {
+            "error": e
+        }
 
 def listTables(username: str):
-    global qdrantClient
-    qdrantCollections = qdrantClient.get_collections()
-    return [qdrantCollections.collections[x].name for x in qdrantCollections if qdrantCollections.collections[x].name.split("-")[1] == username]
+    try:
+        global qdrantClient
+        qdrantCollections = qdrantClient.get_collections()
+        return {
+            "output": [qdrantCollections.collections[x].name for x in qdrantCollections if qdrantCollections.collections[x].name.split("-")[1] == username]
+        }
+    except Exception as e:
+        return {
+            "error": e
+        }