Update app.py

app.py

@@ -14,11 +14,13 @@ class PaperManager:
     def fetch_papers(self):
         """
         Fetch papers from the API if not already fetched today.
+        Returns:
+            tuple: (success: bool, data: list, error_message: str)
         """
         today = datetime.now(timezone.utc).date()
         if self.last_fetch_date == today and self.cache:
             print("Using cached papers.")
-            return True
+            return True, self.cache, ""
         else:
             try:
                 # Attempt to fetch all papers at once. Adjust 'limit' as per API's capability.
@@ -29,10 +31,10 @@ class PaperManager:
                 self.last_fetch_date = today
                 self.total_pages = (len(self.cache) + self.papers_per_page - 1) // self.papers_per_page
                 print(f"Fetched {len(self.cache)} papers. Total pages: {self.total_pages}")
-                return True
+                return True, self.cache, ""
             except requests.RequestException as e:
                 print(f"Error fetching papers: {e}")
-                return False
+                return False, [], str(e)
 
     def format_paper(self, paper):
         """
@@ -51,7 +53,6 @@ class PaperManager:
         except ValueError:
             time_ago = "Unknown"
 
-        # Ensure the triple-quoted string is properly closed
         return f"""<div style='border-bottom: 1px solid #eee; padding: 10px 0;'>
 <a href='{url}' target='_blank' style='color: #000; text-decoration: none; font-weight: bold;'>{title}</a>
 <div style='font-size: 0.8em; color: #666; margin-top: 5px;'>
@@ -120,6 +121,11 @@ html, body {
     align-items: center;
     margin-top: 10px;
 }
+.error-message {
+    color: red;
+    margin-bottom: 10px;
+    text-align: center;
+}
 """
 
 # Instantiate the PaperManager
@@ -129,23 +135,22 @@ def initialize():
     """
     Initialize the app by fetching papers and setting initial states.
     """
-    success = paper_manager.fetch_papers()
+    success, papers, error_message = paper_manager.fetch_papers()
     if success:
-        papers = paper_manager.cache
         page = 1
         total_pages = paper_manager.total_pages
         page_papers = paper_manager.render_papers(papers, page)
         page_info_text = f"Page {page} of {total_pages}"
-        return page_papers, page, total_pages, papers, page_info_text
+        return page_papers, page, total_pages, papers, page_info_text, ""
     else:
-        error_html = "<div>Error fetching papers. Please try again later.</div>"
-        return error_html, 1, 1, [], "Page 1 of 1"
+        error_html = f"<div class='error-message'>Error fetching papers: {error_message}</div>"
+        return error_html, 1, 1, [], "Page 1 of 1", error_message
 
 def refresh_papers(current_page, query):
     """
     Refresh the papers. Fetch new data if a new day has started.
     """
-    success = paper_manager.fetch_papers()
+    success, papers, error_message = paper_manager.fetch_papers()
     if success:
         # Reset to first page on refresh
         new_page = 1
@@ -154,124 +159,12 @@ def refresh_papers(current_page, query):
             total_pages = (len(filtered) + paper_manager.papers_per_page - 1) // paper_manager.papers_per_page if filtered else 1
             page_papers = paper_manager.render_papers(filtered, new_page)
             page_info_text = f"Page {new_page} of {total_pages}"
-            return page_papers, new_page, total_pages, filtered, page_info_text
+            return page_papers, new_page, total_pages, filtered, page_info_text, ""
         else:
             papers = paper_manager.cache
             total_pages = paper_manager.total_pages
             page_papers = paper_manager.render_papers(papers, new_page)
             page_info_text = f"Page {new_page} of {total_pages}"
-            return page_papers, new_page, total_pages, papers, page_info_text
-    else:
-        error_html = "<div>Error fetching papers. Please try again later.</div>"
-        return error_html, current_page, paper_manager.total_pages, [], f"Page {current_page} of {paper_manager.total_pages}"
-
-def search_papers(query, papers):
-    """
-    Search for papers based on the query and update the display.
-    """
-    if query:
-        filtered = paper_manager.search_papers(query)
-    else:
-        filtered = papers
-    total_pages = (len(filtered) + paper_manager.papers_per_page - 1) // paper_manager.papers_per_page if filtered else 1
-    page = 1
-    page_papers = paper_manager.render_papers(filtered, page)
-    page_info_text = f"Page {page} of {total_pages}"
-    return page_papers, page, total_pages, filtered, page_info_text
-
-def change_page(direction, current_page, total_pages, papers, query):
-    """
-    Change the current page based on the direction ('next' or 'prev').
-    """
-    if direction == "next" and current_page < total_pages:
-        new_page = current_page + 1
-    elif direction == "prev" and current_page > 1:
-        new_page = current_page - 1
+            return page_papers, new_page, total_pages, papers, page_info_text, ""
     else:
-        new_page = current_page  # No change if limits are reached
-
-    if not papers:
-        page_papers = "<div>No papers available for this page.</div>"
-    else:
-        page_papers = paper_manager.render_papers(papers, new_page)
-    page_info_text = f"Page {new_page} of {total_pages}"
-    return page_papers, new_page, total_pages, papers, page_info_text
-
-def go_prev(current_page, total_pages, papers, query):
-    """
-    Handle the 'Previous Page' button click.
-    """
-    return change_page("prev", current_page, total_pages, papers, query)
-
-def go_next(current_page, total_pages, papers, query):
-    """
-    Handle the 'Next Page' button click.
-    """
-    return change_page("next", current_page, total_pages, papers, query)
-
-# Define the Gradio Blocks interface
-demo = gr.Blocks(css=css)
-
-with demo:
-    with gr.Column(elem_classes=["container"]):
-        # Title
-        gr.Markdown("# Daily Papers - HackerNews Style", elem_classes=["title"])
-        
-        # Search and Refresh Row
-        with gr.Row(elem_classes=["search-row"]):
-            search_input = gr.Textbox(label="Search papers", placeholder="Enter search term...")
-            refresh_button = gr.Button("Refresh")
-        
-        # Paper List Display
-        paper_list = gr.HTML(elem_classes=["paper-list"])
-        
-        # Pagination Controls
-        with gr.Row(elem_classes=["footer"]):
-            prev_button = gr.Button("Previous Page")
-            page_info = gr.Markdown("Page 1 of 1")
-            next_button = gr.Button("Next Page")
-        
-        # Hidden States
-        current_page_state = gr.State(1)
-        total_pages_state = gr.State(1)
-        papers_state = gr.State([])
-    
-        # Initialize the app on load
-        demo.load(
-            initialize, 
-            outputs=[paper_list, current_page_state, total_pages_state, papers_state, page_info]
-        )
-    
-        # Search Functionality
-        search_input.submit(
-            search_papers, 
-            inputs=[search_input, papers_state], 
-            outputs=[paper_list, current_page_state, total_pages_state, papers_state, page_info]
-        )
-        search_input.change(
-            search_papers, 
-            inputs=[search_input, papers_state], 
-            outputs=[paper_list, current_page_state, total_pages_state, papers_state, page_info]
-        )
-    
-        # Refresh Functionality
-        refresh_button.click(
-            refresh_papers, 
-            inputs=[current_page_state, search_input], 
-            outputs=[paper_list, current_page_state, total_pages_state, papers_state, page_info]
-        )
-    
-        # Pagination Buttons
-        prev_button.click(
-            go_prev, 
-            inputs=[current_page_state, total_pages_state, papers_state, search_input], 
-            outputs=[paper_list, current_page_state, total_pages_state, papers_state, page_info]
-        )
-        next_button.click(
-            go_next, 
-            inputs=[current_page_state, total_pages_state, papers_state, search_input], 
-            outputs=[paper_list, current_page_state, total_pages_state, papers_state, page_info]
-        )
-    
-# Launch the Gradio app
-demo.launch()
+        error_html = f"<div cla