back to basics with simplest installation possible

.editorconfig

@@ -0,0 +1,10 @@
+root = true
+
+[*]
+end_of_line = lf
+insert_final_newline = true
+
+[*.{js,json,yml}]
+charset = utf-8
+indent_style = space
+indent_size = 2

Dockerfile

@@ -1,42 +1,22 @@
 FROM node:20.6.1
-
 USER node
-WORKDIR /app
-
-RUN mkdir -p /app/node_modules
-RUN chmod 777 /app
-RUN chmod 777 /app/node_modules
+WORKDIR /home/node/app
 
-COPY --chown=node package*.json /app
-COPY --chown=node yarn.lock /app
-COPY --chown=node . /app
-
-# Get curl
-#RUN apt-get update && apt-get install -y curl
-# Download the file to a temporary location
+COPY --chown=node ./requirements.txt /home/node/app/requirements.txt
 RUN curl -L https://github.com/omnitool-ai/omnitool/raw/main/packages/omni-server/config.default/models/nsfwjs/mobilenet-v2-quant/group1-shard1of1 -o _tempfile.bin
+RUN mkdir -p /home/node/app/packages/omni-server/config.default/models/nsfwjs/mobilenet-v2-quant/
+RUN chmod 777 /home/node/app/packages/omni-server/config.default/models/nsfwjs/mobilenet-v2-quant/
+RUN mv _tempfile.bin /home/node/app/packages/omni-server/config.default/models/nsfwjs/mobilenet-v2-quant/group1-shard1of1 && chown -R node /home/node/app/packages/omni-server/config.default/models/nsfwjs/mobilenet-v2-quant/group1-shard1of1
+RUN chmod 777 /home/node/app/packages/omni-server/config.default/models/nsfwjs/mobilenet-v2-quant/group1-shard1of1
 
-# Create the target directory
-RUN mkdir -p /app/packages/omni-server/config.default/models/nsfwjs/mobilenet-v2-quant/ 
-RUN chmod 777 /app/packages/omni-server/config.default/models/nsfwjs/mobilenet-v2-quant/
-
-# Move the file to the desired directory
-RUN mv _tempfile.bin /app/packages/omni-server/config.default/models/nsfwjs/mobilenet-v2-quant/group1-shard1of1 && chown -R node /app/packages/omni-server/config.default/models/nsfwjs/mobilenet-v2-quant/group1-shard1of1
-RUN chmod 777 /app/packages/omni-server/config.default/models/nsfwjs/mobilenet-v2-quant/group1-shard1of1
+COPY --chown=node . /home/node/app
 
-RUN chown -Rh $user:$user /app
-
-# Copy application source code along with main.py and run.sh
-COPY --chown=node . /app
+RUN yarn install
 
-# Give execution rights to the shell script
-# RUN chmod +x $HOME/app/start.sh
+EXPOSE 1688
 
-RUN yarn install
+CMD [ "./omnitool_start.sh" ]
 
-# Create a new service container using the `yarn-app` image as a builder
-EXPOSE 7860
 
-CMD [ "node", "launch.js" ]
-#CMD [ "yarn", "start","-u","-rb" ]
-# CMD ["/app/run.sh"]
+# ## docker build -t manusapiens/omnitool-test2b .
+# ## docker run --name n10c -p 7860:7860 -d manusapiens/omnitool-test2b

README.md

@@ -1,8 +1,314 @@
 ---
-title: O Test 3
+title: O T 3
 emoji: 🐳
-colorFrom: gray
-colorTo: blue
+colorFrom: yellow
+colorTo: gray
 sdk: docker
-app_port: 7860
----
+app_port: 1688
+---
+# Omnitool.ai - Your Open Source AI Desktop
+
+*Discover, Learn, Evaluate and Build with thousands of Generative AI Models.*
+
+Omnitool.ai is an open-source, downloadable "AI Lab in a box" built for learners, enthusiasts and anyone with interest in the current wave of AI innovation. It provides an extensible browser based desktop environment for streamlined, hands-on interacting with the latest AI models from OpenAI, replicate.com, Stable Diffusion, Google, or other leading providers through a single, unified interface.
+
+![Alt text](assets/screenshot_desktop_03.png)
+
+Watch the [demo](https://tinyurl.com/omnitool-demo)! and see more [videos](https://www.youtube.com/@OmnitoolAI/videos) on our Youtube channel.
+
+## Why Omnitool?
+
+With thousands of preprints and countless "AI tools" released each week, it is incredibly challenging to stay on top of the rapidly evolving AI ecosystem, to separate hype and facts and to extract durable long term skills and learning. PapersWithCode and GitHub repositories attached to arXiv papers provide ability to hands-on validate and apply the latest discoveries, but the fragile nature of the Python ecosystem and often steep hardware requirments dramatically limits accessibility. Likewise implementing and testing cloud based models requires delving deep into API documentation and wrestling with connecting code.
+
+We believe that is a serious problem. AI may represent the first large scale technological disruption unbounded by logistical challenges, scaling along existing wires, API infastructure and app delivery platforms. Meanwhile, market pressure to adopt AI is felt by many businesses and teams.
+
+Without educated decision makers and technical experts,  businesses and public organisations alike are at high risk of falling for hype and magical narratives and expensive misadventures.      
+
+Omnitool is our attempt to improve this situation: A **single, unified interface** capable of connecting with as many AI models as possible and to **reduce the "time to hands on AI" to an absolute minimum**. 
+
+Omnitool is **highly extensible and interoperable**. Most OpenAPI3 based services can be connected and turned into "blocks" without writing code. It's extension framework enables deeper integrations of anything from custom UIs (Like Stability Dream Studio) to Game Engines (like BabyonJS or Phaser) to [Image manipulation libraries](https://github.com/georgzoeller/omni-extension-sharp/blob/master/README.md).
+
+
+## What Omnitool is NOT
+
+- Omnitool is **not a multi-user cloud SaaS product**. It's a downloadable, locally installed product. 
+- Omnitool is **NOT a no-code solution** meant to replace coding or enable non engineers to code. It's focused on interacting with AI use cases, not writing general purpose software.
+- Omnitool is **not production/enterprise software**. (Yet.) It's a lab optimizing for access to the latest technologies over stability and, as with any lab, things may blow up from time to time.  
+   
+
+## Table of Contents
+
+- [Key Features](#key-features)
+- [Quickstart](#quickstart-guide)
+- [Manual Install](#manual-install)
+- [PocketBase DB Admin (ADVANCED)](#pocketbase-db-admin-advanced)
+- [Next Steps](#next-steps)
+- [Changelist](#changelist)
+
+## Key Features
+
+### Self-hosted and Open Source
+
+* Omnitool is local self-hosted software that turns your machine into a powerful AI Lab.
+
+  * You install Omnitool and it runs on your Mac, Windows or Linux notebook, desktop or server, not cloud servers. 
+  * Data stores it's data locally on your machine and is only transmitted to the third party provider APIs you choose to access. Updates are managed via github.
+  * A Docker Image is forthcoming.
+  * If you are interested in running Omnitool in the cloud, please get in touch with us at [email protected]
+
+* Open Source and Open Standards
+   * Omnitool is licensed as open source software and heavily leverages open standards, such as OpenAPI, making it interoperable and extensible.
+
+### Rapid Access to the world of generative AI without GPU, Managing Python installations and learning dozens of APIs and interfaces
+
+* Minimal Time-to-AI: It allows you to try out models and services in minutes without having to study API docs, write boilerplate code, manage python venvs or figuring out new user interfaces. Because of it's integration of many leading AI platforms, the lag time between "paper with code" to hands on experimentation often is cut down to days. 
+
+* It presents the vast world of generative AI - image, video, audio, text, and classification APIS - through a single, unified user interface without oversimplifying or hiding the power of the APIs.
+  
+### Comprehensive AI Provider Support
+* Seamlessly provides access to 1000s of AI model and utility APIs from an rapidly growing list leading AI providers and aggregators, exposing them all via interoperable blocks.
+  
+Currently supported (v. 0.5.3) :
+   * [Civitai.com](https://civitai.com) (Model metadata access)
+   * [Deepl.com](https://deepl.com) (Document translation)
+   * [ElevenLabs.io](https://elevenlabs.io) (Multilingual voice generation)
+   * Getimg.ai (Image generation and manipulation APIs)
+   * Github.com (Various)
+   * Google.com
+      * Gmail
+      * Vertex (AI)
+      * Google Translate
+      * Google TTS (Text to Speech)
+      * Google Vision (Computer Vision)
+   * [Huggingface.com](https://huggingface.com) (1000's of models, including free inference models)
+   * [OpenAI.com](https://openai.com) (Image/Text/Audio Generation including GPT3/4/Visual, Whisper, Dall-e 2, Dall-e 3, Moderation APIs and more)
+   * [OpenRouter.ai](https://OpenRouter.ai) (100s of LLM APIs)
+   * [Perplexity.ai](https://perplexity.ai) (Text Generation)
+   * [Stability.ai](https://stability.ai) (Image Generation and Manipulation APIs)
+   * [TextSynth.com](https://textsynth.com) (LLM, translation, and classification APIs)
+   * [Replicate.com](https://replicate.com/explore) (1000s of models across all modalities)
+   * [Uberduck.com](https://uberduck.com) (Voice Generation, Music centric offerings)
+   * [Unsplash.com](https://unsplash.com) (Stock imagery)
+   * with many more APIs in testing...
+
+* Support for the following Open Source APIs is in the final stages of testing:
+  * Automatic1111/SDNext API
+  * Oobabooga Text Generation API
+  * Ollama API
+
+* Omnitool is able to generate blocks from any openapi.json definitions via URL or directly supplied file. We support a number of custom x- annotations that can be added to openapi definitions to allow omnitool to guide the block generation. It also supports creating "patches" on top of existing APIs to create customized blocks. With integrated JSONATA support, it is possible to build powerful data processing blocks using pure data.
+
+
+### Extensible Architecture
+
+* Inspired by the common modding architecture found in video game toolsets, Omnitool is built, from the ground up, to be extensible via multiple mechanisms:  
+  * Simple **Client and Server scripts** allowing addition of /commands that are hot-reloaded, so editing and building is a breeze.
+  * **Client Extensions** - any web-app/webpage can be turned into an extension and integrated directly on Omnitool's desktop via it's window system. Omnitool's client SDK exposes the full range of platform functionality to extensions, allowing you to write apps or tools using every API or recipe enabled in Omnitool. 
+  * **Server Extensions** - Server extensions written in javascript that can add new blocks, API and core functionality.
+
+* Some examples of currently available extensions:
+  * omni-core-replicate, a core extensions that allows import of any AI model on [replicate.com](https://replicate.com) into a ready to use block in Omnitool 
+  * [omni-extension-sharp](https://github.com/omnitool-community/omni-extension-sharp), an extension adding an array of Image Manipulation blocks such as format conversion, masking, composition and more based on the powerful [sharp](https://github.com/lovell/sharp) image processing library.
+  * omni-extension-minipaint, a powerful [photo editing tool](https://github.com/viliusle/miniPaint) useful for quickly creating and editing images without switching out of the app.
+  * omni-extension-openpose, a [OpenPose based](https://github.com/CMU-Perceptual-Computing-Lab/openpose) pose estimation and generation toolkit useful for creating guidance images for controlnet/diffusion models.
+  * omni-extension-tldraw, a whiteboarding/sketching extension built on [TLDraw](https://github.com/tldraw/tldraw), useful for generating input for visual transformers and diffusion models
+  * omni-extension-wavacity, a [full wasm implementation](https://wavacity.com/) of Audacity, a state of the art audio recorder/editor useful for generating and editing audio content.
+    
+* Visit the Extension tab in app or see our [Omnitool Community Github](https://github.com/orgs/omnitool-community/repositories) for a list of currently available extensions
+
+  
+## Quickstart Guide
+
+We are currently testing installers for Windows and macOS. Until those are publicly available, please follow the manual installation steps.
+
+## Manual Install
+
+This guide will help you download the Omnitool software, and then build and start the Omnitool server in a directory running from your local machine.
+
+You can then access the Omnitool software from a web browser on your local machine.
+
+1. **Prerequisites**
+
+  Ensure you have the latest versions of the following sofware installed:
+
+ * [Node.js](https://nodejs.org/en)
+ * [Yarn](https://yarnpkg.com)
+ * [Git](https://en.wikipedia.org/wiki/Git)
+
+
+2. **Get the Source Code**
+ - Open a terminal
+ - Navigate to where you want Omnitool to be installed 
+ - Use the following command:
+  ```
+    git clone https://github.com/omnitool-ai/omnitool
+  ```
+
+  This will create the `omnitool` folder.  
+
+  - Now navigate inside Omnitool's folder. By default:
+  ```
+    cd omnitool
+  ```
+
+3. **Install Source Dependencies**
+
+  Run the following command in the root of the repository to install the necessary dependencies:
+  ```
+    yarn install
+  ```
+**Troubleshooting**
+
+* **PYTHON 3.12** - some users are reporting a yarn install failure due to **a missing python module 'distutils'**. To resolve this, we recommend running our fix script to detect and autofix any potential issues and try again. Or you can manually pip install 'setuptools' from the terminal.
+```
+  node setup\fix.js
+```
+
+4. **Build and Start the Server**
+
+  Now we will use `yarn` and `Node.js` to build the server software locally on your machine and then start it running.
+
+  Windows:
+  ```
+    start.bat
+  ```
+
+  MacOS/Linux:
+  ```
+   ./start.sh
+  ```
+
+  When successful, you will see the following message:
+
+  ```
+◐ Booting Server
+✔ Server has started and is ready to accept connections on http://127.0.0.1:1688.
+✔ Ctrl-C to quit.
+```
+
+5. **Open Omnitool in a Web Browser**
+
+  Omnitool.ai can now be accessed from:
+  [127.0.0.1:1688](http://127.0.0.1:1688)  
+
+---
+6. **Explore the Sample Recipes**
+  Use the "Load Recipe" button in the menu to explore different functionality of the platform.
+
+---
+7. **Explore the Code**
+  For a list of scripts we use internally, try running:
+  ```
+    yarn run
+  ```
+
+## PocketBase DB Admin (ADVANCED)
+Recipes and various cache data are stored in a [PocketBase](https://pocketbase.io) database.
+
+If the database is currently running, you can access the default PocketBase admin interface by navigating to [127.0.0.1:8090/_](http://127.0.0.1:8090/_)
+
+Alternatively, the admin interface can be accessed directly within omnitool. From the main menu, choose the `Database Admin` option and the same interface will open inside the omnitool browser window.
+
+o log in to the database, use the credentials
+ * Email: **[email protected]**
+ * Password: **[email protected]**
+
+Once logged in, you can directly modify records using the PocketBase admin interface. This is particularly useful for advanced configurations and troubleshooting.
+
+### Reset Local PocketBase Storage (ADVANCED)
+
+There may be occasions when you need to reset your local database, either to recover from an invalid state or to start with a fresh install.
+
+For Linux:
+   ```bash
+   rm -rf ./local.bin
+   yarn start
+   ```
+For Windows:
+  ```cmd
+  rmdir /s /q .\local.bin
+  yarn start
+  ```
+
+- **Warning**:
+  - **ALL YOUR LOCAL RECIPES, GENERATED IMAGES, DOCUMENTS, AUDIO ETC, WILL BE PERMANENTLY ERASED**
+
+## Generating a JWT Token
+
+Our service allows you to generate a JWT by running a specific script designed for this purpose. The script's signature is as follows:
+
+```
+/generateJwtToken <action> <subject> <expires_in>
+```
+
+**Parameters**
+
+- `<action>`: This is a string parameter identifying the intended action to be performed. In the context of running recipes, this should be set to exec.
+- `<subject>`: This is a string parameter that specifies the subject of the JWT. This could be the recipe that you intend to execute.
+- `<expires_in>`: This is an integer parameter that determines the token's validity period in milliseconds.
+
+**Example**
+
+To generate a JWT for executing a recipe with a validity of 30,000 milliseconds (or 30 seconds), you would run the following script:
+
+```
+/generateJwtToken exec Workflow 30000
+```
+
+**Output**
+
+The script will output a JWT, which is a token string to be used in the authorization header for your API requests.
+
+### Executing a recipe with JWT Authentication
+
+Once you have your JWT, you can execute a recipe by making a POST request to the recipe execution API. This request must include the JWT in the Authorization header.
+
+**Endpoint**
+
+```
+POST http://127.0.0.1:1688/api/v1/workflow/exec
+```
+
+**Header**
+
+```
+Authorization: Bearer <token>
+```
+
+`<token>` is the JWT acquired from the /generateJwtToken script.
+
+**Curl Example**
+
+To make the request using curl, you would use the following command, replacing <token> with your actual JWT:
+
+```
+curl -X POST http://127.0.0.1:1688/api/v1/workflow/exec -H "Authorization: Bearer <token>"
+```
+
+**Response**
+
+Upon success, the API will initiate the specified recipe. You will receive a JSON response containing details about the recipe's execution status, including any outputs or errors.
+
+**Security Considerations**
+
+- Keep your JWT secure to prevent unauthorized access to your recipes.
+- Always use a secure connection to interact with the APIs.
+- Regularly rotate your tokens and use a short expiration time to minimize the impact of potential leaks.
+
+**Troubleshooting**
+
+* If you encounter authorization errors, ensure the JWT has not expired, is correctly set in the header, and was generated with the proper parameters.
+
+## Next Steps
+
+1. Join the Omnitool.ai Discord Community
+
+Interact with fellow users, share your experiences, ask questions, and be a part of our active and growing community on [Discord](https://tinyurl.com/omnitool-discord).
+
+2. Contribute to Omnitool.ai
+
+As an open-source platform, we welcome contributions from users like you. Whether it's improving documentation, adding new features, or simply sharing your unique use cases, your input is invaluable to us. Simply send us a pull-request and we'll be in contact.
+
+3. Feedback and Suggestions
+
+Your feedback helps shape the future of Omnitool.ai. Send your feedback and suggestions to [[email protected]](mailto:[email protected]), or share them directly in our [Discord #feedback channel](https://tinyurl.com/omnitool-feedback). 

README2.md

@@ -1,306 +0,0 @@
-# Omnitool.ai - Your Open Source AI Desktop
-
-*Discover, Learn, Evaluate and Build with thousands of Generative AI Models.*
-
-Omnitool.ai is an open-source, downloadable "AI Lab in a box" built for learners, enthusiasts and anyone with interest in the current wave of AI innovation. It provides an extensible browser based desktop environment for streamlined, hands-on interacting with the latest AI models from OpenAI, replicate.com, Stable Diffusion, Google, or other leading providers through a single, unified interface.
-
-![Alt text](assets/screenshot_desktop_03.png)
-
-Watch the [demo](https://tinyurl.com/omnitool-demo)! and see more [videos](https://www.youtube.com/@OmnitoolAI/videos) on our Youtube channel.
-
-## Why Omnitool?
-
-With thousands of preprints and countless "AI tools" released each week, it is incredibly challenging to stay on top of the rapidly evolving AI ecosystem, to separate hype and facts and to extract durable long term skills and learning. PapersWithCode and GitHub repositories attached to arXiv papers provide ability to hands-on validate and apply the latest discoveries, but the fragile nature of the Python ecosystem and often steep hardware requirments dramatically limits accessibility. Likewise implementing and testing cloud based models requires delving deep into API documentation and wrestling with connecting code.
-
-We believe that is a serious problem. AI may represent the first large scale technological disruption unbounded by logistical challenges, scaling along existing wires, API infastructure and app delivery platforms. Meanwhile, market pressure to adopt AI is felt by many businesses and teams.
-
-Without educated decision makers and technical experts,  businesses and public organisations alike are at high risk of falling for hype and magical narratives and expensive misadventures.      
-
-Omnitool is our attempt to improve this situation: A **single, unified interface** capable of connecting with as many AI models as possible and to **reduce the "time to hands on AI" to an absolute minimum**. 
-
-Omnitool is **highly extensible and interoperable**. Most OpenAPI3 based services can be connected and turned into "blocks" without writing code. It's extension framework enables deeper integrations of anything from custom UIs (Like Stability Dream Studio) to Game Engines (like BabyonJS or Phaser) to [Image manipulation libraries](https://github.com/georgzoeller/omni-extension-sharp/blob/master/README.md).
-
-
-## What Omnitool is NOT
-
-- Omnitool is **not a multi-user cloud SaaS product**. It's a downloadable, locally installed product. 
-- Omnitool is **NOT a no-code solution** meant to replace coding or enable non engineers to code. It's focused on interacting with AI use cases, not writing general purpose software.
-- Omnitool is **not production/enterprise software**. (Yet.) It's a lab optimizing for access to the latest technologies over stability and, as with any lab, things may blow up from time to time.  
-   
-
-## Table of Contents
-
-- [Key Features](#key-features)
-- [Quickstart](#quickstart-guide)
-- [Manual Install](#manual-install)
-- [PocketBase DB Admin (ADVANCED)](#pocketbase-db-admin-advanced)
-- [Next Steps](#next-steps)
-- [Changelist](#changelist)
-
-## Key Features
-
-### Self-hosted and Open Source
-
-* Omnitool is local self-hosted software that turns your machine into a powerful AI Lab.
-
-  * You install Omnitool and it runs on your Mac, Windows or Linux notebook, desktop or server, not cloud servers. 
-  * Data stores it's data locally on your machine and is only transmitted to the third party provider APIs you choose to access. Updates are managed via github.
-  * A Docker Image is forthcoming.
-  * If you are interested in running Omnitool in the cloud, please get in touch with us at [email protected]
-
-* Open Source and Open Standards
-   * Omnitool is licensed as open source software and heavily leverages open standards, such as OpenAPI, making it interoperable and extensible.
-
-### Rapid Access to the world of generative AI without GPU, Managing Python installations and learning dozens of APIs and interfaces
-
-* Minimal Time-to-AI: It allows you to try out models and services in minutes without having to study API docs, write boilerplate code, manage python venvs or figuring out new user interfaces. Because of it's integration of many leading AI platforms, the lag time between "paper with code" to hands on experimentation often is cut down to days. 
-
-* It presents the vast world of generative AI - image, video, audio, text, and classification APIS - through a single, unified user interface without oversimplifying or hiding the power of the APIs.
-  
-### Comprehensive AI Provider Support
-* Seamlessly provides access to 1000s of AI model and utility APIs from an rapidly growing list leading AI providers and aggregators, exposing them all via interoperable blocks.
-  
-Currently supported (v. 0.5.3) :
-   * [Civitai.com](https://civitai.com) (Model metadata access)
-   * [Deepl.com](https://deepl.com) (Document translation)
-   * [ElevenLabs.io](https://elevenlabs.io) (Multilingual voice generation)
-   * Getimg.ai (Image generation and manipulation APIs)
-   * Github.com (Various)
-   * Google.com
-      * Gmail
-      * Vertex (AI)
-      * Google Translate
-      * Google TTS (Text to Speech)
-      * Google Vision (Computer Vision)
-   * [Huggingface.com](https://huggingface.com) (1000's of models, including free inference models)
-   * [OpenAI.com](https://openai.com) (Image/Text/Audio Generation including GPT3/4/Visual, Whisper, Dall-e 2, Dall-e 3, Moderation APIs and more)
-   * [OpenRouter.ai](https://OpenRouter.ai) (100s of LLM APIs)
-   * [Perplexity.ai](https://perplexity.ai) (Text Generation)
-   * [Stability.ai](https://stability.ai) (Image Generation and Manipulation APIs)
-   * [TextSynth.com](https://textsynth.com) (LLM, translation, and classification APIs)
-   * [Replicate.com](https://replicate.com/explore) (1000s of models across all modalities)
-   * [Uberduck.com](https://uberduck.com) (Voice Generation, Music centric offerings)
-   * [Unsplash.com](https://unsplash.com) (Stock imagery)
-   * with many more APIs in testing...
-
-* Support for the following Open Source APIs is in the final stages of testing:
-  * Automatic1111/SDNext API
-  * Oobabooga Text Generation API
-  * Ollama API
-
-* Omnitool is able to generate blocks from any openapi.json definitions via URL or directly supplied file. We support a number of custom x- annotations that can be added to openapi definitions to allow omnitool to guide the block generation. It also supports creating "patches" on top of existing APIs to create customized blocks. With integrated JSONATA support, it is possible to build powerful data processing blocks using pure data.
-
-
-### Extensible Architecture
-
-* Inspired by the common modding architecture found in video game toolsets, Omnitool is built, from the ground up, to be extensible via multiple mechanisms:  
-  * Simple **Client and Server scripts** allowing addition of /commands that are hot-reloaded, so editing and building is a breeze.
-  * **Client Extensions** - any web-app/webpage can be turned into an extension and integrated directly on Omnitool's desktop via it's window system. Omnitool's client SDK exposes the full range of platform functionality to extensions, allowing you to write apps or tools using every API or recipe enabled in Omnitool. 
-  * **Server Extensions** - Server extensions written in javascript that can add new blocks, API and core functionality.
-
-* Some examples of currently available extensions:
-  * omni-core-replicate, a core extensions that allows import of any AI model on [replicate.com](https://replicate.com) into a ready to use block in Omnitool 
-  * [omni-extension-sharp](https://github.com/omnitool-community/omni-extension-sharp), an extension adding an array of Image Manipulation blocks such as format conversion, masking, composition and more based on the powerful [sharp](https://github.com/lovell/sharp) image processing library.
-  * omni-extension-minipaint, a powerful [photo editing tool](https://github.com/viliusle/miniPaint) useful for quickly creating and editing images without switching out of the app.
-  * omni-extension-openpose, a [OpenPose based](https://github.com/CMU-Perceptual-Computing-Lab/openpose) pose estimation and generation toolkit useful for creating guidance images for controlnet/diffusion models.
-  * omni-extension-tldraw, a whiteboarding/sketching extension built on [TLDraw](https://github.com/tldraw/tldraw), useful for generating input for visual transformers and diffusion models
-  * omni-extension-wavacity, a [full wasm implementation](https://wavacity.com/) of Audacity, a state of the art audio recorder/editor useful for generating and editing audio content.
-    
-* Visit the Extension tab in app or see our [Omnitool Community Github](https://github.com/orgs/omnitool-community/repositories) for a list of currently available extensions
-
-  
-## Quickstart Guide
-
-We are currently testing installers for Windows and macOS. Until those are publicly available, please follow the manual installation steps.
-
-## Manual Install
-
-This guide will help you download the Omnitool software, and then build and start the Omnitool server in a directory running from your local machine.
-
-You can then access the Omnitool software from a web browser on your local machine.
-
-1. **Prerequisites**
-
-  Ensure you have the latest versions of the following sofware installed:
-
- * [Node.js](https://nodejs.org/en)
- * [Yarn](https://yarnpkg.com)
- * [Git](https://en.wikipedia.org/wiki/Git)
-
-
-2. **Get the Source Code**
- - Open a terminal
- - Navigate to where you want Omnitool to be installed 
- - Use the following command:
-  ```
-    git clone https://github.com/omnitool-ai/omnitool
-  ```
-
-  This will create the `omnitool` folder.  
-
-  - Now navigate inside Omnitool's folder. By default:
-  ```
-    cd omnitool
-  ```
-
-3. **Install Source Dependencies**
-
-  Run the following command in the root of the repository to install the necessary dependencies:
-  ```
-    yarn install
-  ```
-**Troubleshooting**
-
-* **PYTHON 3.12** - some users are reporting a yarn install failure due to **a missing python module 'distutils'**. To resolve this, we recommend running our fix script to detect and autofix any potential issues and try again. Or you can manually pip install 'setuptools' from the terminal.
-```
-  node setup\fix.js
-```
-
-4. **Build and Start the Server**
-
-  Now we will use `yarn` and `Node.js` to build the server software locally on your machine and then start it running.
-
-  Windows:
-  ```
-    start.bat
-  ```
-
-  MacOS/Linux:
-  ```
-   ./start.sh
-  ```
-
-  When successful, you will see the following message:
-
-  ```
-◐ Booting Server
-✔ Server has started and is ready to accept connections on http://127.0.0.1:1688.
-✔ Ctrl-C to quit.
-```
-
-5. **Open Omnitool in a Web Browser**
-
-  Omnitool.ai can now be accessed from:
-  [127.0.0.1:1688](http://127.0.0.1:1688)  
-
----
-6. **Explore the Sample Recipes**
-  Use the "Load Recipe" button in the menu to explore different functionality of the platform.
-
----
-7. **Explore the Code**
-  For a list of scripts we use internally, try running:
-  ```
-    yarn run
-  ```
-
-## PocketBase DB Admin (ADVANCED)
-Recipes and various cache data are stored in a [PocketBase](https://pocketbase.io) database.
-
-If the database is currently running, you can access the default PocketBase admin interface by navigating to [127.0.0.1:8090/_](http://127.0.0.1:8090/_)
-
-Alternatively, the admin interface can be accessed directly within omnitool. From the main menu, choose the `Database Admin` option and the same interface will open inside the omnitool browser window.
-
-o log in to the database, use the credentials
- * Email: **[email protected]**
- * Password: **[email protected]**
-
-Once logged in, you can directly modify records using the PocketBase admin interface. This is particularly useful for advanced configurations and troubleshooting.
-
-### Reset Local PocketBase Storage (ADVANCED)
-
-There may be occasions when you need to reset your local database, either to recover from an invalid state or to start with a fresh install.
-
-For Linux:
-   ```bash
-   rm -rf ./local.bin
-   yarn start
-   ```
-For Windows:
-  ```cmd
-  rmdir /s /q .\local.bin
-  yarn start
-  ```
-
-- **Warning**:
-  - **ALL YOUR LOCAL RECIPES, GENERATED IMAGES, DOCUMENTS, AUDIO ETC, WILL BE PERMANENTLY ERASED**
-
-## Generating a JWT Token
-
-Our service allows you to generate a JWT by running a specific script designed for this purpose. The script's signature is as follows:
-
-```
-/generateJwtToken <action> <subject> <expires_in>
-```
-
-**Parameters**
-
-- `<action>`: This is a string parameter identifying the intended action to be performed. In the context of running recipes, this should be set to exec.
-- `<subject>`: This is a string parameter that specifies the subject of the JWT. This could be the recipe that you intend to execute.
-- `<expires_in>`: This is an integer parameter that determines the token's validity period in milliseconds.
-
-**Example**
-
-To generate a JWT for executing a recipe with a validity of 30,000 milliseconds (or 30 seconds), you would run the following script:
-
-```
-/generateJwtToken exec Workflow 30000
-```
-
-**Output**
-
-The script will output a JWT, which is a token string to be used in the authorization header for your API requests.
-
-### Executing a recipe with JWT Authentication
-
-Once you have your JWT, you can execute a recipe by making a POST request to the recipe execution API. This request must include the JWT in the Authorization header.
-
-**Endpoint**
-
-```
-POST http://127.0.0.1:1688/api/v1/workflow/exec
-```
-
-**Header**
-
-```
-Authorization: Bearer <token>
-```
-
-`<token>` is the JWT acquired from the /generateJwtToken script.
-
-**Curl Example**
-
-To make the request using curl, you would use the following command, replacing <token> with your actual JWT:
-
-```
-curl -X POST http://127.0.0.1:1688/api/v1/workflow/exec -H "Authorization: Bearer <token>"
-```
-
-**Response**
-
-Upon success, the API will initiate the specified recipe. You will receive a JSON response containing details about the recipe's execution status, including any outputs or errors.
-
-**Security Considerations**
-
-- Keep your JWT secure to prevent unauthorized access to your recipes.
-- Always use a secure connection to interact with the APIs.
-- Regularly rotate your tokens and use a short expiration time to minimize the impact of potential leaks.
-
-**Troubleshooting**
-
-* If you encounter authorization errors, ensure the JWT has not expired, is correctly set in the header, and was generated with the proper parameters.
-
-## Next Steps
-
-1. Join the Omnitool.ai Discord Community
-
-Interact with fellow users, share your experiences, ask questions, and be a part of our active and growing community on [Discord](https://tinyurl.com/omnitool-discord).
-
-2. Contribute to Omnitool.ai
-
-As an open-source platform, we welcome contributions from users like you. Whether it's improving documentation, adding new features, or simply sharing your unique use cases, your input is invaluable to us. Simply send us a pull-request and we'll be in contact.
-
-3. Feedback and Suggestions
-
-Your feedback helps shape the future of Omnitool.ai. Send your feedback and suggestions to [[email protected]](mailto:[email protected]), or share them directly in our [Discord #feedback channel](https://tinyurl.com/omnitool-feedback). 

docker_build.sh

@@ -1,4 +0,0 @@
-#!/bin/bash
-
-docker build -t fastapi .
-docker run  -it -p 7860:7860 fastapi

launch.js

@@ -1,53 +0,0 @@
-const fastify = require('fastify')({ logger: true });
-const http = require('http');
-const { spawn } = require('child_process');
-
-const PROXY_PORT = 7860; // Change this to a port different from 1688
-const TARGET_HOST = '127.0.0.1';
-const TARGET_PORT = 1688;
-
-// Function to start the request forwarding server
-async function startRequestForwardingServer() {
-  const server = http.createServer((req, res) => {
-    const options = {
-      hostname: TARGET_HOST,
-      port: TARGET_PORT,
-      path: req.url,
-      method: req.method,
-      headers: req.headers,
-    };
-
-    const proxy = http.request(options, (proxyRes) => {
-      res.writeHead(proxyRes.statusCode, proxyRes.headers);
-      proxyRes.pipe(res, { end: true });
-    });
-
-    req.pipe(proxy, { end: true });
-  });
-
-  server.listen(PROXY_PORT, '0.0.0.0');
-  console.log(`Request forwarding server listening on port ${PROXY_PORT}`);
-}
-
-// Function to start the background process
-function startYarnStartProcess() {
-  const child = spawn('yarn', ['start'], {
-    detached: true,
-    stdio: 'ignore'
-  });
-
-  child.unref();
-}
-
-// Main function to start everything
-async function startServers() {
-  try {
-    startYarnStartProcess();
-    await startRequestForwardingServer();
-  } catch (error) {
-    console.error('Failed to start servers:', error);
-  }
-}
-
-// Start the servers
-startServers();

omnitool_start.sh

@@ -1,18 +1,35 @@
 #!/bin/bash
+echo "--- YARN START ---"
 
-# Set PATH explicitly
-export PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
-echo "Current PATH: $PATH"
-/usr/local/bin/node -v
+if [ -d "/data" ] && [ ! -L "/home/node/app/packages/omni-server/data.local" ]; then
+    # Backup the existing data.local directory
+    echo "--- Backup the existing data.local directory ---"
 
-# Print the current user
-echo "Current user: $(whoami)"
+    if [ -d "/home/node/app/packages/omni-server/data.local" ]; then
+        mv /home/node/app/packages/omni-server/data.local /home/node/app/packages/omni-server/data.local.org
+    fi
 
-# Print environment variables
-echo "Environment variables:"
-printenv
+    # Create the symlink
+    echo "--- Create the symlink ---"
 
-git pull
+    ln -s /data /home/node/app/packages/omni-server/data.local
 
-# Run yarn commands
-yarn start "$@"  # Pass all arguments to yarn start
+    # Copy data from backup to symlink if backup exists
+    echo "--- Copy data from backup to symlink if backup exists ---"
+
+    if [ -d "/home/node/app/packages/omni-server/data.local.org" ]; then
+        cp -a /home/node/app/packages/omni-server/data.local.org/. /home/node/app/packages/omni-server/data.local/
+        # Cleanup
+        rm -rf /home/node/app/packages/omni-server/data.local.org
+        echo "--- Cleanup done ---"
+
+    fi
+else
+    echo "--- NO /data folder DETECTED, SKIPPING symlink creation ---"
+fi
+
+echo "--- YARN INSTALL ---"
+yarn
+
+echo "--- YARN START ---"
+yarn start -u -rb -R blocks

packages/omni-server/scripts/huggingface.js

@@ -1,309 +0,0 @@
-//@ts-check
-debugger;
-import { client as gradio } from "@gradio/client";
-
-const app_reference = 'manu-sapiens/gradio-api-test'; //'tomsoderlund/rest-api-with-gradio';
-const options = { "hf_token": "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" };//{hf_token} Not needed for a public space, which is the case here.
-
-//@ts-ignore
-const app = await gradio(app_reference, options);
-const config = app.config;
-const root = app.config.root;
-const root_url = app.config.root_url;
-const app_id = app.config.app_id;
-const skip_queue = !app.config.enable_queue;
-const space_id = app.config.space_id;
-const jwt = app.config.jwt;
-
-debugger;
-const view_api = await app.view_api();
-console.warn(`huggingface API returned:\n ${JSON.stringify(view_api)}`);
-
-const result = await predict("/predict", ["This is a test"]);
-console.warn(result);
-
-async function predict(endpoint, data, event_data = null)
-{
-    debugger;
-    if (endpoint != '/predict') 
-    {
-        throw new Error('endpoint must be /predict');
-    }
-
-
-    const app = await submit(data, event_data, jwt, skip_queue);
-
-    try
-    {
-        const result = await new Promise((resolve, reject) =>
-        {
-            app
-                .on("data", (d) =>
-                {
-                    resolve(d);
-                })
-                .on("status", (status) =>
-                {
-                    if (status.stage === "error")
-                    {
-                        reject(status);
-                    }
-                });
-        });
-
-        app.destroy();
-        return result;
-    } catch (error)
-    {
-        app.destroy();
-        throw error;
-    }
-}
-
-
-async function submit(data, event_data, jwt, skip_queue = false)
-{
-    let payload;
-    let complete = false;
-    const listener_map = {};
-
-    const _endpoint = "/predict";
-
-    const _payload = await handleBlob(_endpoint, data);
-
-    let websocket;
-
-    payload = { data: _payload || [], event_data };
-
-
-    if (skip_queue)
-    {
-        await processImmediateCall(_endpoint, payload);
-    } else
-    {
-        await processQueueCall(_endpoint, payload, "wss", jwt);
-    }
-
-
-    return {
-        on(eventType, listener)
-        {
-            const listeners = listener_map[eventType] || [];
-            listener_map[eventType] = listeners;
-            listeners.push(listener);
-            return this;
-        },
-        off(eventType, listener)
-        {
-            let listeners = listener_map[eventType] || [];
-            listeners = listeners.filter((l) => l !== listener);
-            listener_map[eventType] = listeners;
-            return this;
-        },
-        async cancel()
-        {
-            const _status = { stage: "complete", queue: false };
-
-            //@ts-ignore
-            complete = _status;
-            fireEvent("status", { ..._status });
-            if (websocket && websocket.readyState === 0)
-            {
-                websocket.addEventListener("open", () =>
-                {
-                    websocket.close();
-                });
-            } else
-            {
-                websocket.close();
-            }
-            try
-            {
-                await fetch(
-                    `${http_protocol}//${host + config.path}/reset`,
-                    {
-                        headers: { "Content-Type": "application/json" },
-                        method: "POST",
-                        body: JSON.stringify({ session_hash }),
-                    }
-                );
-            } catch (e)
-            {
-                console.warn(
-                    "The `/reset` endpoint could not be called. Subsequent endpoint results may be unreliable."
-                );
-            }
-        },
-        destroy()
-        {
-            for (const eventType in listener_map)
-            {
-                listener_map[eventType].forEach((fn) =>
-                {
-                    this.off(eventType, fn);
-                });
-            }
-        },
-    };
-
-}
-
-async function handleBlob(_endpoint, data)
-{
-    const response = await handle_blob(
-        `${http_protocol}//${host + config.path}`,
-        data,
-        api.unnamed_endpoints[0],
-        hf_token
-    );
-    return transform_files
-        ? transform_output(response.data, api.unnamed_endpoints[0], config.root, config.root_url)
-        : response.data;
-}
-
-async function processImmediateCall(_endpoint, payload)
-{
-    fireEvent("status", { stage: "pending", queue: false });
-    const [output, status_code] = await post_data(
-        `${http_protocol}//${host + config.path}/run${_endpoint}`,
-        { ...payload, session_hash },
-        hf_token
-    );
-    if (status_code == 200)
-    {
-        fireEvent("data", { data: output.data });
-        fireEvent("status", {
-            stage: "complete",
-            eta: output.average_duration,
-            queue: false,
-        });
-    } else
-    {
-        fireEvent("status", { stage: "error", message: output.error, queue: false });
-    }
-}
-
-async function processQueueCall(_endpoint, payload, ws_protocol = "wss", jwt = null)
-{
-    fireEvent("status", { stage: "pending", queue: true });
-    const url = new URL(`${ws_protocol}://${host}${config.path}/queue/join`);
-    if (jwt)
-    {
-        url.searchParams.set("__sign", jwt);
-    }
-    const websocket = new WebSocket(url);
-    websocket.onclose = (evt) =>
-    {
-        if (!evt.wasClean)
-        {
-            fireEvent("status", {
-                stage: "error",
-                message: BROKEN_CONNECTION_MSG,
-                queue: true,
-            });
-        }
-    };
-    websocket.onmessage = function (event)
-    {
-        const _data = JSON.parse(event.data);
-        const { type, status, data } = handle_message(
-            _data,
-            last_status[0]
-        );
-        if (type === "update" && status && !complete)
-        {
-            fireEvent("status", { ...status });
-            if (status.stage === "error")
-            {
-                websocket.close();
-            }
-        } else if (type === "hash")
-        {
-            websocket.send(JSON.stringify({ session_hash }));
-        } else if (type === "data")
-        {
-            websocket.send(JSON.stringify({ ...payload, session_hash }));
-        } else if (type === "complete")
-        {
-            complete = status;
-        } else if (type === "generating")
-        {
-            fireEvent("status", { ...status, stage: status.stage, queue: true });
-        }
-        if (data)
-        {
-            fireEvent("data", {
-                data: transform_files
-                    ? transform_output(data.data, api.unnamed_endpoints[0], config.root, config.root_url)
-                    : data.data,
-            });
-            if (complete)
-            {
-                fireEvent("status", { ...complete, stage: status.stage, queue: true });
-                websocket.close();
-            }
-        }
-    };
-    if (semiver(config.version || "2.0.0", "3.6") < 0)
-    {
-        addEventListener("open", () =>
-            websocket.send(JSON.stringify({ hash: session_hash }))
-        );
-    }
-}
-
-function fireEvent(eventType, eventData)
-{
-    const listeners = listener_map[eventType] || [];
-    listeners.forEach((listener) => listener(eventData));
-}
-
-async function handle_blob(endpoint, data, api_info, token)
-{
-    const blob_refs = await walk_and_store_blobs(data, undefined, [], true, api_info);
-
-    const processedData = await Promise.all(
-        blob_refs.map(async ({ path, blob, data, type }) =>
-        {
-            if (blob)
-            {
-                const file_url = (await upload_files(endpoint, [blob], token)).files[0];
-                return { path, file_url, type };
-            } else
-            {
-                return { path, base64: data, type };
-            }
-        })
-    );
-
-    processedData.forEach(({ path, file_url, base64, type }) =>
-    {
-        if (base64)
-        {
-            update_object(data, base64, path);
-        } else if (type === "Gallery")
-        {
-            update_object(data, file_url, path);
-        } else if (file_url)
-        {
-            const o = {
-                is_file: true,
-                name: `${file_url}`,
-                data: null
-                // orig_name: "file.csv"
-            };
-            update_object(data, o, path);
-        }
-    });
-
-    return data;
-}
-
-function skipQueue(id, config) 
-{
-    return (
-        !(config?.dependencies?.[id]?.queue === null
-            ? config.enable_queue
-            : config?.dependencies?.[id]?.queue) || false
-    );
-}

start.bat

@@ -0,0 +1,37 @@
+@echo off
+
+:: Check if node is installed
+where node >nul 2>&1
+if %errorlevel% neq 0 (
+    echo Node.js is not installed. Please install it from https://nodejs.org/
+    exit /b
+)
+
+:: Check if yarn is installed
+where yarn >nul 2>&1
+if %errorlevel% neq 0 (
+    echo yarn is not installed. After installing Node.js, please install yarn from https://classic.yarnpkg.com/en/docs/install/
+    exit /b
+)
+
+:: Check if git is installed
+where git >nul 2>&1
+if %errorlevel% neq 0 (
+    echo git is not installed. Please install it from https://git-scm.com/downloads
+    exit /b
+)
+
+:: Prompt user to update
+set /p update="Before running Omnitool, do you want to update the project from Github first? (y/n) "
+if /I "%update%"=="y" (
+    :: Pull latest changes from git
+    git pull
+    if %errorlevel% neq 0 (
+        echo Error occurred during git pull. Exiting.
+        exit /b
+    )
+)
+
+:: Run yarn commands
+call yarn
+call yarn start -u -rb %*

start.sh

@@ -1,3 +1,37 @@
 #!/bin/bash
-git pull
+
+
+# Check if node is installed
+if ! command -v node &> /dev/null; then
+    echo "Node.js is not installed. Please install it from https://nodejs.org/"
+    exit 1
+fi
+
+# Check if yarn is installed
+if ! command -v yarn &> /dev/null; then
+    echo "yarn is not installed. After installing Node.js, please install yarn from https://classic.yarnpkg.com/en/docs/install/"
+    exit 1
+fi
+
+# Check if git is installed
+if ! command -v git &> /dev/null; then
+    echo "git is not installed. Please install it from https://git-scm.com/downloads"
+    exit 1
+fi
+
+# Prompt user to update
+read -p "Before running Omnitool, do you want to update the project from Github first? (y/n) " -n 1 -r
+echo  # move to a new line
+
+if [[ $REPLY =~ ^[Yy]$ ]]; then
+    # Pull latest changes from git
+    git pull
+    if [ $? -ne 0 ]; then
+        echo "Error occurred during git pull. Exiting."
+        exit 1
+    fi
+fi
+
+# Run yarn commands
+yarn
 yarn start -u -rb "$@"  # Pass all arguments to yarn start