Update app.py

app.py

@@ -334,7 +334,6 @@ class PaperDownloader:
     def _download_single_doi(self, doi, cancel_event): # removed async keyword
             """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}")
             
@@ -363,23 +362,22 @@ class PaperDownloader:
                         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>'
             
-                filepath, message, error = asyncio.run(call_async()) #added the loop event here
-                return filepath, message, error
+                return asyncio.run(call_async()) #added the loop event here
+                
             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}" 
+               return None, f"Error processing {doi}: {e}", f"Error processing {doi}: {e}"
                
     
     def download_multiple_dois(self, dois_text, cancel_event): #removed async here
             """Download multiple DOIs"""
              # Validar entrada
             if not dois_text:
-                
-                return None, "Error: No DOIs provided", "Error: No DOIs provided",""
+               return None, "Error: No DOIs provided", "Error: No DOIs provided", ""
 
             # Sanitizar y filtrar DOIs
             # Eliminar líneas vacías, espacios en blanco, y DOIs duplicados
@@ -387,27 +385,25 @@ class PaperDownloader:
             
             # Validar lista de DOIs
             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", ""
     
             # Listas para rastrear resultados
             downloaded_files = []      # Rutas de archivos descargados
             failed_dois = []           # DOIs que no se pudieron descargar
             downloaded_links = []      # Links de DOIs descargados
+            
             for doi in dois:
-                   
-                    result = self._download_single_doi(doi,cancel_event)
+                    result = self._download_single_doi(doi,cancel_event) # now single methods directly
 
                     if cancel_event.is_set():
-                        
                         logger.info("Downloads cancelled on multiple dois download")
-                        return  None,"Downloads cancelled","Downloads cancelled","" # early return on cancelled
-                                     
-                    if result is None: #when errors happen results are none
-                         continue
-                   # Manejar diferentes tipos de resultados
+                        return  None,"Downloads cancelled","Downloads cancelled", ""# early return on cancelled
+
+                    if result is None:
+                        continue
+
                     if isinstance(result, Exception):
-                         # Excepción inesperada
+                        # 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}')
@@ -419,24 +415,24 @@ class PaperDownloader:
                         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
+                         # Generar nombre de archivo único
                          filename = f"{str(doi).replace('/', '_').replace('.', '_')}.pdf"
                          filepath_unique = os.path.join(self.output_dir, filename)
-                         
+                        
                          try:
                               # 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
@@ -452,8 +448,7 @@ class PaperDownloader:
                 )
                 logger.info(f"ZIP file created: {zip_filename}")
                 
-            return  zip_filename if downloaded_files else None, "\n".join(downloaded_links),"\n".join(failed_dois), "" # returning only results here and not in lambda
-
+            return zip_filename if downloaded_files else None, "\n".join(downloaded_links),"\n".join(failed_dois), ""
 
     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"""
@@ -480,16 +475,16 @@ class PaperDownloader:
             downloaded_files = []
             failed_dois = []
             downloaded_links = []
-
+           
             for doi in dois:
-                result = self._download_single_doi(doi, cancel_event) # removed lambda call from executor
-
-                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: #skips if it contains null values as a results.
-                      continue
+                 result= self._download_single_doi(doi,cancel_event) # calls function
+                
+                 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: #skips nulls to perform continue on a multi processing with threads.
+                    continue;
 
                  if isinstance(result, Exception):
                     # Excepción inesperada
@@ -499,29 +494,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]
+                      # 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),"" #send all results
-            
+            return zip_filename, "\n".join(downloaded_links), "\n".join(failed_dois), ""# all callbacks done, sending empty logs so no value breaks on UI.
+
 
     def create_zip(self, zip_filename, files):
         """Crea un archivo zip con los pdfs descargados"""
@@ -544,45 +540,48 @@ def create_gradio_interface():
     
 
     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
-            if not bib_file.name.lower().endswith('.bib'):
-               return None, "Error: Please upload a .bib file", "Error: Please upload a .bib file", "",  None
+           
+           
+            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
+
+                downloader.download_task = downloader.executor.submit(
+                        downloader.process_bibtex, 
+                         bib_file,
+                         cancel_event # Added cancelllation event.
+                     )
+                zip_file, downloaded_dois, failed_dois, logs_text= downloader.download_task.result() #gets the values returned.
+
+                return zip_file, downloaded_dois, failed_dois, logs_text, None # simple return
+          
+            elif doi_input:
 
-            downloader.download_task = downloader.executor.submit(
-                 downloader.process_bibtex, 
-                bib_file,
-                cancel_event # Added cancelllation event.
-                 )
-            zip_file, downloaded_dois, failed_dois, logs_text =  downloader.download_task.result() # gets results from method 
-            return zip_file, downloaded_dois, failed_dois, logs_text, None #  we use this method because all outputs values were already done inside the callback
+                downloader.download_task = downloader.executor.submit( #changed async execution method
+                    downloader._download_single_doi, 
+                      doi_input, 
+                      cancel_event
+                    )
+                
+                filepath, message, error =   downloader.download_task.result()#gets results, nothing more 
+                return None, message, error,  "", filepath
 
-           
-        elif doi_input:
-            downloader.download_task = downloader.executor.submit( #changed async execution method
-                 downloader._download_single_doi, 
-                  doi_input, 
-                     cancel_event
-                 )
-            filepath, message, error=   downloader.download_task.result()
-
-            return None, message, error, "", filepath
-            
-        elif dois_input:
-              downloader.download_task = downloader.executor.submit( #changed async execution method
+            elif dois_input:
+                downloader.download_task = downloader.executor.submit( #changed async execution method
                     downloader.download_multiple_dois,
                        dois_input,
-                     cancel_event 
-                    )
-              zip_file, downloaded_dois, failed_dois, logs_text=   downloader.download_task.result()
-              return zip_file, downloaded_dois, failed_dois, logs_text, None #we use the direct assignments with returns as before on multi.
+                        cancel_event #Add cancellation event.
+                   )
+                zip_file, downloaded_dois, failed_dois, logs_text= downloader.download_task.result()
+                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#all params provided
+        
 
-        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 # all parameters must have return data, to prevent gradio to crash on incomplete data for block
     
     with gr.Blocks(theme="Hev832/Applio", css="""
         .gradio-container {
@@ -641,17 +640,16 @@ 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."
-    
+   
     return interface
-            
 
 def main():
     interface = create_gradio_interface()