Update server10v.py
Browse files- server10v.py +41 -41
server10v.py
CHANGED
|
@@ -1,11 +1,11 @@
|
|
| 1 |
# 实时监控日志
|
| 2 |
-
#tail -f /
|
| 3 |
# 查找端口进程
|
| 4 |
#lsof -i :8000
|
| 5 |
# 查找server.py进程
|
| 6 |
#ps aux | grep server.py
|
| 7 |
huggingface_user="Qi28s"#
|
| 8 |
-
huggingface_id="
|
| 9 |
huggingface_tokon="hf_bHdgZHDe QHDHtoMjyIgpKvICbNbWJcTDTG"
|
| 10 |
|
| 11 |
ini_content = {"username":"tmpysanneernier91","key":"fcffd91fcc8a94fb4a8d3a1b39ff652c"}
|
|
@@ -15,9 +15,9 @@ ssh_url = '45.32.68.209'
|
|
| 15 |
st_url = f'http://{frp_url}:7090'
|
| 16 |
huggingface_name = 'tmpysanneernier91'
|
| 17 |
huggingface_Data_name = 'qilan-st10'
|
| 18 |
-
data_folder = '/
|
| 19 |
zip_file_path = '/dev/shm/a/sillytavern.tar.gz' # 输出的 tar.gz 文件路径
|
| 20 |
-
metadata_file_path = '/dev/shm/
|
| 21 |
configs = [
|
| 22 |
("""
|
| 23 |
[common]
|
|
@@ -29,7 +29,7 @@ configs = [
|
|
| 29 |
local_ip = 127.0.0.1
|
| 30 |
local_port = 8000
|
| 31 |
remote_port = 7091
|
| 32 |
-
""", '/
|
| 33 |
(f"""
|
| 34 |
[common]
|
| 35 |
server_addr = {frp_url}
|
|
@@ -40,7 +40,7 @@ configs = [
|
|
| 40 |
local_ip = 127.0.0.1
|
| 41 |
local_port = 8000
|
| 42 |
remote_port = 7090
|
| 43 |
-
""", '/
|
| 44 |
("""
|
| 45 |
[common]
|
| 46 |
server_addr = 43.134.75.213
|
|
@@ -50,7 +50,7 @@ configs = [
|
|
| 50 |
local_ip = 127.0.0.1
|
| 51 |
local_port = 8000
|
| 52 |
remote_port = 7079
|
| 53 |
-
""", '/
|
| 54 |
("""
|
| 55 |
[common]
|
| 56 |
server_addr = 8.210.217.27
|
|
@@ -60,7 +60,7 @@ configs = [
|
|
| 60 |
local_ip = 127.0.0.1
|
| 61 |
local_port = 8000
|
| 62 |
remote_port = 7079
|
| 63 |
-
""", '/
|
| 64 |
("""
|
| 65 |
[common]
|
| 66 |
server_addr = 45.32.68.209
|
|
@@ -70,7 +70,7 @@ configs = [
|
|
| 70 |
local_ip=127.0.0.1
|
| 71 |
local_port=8000
|
| 72 |
remote_port=7079
|
| 73 |
-
""", '/
|
| 74 |
(f"""
|
| 75 |
[common]
|
| 76 |
server_addr = {ssh_url}
|
|
@@ -80,7 +80,7 @@ configs = [
|
|
| 80 |
local_ip=127.0.0.1
|
| 81 |
local_port=22
|
| 82 |
remote_port={ssh_port}
|
| 83 |
-
""", '/
|
| 84 |
]
|
| 85 |
kaggle_metadata = {
|
| 86 |
"title": "Your Dataset Title",
|
|
@@ -93,7 +93,7 @@ import subprocess
|
|
| 93 |
import os
|
| 94 |
import sys
|
| 95 |
import configparser
|
| 96 |
-
from IPython.display import clear_output
|
| 97 |
import urllib.request
|
| 98 |
from pathlib import Path
|
| 99 |
import requests
|
|
@@ -110,16 +110,16 @@ import logging
|
|
| 110 |
from datetime import datetime
|
| 111 |
import pytz
|
| 112 |
os.system("rm -r /sync.sh")
|
| 113 |
-
os.system("wget -O /sync.sh https://huggingface.co/
|
| 114 |
os.system("export LC_ALL=zh_CN.UTF-8")
|
| 115 |
# 创建 FRP 文件夹并下载 frpc 可执行文件。
|
| 116 |
-
os.system("mkdir -p /
|
| 117 |
-
os.system("wget /
|
| 118 |
-
os.system("chmod +x /
|
| 119 |
-
os.system("wget https://huggingface.co/
|
| 120 |
-
os.system("chmod +x /
|
| 121 |
-
os.system('nohup /
|
| 122 |
-
os.system("wget https://huggingface.co/
|
| 123 |
|
| 124 |
def kill_frpc_processes():
|
| 125 |
try:
|
|
@@ -284,12 +284,12 @@ def frp(configs, backstage):
|
|
| 284 |
with open(config_file_path, 'w') as config_file:
|
| 285 |
config_file.write(config_data)
|
| 286 |
# 启动 frpc 命令和参数。
|
| 287 |
-
frpc_cmd=['/
|
| 288 |
|
| 289 |
if backstage:
|
| 290 |
subprocess.Popen(frpc_cmd)
|
| 291 |
else:
|
| 292 |
-
subprocess.run(f'/
|
| 293 |
print('-----------FRP结束-------------')
|
| 294 |
|
| 295 |
|
|
@@ -305,7 +305,7 @@ def monitor_port():
|
|
| 305 |
print("SillyTavern未运行,状态码:", response.status_code, n)
|
| 306 |
# 读取 config.ini 中的 monitor_port_enabled 配置项
|
| 307 |
config = configparser.ConfigParser()
|
| 308 |
-
config.read('/
|
| 309 |
monitor_port_enabled = config.getboolean('general', 'monitor_port_enabled', fallback=False)
|
| 310 |
if monitor_port_enabled:
|
| 311 |
backup_thread = threading.Thread(target=Run_SillyTavern, daemon=True)
|
|
@@ -322,7 +322,7 @@ def monitor_port():
|
|
| 322 |
# print(f"端口 8000 未被使用")
|
| 323 |
# # 读取 config.ini 中的 monitor_port_enabled 配置项
|
| 324 |
# config = configparser.ConfigParser()
|
| 325 |
-
# config.read('/
|
| 326 |
# monitor_port_enabled = config.getboolean('general', 'monitor_port_enabled', fallback=False)
|
| 327 |
# if monitor_port_enabled:
|
| 328 |
# backup_thread = threading.Thread(target=Run_SillyTavern, daemon=True)
|
|
@@ -379,9 +379,9 @@ def SillyTavern():
|
|
| 379 |
|
| 380 |
|
| 381 |
|
| 382 |
-
os.system(f"rm -rf /a /
|
| 383 |
# os.system(f"mkdir -p {data_folder}")
|
| 384 |
-
os.chdir('/
|
| 385 |
os.system("ls")
|
| 386 |
print(f"kaggle datasets download {huggingface_name}/{huggingface_Data_name}")
|
| 387 |
# os.system(f"kaggle datasets download {huggingface_name}/{huggingface_Data_name}")
|
|
@@ -390,9 +390,9 @@ def SillyTavern():
|
|
| 390 |
# 执行下载命令
|
| 391 |
if download_n > 6:
|
| 392 |
break
|
| 393 |
-
os.system(f"kaggle datasets download {huggingface_name}/{huggingface_Data_name} -p /
|
| 394 |
# 检查文件是否存在
|
| 395 |
-
if os.path.exists(f'/
|
| 396 |
print(f"{huggingface_Data_name}.zip 下载成功!")
|
| 397 |
break # 跳出循环
|
| 398 |
print(f"{huggingface_Data_name}.zip 下载失败,正在重试...")
|
|
@@ -400,26 +400,26 @@ def SillyTavern():
|
|
| 400 |
time.sleep(300) # 等待一段时间再重试(例如5秒
|
| 401 |
# os.system('kaggle datasets download xovale7506/sillytavern-data2')
|
| 402 |
# 检查文件是否存在
|
| 403 |
-
if not os.path.exists(f'/
|
| 404 |
print(f"文件 /{huggingface_Data_name}.zip 不存在,启用实时同步。")
|
| 405 |
|
| 406 |
else:
|
| 407 |
|
| 408 |
# 如果文件存在,可以继续执行后续代码
|
| 409 |
-
print(f"文件 /
|
| 410 |
# # 解压 sillytavern.zip
|
| 411 |
# os.system("rm *.zip")
|
| 412 |
-
os.system(f"7z x /
|
| 413 |
-
os.system("mv /
|
| 414 |
-
os.system("mv /
|
| 415 |
-
os.system("ls /
|
| 416 |
# os.system("tar -xvpf /sillytavern.tar.gz -C / --use-compress-program=pigz")
|
| 417 |
-
os.system(f"tar -xvpf /
|
| 418 |
# os.system("pv /sillytavern.tar.gz | tar -xvpf - -C / --use-compress-program=pigz")
|
| 419 |
-
os.system("mv /
|
| 420 |
|
| 421 |
print('更新文件')
|
| 422 |
-
os.chdir('/
|
| 423 |
os.system(f"ls {data_folder}")
|
| 424 |
os.system("nvm install node")
|
| 425 |
os.system("nvm use node")
|
|
@@ -430,10 +430,10 @@ def SillyTavern():
|
|
| 430 |
print(f"Command '{e.cmd}' returned non-zero exit status {e.returncode}.")
|
| 431 |
print("Output:", e.output)
|
| 432 |
os.system(f"ls {data_folder}")
|
| 433 |
-
os.system("python /
|
| 434 |
backup_thread = threading.Thread(target=Run_SillyTavern, daemon=True)
|
| 435 |
backup_thread.start()
|
| 436 |
-
# os.system(f"rm -rf /a /
|
| 437 |
|
| 438 |
print('-----------SillyTavern结束-------------')
|
| 439 |
import requests
|
|
@@ -520,10 +520,10 @@ config.add_section('general')
|
|
| 520 |
# 设置 'monitor_port_enabled' 选项的值为 True
|
| 521 |
config.set('general', 'monitor_port_enabled', 'True')
|
| 522 |
# 将配置写入到 'config.ini' 文件中
|
| 523 |
-
with open('/
|
| 524 |
config.write(configfile)
|
| 525 |
-
if os.path.exists(f'/
|
| 526 |
-
os.system(f"rm -rf /a /
|
| 527 |
backup_thread = threading.Thread(target=repeat_task, daemon=True)#压缩备份
|
| 528 |
backup_thread.start()
|
| 529 |
print("开始衔接")
|
|
|
|
| 1 |
# 实时监控日志
|
| 2 |
+
#tail -f /tmp/app/server10.log
|
| 3 |
# 查找端口进程
|
| 4 |
#lsof -i :8000
|
| 5 |
# 查找server.py进程
|
| 6 |
#ps aux | grep server.py
|
| 7 |
huggingface_user="Qi28s"#
|
| 8 |
+
huggingface_id="cc"
|
| 9 |
huggingface_tokon="hf_bHdgZHDe QHDHtoMjyIgpKvICbNbWJcTDTG"
|
| 10 |
|
| 11 |
ini_content = {"username":"tmpysanneernier91","key":"fcffd91fcc8a94fb4a8d3a1b39ff652c"}
|
|
|
|
| 15 |
st_url = f'http://{frp_url}:7090'
|
| 16 |
huggingface_name = 'tmpysanneernier91'
|
| 17 |
huggingface_Data_name = 'qilan-st10'
|
| 18 |
+
data_folder = '/tmp/app/SillyTavern' # 要压缩的目录
|
| 19 |
zip_file_path = '/dev/shm/a/sillytavern.tar.gz' # 输出的 tar.gz 文件路径
|
| 20 |
+
metadata_file_path = '/dev/shm/aset-metadata.json'
|
| 21 |
configs = [
|
| 22 |
("""
|
| 23 |
[common]
|
|
|
|
| 29 |
local_ip = 127.0.0.1
|
| 30 |
local_port = 8000
|
| 31 |
remote_port = 7091
|
| 32 |
+
""", '/tmp/app/frp/frpc.ini'),
|
| 33 |
(f"""
|
| 34 |
[common]
|
| 35 |
server_addr = {frp_url}
|
|
|
|
| 40 |
local_ip = 127.0.0.1
|
| 41 |
local_port = 8000
|
| 42 |
remote_port = 7090
|
| 43 |
+
""", '/tmp/app/frp/frpc1.ini'),
|
| 44 |
("""
|
| 45 |
[common]
|
| 46 |
server_addr = 43.134.75.213
|
|
|
|
| 50 |
local_ip = 127.0.0.1
|
| 51 |
local_port = 8000
|
| 52 |
remote_port = 7079
|
| 53 |
+
""", '/tmp/app/frp/frpc2.ini'),
|
| 54 |
("""
|
| 55 |
[common]
|
| 56 |
server_addr = 8.210.217.27
|
|
|
|
| 60 |
local_ip = 127.0.0.1
|
| 61 |
local_port = 8000
|
| 62 |
remote_port = 7079
|
| 63 |
+
""", '/tmp/app/frp/frpc3.ini'),
|
| 64 |
("""
|
| 65 |
[common]
|
| 66 |
server_addr = 45.32.68.209
|
|
|
|
| 70 |
local_ip=127.0.0.1
|
| 71 |
local_port=8000
|
| 72 |
remote_port=7079
|
| 73 |
+
""", '/tmp/app/frp/frpc4.ini'),
|
| 74 |
(f"""
|
| 75 |
[common]
|
| 76 |
server_addr = {ssh_url}
|
|
|
|
| 80 |
local_ip=127.0.0.1
|
| 81 |
local_port=22
|
| 82 |
remote_port={ssh_port}
|
| 83 |
+
""", '/tmp/app/frp/frpc5.ini')
|
| 84 |
]
|
| 85 |
kaggle_metadata = {
|
| 86 |
"title": "Your Dataset Title",
|
|
|
|
| 93 |
import os
|
| 94 |
import sys
|
| 95 |
import configparser
|
| 96 |
+
# from IPython.display import clear_output
|
| 97 |
import urllib.request
|
| 98 |
from pathlib import Path
|
| 99 |
import requests
|
|
|
|
| 110 |
from datetime import datetime
|
| 111 |
import pytz
|
| 112 |
os.system("rm -r /sync.sh")
|
| 113 |
+
os.system("wget -O /sync.sh https://huggingface.co/tmp/appsets/Qilan2/st-server/resolve/main/sync.sh" )
|
| 114 |
os.system("export LC_ALL=zh_CN.UTF-8")
|
| 115 |
# 创建 FRP 文件夹并下载 frpc 可执行文件。
|
| 116 |
+
os.system("mkdir -p /tmp/app/frp")
|
| 117 |
+
os.system("wget /tmp/app/frp/frpc https://huggingface.co/Qilan2/box/resolve/main/frp/frpc -O /tmp/app/frp/frpc")
|
| 118 |
+
os.system("chmod +x /tmp/app/frp/frpc")
|
| 119 |
+
os.system("wget https://huggingface.co/tmp/appsets/Qilan2/st-server/resolve/main/xugou-agent-linux-amd64?download=true -O /tmp/app/xugou-agent")
|
| 120 |
+
os.system("chmod +x /tmp/app/xugou-agent")
|
| 121 |
+
os.system('nohup /tmp/app/xugou-agent start --server "https://tz.282820.xyz" --token "xugou_meqz1qus_80244ac171f1d9cf3a1ead6be2ecf86f.7d4ae786cbb7e559" --interval "30" > /tmp/app/xugou-agent.log 2>&1 &')
|
| 122 |
+
os.system("wget https://huggingface.co/tmp/appsets/Qilan2/st-server/raw/main/ip_huggingface.py -O /tmp/app/ip_huggingface.py")
|
| 123 |
|
| 124 |
def kill_frpc_processes():
|
| 125 |
try:
|
|
|
|
| 284 |
with open(config_file_path, 'w') as config_file:
|
| 285 |
config_file.write(config_data)
|
| 286 |
# 启动 frpc 命令和参数。
|
| 287 |
+
frpc_cmd=['/tmp/app/frp/frpc', '-c', config_file_path]
|
| 288 |
|
| 289 |
if backstage:
|
| 290 |
subprocess.Popen(frpc_cmd)
|
| 291 |
else:
|
| 292 |
+
subprocess.run(f'/tmp/app/frp/frpc -c {config_file_path}', shell=True, check=True)
|
| 293 |
print('-----------FRP结束-------------')
|
| 294 |
|
| 295 |
|
|
|
|
| 305 |
print("SillyTavern未运行,状态码:", response.status_code, n)
|
| 306 |
# 读取 config.ini 中的 monitor_port_enabled 配置项
|
| 307 |
config = configparser.ConfigParser()
|
| 308 |
+
config.read('/tmp/app/config.ini')
|
| 309 |
monitor_port_enabled = config.getboolean('general', 'monitor_port_enabled', fallback=False)
|
| 310 |
if monitor_port_enabled:
|
| 311 |
backup_thread = threading.Thread(target=Run_SillyTavern, daemon=True)
|
|
|
|
| 322 |
# print(f"端口 8000 未被使用")
|
| 323 |
# # 读取 config.ini 中的 monitor_port_enabled 配置项
|
| 324 |
# config = configparser.ConfigParser()
|
| 325 |
+
# config.read('/tmp/app/config.ini')
|
| 326 |
# monitor_port_enabled = config.getboolean('general', 'monitor_port_enabled', fallback=False)
|
| 327 |
# if monitor_port_enabled:
|
| 328 |
# backup_thread = threading.Thread(target=Run_SillyTavern, daemon=True)
|
|
|
|
| 379 |
|
| 380 |
|
| 381 |
|
| 382 |
+
os.system(f"rm -rf /a /tmp/app/sillytavern /tmp/app/tmp/app /tmp/app/*.zip /tmp/app/*.ctk")
|
| 383 |
# os.system(f"mkdir -p {data_folder}")
|
| 384 |
+
os.chdir('/tmp/app')
|
| 385 |
os.system("ls")
|
| 386 |
print(f"kaggle datasets download {huggingface_name}/{huggingface_Data_name}")
|
| 387 |
# os.system(f"kaggle datasets download {huggingface_name}/{huggingface_Data_name}")
|
|
|
|
| 390 |
# 执行下载命令
|
| 391 |
if download_n > 6:
|
| 392 |
break
|
| 393 |
+
os.system(f"kaggle datasets download {huggingface_name}/{huggingface_Data_name} -p /tmp/app")
|
| 394 |
# 检查文件是否存在
|
| 395 |
+
if os.path.exists(f'/tmp/app/{huggingface_Data_name}.zip'):
|
| 396 |
print(f"{huggingface_Data_name}.zip 下载成功!")
|
| 397 |
break # 跳出循环
|
| 398 |
print(f"{huggingface_Data_name}.zip 下载失败,正在重试...")
|
|
|
|
| 400 |
time.sleep(300) # 等待一段时间再重试(例如5秒
|
| 401 |
# os.system('kaggle datasets download xovale7506/sillytavern-data2')
|
| 402 |
# 检查文件是否存在
|
| 403 |
+
if not os.path.exists(f'/tmp/app/{huggingface_Data_name}.zip'):
|
| 404 |
print(f"文件 /{huggingface_Data_name}.zip 不存在,启用实时同步。")
|
| 405 |
|
| 406 |
else:
|
| 407 |
|
| 408 |
# 如果文件存在,可以继续执行后续代码
|
| 409 |
+
print(f"文件 /tmp/app/{huggingface_Data_name}.zip 存在,继续执行程序。")
|
| 410 |
# # 解压 sillytavern.zip
|
| 411 |
# os.system("rm *.zip")
|
| 412 |
+
os.system(f"7z x /tmp/app/{huggingface_Data_name}.zip -y")
|
| 413 |
+
os.system("mv /tmp/app/sillytavern.tck sillytavern.tar.gz")
|
| 414 |
+
os.system("mv /tmp/app/sillytavern.ctk sillytavern.tar.gz")
|
| 415 |
+
os.system("ls /tmp/app")
|
| 416 |
# os.system("tar -xvpf /sillytavern.tar.gz -C / --use-compress-program=pigz")
|
| 417 |
+
os.system(f"tar -xvpf /tmp/app/sillytavern.tar.gz -C /tmp/app --use-compress-program=pigz > /dev/null")
|
| 418 |
# os.system("pv /sillytavern.tar.gz | tar -xvpf - -C / --use-compress-program=pigz")
|
| 419 |
+
os.system("mv /tmp/app/tmp/app/SillyTavern /tmp/app/SillyTavern")
|
| 420 |
|
| 421 |
print('更新文件')
|
| 422 |
+
os.chdir('/tmp/app/SillyTavern')
|
| 423 |
os.system(f"ls {data_folder}")
|
| 424 |
os.system("nvm install node")
|
| 425 |
os.system("nvm use node")
|
|
|
|
| 430 |
print(f"Command '{e.cmd}' returned non-zero exit status {e.returncode}.")
|
| 431 |
print("Output:", e.output)
|
| 432 |
os.system(f"ls {data_folder}")
|
| 433 |
+
os.system("python /tmp/app/ip_huggingface.py")
|
| 434 |
backup_thread = threading.Thread(target=Run_SillyTavern, daemon=True)
|
| 435 |
backup_thread.start()
|
| 436 |
+
# os.system(f"rm -rf /a /tmp/app/sillytavern /tmp/app/tmp/app /tmp/app/*.zip /tmp/app/*.ctk")
|
| 437 |
|
| 438 |
print('-----------SillyTavern结束-------------')
|
| 439 |
import requests
|
|
|
|
| 520 |
# 设置 'monitor_port_enabled' 选项的值为 True
|
| 521 |
config.set('general', 'monitor_port_enabled', 'True')
|
| 522 |
# 将配置写入到 'config.ini' 文件中
|
| 523 |
+
with open('/tmp/app/config.ini', 'w') as configfile:
|
| 524 |
config.write(configfile)
|
| 525 |
+
if os.path.exists(f'/tmp/app/{huggingface_Data_name}.zip'):
|
| 526 |
+
os.system(f"rm -rf /a /tmp/app/tmp/app /tmp/app/*.zip /tmp/app/*.ctk /tmp/app/*.gz")
|
| 527 |
backup_thread = threading.Thread(target=repeat_task, daemon=True)#压缩备份
|
| 528 |
backup_thread.start()
|
| 529 |
print("开始衔接")
|