decouple modules

app.py

@@ -2,10 +2,12 @@ import time
 import schedule
 import threading
 import gradio as gr
-from activate import trigger
-from restart import restart
-from config import *
-from times import *
+from datetime import datetime
+from modules.smtp import send_email
+from modules.activate import trigger
+from modules.times import fix_datetime, time_diff
+from modules.restart import self_restart, test_restart
+from utils import START_TIME, DELAY, PERIOD
 
 
 def run_schedule():
@@ -19,12 +21,12 @@ def run_schedule():
 
 def monitor(period=PERIOD):
     print(f"Monitor is on and triggered every {period}h...")
-    schedule.every(47).hours.do(restart)
+    schedule.every(47).hours.do(self_restart)
     schedule.every(int(period)).hours.do(trigger)
     threading.Thread(target=run_schedule, daemon=True).start()
 
 
-def tasklist():
+def tasklst():
     try:
         outputs = f"Has been running for {time_diff(START_TIME, datetime.now())}"
         jobs = schedule.get_jobs()
@@ -49,7 +51,7 @@ if __name__ == "__main__":
             with gr.Column():
                 gr.Interface(
                     title="See current task status",
-                    fn=tasklist,
+                    fn=tasklst,
                     inputs=None,
                     outputs=gr.TextArea(label="Current task details"),
                     flagging_mode="never",
@@ -64,4 +66,25 @@ if __name__ == "__main__":
                     flagging_mode="never",
                 )
 
+            with gr.Column():
+                gr.Interface(
+                    title="Cookie test",
+                    fn=test_restart,
+                    inputs=gr.Textbox(label="Restart a space with permissions"),
+                    outputs=[
+                        gr.Textbox(label="Status"),
+                        gr.Markdown(container=True, show_label=True, label="Shortcut"),
+                    ],
+                    flagging_mode="never",
+                )
+
+            with gr.Column():
+                gr.Interface(
+                    title="SMTP test",
+                    fn=send_email,
+                    inputs=None,
+                    outputs=gr.Textbox(label="Status"),
+                    flagging_mode="never",
+                )
+
     demo.launch()

activate.py → modules/activate.py

@@ -3,10 +3,11 @@ import time
 import requests
 import threading
 from tqdm import tqdm
+from datetime import datetime
 from huggingface_hub import HfApi
-from smtp import send_email
-from config import *
-from times import *
+from modules.smtp import send_email
+from modules.times import fix_datetime
+from utils import HF_DOMAIN, HEADER, TIMEOUT, MS_DOMAIN, DELAY, USERS
 
 
 def get_space_status(repo_id: str):

modules/restart.py

@@ -0,0 +1,36 @@
+import requests
+from modules.smtp import send_email
+from utils import HF_DOMAIN, HEADER, TIMEOUT, COOKIE
+
+
+def restart_private_space(repo: str):
+    response = requests.post(
+        f"{HF_DOMAIN}/api/spaces/{repo}/restart",
+        headers={
+            "User-Agent": HEADER["User-Agent"],
+            "cookie": COOKIE,
+        },
+        timeout=TIMEOUT,
+    )
+    response.raise_for_status()
+
+
+def self_restart():
+    try:
+        restart_private_space("kakamond/keep_spaces_alive")
+
+    except Exception as e:
+        send_email(f"Failed to self-restart: {e}")
+
+
+def test_restart(repo):
+    status = "Success"
+    url = None
+    try:
+        restart_private_space(repo)
+        url = f"{HF_DOMAIN}/spaces/{repo}"
+
+    except Exception as e:
+        status = f"{e}"
+
+    return status, url

smtp.py → modules/smtp.py

@@ -1,9 +1,9 @@
 import requests
-from config import *
+from utils import EMAIL, SMTP, TAG, HOST, PORT, API
 
 
-def send_email(
-    content,
+def email_api(
+    content: str,
     title="Runtime error detected",
     header="Please fix following repo(s):",
     email=EMAIL,
@@ -29,16 +29,29 @@ def send_email(
             "email": email,  # from
             "mail": target,  # to
             "title": title,  # subject
-            "name": "ksa",  # nickname
+            "name": "Keep Spaces Alive",  # nickname
             "text": body,  # content
         },
     )
     if response.status_code == 200:
         result: dict = response.json()
         if result.get("status") == "success":
-            print("Email sent successfully!")
+            return "Email sent successfully!"
         else:
-            print(f"Failed to send email: {result.get('message')}")
+            raise ConnectionError(f"Failed to send email: {result.get('message')}")
 
     else:
-        print(f"Request failed with status code: {response.status_code}")
+        raise ConnectionError(
+            f"Request failed with status code: {response.status_code}"
+        )
+
+
+def send_email(content="Test SMTP"):
+    status = "Success"
+    try:
+        status = email_api(content)
+
+    except Exception as e:
+        status = f"{e}"
+
+    return status

restart.py

@@ -1,23 +0,0 @@
-import requests
-from smtp import send_email
-from config import *
-
-
-def restart_private_space(repo: str, cookie: str):
-    try:
-        response = requests.post(
-            f"{HF_DOMAIN}/api/spaces/{repo}/restart",
-            headers={
-                "User-Agent": HEADER["User-Agent"],
-                "cookie": cookie,
-            },
-            timeout=TIMEOUT,
-        )
-        response.raise_for_status()
-
-    except Exception as e:
-        send_email(f"{e}", "Restart failure", f"Failed to restart {repo}")
-
-
-def restart():
-    restart_private_space("kakamond/keep_spaces_alive", COOKIE)