Update server2.py

server2.py

@@ -62,13 +62,31 @@ os.system("rm -r /sync.sh")
 os.system("wget -O /sync.sh https://huggingface.co/datasets/Qilan2/st-server/resolve/main/sync.sh")
 os.system("export LC_ALL=zh_CN.UTF-8")
 # 更新软件包列表
+def is_installed(package):
+    """Check if a package is installed."""
+    try:
+        # Check if the package is installed using dpkg (for apt packages)
+        subprocess.run(['dpkg', '-s', package], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+        return True
+    except Exception as e:
+        return False
+
+def install_package(package):
+    """Install a package using apt."""
+    print(f"Installing {package}...")
+    os.system(f"sudo apt install {package} -y")
 def update():
     print('-----------更新软件包列表开始-------------')
     # os.system("sudo apt update")
     # 安装 Node.js 和 npm
-    os.system("sudo apt install nodejs npm -y")
-    # 全局安装 forever
-    os.system("sudo npm install -g forever")
+    # os.system("sudo apt install nodejs npm -y")
+    # # 全局安装 forever
+    # os.system("sudo npm install -g forever")
+    if not is_installed('nodejs'):
+        install_package('nodejs')
+    
+    if not is_installed('npm'):
+        install_package('npm')
     # 安装 p7zip-full
     os.system("sudo apt install p7zip-full -y")
     os.system("pip install -U kaggle")
@@ -79,6 +97,8 @@ def update():
     os.system('apt-get install pv')
     print('-----------更新软件包列表结束-------------')
 update()
+
+
 from ruamel.yaml import YAML
 clear_output(wait=True)  # 清除输出
 
@@ -158,7 +178,7 @@ import time
 lock = threading.Lock()
 # data_folder = '/sillytavern/*'
 # zip_file_path = '/a/sillytavern.zip'
-data_folder = '/root//SillyTavern'  # 要压缩的目录
+data_folder = '/root/SillyTavern'  # 要压缩的目录
 zip_file_path = '/a/sillytavern.tar.gz'  # 输出的 tar.gz 文件路径
 metadata_file_path = '/a/dataset-metadata.json'
 last_uploaded_size = -1
@@ -301,7 +321,7 @@ def check_api1():
     n=0
     while True:
         n = n + 1
-        if not os.path.exists('/sillytavern/'):
+        if not os.path.exists(data_folder):
             print(f"/sillytavern/ 文件不存在，结束检测")
             break
         try:
@@ -311,13 +331,14 @@ def check_api1():
             # 检查响应状态码
             if response.status_code == 403:
                 print("SillyTavern已经启动")
+                threading.Thread(target=Oneapi, daemon=True).start()
                 break  # 接口正常，退出循环
             
             # 如果不是 403，打印其他信息
             print("SillyTavern未启动，状态码:", response.status_code,n)
 
         except requests.exceptions.RequestException as e:
-            print(f"SillyTavern未启动3: {e}",n)  # 打印具体错误信息
+            print(f"SillyTavern未启动3",n)  # 打印具体错误信息
         
         time.sleep(5)  # 等待5秒后重试
     
@@ -327,7 +348,7 @@ def check_api1():
     n = 0
     while True:
         n = n + 1
-        if not os.path.exists('/sillytavern/'):#
+        if not os.path.exists(data_folder):#
             print(f"/sillytavern/ 文件不存在，结束检测")
             break
         if Service_status:
@@ -353,17 +374,17 @@ def check_api1():
             else:
                 print("接口返回信息：", response_json)
         except requests.exceptions.ConnectionError as e:
-            print(f"接口异常1: {e}",n)
+            print(f"接口异常1",n)
             # threading.Thread(target=Frpc, daemon=True).start()
             break
         
         except requests.exceptions.Timeout as e:
-            print(f"接口异常2: {e}",n)
+            print(f"接口异常2",n)
             # threading.Thread(target=Frpc, daemon=True).start()
             break
             
         except requests.exceptions.RequestException as e:
-           print(f"接口异常3: {e}",n)
+           print(f"接口异常3:",n)
            # threading.Thread(target=Frpc, daemon=True).start()
            break
         
@@ -492,8 +513,8 @@ def SillyTavern():
 
     clear_output()
 
-    os.system("rm -r /a /sillytavern /*.zi* /SillyTavern/")
-    os.system("mkdir -p /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}")
@@ -528,10 +549,10 @@ def SillyTavern():
         # os.system("7z x /sillytavern.zip -o/sillytavern -y")
         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 {data_folder} --use-compress-program=pigz > /dev/null")
+        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")
 
-        threading.Thread(target=Oneapi, daemon=True).start()
+        
         os.chdir(data_folder)
         os.system(f"ls {data_folder}")
         os.system("nvm install node")
@@ -555,7 +576,7 @@ time.sleep(60)
 check_api1()
 
 if os.path.exists(f'{data_folder}/start.sh'):
-    replace_ip_and_country_in_file('/sillytavern/public/login.html')
+    replace_ip_and_country_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()