Update app.py

app.py

@@ -356,18 +356,19 @@ class PaperDownloader:
 
                         logger.info(f"Descarga exitosa: {filename}")
                         
-                        progress_callback(filepath, f"Descargado exitosamente: <a href='https://doi.org/{doi}'>{doi}</a>", "", None ) # 4 args with filepath at begin
-
+                        return filepath, f"Descargado exitosamente: <a href='https://doi.org/{doi}'>{doi}</a>", ""
+                        
                         
                    else:
                         logger.warning(f"No se pudo descargar: {doi}")
-                        progress_callback(None, f"No se pudo descargar {doi}", f'<a href="https://doi.org/{doi}">{doi}</a>',  None)
+                        return None, f"No se pudo descargar {doi}", f'<a href="https://doi.org/{doi}">{doi}</a>'
             
-                asyncio.run(call_async()) #added the loop event here
+                filepath, message, error =  asyncio.run(call_async()) #added the loop event here
+                progress_callback(filepath, message, error, None )  # call this once the callback is made
                 
             except CancelledError:
                logger.info(f"Download Cancelled DOI: {doi}")
-               progress_callback(None, f"Download cancelled {doi}","Download Cancelled", None) #send proper types with null values
+               progress_callback(None, f"Download cancelled {doi}","Download Cancelled",  None ) #send proper types with null values
                
             except Exception as e:
                logger.error(f"Error processing {doi}: {e}")
@@ -378,7 +379,7 @@ class PaperDownloader:
             """Download multiple DOIs"""
              # Validar entrada
             if not dois_text:
-                progress_callback(None, "Error: No DOIs provided", "Error: No DOIs provided","", None)
+                progress_callback(None, "Error: No DOIs provided", "Error: No DOIs provided","" , None)
                 return None
 
             # Sanitizar y filtrar DOIs
@@ -387,7 +388,7 @@ class PaperDownloader:
             
             # Validar lista de DOIs
             if not dois:
-                progress_callback(None, "Error: No valid DOIs provided", "Error: No valid DOIs provided","",  None)
+                progress_callback(None, "Error: No valid DOIs provided", "Error: No valid DOIs provided", "" , None)
                 return None
     
             # Listas para rastrear resultados
@@ -397,47 +398,52 @@ class PaperDownloader:
           
 
             for doi in dois:
-                    self._download_single_doi(doi, lambda a,b,c,d: progress_callback(a,b,c, d) , cancel_event )
-                    if cancel_event.is_set():
-                         logger.info("Downloads cancelled on multiple dois download")
-                         progress_callback(None,  "Downloads cancelled","Downloads cancelled","", None) # early return on cancelled
-                         return None #break here when is cancelled
+                 filepath, message, error=  self._download_single_doi(doi, lambda a,b,c,d : progress_callback(a,b,c,d), cancel_event )
+                 if cancel_event.is_set():
+                       logger.info("Downloads cancelled on multiple dois download")
+                       progress_callback(None,  "Downloads cancelled","Downloads cancelled",  None) # early return on cancelled
+                       return None #break here when is cancelled
 
-                    result = self.results_dict.get(doi, (None,None,"", None)) # obtain from self.results
-        
+                 result = self.results_dict.get(doi, (None,None,"", None)) # obtain from self.results
+
+                 if result is None: #when errors happen results are none
+                     continue;
+            
                     # Manejar diferentes tipos de resultados
-                    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:
-                        # Descarga fallida (resultado de download_single_doi_async)
+                
+                 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]
                         
-                        # Generar nombre de archivo único
-                        filename = f"{str(doi).replace('/', '_').replace('.', '_')}.pdf"
-                        filepath_unique = os.path.join(self.output_dir, filename)
+                      # 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)
+                     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>')
+                         # 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:
+                     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:
@@ -453,7 +459,7 @@ class PaperDownloader:
         
 
             # Devolver resultados
-            progress_callback( zip_filename if downloaded_files else None, "\n".join(downloaded_links),"\n".join(failed_dois), "" , None ) # Send null for zip result to fill params
+            progress_callback( zip_filename if downloaded_files else None, "\n".join(downloaded_links),"\n".join(failed_dois),"" ,  None) # send empty values on callback to not break it.
             return
             
     def process_bibtex(self, bib_file, progress_callback, cancel_event):# removed async here
@@ -483,17 +489,19 @@ class PaperDownloader:
             downloaded_files = []
             failed_dois = []
             downloaded_links = []
-
             for doi in dois:
 
-                 self._download_single_doi(doi,  lambda a,b,c, d: progress_callback(a,b,c, d), cancel_event )
+                 filepath, message, error= self._download_single_doi(doi, lambda a,b,c,d: progress_callback(a,b,c,d), cancel_event ) # added lambda for params handling.
                  if cancel_event.is_set():
                        logger.info("Download Cancelled in bibtex mode")
                        progress_callback(None, "Download Cancelled", "Download Cancelled", None)
                        return None #cancel if requested
                        
-                 result = self.results_dict.get(doi, (None,None,"", None)) # obtain from self.results
+                 result = self.results_dict.get(doi, (None,None,"",None)) # obtain from self.results
             
+                 if result is None:
+                    continue # skips for a None type results when callback fails
+
                  if isinstance(result, Exception):
                     # Excepción inesperada
                     error_msg = f"Unexpected error: {str(result)}"
@@ -524,8 +532,7 @@ class PaperDownloader:
                 loop.run_in_executor(self.executor, lambda:  self.create_zip(zip_filename,downloaded_files))
                 logger.info(f"ZIP file created: {zip_filename}")
     
-            progress_callback(zip_filename, "\n".join(downloaded_links), "\n".join(failed_dois), "", None )#added a "", None in order to work correctly on Blocks interface output
-
+            progress_callback(zip_filename, "\n".join(downloaded_links), "\n".join(failed_dois),"")  # send "", None to conform output
             return
 
     def create_zip(self, zip_filename, files):
@@ -547,10 +554,10 @@ def create_gradio_interface():
     downloader.results_dict = {}  #shared results dict, since it runs on different threads
 
     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>")
     
 
-    def download_papers(bib_file, doi_input, dois_input):
+    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
             
@@ -560,49 +567,49 @@ def create_gradio_interface():
                    
                     #store data for single or multiple mode on download_papers execution.
                     if doi:
-                        downloader.results_dict[doi] = (filepath, message,fail_message, "")
-                    
-                    
-                    updates = update_progress(message, fail_message) #send update info.
+                          downloader.results_dict[doi] = (filepath, message,fail_message, "")
 
-                    return updates
+                   
+                    return  update_progress(message, fail_message)  # send return values only with results
 
             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 #add empty string to satisfy 5 out
+                    return  None, "Error: Please upload a .bib file", "Error: Please upload a .bib file", "",  None # must return all 5 results at each possibility
+                     
 
                  downloader.download_task = downloader.executor.submit(
                        downloader.process_bibtex, 
-                        bib_file,
-                       lambda a,b,c, d:  update_progress(a,f"{b}<br>{c}"),  #convert for ui output, the return data will contain the HTML, send 4
+                         bib_file,
+                      lambda a,b,c, d: update_progress(a,f"{b}<br>{c}"),  #convert for ui output, the return data will contain the HTML
                         cancel_event # Added cancelllation event.
                  )
+            
+                 return  None, "","",  "", None #must be None ,str , str, str, None  ( five params)
 
-                 return None,"","", "", None # returns five
 
             elif doi_input:
                  downloader.download_task = downloader.executor.submit( #changed async execution method
-                       downloader._download_single_doi, 
-                       doi_input, 
-                        lambda a,b,c,d: update_progress(a,f"{b}<br>{c}") , #callback function, format output and send html info, removed lambda from executor calls
-                            cancel_event  # Add cancellation event.
-                      )
+                      downloader._download_single_doi, 
+                       doi_input,
+                          lambda a,b,c,d: update_progress(a,f"{b}<br>{c}"),  #callback function, format output and send html info, removed lambda from executor calls
+                           cancel_event  # Add cancellation event.
+                   )
                  
-                 return None,"","", "", None # returns five
-             
+                 return   None, "","", "", None  #must be None ,str , str, str, None  ( five params)
+           
             elif dois_input:
-                downloader.download_task = downloader.executor.submit( #changed async execution method
-                      downloader.download_multiple_dois,
-                         dois_input,
-                      lambda a,b,c, d: update_progress(a,f"{b}<br>{c}"), #callback function
-                         cancel_event #Add cancellation event.
-                  )
-                  
-                return None, "","", "", None #returns five
+                  downloader.download_task = downloader.executor.submit( #changed async execution method
+                        downloader.download_multiple_dois,
+                          dois_input,
+                         lambda a,b,c,d: update_progress(a,f"{b}<br>{c}"), #callback function, return simple values
+                        cancel_event #Add cancellation event.
+                    )
+                
+                  return   None, "","", "", None #must be None ,str , str, str, None  ( five params)
 
             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#returns five
+                  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 be None ,str , str, str, None  ( five params)
         
     
     with gr.Blocks(theme="Hev832/Applio", css="""
@@ -664,7 +671,8 @@ 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"