Update app.py

app.py

@@ -68,6 +68,7 @@ class PaperDownloader:
         retry_count = 0
 
         while redirect_count <= max_redirects:
+          
             try:
                 while retry_count <= max_retries:
                     try:
@@ -330,14 +331,13 @@ class PaperDownloader:
             # Si se agotan todos los reintentos
             return None
 
-    async def _download_single_doi(self, doi, cancel_event): # removed async keyword
+    async def _download_single_doi(self, doi, cancel_event):
             """Descargar un único DOI con retroalimentación de progreso"""
             if not doi:
                 return None, "Error: DOI no proporcionado", "Error: DOI no proporcionado"
             logger.info(f"Starting download process for DOI: {doi}")
             
             try:
-                
                 pdf_content = await self.download_with_retry_async(doi)
                 if pdf_content:
                         logger.info(f"Downloaded PDF for DOI: {doi}")
@@ -346,27 +346,27 @@ class PaperDownloader:
 
                         # Escribir contenido del PDF
                         
-                        with open(filepath, 'wb') as f: # added context for handling resource and also made sync the file method
-                           f.write(pdf_content)
-                       
+                        with open(filepath, 'wb') as f: # context is useful here
+                            f.write(pdf_content)
+                        
                         logger.info(f"Saved PDF to file: {filepath}")
 
                         logger.info(f"Descarga exitosa: {filename}")
                         
                         return filepath, f"Descargado exitosamente: <a href='https://doi.org/{doi}'>{doi}</a>", ""
-                   else:
+                   
+                else:
                         logger.warning(f"No se pudo descargar: {doi}")
                         return None, f"No se pudo descargar {doi}", f'<a href="https://doi.org/{doi}">{doi}</a>'
-           
+            
             except CancelledError:
                 logger.info(f"Download Cancelled DOI: {doi}")
-                return None, f"Download cancelled {doi}","Download Cancelled"
-               
+                return None, f"Download cancelled {doi}","Download Cancelled" 
+            
             except Exception as e:
                 logger.error(f"Error processing {doi}: {e}")
                 return None, f"Error processing {doi}: {e}", f"Error processing {doi}: {e}"
-               
-    
+            
     async def download_multiple_dois(self, dois_text, cancel_event):
             """Download multiple DOIs"""
             if not dois_text:
@@ -386,29 +386,30 @@ class PaperDownloader:
             downloaded_links = []      # Links de DOIs descargados
             
             for doi in dois:
+                   
                     result = await self._download_single_doi(doi,cancel_event)
 
                     if cancel_event.is_set():
-                         logger.info("Downloads cancelled on multiple dois download")
-                         return  None,"Downloads cancelled","Downloads cancelled", ""# early return on cancelled
+                        logger.info("Downloads cancelled on multiple dois download")
+                        return None, "Downloads cancelled","Downloads cancelled",""  # early return on cancelled
 
                     if result is None:
                         continue
 
                     if isinstance(result, Exception):
-                        # Excepción inesperada
-                        error_msg = f"Unexpected error: {str(result)}"
-                        logger.error(f"Error downloading {doi}: {error_msg}")
-                        failed_dois.append(f'<a href="https://doi.org/{doi}">{doi}</a> - {error_msg}')
+                         # Excepción inesperada
+                         error_msg = f"Unexpected error: {str(result)}"
+                         logger.error(f"Error downloading {doi}: {error_msg}")
+                         failed_dois.append(f'<a href="https://doi.org/{doi}">{doi}</a> - {error_msg}')
                 
                     elif result[0] is None:
-                        # Descarga fallida (resultado de download_single_doi_async)
-                        error_msg = result[1]
-                        logger.warning(f"Failed to download {doi}: {error_msg}")
-                        failed_dois.append(f'<a href="https://doi.org/{doi}">{doi}</a> - {error_msg}')
+                       # Descarga fallida (resultado de download_single_doi_async)
+                         error_msg = result[1]
+                         logger.warning(f"Failed to download {doi}: {error_msg}")
+                         failed_dois.append(f'<a href="https://doi.org/{doi}">{doi}</a> - {error_msg}')
                     
                     else:
-                        # Descarga exitosa
+                         # Descarga exitosa
                          filepath = result[0]
                          
                          # Generar nombre de archivo único
@@ -416,17 +417,19 @@ class PaperDownloader:
                          filepath_unique = os.path.join(self.output_dir, filename)
                          
                          try:
-                              # Renombrar archivo
+                             # Renombrar archivo
                               os.rename(filepath, filepath_unique)
-                              
-                              # Añadir a lista de archivos descargados
+                            
+                            # Añadir a lista de archivos descargados
                               downloaded_files.append(filepath_unique)
                               downloaded_links.append(f'<a href="https://doi.org/{doi}">{doi}</a>')
                         
                          except Exception as rename_error:
-                              logger.error(f"Error renaming file for {doi}: {rename_error}")
-                              failed_dois.append(f'<a href="https://doi.org/{doi}">{doi}</a> - Error saving file')
-            
+                               logger.error(f"Error renaming file for {doi}: {rename_error}")
+                               failed_dois.append(f'<a href="https://doi.org/{doi}">{doi}</a> - Error saving file')
+                
+
+                    
             # Crear archivo ZIP si hay archivos descargados
             zip_filename = None
             if downloaded_files:
@@ -439,9 +442,8 @@ class PaperDownloader:
                     lambda: self.create_zip(zip_filename, downloaded_files)
                 )
                 logger.info(f"ZIP file created: {zip_filename}")
-                
             return  zip_filename if downloaded_files else None, "\n".join(downloaded_links),"\n".join(failed_dois), ""
-
+            
     async def process_bibtex(self, bib_file, cancel_event):# removed async here
             """Process BibTeX file and download papers with multiple strategies and reports UI updates using a callback"""
             # Read BibTeX file content from the uploaded object
@@ -450,7 +452,7 @@ 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}",""
+                return None, f"Error reading uploaded file {bib_file.name}: {e}", f"Error reading uploaded file {bib_file.name}: {e}", ""
 
             # Parse BibTeX data
             try:
@@ -469,30 +471,30 @@ class PaperDownloader:
             downloaded_links = []
            
             for doi in dois:
-                  result =  await self._download_single_doi(doi,cancel_event)
+                  result = await self._download_single_doi(doi, cancel_event)
 
                   if cancel_event.is_set():
-                      logger.info("Download Cancelled in bibtex mode")
-                      return  None, "Download Cancelled", "Download Cancelled", ""#cancel if requested
-
+                        logger.info("Download Cancelled in bibtex mode")
+                        return  None, "Download Cancelled", "Download Cancelled", ""#cancel if requested
+                      
                   if result is None:
-                    continue;
-                   
+                        continue
+                    
                   if isinstance(result, Exception):
-                    # Excepción inesperada
-                    error_msg = f"Unexpected error: {str(result)}"
-                    logger.error(f"Error downloading {doi}: {error_msg}")
-                    failed_dois.append(f'<a href="https://doi.org/{doi}">{doi}</a> - {error_msg}')
-                
+                     # Excepción inesperada
+                     error_msg = f"Unexpected error: {str(result)}"
+                     logger.error(f"Error downloading {doi}: {error_msg}")
+                     failed_dois.append(f'<a href="https://doi.org/{doi}">{doi}</a> - {error_msg}')
+                    
                   elif result[0] is None:
-                    # Descarga fallida (resultado de download_single_doi_async)
+                      # Descarga fallida (resultado de download_single_doi_async)
                      error_msg = result[1]
                      logger.warning(f"Failed to download {doi}: {error_msg}")
                      failed_dois.append(f'<a href="https://doi.org/{doi}">{doi}</a> - {error_msg}')
                 
                   else:
-                       # Descarga exitosa
-                     filepath = result[0]
+                     # Descarga exitosa
+                      filepath = result[0]
                     
                       # Unique filename for zip
                      filename = f"{str(doi).replace('/', '_').replace('.', '_')}_{i}.pdf"
@@ -506,9 +508,8 @@ class PaperDownloader:
                 loop = asyncio.get_running_loop()
                 loop.run_in_executor(self.executor, lambda:  self.create_zip(zip_filename,downloaded_files))
                 logger.info(f"ZIP file created: {zip_filename}")
-                
-            return  zip_filename, "\n".join(downloaded_links), "\n".join(failed_dois), ""
-
+               
+            return zip_filename, "\n".join(downloaded_links), "\n".join(failed_dois), ""
 
     def create_zip(self, zip_filename, files):
         """Crea un archivo zip con los pdfs descargados"""
@@ -525,35 +526,33 @@ class PaperDownloader:
 def create_gradio_interface():
     """Create Gradio interface for Paper Downloader"""
     downloader = PaperDownloader()
-  
     def update_progress( message="", logs=""):
-         return  gr.Textbox.update(value=f"{message}"),gr.Textbox.update(value=f"<pre>{logs}</pre>")
+      return  gr.Textbox.update(value=f"{message}"),gr.Textbox.update(value=f"<pre>{logs}</pre>")
     
 
     async def download_papers(bib_file, doi_input, dois_input, output_file, downloaded_dois_textbox,failed_dois_textbox,logs, single_file):
             cancel_event = asyncio.Event() # Create cancellation event for every submission.
             downloader.cancel_event = cancel_event # store the event so that it is available to stop the process
-           
             if bib_file:
-                 # Check file type
+                # 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_file, downloaded_dois, failed_dois, logs_text = await downloader.process_bibtex(bib_file, cancel_event)
-                 return zip_file, downloaded_dois, failed_dois, logs_text, None# we use variables to keep consistent return with correct info.
+                    return  None, "Error: Please upload a .bib file", "Error: Please upload a .bib file","", None
 
+                 zip_file, downloaded_dois, failed_dois, logs_text = await downloader.process_bibtex(bib_file, cancel_event)
+                
+                 return zip_file, downloaded_dois, failed_dois, logs_text, None
             elif doi_input:
-                filepath, message, error=  await downloader._download_single_doi(doi_input,cancel_event)
-                return  None, message, error,"",filepath# correct return
-
-            elif dois_input:
 
-               zip_file, downloaded_dois, failed_dois, logs_text=  await downloader.download_multiple_dois(dois_input,cancel_event)
+                  filepath, message, error = await downloader._download_single_doi(doi_input,cancel_event)
 
-               return zip_file, downloaded_dois, failed_dois, logs_text, None # correct return
-               
+                  return None, message, error,"",filepath
+           
+            elif dois_input:
+                zip_file, downloaded_dois, failed_dois, logs_text= await downloader.download_multiple_dois(dois_input, cancel_event)
+                return  zip_file, downloaded_dois, failed_dois, logs_text, 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 # direct return values, no callbacks
+                  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 # direct return values, no callbacks
         
     
     with gr.Blocks(theme="Hev832/Applio", css="""
@@ -614,15 +613,12 @@ def create_gradio_interface():
           
             submit_button.click(
                 download_papers,
-                 inputs=[bib_file, doi_input, dois_input],
-                outputs=[output_file, downloaded_dois_textbox, failed_dois_textbox,logs, single_file ] # the new output should be a tuple and we output logs too for debugging.
-                
+                inputs=[bib_file, doi_input, dois_input],
+                  outputs=[output_file, downloaded_dois_textbox, failed_dois_textbox,logs, single_file ] # the new output should be a tuple and we output logs too for debugging.
             )
-        
-        
     interface.title="🔬 Academic Paper Batch Downloader"
     interface.description="Upload a BibTeX file or enter DOIs to download PDFs. We'll attempt to fetch PDFs from multiple sources like Sci-Hub, Libgen, Google Scholar and Crossref. You can use any of the three inputs at any moment."
-
+   
     return interface
 
 def main():