Update ff.py

ff.py

@@ -12,7 +12,7 @@ import pytz
 
 
 BACKUP_TIME = os.environ.get('BACKUP_TIME', '1200')# 备份时间 10800秒 2小时
-
+BACKUP_TIME = 30
 HF_USER1 = os.environ.get('HF_USER1', '')# HF 备份仓库的用户名
 HF_REPO	= os.environ.get('HF_REPO', '')#HF 备份的Models仓库名
 HF_EMAIL = os.environ.get('HF_EMAIL', '') #HF的邮箱
@@ -44,7 +44,7 @@ def get_latest_local_package(directory, pattern='*.tar.gz'):
     except Exception as e:
         print(f"获取最新包时发生错误: {e}")
         return None
-def compress_folder(folder_path, output_dir):
+def compress_folder(folder_path, output_dir, keep_count=3):
     try:
         # 确保输出目录存在
         os.makedirs(output_dir, exist_ok=True)
@@ -60,7 +60,7 @@ def compress_folder(folder_path, output_dir):
         timestamp = str(int(datetime.now(china_tz).timestamp() * 1000))
         output_path = os.path.join(output_dir, f'{timestamp}.tar.gz')
         
-        # 获取已存在的压缩包
+        # 获取所有压缩包
         existing_archives = glob.glob(os.path.join(output_dir, '*.tar.gz'))
         
         # 安全地提取时间戳
@@ -69,15 +69,22 @@ def compress_folder(folder_path, output_dir):
             match = re.search(r'(\d+)\.tar\.gz$', filename)
             return int(match.group(1)) if match else 0
         
-        # 如果压缩包数量超过5个，删除最旧的
-        if len(existing_archives) >= 3:
-            # 按时间戳排序
+        # 如果压缩包数量超过保留数量，删除最旧的
+        if len(existing_archives) >= keep_count:
+            # 按时间戳排序（从小到大，最旧的在前面）
             existing_archives.sort(key=extract_timestamp)
             
+            # 计算需要删除的数量
+            delete_count = len(existing_archives) - keep_count + 1
+            
             # 删除最旧的压缩包
-            oldest_archive = existing_archives[0]
-            os.remove(oldest_archive)
-            print(f"删除最旧的压缩包：{oldest_archive}")
+            for i in range(delete_count):
+                oldest_archive = existing_archives[i]
+                try:
+                    os.remove(oldest_archive)
+                    print(f"删除最旧的压缩包：{os.path.basename(oldest_archive)}")
+                except Exception as e:
+                    print(f"删除失败 {oldest_archive}: {e}")
         
         # tar.gz 压缩
         result = subprocess.run(
@@ -97,6 +104,7 @@ def compress_folder(folder_path, output_dir):
             print(f"压缩成功：{output_path}")
             print(f"压缩大小：{file_size:.2f} MB")
             print(f"压缩时间：{formatted_time}")
+            print(f"保留策略：最多保留 {keep_count} 个备份包")
             
             # 返回压缩包名和大小信息
             return f"{os.path.basename(output_path)} MB：{file_size:.2f} MB TIME：{formatted_time}"
@@ -134,8 +142,9 @@ def github(type):
         print(f"开始备份上传HF仓库：{HF_REPO}")
         os.system("mkdir -p /data/f")
         os.system("cp -rf /data/ff /data/f")
+        os.system('git lfs prune')
         # 备份上传仓库
-        new_archive_info = compress_folder('/data/f', f'/data/{HF_REPO}')
+        new_archive_info = compress_folder('/data/f', f'/data/{HF_REPO}', keep_count=3)
         if new_archive_info:
             new_archive, file_size_info = new_archive_info.split(' MB：')
             os.chdir(f'/data/{HF_REPO}')
@@ -144,6 +153,7 @@ def github(type):
             os.system(f'git commit -m "{file_size_info}"')
             # os.system('git push -u origin main')
             os.system('git push -f origin main')
+            os.system('git gc --prune=now')
         else:
             print("压缩失败，无法提交")
 
@@ -200,5 +210,5 @@ if os.path.exists('/data/ff/.mozilla/firefox/profiles.ini') and os.path.isfile('
         result = restart_huggingface_space(HF_USER2, HF_ID, HF_TOKON2)
         print(result)
         # break
-github(2)
+# github(2)
 # nv1_agent()