RAG changes

pages/Multimodal_Conversational_Search.py

@@ -15,17 +15,14 @@ import random
 import string
 import rag_DocumentLoader 
 import rag_DocumentSearcher
-#import colpali
 import pandas as pd
 from PIL import Image 
 import shutil
 import base64
 import time
 import botocore
-#from langchain.callbacks.base import BaseCallbackHandler
-#from IPython.display import clear_output, display, display_markdown, Markdown
 from requests_aws4auth import AWS4Auth
-import colpali
+import copali
 from requests.auth import HTTPBasicAuth
 
 
@@ -41,8 +38,8 @@ AI_ICON = "images/opensearch-twitter-card.png"
 REGENERATE_ICON = "images/regenerate.png"
 s3_bucket_ = "pdf-repo-uploads"
             #"pdf-repo-uploads"
-polly_client = boto3.Session(
-            region_name='us-east-1').client('polly')
+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')
 
 # Check if the user ID is already stored in the session state
 if 'user_id' in st.session_state:
@@ -69,13 +66,9 @@ if "chats" not in st.session_state:
 
 if "questions_" not in st.session_state:
     st.session_state.questions_ = []
-    
-    
+
 if "show_columns" not in st.session_state:
     st.session_state.show_columns = False
-    
-if "answer_ready" not in st.session_state:
-    st.session_state.answer_ready = False
 
 if "answers_" not in st.session_state:
     st.session_state.answers_ = []
@@ -85,7 +78,7 @@ if "input_index" not in st.session_state:
     
 if "input_is_rerank" not in st.session_state:
     st.session_state.input_is_rerank = True
-    
+
 if "input_is_colpali" not in st.session_state:
     st.session_state.input_is_colpali = False
 
@@ -98,10 +91,8 @@ if "input_table_with_sql" not in st.session_state:
 if "input_query" not in st.session_state:
     st.session_state.input_query="which city has the highest average housing price in UK ?"#"What is the projected energy percentage from renewable sources in future?"#"Which city in United Kingdom has the highest average housing price ?"#"How many aged above 85 years died due to covid ?"# What is the projected energy from renewable sources ?"
 
-
 if "input_rag_searchType" not in st.session_state:
-    st.session_state.input_rag_searchType = ["Vector Search"]
-    
+    st.session_state.input_rag_searchType = ["Vector Search"]  
 
 
         
@@ -139,7 +130,7 @@ st.markdown("""
 
 
 credentials = boto3.Session().get_credentials()
-awsauth = AWS4Auth(credentials.access_key, credentials.secret_key, 'us-west-2', service, session_token=credentials.token)
+awsauth = HTTPBasicAuth('prasadnu',st.secrets['rag_shopping_assistant_os_api_access'])
 service = 'es'
 
 
@@ -166,7 +157,7 @@ service = 'es'
 def write_logo():
     col1, col2, col3 = st.columns([5, 1, 5])
     with col2:
-        st.image(AI_ICON, use_column_width='always') 
+        st.image(AI_ICON, use_container_width='always') 
 
 def write_top_bar():
     col1, col2 = st.columns([77,23])
@@ -174,7 +165,7 @@ def write_top_bar():
         st.write("")
         st.header("Chat with your data",divider='rainbow')
         
-        #st.image(AI_ICON, use_column_width='always')
+        #st.image(AI_ICON, use_container_width='always')
     
     with col2:
         st.write("")
@@ -198,8 +189,6 @@ if clear:
 
 
 def handle_input():
-    # st.session_state.answer_ready = True
-    # st.session_state.show_columns = False  # reset column display
     print("Question: "+st.session_state.input_query)
     print("-----------")
     print("\n\n")
@@ -264,7 +253,7 @@ def write_user_message(md):
     col1, col2 = st.columns([3,97])
     
     with col1:
-        st.image(USER_ICON, use_column_width='always')
+        st.image(USER_ICON, use_container_width='always')
     with col2:
         #st.warning(md['question'])
 
@@ -277,7 +266,7 @@ def render_answer(question,answer,index,res_img):
     
     col1, col2, col_3 = st.columns([4,74,22])
     with col1:
-        st.image(AI_ICON, use_column_width='always')
+        st.image(AI_ICON, use_container_width='always')
     with col2:
         ans_ = answer['answer']
         st.write(ans_)
@@ -387,7 +376,6 @@ def render_answer(question,answer,index,res_img):
                     st.write(answer["source"])
                 
         
-        
     with col_3:
         
         #st.markdown("<div style='color:#e28743;borderWidth: 0px;borderColor: red;borderStyle: solid;width: fit-content;height: fit-content;border-radius: 5px;'><b>"+",".join(st.session_state.input_rag_searchType)+"</b></div>", unsafe_allow_html = True)
@@ -398,26 +386,28 @@ def render_answer(question,answer,index,res_img):
 
             rdn_key = ''.join([random.choice(string.ascii_letters)
                               for _ in range(10)])
-            rdn_key_1 = ''.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"])
             #print("changing values-----------------")
             def on_button_click():
+                # print("button clicked---------------")
+                # print(currentValue)
+                # print(oldValue)
                 if(currentValue!=oldValue or 1==1): 
+                    #print("----------regenerate----------------")
                     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()
             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():
                     render_all()
-                
-
             if("currentValue"  in st.session_state):
                 del st.session_state["currentValue"]
 
@@ -426,18 +416,17 @@ def render_answer(question,answer,index,res_img):
             except:
                 pass  
 
+            #print("------------------------")
+            #print(st.session_state)
+
             placeholder__ = st.empty()
+            
             placeholder__.button("🔄",key=rdn_key,on_click=on_button_click)
             placeholder__.button("Show similarity map",key=rdn_key_1,on_click = show_maxsim)
         
-        
-     
 #Each answer will have context of the question asked in order to associate the provided feedback with the respective question
 def write_chat_message(md, q,index):
-    if(st.session_state.show_columns):
-        res_img = st.session_state.maxSimImages
-    else:
-        res_img = md['image']
+    res_img = md['image']
     #st.session_state['session_id'] = res['session_id']   to be added in memory
     chat = st.container()
     with chat:
@@ -468,7 +457,7 @@ with col_2:
     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")
 with st.sidebar:
     st.page_link("app.py", label=":orange[Home]", icon="🏠")
     st.subheader(":blue[Sample Data]")
@@ -627,6 +616,4 @@ with st.sidebar:
     #     st.session_state.input_copali_rerank = False
     
     
-                                       
-        
-        
+