Update Dockerfile

Dockerfile

@@ -140,7 +140,7 @@ from pathlib import Path
 from watchdog.observers import Observer
 from watchdog.events import FileSystemEventHandler
 from huggingface_hub import HfApi
-# 删除：from huggingface_hub.utils import tqdm_utils
+import huggingface_hub
 import base64
 from datetime import datetime
 import pytz
@@ -178,54 +178,95 @@ class DataDirectoryHandler(FileSystemEventHandler):
         self.data_directory = data_directory
         self.api = HfApi(token=hf_token)
         self.last_commit_time = 0
-        self.commit_delay = 1
-        self.pending_changes = []
+        self.commit_delay = 1  # 防抖延迟 1 秒
+        self.pending_changes = []  # 缓冲待上传变更
         logger.info(f"初始化监控器，监控目录: {data_directory}，目标仓库: {repo_id}")
     
     def on_any_event(self, event):
+        """捕获所有文件系统事件"""
         if event.is_directory:
             return
         self.pending_changes.append((event.event_type, event.src_path))
         self.schedule_commit(f"文件{event.event_type}")
 
     def schedule_commit(self, change_type):
+        """安排提交任务，带有防抖机制"""
         current_time = time.time()
         if current_time - self.last_commit_time > self.commit_delay:
             self.last_commit_time = current_time
             asyncio.run(self.commit_changes(change_type))
 
     async def commit_changes(self, change_type):
+        """异步提交变更到 Hugging Face Hub，带重试机制 + 版本兼容禁用进度条"""
         max_retries = 3
         retry_delay = 5
         change_summary = f"{change_type} ({len(self.pending_changes)} 文件)"
-        self.pending_changes = []
+        self.pending_changes = []  # 清空缓冲区
+        
         for attempt in range(max_retries):
             try:
                 commit_message = f"自动提交: {change_summary} - {time.strftime('%Y-%m-%d %H:%M:%S')}"
                 logger.info(f"开始上传: {commit_message}")
-                await asyncio.to_thread(
-                    self.api.upload_folder,
-                    folder_path=self.data_directory,
-                    repo_id=self.repo_id,
-                    repo_type="dataset",
-                    commit_message=commit_message,
-                    ignore_patterns=["*.tmp", "*.log", "*.temp", ".git/*"],
-                    disable_progress_bar=True  # 正确禁用进度条
-                )
+
+                # 基础参数
+                upload_kwargs = {
+                    "folder_path": self.data_directory,
+                    "repo_id": self.repo_id,
+                    "repo_type": "dataset",
+                    "commit_message": commit_message,
+                    "ignore_patterns": ["*.tmp", "*.log", "*.temp", ".git/*"]
+                }
+
+                # === 版本兼容：自动选择禁用进度条的方式 ===
+                try:
+                    version_str = huggingface_hub.__version__
+                    version = tuple(map(int, (version_str.split('.') + ['0', '0', '0'])[:3]))
+                    logger.info(f"检测到 huggingface_hub 版本: {version_str}")
+                    
+                    if version >= (0, 25, 0):
+                        # 新版本：使用 disable_progress_bar
+                        upload_kwargs["disable_progress_bar"] = True
+                        logger.info("使用 disable_progress_bar=True 禁用进度条")
+                    
+                    elif version >= (0, 23, 0):
+                        # 旧版本：尝试使用 tqdm_class
+                        try:
+                            from huggingface_hub.utils import tqdm_utils
+                            upload_kwargs["tqdm_class"] = tqdm_utils.DisableTqdm
+                            logger.info("使用 tqdm_class=DisableTqdm 禁用进度条")
+                        except ImportError:
+                            logger.warning("无法导入 tqdm_utils，进度条可能仍会显示（旧版兼容性问题）")
+                    
+                    else:
+                        logger.warning(f"非常旧的 huggingface_hub 版本 {version_str}，无法禁用进度条")
+                
+                except Exception as e:
+                    logger.warning(f"版本检测失败，尝试旧方式禁用进度条: {e}")
+                    try:
+                        from huggingface_hub.utils import tqdm_utils
+                        upload_kwargs["tqdm_class"] = tqdm_utils.DisableTqdm
+                    except:
+                        pass
+
+                # 执行上传
+                await asyncio.to_thread(self.api.upload_folder, **upload_kwargs)
                 logger.info(f"成功提交变更到 Hugging Face Hub: {commit_message}")
                 return
+
             except Exception as e:
                 logger.error(f"提交失败 (尝试 {attempt + 1}/{max_retries}): {e}")
                 if attempt < max_retries - 1:
                     logger.info(f"将在 {retry_delay} 秒后重试...")
                     await asyncio.sleep(retry_delay)
+        
         logger.error(f"达到最大重试次数，上传失败")
 
 def start_directory_monitoring(data_directory="/data", repo_id=None, hf_token=None):
+    """启动目录监控服务"""
     if not hf_token:
         hf_token_encoded = "aGZfcXllTEJnUUtPb2FUbHBMZ0FuTGFGTmJPV2xjUUtJT0VycQ=="
         hf_token = base64.b64decode(hf_token_encoded).decode('utf-8')
-        logger.info(f"HF_TOKEN value: {hf_token}")
+        logger.info(f"HF_TOKEN 已解码（长度: {len(hf_token)}）")
     
     if not repo_id:
         raise ValueError("必须提供 repo_id 参数")
@@ -248,6 +289,7 @@ def start_directory_monitoring(data_directory="/data", repo_id=None, hf_token=No
     return observer
 
 def start_gitea_server(port=7860):
+    """启动 Gitea 服务器"""
     def run_gitea():
         try:
             gitea_process = subprocess.Popen(
@@ -286,6 +328,7 @@ def start_gitea_server(port=7860):
     return gitea_thread
 
 async def main():
+    """主函数 - 启动 Gitea 和目录监控服务，带崩溃重启功能"""
     CONFIG = {
         "data_directory": "/data",
         "repo_id": os.getenv("REPO_ID", "02engine/02gitea"),
@@ -300,13 +343,17 @@ async def main():
         try:
             logger.info(f"启动集成服务 (尝试 {retry_count + 1}/{max_retries})...")
             
+            # 先运行 pullhf.py 拉取最新数据集
             logger.info("运行 pullhf.py 拉取最新数据集")
             pull_result = subprocess.run(["python3", "/pullhf.py"], check=True)
             if pull_result.returncode != 0:
                 logger.error("pullhf.py 执行失败，退出")
                 exit(1)
             
+            # 启动 Gitea 服务器
             gitea_thread = start_gitea_server(CONFIG["gitea_port"])
+            
+            # 启动目录监控服务
             observer = start_directory_monitoring(
                 data_directory=CONFIG["data_directory"],
                 repo_id=CONFIG["repo_id"],
@@ -314,8 +361,8 @@ async def main():
             )
             
             logger.info("所有服务已启动完成！")
-            logger.info("目录监控: /data to Hugging Face Hub")
-            logger.info("Gitea 服务: http://localhost:7860")
+            logger.info("目录监控: /data → Hugging Face Hub")
+            logger.info("Gitea 服务: http://${HF_SPACE_URL:-localhost}:7860")
             logger.info("按 Ctrl+C 停止所有服务")
             
             try: