Qilan2 commited on
Commit
87690e1
·
verified ·
1 Parent(s): c7488c9

Update server.py

Browse files
Files changed (1) hide show
  1. server.py +15 -5
server.py CHANGED
@@ -1,6 +1,7 @@
1
  ini_content = {"username":"lixuhs875","key":"642ac670e3e0f7a237b53919592582c5"}
2
  frp_url = '47.237.156.222'
3
  ssh_port = '7072'
 
4
  st_url = f'http://{frp_url}:7070'
5
  huggingface_name = 'lixuhs875'
6
  huggingface_Data_name = 'qilan-st1'
@@ -48,7 +49,6 @@ configs = [
48
  local_port = 8000
49
  remote_port = 7073
50
  """, '/content/frp/frpc3.ini'),
51
-
52
  ("""
53
  [common]
54
  server_addr = 140.143.15.186
@@ -58,7 +58,17 @@ configs = [
58
  local_ip=127.0.0.1
59
  local_port=8000
60
  remote_port=7073
61
- """, '/content/frp/frpc4.ini')
 
 
 
 
 
 
 
 
 
 
62
  ]
63
  kaggle_metadata = {
64
  "title": "Your Dataset Title",
@@ -413,7 +423,7 @@ def check_api1():
413
  nn = 0
414
  try:
415
  # subprocess.run(f"rsync -avz --port=7071 ljj@{frp_url}::qilan {data_folder}/", shell=True, check=True)
416
- subprocess.run(f"rsync -avz -e 'ssh -p {ssh_port} -o StrictHostKeyChecking=no' root@{frp_url}:{data_folder}/ {data_folder}/", shell=True, check=True)
417
  except subprocess.CalledProcessError as e:
418
  print(f"Rsync 失败,返回码: {e.returncode}")
419
  print(f"Command output: {e.output}")
@@ -600,7 +610,7 @@ def SillyTavern():
600
  print(f"文件 /{huggingface_Data_name}.zip 不存在,启用实时同步。")
601
  generate_ssh_key()
602
  copy_public_key_to_remote(frp_url, ssh_port, "root", "qilan")
603
- subprocess.run(f"rsync -avz -e 'ssh -p {ssh_port} -o StrictHostKeyChecking=no' root@{frp_url}:{data_folder}/ {data_folder}/", shell=True, check=True)
604
  # subprocess.run(f"rsync -avz --port=7075 ljj@{frp_url}::qilan {data_folder}/", shell=True, check=True)
605
  # sys.exit()
606
  else:
@@ -641,7 +651,7 @@ def SillyTavern():
641
  threading.Thread(target=SillyTavern, daemon=True).start()
642
  time.sleep(60)
643
  check_api1()
644
-
645
  if os.path.exists(f'{data_folder}/start.sh'):
646
  replace_info_in_file(f'{data_folder}/public/login.html')
647
  # threading.Thread(target=repeat_task, daemon=True).start() #压缩备份
 
1
  ini_content = {"username":"lixuhs875","key":"642ac670e3e0f7a237b53919592582c5"}
2
  frp_url = '47.237.156.222'
3
  ssh_port = '7072'
4
+ ssh_url = '47.74.57.131'
5
  st_url = f'http://{frp_url}:7070'
6
  huggingface_name = 'lixuhs875'
7
  huggingface_Data_name = 'qilan-st1'
 
49
  local_port = 8000
50
  remote_port = 7073
51
  """, '/content/frp/frpc3.ini'),
 
52
  ("""
53
  [common]
54
  server_addr = 140.143.15.186
 
58
  local_ip=127.0.0.1
59
  local_port=8000
60
  remote_port=7073
61
+ """, '/content/frp/frpc4.ini'),
62
+ (f"""
63
+ [common]
64
+ server_addr = {ssh_url}
65
+ server_port=7000
66
+ [kkji1mk24]
67
+ type=tcp
68
+ local_ip=127.0.0.1
69
+ local_port=22
70
+ remote_port={ssh_port}
71
+ """, '/content/frp/frpc5.ini')
72
  ]
73
  kaggle_metadata = {
74
  "title": "Your Dataset Title",
 
423
  nn = 0
424
  try:
425
  # subprocess.run(f"rsync -avz --port=7071 ljj@{frp_url}::qilan {data_folder}/", shell=True, check=True)
426
+ subprocess.run(f"rsync -avz -e 'ssh -p {ssh_port} -o StrictHostKeyChecking=no' root@{ssh_url}:{data_folder}/ {data_folder}/", shell=True, check=True)
427
  except subprocess.CalledProcessError as e:
428
  print(f"Rsync 失败,返回码: {e.returncode}")
429
  print(f"Command output: {e.output}")
 
610
  print(f"文件 /{huggingface_Data_name}.zip 不存在,启用实时同步。")
611
  generate_ssh_key()
612
  copy_public_key_to_remote(frp_url, ssh_port, "root", "qilan")
613
+ subprocess.run(f"rsync -avz -e 'ssh -p {ssh_port} -o StrictHostKeyChecking=no' root@{ssh_url}:{data_folder}/ {data_folder}/", shell=True, check=True)
614
  # subprocess.run(f"rsync -avz --port=7075 ljj@{frp_url}::qilan {data_folder}/", shell=True, check=True)
615
  # sys.exit()
616
  else:
 
651
  threading.Thread(target=SillyTavern, daemon=True).start()
652
  time.sleep(60)
653
  check_api1()
654
+ os.system("rm -r /qilan-st2.zip /sillytavern.tar.gz")
655
  if os.path.exists(f'{data_folder}/start.sh'):
656
  replace_info_in_file(f'{data_folder}/public/login.html')
657
  # threading.Thread(target=repeat_task, daemon=True).start() #压缩备份