Update ff.py

ff.py

@@ -9,26 +9,27 @@ import psutil
 import glob
 import re
 import pytz
+import requests
 
+BACKUP_TIME = os.environ.get('BACKUP_TIME', '1200')  # 备份时间 10800秒 2小时
+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的邮箱
+HF_TOKEN1 = os.environ.get('HF_TOKEN1', '')  # HF备份账号的TOKEN
+
+HF_USER2 = os.environ.get('HF_USER2', '')  # huggingface 用户名
+HF_ID = os.environ.get('HF_ID', '')  # huggingface space 名
+HF_TOKEN2 = os.environ.get('HF_TOKON2', '')  # huggingface TOKEN
 
-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的邮箱
-HF_TOKEN1 = os.environ.get('HF_TOKEN1', '')#HF备份账号的TOKEN
 
-HF_USER2 = os.environ.get('HF_USER2', '')# huggingface 用户名
-HF_ID = os.environ.get('HF_ID', '')# huggingface space 名
-HF_TOKEN2 = os.environ.get('HF_TOKON2', '')# huggingface TOKEN
-#JUPYTER_TOKEN  
 def cf():
     os.system("rm -r /data/cf")
     os.system("wget -O '/data/cf' -q 'https://github.com/cloudflare/cloudflared/releases/download/2025.9.0/cloudflared-linux-amd64'")
     os.system("chmod +x  /data/cf")
     # hf-ff.ql02.ggff.net
-    os.system('/data/cf tunnel run --token eyJhIjoiZWM1MTk5ZTYwZGYxYWI2YmM2OTdhMGYzMTAzYzY4NTUiLCJ0IjoiOTY0NDIwODgtN2RkOS00Y2IwLThhMDEtYTI1YzZmMjAwZjBlIiwicyI6Ik9XSmpNVFpsTjJZdE5UWTRNQzAwTW1VMkxUaGxaREV0T1RRNU1EZzROVFV3T0dFeiJ9')
-threading.Thread(target=cf, daemon=True).start()
+    os.system('/data/cf tunnel run --token eyJhIjoiZWM1MTk5ZTYwZGYxYWI2YmM2OTdhMGYzMTA3YzY4NTUiLCJ0IjoiOTY0NDIwODgtN2RkOS00Y2IwLThhMDEtYTI1YzZmMjAwZjBlIiwicyI6Ik9XSmpNVFpsTjJZdE5UWTRNQzAwTW1VMkxUaGxaREV0T1RRNU1EZzROVFV3T0dFeiJ9')
+
+
 def get_latest_local_package(directory, pattern='*.tar.gz'):
     try:
         # 构建完整的搜索路径
@@ -50,15 +51,169 @@ def get_latest_local_package(directory, pattern='*.tar.gz'):
     except Exception as e:
         print(f"获取最新包时发生错误: {e}")
         return None
+
+
+def delete_huggingface_lfs_file(filename, repo_id, token):
+    """
+    通过Hugging Face API删除LFS文件记录
+    """
+    try:
+        # 1. 查询LFS文件列表
+        url = f"https://huggingface.co/api/models/{repo_id}/lfs-files"
+        headers = {
+            "content-type": "application/json",
+            "Authorization": f"Bearer {token}",
+            "user-agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36"
+        }
+        
+        response = requests.get(url, headers=headers)
+        if response.status_code != 200:
+            print(f"查询LFS文件失败: {response.status_code} - {response.text}")
+            return False
+        
+        lfs_files = response.json()
+        
+        # 2. 查找匹配的文件
+        file_to_delete = None
+        for file_info in lfs_files:
+            if file_info.get('filename') == filename:
+                file_to_delete = file_info
+                break
+        
+        if not file_to_delete:
+            print(f"未找到对应的LFS文件记录: {filename}")
+            return False
+        
+        # 3. 删除LFS文件记录
+        file_oid = file_to_delete['fileOid']
+        delete_url = f"https://huggingface.co/api/models/{repo_id}/lfs-files/{file_oid}?rewriteHistory=true"
+        
+        delete_response = requests.delete(delete_url, headers=headers)
+        if delete_response.status_code == 200:
+            print(f"成功删除LFS文件记录: {filename} (OID: {file_oid})")
+            return True
+        else:
+            print(f"删除LFS文件记录失败: {delete_response.status_code} - {delete_response.text}")
+            return False
+            
+    except Exception as e:
+        print(f"删除LFS文件记录时出错: {e}")
+        return False
+
+
+def safe_git_cleanup(repo_path, files_to_remove):
+    """
+    安全的Git清理，不会影响现有的备份文件
+    """
+    try:
+        original_dir = os.getcwd()
+        os.chdir(repo_path)
+        
+        print(f"执行安全Git清理: {files_to_remove}")
+        
+        # 1. 首先确保工作目录是干净的
+        result = subprocess.run(['git', 'status', '--porcelain'], capture_output=True, text=True)
+        if result.stdout.strip():
+            print("工作目录有未提交的更改，先提交...")
+            subprocess.run(['git', 'add', '.'], capture_output=True)
+            subprocess.run(['git', 'commit', '-m', '自动提交: 清理前的更改'], capture_output=True)
+        
+        # 2. 只从Git索引中删除指定的文件，但不影响工作目录中的文件
+        for filename in files_to_remove:
+            if os.path.exists(filename):
+                print(f"从Git索引中删除 {filename} (文件仍保留在工作目录)")
+                subprocess.run(['git', 'rm', '--cached', filename], capture_output=True)
+            else:
+                print(f"文件 {filename} 不存在于工作目录，只清理Git引用")
+        
+        # 3. 提交删除操作
+        if files_to_remove:
+            subprocess.run(['git', 'commit', '-m', f'清理已删除的文件: {", ".join(files_to_remove)}'], capture_output=True)
+        
+        # 4. 执行GC清理但不删除最近的文件
+        subprocess.run(['git', 'gc', '--auto'], capture_output=True)
+        subprocess.run(['git', 'lfs', 'prune'], capture_output=True)
+        
+        print("安全Git清理完成")
+        os.chdir(original_dir)
+        return True
+        
+    except Exception as e:
+        print(f"安全Git清理时出错: {e}")
+        os.chdir(original_dir)
+        return False
+
+
+def get_remote_lfs_files(repo_id, token):
+    """
+    获取远程所有的LFS文件列表
+    """
+    try:
+        url = f"https://huggingface.co/api/models/{repo_id}/lfs-files"
+        headers = {
+            "content-type": "application/json",
+            "Authorization": f"Bearer {token}",
+            "user-agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36"
+        }
+        
+        response = requests.get(url, headers=headers)
+        if response.status_code == 200:
+            return response.json()
+        else:
+            print(f"获取远程LFS文件失败: {response.status_code}")
+            return []
+    except Exception as e:
+        print(f"获取远程LFS文件时出错: {e}")
+        return []
+
+
+def cleanup_orphaned_lfs_references(repo_path, repo_id, token, keep_count=3):
+    """
+    清理孤儿LFS引用：删除远程存在但本地不存在的文件引用
+    """
+    try:
+        original_dir = os.getcwd()
+        os.chdir(repo_path)
+        
+        print("检查孤儿LFS引用...")
+        
+        # 获取远程LFS文件
+        remote_files = get_remote_lfs_files(repo_id, token)
+        if not remote_files:
+            print("无法获取远程LFS文件列表")
+            return
+        
+        # 获取本地文件
+        local_files = set(glob.glob('*.tar.gz'))
+        
+        # 找出远程存在但本地不存在的文件
+        orphaned_files = []
+        for remote_file in remote_files:
+            filename = remote_file.get('filename')
+            if filename and filename not in local_files:
+                orphaned_files.append(filename)
+        
+        if orphaned_files:
+            print(f"发现孤儿LFS引用: {orphaned_files}")
+            
+            # 删除这些孤儿引用
+            for filename in orphaned_files:
+                print(f"删除孤儿LFS引用: {filename}")
+                delete_huggingface_lfs_file(filename, repo_id, token)
+        
+        print("孤儿LFS引用清理完成")
+        os.chdir(original_dir)
+        
+    except Exception as e:
+        print(f"清理孤儿LFS引用时出错: {e}")
+        os.chdir(original_dir)
+
+
 def compress_folder(folder_path, output_dir, keep_count=3):
     try:
         # 确保输出目录存在
         os.makedirs(output_dir, exist_ok=True)
         
-        # 使用 pytz 获取中国时区的当前时间戳（毫秒级）
-        import pytz
-        from datetime import datetime
-        
         # 设置中国时区
         china_tz = pytz.timezone('Asia/Shanghai')
         
@@ -71,10 +226,11 @@ def compress_folder(folder_path, output_dir, keep_count=3):
         
         # 安全地提取时间戳
         def extract_timestamp(filename):
-            # 提取文件名中的数字部分
             match = re.search(r'(\d+)\.tar\.gz$', filename)
             return int(match.group(1)) if match else 0
         
+        files_to_cleanup = []
+        
         # 如果压缩包数量超过保留数量，删除最旧的
         if len(existing_archives) >= keep_count:
             # 按时间戳排序（从小到大，最旧的在前面）
@@ -86,15 +242,31 @@ def compress_folder(folder_path, output_dir, keep_count=3):
             # 删除最旧的压缩包
             for i in range(delete_count):
                 oldest_archive = existing_archives[i]
+                oldest_filename = os.path.basename(oldest_archive)
+                
                 try:
+                    # 删除本地文件
                     os.remove(oldest_archive)
-                    print(f"删除最旧的压缩包：{os.path.basename(oldest_archive)}")
+                    print(f"删除最旧的压缩包：{oldest_filename}")
+                    
+                    # 记录需要清理的文件名
+                    files_to_cleanup.append(oldest_filename)
+                    
+                    # 删除Hugging Face LFS文件记录
+                    print(f"正在删除Hugging Face LFS文件记录: {oldest_filename}")
+                    delete_huggingface_lfs_file(oldest_filename, f"{HF_USER1}/{HF_REPO}", HF_TOKEN1)
+                        
                 except Exception as e:
                     print(f"删除失败 {oldest_archive}: {e}")
         
+        # 如果有文件需要从Git历史中清理，执行安全清理
+        if files_to_cleanup:
+            print(f"执行安全Git清理: {files_to_cleanup}")
+            safe_git_cleanup(output_dir, files_to_cleanup)
+        
         # tar.gz 压缩
         result = subprocess.run(
-            ['tar', '-czvf', output_path, folder_path], 
+            ['tar', '-czf', output_path, folder_path], 
             capture_output=True, 
             text=True
         )
@@ -124,8 +296,6 @@ def compress_folder(folder_path, output_dir, keep_count=3):
         return None
 
 
-# 调用函数
-# new_archive = compress_folder('/data/dv1', 'nezha-hf')
 def github(type):
     if type == 1:
         os.system(f'rm -rf /data/{HF_REPO} /data/ff /data/data') 
@@ -138,33 +308,56 @@ def github(type):
         os.system("ls")
         latest_package = get_latest_local_package(f'/data/{HF_REPO}')
         print(f"最新压缩包路径: {latest_package}")
-        # tar -xzvf /data/firefox/1760199222945.tar.gz -C /data
-        os.system(f"tar -xzf {latest_package} -C /data")
-        os.system("mv /data/f/ff /data/")
-        os.system("mv /data/data/f/ff /data/")
-        os.system("rm -rf /data/data /data/f")
+        if latest_package:
+            os.system(f"tar -xzf {latest_package} -C /data")
+            os.system("mv /data/f/ff /data/")
+            os.system("mv /data/data/f/ff /data/")
+            os.system("rm -rf /data/data /data/f")
     
     if type == 2:
         print(f"开始备份上传HF仓库：{HF_REPO}")
         os.system("mkdir -p /data/f")
         os.system("cp -rf /data/ff /data/f")
+        
+        repo_path = f'/data/{HF_REPO}'
+        repo_id = f"{HF_USER1}/{HF_REPO}"
+        
+        # 切换到仓库目录
+        os.chdir(repo_path)
+        
+        # 先清理孤儿LFS引用
+        cleanup_orphaned_lfs_references(repo_path, repo_id, HF_TOKEN1, keep_count=3)
+        
+        # 执行Git清理（不影响现有文件）
         os.system('git lfs prune')
+        os.system('git gc --auto')
+        
         # 备份上传仓库
-        new_archive_info = compress_folder('/data/f', f'/data/{HF_REPO}', keep_count=3)
+        new_archive_info = compress_folder('/data/f', repo_path, keep_count=3)
         if new_archive_info:
             new_archive, file_size_info = new_archive_info.split(' MB：')
-            os.chdir(f'/data/{HF_REPO}')
+            
             os.system("pwd")
             os.system(f'git add .')
             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')
+            
+            # 正常推送（不再需要强制推送）
+            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')
+            
+            # 轻度清理
+            os.system('git gc --auto')
+            os.system('git lfs prune')
         else:
             print("压缩失败，无法提交")
 
+
 def _reconstruct_token(partial_token):
     return partial_token.replace(" ", "")
+
 def restart_huggingface_space(space_name, space_id, partial_token):
     token = _reconstruct_token(partial_token)
     url = f"https://huggingface.co/api/spaces/{space_name}/{space_id}/restart?factory=true"
@@ -186,25 +379,28 @@ def restart_huggingface_space(space_name, space_id, partial_token):
             "success": False,
             "message": str(e)
         }
+
+
 def check_system_resources():
     time.sleep(120)
     cpu_usage = psutil.cpu_percent(interval=1)
     memory = psutil.virtual_memory()
     memory_usage = memory.percent
-    # if cpu_usage >= 90:
     if cpu_usage >= 90 or memory_usage >= 95:
         print("占用过高")
-        result = restart_huggingface_space(HF_USER2, HF_ID, HF_TOKON2)
+        result = restart_huggingface_space(HF_USER2, HF_ID, HF_TOKEN2)
         print(result)
     else:
         print("系统资源正常")
-   
+
+
 def repeat_task():
     print('备份线程启动')
     while True:
         print(f"打包时间：{BACKUP_TIME} 秒")
-        time.sleep(int(BACKUP_TIME))# 2小时
+        time.sleep(int(BACKUP_TIME))
         github(2)
+
 github(1)
 
 if os.path.exists('/data/ff/.mozilla/firefox/profiles.ini') and os.path.isfile('/data/ff/.mozilla/firefox/profiles.ini'):
@@ -215,6 +411,6 @@ if os.path.exists('/data/ff/.mozilla/firefox/profiles.ini') and os.path.isfile('
         github(2)
         result = restart_huggingface_space(HF_USER2, HF_ID, HF_TOKON2)
         print(result)
-        # break
+        break
 # github(2)
 # nv1_agent()