Minor bug fixes

app/main.py

@@ -1,4 +1,3 @@
-import asyncio
 import queue
 import threading
 
@@ -11,7 +10,7 @@ import uuid
 import zipfile
 from datetime import datetime
 from pathlib import Path
-from time import time
+from time import time, sleep
 
 from dotenv import load_dotenv
 import torch
@@ -94,18 +93,17 @@ def gr_error_wrapper(func):
     return wrapper
 
 
-async def query_job_status(job_id):
+def query_job_status(job_id):
     stop = False
-    interval = 3  # Check every 3 seconds for better responsiveness
+    interval = 3
     retry = 0
-
+    gr.Info('Start querying job status...')
     while not stop:
-        # Wait for a short interval before checking again
-        await asyncio.sleep(interval)  # Non-blocking sleep
+        sleep(interval)
         job = job_db.job_lookup(job_id)
 
         if job:  # If the job exists
-            if job['status'] == "RUNNING":  # If the job is still running
+            if job['status'] == "RUNNING":
                 yield {
                     pred_lookup_status: f'''
         Your job (ID: **{job['id']}**) started at **{job['start_time']}** and is **RUNNING...**
@@ -114,35 +112,36 @@ async def query_job_status(job_id):
         You may keep the page open or close it and revisit later using the job ID.
         You will receive an email notification once the job is done.
         ''',
-                    pred_lookup_btn: gr.update(visible=False),
-                    pred_lookup_stop_btn: gr.update(visible=True),
+                    pred_lookup_btn: gr.Button(visible=False),
+                    pred_lookup_stop_btn: gr.Button(visible=True),
+                    result_example: gr.Button(visible=False),
                 }
 
-            elif job['status'] == "COMPLETED":  # If the job is complete
+            elif job['status'] == "COMPLETED":
                 stop = True
                 msg = f"Your job (ID: {job['id']}) has been **COMPLETED**"
                 msg += f" at **{job['end_time']}**" if job.get('end_time') else ""
                 msg += f" and the results will **EXPIRE** by **{job['expiry_time']}**." if job.get('expiry_time') else "."
                 msg += " Redirecting to the results page..."
-
                 yield {
                     pred_lookup_status: msg,
                     tabs: gr.Tabs(selected='result'),
                     result_state: job,
-                    pred_lookup_btn: gr.update(visible=True),
-                    pred_lookup_stop_btn: gr.update(visible=False),
+                    pred_lookup_btn: gr.Button(visible=True),
+                    pred_lookup_stop_btn: gr.Button(visible=False),
+                    result_example: gr.Button(visible=True),
                 }
 
-            elif job['status'] == "FAILED":  # If the job failed
+            elif job['status'] == "FAILED":
                 stop = True
                 msg = f'Your job (ID: {job_id}) has **FAILED**'
                 msg += f" at {job['end_time']}" if job.get('end_time') else ''
                 msg += f" due to error: {job['error']}." if job.get('error') else '.'
-
                 yield {
                     pred_lookup_status: msg,
-                    pred_lookup_btn: gr.update(visible=True),
-                    pred_lookup_stop_btn: gr.update(visible=False),
+                    pred_lookup_btn: gr.Button(visible=True),
+                    pred_lookup_stop_btn: gr.Button(visible=False),
+                    result_example: gr.Button(visible=True),
                 }
 
         else:  # If the job is not found
@@ -155,11 +154,11 @@ async def query_job_status(job_id):
             retry += 1
             yield {
                 pred_lookup_status: msg,
-                pred_lookup_btn: gr.update(visible=stop),
-                pred_lookup_stop_btn: gr.update(visible=not stop),
+                pred_lookup_btn: gr.Button(visible=stop),
+                pred_lookup_stop_btn: gr.Button(visible=not stop),
+                result_example: gr.Button(visible=stop),
             }
 
-
 def checkbox_group_selections_to_kwargs(selected_options, option_mapping):
     kwargs = {
         option_mapping[label]: label in selected_options
@@ -555,6 +554,7 @@ with gr.Blocks(theme=THEME, title='GenFBDD', css=static.CSS, delete_cache=(3600,
                             label='Input Your Job ID', placeholder='e.g., e9dfd149-3f5c-48a6-b797-c27d027611ac',
                             info="Your job ID is a UUID4 string that you receive after submitting a job on the "
                                  "page or in the email notification.")
+                        result_example = gr.Button('Example', elem_classes=['example'])
                         pred_lookup_btn = gr.Button(value='Query Status', variant='primary', visible=True)
                         pred_lookup_stop_btn = gr.Button(value='Stop Tracking', variant='stop', visible=False)
                         pred_lookup_status = gr.Markdown("**Job Status**", container=True)
@@ -569,7 +569,6 @@ with gr.Blocks(theme=THEME, title='GenFBDD', css=static.CSS, delete_cache=(3600,
                     with gr.Row():
                         scores = gr.CheckboxGroup(list(fn.SCORE_MAP.keys()), label='Compound Scores')
                         filters = gr.CheckboxGroup(list(fn.FILTER_MAP.keys()), label='Compound Filters')
-                        result_example = gr.Button('Example', elem_classes=['example'])
                     with gr.Row():
                         prop_clr_btn = gr.ClearButton(value='Clear Properties', interactive=False)
                         prop_calc_btn = gr.Button(value='Calculate Properties', interactive=False, variant='primary')
@@ -775,10 +774,10 @@ with gr.Blocks(theme=THEME, title='GenFBDD', css=static.CSS, delete_cache=(3600,
             gr.update(visible=True),
         ],
         outputs=[pred_lookup_status, pred_lookup_btn, pred_lookup_stop_btn],
-    ).success(
+    ).then(
         fn=query_job_status,
         inputs=[pred_lookup_id],
-        outputs=[pred_lookup_status, tabs, result_state, pred_lookup_btn, pred_lookup_stop_btn],
+        outputs=[pred_lookup_status, tabs, result_state, pred_lookup_btn, pred_lookup_stop_btn, result_example],
         show_progress='minimal',
     )
 
@@ -789,32 +788,32 @@ with gr.Blocks(theme=THEME, title='GenFBDD', css=static.CSS, delete_cache=(3600,
             gr.update(visible=True),
         ],
         outputs=[pred_lookup_status, pred_lookup_btn, pred_lookup_stop_btn],
-    ).success(
+    ).then(
         fn=query_job_status,
         inputs=pred_lookup_id,
-        outputs=[pred_lookup_status, tabs, result_state, pred_lookup_btn, pred_lookup_stop_btn],
+        outputs=[pred_lookup_status, tabs, result_state, pred_lookup_btn, pred_lookup_stop_btn, result_example],
         show_progress='minimal',
         cancels=[user_job_lookup],
     )
 
-    pred_lookup_stop_btn.click(
-        fn=lambda: [gr.Button(visible=True), gr.Button(visible=False)],
-        outputs=[pred_lookup_btn, pred_lookup_stop_btn],
-        cancels=[user_job_lookup, auto_job_lookup],
-    )
-
     result_example.click(
         fn=lambda: '80cf2658-7a1c-48d6-8372-61b978177fe6',
         outputs=[pred_lookup_id],
         show_progress='hidden'
-    ).success(
+    ).then(
         fn=query_job_status,
         inputs=pred_lookup_id,
-        outputs=[pred_lookup_status, tabs, result_state, pred_lookup_btn, pred_lookup_stop_btn],
+        outputs=[pred_lookup_status, tabs, result_state, pred_lookup_btn, pred_lookup_stop_btn, result_example],
         show_progress='minimal',
         cancels=[user_job_lookup, auto_job_lookup],
     )
 
+    pred_lookup_stop_btn.click(
+        fn=lambda: [gr.Button(visible=True), gr.Button(visible=False), gr.Button(visible=True)],
+        outputs=[pred_lookup_btn, pred_lookup_stop_btn, result_example],
+        cancels=[user_job_lookup, auto_job_lookup],
+    )
+
     ### Results
     def update_results(result_info):
         result_dir = Path(result_info['output_dir'])
@@ -927,5 +926,4 @@ demo.launch(
     max_file_size="5mb",
     ssr_mode=False,
     show_api=False,
-    enable_monitoring=True,
 )

app/static.py

@@ -136,7 +136,7 @@ CSS = """
   text-decoration: underline;
   box-shadow: none;
   text-align: left !important;
-  display: inline-block !important;
+  display: block; 
 }
 
 footer {