Improved news update mechanism

app/database.py

@@ -74,7 +74,6 @@ def add_article(session: Session, article: Article):
     Adds a new article to the database
     '''
     session.add(article)
-    session.commit()
 
 
 def retrieve_articles(session: Session):
@@ -86,10 +85,10 @@ def retrieve_articles(session: Session):
 
 def clear_articles(session: Session):
     '''
-    Deletes all articles in the database
+    Deletes all articles and sources in the database
     '''
+    session.query(Source).delete()
     session.query(Article).delete()
-    session.commit()
 
 
 def add_sources(session: Session, sources: list[Source]):
@@ -97,5 +96,4 @@ def add_sources(session: Session, sources: list[Source]):
     Adds the given sources to the database
     '''
     for source in sources:
-        session.add(source)
-    session.commit()
+        session.add(source)

app/main.py

@@ -8,13 +8,12 @@ import threading
 import os
 
 
-UPDATE_INTERVAL_VAR = 'UPDATE_INTERVAL'
+DEFAULT_UPDATE_INTERVAL = 12  # in hours
 
-DEFAULT_UPDATE_INTERVAL = 180  # in minutes
 
 # set update interval from environment variable if available
 try:
-    update_interval_str = os.getenv(UPDATE_INTERVAL_VAR)
+    update_interval_str = os.getenv('UPDATE_INTERVAL')
     if update_interval_str is not None:
         update_interval = int(update_interval_str)
     else:
@@ -33,7 +32,7 @@ is_updating = threading.Lock()
 @asynccontextmanager
 async def lifespan(app: FastAPI):
     # update news periodically
-    scheduler.add_job(update_news, 'interval', minutes=update_interval)
+    scheduler.add_job(update_news, 'interval', hours=update_interval)
     scheduler.start()
     yield
     # stop the scheduler when closing the server
@@ -72,8 +71,7 @@ async def read_root(request: Request, background_tasks: BackgroundTasks):
             {
                 'request': request,
                 'articles': articles,
-                'message': 'Summarizing news articles now.'
-                           ' Please check back in a few minutes.'
+                'updateInProgress': True
             }
         )
 
@@ -82,6 +80,6 @@ async def read_root(request: Request, background_tasks: BackgroundTasks):
         {
             'request': request,
             'articles': articles,
-            'message': 'Additional articles are being summarized right now.' if is_updating.locked() else None
+            'updateInProgress': is_updating.locked()
         }
     )

app/templates/index.html

@@ -48,15 +48,20 @@
             <svg class="h-8 w-8 mr-2" viewBox="0 0 32 32" fill="black" xmlns="http://www.w3.org/2000/svg">
                 <circle cx="16" cy="16" r="10" />
             </svg>
-            <a href="#" class="font-display text-2xl tracking-widest uppercase">Focal</a>
+            <a href="#" class="font-display text-2xl">Focal</a>
         </div>
     </header>
 
     <main class="container mx-auto px-6 py-12 max-w-4xl">
 
-        {% if message %}
-        <div class="text-center text-lg text-text-primary">
-            {{ message }}
+        {% if updateInProgress %}
+        <div class="text-center my-24">
+            <svg class="animate-spin h-8 w-8 text-primary mx-auto mb-4" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24">
+                <circle class="opacity-25" cx="12" cy="12" r="10" stroke="currentColor" stroke-width="4"></circle>
+                <path class="opacity-75" fill="currentColor" d="M4 12a8 8 0 018-8V0C5.373 0 0 5.373 0 12h4zm2 5.291A7.962 7.962 0 014 12H0c0 3.042 1.135 5.824 3 7.938l3-2.647z"></path>
+            </svg>
+            <h3 class="text-xl font-medium text-gray-900">Updating news articles now...</h3>
+            <p class="text-gray-500 mt-1">Please check back in a few minutes.</p>
         </div>
         {% endif %}
 

app/update_news.py

@@ -31,19 +31,27 @@ def update_news():
     # rss feeds for current headlines
     rss_feed_urls = read_rss_feed_urls()
 
-    # clear old articles
+    # update database
     with get_session() as session:
+        # clear old articles
         clear_articles(session)
 
-    # summarize articles and add to database
-    for article, sources in news_summary(summarizer, rss_feed_urls):
-        with get_session() as session:
-            add_article(session, article)
-
-            for source in sources:
-                source.article_id = article.id
-
-            add_sources(session, sources)
+        # summarize and collect all articles
+        articles = []
+        sources = []
+        for article, article_sources in news_summary(summarizer, rss_feed_urls):
+            articles.append(article)
+            sources.extend((source, article) for source in article_sources)
+
+        # add all articles to database and commit to generate IDs
+        session.add_all(articles)
+        session.commit()
+
+        # add sources associated with their articles
+        for source, article in sources:
+            source.article_id = article.id
+        session.add_all([source for source, _ in sources])
+        session.commit()
 
 
 if __name__ == '__main__':