Update server.py

server.py

@@ -2,6 +2,8 @@ ini_content = {"username":"xovale7506","key":"502e30bafc004c02aa668a279df23f3e"}
 frp_url = '47.237.156.222'
 ssh_port = '7072'
 st_url = f'http://{frp_url}:7070'
+huggingface_name = 'xovale7506'
+huggingface_Data_name = 'sillytavern-data'
 config_data = f"""
 [common]
 server_addr = {frp_url}
@@ -36,7 +38,7 @@ remote_port = 7070
 
 kaggle_metadata = {
     "title": "Your Dataset Title",
-    "id": "xovale7506/sillytavern-data",
+    "id": f"{huggingface_name}/{huggingface_Data_name}",
     "licenses": [{"name": "CC0-1.0"}]
 }
 st_status = True
@@ -177,6 +179,7 @@ def compress_folder():
         
         print('开始压缩数据')
         result = subprocess.run(['7z', 'a', '-tzip', '-mx=1','-mmt=2', zip_file_path, data_folder])
+        # 7z a -tzip -mx=1 -mmt=2 /a/sillytavern.zip /sillytavern/*
         print('重命名压缩后的文件')
         file_path = '/a/sillytavern.zip1'
         subprocess.run(['mv', zip_file_path,file_path])
@@ -204,6 +207,7 @@ def compress_folder():
                     json.dump(kaggle_metadata, json_fid)
 
                 subprocess.run(['kaggle', 'datasets', 'version', '-m', 'new version message', '-p', '/a'])
+                # kaggle datasets version -m 'new version message' -p /a
                 last_uploaded_size = file_size
             
             elif file_size > last_uploaded_size:
@@ -287,8 +291,8 @@ def check_api1():
     n=0
     while True:
         n = n + 1
-        if st_status == False and n > 50:
-            print("/sillytavern 文件不存在，结束检测")
+        if not os.path.exists('/sillytavern/'):
+            print(f"/sillytavern/ 文件不存在，结束检测")
             break
         try:
             url = "http://127.0.0.1:8000/v1"
@@ -300,10 +304,10 @@ def check_api1():
                 break  # 接口正常，退出循环
             
             # 如果不是 403，打印其他信息
-            print("SillyTavern未启动，状态码:", response.status_code)
+            print("SillyTavern未启动，状态码:", response.status_code,n)
 
         except requests.exceptions.RequestException as e:
-            print(f"SillyTavern未启动3: {e}")  # 打印具体错误信息
+            print(f"SillyTavern未启动3: {e}",n)  # 打印具体错误信息
         
         time.sleep(5)  # 等待5秒后重试
     
@@ -313,8 +317,8 @@ def check_api1():
     n = 0
     while True:
         n = n + 1
-        if st_status == False and n > 50:
-            print("/sillytavern 文件不存在，结束检测")
+        if not os.path.exists('/sillytavern/'):#
+            print(f"/sillytavern/ 文件不存在，结束检测")
             break
         if Service_status:
             print("结束检测")
@@ -331,30 +335,29 @@ def check_api1():
                 try:
                     subprocess.run(f"rsync -avz -e 'ssh -p {ssh_port} -o StrictHostKeyChecking=no' root@{frp_url}:/sillytavern/ /sillytavern/", shell=True, check=True)
                 except subprocess.CalledProcessError as e:
-                    print(f"Rsync failed with return code: {e.returncode}")
+                    print(f"Rsync 失败，返回码: {e.returncode}")
                     print(f"Command output: {e.output}")
-                # subprocess.run(f"rsync -avz -e 'ssh -p {ssh_port} -o StrictHostKeyChecking=no' root@{frp_url}:/sillytavern/ /sillytavern/", shell=True, check=True)
-                # subprocess.run(f"sh /sync.sh -p {ssh_port} -s {frp_url}", shell=True, check=True)
+                    generate_ssh_key()
+                # subprocess.run(f"bash /sync.sh -p {ssh_port} -s {frp_url}", shell=True, check=True)
                 # break  # 跳出循环
             else:
                 print("接口返回信息：", response_json)
-        
         except requests.exceptions.ConnectionError as e:
-            print(f"接口异常1: {e}")
+            print(f"接口异常1: {e}",n)
             # threading.Thread(target=Frpc, daemon=True).start()
             break
         
         except requests.exceptions.Timeout as e:
-            print(f"接口异常2: {e}")
+            print(f"接口异常2: {e}",n)
             # threading.Thread(target=Frpc, daemon=True).start()
             break
             
         except requests.exceptions.RequestException as e:
-           print(f"接口异常3: {e}")
+           print(f"接口异常3: {e}",n)
            # threading.Thread(target=Frpc, daemon=True).start()
            break
         
-        time.sleep(5)  # 等待5秒后重试
+        time.sleep(2)  # 等待5秒后重试
 
 
 def frp(config_data1,config_file_path,backstage):
@@ -427,8 +430,8 @@ def replace_ip_and_country_in_file(file_path):
                 # print(f"读取到的文件内容: {content}")
             
             # 使用正则表达式匹配 "IP[xxx]国家[yyy]" 的格式
-            pattern = r'IP\[.*?\]国家\[.*?\]国家\[.*?\]'
-            replacement = f'机子IP[{geo_info["ip"]}]ISP[{geo_info["country"]}]ISP[{geo_info["isp"]}]'
+            pattern = r'IP\[.*?\]国家\[.*?\]ISP\[.*?\]'
+            replacement = f'机子IP[{geo_info["ip"]}]国家[{geo_info["country"]}]ISP[{geo_info["isp"]}]'
             new_content = re.sub(pattern, replacement, content)
             
             # print(f"替换后的内容: {new_content}")
@@ -462,54 +465,63 @@ def SillyTavern():
     os.system("rm -r /a /sillytavern /*.zi* /SillyTavern/")
     os.system("mkdir -p /sillytavern")
     os.chdir('/')
-    os.system("kaggle datasets download xovale7506/sillytavern-data")
-    # 检查文件是否存在
-    if not os.path.exists('/sillytavern-data.zip'):
-        print(f"文件 /sillytavern-data.zip 不存在，程序将结束。")
-        st_status = False
-    # 如果文件存在，可以继续执行后续代码
-    print(f"文件 /sillytavern-data.zip 存在，继续执行程序。")
-    # # 解压 sillytavern.zip
-    os.system("7z x /sillytavern-data.zip -o/ -y")
-    os.system("mv /sillytavern.zip1 /sillytavern.zip")
-    os.system("7z x /sillytavern.zip -o/sillytavern -y")
-    os.system("rm *.zip")
-    clear_output()
-
-    # # 拉取最新版本
-    # !git clone https://github.com/SillyTavern/SillyTavern.git
-    # 强制替换掉备份
-    # !rsync -a --delete /SillyTavern/* /sillytavern/
+    print(f"kaggle datasets download {huggingface_name}/{huggingface_Data_name}")
+    # os.system(f"kaggle datasets download {huggingface_name}/{huggingface_Data_name}")
+    while True:
+        # 执行下载命令
+        os.system(f"kaggle datasets download {huggingface_name}/{huggingface_Data_name}")
+        # 检查文件是否存在
+        if os.path.exists(f'/{huggingface_Data_name}.zip'):
+            print(f"{huggingface_Data_name}.zip 下载成功！")
+            break  # 跳出循环
     
+        print(f"{downloaded_file} 下载失败，正在重试...")
     
-    threading.Thread(target=Oneapi, daemon=True).start()
-    os.chdir('/sillytavern')
-    replace_ip_and_country_in_file('/sillytavern/public/login.html')
-    os.system("ls")
-    os.system("nvm install node")
-    os.system("nvm use node")
-    os.system("npm install -y")
-    try:
+        time.sleep(5)  # 等待一段时间再重试（例如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(frp_url, ssh_port, "root", "qilan")
+        subprocess.run(f"rsync -avz -e 'ssh -p {ssh_port} -o StrictHostKeyChecking=no' root@{frp_url}:/sillytavern/ /sillytavern/", shell=True, check=True)
+        # sys.exit()
+    else:
+        
+        # 如果文件存在，可以继续执行后续代码
+        print(f"文件 /{huggingface_Data_name}.zip 存在，继续执行程序。")
+    # # 解压 sillytavern.zip
+        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("rm *.zip")
+
+        threading.Thread(target=Oneapi, daemon=True).start()
+        os.chdir('/sillytavern')
+        replace_ip_and_country_in_file('/sillytavern/public/login.html')
+        os.system("ls")
+        os.system("nvm install node")
+        os.system("nvm use node")
+        os.system("npm install -y")
+        try:
+            subprocess.run('yes | sh /sillytavern/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.chdir('/sillytavern')
         subprocess.run('yes | sh /sillytavern/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.chdir('/sillytavern')
-    subprocess.run('yes | sh /sillytavern/start.sh', shell=True, check=True)
-    subprocess.run('yes | sh /sillytavern/start.sh', shell=True, check=True)
-    subprocess.run('yes | sh /sillytavern/start.sh', shell=True, check=True)
-    subprocess.run('yes | sh /sillytavern/start.sh', shell=True, check=True)
-    print('-----------SillyTavern结束-------------')
-    # os.system("yes | sh start.sh -y")
-
-    # commands = [
-    #     'yes | sh start.sh -y'
-    # ]
-    # run_commands(commands)    
+        subprocess.run('yes | sh /sillytavern/start.sh', shell=True, check=True)
+        subprocess.run('yes | sh /sillytavern/start.sh', shell=True, check=True)
+        subprocess.run('yes | sh /sillytavern/start.sh', shell=True, check=True)
+    print('-----------SillyTavern结束-------------')  
 threading.Thread(target=SillyTavern, daemon=True).start()
+time.sleep(60)
 check_api1()
-if not os.path.exists('/sillytavern-data.zip'):
-    threading.Thread(target=repeat_task, daemon=True).start() #压缩备份
+
+if os.path.exists('/sillytavern/start.sh'):
+    # threading.Thread(target=repeat_task, daemon=True).start() #压缩备份
+    backup_thread = threading.Thread(target=repeat_task, daemon=True)
+    backup_thread.start()
     print("开始衔接")
     Service_status = True
     # frp(config_data2,'/content/frp/frpc2.ini',True)
@@ -520,12 +532,20 @@ if not os.path.exists('/sillytavern-data.zip'):
     frp_thread2 = threading.Thread(target=frp, args=(config_data, '/content/frp/frpc.ini', False))
     frp_thread2.start()
     while True:
+        if backup_thread.is_alive():
+            print("备份线程仍在运行...")
+        else:
+            print("备份线程已停止.")
+            backup_thread = threading.Thread(target=repeat_task, daemon=True)
+            backup_thread.start()
+            # break
         try:
             # 检查 /sillytavern/start.sh 是否在运行
             subprocess.check_output(['pgrep', '-f', '/sillytavern/start.sh'])
             # print("脚本正在运行。")
         except subprocess.CalledProcessError:
             print("脚本未运行。退出循环。")
+            compress_folder()
             break
         time.sleep(5)