Update app.py

app.py

@@ -167,14 +167,19 @@ def google_search(term, num_results=5, lang="en", timeout=5, safe="active", ssl_
     print(f"Total results fetched: {len(all_results)}")
     return all_results
 
-def google_news_search(term, num_results=5, lang="en", timeout=5, safe="active", ssl_verify=None):
+def google_news_search(term, num_results=5, lang="en", timeout=5, safe="active", ssl_verify=None, days_back=30):
     print(f"Searching Google News for term: {term}")
     
-    # Get the current year
-    current_year = datetime.now().year
+    # Calculate the date range
+    end_date = datetime.now()
+    start_date = end_date - timedelta(days=days_back)
     
-    # Add the current year to the search term
-    search_term = f"{term} {current_year}"
+    # Format dates as strings
+    start_date_str = start_date.strftime("%Y-%m-%d")
+    end_date_str = end_date.strftime("%Y-%m-%d")
+    
+    # Add the date range to the search term
+    search_term = f"{term} after:{start_date_str} before:{end_date_str}"
     
     escaped_term = urllib.parse.quote_plus(search_term)
     start = 0
@@ -513,16 +518,20 @@ def save_text_to_pdf(text, output_path):
     print("PDF saved successfully.")
 
 # Integrated function to perform web scraping, formatting, and text generation
-def scrape_and_display(query, num_results, instructions, web_search=True, use_news=False, temperature=0.7, repetition_penalty=1.0, top_p=0.9):
+def scrape_and_display(query, num_results, instructions, web_search=True, use_news=False, days_back=None, temperature=0.7, repetition_penalty=1.0, top_p=0.9):
     print(f"Scraping and displaying results for query: {query} with num_results: {num_results}")
     if web_search:
+        if days_back is None:
+            current_year = datetime.now().year
+            days_back = 365 if current_year % 4 != 0 else 366  # Account for leap years
+
         if use_news:
-            search_results = google_news_search(query, num_results)
+            # For news, we might want to use a shorter time frame by default
+            news_days_back = min(days_back, 30)  # Use at most 30 days for news
+            search_results = google_news_search(query, num_results, days_back=news_days_back)
         else:
-            # Add the year-based search here
-            current_year = datetime.now().year
-            days_in_year = 365 if current_year % 4 != 0 else 366  # Account for leap years
-            search_results = google_search(query, num_results=num_results, instructions=instructions, days_back=days_in_year)
+            search_results = google_search(query, num_results=num_results, instructions=instructions, days_back=days_back)
+        
         
         # Summarize each result
         summarized_results = []