Upload app.py

app.py

@@ -1,9 +1,6 @@
 import os
 import re
-import json
 import time
-import random
-import string
 import requests
 import schedule
 import gradio as gr
@@ -12,26 +9,30 @@ from tqdm import tqdm
 from functools import partial
 from datetime import datetime, timedelta
 
+# import json
+# import random
+# import string
+
 TIMEOUT = 15
 DELAY = 1
 
 
-def start_monitor(url: str):
-    payload = {
-        "data": ["", ""],
-        "event_data": None,  # 使用None来表示null
-        "fn_index": 0,
-        "trigger_id": 11,
-        "session_hash": "".join(
-            random.choice(string.ascii_lowercase) for _ in range(11)
-        ),
-    }
-    response = requests.post(f"{url}/queue/join?", json=payload)
-    # 检查请求是否成功
-    if response.status_code == 200:
-        return "monitoring"
+# def start_monitor(url: str):
+#     payload = {
+#         "data": ["", ""],
+#         "event_data": None,  # 使用None来表示null
+#         "fn_index": 0,
+#         "trigger_id": 11,
+#         "session_hash": "".join(
+#             random.choice(string.ascii_lowercase) for _ in range(11)
+#         ),
+#     }
+#     response = requests.post(f"{url}/queue/join?", json=payload)
+#     # 检查请求是否成功
+#     if response.status_code == 200:
+#         return "monitoring"
 
-    return "running"
+#     return "running"
 
 
 def add_six_hours(match):
@@ -46,47 +47,47 @@ def fix_datetime(text: str):
     return re.sub(datetime_pattern, add_six_hours, text)
 
 
-def get_studios(username: str):
-    # 请求负载
-    payload = {
-        "PageNumber": 1,
-        "PageSize": 1000,
-        "Name": "",
-        "SortBy": "gmt_modified",
-        "Order": "desc",
-    }
-    try:
-        # 发送PUT请求
-        response = requests.put(
-            f"https://www.modelscope.cn/api/v1/studios/{username}/list",
-            data=json.dumps(payload),
-            headers={
-                "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/58.0.3029.110 Safari/537.3"
-            },
-            timeout=TIMEOUT,
-        )
-        # 检查请求是否成功
-        response.raise_for_status()
-        # 解析JSON响应
-        spaces: list = response.json()["Data"]["Studios"]
-        if spaces:
-            studios = []
-            for space in spaces:
-                studios.append(
-                    f"https://www.modelscope.cn/api/v1/studio/{username}/{space['Name']}/start_expired"
-                )
-
-            return studios
-
-    except requests.exceptions.Timeout as errt:
-        print(f"请求超时: {errt}, retrying...")
-        time.sleep(DELAY)
-        return get_studios(username)
-
-    except Exception as err:
-        print(f"请求发生错误: {err}")
-
-    return []
+# def get_studios(username: str):
+#     # 请求负载
+#     payload = {
+#         "PageNumber": 1,
+#         "PageSize": 1000,
+#         "Name": "",
+#         "SortBy": "gmt_modified",
+#         "Order": "desc",
+#     }
+#     try:
+#         # 发送PUT请求
+#         response = requests.put(
+#             f"https://www.modelscope.cn/api/v1/studios/{username}/list",
+#             data=json.dumps(payload),
+#             headers={
+#                 "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/58.0.3029.110 Safari/537.3"
+#             },
+#             timeout=TIMEOUT,
+#         )
+#         # 检查请求是否成功
+#         response.raise_for_status()
+#         # 解析JSON响应
+#         spaces: list = response.json()["Data"]["Studios"]
+#         if spaces:
+#             studios = []
+#             for space in spaces:
+#                 studios.append(
+#                     f"https://www.modelscope.cn/api/v1/studio/{username}/{space['Name']}/start_expired"
+#                 )
+
+#             return studios
+
+#     except requests.exceptions.Timeout as errt:
+#         print(f"请求超时: {errt}, retrying...")
+#         time.sleep(DELAY)
+#         return get_studios(username)
+
+#     except Exception as err:
+#         print(f"请求发生错误: {err}")
+
+#     return []
 
 
 def get_spaces(username: str):
@@ -130,8 +131,8 @@ def activate_space(url: str):
         if ".hf.space" in url:
             response = requests.get(url, timeout=TIMEOUT)
             response.raise_for_status()
-            if "-keep-spaces-active.hf.space" in url:
-                status = start_monitor(url)
+            # if "-keep-spaces-active.hf.space" in url:
+            #     status = start_monitor(url)
 
         else:
             response = requests.put(url, timeout=TIMEOUT)
@@ -181,27 +182,28 @@ def activate(hf_users: str, ms_users: str):
     if not ms_users:
         ms_users = hf_users
 
-    spaces, monitors, studios, output = [], [], [], []
+    # spaces, monitors, studios, output = [], [], [], []
+    spaces, output = [], []
     hf_usernames = hf_users.split(";")
-    ms_usernames = ms_users.split(";")
+    # ms_usernames = ms_users.split(";")
     for user in tqdm(hf_usernames, desc="Collecting spaces..."):
         username = user.strip()
         if username:
             spaces += get_spaces(username)
             time.sleep(DELAY)
 
-    for space in spaces:
-        if "keep-spaces-active" in space:
-            monitors.append(space)
-        else:
-            studios.append(space)
+    # for space in spaces:
+    #     if "keep-spaces-active" in space:
+    #         monitors.append(space)
+    #     else:
+    #         studios.append(space)
 
-    spaces = monitors + studios
-    for user in tqdm(ms_usernames, desc="Collecting studios..."):
-        username = user.strip()
-        if username:
-            spaces += get_studios(username)
-            time.sleep(DELAY)
+    # spaces = monitors + studios
+    # for user in tqdm(ms_usernames, desc="Collecting studios..."):
+    #     username = user.strip()
+    #     if username:
+    #         spaces += get_studios(username)
+    #         time.sleep(DELAY)
 
     for space in tqdm(spaces, desc="Activating spaces..."):
         output.append(
@@ -218,7 +220,11 @@ def activate(hf_users: str, ms_users: str):
     return pd.DataFrame(output)
 
 
-def monitor(hf_users: str, ms_users: str, period=4):
+def monitor(
+    hf_users: str = os.getenv("hf_users"),
+    ms_users: str = os.getenv("hf_users"),
+    period=4,
+):
     if schedule.get_jobs():
         return
 
@@ -248,22 +254,24 @@ def listasks():
 
 
 if __name__ == "__main__":
+    # monitor(None, None)
     with gr.Blocks() as demo:
         gr.Interface(
             title="Start keeping all spaces active periodically",
             fn=monitor,
             inputs=[
-                gr.Textbox(
-                    label="HuggingFace",
-                    placeholder="Usernames joint by ;",
-                ),
-                gr.Textbox(
-                    label="ModelScope",
-                    placeholder="Usernames joint by ;",
-                ),
+                # gr.Textbox(
+                #     label="HuggingFace",
+                #     placeholder="Usernames joint by ;",
+                # ),
+                # gr.Textbox(
+                #     label="ModelScope",
+                #     placeholder="Usernames joint by ;",
+                # ),
             ],
-            outputs=None,
+            outputs="text",
             flagging_mode="never",
+            live=True,
         )
 
         gr.Interface(