Update app.py

app.py

@@ -219,42 +219,42 @@ class PaperDownloader:
     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"
+            return None, "Error: DOI not provided", "Error: DOI not provided", None, None
 
         try:
             pdf_content = self.download_with_retry(doi)
             
             if pdf_content:
                 if doi is None:
-                     return None, "Error: DOI not provided", "Error: DOI not provided"
+                     return None, "Error: DOI not provided", "", None, None
                 filename = f"{str(doi).replace('/', '_').replace('.', '_')}.pdf"
                 filepath = os.path.join(self.output_dir, filename)
                 with open(filepath, 'wb') as f:
                     f.write(pdf_content)
                 logger.info(f"Successfully downloaded: {filename}")
-                return filepath, f'<a href="https://doi.org/{doi}">{doi}</a>', ""
+                return filepath, f'<a href="https://doi.org/{doi}">{doi}</a>', "", None
             else:
                 logger.warning(f"Could not download: {doi}")
-                return None, f"Could not download {doi}", f'<a href="https://doi.org/{doi}">{doi}</a>'
+                return None, f"Could not download {doi}", f'<a href="https://doi.org/{doi}">{doi}</a>', None, None
 
         except Exception as e:
             logger.error(f"Error processing {doi}: {e}")
-            return None, f"Error processing {doi}: {e}", f"Error processing {doi}: {e}"
+            return None, f"Error processing {doi}: {e}", f"Error processing {doi}: {e}", None, None
     
     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"
+            return None, "Error: No DOIs provided", "Error: No DOIs provided", None, None
         
         dois = [doi.strip() for doi in dois_text.split('\n') if doi.strip()]
         if not dois:
-            return None, "Error: No valid DOIs provided", "Error: No valid DOIs provided"
+            return None, "Error: No valid DOIs provided", "Error: No valid DOIs provided", None, None
 
         downloaded_files = []
         failed_dois = []
         downloaded_links = []
         for i, doi in enumerate(tqdm(dois, desc="Downloading papers")):
-            filepath, success_message, fail_message = self.download_single_doi(doi)
+            filepath, success_message, fail_message, _ = self.download_single_doi(doi)
             if filepath:
               # Unique filename for zip
               filename = f"{str(doi).replace('/', '_').replace('.', '_')}_{i}.pdf"
@@ -273,7 +273,7 @@ class PaperDownloader:
                     zipf.write(file_path, arcname=os.path.basename(file_path))
             logger.info(f"ZIP file created: {zip_filename}")
 
-        return zip_filename if downloaded_files else None, "\n".join(downloaded_links), "\n".join(failed_dois)
+        return zip_filename if downloaded_files else None, "\n".join(downloaded_links), "\n".join(failed_dois), None, None
 
 
     def process_bibtex(self, bib_file):
@@ -284,14 +284,14 @@ class PaperDownloader:
                  bib_content = f.read()
         except Exception as e:
              logger.error(f"Error reading uploaded file {bib_file.name}: {e}")
-             return None, f"Error reading uploaded file {bib_file.name}: {e}", f"Error reading uploaded file {bib_file.name}: {e}", None
+             return None, f"Error reading uploaded file {bib_file.name}: {e}", f"Error reading uploaded file {bib_file.name}: {e}", None, None
 
         # Parse BibTeX data
         try:
             bib_database = bibtexparser.loads(bib_content)
         except Exception as e:
              logger.error(f"Error parsing BibTeX data: {e}")
-             return None, f"Error parsing BibTeX data: {e}", f"Error parsing BibTeX data: {e}", None
+             return None, f"Error parsing BibTeX data: {e}", f"Error parsing BibTeX data: {e}", None, None
 
         # Extract DOIs
         dois = [entry.get('doi') for entry in bib_database.entries if entry.get('doi')]
@@ -311,7 +311,7 @@ class PaperDownloader:
                 # Save PDF
                 if pdf_content:
                     if doi is None:
-                        return None, "Error: DOI not provided", "Error: DOI not provided", None
+                        return None, "Error: DOI not provided", "", None, None
                     filename = f"{str(doi).replace('/', '_').replace('.', '_')}.pdf"
                     filepath = os.path.join(self.output_dir, filename)
                     
@@ -336,7 +336,7 @@ class PaperDownloader:
                     zipf.write(file_path, arcname=os.path.basename(file_path))
             logger.info(f"ZIP file created: {zip_filename}")
 
-        return zip_filename, "\n".join(downloaded_links), "\n".join(failed_dois), None
+        return zip_filename, "\n".join(downloaded_links), "\n".join(failed_dois), None, None
 
     def create_report_docx(self, downloaded_dois, failed_dois):
         """Creates a Word document report of downloaded and failed DOIs."""
@@ -380,18 +380,18 @@ def create_gradio_interface():
         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
+                return None, "Error: Please upload a .bib file", "Error: Please upload a .bib file", None, None
 
-            zip_path, downloaded_dois, failed_dois, _ = downloader.process_bibtex(bib_file)
-            return zip_path, downloaded_dois, failed_dois, None
+            zip_path, downloaded_dois, failed_dois, _ , _= downloader.process_bibtex(bib_file)
+            return zip_path, downloaded_dois, failed_dois, None, None
         elif doi_input:
-            filepath, message, failed_doi = downloader.download_single_doi(doi_input)
-            return None, message, failed_doi, filepath
+            filepath, message, failed_doi, _ = downloader.download_single_doi(doi_input)
+            return None, message, failed_doi, filepath, None
         elif dois_input:
-           zip_path, downloaded_dois, failed_dois = downloader.download_multiple_dois(dois_input)
-           return zip_path, downloaded_dois, failed_dois, None
+           zip_path, downloaded_dois, failed_dois, _ , _= downloader.download_multiple_dois(dois_input)
+           return zip_path, downloaded_dois, failed_dois, None, 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
+           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, None
     
     def create_report(downloaded_dois_html, failed_dois_html):
         """Creates a report and returns the report path."""