refactor: clean up TargetMarketAnalyst class and improve chat functionality; add openai to requirements

classes/Target_Market.py

@@ -32,8 +32,8 @@ class TargetMarketAnalyst:
         st.header(self.analyst_name)
 
         # EVALUATION FORM LINK
-        url = os.getenv('Link')
-        st.write('Evaluation Form: [Link](%s)' % url)  
+        #url = os.getenv('Link')
+        #st.write('Evaluation Form: [Link](%s)' % url)  
     
     def request_model(self, payload_txt):
         response = requests.post(self.model_url, json=payload_txt)
@@ -60,8 +60,7 @@ class TargetMarketAnalyst:
         return output
  
     def row1(self):
-        col1, col2 = st.columns(gap="medium", spec=[0.33, 0.66])
-        with col1:
+        
             prompt = st.chat_input("How can I help you today?")
 
             #client = genai.Client(api_key="AIzaSyArNeCctdKaWhxprHTnHyISCd0CpKqB5dk")
@@ -88,8 +87,16 @@ class TargetMarketAnalyst:
          
             url = "http://172.17.21.23:7860/api/v1/run/382ac239-3231-4f9b-89fe-f5ee26e4b1eb?stream=false"
 
-  
+            if "messages" not in st.session_state:
+                st.session_state.messages = []
+            for message in st.session_state.messages:
+                with st.chat_message(message["role"]):
+                    st.markdown(message["content"])
             if prompt:
+                st.chat_message("user").markdown(prompt)
+                # Add user message to chat history
+                st.session_state.messages.append({"role": "user", "content": prompt})
+               
                 response = requests.post(url, json=payload_txt, headers=headers, params={'stream': 'false'})
                 response.raise_for_status()
                 output = response.json()
@@ -99,106 +106,19 @@ class TargetMarketAnalyst:
                     return text.replace('\\n', '\n').replace('\\t', '\t').replace('\\r', '\r')
 
                 self.text = remove_escape_sequences(json.dumps(text, ensure_ascii=False).strip('"'))
-        '''
-            self.topics = st.text_input("Topic of Interest: ", placeholder='Enter Topic of Interest:', key='topic')
-            #self.start_date = st.date_input('Start Date:', value="today", key='start_date')
-            #self.end_date = st.date_input('End Date:', value="today", key='end_date')
-
-            self.sort = st.radio(
-                "Sort by:",
-                ["Published At", "Popularity", "Relevancy"],
-                captions=[
-                    "Newest articles come first",
-                    "Articles from popular sources and publishers come first",
-                    "Articles more closely related to topic come first",
-                ],
-            )
-
-            if self.sort == 'Relevancy':
-                self.sort = 'relevancy'
-            elif self.sort == 'Popularity':
-                self.sort = 'popularity'
-            elif self.sort == 'Published At':
-                self.sort = 'publishedAt'
-'''
-        with col2:
-            #st.write("") # FOR THE HIDE BUTTON
-            #st.write("") # FOR THE HIDE BUTTON
-            st.write("Content: ")
-            #st.session_state['analyzing'] = False
-            #st.write("") # FOR THE HIDE BUTTON
-            if prompt:
-                st.write(self.text)
-            '''analyze_button = st.button("", disabled=initialize_analyze_session())
-            start_time = time.time()
-            if analyze_button:
-                hide_button()
-                if self.topics:
-                    combined_text = ""
-                    with st.spinner('Analyzing...', show_time=True):
-                        st.write('')
-                        # INITIALIZING SESSIONS
-                        
-                        combined_text += f"Topic/s of Interest: {self.topics}\n"
-                        # OUTPUT FOR SEO ANALYST
-                        root = 'https://newsapi.org/v2/everything?'
-                        language = "en"
-                        api = os.getenv('apiKey')
-                        response = requests.get(f'{root}q={self.topics}&language={language}&sortBy={self.sort}&language="en"&apiKey={api}')
-                        try:
-                            response.raise_for_status()
-                            output = response.json()
-                            with st.expander("Output", expanded=True):
-                                text = output['articles']
-                                
-                                for article in text:
-                                    source = article['source']['name']
-                                    published = article['publishedAt']
-                                    author = article['author']
-                                    title = article['title']
-                                    description = article['description']
-                                    url = article['url']
-                                    urlImage = article['urlToImage']
-                                    content = article['content']
-                                
-                                
-                                    left_co, cent_co,last_co = st.columns(3)
-                                    
-                                    if urlImage:
-                                        with left_co:
-                                            st.image(urlImage, width=400)
-                                            st.write(f"**{title}**")
-                                    st.write(f"{description}")
-                                    st.write(f"**Author**: {author}")
-                                    st.write(f"**Source**: {source}")
-                                    st.write('Link: [URL](%s)' % url)
-                                    st.write(f"**Published At**: {published}")
-                        
-                                    st.write("---")
 
-                            
-                                st.write(article)
-
-                            end_time = time.time()
-                            time_lapsed = end_time - start_time
-                            debug_info = {
-                                'analyst': self.analyst_name,
-                                'time_lapsed': time_lapsed,
-                                
-                            }
-
-                            collect_telemetry(debug_info)
-
-                            with st.expander("Debug information", icon="⚙"):
-                                st.write(debug_info)
+                response = f"Echo: {self.text}"
+                with st.chat_message("assistant"):
+                    response = st.write_stream(self.stream_string(self.text))
+                    
+                # Add assistant response to chat history
+                st.session_state.messages.append({"role": "assistant", "content": response})
+    
+    def stream_string(self, text, delay=0.01):
+        for char in text:
+            yield char
+            time.sleep(delay)  # Small delay to simulate typing
 
-                            st.session_state['analyzing'] = False 
-                        except requests.exceptions.HTTPError:
-                                st.info("Exceeded limit, please come back tomorrow")
-                else:
-                    st.info("Please provide a topic of interest")
-                    hide_button()
-           '''
 if __name__ == "__main__":
     st.set_page_config(layout="wide")
 

requirements.txt

@@ -9,3 +9,4 @@ streamlit_paste_button
 pymupdf
 pymongo
 newsapi-python
+openai