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","" )
                 return None
             logger.info(f"Starting download process for DOI: {doi}")
             
@@ -356,29 +356,29 @@ class PaperDownloader:
 
                         logger.info(f"Descarga exitosa: {filename}")
                         
-                        progress_callback(filepath, f"Descargado exitosamente: <a href='https://doi.org/{doi}'>{doi}</a>", "")
+                        progress_callback(filepath, f"Descargado exitosamente: <a href='https://doi.org/{doi}'>{doi}</a>", "",  None)
                         
                         
                    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>')
+                        progress_callback(None, f"No se pudo descargar {doi}", f'<a href="https://doi.org/{doi}">{doi}</a>',  None)
             
                 asyncio.run(call_async()) #added the loop event here
                 
             except CancelledError:
                logger.info(f"Download Cancelled DOI: {doi}")
-               progress_callback(None, f"Download cancelled {doi}","Download Cancelled" )
+               progress_callback(None, f"Download cancelled {doi}","Download Cancelled",  None )
                
             except Exception as e:
                logger.error(f"Error processing {doi}: {e}")
-               progress_callback(None, f"Error processing {doi}: {e}", f"Error processing {doi}: {e}" )
+               progress_callback(None, f"Error processing {doi}: {e}", f"Error processing {doi}: {e}",  None )
                
     
     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","",)
                 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", "")
                 return None
     
             # Listas para rastrear resultados
@@ -397,13 +397,13 @@ class PaperDownloader:
           
 
             for doi in dois:
-                    self._download_single_doi(doi, lambda a,b,c,d: progress_callback(a,b,c,d) , cancel_event ) # changed lambda
+                    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","") # early return on cancelled
                          return None #break here when is cancelled
 
-                    result = self.results_dict.get(doi, (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):
@@ -467,7 +467,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}" )
+                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
@@ -475,7 +475,7 @@ class PaperDownloader:
                 bib_database = bibtexparser.loads(bib_content)
             except Exception as e:
                 logger.error(f"Error parsing BibTeX data: {e}")
-                progress_callback(None,f"Error parsing BibTeX data: {e}", f"Error parsing BibTeX data: {e}")
+                progress_callback(None,f"Error parsing BibTeX data: {e}", f"Error parsing BibTeX data: {e}", None)
                 return None
 
             # Extract DOIs
@@ -489,13 +489,13 @@ class PaperDownloader:
 
             for doi in dois:
 
-                 self._download_single_doi(doi,  lambda a,b,c, d: progress_callback(a,b,c, d), cancel_event ) # changed lambda
+                 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", )
+                       progress_callback(None, "Download Cancelled", "Download Cancelled",  None)
                        return None #cancel if requested
                        
-                 result = self.results_dict.get(doi, (None,None,"")) # obtain from self.results
+                 result = self.results_dict.get(doi, (None,None,"", None)) # obtain from self.results
             
                  if isinstance(result, Exception):
                     # Excepción inesperada
@@ -527,7 +527,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), "") # send 4 vars
+            progress_callback(zip_filename, "\n".join(downloaded_links), "\n".join(failed_dois), "" ) # send 4 parameters to show on log.
             return
 
     def create_zip(self, zip_filename, files):
@@ -562,48 +562,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)
+                          downloader.results_dict[doi] = (filepath, message,fail_message, "")
 
-                    updates = update_progress(message, fail_message)
+                    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", "",""
+                      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,
-                       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.
+                        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
+                        cancel_event # Added cancelllation event.
                  )
-                 
+                
                  return None,"","", "", None # output here correct
            
             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  # output here correct
              
             elif dois_input:
-                downloader.download_task = downloader.executor.submit( #changed async execution method
+                 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
+                       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#output here correct
+            
 
             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#output here correct
 
     
     with gr.Blocks(theme="Hev832/Applio", css="""