Update server3.py

server3.py

@@ -1,8 +1,8 @@
 ini_content = {"username":"lixuhs875","key":"642ac670e3e0f7a237b53919592582c5"}
 frp_url = '119.8.118.149'
-ssh_port = '7072'
+ssh_port = '7075'
 ssh_url = '47.74.57.131'
-st_url = f'http://{frp_url}:7070'
+st_url = f'http://{frp_url}:7074'
 huggingface_name = 'lixuhs875'
 huggingface_Data_name = 'qilan-st1'
 configs = [
@@ -11,24 +11,69 @@ configs = [
     server_addr = 47.237.156.222
     server_port = 7000
 
-    [sasfgha]
+    [safgha]
     type = tcp
     local_ip = 127.0.0.1
     local_port = 8000
-    remote_port = 7080
+    remote_port = 7076
     
-    [sawfab2f]
+    [safab2f]
     type = tcp
     local_ip = 127.0.0.1
     local_port = 22
-    remote_port = 7082
-    
-    [saffghg]
+    remote_port = 7077
+    """, '/content/frp/frpc.ini'),
+    (f"""
+    [common]
+    server_addr = {frp_url}
+    server_port = 7000
+    token = qilan
+    [kkjmk1]
+    type = tcp
+    local_ip = 127.0.0.1
+    local_port = 8000
+    remote_port = 7076
+    """, '/content/frp/frpc1.ini'),
+    ("""
+    [common]
+    server_addr = 8.137.94.137
+    server_port = 7000
+    [kjas2]
     type = tcp
     local_ip = 127.0.0.1
     local_port = 8000
-    remote_port = 7081
-    """, '/content/frp/frpc.ini')
+    remote_port = 7077
+    """, '/content/frp/frpc2.ini'),
+   ("""
+   [common]
+   server_addr = 120.76.218.32
+   server_port = 7000
+   [kja1sh3]
+   type = tcp
+   local_ip = 127.0.0.1
+   local_port = 8000
+   remote_port = 7074
+   """, '/content/frp/frpc3.ini'),
+   ("""
+   [common]
+   server_addr = 140.143.15.186
+   server_port=7000 
+   [kkji1mk4] 
+   type=tcp 
+   local_ip=127.0.0.1
+   local_port=8000 
+   remote_port=7074
+     """, '/content/frp/frpc4.ini'),
+   (f"""
+   [common]
+   server_addr = {ssh_url}
+   server_port=7000 
+   [kkji1mk5] 
+   type=tcp 
+   local_ip=127.0.0.1
+   local_port=22 
+   remote_port={ssh_port}
+     """, '/content/frp/frpc5.ini')
 ]
 kaggle_metadata = {
     "title": "Your Dataset Title",
@@ -183,73 +228,70 @@ def update_last_uploaded_size(size):
     global last_uploaded_size
     last_uploaded_size = size
 
-def get_folder_size(folder):
-    """使用 du 命令获取文件夹的总大小（字节数）"""
-    result = subprocess.run(['du', '-sb', folder], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-    if result.returncode == 0:
-        size = result.stdout.split()[0]  # 获取大小
-        return int(size)
-    else:
-        print(f"Error calculating size: {result.stderr.decode()}")
-        return 0
-
 def compress_folder():
     global last_uploaded_size  # 声明使用全局变量
+
     # 清理并创建目录 /a
     if os.path.exists('/a'):
         subprocess.run(['rm', '-r', '/a/'])
+
     os.makedirs('/a', exist_ok=True)
+
     with lock:  # 使用锁
-        # 获取当前文件夹的大小
-        current_folder_size = get_folder_size(data_folder)
-        print(f"当前文件夹大小: {current_folder_size} 字节")
+        if os.path.exists(zip_file_path):
+            print(f"压缩文件 {zip_file_path} 已存在，跳过本次压缩。")
+            return
+        
+        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/*
+        # tar -cvf - /sillytavern | pigz -p 6 -1 > /a/sillytavern.tar.gz
+        try:
+            result = subprocess.run(
+            f'tar -cvf - {data_folder} | pigz -p 2 -1 > {zip_file_path} 2> /dev/null',
+            shell=True,
+            check=True,
+            stdout=subprocess.DEVNULL,  # 将标准输出重定向到 /dev/null
+            stderr=subprocess.DEVNULL   # 将标准错误也重定向到 /dev/null
+            )
+        except subprocess.CalledProcessError as e:
+            print(f"Command failed with return code {e.returncode}")
 
-        # 判断文件夹大小是否大于 800MB (800MB = 800 * 1024 * 1024 字节)
-        if current_folder_size < (800 * 1024 ** 2):
-            print("文件夹小于800MB，不进行上传和压缩。")
+        print('重命名压缩后的文件')
+        file_path = "/a/sillytavern.ctk"
+        print(zip_file_path)
+        
+        subprocess.run(['mv', zip_file_path,file_path])
+        if result.returncode != 0:
+            print("压缩失败，请检查7z命令是否正确")
             return
 
-        # 如果是首次运行或者文件夹大小不同于上次上传，进行压缩
-        if last_uploaded_size == -1 or current_folder_size != last_uploaded_size:
-            print('开始压缩数据')
-            try:
-                # 执行压缩
-                result = subprocess.run(
-                    f'tar -cvf - {data_folder} | pigz -p 2 -1 > {zip_file_path} 2> /dev/null',
-                    shell=True,
-                    check=True,
-                    stdout=subprocess.DEVNULL,  # 将标准输出重定向到 /dev/null
-                    stderr=subprocess.DEVNULL   # 将标准错误也重定向到 /dev/null
-                )
-            except subprocess.CalledProcessError as e:
-                print(f"命令失败，返回代码: {e.returncode}")
-                return
-
-            print('压缩完成')
-            file_path = "/a/sillytavern.ctk"
-            subprocess.run(['mv', zip_file_path, file_path])
-            print(f"数据压缩为 {file_path}")
-
-            file_size = os.path.getsize(file_path)  # 获取压缩包的大小
-            print('文件大小:', file_size)
-
-            if file_size < (800 * 1024 ** 2):  # 判断压缩后的大小是否小于 800MB
-                print("压缩文件小于800MB，不进行上传。")
-                return
-
-            # 执行上传
+        print(f"Data compressed into {file_path}")
+        
+        file_size = os.path.getsize(file_path)  # 获取压缩包的大小
+        print('文件大小:', file_size, '上次文件大小：', last_uploaded_size,file_size * 1024 ** 2)
+        
+        # 判断是否大于800MB (800MB = 800 * 1024 * 1024 字节)
+        if file_size < (400 * 1024 ** 2):  
+            print("文件小于800MB，不进行上传。")
+            return
+        
+        if last_uploaded_size == -1 or file_size != last_uploaded_size:
+            # 判断是否为首次运行或上次上传大小为0
             if last_uploaded_size == -1:
                 print("首次运行，正在执行上传...")
-                update_last_uploaded_size(file_size)
+                update_last_uploaded_size(file_size)  # 更新为当前文件大小
 
                 with open(metadata_file_path, 'w') as json_fid:
                     json.dump(kaggle_metadata, json_fid)
-
-                subprocess.run(['kaggle', 'datasets', 'version', '-m', 'new version message', '-p', '/a'])
+                os.system("kaggle datasets version -m 'new version message' -p /a")
+                #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
-            else:
-                print(f"新文件大小 {file_size} 大于上次上传的大小，正在执行上传...")
-                update_last_uploaded_size(file_size)
+            
+            elif file_size > last_uploaded_size:
+                print(f"新文件 {zip_file_path} 大于上次上传的大小，正在执行上传...")
+                update_last_uploaded_size(file_size)  # 更新元数据中的最后一次上传大小
 
                 with open(metadata_file_path, 'w') as json_fid:
                     json.dump(kaggle_metadata, json_fid)
@@ -258,14 +300,14 @@ def compress_folder():
                 last_uploaded_size = file_size
             
         else:
-            print(f"新文件夹大小 {current_folder_size} 不大于上次上传的大小，跳过")
+            print(f"新文件 {zip_file_path} 不大于上次上传的大小，跳过")
 
 
 def repeat_task():
     print('------打包线程启动-------------')
     while True:
         print('等待打包')
-        time.sleep(3600)
+        time.sleep(18000)
         compress_folder()
     print('------打包线程结束-------------')
 # repeat_task()
@@ -394,11 +436,8 @@ def check_api1():
                 retry_count = 3  # 设置重试次数
                 for attempt in range(retry_count):
                     try:
-                        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)
-                        # os.system(f"rsync -avz -e 'ssh -p {ssh_port} -o StrictHostKeyChecking=no -o ConnectTimeout=30' --timeout=300 root@{ssh_url}:{data_folder}/ {data_folder}/
-")
-                        # subprocess.run(f"rsync -avz -e 'ssh -p {ssh_port} -o StrictHostKeyChecking=no' root@{ssh_url}:{data_folder}/ {data_folder}/", 
+                        
+                        subprocess.run(f"rsync -avz -e 'ssh -p {ssh_port} -o StrictHostKeyChecking=no' root@{ssh_url}:{data_folder}/ {data_folder}/", 
                                        shell=True, check=True, timeout=300)
                         break  # 如果成功，跳出重试循环
                     except subprocess.CalledProcessError as e:
@@ -410,6 +449,7 @@ def check_api1():
                 logging.info("%s 接口返回信息： %s", url, response_json)  # 修正日志记录
         except requests.exceptions.ConnectionError as e:
             logging.error(f"接口异常1: {e}, 尝试次数: {n}, nn: {nn}")
+            time.sleep(3)
             nn += 1
             if nn > 10:
                 break
@@ -639,28 +679,23 @@ if os.path.exists(f'{data_folder}/start.sh'):
     replace_info_in_file(f'{data_folder}/public/login.html')
     # threading.Thread(target=repeat_task, daemon=True).start() #压缩备份
     # backup_thread = threading.Thread(target=repeat_task, daemon=True)
-    backup_thread.start()
+    # backup_thread.start()
     print("开始衔接")
     Service_status = True
     frp(configs, True)
-    # frp(config_data2,'/content/frp/frpc2.ini',True)
-    # frp(config_data,'/content/frp/frpc.ini',True)
-    # frp(config_data3,'/content/frp/frpc3.ini',True)
     # frp(config_data4,'/content/frp/frpc4.ini',True)
     # 以线程的形式运行 frp 任务
     # frp_thread1 = threading.Thread(target=frp, args=(config_data2, '/content/frp/frpc2.ini', True))
     # frp_thread1.start()
-    # frp_thread2 = threading.Thread(target=frp, args=(config_data, '/content/frp/frpc.ini', False))
-    # frp_thread2.start()
-    threading.Thread(target=monitor_port, daemon=True).start()#检测端口状态
+    # threading.Thread(target=monitor_port, daemon=True).start()#检测端口状态
     while True:
-        if backup_thread.is_alive():
-            print("备份线程仍在运行...")
-        else:
-            print("备份线程已停止.")
-            # backup_thread = threading.Thread(target=repeat_task, daemon=True)
-            # backup_thread.start()
-            # break
+        # if backup_thread.is_alive():
+        #     print("备份线程仍在运行...")
+        # else:
+        #     print("备份线程已停止.")
+        #     backup_thread = threading.Thread(target=repeat_task, daemon=True)
+        #     backup_thread.start()
+        #     break
         time.sleep(5)
 
 else: