rerank model

pages/Multimodal_Conversational_Search.py

@@ -34,9 +34,6 @@ st.set_page_config(
     layout="wide",
     page_icon="images/opensearch_mark_default.png"
 )
-if "trigger_search" not in st.session_state:
-    st.session_state.trigger_search = False
-
 
 parent_dirname = "/".join((os.path.dirname(__file__)).split("/")[0:-1])
 USER_ICON = "images/user.png"
@@ -45,11 +42,22 @@ REGENERATE_ICON = "images/regenerate.png"
 s3_bucket_ = "pdf-repo-uploads"
             #"pdf-repo-uploads"
 
-polly_client = boto3.client('polly',aws_access_key_id=st.secrets['user_access_key'],
-                aws_secret_access_key=st.secrets['user_secret_key'], region_name = 'us-east-1')
+# @st.cache_resource
+# def get_polly_client():
+#     return boto3.client('polly',
+#         aws_access_key_id=st.secrets['user_access_key'],
+#         aws_secret_access_key=st.secrets['user_secret_key'],
+#         region_name='us-east-1'
+#     )
+
+# polly_client = get_polly_client()
 
 
 # Check if the user ID is already stored in the session state
+
+if "trigger_search" not in st.session_state:
+    st.session_state.trigger_search = False
+
 if 'user_id' in st.session_state:
     user_id = st.session_state['user_id']
     #print(f"User ID: {user_id}")
@@ -103,12 +111,6 @@ if "input_rag_searchType" not in st.session_state:
     st.session_state.input_rag_searchType = ["Vector Search"]  
 
 
-        
-region = 'us-east-1'
-bedrock_runtime_client = boto3.client('bedrock-runtime',region_name=region)
-output = []
-service = 'es'
-
 st.markdown("""
     <style>
     [data-testid=column]:nth-of-type(2) [data-testid=stVerticalBlock]{
@@ -154,7 +156,6 @@ if clear:
 
 
 def handle_input():
-    st.session_state.trigger_search = True
     print("Question: "+st.session_state.input_query)
     print("-----------")
     print("\n\n")
@@ -207,29 +208,33 @@ def render_answer(question,answer,index,res_img):
         ans_ = answer['answer']
         st.write(ans_)
 
-        polly_response = polly_client.synthesize_speech(VoiceId='Joanna',
-                        OutputFormat='ogg_vorbis', 
-                        Text = ans_,
-                        Engine = 'neural')
+        # polly_response = polly_client.synthesize_speech(VoiceId='Joanna',
+        #                 OutputFormat='ogg_vorbis', 
+        #                 Text = ans_,
+        #                 Engine = 'neural')
 
-        audio_col1, audio_col2 = st.columns([50,50])
-        with audio_col1:
-            st.audio(polly_response['AudioStream'].read(), format="audio/ogg")
-        rdn_key_1 = ''.join([random.choice(string.ascii_letters)
-                              for _ in range(10)])
+        # audio_col1, audio_col2 = st.columns([50,50])
+        # with audio_col1:
+        #     st.audio(polly_response['AudioStream'].read(), format="audio/ogg")
+        # rdn_key_1 = ''.join([random.choice(string.ascii_letters)
+        #                       for _ in range(10)])
         # def show_maxsim():
         #     st.session_state.show_columns = True
         #     st.session_state.maxSimImages = colpali.img_highlight(st.session_state.top_img, st.session_state.query_token_vectors, st.session_state.query_tokens)
+        #     handle_input()
         #     with placeholder.container():
-        #         if st.session_state.trigger_search:
-        #             handle_input()
-        #             render_all()
-        #         #render_all()    
+        #         render_all()    
         # if(st.session_state.input_is_colpali):
         #     st.button("Show similarity map",key=rdn_key_1,on_click = show_maxsim)
                 
     colu1,colu2,colu3 = st.columns([4,82,20])
     with colu2:
+        @st.cache_data
+        def load_table_from_file(filepath):
+            df = pd.read_csv(filepath, skipinitialspace=True, on_bad_lines='skip', delimiter='`')
+            df.fillna(method='pad', inplace=True)
+            return df
+
         with st.expander("Relevant Sources:"):
             with st.container():
                 if(len(res_img)>0):
@@ -265,45 +270,42 @@ def render_answer(question,answer,index,res_img):
                                 with cols[idx]:
                                     
                                     st.image(parent_dirname+"/figures/"+st.session_state.input_index+"/"+img+".jpg")
-                            #st.write(caption)
                             idx = idx+1
                     if(st.session_state.show_columns == True):
                         st.session_state.show_columns = False
-                #st.markdown("<div style='color:#e28743';padding:3px 7px 3px 7px;borderWidth: 0px;borderColor: red;borderStyle: solid;width: fit-content;height: fit-content;border-radius: 10px;'><b>Sources from the document:</b></div>", unsafe_allow_html = True)
                 if(len(answer["table"] )>0):
                     #with st.expander("Table:"):
-                    df = pd.read_csv(answer["table"][0]['name'],skipinitialspace = True, on_bad_lines='skip',delimiter='`')
-                    df.fillna(method='pad', inplace=True)
+                    df = load_table_from_file(answer["table"][0]['name'])
                     st.table(df)
                 #with st.expander("Raw sources:"):
                 st.write(answer["source"])
                
         
-    with col_3:
-        if(index == len(st.session_state.questions_)):
-
-            rdn_key = ''.join([random.choice(string.ascii_letters)
-                              for _ in range(10)])
-            currentValue = ''.join(st.session_state.input_rag_searchType)+str(st.session_state.input_is_rerank)+str(st.session_state.input_table_with_sql)+st.session_state.input_index
-            oldValue = ''.join(st.session_state.inputs_["rag_searchType"])+str(st.session_state.inputs_["is_rerank"])+str(st.session_state.inputs_["table_with_sql"])+str(st.session_state.inputs_["index"])
-            # def on_button_click():
-            #     if(currentValue!=oldValue or 1==1): 
-            #         st.session_state.input_query = st.session_state.questions_[-1]["question"]
-            #         st.session_state.answers_.pop()
-            #         st.session_state.questions_.pop()
+    # with col_3:
+    #     if(index == len(st.session_state.questions_)):
+
+    #         rdn_key = ''.join([random.choice(string.ascii_letters)
+    #                           for _ in range(10)])
+    #         currentValue = ''.join(st.session_state.input_rag_searchType)+str(st.session_state.input_is_rerank)+str(st.session_state.input_table_with_sql)+st.session_state.input_index
+    #         oldValue = ''.join(st.session_state.inputs_["rag_searchType"])+str(st.session_state.inputs_["is_rerank"])+str(st.session_state.inputs_["table_with_sql"])+str(st.session_state.inputs_["index"])
+    #         def on_button_click():
+    #             if(currentValue!=oldValue or 1==1): 
+    #                 st.session_state.input_query = st.session_state.questions_[-1]["question"]
+    #                 st.session_state.answers_.pop()
+    #                 st.session_state.questions_.pop()
                     
-            #         handle_input()
-            #         with placeholder.container():
-            #             render_all()
-            # if("currentValue"  in st.session_state):
-            #     del st.session_state["currentValue"]
-
-            # try:
-            #     del regenerate
-            # except:
-            #     pass  
-            # placeholder__ = st.empty()
-            # placeholder__.button("🔄",key=rdn_key,on_click=on_button_click)
+    #                 handle_input()
+    #                 with placeholder.container():
+    #                     render_all()
+    #         if("currentValue"  in st.session_state):
+    #             del st.session_state["currentValue"]
+
+    #         try:
+    #             del regenerate
+    #         except:
+    #             pass  
+    #         placeholder__ = st.empty()
+    #         placeholder__.button("🔄",key=rdn_key,on_click=on_button_click)
             
         
 #Each answer will have context of the question asked in order to associate the provided feedback with the respective question
@@ -326,19 +328,21 @@ def render_all():
 
 placeholder = st.empty()
 with placeholder.container():
-  if st.session_state.trigger_search:
-    handle_input()
+    if st.session_state.trigger_search:
+    with st.spinner("Running search..."):
+        handle_input()
     render_all()
-  
+    st.session_state.trigger_search = False  # reset
 
 st.markdown("")
 col_2, col_3 = st.columns([75,20])  
 with col_2:
-    #st.markdown("")
     input = st.text_input( "Ask here",label_visibility = "collapsed",key="input_query")
 with col_3:
-    #hidden = st.button("RUN",disabled=True,key = "hidden")
-    play = st.button("Go",on_click=handle_input,key = "play")
+    #play = st.button("Go",on_click=handle_input,key = "play")
+    play = st.button("Go", key="play")
+    if play:
+        st.session_state.trigger_search = True
 with st.sidebar:
     st.page_link("app.py", label=":orange[Home]", icon="🏠")
     st.subheader(":blue[Sample Data]")
@@ -411,10 +415,5 @@ with st.sidebar:
     with st.expander("Sample questions for Colpali retriever:"):
         st.write("1. Proportion of female new hires 2021-2023? \n\n 2. First-half 2021 return on unlisted real estate investments? \n\n 3. Trend of the fund's expected absolute volatility between January 2014 and January 2016? \n\n 4. Fund return percentage in 2017? \n\n 5. Annualized gross return of the fund from 1997 to 2008?")
 
-    run = st.sidebar.button("🔍 Run Search")
-
-    if run:
-        st.session_state.trigger_search = True
     
-