feat: added relevancy options for users

.env

@@ -1,2 +1,3 @@
 email=shore360
-password=shoreai
+password=shoreai
+apiKey=ae72168bf4064434bef650d038624373

classes/Target_Market.py

@@ -9,10 +9,11 @@ from helper.button_behaviour import hide_button
 from helper.initialize_analyze_session import initialize_analyze_session
 import json
 from newsapi import NewsApiClient
+import datetime
+import requests
 
 class TargetMarketAnalyst:
     def __init__(self, model_url, analyst_name, data_src, analyst_description):
-        self.newsapi = NewsApiClient(api_key='ae72168bf4064434bef650d038624373')
         self.model_url = model_url
         self.analyst_name = analyst_name
         self.data_src = data_src
@@ -29,9 +30,7 @@ class TargetMarketAnalyst:
 
         # EVALUATION FORM LINK
         url = os.getenv('Link')
-        st.write('Evaluation Form: [Link](%s)' % url)
-
-        
+        st.write('Evaluation Form: [Link](%s)' % url)  
     
     def request_model(self, payload_txt):
         response = requests.post(self.model_url, json=payload_txt)
@@ -47,7 +46,7 @@ class TargetMarketAnalyst:
         demographics = text["demographics"]
         summary = text["summary"]
         
-        with st.expander("AI Analyst", expanded=True, icon="🤖"):
+        with st.expander("News Available", expanded=True, icon="🤖"):
             st.write(f"**Target Market**:\n {target_market}\n")
             st.write(f"\n**Product / Service Demographics**: {demographics}")
             st.write(f"\n**Marketing Message Summary**: {summary}")
@@ -57,8 +56,27 @@ class TargetMarketAnalyst:
     def row1(self):
         col1, col2 = st.columns(gap="medium", spec=[0.33, 0.66])
         with col1:
-            self.topics = st.text_input("Topic/s of Interest: ", placeholder='Enter Topic/s of Interest:', key='topic')
-            
+            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
@@ -69,41 +87,70 @@ class TargetMarketAnalyst:
             start_time = time.time()
             if analyze_button:
                 hide_button()
-                if self.topics or self.sources and self.country:
+                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?'
-                        query = f'q={self.topics}'
-                        response = requests.get(f'{root}{query}&from=2025-03-20&to=2025-03-20&sortBy=popularity&apiKey=ae72168bf4064434bef650d038624373')
-                        response.raise_for_status()
-                        output = response.json()
-
-                        st.write(output)
-
+                        language = "en"
+                        response = requests.get(f'{root}q={self.topics}&language={language}&sortBy={self.sort}&language="en"&apiKey={os.getenv('apiKey')}')
+                        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("---")
 
-                        end_time = time.time()
-                        time_lapsed = end_time - start_time
-                        debug_info = {
-                            'analyst': self.analyst_name,
-                            'time_lapsed': time_lapsed,
                             
-                        }
+                                st.write(text)
+
+                            end_time = time.time()
+                            time_lapsed = end_time - start_time
+                            debug_info = {
+                                'analyst': self.analyst_name,
+                                'time_lapsed': time_lapsed,
+                                
+                            }
 
-                        collect_telemetry(debug_info)
+                            collect_telemetry(debug_info)
 
-                        with st.expander("Debug information", icon="⚙"):
-                            st.write(debug_info)
+                            with st.expander("Debug information", icon="⚙"):
+                                st.write(debug_info)
 
-                        st.session_state['analyzing'] = False 
+                            st.session_state['analyzing'] = False 
+                        except requests.exceptions.HTTPError:
+                                st.info("Exceeded limit, please come back tomorrow")
                 else:
-                    st.info("Please upload CSV or PDF files first.")
+                    st.info("Please provide a topic of interest")
                     hide_button()
             
 if __name__ == "__main__":