Update ff.py

ff.py

@@ -121,8 +121,8 @@ def telegram_message(bot_token: str, chat_id: str, message: str):
         return response.json()
     except Exception:
         return {"status_code": response.status_code, "text": response.text}
-tmp_name = random_name()
-def create_space(type,key = "", value = ""):
+
+def create_space(type,key = "", value = "",name = ""):
     if type == 1:
         # 创建spaces
         url = "https://huggingface.co/api/repos/create"
@@ -130,9 +130,9 @@ def create_space(type,key = "", value = ""):
             "Content-Type": "application/json",
             "Authorization": f"Bearer {HF_TOKON2}"
         }
-        
+        name = random_name()
         payload = {
-        "name": tmp_name,
+        "name": name,
         "type": "space",
         "private": True,
         "sleepTimeSeconds": 172800,
@@ -157,7 +157,7 @@ def create_space(type,key = "", value = ""):
         return response.text
     if type == 3:
         # 创建spaces 变量
-        url = f"https://huggingface.co/api/spaces/{HF_USER2}/{tmp_name}/secrets"
+        url = f"https://huggingface.co/api/spaces/{HF_USER2}/{name}/secrets"
         headers = {
             "Content-Type": "application/json",
             "Authorization": f"Bearer {HF_TOKON2}"
@@ -170,15 +170,15 @@ def create_space(type,key = "", value = ""):
         response = requests.post(url, headers=headers, json=payload)
         return response.text
     if type == 4:
-        file_path = f"/data/{tmp_name}/Dockerfile"
+        file_path = f"/data/{name}/Dockerfile"
         os.system("rm -rf {HF_SPACES_NAME}")
-        git = f"git clone https://{HF_USER2}:{HF_TOKON2}@huggingface.co/spaces/{HF_USER2}/{tmp_name}"
+        git = f"git clone https://{HF_USER2}:{HF_TOKON2}@huggingface.co/spaces/{HF_USER2}/{name}"
         url = "https://huggingface.co/datasets/Qilan2/ff/raw/main/Dockerfile"
         print(git)
         os.system(git)
         os.system(f'git config --global user.email "{HF_EMAIL2}"')
         os.system(f'git config --global user.name "{HF_USER2}"') 
-        os.chdir(f'/data/{tmp_name}')
+        os.chdir(f'/data/{name}')
         time.sleep(3)
         # 如果文件已存在，先删除
         if os.path.exists(file_path):
@@ -197,7 +197,7 @@ def create_space(type,key = "", value = ""):
             telegram_message(BOT_TOKEN, CHAT_ID, f"{HF_ID}下载Dockerfile下载失败，状态码: {response.status_code}")
         
         # os.system(f"wget -O '/data/{tmp_name}/Dockerfile' https://huggingface.co/datasets/Qilan2/ff/raw/main/Dockerfile")
-        repo_path = f"/data/{tmp_name}"
+        repo_path = f"/data/{name}"
         subprocess.run(["git", "-C", repo_path, "add", "."], check=True)
         subprocess.run(["git", "-C", repo_path, "commit", "-m", commit_message], check=True)
         subprocess.run(["git", "-C", repo_path, "push", "origin", "main"], check=True)
@@ -570,23 +570,33 @@ def check_system_resources():
     memory_usage = memory.percent
     if cpu_usage >= 90 or memory_usage >= 95:
         print("占用过高")
+        telegram_message(BOT_TOKEN, CHAT_ID, f"{HF_ID}CUP 内存占用过高，开始重启")
         response = create_space(1)
-        print(response)
-        create_space(3,"BACKUP_TIME",BACKUP_TIME)
-        create_space(3,"HF_USER1",HF_USER1)
-        create_space(3,"HF_REPO",HF_REPO)
-        create_space(3,"HF_EMAIL",HF_EMAIL)
-        create_space(3,"HF_TOKEN1",HF_TOKEN1)
-        create_space(3,"HF_USER2",HF_USER2)
-        create_space(3,"HF_EMAIL2",HF_EMAIL2)
-        create_space(3,"HF_ID",tmp_name)
-        create_space(3,"HF_TOKON2",HF_TOKON2)
-        create_space(3,"UUID",UUID)
-        create_space(3,"N_SERVER","z.282820.xyz:443")
-        create_space(3,"CHAT_ID",CHAT_ID)
-        create_space(3,"BOT_TOKEN",BOT_TOKEN)
-        create_space(3,"HF_SPACES_NAME",HF_ID)
-        create_space(4)
+        full_name = response["name"]
+        tmp_name = full_name.split("/")[-1]
+        log = f"“原始创建Space返回：{response} name字段:{full_name} Space 名称{tmp_name}"
+        telegram_message(BOT_TOKEN, CHAT_ID, log)
+        print(log)
+        create_space(3,"BACKUP_TIME",BACKUP_TIME,tmp_name)
+        create_space(3,"HF_USER1",HF_USER1,tmp_name)
+        create_space(3,"HF_REPO",HF_REPO,tmp_name)
+        create_space(3,"HF_EMAIL",HF_EMAIL,tmp_name)
+        create_space(3,"HF_TOKEN1",HF_TOKEN1,tmp_name)
+        create_space(3,"HF_USER2",HF_USER2,tmp_name)
+        create_space(3,"HF_EMAIL2",HF_EMAIL2,tmp_name)
+        create_space(3,"HF_ID",tmp_name,tmp_name)
+        create_space(3,"HF_TOKON2",HF_TOKON2,tmp_name)
+        create_space(3,"UUID",UUID,tmp_name)
+        create_space(3,"N_SERVER","z.282820.xyz:443",tmp_name)
+        create_space(3,"CHAT_ID",CHAT_ID,tmp_name)
+        create_space(3,"BOT_TOKEN",BOT_TOKEN,tmp_name)
+        create_space(3,"HF_SPACES_NAME",HF_ID,tmp_name)
+        time.sleep(2)
+        create_space(4,"","",tmp_name)
+        time.sleep(2)
+        result = restart_huggingface_space(HF_USER2, tmp_name, HF_TOKON2)
+        print(f"{tmp_name}重启结果：",result)
+        
         # result = restart_huggingface_space(HF_USER2, HF_ID, HF_TOKON2)
         # print(result)
     else:
@@ -610,25 +620,32 @@ if os.path.exists('/data/ff/.mozilla/firefox/profiles.ini') and os.path.isfile('
         response = create_space(2)
         print(response)
         time.sleep(20)#21600 = 6小时
-        # github(2)
+        github(2)
         response = create_space(1)
-        print(response)
-        create_space(3,"BACKUP_TIME",BACKUP_TIME)
-        create_space(3,"HF_USER1",HF_USER1)
-        create_space(3,"HF_REPO",HF_REPO)
-        create_space(3,"HF_EMAIL",HF_EMAIL)
-        create_space(3,"HF_TOKEN1",HF_TOKEN1)
-        create_space(3,"HF_USER2",HF_USER2)
-        create_space(3,"HF_EMAIL2",HF_EMAIL2)
-        create_space(3,"HF_ID",tmp_name)
-        create_space(3,"HF_TOKON2",HF_TOKON2)
-        create_space(3,"UUID",UUID)
-        create_space(3,"N_SERVER","z.282820.xyz:443")
-        create_space(3,"CHAT_ID",CHAT_ID)
-        create_space(3,"BOT_TOKEN",BOT_TOKEN)
-        create_space(3,"HF_SPACES_NAME",HF_ID)
-        create_space(4)
-        create_space(4)
+        full_name = response["name"]
+        tmp_name = full_name.split("/")[-1]
+        log = f"“原始创建Space返回：{response} name字段:{full_name} Space 名称{tmp_name}"
+        telegram_message(BOT_TOKEN, CHAT_ID, log)
+        print(log)
+        create_space(3,"BACKUP_TIME",BACKUP_TIME,tmp_name)
+        create_space(3,"HF_USER1",HF_USER1,tmp_name)
+        create_space(3,"HF_REPO",HF_REPO,tmp_name)
+        create_space(3,"HF_EMAIL",HF_EMAIL,tmp_name)
+        create_space(3,"HF_TOKEN1",HF_TOKEN1,tmp_name)
+        create_space(3,"HF_USER2",HF_USER2,tmp_name)
+        create_space(3,"HF_EMAIL2",HF_EMAIL2,tmp_name)
+        create_space(3,"HF_ID",tmp_name,tmp_name)
+        create_space(3,"HF_TOKON2",HF_TOKON2,tmp_name)
+        create_space(3,"UUID",UUID,tmp_name)
+        create_space(3,"N_SERVER","z.282820.xyz:443",tmp_name)
+        create_space(3,"CHAT_ID",CHAT_ID,tmp_name)
+        create_space(3,"BOT_TOKEN",BOT_TOKEN,tmp_name)
+        create_space(3,"HF_SPACES_NAME",HF_ID,tmp_name)
+        time.sleep(2)
+        create_space(4,"","",tmp_name)
+        time.sleep(2)
+        result = restart_huggingface_space(HF_USER2, tmp_name, HF_TOKON2)
+        print(f"{tmp_name}重启结果：",result)
         telegram_message(BOT_TOKEN, CHAT_ID, f"{HF_ID}启动结束")
         # result = restart_huggingface_space(HF_USER2, HF_ID, HF_TOKON2)
         # print(result)