Update server10v.py

server10v.py

@@ -381,8 +381,11 @@ def SillyTavern():
     
     os.system(f"rm -rf /a /data/sillytavern /data/data /data/*.zip /data/*.ctk")
     # os.system(f"mkdir -p {data_folder}")
+    print('----当前文件夹路径--------')
+    os.chdir('pwd')
+    print('----进入/data--------')
     os.chdir('/data')
-    os.system("ls")
+    
     print(f"kaggle datasets download {huggingface_name}/{huggingface_Data_name}")
     # os.system(f"kaggle datasets download {huggingface_name}/{huggingface_Data_name}")
     download_n = 0
@@ -406,6 +409,8 @@ def SillyTavern():
     else:
         
         # 如果文件存在，可以继续执行后续代码
+        print('----/data文件夹内容--------')
+        os.system("ls")
         print(f"文件 /data/{huggingface_Data_name}.zip 存在，继续执行程序。")
     # # 解压 sillytavern.zip
         # os.system("rm *.zip")
@@ -419,7 +424,9 @@ def SillyTavern():
         os.system("mv /data/data/SillyTavern  /data/SillyTavern")
         
         print('更新文件')
+        print('----进入/data/SillyTavern--------')
         os.chdir('/data/SillyTavern')
+        print('----/data/SillyTavern内容--------')
         os.system(f"ls {data_folder}")
         os.system("nvm install node")
         os.system("nvm use node")
@@ -431,8 +438,9 @@ def SillyTavern():
             print("Output:", e.output)
         os.system(f"ls {data_folder}")
         os.system("python /data/ip_huggingface.py")
-        backup_thread = threading.Thread(target=Run_SillyTavern, daemon=True)
-        backup_thread.start()
+        Run_SillyTavern()
+        # backup_thread = threading.Thread(target=Run_SillyTavern, daemon=True)
+        # backup_thread.start()
         # os.system(f"rm -rf /a /data/sillytavern /data/data /data/*.zip /data/*.ctk")
         
     print('-----------SillyTavern结束-------------')  
@@ -507,51 +515,51 @@ def check_system_resources():
 # 调用函数
 
 
-threading.Thread(target=SillyTavern, daemon=True).start()
-# SillyTavern()
-time.sleep(60)
-check_api1()
-
-
-# 创建 ConfigParser 对象
-config = configparser.ConfigParser()
-# 添加一个 'general' 部分
-config.add_section('general')
-# 设置 'monitor_port_enabled' 选项的值为 True
-config.set('general', 'monitor_port_enabled', 'True')
-# 将配置写入到 'config.ini' 文件中
-with open('/data/config.ini', 'w') as configfile:
-    config.write(configfile)
-if os.path.exists(f'/data/{huggingface_Data_name}.zip'):
-    os.system(f"rm -rf /a  /data/data /data/*.zip /data/*.ctk /data/*.gz")
-    backup_thread = threading.Thread(target=repeat_task, daemon=True)#压缩备份
-    backup_thread.start()
-    print("开始衔接")
-    Service_status = True
-    frp(configs, True)
-    threading.Thread(target=monitor_port, daemon=True).start()#检测端口状态
-    # check_system_resources()
-    # time.sleep(600)
-    while True:
-        # 检查是否是中国时区早上6点
-        china_tz = pytz.timezone('Asia/Shanghai')
-        now = datetime.now(china_tz)
-        if now.hour == 14 and now.minute < 2:  # 6:00-6:05之间退出
-            print(f"当前时间: {now.strftime('%Y-%m-%d %H:%M:%S')}, 到达早上6点，退出循环")
-            break
-        else:
-            print(f"当前时间: {now.strftime('%Y-%m-%d %H:%M:%S')}, 未到达早上6点")
+# threading.Thread(target=SillyTavern, daemon=True).start()
+SillyTavern()
+# time.sleep(60)
+# check_api1()
+
+
+# # 创建 ConfigParser 对象
+# config = configparser.ConfigParser()
+# # 添加一个 'general' 部分
+# config.add_section('general')
+# # 设置 'monitor_port_enabled' 选项的值为 True
+# config.set('general', 'monitor_port_enabled', 'True')
+# # 将配置写入到 'config.ini' 文件中
+# with open('/data/config.ini', 'w') as configfile:
+#     config.write(configfile)
+# if os.path.exists(f'/data/{huggingface_Data_name}.zip'):
+#     os.system(f"rm -rf /a  /data/data /data/*.zip /data/*.ctk /data/*.gz")
+#     backup_thread = threading.Thread(target=repeat_task, daemon=True)#压缩备份
+#     backup_thread.start()
+#     print("开始衔接")
+#     Service_status = True
+#     frp(configs, True)
+#     threading.Thread(target=monitor_port, daemon=True).start()#检测端口状态
+#     # check_system_resources()
+#     # time.sleep(600)
+#     while True:
+#         # 检查是否是中国时区早上6点
+#         china_tz = pytz.timezone('Asia/Shanghai')
+#         now = datetime.now(china_tz)
+#         if now.hour == 14 and now.minute < 2:  # 6:00-6:05之间退出
+#             print(f"当前时间: {now.strftime('%Y-%m-%d %H:%M:%S')}, 到达早上6点，退出循环")
+#             break
+#         else:
+#             print(f"当前时间: {now.strftime('%Y-%m-%d %H:%M:%S')}, 未到达早上6点")
             
-        if backup_thread.is_alive():
-            print("备份线程仍在运行...")
-        else:
-            print("备份线程已停止.")
-            backup_thread = threading.Thread(target=repeat_task, daemon=True)
-            backup_thread.start()
-        time.sleep(5)
-else:
-    print(f'{data_folder}/start.sh 文件不存在结束执行')
-compress_folder()
-result = restart_huggingface_space(huggingface_user, huggingface_id, huggingface_tokon)
-print(result)
+#         if backup_thread.is_alive():
+#             print("备份线程仍在运行...")
+#         else:
+#             print("备份线程已停止.")
+#             backup_thread = threading.Thread(target=repeat_task, daemon=True)
+#             backup_thread.start()
+#         time.sleep(5)
+# else:
+#     print(f'{data_folder}/start.sh 文件不存在结束执行')
+# compress_folder()
+# result = restart_huggingface_space(huggingface_user, huggingface_id, huggingface_tokon)
+# print(result)