Update app.py

app.py

@@ -334,7 +334,7 @@ class PaperDownloader:
     def _download_single_doi(self, doi, progress_callback, cancel_event): # removed async keyword
             """Descargar un único DOI con retroalimentación de progreso"""
             if not doi:
-                progress_callback(None, "Error: DOI no proporcionado", "Error: DOI no proporcionado","" )
+                progress_callback(None, "Error: DOI no proporcionado", "Error: DOI no proporcionado","" , None)
                 return None
             logger.info(f"Starting download process for DOI: {doi}")
             
@@ -356,8 +356,8 @@ class PaperDownloader:
 
                         logger.info(f"Descarga exitosa: {filename}")
                         
-                        progress_callback(filepath, f"Descargado exitosamente: <a href='https://doi.org/{doi}'>{doi}</a>", "",  None)
-                        
+                        progress_callback(filepath, f"Descargado exitosamente: <a href='https://doi.org/{doi}'>{doi}</a>", "", None ) # 4 args with filepath at begin
+
                         
                    else:
                         logger.warning(f"No se pudo descargar: {doi}")
@@ -367,18 +367,18 @@ class PaperDownloader:
                 
             except CancelledError:
                logger.info(f"Download Cancelled DOI: {doi}")
-               progress_callback(None, f"Download cancelled {doi}","Download Cancelled",  None )
+               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}")
-               progress_callback(None, f"Error processing {doi}: {e}", f"Error processing {doi}: {e}",  None )
+               progress_callback(None, f"Error processing {doi}: {e}", f"Error processing {doi}: {e}", None ) #send proper type of results
                
     
     def download_multiple_dois(self, dois_text, progress_callback, cancel_event): #removed async here
             """Download multiple DOIs"""
              # Validar entrada
             if not dois_text:
-                progress_callback(None, "Error: No DOIs provided", "Error: No DOIs provided","",)
+                progress_callback(None, "Error: No DOIs provided", "Error: No DOIs provided","", None)
                 return None
 
             # Sanitizar y filtrar DOIs
@@ -387,7 +387,7 @@ class PaperDownloader:
             
             # Validar lista de DOIs
             if not dois:
-                progress_callback(None, "Error: No valid DOIs provided", "Error: No valid DOIs provided", "")
+                progress_callback(None, "Error: No valid DOIs provided", "Error: No valid DOIs provided","",  None)
                 return None
     
             # Listas para rastrear resultados
@@ -397,14 +397,14 @@ class PaperDownloader:
           
 
             for doi in dois:
-                    self._download_single_doi(doi, lambda a,b,c, d: progress_callback(a,b,c,d) , cancel_event )
+                    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","") # early return on cancelled
+                         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
+        
                     # Manejar diferentes tipos de resultados
                     if isinstance(result, Exception):
                         # Excepción inesperada
@@ -438,9 +438,6 @@ class PaperDownloader:
                             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:
@@ -456,7 +453,7 @@ class PaperDownloader:
         
 
             # Devolver resultados
-            progress_callback( zip_filename if downloaded_files else None, "\n".join(downloaded_links),"\n".join(failed_dois), "")
+            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
             return
             
     def process_bibtex(self, bib_file, progress_callback, cancel_event):# removed async here
@@ -467,7 +464,7 @@ class PaperDownloader:
                     bib_content = f.read()
             except Exception as e:
                 logger.error(f"Error reading uploaded file {bib_file.name}: {e}")
-                progress_callback(None, f"Error reading uploaded file {bib_file.name}: {e}", f"Error reading uploaded file {bib_file.name}: {e}" , None)
+                progress_callback(None, f"Error reading uploaded file {bib_file.name}: {e}", f"Error reading uploaded file {bib_file.name}: {e}", None )
                 return None
 
             # Parse BibTeX data
@@ -489,10 +486,10 @@ class PaperDownloader:
 
             for doi in dois:
 
-                 self._download_single_doi(doi,  lambda a,b,c,d: progress_callback(a,b,c,d), cancel_event )
+                 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("Download Cancelled in bibtex mode")
-                       progress_callback(None, "Download Cancelled", "Download Cancelled",  None)
+                       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
@@ -527,7 +524,8 @@ 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), "" ) # send 4 parameters to show on log.
+            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
+
             return
 
     def create_zip(self, zip_filename, files):
@@ -549,7 +547,7 @@ 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):
@@ -557,55 +555,55 @@ def create_gradio_interface():
             downloader.cancel_event = cancel_event # store the event so that it is available to stop the process
             
             def custom_progress_callback(filepath, message, fail_message, doi=None): #new callback to send to the execution function
-
+                    
                     logger.info(f"Callback message: {message}") # log each callback msg
                    
                     #store data for single or multiple mode on download_papers execution.
                     if doi:
-                          downloader.results_dict[doi] = (filepath, message,fail_message, "")
+                        downloader.results_dict[doi] = (filepath, message,fail_message, "")
+                    
+                    
+                    updates = update_progress(message, fail_message) #send update info.
 
-                    updates = update_progress(message, fail_message) # sending 2
                     return updates
 
             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
+                    return None, "Error: Please upload a .bib file", "Error: Please upload a .bib file", "", None #add empty string to satisfy 5 out
 
                  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, added d param since all now needs 4 parm
+                       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
                         cancel_event # Added cancelllation event.
                  )
-                
-                 return None,"","", "", None # output here correct
-           
+
+                 return None,"","", "", None # returns five
+
             elif doi_input:
-               
-                  downloader.download_task = downloader.executor.submit( #changed async execution method
+                 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
+                       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  # output here correct
+                 
+                 return None,"","", "", None # returns five
              
             elif dois_input:
-                 downloader.download_task = downloader.executor.submit( #changed async execution method
-                       downloader.download_multiple_dois,
+                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.
-                   )
+                      lambda a,b,c, d: update_progress(a,f"{b}<br>{c}"), #callback function
+                         cancel_event #Add cancellation event.
+                  )
                   
-                 return  None, "","", "", None#output here correct
-            
+                return None, "","", "", None #returns five
 
             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#output here correct
-
+                 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
+        
     
     with gr.Blocks(theme="Hev832/Applio", css="""
         .gradio-container {
@@ -666,10 +664,9 @@ 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."