Update server6.py

server6.py

@@ -621,69 +621,124 @@ def SillyTavern():
     os.system(f"rm -r /a /sillytavern /*.zi* {data_folder}")
     os.system(f"mkdir -p {data_folder}")
     os.chdir('/')
-    print(f"kaggle datasets download {huggingface_name}/{huggingface_Data_name}")
-    # os.system(f"kaggle datasets download {huggingface_name}/{huggingface_Data_name}")
+    print(f"开始下载 kaggle 数据集 {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 下载失败，正在重试...")
-        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)
-        # sys.exit()
+    max_retries = 5  # 修改为5次尝试
+    download_success = False
+    
+    while download_n < max_retries:
+        try:
+            # 使用subprocess.run捕获命令的输出和错误
+            result = subprocess.run(
+                f"kaggle datasets download {huggingface_name}/{huggingface_Data_name} -p /",
+                shell=True,
+                check=False,  # 不要在失败时抛出异常
+                stdout=subprocess.PIPE,
+                stderr=subprocess.PIPE
+            )
+            
+            # 检查文件是否存在
+            if os.path.exists(f'/{huggingface_Data_name}.zip'):
+                print(f"{huggingface_Data_name}.zip 下载成功！")
+                download_success = True
+                break  # 跳出循环
+            
+            # 输出错误信息
+            print(f"下载尝试 {download_n+1}/{max_retries} 失败")
+            if result.stderr:
+                print(f"错误信息: {result.stderr.decode('utf-8', errors='replace')}")
+                
+            download_n += 1
+            
+            if download_n < max_retries:
+                wait_time = 60  # 减少等待时间以加快失败后的切换
+                print(f"等待 {wait_time} 秒后重试...")
+                time.sleep(wait_time)
+            
+        except Exception as e:
+            print(f"下载过程中发生错误: {str(e)}")
+            download_n += 1
+            if download_n < max_retries:
+                print(f"等待 60 秒后重试...")
+                time.sleep(60)
+    
+    # 检查文件是否存在，如果不存在则使用rsync同步
+    if not download_success or not os.path.exists(f'/{huggingface_Data_name}.zip'):
+        print(f"下载 {huggingface_Data_name}.zip 失败 {max_retries} 次，切换到rsync同步")
+        os.system("mkdir -p /root/SillyTavern")
+        try:
+            print("开始生成SSH密钥...")
+            generate_ssh_key()
+            print("复制SSH密钥到远程服务器...")
+            copy_public_key_to_remote(ssh_url, ssh_port, "root", "qilan")
+            print(f"开始从 {ssh_url}:{ssh_port} 同步数据到 {data_folder}")
+            # 添加进度显示
+            rsync_cmd = f"rsync -avz --progress --stats --timeout=600 -e 'ssh -p {ssh_port} -o StrictHostKeyChecking=no' root@{ssh_url}:{data_folder}/ {data_folder}/"
+            print(f"执行命令: {rsync_cmd}")
+            subprocess.run(rsync_cmd, shell=True, check=True)
+            print("rsync同步完成")
+        except subprocess.CalledProcessError as e:
+            print(f"rsync同步失败: {e.returncode}")
+            if e.stdout:
+                print(f"输出: {e.stdout}")
+            if e.stderr:
+                print(f"错误: {e.stderr}")
+            print("尝试再次生成SSH密钥并重试...")
+            generate_ssh_key()
+            try:
+                subprocess.run(rsync_cmd, shell=True, check=True)
+                print("第二次rsync同步完成")
+            except subprocess.CalledProcessError as e2:
+                print(f"第二次rsync同步也失败: {e2}")
     else:
-        
         # 如果文件存在，可以继续执行后续代码
         print(f"文件 /{huggingface_Data_name}.zip 存在，继续执行程序。")
-    # # 解压 sillytavern.zip
-        # os.system("rm *.zip")
-        os.system("ls /")
-        os.system(f"7z x /{huggingface_Data_name}.zip -o/ -y")
-        # os.system("mv /sillytavern.zip1 /sillytavern.zip")
-        # os.system("7z x /sillytavern.zip -o/sillytavern -y")
-        os.system("mv /sillytavern.tck sillytavern.tar.gz")
-        os.system("mv /sillytavern.ctk sillytavern.tar.gz")
-        # os.system("tar -xvpf /sillytavern.tar.gz -C / --use-compress-program=pigz")
-        os.system(f"tar -xvpf /sillytavern.tar.gz -C / --use-compress-program=pigz > /dev/null")
-        # os.system("pv /sillytavern.tar.gz | tar -xvpf - -C / --use-compress-program=pigz")
-
-        
-        os.chdir(data_folder)
-        # os.system('git merge --abort')
-        # os.system('git reset --hard')
-        # os.system('git pull --rebase --autostash')
-        print('更新文件')
-        os.system(f"ls {data_folder}")
-        os.system("nvm install node")
-        os.system("nvm use node")
-        os.system("npm install -y")
+        # 解压文件
         try:
-            subprocess.run(f'yes | sh {data_folder}/start.sh', shell=True, check=True)
-        except subprocess.CalledProcessError as e:
-            print(f"Command '{e.cmd}' returned non-zero exit status {e.returncode}.")
-            print("Output:", e.output)
-        os.system(f"ls {data_folder}")
-        
-        
-        backup_thread = threading.Thread(target=Run_SillyTavern, daemon=True)
-        backup_thread.start()
-        os.system(f"rm -r /{huggingface_Data_name}.zip /sillytavern.tar.gz")
-
-    print('-----------SillyTavern结束-------------')  
+            os.system("ls /")
+            print("开始解压文件...")
+            os.system(f"7z x /{huggingface_Data_name}.zip -o/ -y")
+            os.system("mv /sillytavern.tck sillytavern.tar.gz 2>/dev/null || true")
+            os.system("mv /sillytavern.ctk sillytavern.tar.gz 2>/dev/null || true")
+            
+            # 检查tar.gz文件是否存在
+            if os.path.exists("/sillytavern.tar.gz"):
+                print("开始解压tar.gz文件...")
+                os.system(f"tar -xvpf /sillytavern.tar.gz -C / --use-compress-program=pigz > /dev/null")
+                print("tar.gz文件解压完成")
+            else:
+                print("警告: sillytavern.tar.gz文件不存在")
+            
+            os.chdir(data_folder)
+            print('更新文件')
+            os.system(f"ls {data_folder}")
+            os.system("nvm install node")
+            os.system("nvm use node")
+            os.system("npm install -y")
+            
+            try:
+                print("尝试启动SillyTavern...")
+                subprocess.run(f'yes | sh {data_folder}/start.sh', shell=True, check=True)
+            except subprocess.CalledProcessError as e:
+                print(f"启动失败: {e.returncode}")
+                print(f"命令: {e.cmd}")
+                if hasattr(e, 'output') and e.output:
+                    print(f"输出: {e.output}")
+            
+            os.system(f"ls {data_folder}")
+            
+            # 启动后台线程
+            backup_thread = threading.Thread(target=Run_SillyTavern, daemon=True)
+            backup_thread.start()
+            # 清理下载的文件
+            print("清理临时文件...")
+            os.system(f"rm -r /{huggingface_Data_name}.zip /sillytavern.tar.gz 2>/dev/null || true")
+        except Exception as e:
+            print(f"解压或启动过程中发生错误: {str(e)}")
+
+    print('-----------SillyTavern结束-------------')
 threading.Thread(target=SillyTavern, daemon=True).start()
 time.sleep(60)
 check_api1()