Update server2.py

server2.py

@@ -628,25 +628,27 @@ def SillyTavern():
     os.chdir('/')
     print(f"kaggle datasets download {huggingface_name}/{huggingface_Data_name}")
     # os.system(f"kaggle datasets download {huggingface_name}/{huggingface_Data_name}")
+    download_n = 0
     while True:
         # 执行下载命令
+        if download_n > 6:
+            break
         os.system(f"kaggle datasets download {huggingface_name}/{huggingface_Data_name} -p /")
         # 检查文件是否存在
         if os.path.exists(f'/{huggingface_Data_name}.zip'):
             print(f"{huggingface_Data_name}.zip 下载成功！")
             break  # 跳出循环
-    
         print(f"{huggingface_Data_name}.zip 下载失败，正在重试...")
-    
-        time.sleep(5)  # 等待一段时间再重试（例如5秒
+        download_n += 1
+        time.sleep(300)  # 等待一段时间再重试（例如5秒
     # os.system('kaggle datasets download xovale7506/sillytavern-data2')
     # 检查文件是否存在
     if not os.path.exists(f'/{huggingface_Data_name}.zip'):
         print(f"文件 /{huggingface_Data_name}.zip 不存在，启用实时同步。")
         generate_ssh_key()
         copy_public_key_to_remote(ssh_url, ssh_port, "root", "qilan")
+        subprocess.run(f"rsync -avz --timeout=600 -e 'ssh -p {ssh_port} -o StrictHostKeyChecking=no' root@{ssh_url}:{data_folder}/ {data_folder}/",shell=True, check=True)
         # subprocess.run(f"rsync -avz --port=7075 ljj@{frp_url}::qilan {data_folder}/", shell=True, check=True)
-        subprocess.run(f"rsync -avz -e 'ssh -p {ssh_port} -o StrictHostKeyChecking=no -o ConnectTimeout=30' --timeout=300 root@{ssh_url}:{data_folder}/ {data_folder}/", shell=True, check=True)
         # sys.exit()
     else: