upd app

app.py

@@ -1,3 +1,4 @@
+import os
 import json
 import time
 import requests
@@ -40,7 +41,7 @@ def get_studios(username: str):
             studios = []
             for space in spaces:
                 studios.append(
-                    f"https://www.modelscope.cn/studios/{username}/{space['Name']}"
+                    f"https://www.modelscope.cn/api/v1/studio/{username}/{space['Name']}/start_expired"
                 )
 
             return studios
@@ -156,6 +157,12 @@ def activate_space(url: str):
 
 
 def activate(hf_users: str, ms_users: str):
+    if not hf_users:
+        hf_users = os.getenv("hf_users")
+
+    if not ms_users:
+        ms_users = os.getenv("ms_users")
+
     hf_usernames = hf_users.split(";")
     ms_usernames = ms_users.split(";")
     spaces = []
@@ -173,7 +180,7 @@ def activate(hf_users: str, ms_users: str):
 
     output = []
     for space in tqdm(spaces, desc="Activating spaces..."):
-        output.append({"space": space, "status": activate_space(space)})
+        output.append({"space": space.split("/")[-1], "status": activate_space(space)})
         time.sleep(DELAY)
 
     print("Activation complete!")
@@ -184,6 +191,12 @@ def monitor(hf_users: str, ms_users: str, period=3):
     if schedule.get_jobs():
         return
 
+    if not hf_users:
+        hf_users = os.getenv("hf_users")
+
+    if not ms_users:
+        ms_users = os.getenv("ms_users")
+
     print(f"监控开启中...每 {period} 小时触发")
     fixed_activate = partial(activate, hf_users=hf_users, ms_users=ms_users)
     schedule.every(period).hours.do(fixed_activate)
@@ -195,7 +208,7 @@ def monitor(hf_users: str, ms_users: str, period=3):
 def list_tasks():
     jobs = schedule.get_jobs()
     if jobs:
-        return f"{jobs}".replace("[", "").replace("]", "")
+        return f"{jobs[0]}"
 
     return "None"
 
@@ -205,8 +218,14 @@ with gr.Blocks() as iface:
         title="Start keeping all spaces active periodically",
         fn=monitor,
         inputs=[
-            gr.Textbox(label="HuggingFace", value="monet-joe;MuGeminorum;ccmusic-database", placeholder="Usernames joint by ;"),
-            gr.Textbox(label="ModelScope", value="monetjoe;MuGeminorum;ccmusic", placeholder="Usernames joint by ;"),
+            gr.Textbox(
+                label="HuggingFace",
+                placeholder="Usernames joint by ;",
+            ),
+            gr.Textbox(
+                label="ModelScope",
+                placeholder="Usernames joint by ;",
+            ),
         ],
         outputs=None,
         allow_flagging=False,
@@ -222,8 +241,14 @@ with gr.Blocks() as iface:
         title="Test activation for all spaces once",
         fn=activate,
         inputs=[
-            gr.Textbox(label="HuggingFace", value="monet-joe;MuGeminorum;ccmusic-database", placeholder="Usernames joint by ;"),
-            gr.Textbox(label="ModelScope", value="monetjoe;MuGeminorum;ccmusic", placeholder="Usernames joint by ;"),
+            gr.Textbox(
+                label="HuggingFace",
+                placeholder="Usernames joint by ;",
+            ),
+            gr.Textbox(
+                label="ModelScope",
+                placeholder="Usernames joint by ;",
+            ),
         ],
         outputs=gr.Dataframe(label="Activated spaces"),
         allow_flagging=False,