refine ui

app.py

@@ -26,9 +26,12 @@ def monitor(period=PERIOD):
     threading.Thread(target=run_schedule, daemon=True).start()
 
 
+# UI func
 def tasklst():
+    status = "Success"
+    logs = None
     try:
-        outputs = f"Has been running for {time_diff(START_TIME, datetime.now())}"
+        logs = f"\nHas been running for {time_diff(START_TIME, datetime.now())}\n"
         jobs = schedule.get_jobs()
         for job in jobs:
             last_run = fix_datetime(job.last_run)
@@ -36,53 +39,41 @@ def tasklst():
                 last_run = "never"
 
             next_run = fix_datetime(job.next_run)
-            outputs += f"\n\nEvery {job.interval}h do {job.job_func} (last run: {last_run}, next run: {next_run})"
-
-        return outputs
+            logs += f"\nEvery {job.interval}h do {job.job_func.__name__} (last run: {last_run}, next run: {next_run})\n"
 
     except Exception as e:
-        return f"{e}"
+        status = f"{e}"
+
+    return status, logs
 
 
 if __name__ == "__main__":
     monitor()
     with gr.Blocks() as demo:
-        with gr.Tab("See current task status"):
-            gr.Interface(
-                fn=tasklst,
-                inputs=None,
-                outputs=gr.TextArea(
-                    label="Current task details",
-                    show_copy_button=True,
-                ),
-                flagging_mode="never",
-            )
+        gr.Markdown("# Keep Spaces Alive")
+        with gr.Row():
+            with gr.Column():
+                task_btn = gr.Button("See current task status")
+                once_btn = gr.Button("Trigger once manually")
+                smtp_btn = gr.Button("SMTP test")
+                re_txt = gr.Textbox(
+                    label="Restart a gradio space with permissions",
+                    placeholder="username/repo",
+                )
+                re_btn = gr.Button("Restart")
 
-        with gr.Tab("Trigger once manually"):
-            gr.Interface(
-                fn=trigger,
-                inputs=None,
-                outputs=gr.TextArea(label="Activation logs", show_copy_button=True),
-                flagging_mode="never",
-            )
+            with gr.Column():
+                status_bar = gr.Textbox(label="Status", show_copy_button=True)
+                gr.Markdown("Logs")
+                logs_bar = gr.Markdown(container=True, show_copy_button=True)
 
-        with gr.Tab("Cookie test"):
-            gr.Interface(
+            task_btn.click(fn=tasklst, outputs=[status_bar, logs_bar])
+            once_btn.click(fn=trigger, outputs=[status_bar, logs_bar])
+            smtp_btn.click(fn=send_email, outputs=[status_bar, logs_bar])
+            re_btn.click(
                 fn=test_restart,
-                inputs=gr.Textbox(label="Restart a gradio space with permissions"),
-                outputs=[
-                    gr.Textbox(label="Status", show_copy_button=True),
-                    gr.Markdown(),
-                ],
-                flagging_mode="never",
-            )
-
-        with gr.Tab("SMTP test"):
-            gr.Interface(
-                fn=send_email,
-                inputs=None,
-                outputs=gr.Textbox(label="Status", show_copy_button=True),
-                flagging_mode="never",
+                inputs=[re_txt],
+                outputs=[status_bar, logs_bar],
             )
 
     demo.launch()

modules/activate.py

@@ -123,7 +123,10 @@ def activate_studio(repo: str, holding_delay=5):
         print(e)
 
 
+# UI func
 def trigger(users=USERS):
+    status = "Success"
+    logs = None
     try:
         spaces, studios, failures = [], [], []
         usernames = users.split(";")
@@ -153,11 +156,11 @@ def trigger(users=USERS):
             ).start()
             time.sleep(DELAY)
 
-        log = (
+        logs = (
             "\n".join(spaces + studios)
-            + f"\n[{fix_datetime(datetime.now())}] Activation complete!"
+            + f"\n[{fix_datetime(datetime.now())}] Activation complete!\n"
         )
-        print(log)
+        print(logs)
         content = ""
         for failure in failures:
             errepo: str = failure
@@ -167,7 +170,7 @@ def trigger(users=USERS):
         if content:
             send_email(content)
 
-        return log
-
     except Exception as e:
-        return f"{e}"
+        status = f"{e}"
+
+    return status, logs

modules/restart.py

@@ -13,24 +13,25 @@ def restart_private_space(repo: str):
         timeout=TIMEOUT,
     )
     response.raise_for_status()
+    return f"\n{response.text}\n"
 
 
 def self_restart():
     try:
         restart_private_space("kakamond/keep_spaces_alive")
-
     except Exception as e:
         send_email(f"Failed to self-restart: {e}")
 
 
+# UI func
 def test_restart(repo):
     status = "Success"
-    url = None
+    logs = None
     try:
-        restart_private_space(repo)
-        url = f"{HF_DOMAIN}/spaces/{repo}"
+        logs = restart_private_space(repo)
+        logs += f"\nSuccessfully restart {HF_DOMAIN}/spaces/{repo}\n"
 
     except Exception as e:
         status = f"{e}"
 
-    return status, url
+    return status, logs

modules/smtp.py

@@ -46,12 +46,15 @@ def email_api(
         )
 
 
+# UI func
 def send_email(content="Test SMTP"):
     status = "Success"
+    logs = None
     try:
         status = email_api(content)
+        logs = f"\nEmail content: {content}\n"
 
     except Exception as e:
         status = f"{e}"
 
-    return status
+    return status, logs

utils.py

@@ -6,11 +6,11 @@ API = os.getenv("api")
 EMAIL = os.getenv("email")
 SMTP = os.getenv("smtp")
 COOKIE = os.getenv("cookie")
-if not (PERIOD and USERS and API and EMAIL and SMTP and COOKIE):
-    print("Please check the environment variables!")
-    exit()
-else:
-    PERIOD = int(PERIOD)
+# if not (PERIOD and USERS and API and EMAIL and SMTP and COOKIE):
+#     print("Please check the environment variables!")
+#     exit()
+# else:
+#     PERIOD = int(PERIOD)
 
 TAG = os.getenv("target")
 if not TAG: