increase number retreived items, prevent resending the same query

app.py

@@ -185,6 +185,7 @@ def run_query(query, report_type, top_k , regions, countries, is_debug, index_na
         #results = utils.search_index(query, top_k, regions, countries, retriever, index_namespace)
         #descriptions = "\n".join([f"Description of company \"{res['name']}\":  {res['data']['Summary']}.\n" for res in results[:20] if 'Summary' in res['data']])
         messages = oai.call_assistant(query, engine=openai_model)
+        st.session_state.messages = messages
         results = st.session_state.db_search_results
         if not messages is None:        
             with content_container:
@@ -292,6 +293,7 @@ def run_query(query, report_type, top_k , regions, countries, is_debug, index_na
     df = pd.DataFrame.from_dict(carddict, orient="columns")
     
     if len(df)>0:
+        df.index += 1
         with content_container:
             st.dataframe(df,
                 hide_index=False,
@@ -305,6 +307,7 @@ def run_query(query, report_type, top_k , regions, countries, is_debug, index_na
                     "business_model": st.column_config.TextColumn(label="Business model")
                 },
                 use_container_width=True)
+    st.session_state.last_user_query = query            
 
 
 def query_sent():
@@ -335,6 +338,11 @@ def render_history():
 if not 'submitted_query' in st.session_state:
     st.session_state.submitted_query = ''
 
+if not 'messages' in st.session_state:
+    st.session_state.messages = []
+if not 'last_user_query' in st.session_state:
+    st.session_state.last_user_query = ''
+
 if utils.check_password():
 
     st.markdown("<script language='javascript'>console.log('scrolling');</script>", unsafe_allow_html=True)
@@ -420,18 +428,18 @@ if utils.check_password():
         report_type = st.selectbox(label="Response Type", options=["assistant", "standard", "guided", "company_list", "clustered"], index=0)
         #assistant_id = st.text_input(label="Assistant ID", key="assistant_id", value = "asst_NHoxEosVlemDY7y5TYg8ftku") #value="asst_fkZtxo127nxKOCcwrwznuCs2")
         assistant_id = st.selectbox(label="Assistant", options = [f"{a.id}|||{a.name}" for a in assistants])
-        default_prompt = st.text_area("Default Prompt", value = utils.default_prompt, height=400, key="advanced_default_prompt_content")
-        clustering_prompt = st.text_area("Clustering Prompt", value = utils.clustering_prompt, height=400, key="advanced_clustering_prompt_content")
         #prompt_new = st.button("New", on_click = _prompt(prompt_title, prompt))
         #prompt_delete = st.button("Del", on_click = utils.del_prompt(prompt_title_editable))
         #prompt_save = st.button("Save", on_click = utils.save_prompt(prompt_title_editable, prompt))
         #scrape_boost = st.number_input('Web to API content ratio', value=1.)
-        top_k = st.number_input('# Top Results', value=20)
+        top_k = st.number_input('# Top Results', value=30)
         is_debug = st.checkbox("Debug output", value = False, key="debug")
         openai_model = st.selectbox(label="Model", options=["gpt-4-1106-preview", "gpt-3.5-turbo-16k-0613", "gpt-3.5-turbo-16k"], index=0, key="openai_model")
         index_namespace = st.selectbox(label="Data Type", options=["websummarized", "web", "cbli", "all"], index=0)
         liked_companies = st.text_input(label="liked companies", key='liked_companies')
         disliked_companies = st.text_input(label="disliked companies", key='disliked_companies')
+        default_prompt = st.text_area("Default Prompt", value = utils.default_prompt, height=400, key="advanced_default_prompt_content")
+        clustering_prompt = st.text_area("Clustering Prompt", value = utils.clustering_prompt, height=400, key="advanced_clustering_prompt_content")
 
     if not "assistant_thread" in st.session_state:
         st.session_state.assistant_thread = st.session_state.openai_client.beta.threads.create()    
@@ -454,7 +462,6 @@ if utils.check_password():
         st.session_state.index_namespace = index_namespace
         st.session_state.region = region_selectbox
         st.session_state.country = countries_selectbox
-        #st.session_state.user_query = ''        
         run_query(query, report_type, top_k, region_selectbox, countries_selectbox, is_debug, index_namespace, openai_model)
     else:
         st.session_state.new_conversation = False

openai_utils.py

@@ -65,6 +65,7 @@ def wait_for_response(thread, run):
         elif run_status.status == 'requires_action':
             required_action = run_status.required_action
             if required_action.type == 'submit_tool_outputs':
+                print(f"Requires tool outputs: {required_action}")                
                 outputs = {}
                 for tool_call in required_action.submit_tool_outputs.tool_calls:
                     if tool_call.function.name =="getListOfCompanies":
@@ -107,6 +108,11 @@ def wait_for_response(thread, run):
             
 
 def call_assistant(query, engine="gpt-3.5-turbo"):  #, temp=0, top_p=1.0, max_tokens=4048):
+    #Prevent re sending the last message over and over
+    print(f"Last query {st.session_state.last_user_query}, current query {query}")
+    if st.session_state.last_user_query == query:
+        report_error(f"That query '{query}' was just sent. We don't send the same query twice in a row. ")
+        return st.session_state.messages
     try:
         thread = st.session_state.assistant_thread
         assistant_id = st.session_state.assistant_id