simplifying Dockerfile. Updated constant for omnitool space owner

Dockerfile

@@ -3,31 +3,17 @@ FROM node:20.6.1
 USER node
 WORKDIR /app
 
-RUN chmod 0777 /app
-RUN cd /app
+#RUN chmod 0777 /app
+#RUN cd /app
 RUN git clone https://github.com/omnitool-ai/omnitool.git
-RUN cd omnitool
-RUN yarn install
-#RUN mkdir -p /app/omnitool/node_modules
-RUN cd ..
-RUN yarn install
-RUN chmod 0777 /app
-
-#RUN mkdir -p /app/omnitool
-#RUN chmod 777 /app/omnitool
+RUN cd omnitool && yarn install
+#RUN yarn install
+#RUN cd ..
+#RUN yarn install
 RUN mkdir -p /app/omnitool/node_modules
-#RUN chmod 777 /app/omnitool/node_modules
-#RUN mkdir -p /app/omnitool/packages/omni-server/config.default/models/nsfwjs/mobilenet-v2-quant/
-#RUN chmod 777 /app/omnitool/packages/omni-server/config.default/models/nsfwjs/mobilenet-v2-quant/
-#RUN curl -L https://github.com/omnitool-ai/omnitool/raw/main/packages/omni-server/config.default/models/nsfwjs/mobilenet-v2-quant/group1-shard1of1 -o /app/omnitool/packages/omni-server/config.default/models/nsfwjs/mobilenet-v2-quant/group1-shard1of1
-#RUN chmod 777 /app/omnitool/packages/omni-server/config.default/models/nsfwjs/mobilenet-v2-quant/group1-shard1of1
-
+RUN chmod 0777 /app
 RUN chown -Rh $user:$user /app
-#RUN chown -Rh $user:$user /app/omnitool
-
 COPY --chown=node . /app
-
-#RUN yarn install
 EXPOSE 4444
 
 CMD ["node", "hf_server.js"]

hf_server.js

@@ -3,7 +3,7 @@
  * All rights reserved.
  */
 //@ts-check
-const VERSION = '0.6.0.hf.011a';
+const VERSION = '0.6.0.hf.012.a';
 
 const express = require('express');
 const http = require('http');
@@ -22,10 +22,11 @@ const CONTAINER_PORT_OMNITOOL = 1688;
 const OMNITOOL_HEALTH_PING = '/api/v1/mercenaries/ping';
 const FAVICON = 'https://github.com/omnitool-ai/omnitool/raw/main/packages/omni-ui/omni-web/public/favicon.jpg'
 
-const OMNITOOL_SPACE_NAME = 'omnitool-test-3';
-const OMNITOOL_SPACE_OWNER = 'manu-sapiens';
-const HF_SPACE_URL = `https://huggingface.co/spaces/${OMNITOOL_SPACE_OWNER}/${OMNITOOL_SPACE_NAME}`;
-const HF_SPACE_DUPLICATE_URL = `https://huggingface.co/spaces/manu-sapiens/omnitool_test_3?duplicate=true`;
+//const OMNITOOL_SPACE_NAME = 'omnitool-test-3';
+//const OMNITOOL_SPACE_OWNER = 'manu-sapiens';
+const OMNITOOL_SPACE_URL = "https://omnitool-ai-omnitool-on-hf.hf.space/";
+const HF_SPACE_URL = "https://huggingface.co/spaces/omnitool-ai/omnitool_on_hf";
+const HF_SPACE_DUPLICATE_URL = "https://huggingface.co/spaces/omnitool-ai/omnitool_on_hf?duplicate=true";
 
 const DELAY_OMNITOOL_SET_TO_RUNNING = 2000; // 2 seconds
 const CHECK_OMNI_INTERVAL = 60000; // 1 minute
@@ -41,7 +42,7 @@ global.PROXY_STARTED = false;
 global.logs = [];
 global.OMNITOOL_PROXY = null;
 global.CONNECTED_TO_MASTER = false;
-global.SPACE_OWNER = "";
+
 
 
 console.log(`************ Omnitool Proxy Server v${VERSION} ************`);
@@ -257,7 +258,7 @@ function getButtonsString(buttonsHTML)
         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>';
     } else
     {
-        connectionStatusMessage = `<div style="color: green;">You are now connected to the space of ${global.SPACE_OWNER}.</div><div>If this is NOT you, it is HIGHLY recommended that you duplicate this space and make it private to secure your keys, recipes and outputs.</div><div>In addition, consider subscribing to the 20GB local storage option from Huggingface to preserve your keys and work between reboot of this server.</div>`;
+        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>`;
     }
 
     return `
@@ -270,11 +271,10 @@ function getButtonsString(buttonsHTML)
                 <h1>Omnitool.ai on Hugging Face</h1>
                 <p>Version: ${VERSION}</p>
                 <div>Welcome to Omnitool.ai running on Hugging Face!</div>
-                <div>This is a fully functional version.</div>
-                <div>For more details visit us at <a href="https://omnitool.ai" target="_blank" class="button-like-link" id="duplicateRepoButton">omnitool.ai</a></div>
+                <div>This is a fully functional version, but all recipes and outputs are lost when the server is restarted!</div>
+                <div>For more details, including how to install omnitool on your own computer, visit us at <a href="https://omnitool.ai" target="_blank" class="button-like-link" id="duplicateRepoButton">omnitool.ai</a></div>
                 <p>-----------------------------------</p>
                 <p>This Space URL: ${global.LOCAL_URL}</p>
-                <p>This Space Owner: ${global.SPACE_OWNER}</p>
                 <p>Using REFERENCE Space: ${global.CONNECTED_TO_MASTER}</p>
                 <p>Omnitool SERVER Launched: ${global.ALREADY_STARTING}</p>
                 <p>Omnitool SERVER Ready: ${global.OMNITOOL_READY}</p>
@@ -412,12 +412,7 @@ function setGlobals(req)
 
     // New logic to set CONNECTED_TO_MASTER
     global.CONNECTED_TO_MASTER = false;
-    const recreated_string = `-${OMNITOOL_SPACE_NAME}.hf.space`;
-    // remove the protocol, a possible trailing / and the recreated string from the url
-    global.SPACE_OWNER = global.LOCAL_URL.replace(/\/$/, '').replace(recreated_string, '');
-    console.log(`global.SPACE_OWNER = ${global.SPACE_OWNER}`);
-
-    if (global.SPACE_OWNER === OMNITOOL_SPACE_OWNER) { global.CONNECTED_TO_MASTER = true; }
+    if (global.LOCAL_URL === OMNITOOL_SPACE_URL) global.CONNECTED_TO_MASTER = true;
     console.log(`global.CONNECTED_TO_MASTER = ${global.CONNECTED_TO_MASTER}`);
 
 }

omnitool_init.sh

@@ -6,62 +6,39 @@ cd ./omnitool
 git pull
 cd ..
 
-# if [ -d "./omnitool" ]; then
-#     echo "[v] OMNITOOL already present "
-#     cd ./omnitool
-#     git pull
-#     cd ..
-#     chmod 0777 ./omnitool
-#     chown -R node:node ./omnitool
-# else
-#     echo "[ERROR] OMNITOOL IS MISSING"
-#     git clone https://github.com/omnitool-ai/omnitool.git
-#     chmod 0777 ./omnitool
-#     chown -R node:node ./omnitool
-# fi
-
-# if [ -d "./omnitool/node_modules" ]; then
-#     echo "[v] OMNITOOL NODE_MODULES already present "
-# else
-#     mkdir -p ./omnitool/node_modules
-#     chmod 0777 ./omnitool/node_modules
-#     chown node ./omnitool/node_modules
-#     echo "[+] Adding OMNITOOL NODE_MODULES"
-# fi
-
-echo "[->] CHECKING EXISTING /DATA "
-if [ -d "/data" ]; then
-    echo "$(ls -l /data/files)" 
-
-    if [ -L "./omnitool/packages/omni-server/data.local" ]; then
-        echo "[v] DATA.LOCAL symlink already present "
-    else
-        if [ -d "./omnitool/packages/omni-server/data.local" ]; then
-            echo "[v] DATA.LOCAL already present "
-            # hopefully it got copied over through the symlink in the previous run
-            rm -rf ./omnitool/packages/omni-server/data.local
+# echo "[->] CHECKING EXISTING /DATA "
+# if [ -d "/data" ]; then
+#     echo "$(ls -l /data)" 
+
+#     if [ -L "./omnitool/packages/omni-server/data.local" ]; then
+#         echo "[v] DATA.LOCAL symlink already present "
+#     else
+#         if [ -d "./omnitool/packages/omni-server/data.local" ]; then
+#             echo "[v] DATA.LOCAL already present "
+#             # hopefully it got copied over through the symlink in the previous run
+#             rm -rf ./omnitool/packages/omni-server/data.local
             
-            mkdir ./omnitool/packages/omni-server/data.local        
-            chmod 0777 ./omnitool/packages/omni-server/data.local
-            chown node ./omnitool/packages/omni-server/data.local
-        else
-            echo "[v] Creating DATA.LOCAL "
-            mkdir ./omnitool/packages/omni-server/data.local
-            chmod 0777 ./omnitool/packages/omni-server/data.local
-            chown node ./omnitool/packages/omni-server/data.local
-        fi
-
-        echo "[v] Creating the symlink "
-        ln -s /data ./omnitool/packages/omni-server/data.local
-        chown node ./omnitool/packages/omni-server/data.local
-    fi
+#             mkdir ./omnitool/packages/omni-server/data.local        
+#             chmod 0777 ./omnitool/packages/omni-server/data.local
+#             chown node ./omnitool/packages/omni-server/data.local
+#         else
+#             echo "[v] Creating DATA.LOCAL "
+#             mkdir ./omnitool/packages/omni-server/data.local
+#             chmod 0777 ./omnitool/packages/omni-server/data.local
+#             chown node ./omnitool/packages/omni-server/data.local
+#         fi
+
+#         echo "[v] Creating the symlink "
+#         ln -s /data ./omnitool/packages/omni-server/data.local
+#         chown node ./omnitool/packages/omni-server/data.local
+#     fi
     
-else
-    echo "[v] NO persistent /DATA DETECTED. You can add 20Gig of persistent storage as a paid option to Hugging Face"
-fi
+# else
+#     echo "[v] NO persistent /DATA DETECTED. You can add 20Gig of persistent storage as a paid option to Hugging Face"
+# fi
 
+echo "[->] CD OMNITOOL "
 cd omnitool
-echo "[x] CD OMNITOOL "
 
 echo "[->] YARN INSTALL"
 yarn
@@ -70,5 +47,5 @@ echo "[->] Updating permissions"
 chmod -R 0777 .
 chown -Rh node:node .
 
-echo "[v] YARN START "
+echo "[->] YARN START "
 yarn start -u -rb -R blocks