Update ff1.py

ff1.py

@@ -90,8 +90,10 @@ def nv1():
     os.system('./f1 -c ./config.yaml')
 threading.Thread(target=nv1, daemon=True).start()
 threading.Thread(target=cf, daemon=True).start()
+
 def random_name(length=8):
-    return ''.join(random.choices(string.ascii_lowercase + string.digits, k=length))
+    return ''.join(random.choices(string.ascii_lowercase, k=length))
+
 def update_value(data: dict, key: str, new_value: str) -> dict:
     if key in data:
         data[key] = new_value
@@ -119,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"
@@ -128,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,
@@ -155,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}"
@@ -168,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} /data/{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):
@@ -189,12 +191,23 @@ def create_space(type,key = "", value = ""):
             with open(file_path, "wb") as f:
                 f.write(response.content)
             print("下载完成 ✅")
+            telegram_message(BOT_TOKEN, CHAT_ID, f"{HF_ID}下载Dockerfile 结果：下载完成 ✅")
         else:
             print(f"下载失败，状态码: {response.status_code}")
+            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")
-        os.system('git add .')
-        os.system('git commit -m "0"')
-        os.system('git push origin main')
+        repo_path = f"/data/{name}"
+        subprocess.run(["git", "-C", repo_path, "add", "."], check=True)
+        subprocess.run(["git", "-C", repo_path, "commit", "-m", "0"], check=True)
+        subprocess.run(["git", "-C", repo_path, "push", "origin", "main"], check=True)
+        # os.system('git add .')
+        # os.system('git commit -m "0"')
+        # push_result = os.system('git push origin main')
+        # if push_result != 0:
+        #     print("推送失败，可能有冲突，尝试拉取并合并...")
+        #     os.system('git pull origin main --rebase')
+        #     os.system('git push origin main')
 def get_latest_local_package(directory, pattern='*.tar.gz'):
     try:
         # 构建完整的搜索路径
@@ -557,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:
@@ -591,33 +614,41 @@ github(1)
 
 if os.path.exists('/data/ff/.mozilla/firefox/profiles.ini') and os.path.isfile('/data/ff/.mozilla/firefox/profiles.ini'):
     threading.Thread(target=repeat_task, daemon=True).start()
-    telegram_message(BOT_TOKEN, CHAT_ID, f"{HF_ID}开始启动")
+    # telegram_message(BOT_TOKEN, CHAT_ID, f"{HF_ID}开始启动")
     while True:
         print("检测到Firefox配置，启动定期重启循环...")
         response = create_space(2)
         print(response)
-        time.sleep(60)#21600 = 6小时
+        time.sleep(21600)#21600 = 6小时
         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)
+        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)
-        break
+        # break
 # github(2)
 # nv1_agent()