change logic to enable different feeds

.gitignore

@@ -24,4 +24,4 @@ htmlcov/
 .coverage.*
 *,cover
 venv
-last_predictions_cache.json
+*_cache.json

app.py

@@ -6,9 +6,7 @@ from transformers import pipeline
 import feedparser
 import json
 from dateutil import parser
-
-nyt_homepage_rss = "https://rss.nytimes.com/services/xml/rss/nyt/HomePage.xml"
-
+import re
 load_dotenv()
 # Load Setiment Classifier
 sentiment_analysis = pipeline(
@@ -25,20 +23,27 @@ def index():
 
 @app.route('/news')
 def get_news():
-    nyt_homepage = get_nytimes()
+    feed_url = request.args.get('feed_url')
+    # check if string is a valid
+
+    # file name for cache
+    file_name = "".join(re.split(r"https://|\.|/", feed_url))
+
+    feed_entries = get_feed(feed_url)
     # filter only titles for sentiment analysis
     try:
-        with open('last_predictions_cache.json') as file:
+        with open(f'{file_name}_cache.json') as file:
             cache = json.load(file)
     except:
         cache = {}
 
     # if new homepage is newer than cache, update cache and return
-    print("new date",nyt_homepage['last_update'])
-    print("old date",cache['last_update'] if 'last_update' in cache else "None")
-    if not cache or parser.parse(nyt_homepage['last_update']) > parser.parse(cache['last_update']):
+    print("new date", feed_entries['last_update'])
+    print("old date", cache['last_update']
+          if 'last_update' in cache else "None")
+    if not cache or parser.parse(feed_entries['last_update']) > parser.parse(cache['last_update']):
         print("Updating cache with new preditions")
-        titles = [entry['title'] for entry in nyt_homepage['entries']]
+        titles = [entry['title'] for entry in feed_entries['entries']]
         # run sentiment analysis on titles
         predictions = [sentiment_analysis(sentence) for sentence in titles]
         # parse Negative and Positive, normalize to -1 to 1
@@ -46,11 +51,11 @@ def get_news():
                        'NEGATIVE' else prediction[0]['score'] for prediction in predictions]
         # merge rss data with predictions
         entries_predicitons = [{**entry, 'sentiment': prediction}
-                               for entry, prediction in zip(nyt_homepage['entries'], predictions)]
+                               for entry, prediction in zip(feed_entries['entries'], predictions)]
         output = {'entries': entries_predicitons,
-                  'last_update': nyt_homepage['last_update']}
+                  'last_update': feed_entries['last_update']}
         # update last precitions cache
-        with open('last_predictions_cache.json', 'w') as file:
+        with open(f'{file_name}_cache.json', 'w') as file:
             json.dump(output, file)
         # send back json
         return jsonify(output)
@@ -81,8 +86,8 @@ def predict():
         return jsonify(output)
 
 
-def get_nytimes():
-    feed = feedparser.parse(nyt_homepage_rss)
+def get_feed(feed_url):
+    feed = feedparser.parse(feed_url)
     return {'entries': feed['entries'], 'last_update': feed["feed"]['updated']}
 
 

client/src/components/NewsBlock.svelte

@@ -25,7 +25,7 @@
 		<a target="_blank" href={feedEntry.link}>
 			<h2 class="text-2xl font-bold font-serif leading-tight">{feedEntry.title}</h2>
 			<h4 class="text-sm font-bold leading-tight">By {feedEntry.author}</h4>
-			<p class="py-3 max-w-prose leading-normal">{feedEntry.summary}</p>
+			<p class="py-3 max-w-prose leading-normal">{@html feedEntry.summary}</p>
 			<!-- {#if feedEntry.tags}
 				<div class="text-sm">
 					{#each feedEntry.tags as tag}

client/src/routes/index.svelte

@@ -1,18 +1,50 @@
 <script>
 	import NewsBlock from '../components/NewsBlock.svelte';
-
+	let feeds = [
+		{
+			label: 'NYTimes',
+			value: 'https://rss.nytimes.com/services/xml/rss/nyt/HomePage.xml'
+		},
+		{
+			label: 'SF Gate Bay Area',
+			value: 'https://www.sfgate.com/bayarea/feed/Bay-Area-News-429.php'
+		},
+		{
+			label: 'BBC News',
+			value: 'https://feeds.bbci.co.uk/news/rss.xml'
+		},
+		{
+			label: 'Buzz Feed World',
+			value: 'https://www.buzzfeed.com/world.xml'
+		},
+		{
+			label: 'Al Jazeera',
+			value: 'https://aljazeera.com/xml/rss/all.xml'
+		},
+		{
+			label: 'Hacker News Front Page',
+			value: 'https://hnrss.org/frontpage'
+		},
+		{
+			label: 'Reddit World News',
+			value: 'https://www.reddit.com/r/worldnews/.rss'
+		}
+	];
+	let selectedFeedUrl = feeds[0].value;
 	let predictions;
 	let lastUpdate;
 	let positiveOrder = true;
-	async function fecthPredictions() {
+	async function fecthPredictions(feedUrl) {
+		console.log(feedUrl);
 		try {
-			predictions = await fetch('news').then((d) => d.json());
+			predictions = await fetch(`news?feed_url=${feedUrl}`).then((d) => d.json());
 		} catch (e) {
 			// hack to develop locally without having to run the server
 			predictions = await fetch('static/test.json').then((d) => d.json());
 		}
 		lastUpdate = new Date(predictions.last_update);
 		predictions = predictions.entries.sort((a, b) => b.sentiment - a.sentiment);
+		positiveOrder = true
 		console.log(lastUpdate, predictions);
 	}
 
@@ -38,9 +70,9 @@
 			target="_blank"
 			href="https://rss.nytimes.com/services/xml/rss/nyt/HomePage.xml">New York Times</a
 		>
-		homepage headlines RSS. It also provides you with a sorting button to choose to see {positiveOrder
-			? 'good or bad news first'
-			: 'bad or good news first'}. It's built with a
+		homepage headlines RSS. It also provides a sorting button to toggle between {positiveOrder
+			? 'good and bad news'
+			: 'bad and good news'} first😛 . It's built with a
 		<a
 			class="text-blue-500 underline hover:no-underline"
 			target="_blank"
@@ -66,9 +98,21 @@
 		</a>
 	</p>
 	<details>
-		<summary class="cursor-pointer"> Details </summary>
-		<p></p>
+		<summary class="cursor-pointer">Notes</summary>
+		<p />
 	</details>
+
+	<p class="py-3 max-w-prose leading-normal">
+		You can try other news feeds <select
+			class="inline-block text-sm bg-gray-200 border border-gray-200 text-gray-700 px-1 py-1 rounded leading-tight focus:outline-none focus:bg-white focus:border-gray-500"
+			bind:value={selectedFeedUrl}
+		>
+			{#each feeds as feed (feed.value)}
+				<option value={feed.value}>{feed.label}</option>
+			{/each}
+		</select>; however the NYTimes feed comes with more information than the other feeds, such as
+		the thumbnail image, author, and more.
+	</p>
 	<div class="py-4" />
 	<button
 		class="{positiveOrder
@@ -78,7 +122,7 @@
 	>
 		{!positiveOrder ? 'Sorted by negative scores' : 'Sorted by positive scores'}
 	</button>
-	{#await fecthPredictions()}
+	{#await fecthPredictions(selectedFeedUrl)}
 		<div class="py-4">
 			<svg class="animate-spin inline-block" width="25" height="25" viewBox="0 0 100 100">
 				<path d="M0,50 a1,1 0 0,0 100,0" fill="lightgrey" />