fix history log

app.py

@@ -19,19 +19,21 @@ import openai_utils as oai
 from streamlit_extras.stylable_container import stylable_container
 
 
-OPENAI_API_KEY = st.secrets["OPENAI_API_KEY"]  # app.pinecone.io
-model_name = 'text-embedding-ada-002'
+# OPENAI_API_KEY = st.secrets["OPENAI_API_KEY"]  # app.pinecone.io
+#model_name = 'text-embedding-ada-002'
 
-embed = OpenAIEmbeddings(
-    model=model_name,
-    openai_api_key=OPENAI_API_KEY
-)
+# embed = OpenAIEmbeddings(
+#     model=model_name,
+#     openai_api_key=OPENAI_API_KEY
+# )
+
+#"🤖", 
 
 st.set_page_config(
     layout="wide", 
     initial_sidebar_state="collapsed",
     page_title="RaizedAI Startup Discovery Assistant",
-    page_icon=":robot:"
+    #page_icon=":robot:"
     )
 
 COUNTRIES_FN="data/countries.csv"
@@ -69,6 +71,9 @@ st.session_state.openai_client = oai.get_client()
 retriever, tokenizer = init_models()
 st.session_state.retriever = retriever
 
+# AVATAR_PATHS = {"assistant": st.image("resources/raized_logo.png"),
+#                 "user": "👩‍⚖️"}
+
 #st.session_state.messages = [{"role":"system", "content":"You are an assistant who helps users find startups to invest in."}]
 
 
@@ -124,9 +129,6 @@ def card(company_id, name, description, score, data_type, region, country, metad
     #print(f" markdown for {company_id}\n{markdown}")
     return markdown
 
-
-
-        
 def run_query(query, report_type, top_k , regions, countries, is_debug, index_namespace, openai_model):
 
     #Summarize the results
@@ -135,7 +137,7 @@ def run_query(query, report_type, top_k , regions, countries, is_debug, index_na
     # Create a summarized report focusing on the top3 companies.
     # For every company find its uniqueness over the other companies. Use only information from the descriptions.
     # """
-    col_content, col_sidepanel = st.columns([4, 1], gap="small")
+    content_container = st.container()  #, col_sidepanel = st.columns([4, 1], gap="small")
     if report_type=="guided":
         prompt_txt = utils.query_finetune_prompt + """        
         User query: {query} 
@@ -143,7 +145,7 @@ def run_query(query, report_type, top_k , regions, countries, is_debug, index_na
         prompt_template = PromptTemplate(template=prompt_txt, input_variables=["query"])
         prompt = prompt_template.format(query = query)
         m_text = oai.call_openai(prompt, engine=openai_model, temp=0, top_p=1.0, max_tokens=20, log_message = False)
-
+    
         print(f"Keywords: {m_text}")    
         results = utils.search_index(m_text, top_k, regions, countries, retriever, index_namespace)
         
@@ -168,13 +170,20 @@ def run_query(query, report_type, top_k , regions, countries, is_debug, index_na
     elif report_type=="assistant":
         #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']])
-        m_text = oai.call_openai(query, engine=openai_model, temp=0, top_p=1.0)
+        messages = oai.call_assistant(query, engine=openai_model)
         results = st.session_state.db_search_results
-        with col_content:
-            with st.chat_message("assistant"):  #, "assets/raized_logo.webp"):
-                st.write(m_text)
-        st.session_state.messages.append({"role": "user", "content": query})
-        st.session_state.messages.append({"role": "system", "content": m_text})
+        with content_container:
+            for message in list(messages)[::-1]:
+                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)
+                # else:                        
+                #     with st.chat_message(name = message.role):
+                #         st.write(message.content[0].text.value)
+        # st.session_state.messages.append({"role": "user", "content": query})
+        # st.session_state.messages.append({"role": "system", "content": m_text})
         
     else:
         st.session_state.new_conversation = False
@@ -259,14 +268,14 @@ def run_query(query, report_type, top_k , regions, countries, is_debug, index_na
     pins = country_geo[country_geo['name'].isin(locations)].loc[:, ['latitude', 'longitude']]
     
     if len(pins)>0:
-        with col_sidepanel:
+        with st.expander("Map view"):
             st.map(pins)
     #st.markdown(list_html, unsafe_allow_html=True)
 
     df = pd.DataFrame.from_dict(carddict, orient="columns")
     
     if len(df)>0:
-        with col_content:
+        with content_container:
             st.dataframe(df,
                 hide_index=False,
                 column_config ={
@@ -419,8 +428,6 @@ if utils.check_password():
         #     prompt = "guided"
         # else:
         #     prompt = ""
-        with st.chat_message("user"):
-            st.write(query)
         #oai.start_conversation()
         i = assistant_id.index("|||")
         st.session_state.assistant_id = assistant_id[:i]

openai_utils.py

@@ -93,31 +93,36 @@ def wait_for_response(thread, run):
             print(f"Run status: {run_status.status}")
             return run_status
 
+def call_assistant(query, engine="gpt-3.5-turbo"):  #, temp=0, top_p=1.0, max_tokens=4048):
+    try:
+        thread = st.session_state.assistant_thread
+        assistant_id = st.session_state.assistant_id
+        message = st.session_state.openai_client.beta.threads.messages.create(
+            thread.id,
+            role="user",
+            content=query,
+        )            
+        run = st.session_state.openai_client.beta.threads.runs.create(
+            thread_id=thread.id,
+            assistant_id=assistant_id,
+        )
+        messages = wait_for_response(thread, run)            
+
+        print(f"====================\nOpen AI response\n {str(messages)[:1000]}\n====================\n")
+        return messages
+        # text = ""
+        # for message in messages:
+        #     print(message)
+        #     text = text + "\n" + message.content[0].text.value
+        # return text
+    except Exception as e:
+    #except openai.error.OpenAIError as e:
+        print(f"An error occurred: {str(e)}")
+        
 
 def call_openai(prompt, engine="gpt-3.5-turbo", temp=0, top_p=1.0, max_tokens=4048):
     if st.session_state.report_type=="assistant":
-        try:
-            thread = st.session_state.assistant_thread
-            assistant_id = st.session_state.assistant_id
-            message = st.session_state.openai_client.beta.threads.messages.create(
-              thread.id,
-              role="user",
-              content=prompt,
-            )            
-            run = st.session_state.openai_client.beta.threads.runs.create(
-                thread_id=thread.id,
-                assistant_id=assistant_id,
-            )
-            messages = wait_for_response(thread, run)            
-
-            print(f"====================\nOpen AI response\n {str(messages)[:1000]}\n====================\n")
-            text = ""
-            for message in messages:
-                text = text + "\n" + message.content[0].text.value
-            return text
-        except Exception as e:
-        #except openai.error.OpenAIError as e:
-            print(f"An error occurred: {str(e)}")
+        raise Exception("use call_assistant instead of call_openai")        
     else:        
         try:
             response = st.session_state.openai_client.chat.completions.create(

utils.py

@@ -15,7 +15,12 @@ import streamlit as st
 # response = gcp_client.access_secret_version(request={"name": version.name})
 
 def get_variable(name):
-    return os.getenv(name, st.secrets[name])
+    res = ""
+    try:    
+        res = os.getenv(name, st.secrets[name])
+    except Exception as e:
+        pass  
+    return res
 
 OPENAI_API_KEY = get_variable("OPENAI_API_KEY")  # app.pinecone.io
 OPENAI_ORGANIZATION_ID = get_variable("OPENAI_ORGANIZATION_ID")