Update app.py

app.py

@@ -5,6 +5,7 @@ import logging
 import zipfile
 import requests
 import bibtexparser
+from tqdm import tqdm
 from urllib.parse import quote, urlencode
 import gradio as gr
 from bs4 import BeautifulSoup
@@ -419,8 +420,8 @@ class PaperDownloader:
 
         return None
 
-    def download_single_doi(self, doi, progress=gr.Progress()):
-        """Downloads a single paper using a DOI with progress bar"""
+    def download_single_doi(self, doi):
+        """Downloads a single paper using a DOI"""
         if not doi:
             return None, "Error: DOI not provided", "Error: DOI not provided"
 
@@ -435,20 +436,17 @@ class PaperDownloader:
                 with open(filepath, 'wb') as f:
                     f.write(pdf_content)
                 logger.info(f"Successfully downloaded: {filename}")
-                progress(1)
                 return filepath, f'<div style="display: flex; align-items: center;">✓ <a href="https://doi.org/{doi}">{doi}</a> <button onclick="copyLink(this)">Copy</button></div>', ""
             else:
                 logger.warning(f"Could not download: {doi}")
-                progress(1)
                 return None, f"Could not download {doi}", f'<div style="display: flex; align-items: center;">❌ <a href="https://doi.org/{doi}">{doi}</a>  <button onclick="copyLink(this)">Copy</button></div>'
 
         except Exception as e:
             logger.error(f"Error processing {doi}: {e}")
-            progress(1)
             return None, f"Error processing {doi}: {e}", f"Error processing {doi}: {e}"
 
-    def download_multiple_dois(self, dois_text, progress=gr.Progress()):
-        """Downloads multiple papers from a list of DOIs with progress bar"""
+    def download_multiple_dois(self, dois_text):
+        """Downloads multiple papers from a list of DOIs"""
         if not dois_text:
             return None, "Error: No DOIs provided", "Error: No DOIs provided"
 
@@ -456,13 +454,11 @@ class PaperDownloader:
         if not dois:
             return None, "Error: No valid DOIs provided", "Error: No valid DOIs provided"
 
-        total_dois = len(dois)
         downloaded_files = []
         failed_dois = []
         downloaded_links = []
-        
-        for i, doi in enumerate(dois):
-            filepath, success_message, fail_message = self.download_single_doi(doi, progress=progress)
+        for i, doi in enumerate(tqdm(dois, desc="Downloading papers")):
+            filepath, success_message, fail_message = self.download_single_doi(doi)
             if filepath:
                 # Unique filename for zip
                 filename = f"{str(doi).replace('/', '_').replace('.', '_')}_{i}.pdf"
@@ -473,8 +469,6 @@ class PaperDownloader:
 
             else:
                 failed_dois.append(f'<div style="display: flex; align-items: center;">❌ <a href="https://doi.org/{doi}">{doi}</a>  <button onclick="copyLink(this)">Copy</button></div>')
-            progress((i + 1) / total_dois)
-
 
         if downloaded_files:
             zip_filename = 'papers.zip'
@@ -485,8 +479,8 @@ class PaperDownloader:
 
         return zip_filename if downloaded_files else None, "\n".join(downloaded_links), "\n".join(failed_dois)
 
-    def process_bibtex(self, bib_file, progress=gr.Progress()):
-        """Process BibTeX file and download papers with multiple strategies with progress bar"""
+    def process_bibtex(self, bib_file):
+        """Process BibTeX file and download papers with multiple strategies"""
         # Read BibTeX file content from the uploaded object
         try:
             with open(bib_file.name, 'r', encoding='utf-8') as f:
@@ -510,11 +504,9 @@ class PaperDownloader:
         downloaded_files = []
         failed_dois = []
         downloaded_links = []
-        
-        total_dois = len(dois)
 
         # Download PDFs
-        for i, doi in enumerate(dois):
+        for doi in tqdm(dois, desc="Downloading papers"):
             try:
                 # Try to download with multiple methods with retries
                 pdf_content = self.download_with_retry(doi)
@@ -538,7 +530,6 @@ class PaperDownloader:
             except Exception as e:
                 failed_dois.append(f'<div style="display: flex; align-items: center;">❌ <a href="https://doi.org/{doi}">{doi}</a>  <button onclick="copyLink(this)">Copy</button></div>')
                 logger.error(f"Error processing {doi}: {e}")
-            progress((i + 1) / total_dois)
 
         # Create ZIP of downloaded papers
         if downloaded_files:
@@ -550,7 +541,7 @@ class PaperDownloader:
 
         return zip_filename, "\n".join(downloaded_links), "\n".join(failed_dois), None
 
-    async def process_bibtex_async(self, bib_file, progress=gr.Progress()):
+    async def process_bibtex_async(self, bib_file):
         """Process BibTeX file and download papers with multiple strategies"""
         # Read BibTeX file content from the uploaded object
         try:
@@ -575,10 +566,9 @@ class PaperDownloader:
         downloaded_files = []
         failed_dois = []
         downloaded_links = []
-        total_dois = len(dois)
 
         # Download PDFs
-        for i, doi in enumerate(dois):
+        for doi in tqdm(dois, desc="Downloading papers"):
             try:
                 # Try to download with multiple methods with retries
                 pdf_content = await self.download_with_retry_async(doi)
@@ -602,8 +592,6 @@ class PaperDownloader:
             except Exception as e:
                 failed_dois.append(f'<div style="display: flex; align-items: center;">❌ <a href="https://doi.org/{doi}">{doi}</a>  <button onclick="copyLink(this)">Copy</button></div>')
                 logger.error(f"Error processing {doi}: {e}")
-            progress((i + 1) / total_dois)
-
 
         # Create ZIP of downloaded papers
         if downloaded_files:
@@ -619,19 +607,19 @@ def create_gradio_interface():
     """Create Gradio interface for Paper Downloader"""
     downloader = PaperDownloader()
 
-    async def download_papers(bib_file, doi_input, dois_input, progress=gr.Progress()):
+    async def download_papers(bib_file, doi_input, dois_input):
         if bib_file:
             # Check file type
             if not bib_file.name.lower().endswith('.bib'):
                 return None, "Error: Please upload a .bib file", "Error: Please upload a .bib file", None
 
-            zip_path, downloaded_dois, failed_dois, _ = await downloader.process_bibtex_async(bib_file, progress)
+            zip_path, downloaded_dois, failed_dois, _ = await downloader.process_bibtex_async(bib_file)
             return zip_path, downloaded_dois, failed_dois, None
         elif doi_input:
-            filepath, message, failed_doi = downloader.download_single_doi(doi_input, progress)
+            filepath, message, failed_doi = downloader.download_single_doi(doi_input)
             return None, message, failed_doi, filepath
         elif dois_input:
-            zip_path, downloaded_dois, failed_dois = downloader.download_multiple_dois(dois_input, progress)
+            zip_path, downloaded_dois, failed_dois = downloader.download_multiple_dois(dois_input)
             return zip_path, downloaded_dois, failed_dois, None
         else:
             return None, "Please provide a .bib file, a single DOI, or a list of DOIs", "Please provide a .bib file, a single DOI, or a list of DOIs", None