Update app.py

app.py

@@ -68,7 +68,6 @@ class PaperDownloader:
         retry_count = 0
 
         while redirect_count <= max_redirects:
-          
             try:
                 while retry_count <= max_retries:
                     try:
@@ -331,54 +330,47 @@ class PaperDownloader:
             # Si se agotan todos los reintentos
             return None
 
-    def _download_single_doi(self, doi, cancel_event): # removed async keyword
+    async 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}")
             
             try:
                 
-                async def call_async():# Added this in order to execute correctly on executor
-
-                   pdf_content = await self.download_with_retry_async(doi)
-                   if pdf_content:
+                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)
 
                         # Escribir contenido del PDF
                         
-                        open(filepath, 'wb').write(pdf_content)
+                        with open(filepath, 'wb') as f: # added context for handling resource and also made sync the file method
+                           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:
                         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>'
-            
-                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"
+                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}"
                
     
-    def download_multiple_dois(self, dois_text, cancel_event): #removed async here
+    async def download_multiple_dois(self, dois_text, cancel_event):
             """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
@@ -394,48 +386,47 @@ class PaperDownloader:
             downloaded_links = []      # Links de DOIs descargados
             
             for doi in dois:
-                result = self._download_single_doi(doi,cancel_event) # all downloads return their info 
-                 
-                if cancel_event.is_set():
-                    logger.info("Downloads cancelled on multiple dois download")
-                    return  None,"Downloads cancelled","Downloads cancelled", ""# early return on cancelled
+                    result = await self._download_single_doi(doi,cancel_event)
 
-                if result is None:
-                    continue
+                    if cancel_event.is_set():
+                         logger.info("Downloads cancelled on multiple dois download")
+                         return  None,"Downloads cancelled","Downloads cancelled", ""# early return on cancelled
 
-                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}')
+                    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}')
                 
-                else:
-                    # Descarga exitosa
-                    filepath = result[0]
+                    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]
                          
-                    # 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
-                        downloaded_files.append(filepath_unique)
-                        downloaded_links.append(f'<a href="https://doi.org/{doi}">{doi}</a>')
+                         # 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
+                              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')
-
-                    
+                         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')
+            
             # Crear archivo ZIP si hay archivos descargados
             zip_filename = None
             if downloaded_files:
@@ -448,11 +439,10 @@ 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), ""
 
-    def process_bibtex(self, bib_file, cancel_event):# removed async here
+    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
             try:
@@ -477,46 +467,47 @@ class PaperDownloader:
             downloaded_files = []
             failed_dois = []
             downloaded_links = []
+           
             for doi in dois:
-                 result = self._download_single_doi(doi, cancel_event)
-            
-                 if cancel_event.is_set():
+                  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" , ""
-                      
-                 if result is None:
+                      return  None, "Download Cancelled", "Download Cancelled", ""#cancel if requested
+
+                  if result is None:
                     continue;
-                    
-                 if isinstance(result, Exception):
+                   
+                  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:
+                  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
+                
+                  else:
+                       # Descarga exitosa
                      filepath = result[0]
                     
-                     # Unique filename for zip
+                      # 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):
@@ -534,53 +525,35 @@ 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>")
     
 
-    def download_papers(bib_file, doi_input, dois_input, output_file, downloaded_dois_textbox,failed_dois_textbox,logs, single_file):
+    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
-                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
-                    )
-
-                zip_file, downloaded_dois, failed_dois, logs_text =   downloader.download_task.result()
-
-                return zip_file, downloaded_dois, failed_dois, logs_text, None #just direct return now no callbaccks or specific UI methods on callback functions
+                 # 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.
 
             elif doi_input:
+                filepath, message, error=  await downloader._download_single_doi(doi_input,cancel_event)
+                return  None, message, error,"",filepath# correct return
 
-                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()
+            elif dois_input:
 
-                return  None, message, error,  "", filepath  #just direct return now no callbaccks or specific UI methods on callback functions
+               zip_file, downloaded_dois, failed_dois, logs_text=  await downloader.download_multiple_dois(dois_input,cancel_event)
 
-            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 #just direct return now no callbaccks or specific UI methods on callback functions
+               return zip_file, downloaded_dois, failed_dois, logs_text, None # correct return
+               
             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
+               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="""
@@ -642,12 +615,14 @@ 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.
+                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():