add llmchain

app.py

@@ -41,23 +41,24 @@ with st.sidebar.form(key ='Form1'):
                             type="password")
     submitted1 = st.form_submit_button(label='Submit')
 
-    # if submitted1 and confluence_url and space_key:
-    #     st.session_state["config"] = {
-    #         "persist_directory": None,
-    #         "confluence_url": confluence_url,
-    #         "username": username if username != "" else None,
-    #         "api_key": api_key if api_key != "" else None,
-    #         "space_key": space_key,
-    #     }
-    #     with st.spinner(text="Ingesting Confluence..."):
-    #         ### Hardcoding for https://templates.atlassian.net/wiki/ and space RD to avoid multiple OpenAI calls.
-    #         config = st.session_state["config"]
-    #         if  config["confluence_url"] == "https://templates.atlassian.net/wiki/" and config["space_key"] =="RD":
-    #             config["persist_directory"] = "chroma_db"
-    #         st.session_state["config"] = config
+    if submitted1 and confluence_url and space_key:
+        st.session_state["config"] = {
+            "persist_directory": None,
+            "confluence_url": confluence_url,
+            "username": username if username != "" else None,
+            "api_key": api_key if api_key != "" else None,
+            "space_key": space_key,
+            "include_attachment": True
+        }
+        with st.spinner(text="Ingesting Confluence..."):
+            ### Hardcoding for https://templates.atlassian.net/wiki/ and space RD to avoid multiple OpenAI calls.
+            config = st.session_state["config"]
+            if  config["confluence_url"] == "https://templates.atlassian.net/wiki/" and config["space_key"] =="RD":
+                config["persist_directory"] = "chroma_db"
+            st.session_state["config"] = config
 
-    #         st.session_state["confluence_qa"]  = load_confluence(st.session_state["config"])
-    #     st.write("Confluence Space Ingested")
+            st.session_state["confluence_qa"]  = load_confluence(st.session_state["config"])
+        st.write("Confluence Space Ingested")
         
 
 st.title("Confluence Q&A Demo")

confluence_qa.py

@@ -5,7 +5,7 @@ from langchain import HuggingFacePipeline
 from langchain.prompts import PromptTemplate
 from langchain.chains import RetrievalQA
 from langchain.embeddings import HuggingFaceEmbeddings
-from langchain.vectorstores import FAISS
+from langchain.vectorstores import Chroma
 
 class ConfluenceQA:
     def init_embeddings(self) -> None:
@@ -20,14 +20,14 @@ class ConfluenceQA:
     def store_in_vector_db(self) -> None:
         config = self.config        
         loader = ConfluenceLoader(
-            url=config.url, username=config.username, api_key=config.apiKey
+            url=config.url, username=config.username, api_key=config.api_key
         )
-        documents = loader.load(include_attachments=config.includeAttachements, limit=50, page_ids=config.page_ids)
+        documents = loader.load(include_attachments=config.includeAttachements, limit=50, space_key=config.space_key)
         text_splitter = RecursiveCharacterTextSplitter(chunk_size=1000, chunk_overlap=150)
         documents = text_splitter.split_documents(documents)
         # text_splitter = TokenTextSplitter(chunk_size=1000, chunk_overlap=10)  # This the encoding for text-embedding-ada-002
         # texts = text_splitter.split_documents(texts)
-        self.db = FAISS.from_documents(documents, self.embeddings)
+        self.db = Chroma.from_documents(documents, self.embeddings)
 
     def retrieve_qa_chain(self) -> None:
         template = """Use the following pieces of context to answer the question at the end. If you don't know the answer, just say that you don't know, don't try to make up an answer. Keep the answer as concise as possible.