Update app.py

app.py

@@ -631,6 +631,17 @@ if page == "Scrape or Upload Own Docs":
     submit_scrape_web = False
     submit_scrape_vector_store = False
 
+    def get_new_retrievers(all_documents, chunk_size, chunk_overlap, country_scrape_upload):
+        with st.spinner('Setting up new bm25 retrievers with documents, can take very long...'):
+            # vectorstore for this country will be stored in "bm25/new_{country}_chunk_{chunk_size}_overlap_{chunk_overlap}"
+            # can be used to override existing vectorstore for this country in sidebar document configuration
+            setup_bm25_retriever(all_documents, chunk_size, chunk_overlap, country_scrape_upload)   
+        
+        with st.spinner('Setting up new chromadb vectores with documents, can take 5 mins and above...'):
+            # vectorstore for this country will be stored in "chroma_db/new_{country}_chunk_{chunk_size}_overlap_{chunk_overlap}"
+            # can be used to override existing vectorstore for this country in sidebar document configuration
+            setup_chromadb_vectorstore(all_documents, chunk_size, chunk_overlap, country_scrape_upload) 
+
     # form for user to configure pdf loading options
     if option == options[0]:        
         with st.form(key='upload_pdf_form'):
@@ -641,7 +652,13 @@ if page == "Scrape or Upload Own Docs":
                 with open(temp_file, "wb") as file:
                     file.write(uploaded_pdf.getvalue())
                     pdf_filename, = uploaded_pdf.name
-            submit_upload_pdf = st.form_submit_button(label='Upload and Create Vector Store')                
+            submit_upload_pdf = st.form_submit_button(label='Upload and Create Vector Store')   
+
+            if submit_upload_pdf:
+                with st.spinner('Generating documents from PDF...'):
+                    all_documents = pdf_loader_local(pdf_filename, country_scrape_upload) 
+                    get_new_retrievers(all_documents, st.session_state['chunk_size'], st.session_state['chunk_overlap'], country_scrape_upload)
+             
             
     # form for user to configure web scraping for duckduckgo
     if option == options[1]:        
@@ -667,31 +684,9 @@ if page == "Scrape or Upload Own Docs":
                     st.write(df_links)
                 except:
                     st.write("Waiting for web scraping results.")
-                submit_scrape_vector_store = st.form_submit_button(label='Create Vector Store from Search Results')    
-
-    def get_new_retrievers(all_documents, chunk_size, chunk_overlap, country_scrape_upload):
-        with st.spinner('Setting up new bm25 retrievers with documents, can take very long...'):
-            # vectorstore for this country will be stored in "bm25/new_{country}_chunk_{chunk_size}_overlap_{chunk_overlap}"
-            # can be used to override existing vectorstore for this country in sidebar document configuration
-            setup_bm25_retriever(all_documents, chunk_size, chunk_overlap, country_scrape_upload)   
-
-        
-        with st.spinner('Setting up new chromadb vectores with documents, can take 5 mins and above...'):
-            # vectorstore for this country will be stored in "chroma_db/new_{country}_chunk_{chunk_size}_overlap_{chunk_overlap}"
-            # can be used to override existing vectorstore for this country in sidebar document configuration
-            setup_chromadb_vectorstore(all_documents, chunk_size, chunk_overlap, country_scrape_upload) 
-    
-    if (submit_upload_pdf | submit_scrape_vector_store):    
-        if submit_upload_pdf:
-            with st.spinner('Generating documents from PDF...'):
-                all_documents = pdf_loader_local(pdf_filename, country_scrape_upload) 
-                get_new_retrievers(all_documents, st.session_state['chunk_size'], st.session_state['chunk_overlap'], country_scrape_upload)
-
-        if submit_scrape_vector_store:     
-            with st.spinner('Generating documents from web search results...'):
-                all_documents = process_links_load_documents(all_links)    
-                get_new_retrievers(all_documents, st.session_state['chunk_size'], st.session_state['chunk_overlap'], country_scrape_upload)
-
-
-
+                submit_scrape_vector_store = st.form_submit_button(label='Create Vector Store from Search Results')  
 
+                if submit_scrape_vector_store:     
+                    with st.spinner('Generating documents from web search results...'):
+                        all_documents = process_links_load_documents(all_links)    
+                        get_new_retrievers(all_documents, st.session_state['chunk_size'], st.session_state['chunk_overlap'], country_scrape_upload)