bug fixes

app.py

@@ -178,8 +178,10 @@ def run_query(query, report_type, top_k , regions, countries, is_debug, index_na
         if not messages is None:        
             with content_container:
                 for message in list(messages)[::-1]:
-                    with st.chat_message(name = message.role):
-                        st.write(message.content[0].text.value)
+                    if hasattr(message, 'role'):
+                        print(f"\n-----\nMessage: {message}\n")
+                        with st.chat_message(name = message.role):
+                            st.write(message.content[0].text.value)
                     # if message.role == "assistant":
                     #     with st.chat_message(name = message.role, avatar = st.image("resources/raized_logo.png")):
                     #         st.write(message.content[0].text.value)
@@ -324,6 +326,7 @@ if utils.check_password():
     st.markdown("<script language='javascript'>console.log('scrolling');</script>", unsafe_allow_html=True)
 
     if st.sidebar.button("New Conversation") or "messages" not in st.session_state:
+        st.session_state.assistant_thread = st.session_state.openai_client.beta.threads.create()    
         st.session_state.new_conversation = True
         st.session_state.messages = [{"role":"system", "content":"Hello. I'm your startups discovery assistant."}]        
 

openai_utils.py

@@ -20,14 +20,19 @@ def getListOfCompanies(query, filters = {}):
     descriptions = "\n".join([f"Description of company \"{res['name']}\":  {res['data']['Summary']}.\n" for res in st.session_state.db_search_results[:20] if 'Summary' in res['data']])
     return descriptions
 
+def report_error(txt):
+    print(f"\nEEEEEEEEEEEEE\n{txt}")
+
 def wait_for_response(thread, run):
-    while True:
+    timeout = 60    #timeout in seconds
+    started = time.time()
+    while True and time.time()-started<timeout:
         # Retrieve the run status
         run_status = st.session_state.openai_client.beta.threads.runs.retrieve(
             thread_id=thread.id,
             run_id=run.id
         )
-
+        print(f"Run status: {run_status.status}")
         # Check and print the step details
         run_steps = st.session_state.openai_client.beta.threads.runs.steps.list(
             thread_id=thread.id,
@@ -84,14 +89,22 @@ def wait_for_response(thread, run):
                     run_id=run.id,
                     tool_outputs=tool_outputs,
                 )
-                print(run_status.required_action)
+                print(f"Required action {run_status.required_action}")
                 #return run_status
             else:
-                print(f"Unknown required action: {required_action.type}")
-                return run_status
+                report_error(f"Unknown required action type: {required_action}")
+                break
         else:
-            print(f"Run status: {run_status.status}")
-            return run_status
+            report_error(f"Unhandled Run status: {run_status.status}\n\nError: {run_status.last_error}\n")
+            break
+    if time.time()-started>timeout:
+        report_error(f"Wait for response timeout after {timeout}")
+    report_error(f"Flow not completed")
+    messages = st.session_state.openai_client.beta.threads.messages.list(
+        thread_id=thread.id
+    )             
+    return messages
+            
 
 def call_assistant(query, engine="gpt-3.5-turbo"):  #, temp=0, top_p=1.0, max_tokens=4048):
     try:

utils.py

@@ -10,7 +10,6 @@ import psycopg2
 from psycopg2 import extras
 import streamlit as st
 
-print(f"openai-key{os.getenv('OPENAI_API_KEY')}")
 # gcp_client = secretmanager.SecretManagerServiceClient()
 # response = gcp_client.access_secret_version(request={"name": version.name})
 
@@ -21,7 +20,6 @@ def get_variable(name):
             res = st.secrets[name]
         except Exception as e:
             pass  
-    print(f"Got var {name}: {res}")
     return res
 
 OPENAI_API_KEY = get_variable("OPENAI_API_KEY")  # app.pinecone.io
@@ -107,7 +105,10 @@ def search_index(query, top_k, regions, countries, retriever, index_namespace):
         data = {"Summary": match["metadata"]["summary"]} 
         if 'summary' in match['metadata']:
             try:                
-                data = json.loads(match["metadata"]["summary"])
+                txt_data = match["metadata"]["summary"]
+                if txt_data.startswith('```json') and txt_data.endswith('```'):
+                    txt_data = txt_data[7:-3]
+                data = json.loads(txt_data)
             except Exception as e:
                 pass                
         answer['data'] = data