Update app.py

app.py

@@ -565,83 +565,49 @@ def create_gradio_interface():
                           downloader.results_dict[doi] = (filepath, message,fail_message)
 
                     updates = update_progress(message,fail_message) #use update function here
-                  
                     return updates
-                
 
             if bib_file:
-                # Check file type
+                 # 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
+
                  downloader.download_task = downloader.executor.submit(
                        downloader.process_bibtex, 
-                         bib_file,
+                        bib_file,
                         lambda a,b,c:  update_progress(a,f"{b}<br>{c}"), #convert for ui output, the return data will contain the HTML
-                         cancel_event # Added cancelllation event.
-                 )
-                 
+                        cancel_event # Added cancelllation event.
+                    )
+                    
                  return None,"","",None
-             
+           
             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: 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.
+                       doi_input, 
+                          lambda a,b,c: 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
-            
+                 
+                  return  None, "","", None
+              
             elif dois_input:
-                downloader.download_task = downloader.executor.submit( #changed async execution method
-                         downloader.download_multiple_dois,
-                           dois_input,
+                 downloader.download_task = downloader.executor.submit( #changed async execution method
+                      downloader.download_multiple_dois,
+                        dois_input,
                        lambda a,b,c: update_progress(a,f"{b}<br>{c}") ,#callback function
-                        cancel_event #Add cancellation event.
-                  )
-                 
-                return  None, "","", None
+                         cancel_event #Add cancellation event.
+                   )
+               
+                 return  None, "","", 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
+                 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
         
 
     
-
-    # Gradio Interface
-    interface = gr.Interface(
-        fn=download_papers,
-        inputs=[
-            gr.File(file_types=['.bib'], label="Upload BibTeX File"),
-            gr.Textbox(label="Enter Single DOI", placeholder="10.xxxx/xxxx"),
-            gr.Textbox(label="Enter Multiple DOIs (one per line)", placeholder="10.xxxx/xxxx\n10.yyyy/yyyy\n..."),
-           
-        ],
-        outputs=[
-            gr.File(label="Download Papers (ZIP) or Single PDF"),
-            gr.Textbox(label="""
-                Found DOIs
-            """),
-             gr.Textbox(label="""
-                Missed DOIs
-            """),
-              gr.Textbox(label="""
-            Logs
-            """, lines = 10),
-            gr.File(label="Downloaded Single PDF")
-        ],
-         
-        title="🔬 Academic Paper Batch Downloader",
-        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.",
-        theme="Hev832/Applio",
-        examples=[
-            ["example.bib", None, None],  # Bibtex File
-            [None, "10.1038/nature12373", None],  # Single DOI
-            [None, None, "10.1109/5.771073\n10.3390/horticulturae8080677"],  # Multiple DOIs
-        ],
-        css="""
+    with gr.Blocks(theme="Hev832/Applio", css="""
         .gradio-container {
             background-color: black;
         }
@@ -660,26 +626,56 @@ def create_gradio_interface():
             .logs_box {
                 
             }
-        """,
-         
-        
-        cache_examples=False,
-    )
-
-    interface.load= """
-      () => {
-        
-        return []
-      }
-     """
-    # Adding clear button
-    with gr.Row():
+        """) as interface:
+            with gr.Row():
+                    with gr.Column():
+                        bib_file = gr.File(file_types=['.bib'], label="Upload BibTeX File")
+                        doi_input = gr.Textbox(label="Enter Single DOI", placeholder="10.xxxx/xxxx")
+                        dois_input = gr.Textbox(label="Enter Multiple DOIs (one per line)", placeholder="10.xxxx/xxxx\n10.yyyy/yyyy\n...")
+                        with gr.Row():
+                                clear_button= gr.ClearButton(value = "Clear") # added a clear button
+                                submit_button= gr.Button(value="Submit")
+                        examples= gr.Examples([
+                             ["example.bib", None, None],  # Bibtex File
+                             [None, "10.1038/nature12373", None],  # Single DOI
+                             [None, None, "10.1109/5.771073\n10.3390/horticulturae8080677"],  # Multiple DOIs
+                        ],
+                            inputs=[bib_file, doi_input, dois_input]
+                        )
+
+                    with gr.Column():
+                         
+                        
+                        output_file = gr.File(label="Download Papers (ZIP) or Single PDF")
+                        downloaded_dois_textbox =  gr.Textbox(label="""
+                           Found DOIs
+                         """,)
+                        failed_dois_textbox=gr.Textbox(label="""
+                          Missed DOIs
+                         """,)
+                        logs =  gr.Textbox(label="""
+                           Logs
+                             """, lines = 10)
+                         
+                        single_file= gr.File(label="Downloaded Single PDF")
+                    
+            
+            with gr.Row():
+                 stop_button = gr.Button(value="Stop Downloads")
           
-           interface.stop_btn= gr.Button(value="Stop Downloads")
-           
-    interface.stop_btn.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.
+           ) 
+           stop_button.click(lambda: downloader.cancel_download(), outputs=None)  # added function in object downloader
+
     
+    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()