Update app.py

app.py

@@ -341,32 +341,32 @@ class PaperDownloader:
                 
                 pdf_content = await self.download_with_retry_async(doi)
                 if pdf_content:
-                        logger.info(f"Downloaded PDF for DOI: {doi}")
-                        filename = f"{str(doi).replace('/', '_').replace('.', '_')}.pdf"
-                        filepath = os.path.join(self.output_dir, filename)
+                    logger.info(f"Downloaded PDF for DOI: {doi}")
+                    filename = f"{str(doi).replace('/', '_').replace('.', '_')}.pdf"
+                    filepath = os.path.join(self.output_dir, filename)
 
-                        # Escribir contenido del PDF
-                        
-                        with open(filepath, 'wb') as f:
-                           f.write(pdf_content)
+                    # Escribir contenido del PDF
+                    
+                    with open(filepath, 'wb') as f:
+                       f.write(pdf_content)
                        
-                        logger.info(f"Saved PDF to file: {filepath}")
+                    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>", ""
+                    logger.info(f"Descarga exitosa: {filename}")
+                    
+                    return filepath, f"Descargado exitosamente: <a href='https://doi.org/{doi}'>{doi}</a>", ""
                    
                 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>'
-            
+                    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"
+                logger.info(f"Download Cancelled DOI: {doi}")
+                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}"
+                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):
@@ -387,16 +387,13 @@ class PaperDownloader:
             failed_dois = []           # DOIs que no se pudieron descargar
             downloaded_links = []      # Links de DOIs descargados
             
-            for doi in dois:
-                   
-                    result = await self._download_single_doi(doi,cancel_event) #await all of it and only collect results
+            for i, doi in enumerate(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
-            
+                        continue
 
                     if isinstance(result, Exception):
                         # Excepción inesperada
@@ -406,31 +403,30 @@ class PaperDownloader:
                     
                     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}')
+                        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]
-                         
+                        
                          # Generar nombre de archivo único
-                         filename = f"{str(doi).replace('/', '_').replace('.', '_')}.pdf"
-                         filepath_unique = os.path.join(self.output_dir, filename)
+                        filename = f"{str(doi).replace('/', '_').replace('.', '_')}.pdf" #Fixed indent
+                        filepath_unique = os.path.join(self.output_dir, filename) # Fixed indent
                          
-                         try:
-                              # Renombrar archivo
-                              os.rename(filepath, filepath_unique)
-                              
-                              # Añadir a lista de archivos descargados
-                              downloaded_files.append(filepath_unique)
-                              downloaded_links.append(f'<a href="https://doi.org/{doi}">{doi}</a>')
+                        try:
+                             # Renombrar archivo
+                           os.rename(filepath, filepath_unique) #Fixed indent
+                            
+                            # Añadir a lista de archivos descargados
+                           downloaded_files.append(filepath_unique)  #Fixed indent
+                           downloaded_links.append(f'<a href="https://doi.org/{doi}">{doi}</a>') #Fixed indent
                         
                          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') #Fixed indent
+            
             # Crear archivo ZIP si hay archivos descargados
             zip_filename = None
             if downloaded_files:
@@ -443,8 +439,7 @@ 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), ""
+            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):
             """Process BibTeX file and download papers with multiple strategies and reports UI updates using a callback"""
@@ -471,47 +466,47 @@ class PaperDownloader:
             downloaded_files = []
             failed_dois = []
             downloaded_links = []
+           
+            for i,doi in enumerate(dois):
+                  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
+                      
+                  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}')
             
-            for doi in dois:
-                    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", "" # 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}')
-                    
-                    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}')
+                  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}')
                 
-                    else:
-                         # Descarga exitosa
-                        filepath = result[0]
+                  else:
+                    # Descarga exitosa
+                     filepath = result[0]
                          
-                         # Unique filename for zip
-                        filename = f"{str(doi).replace('/', '_').replace('.', '_')}_{i}.pdf"
-                        filepath_unique = os.path.join(self.output_dir, filename)
-                        os.rename(filepath, filepath_unique)
-                        downloaded_files.append(filepath_unique)
-                        downloaded_links.append(f'<a href="https://doi.org/{doi}">{doi}</a>')
-        
+                    # Unique filename for zip
+                     filename = f"{str(doi).replace('/', '_').replace('.', '_')}_{i}.pdf"
+                     filepath_unique = os.path.join(self.output_dir, filename)
+                     os.rename(filepath, filepath_unique)
+                     downloaded_files.append(filepath_unique)
+                     downloaded_links.append(f'<a href="https://doi.org/{doi}">{doi}</a>')
+
             if downloaded_files:
                 zip_filename = 'papers.zip'
                 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"""
@@ -531,31 +526,35 @@ def create_gradio_interface():
 
 
     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
+            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
                 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
+                     return None, "Error: Please upload a .bib file", "Error: Please upload a .bib file",  "",  None #Added for consistent value returns
+
+                zip_file, downloaded_dois, failed_dois, logs_text=  await downloader.process_bibtex(bib_file, cancel_event)
 
-        elif doi_input:
-            filepath, message, error= await downloader._download_single_doi(doi_input,cancel_event)
-            return  None, message, error, "", filepath
+                return zip_file, downloaded_dois, failed_dois, logs_text, None# Correctly send None and "", in one var to return tuple 5 values, as it is required
 
-        elif dois_input:
-             zip_file, downloaded_dois, failed_dois, logs_text= await downloader.download_multiple_dois(dois_input,cancel_event)
+            elif doi_input:
 
-             return  zip_file, downloaded_dois, failed_dois, logs_text, None
+                  filepath, message, error= await downloader._download_single_doi(doi_input, cancel_event)
+                  return None, message, error,"", filepath # Correctly return params here on singe execution
+
+            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 # Correctly send null
            
-        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
+            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 # must also have five values to satisfy gradio block method
+        
     
     with gr.Blocks(theme="Hev832/Applio", css="""
         .gradio-container {
@@ -614,11 +613,11 @@ def create_gradio_interface():
                  stop_button.click(lambda: downloader.cancel_download(), outputs=None)  # added function in object downloader
           
             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.
+                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.
             )
-
+  
     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."