manu-sapiens commited on
Commit
9ae4343
·
1 Parent(s): e58b995

updating omnitool before checking the symlink

Browse files
Files changed (2) hide show
  1. hf_server.js +3 -3
  2. omnitool_init.sh +18 -64
hf_server.js CHANGED
@@ -3,7 +3,7 @@
3
  * All rights reserved.
4
  */
5
  //@ts-check
6
- const VERSION = '0.6.0.hf.012.c';
7
 
8
  const express = require('express');
9
  const http = require('http');
@@ -252,10 +252,10 @@ function getButtonsString(buttonsHTML)
252
  let connectionStatusMessage;
253
  if (global.CONNECTED_TO_MASTER)
254
  {
255
- connectionStatusMessage = '<div>You are now connected DIRECTLY to the REFERENCE Omnitool Space on Huggingface.</div><div style="color: red;">It is HIGHLY recommended that you duplicate this space and make it private to secure your keys, recipes and outputs.</div>';
256
  } else
257
  {
258
- connectionStatusMessage = `<div style="color: green;">You are now connected to the space ${global.LOCAL_URL}.</div><div style="color: red;">If this is NOT yours, it is HIGHLY recommended that you duplicate this space and make it private to secure your keys, recipes and outputs.</div>`;
259
  }
260
 
261
  return `
 
3
  * All rights reserved.
4
  */
5
  //@ts-check
6
+ const VERSION = '0.6.0.hf.012.d';
7
 
8
  const express = require('express');
9
  const http = require('http');
 
252
  let connectionStatusMessage;
253
  if (global.CONNECTED_TO_MASTER)
254
  {
255
+ connectionStatusMessage = '<div>You are now connected DIRECTLY to the REFERENCE Omnitool Space on Huggingface.</div><div style="color: red;">It is HIGHLY recommended that you duplicate this space and make it private to secure your keys, recipes and outputs.</div><div>When DUPLICATING the Space, consider choosing the 20 Gig option to persist keys, recipes and outputs between server restarts. Those will still be lost, however, if the Space is rebuilt.</div>';
256
  } else
257
  {
258
+ connectionStatusMessage = `<div style="color: green;">You are now connected to the space ${global.LOCAL_URL}.</div><div style="color: red;">If this is NOT yours, it is HIGHLY recommended that you duplicate this space and make it private to secure your keys, recipes and outputs.</div><div>When DUPLICATING the Space, consider choosing the 20 Gig option to persist keys, recipes and outputs between server restarts. Those will still be lost, however, if the Space is rebuilt.</div>`;
259
  }
260
 
261
  return `
omnitool_init.sh CHANGED
@@ -1,39 +1,6 @@
1
  #!/bin/bash
2
  echo "[->] START "
3
 
4
-
5
- echo "[->] CHECKING EXISTING /DATA "
6
- if [ -d "/data" ]; then
7
- echo "$(ls -l /data)"
8
-
9
- if [ -L "./omnitool/packages/omni-server/data.local" ]; then
10
- echo "[v] DATA.LOCAL symlink already present "
11
- else
12
- if [ -d "./omnitool/packages/omni-server/data.local" ]; then
13
- echo "[v] DATA.LOCAL already present "
14
- # hopefully it got copied over through the symlink in the previous run
15
- rm -rf ./omnitool/packages/omni-server/data.local
16
-
17
- #mkdir ./omnitool/packages/omni-server/data.local
18
- #chmod 0777 ./omnitool/packages/omni-server/data.local
19
- #chown node ./omnitool/packages/omni-server/data.local
20
- #else
21
- # echo "[v] Creating DATA.LOCAL "
22
- # mkdir ./omnitool/packages/omni-server/data.local
23
- # chmod 0777 ./omnitool/packages/omni-server/data.local
24
- # chown node ./omnitool/packages/omni-server/data.local
25
- fi
26
-
27
- echo "[v] Creating the symlink "
28
- ln -s /data ./omnitool/packages/omni-server/data.local
29
- chown node ./omnitool/packages/omni-server/data.local
30
- fi
31
-
32
- else
33
- echo "[v] NO persistent /DATA DETECTED. You can add 20Gig of persistent storage as a paid option to Hugging Face"
34
- fi
35
-
36
-
37
  echo "[->] UPDATE OMNITOOL "
38
  cd ./omnitool
39
  output=$(git pull)
@@ -49,39 +16,26 @@ else
49
  chown -Rh node:node .
50
  fi
51
 
52
- # cd ..
53
- # echo "[->] CHECKING EXISTING /DATA "
54
- # if [ -d "/data" ]; then
55
- # echo "$(ls -l /data)"
56
 
57
- # if [ -L "./omnitool/packages/omni-server/data.local" ]; then
58
- # echo "[v] DATA.LOCAL symlink already present "
59
- # else
60
- # if [ -d "./omnitool/packages/omni-server/data.local" ]; then
61
- # echo "[v] DATA.LOCAL already present "
62
- # # hopefully it got copied over through the symlink in the previous run
63
- # rm -rf ./omnitool/packages/omni-server/data.local
64
-
65
- # mkdir ./omnitool/packages/omni-server/data.local
66
- # chmod 0777 ./omnitool/packages/omni-server/data.local
67
- # chown node ./omnitool/packages/omni-server/data.local
68
- # else
69
- # echo "[v] Creating DATA.LOCAL "
70
- # mkdir ./omnitool/packages/omni-server/data.local
71
- # chmod 0777 ./omnitool/packages/omni-server/data.local
72
- # chown node ./omnitool/packages/omni-server/data.local
73
- # fi
74
 
75
- # echo "[v] Creating the symlink "
76
- # ln -s /data ./omnitool/packages/omni-server/data.local
77
- # chown node ./omnitool/packages/omni-server/data.local
78
- # fi
79
-
80
- # else
81
- # echo "[v] NO persistent /DATA DETECTED. You can add 20Gig of persistent storage as a paid option to Hugging Face"
82
- # fi
83
- # echo "[->] CD OMNITOOL "
84
- # cd omnitool
85
 
86
  echo "[->] YARN START "
87
  yarn start -u -rb -R blocks
 
1
  #!/bin/bash
2
  echo "[->] START "
3
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
4
  echo "[->] UPDATE OMNITOOL "
5
  cd ./omnitool
6
  output=$(git pull)
 
16
  chown -Rh node:node .
17
  fi
18
 
19
+ echo "[->] CHECKING persisted /DATA "
20
+ if [ -d "/data" ]; then
21
+ echo "$(ls -l /data)"
 
22
 
23
+ if [ -L "./packages/omni-server/data.local" ]; then
24
+ echo "[v] DATA.LOCAL symlink already present "
25
+ else
26
+ if [ -d "./packages/omni-server/data.local" ]; then
27
+ echo "[v] DATA.LOCAL already present "
28
+ # hopefully it got copied over through the symlink in the previous run
29
+ rm -rf ./packages/omni-server/data.local
30
+ fi
 
 
 
 
 
 
 
 
 
31
 
32
+ echo "[v] Creating the symlink "
33
+ ln -s /data ./packages/omni-server/data.local
34
+ chown node ./packages/omni-server/data.local
35
+ fi
36
+ else
37
+ echo "[v] NO persistent /DATA DETECTED. You can add 20Gig of persistent storage as a paid option to Hugging Face"
38
+ fi
 
 
 
39
 
40
  echo "[->] YARN START "
41
  yarn start -u -rb -R blocks