removed submodule and moved git pull to Dockerfile

.gitmodules

@@ -1,3 +0,0 @@
-[submodule "omnitool"]
-	path = omnitool
-	url = https://github.com/omnitool-ai/omnitool.git

Dockerfile

@@ -4,9 +4,18 @@ USER node
 WORKDIR /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 mkdir -p /app/omnitool/node_modules
+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/
@@ -18,7 +27,7 @@ RUN chown -Rh $user:$user /app
 
 COPY --chown=node . /app
 
-RUN yarn install
+#RUN yarn install
 EXPOSE 4444
 
 CMD ["node", "hf_server.js"]

hf_server.js

@@ -317,6 +317,7 @@ function getButtonsString(buttonsHTML)
                                     logContainer.innerText = data.logs.join("");
                                     if (data.ready) {
                                         clearInterval(interval);
+                                        document.getElementById('exitIframeButton').disabled = false;
                                         document.getElementById('exitIframeButton').classList.add('highlight-button');
 
 
@@ -360,7 +361,7 @@ async function handleGetRoot(req, res)
 
         let buttonsHTML = `
         <button id="startServerButton" class="${startButtonClass}" onclick="startServer()">CREATE Omnitool Server</button>
-        <button id="exitIframeButton" class="${gotoButtonClass}" onclick="exitIframe()">LAUNCH Omnitool</button>
+        <button id="exitIframeButton" class="${gotoButtonClass}" onclick="exitIframe() disabled">LAUNCH Omnitool</button>
         <a href="${HF_SPACE_DUPLICATE_URL}" target="_blank" class="button-like-link" id="duplicateRepoButton">DUPLICATE Space</a>`;
 
         const html = getButtonsString(buttonsHTML);

omnitool

@@ -1 +0,0 @@
-Subproject commit 8cc31bba952351a937b58b010635022f01ccff06

omnitool_init.sh

@@ -2,29 +2,32 @@
 echo "[->] START "
 
 echo "[->] UPDATE OMNITOOL "
+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" ]; 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
+# 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
@@ -60,12 +63,12 @@ fi
 cd omnitool
 echo "[x] CD OMNITOOL "
 
-echo "[->] YARN INSTALL "
+echo "[->] YARN INSTALL"
 yarn
 
-# maybe that's all that is really needed (to be tested)
+echo "[->] Updating permissions"
 chmod -R 0777 .
-chown -Rh node .
+chown -Rh node:node .
 
 echo "[v] YARN START "
 yarn start -u -rb -R blocks