Spaces:

omnitool-ai
/

omnitool_on_hf

Running

App Files Files Community

manu-sapiens commited on Dec 5, 2023

Commit

e343169

1 Parent(s): aa22602

improved welcome message

Browse files

Files changed (1) hide show

myNodeServer.js +32 -45

myNodeServer.js CHANGED Viewed

@@ -19,9 +19,11 @@ const OMNI_URL = 'http://127.0.0.1:1688'; // URL of the OMNITOOL service
 const PROXY_PORT_OMNITOOL = 4444;
 const CONTAINER_PORT_OMNITOOL = 1688;
 const OMNITOOL_HEALTH_PING = '/api/v1/mercenaries/ping';
-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 = `${HF_SPACE_URL}?duplicate=true`;
@@ -69,10 +71,10 @@ const COMMON_STYLES = `
             display: inline-block;
             background-color: #f0f0f0; /* Button color */
             color: #000; /* Text color */
-            padding: 10px 15px;
             text-align: center;
             text-decoration: none;
-            border: 1px solid #ddd;
             border-radius: 5px;
             font-size: 16px;
             cursor: pointer;
@@ -242,10 +244,6 @@ async function proxyRequest(req, res)
 function getButtonsString(buttonsHTML)
 {
-    // Add a button for the Hugging Face API call
-    const huggingFaceButton = '<button onclick="getHuggingFaceUserName()">Get Hugging Face User Name</button>';
     // Message to display based on CONNECTED_TO_MASTER
     let connectionStatusMessage;
     if (global.CONNECTED_TO_MASTER)
@@ -259,23 +257,28 @@ function getButtonsString(buttonsHTML)
     return `
         <html>
             <head>
-                <title>Proxy Server</title>
                 ${COMMON_STYLES}
             </head>
             <body>
-                <h1>Proxy Server</h1>
                 <p>Version: ${VERSION}</p>
-                <p>Local URL: ${global.LOCAL_URL}</p>
-                <p>Space Owner: ${global.SPACE_OWNER}</p>
-                <p>Connected to master: ${global.CONNECTED_TO_MASTER}</p>
-                <p>Omni URL: ${OMNI_URL}</p>
-                <p>Omni Running: ${global.OMNITOOL_RUNNING}</p>
-                <p>Omni Ready: ${global.OMNITOOL_READY}</p>
-                ${connectionStatusMessage} <!-- Display the connection status message -->
                 ${buttonsHTML}
-                ${huggingFaceButton}
                 ${LOG_CONTAINER_HTML}
                 <script>
                     // Script to check Hugging Face login status and control 'Clone Repo' button
@@ -323,23 +326,6 @@ function getButtonsString(buttonsHTML)
                         element.scrollTop = element.scrollHeight;
                     }
-                    // Function to handle the Hugging Face API call
-                    function getHuggingFaceUserName() {
-                        fetch('https://huggingface.co/api/whoami-v2')
-                            .then(response => response.json())
-                            .then(data => {
-                                if(data && data.name) {
-                                    alert('Hugging Face User Name: ' + data.name);
-                                } else {
-                                    alert('No name field in the response.');
-                                }
-                            })
-                            .catch(error => {
-                                console.error('Error fetching Hugging Face user name:', error);
-                                alert('Error fetching data.');
-                            });
-                    }
                     startLogPolling();
                 </script>
             </body>
@@ -363,7 +349,6 @@ async function handleGetRoot(req, res)
     {
         console.log('Omnitool server is not running');
         let startButtonClass = '';
-        let cloneButtonClass = '';
         if (!global.ALREADY_STARTING) startButtonClass = 'highlight-button';
         const gotoButtonClass = '';
@@ -394,17 +379,17 @@ async function handleGetRoot(req, res)
     proxyRequest(req, res);
 }
-function extractSpaceOwner(url, spaceName)
-{
-    const regex = new RegExp(`^(?:https?:\\/\\/)?([^\\/]*?)-${spaceName}\\.hf\\.space\\/?$`);
-    const match = url.match(regex);
-    return match ? match[1] : null;
-}
 function setGlobals(req)
 {
     console.log(`Setting global using req.headers['host'] = ${req.headers['host']}`);
     global.LOCAL_URL = req.headers['host'];
     if (req.protocol === "https") global.PROTOCOL = 'https'; else global.PROTOCOL = 'http';
     console.log(`global.LOCAL_URL = ${global.LOCAL_URL}\nglobal.PROTOCOL = ${global.PROTOCOL}`);
@@ -417,8 +402,10 @@ function setGlobals(req)
     // New logic to set CONNECTED_TO_MASTER
     global.CONNECTED_TO_MASTER = false;
-    global.SPACE_OWNER = extractSpaceOwner(global.LOCAL_URL, OMNITOOL_SPACE_NAME);
- console.log(`global.SPACE_OWNER = ${global.SPACE_OWNER}`);
     if (global.SPACE_OWNER === OMNITOOL_SPACE_OWNER) { global.CONNECTED_TO_MASTER = true; }
     console.log(`global.CONNECTED_TO_MASTER = ${global.CONNECTED_TO_MASTER}`);

 const PROXY_PORT_OMNITOOL = 4444;
 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 = `${HF_SPACE_URL}?duplicate=true`;
             display: inline-block;
             background-color: #f0f0f0; /* Button color */
             color: #000; /* Text color */
+            padding: 5px 10px;
             text-align: center;
             text-decoration: none;
+            border: 1px solid #000;
             border-radius: 5px;
             font-size: 16px;
             cursor: pointer;
 function getButtonsString(buttonsHTML)
 {
     // Message to display based on CONNECTED_TO_MASTER
     let connectionStatusMessage;
     if (global.CONNECTED_TO_MASTER)
     return `
         <html>
             <head>
+                <title>Omnitool</title>
                 ${COMMON_STYLES}
             </head>
             <body>
+                <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>
+                <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>
+                <p>-----------------------------------</p>
+                <p></p>
+                ${connectionStatusMessage}
+                <p></p>
                 ${buttonsHTML}
                 ${LOG_CONTAINER_HTML}
                 <script>
                     // Script to check Hugging Face login status and control 'Clone Repo' button
                         element.scrollTop = element.scrollHeight;
                     }
                     startLogPolling();
                 </script>
             </body>
     {
         console.log('Omnitool server is not running');
         let startButtonClass = '';
         if (!global.ALREADY_STARTING) startButtonClass = 'highlight-button';
         const gotoButtonClass = '';
     proxyRequest(req, res);
 }
 function setGlobals(req)
 {
     console.log(`Setting global using req.headers['host'] = ${req.headers['host']}`);
     global.LOCAL_URL = req.headers['host'];
+    // !!!!!!!!!
+    // TEST ONLY: global.LOCAL_URL = 'manu-sapiens-omnitool-test-3.hf.space/';
+    // !!!!!!!!!
     if (req.protocol === "https") global.PROTOCOL = 'https'; else global.PROTOCOL = 'http';
     console.log(`global.LOCAL_URL = ${global.LOCAL_URL}\nglobal.PROTOCOL = ${global.PROTOCOL}`);
     // 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; }
     console.log(`global.CONNECTED_TO_MASTER = ${global.CONNECTED_TO_MASTER}`);