diff --git a/.github/workflows/commit.yaml b/.github/workflows/commit.yaml deleted file mode 100644 index 9d88605c0..000000000 --- a/.github/workflows/commit.yaml +++ /dev/null @@ -1,39 +0,0 @@ -name: Update Commit Hash File - -on: - push: - branches: - - main - -permissions: - contents: write - -jobs: - update-commit: - if: contains(github.event.head_commit.message, '#release') != true - runs-on: ubuntu-latest - - steps: - - name: Checkout the code - uses: actions/checkout@v3 - - - name: Setup Node.js - uses: actions/setup-node@v4 - with: - node-version: '20' - - name: Get the latest commit hash - run: | - echo "COMMIT_HASH=$(git rev-parse HEAD)" >> $GITHUB_ENV - echo "CURRENT_VERSION=$(node -p "require('./package.json').version")" >> $GITHUB_ENV - - - name: Update commit file - run: | - echo "{ \"commit\": \"$COMMIT_HASH\", \"version\": \"$CURRENT_VERSION\" }" > app/commit.json - - - name: Commit and push the update - run: | - git config --global user.name "github-actions[bot]" - git config --global user.email "github-actions[bot]@users.noreply.github.com" - git add app/commit.json - git commit -m "chore: update commit hash to $COMMIT_HASH" - git push \ No newline at end of file diff --git a/.github/workflows/docs.yaml b/.github/workflows/docs.yaml index ceff50847..0691be2fd 100644 --- a/.github/workflows/docs.yaml +++ b/.github/workflows/docs.yaml @@ -4,6 +4,8 @@ on: push: branches: - main + paths: + - 'docs/**' # This will only trigger the workflow when files in docs directory change permissions: contents: write jobs: diff --git a/.github/workflows/update-stable.yml b/.github/workflows/update-stable.yml index bcb0ad95a..967c4e38b 100644 --- a/.github/workflows/update-stable.yml +++ b/.github/workflows/update-stable.yml @@ -166,8 +166,7 @@ jobs: - name: Commit and Tag Release run: | git pull - echo "{ \"commit\": \"$COMMIT_HASH\", \"version\": \"$NEW_VERSION\" }" > app/commit.json - git add package.json pnpm-lock.yaml changelog.md app/commit.json + git add package.json pnpm-lock.yaml changelog.md git commit -m "chore: release version ${{ steps.bump_version.outputs.new_version }}" git tag "v${{ steps.bump_version.outputs.new_version }}" git push diff --git a/.husky/pre-commit b/.husky/pre-commit index b95e00d5e..5f5c2b9ed 100644 --- a/.husky/pre-commit +++ b/.husky/pre-commit @@ -29,15 +29,4 @@ if ! pnpm lint; then exit 1 fi -# Update commit.json with the latest commit hash -echo "Updating commit.json with the latest commit hash..." -COMMIT_HASH=$(git rev-parse HEAD) -if [ $? -ne 0 ]; then - echo "❌ Failed to get commit hash. Ensure you are in a git repository." - exit 1 -fi - -echo "{ \"commit\": \"$COMMIT_HASH\" }" > app/commit.json -git add app/commit.json - echo "πŸ‘ All checks passed! Committing changes..." diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index bdb02ff19..3a8d5be8f 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,217 +1,219 @@ -# Contributing to bolt.diy +# Contribution Guidelines -First off, thank you for considering contributing to bolt.diy! This fork aims to expand the capabilities of the original project by integrating multiple LLM providers and enhancing functionality. Every contribution helps make bolt.diy a better tool for developers worldwide. +Welcome! This guide provides all the details you need to contribute effectively to the project. Thank you for helping us make **bolt.diy** a better tool for developers worldwide. πŸ’‘ + +--- ## πŸ“‹ Table of Contents -- [Code of Conduct](#code-of-conduct) -- [How Can I Contribute?](#how-can-i-contribute) -- [Pull Request Guidelines](#pull-request-guidelines) -- [Coding Standards](#coding-standards) -- [Development Setup](#development-setup) -- [Deploymnt with Docker](#docker-deployment-documentation) -- [Project Structure](#project-structure) - -## Code of Conduct - -This project and everyone participating in it is governed by our Code of Conduct. By participating, you are expected to uphold this code. Please report unacceptable behavior to the project maintainers. - -## How Can I Contribute? - -### 🐞 Reporting Bugs and Feature Requests -- Check the issue tracker to avoid duplicates -- Use the issue templates when available -- Include as much relevant information as possible -- For bugs, add steps to reproduce the issue - -### πŸ”§ Code Contributions -1. Fork the repository -2. Create a new branch for your feature/fix -3. Write your code -4. Submit a pull request - -### ✨ Becoming a Core Contributor -We're looking for dedicated contributors to help maintain and grow this project. If you're interested in becoming a core contributor, please fill out our [Contributor Application Form](https://forms.gle/TBSteXSDCtBDwr5m7). - -## Pull Request Guidelines - -### πŸ“ PR Checklist -- [ ] Branch from the main branch -- [ ] Update documentation if needed -- [ ] Manually verify all new functionality works as expected -- [ ] Keep PRs focused and atomic - -### πŸ‘€ Review Process -1. Manually test the changes -2. At least one maintainer review required -3. Address all review comments -4. Maintain clean commit history - -## Coding Standards - -### πŸ’» General Guidelines -- Follow existing code style -- Comment complex logic -- Keep functions focused and small -- Use meaningful variable names -- Lint your code. This repo contains a pre-commit-hook that will verify your code is linted properly, -so set up your IDE to do that for you! - -## Development Setup - -### πŸ”„ Initial Setup -1. Clone the repository: -```bash -git clone https://github.com/coleam00/bolt.new-any-llm.git -``` -2. Install dependencies: +1. [Code of Conduct](#code-of-conduct) +2. [How Can I Contribute?](#how-can-i-contribute) +3. [Pull Request Guidelines](#pull-request-guidelines) +4. [Coding Standards](#coding-standards) +5. [Development Setup](#development-setup) +6. [Testing](#testing) +7. [Deployment](#deployment) +8. [Docker Deployment](#docker-deployment) +9. [VS Code Dev Containers Integration](#vs-code-dev-containers-integration) + +--- + +## πŸ›‘οΈ Code of Conduct + +This project is governed by our **Code of Conduct**. By participating, you agree to uphold this code. Report unacceptable behavior to the project maintainers. + +--- + +## πŸ› οΈ How Can I Contribute? + +### 1️⃣ Reporting Bugs or Feature Requests +- Check the [issue tracker](#) to avoid duplicates. +- Use issue templates (if available). +- Provide detailed, relevant information and steps to reproduce bugs. + +### 2️⃣ Code Contributions +1. Fork the repository. +2. Create a feature or fix branch. +3. Write and test your code. +4. Submit a pull request (PR). + +### 3️⃣ Join as a Core Contributor +Interested in maintaining and growing the project? Fill out our [Contributor Application Form](https://forms.gle/TBSteXSDCtBDwr5m7). + +--- + +## βœ… Pull Request Guidelines + +### PR Checklist +- Branch from the **main** branch. +- Update documentation, if needed. +- Test all functionality manually. +- Focus on one feature/bug per PR. + +### Review Process +1. Manual testing by reviewers. +2. At least one maintainer review required. +3. Address review comments. +4. Maintain a clean commit history. + +--- + +## πŸ“ Coding Standards + +### General Guidelines +- Follow existing code style. +- Comment complex logic. +- Keep functions small and focused. +- Use meaningful variable names. + +--- + +## πŸ–₯️ Development Setup + +### 1️⃣ Initial Setup +- Clone the repository: + ```bash + git clone https://github.com/stackblitz-labs/bolt.diy.git + ``` +- Install dependencies: + ```bash + pnpm install + ``` +- Set up environment variables: + 1. Rename `.env.example` to `.env.local`. + 2. Add your API keys: + ```bash + GROQ_API_KEY=XXX + HuggingFace_API_KEY=XXX + OPENAI_API_KEY=XXX + ... + ``` + 3. Optionally set: + - Debug level: `VITE_LOG_LEVEL=debug` + - Context size: `DEFAULT_NUM_CTX=32768` + +**Note**: Never commit your `.env.local` file to version control. It’s already in `.gitignore`. + +### 2️⃣ Run Development Server ```bash -pnpm install +pnpm run dev ``` +**Tip**: Use **Google Chrome Canary** for local testing. -3. Set up environment variables: - - Rename `.env.example` to `.env.local` - - Add your LLM API keys (only set the ones you plan to use): -```bash -GROQ_API_KEY=XXX -HuggingFace_API_KEY=XXX -OPENAI_API_KEY=XXX -ANTHROPIC_API_KEY=XXX -... -``` - - Optionally set debug level: -```bash -VITE_LOG_LEVEL=debug -``` +--- + +## πŸ§ͺ Testing - - Optionally set context size: +Run the test suite with: ```bash -DEFAULT_NUM_CTX=32768 +pnpm test ``` -Some Example Context Values for the qwen2.5-coder:32b models are. - -* DEFAULT_NUM_CTX=32768 - Consumes 36GB of VRAM -* DEFAULT_NUM_CTX=24576 - Consumes 32GB of VRAM -* DEFAULT_NUM_CTX=12288 - Consumes 26GB of VRAM -* DEFAULT_NUM_CTX=6144 - Consumes 24GB of VRAM +--- -**Important**: Never commit your `.env.local` file to version control. It's already included in .gitignore. +## πŸš€ Deployment -### πŸš€ Running the Development Server +### Deploy to Cloudflare Pages ```bash -pnpm run dev +pnpm run deploy ``` +Ensure you have required permissions and that Wrangler is configured. -**Note**: You will need Google Chrome Canary to run this locally if you use Chrome! It's an easy install and a good browser for web development anyway. +--- -## Testing +## 🐳 Docker Deployment -Run the test suite with: +This section outlines the methods for deploying the application using Docker. The processes for **Development** and **Production** are provided separately for clarity. -```bash -pnpm test -``` +--- -## Deployment +### πŸ§‘β€πŸ’» Development Environment -To deploy the application to Cloudflare Pages: +#### Build Options +**Option 1: Helper Scripts** ```bash -pnpm run deploy +# Development build +npm run dockerbuild ``` -Make sure you have the necessary permissions and Wrangler is correctly configured for your Cloudflare account. +**Option 2: Direct Docker Build Command** +```bash +docker build . --target bolt-ai-development +``` -# Docker Deployment Documentation +**Option 3: Docker Compose Profile** +```bash +docker-compose --profile development up +``` -This guide outlines various methods for building and deploying the application using Docker. +#### Running the Development Container +```bash +docker run -p 5173:5173 --env-file .env.local bolt-ai:development +``` -## Build Methods +--- -### 1. Using Helper Scripts +### 🏭 Production Environment -NPM scripts are provided for convenient building: +#### Build Options +**Option 1: Helper Scripts** ```bash -# Development build -npm run dockerbuild - # Production build npm run dockerbuild:prod ``` -### 2. Direct Docker Build Commands - -You can use Docker's target feature to specify the build environment: - +**Option 2: Direct Docker Build Command** ```bash -# Development build -docker build . --target bolt-ai-development - -# Production build docker build . --target bolt-ai-production ``` -### 3. Docker Compose with Profiles - -Use Docker Compose profiles to manage different environments: - +**Option 3: Docker Compose Profile** ```bash -# Development environment -docker-compose --profile development up - -# Production environment docker-compose --profile production up ``` -## Running the Application - -After building using any of the methods above, run the container with: - +#### Running the Production Container ```bash -# Development -docker run -p 5173:5173 --env-file .env.local bolt-ai:development - -# Production docker run -p 5173:5173 --env-file .env.local bolt-ai:production ``` -## Deployment with Coolify +--- -[Coolify](https://github.com/coollabsio/coolify) provides a straightforward deployment process: +### Coolify Deployment -1. Import your Git repository as a new project -2. Select your target environment (development/production) -3. Choose "Docker Compose" as the Build Pack -4. Configure deployment domains -5. Set the custom start command: +For an easy deployment process, use [Coolify](https://github.com/coollabsio/coolify): +1. Import your Git repository into Coolify. +2. Choose **Docker Compose** as the build pack. +3. Configure environment variables (e.g., API keys). +4. Set the start command: ```bash docker compose --profile production up ``` -6. Configure environment variables - - Add necessary AI API keys - - Adjust other environment variables as needed -7. Deploy the application -## VS Code Integration +--- + +## πŸ› οΈ VS Code Dev Containers Integration -The `docker-compose.yaml` configuration is compatible with VS Code dev containers: +The `docker-compose.yaml` configuration is compatible with **VS Code Dev Containers**, making it easy to set up a development environment directly in Visual Studio Code. -1. Open the command palette in VS Code -2. Select the dev container configuration -3. Choose the "development" profile from the context menu +### Steps to Use Dev Containers -## Environment Files +1. Open the command palette in VS Code (`Ctrl+Shift+P` or `Cmd+Shift+P` on macOS). +2. Select **Dev Containers: Reopen in Container**. +3. Choose the **development** profile when prompted. +4. VS Code will rebuild the container and open it with the pre-configured environment. -Ensure you have the appropriate `.env.local` file configured before running the containers. This file should contain: -- API keys -- Environment-specific configurations -- Other required environment variables +--- -## Notes +## πŸ”‘ Environment Variables -- Port 5173 is exposed and mapped for both development and production environments -- Environment variables are loaded from `.env.local` -- Different profiles (development/production) can be used for different deployment scenarios -- The configuration supports both local development and production deployment +Ensure `.env.local` is configured correctly with: +- API keys. +- Context-specific configurations. + +Example for the `DEFAULT_NUM_CTX` variable: +```bash +DEFAULT_NUM_CTX=24576 # Uses 32GB VRAM +``` \ No newline at end of file diff --git a/FAQ.md b/FAQ.md index ecd4158fe..a09fae885 100644 --- a/FAQ.md +++ b/FAQ.md @@ -1,47 +1,91 @@ -[![bolt.diy: AI-Powered Full-Stack Web Development in the Browser](./public/social_preview_index.jpg)](https://bolt.diy) +# Frequently Asked Questions (FAQ) -# bolt.diy +
+What are the best models for bolt.diy? -## FAQ +For the best experience with bolt.diy, we recommend using the following models: -### How do I get the best results with bolt.diy? +- **Claude 3.5 Sonnet (old)**: Best overall coder, providing excellent results across all use cases +- **Gemini 2.0 Flash**: Exceptional speed while maintaining good performance +- **GPT-4o**: Strong alternative to Claude 3.5 Sonnet with comparable capabilities +- **DeepSeekCoder V2 236b**: Best open source model (available through OpenRouter, DeepSeek API, or self-hosted) +- **Qwen 2.5 Coder 32b**: Best model for self-hosting with reasonable hardware requirements -- **Be specific about your stack**: If you want to use specific frameworks or libraries (like Astro, Tailwind, ShadCN, or any other popular JavaScript framework), mention them in your initial prompt to ensure bolt scaffolds the project accordingly. +**Note**: Models with less than 7b parameters typically lack the capability to properly interact with bolt! +
-- **Use the enhance prompt icon**: Before sending your prompt, try clicking the 'enhance' icon to have the AI model help you refine your prompt, then edit the results before submitting. +
+How do I get the best results with bolt.diy? -- **Scaffold the basics first, then add features**: Make sure the basic structure of your application is in place before diving into more advanced functionality. This helps Bolt.diy understand the foundation of your project and ensure everything is wired up right before building out more advanced functionality. +- **Be specific about your stack**: + Mention the frameworks or libraries you want to use (e.g., Astro, Tailwind, ShadCN) in your initial prompt. This ensures that bolt.diy scaffolds the project according to your preferences. -- **Batch simple instructions**: Save time by combining simple instructions into one message. For example, you can ask Bolt.diy to change the color scheme, add mobile responsiveness, and restart the dev server, all in one go saving you time and reducing API credit consumption significantly. +- **Use the enhance prompt icon**: + Before sending your prompt, click the *enhance* icon to let the AI refine your prompt. You can edit the suggested improvements before submitting. -### Why are there so many open issues/pull requests? +- **Scaffold the basics first, then add features**: + Ensure the foundational structure of your application is in place before introducing advanced functionality. This helps bolt.diy establish a solid base to build on. -bolt.diy was started simply to showcase how to edit an open source project and to do something cool with local LLMs on my (@ColeMedin) YouTube channel! However, it quickly grew into a massive community project that I am working hard to keep up with the demand of by forming a team of maintainers and getting as many people involved as I can. That effort is going well and all of our maintainers are ABSOLUTE rockstars, but it still takes time to organize everything so we can efficiently get through all the issues and PRs. But rest assured, we are working hard and even working on some partnerships behind the scenes to really help this project take off! +- **Batch simple instructions**: + Combine simple tasks into a single prompt to save time and reduce API credit consumption. For example: + *"Change the color scheme, add mobile responsiveness, and restart the dev server."* +
-### How do local LLMs fair compared to larger models like Claude 3.5 Sonnet for bolt.diy/bolt.new? +
+How do I contribute to bolt.diy? -As much as the gap is quickly closing between open source and massive close source models, you’re still going to get the best results with the very large models like GPT-4o, Claude 3.5 Sonnet, and DeepSeek Coder V2 236b. This is one of the big tasks we have at hand - figuring out how to prompt better, use agents, and improve the platform as a whole to make it work better for even the smaller local LLMs! +Check out our [Contribution Guide](CONTRIBUTING.md) for more details on how to get involved! +
-### I'm getting the error: "There was an error processing this request" +
+What are the future plans for bolt.diy? -If you see this error within bolt.diy, that is just the application telling you there is a problem at a high level, and this could mean a number of different things. To find the actual error, please check BOTH the terminal where you started the application (with Docker or pnpm) and the developer console in the browser. For most browsers, you can access the developer console by pressing F12 or right clicking anywhere in the browser and selecting β€œInspect”. Then go to the β€œconsole” tab in the top right. +Visit our [Roadmap](https://roadmap.sh/r/ottodev-roadmap-2ovzo) for the latest updates. +New features and improvements are on the way! +
-### I'm getting the error: "x-api-key header missing" +
+Why are there so many open issues/pull requests? -We have seen this error a couple times and for some reason just restarting the Docker container has fixed it. This seems to be Ollama specific. Another thing to try is try to run bolt.diy with Docker or pnpm, whichever you didn’t run first. We are still on the hunt for why this happens once and a while! +bolt.diy began as a small showcase project on @ColeMedin's YouTube channel to explore editing open-source projects with local LLMs. However, it quickly grew into a massive community effort! -### I'm getting a blank preview when bolt.diy runs my app! +We're forming a team of maintainers to manage demand and streamline issue resolution. The maintainers are rockstars, and we're also exploring partnerships to help the project thrive. +
-We promise you that we are constantly testing new PRs coming into bolt.diy and the preview is core functionality, so the application is not broken! When you get a blank preview or don’t get a preview, this is generally because the LLM hallucinated bad code or incorrect commands. We are working on making this more transparent so it is obvious. Sometimes the error will appear in developer console too so check that as well. +
+How do local LLMs compare to larger models like Claude 3.5 Sonnet for bolt.diy? -### How to add a LLM: +While local LLMs are improving rapidly, larger models like GPT-4o, Claude 3.5 Sonnet, and DeepSeek Coder V2 236b still offer the best results for complex applications. Our ongoing focus is to improve prompts, agents, and the platform to better support smaller local LLMs. +
-To make new LLMs available to use in this version of bolt.new, head on over to `app/utils/constants.ts` and find the constant MODEL_LIST. Each element in this array is an object that has the model ID for the name (get this from the provider's API documentation), a label for the frontend model dropdown, and the provider. +
+Common Errors and Troubleshooting -By default, Anthropic, OpenAI, Groq, and Ollama are implemented as providers, but the YouTube video for this repo covers how to extend this to work with more providers if you wish! +### **"There was an error processing this request"** +This generic error message means something went wrong. Check both: +- The terminal (if you started the app with Docker or `pnpm`). +- The developer console in your browser (press `F12` or right-click > *Inspect*, then go to the *Console* tab). -When you add a new model to the MODEL_LIST array, it will immediately be available to use when you run the app locally or reload it. For Ollama models, make sure you have the model installed already before trying to use it here! +### **"x-api-key header missing"** +This error is sometimes resolved by restarting the Docker container. +If that doesn't work, try switching from Docker to `pnpm` or vice versa. We're actively investigating this issue. -### Everything works but the results are bad +### **Blank preview when running the app** +A blank preview often occurs due to hallucinated bad code or incorrect commands. +To troubleshoot: +- Check the developer console for errors. +- Remember, previews are core functionality, so the app isn't broken! We're working on making these errors more transparent. -This goes to the point above about how local LLMs are getting very powerful but you still are going to see better (sometimes much better) results with the largest LLMs like GPT-4o, Claude 3.5 Sonnet, and DeepSeek Coder V2 236b. If you are using smaller LLMs like Qwen-2.5-Coder, consider it more experimental and educational at this point. It can build smaller applications really well, which is super impressive for a local LLM, but for larger scale applications you want to use the larger LLMs still! +### **"Everything works, but the results are bad"** +Local LLMs like Qwen-2.5-Coder are powerful for small applications but still experimental for larger projects. For better results, consider using larger models like GPT-4o, Claude 3.5 Sonnet, or DeepSeek Coder V2 236b. + +### **"Received structured exception #0xc0000005: access violation"** +If you are getting this, you are probably on Windows. The fix is generally to update the [Visual C++ Redistributable](https://learn.microsoft.com/en-us/cpp/windows/latest-supported-vc-redist?view=msvc-170) + +### **"Miniflare or Wrangler errors in Windows"** +You will need to make sure you have the latest version of Visual Studio C++ installed (14.40.33816), more information here https://github.com/stackblitz-labs/bolt.diy/issues/19. +
+ +--- + +Got more questions? Feel free to reach out or open an issue in our GitHub repo! diff --git a/README.md b/README.md index 84235f8c1..5ef41deac 100644 --- a/README.md +++ b/README.md @@ -1,19 +1,32 @@ -[![bolt.diy: AI-Powered Full-Stack Web Development in the Browser](./public/social_preview_index.jpg)](https://bolt.diy) - # bolt.diy (Previously oTToDev) +[![bolt.diy: AI-Powered Full-Stack Web Development in the Browser](./public/social_preview_index.jpg)](https://bolt.diy) Welcome to bolt.diy, the official open source version of Bolt.new (previously known as oTToDev and bolt.new ANY LLM), which allows you to choose the LLM that you use for each prompt! Currently, you can use OpenAI, Anthropic, Ollama, OpenRouter, Gemini, LMStudio, Mistral, xAI, HuggingFace, DeepSeek, or Groq models - and it is easily extended to use any other model supported by the Vercel AI SDK! See the instructions below for running this locally and extending it to include more models. -Check the [bolt.diy Docs](https://stackblitz-labs.github.io/bolt.diy/) for more information. This documentation is still being updated after the transfer. +Check the [bolt.diy Docs](https://stackblitz-labs.github.io/bolt.diy/) for more information. + +We have also launched an experimental agent called the "bolt.diy Expert" that can answer common questions about bolt.diy. Find it here on the [oTTomator Live Agent Studio](https://studio.ottomator.ai/). bolt.diy was originally started by [Cole Medin](https://www.youtube.com/@ColeMedin) but has quickly grown into a massive community effort to build the BEST open source AI coding assistant! -## Join the community for bolt.diy! +## Table of Contents -https://thinktank.ottomator.ai +- [Join the Community](#join-the-community) +- [Requested Additions](#requested-additions) +- [Features](#features) +- [Setup](#setup) +- [Run the Application](#run-the-application) +- [Available Scripts](#available-scripts) +- [Contributing](#contributing) +- [Roadmap](#roadmap) +- [FAQ](#faq) +## Join the community -## Requested Additions - Feel Free to Contribute! +[Join the bolt.diy community here, in the thinktank on ottomator.ai!](https://thinktank.ottomator.ai) + + +## Requested Additions - βœ… OpenRouter Integration (@coleam00) - βœ… Gemini Integration (@jonathands) @@ -60,7 +73,7 @@ https://thinktank.ottomator.ai - ⬜ Perplexity Integration - ⬜ Vertex AI Integration -## bolt.diy Features +## Features - **AI-powered full-stack web development** directly in your browser. - **Support for multiple LLMs** with an extensible architecture to integrate additional models. @@ -70,141 +83,212 @@ https://thinktank.ottomator.ai - **Download projects as ZIP** for easy portability. - **Integration-ready Docker support** for a hassle-free setup. -## Setup bolt.diy +## Setup If you're new to installing software from GitHub, don't worry! If you encounter any issues, feel free to submit an "issue" using the provided links or improve this documentation by forking the repository, editing the instructions, and submitting a pull request. The following instruction will help you get the stable branch up and running on your local machine in no time. -### Prerequisites +Let's get you up and running with the stable version of Bolt.DIY! -1. **Install Git**: [Download Git](https://git-scm.com/downloads) -2. **Install Node.js**: [Download Node.js](https://nodejs.org/en/download/) +## Quick Download - - After installation, the Node.js path is usually added to your system automatically. To verify: - - **Windows**: Search for "Edit the system environment variables," click "Environment Variables," and check if `Node.js` is in the `Path` variable. - - **Mac/Linux**: Open a terminal and run: - ```bash - echo $PATH - ``` - Look for `/usr/local/bin` in the output. +[![Download Latest Release](https://img.shields.io/github/v/release/stackblitz-labs/bolt.diy?label=Download%20Bolt&sort=semver)](https://github.com/stackblitz-labs/bolt.diy/releases/latest) ← Click here to go the the latest release version! -### Clone the Repository +- Next **click source.zip** -Clone the repository using Git: -```bash -git clone -b stable https://github.com/stackblitz-labs/bolt.diy -``` -### (Optional) Configure Environment Variables -Most environment variables can be configured directly through the settings menu of the application. However, if you need to manually configure them: +## Prerequisites -1. Rename `.env.example` to `.env.local`. -2. Add your LLM API keys. For example: +Before you begin, you'll need to install two important pieces of software: -```env -GROQ_API_KEY=YOUR_GROQ_API_KEY -OPENAI_API_KEY=YOUR_OPENAI_API_KEY -ANTHROPIC_API_KEY=YOUR_ANTHROPIC_API_KEY -``` +### Install Node.js -**Note**: Ollama does not require an API key as it runs locally. +Node.js is required to run the application. -3. Optionally, set additional configurations: +1. Visit the [Node.js Download Page](https://nodejs.org/en/download/) +2. Download the "LTS" (Long Term Support) version for your operating system +3. Run the installer, accepting the default settings +4. Verify Node.js is properly installed: + - **For Windows Users**: + 1. Press `Windows + R` + 2. Type "sysdm.cpl" and press Enter + 3. Go to "Advanced" tab β†’ "Environment Variables" + 4. Check if `Node.js` appears in the "Path" variable + - **For Mac/Linux Users**: + 1. Open Terminal + 2. Type this command: + ```bash + echo $PATH + ``` + 3. Look for `/usr/local/bin` in the output -```env -# Debugging -VITE_LOG_LEVEL=debug +## Running the Application -# Ollama settings (example: 8K context, localhost port 11434) -OLLAMA_API_BASE_URL=http://localhost:11434 -DEFAULT_NUM_CTX=8192 -``` +You have two options for running Bolt.DIY: directly on your machine or using Docker. -**Important**: Do not commit your `.env.local` file to version control. This file is already included in `.gitignore`. +### Option 1: Direct Installation (Recommended for Beginners) ---- +1. **Install Package Manager (pnpm)**: + ```bash + npm install -g pnpm + ``` + +2. **Install Project Dependencies**: + ```bash + pnpm install + ``` + +3. **Start the Application**: + ```bash + pnpm run dev + ``` + + **Important Note**: If you're using Google Chrome, you'll need Chrome Canary for local development. [Download it here](https://www.google.com/chrome/canary/) + +### Option 2: Using Docker + +This option requires some familiarity with Docker but provides a more isolated environment. -## Run the Application +#### Additional Prerequisite +- Install Docker: [Download Docker](https://www.docker.com/) -### Option 1: Without Docker +#### Steps: -1. **Install Dependencies**: - ```bash - pnpm install - ``` - If `pnpm` is not installed, install it using: - ```bash - sudo npm install -g pnpm - ``` +1. **Build the Docker Image**: + ```bash + # Using npm script: + npm run dockerbuild -2. **Start the Application**: - ```bash - pnpm run dev + # OR using direct Docker command: + docker build . --target bolt-ai-development ``` - This will start the Remix Vite development server. You will need Google Chrome Canary to run this locally if you use Chrome! It's an easy install and a good browser for web development anyway. -### Option 2: With Docker +2. **Run the Container**: + ```bash + docker-compose --profile development up + ``` -#### Prerequisites -- Ensure Git, Node.js, and Docker are installed: [Download Docker](https://www.docker.com/) -#### Steps -1. **Build the Docker Image**: - Use the provided NPM scripts: - ```bash - npm run dockerbuild # Development build - npm run dockerbuild:prod # Production build - ``` +## Configuring API Keys and Providers - Alternatively, use Docker commands directly: - ```bash - docker build . --target bolt-ai-development # Development build - docker build . --target bolt-ai-production # Production build - ``` +### Adding Your API Keys -2. **Run the Container**: - Use Docker Compose profiles to manage environments: - ```bash - docker-compose --profile development up # Development - docker-compose --profile production up # Production - ``` +Setting up your API keys in Bolt.DIY is straightforward: - - With the development profile, changes to your code will automatically reflect in the running container (hot reloading). +1. Open the home page (main interface) +2. Select your desired provider from the dropdown menu +3. Click the pencil (edit) icon +4. Enter your API key in the secure input field ---- +![API Key Configuration Interface](./docs/images/api-key-ui-section.png) -### Update Your Local Version to the Latest +### Configuring Custom Base URLs -To keep your local version of bolt.diy up to date with the latest changes, follow these steps for your operating system: +For providers that support custom base URLs (such as Ollama or LM Studio), follow these steps: -#### 1. **Navigate to your project folder** - Navigate to the directory where you cloned the repository and open a terminal: +1. Click the settings icon in the sidebar to open the settings menu + ![Settings Button Location](./docs/images/bolt-settings-button.png) -#### 2. **Fetch the Latest Changes** - Use Git to pull the latest changes from the main repository: +2. Navigate to the "Providers" tab +3. Search for your provider using the search bar +4. Enter your custom base URL in the designated field + ![Provider Base URL Configuration](./docs/images/provider-base-url.png) +> **Note**: Custom base URLs are particularly useful when running local instances of AI models or using custom API endpoints. + +### Supported Providers +- Ollama +- LM Studio +- OpenAILike + +## Setup Using Git (For Developers only) + +This method is recommended for developers who want to: +- Contribute to the project +- Stay updated with the latest changes +- Switch between different versions +- Create custom modifications + +#### Prerequisites +1. Install Git: [Download Git](https://git-scm.com/downloads) + +#### Initial Setup + +1. **Clone the Repository**: ```bash - git pull origin main + # Using HTTPS + git clone https://github.com/stackblitz-labs/bolt.diy.git ``` -#### 3. **Update Dependencies** - After pulling the latest changes, update the project dependencies by running the following command: +2. **Navigate to Project Directory**: + ```bash + cd bolt.diy + ``` +3. **Switch to the Main Branch**: + ```bash + git checkout main + ``` +4. **Install Dependencies**: ```bash pnpm install ``` -#### 4. **Run the Application** - Once the updates are complete, you can start the application again with: - +5. **Start the Development Server**: ```bash pnpm run dev ``` -This ensures that you're running the latest version of bolt.diy and can take advantage of all the newest features and bug fixes. +#### Staying Updated + +To get the latest changes from the repository: + +1. **Save Your Local Changes** (if any): + ```bash + git stash + ``` + +2. **Pull Latest Updates**: + ```bash + git pull origin main + ``` + +3. **Update Dependencies**: + ```bash + pnpm install + ``` + +4. **Restore Your Local Changes** (if any): + ```bash + git stash pop + ``` + +#### Troubleshooting Git Setup + +If you encounter issues: + +1. **Clean Installation**: + ```bash + # Remove node modules and lock files + rm -rf node_modules pnpm-lock.yaml + + # Clear pnpm cache + pnpm store prune + + # Reinstall dependencies + pnpm install + ``` + +2. **Reset Local Changes**: + ```bash + # Discard all local changes + git reset --hard origin/main + ``` + +Remember to always commit your local changes or stash them before pulling updates to avoid conflicts. --- @@ -236,4 +320,4 @@ Explore upcoming features and priorities on our [Roadmap](https://roadmap.sh/r/o ## FAQ -For answers to common questions, visit our [FAQ Page](FAQ.md). +For answers to common questions, issues, and to see a list of recommended models, visit our [FAQ Page](FAQ.md). diff --git a/app/commit.json b/app/commit.json deleted file mode 100644 index 7fa447ddd..000000000 --- a/app/commit.json +++ /dev/null @@ -1 +0,0 @@ -{ "commit": "b9601b26d739f935eda935c61dea4c7c6b9c7220", "version": "0.0.2" } diff --git a/app/components/chat/BaseChat.tsx b/app/components/chat/BaseChat.tsx index 2084cbb37..7c2a9da12 100644 --- a/app/components/chat/BaseChat.tsx +++ b/app/components/chat/BaseChat.tsx @@ -119,6 +119,9 @@ export const BaseChat = React.forwardRef( useEffect(() => { // Load API keys from cookies on component mount + + let parsedApiKeys: Record | undefined = {}; + try { const storedApiKeys = Cookies.get('apiKeys'); @@ -127,6 +130,7 @@ export const BaseChat = React.forwardRef( if (typeof parsedKeys === 'object' && parsedKeys !== null) { setApiKeys(parsedKeys); + parsedApiKeys = parsedKeys; } } } catch (error) { @@ -155,7 +159,8 @@ export const BaseChat = React.forwardRef( Cookies.remove('providers'); } - initializeModelList(providerSettings).then((modelList) => { + initializeModelList({ apiKeys: parsedApiKeys, providerSettings }).then((modelList) => { + console.log('Model List: ', modelList); setModelList(modelList); }); @@ -355,7 +360,7 @@ export const BaseChat = React.forwardRef( modelList={modelList} provider={provider} setProvider={setProvider} - providerList={providerList || PROVIDER_LIST} + providerList={providerList || (PROVIDER_LIST as ProviderInfo[])} apiKeys={apiKeys} /> {(providerList || []).length > 0 && provider && ( diff --git a/app/components/chat/Chat.client.tsx b/app/components/chat/Chat.client.tsx index d9e57f233..1b830fd90 100644 --- a/app/components/chat/Chat.client.tsx +++ b/app/components/chat/Chat.client.tsx @@ -21,6 +21,7 @@ import { debounce } from '~/utils/debounce'; import { useSettings } from '~/lib/hooks/useSettings'; import type { ProviderInfo } from '~/types/model'; import { useSearchParams } from '@remix-run/react'; +import { createSampler } from '~/utils/sampler'; const toastAnimation = cssTransition({ enter: 'animated fadeInRight', @@ -77,6 +78,24 @@ export function Chat() { ); } +const processSampledMessages = createSampler( + (options: { + messages: Message[]; + initialMessages: Message[]; + isLoading: boolean; + parseMessages: (messages: Message[], isLoading: boolean) => void; + storeMessageHistory: (messages: Message[]) => Promise; + }) => { + const { messages, initialMessages, isLoading, parseMessages, storeMessageHistory } = options; + parseMessages(messages, isLoading); + + if (messages.length > initialMessages.length) { + storeMessageHistory(messages).catch((error) => toast.error(error.message)); + } + }, + 50, +); + interface ChatProps { initialMessages: Message[]; storeMessageHistory: (messages: Message[]) => Promise; @@ -103,7 +122,7 @@ export const ChatImpl = memo( }); const [provider, setProvider] = useState(() => { const savedProvider = Cookies.get('selectedProvider'); - return PROVIDER_LIST.find((p) => p.name === savedProvider) || DEFAULT_PROVIDER; + return (PROVIDER_LIST.find((p) => p.name === savedProvider) || DEFAULT_PROVIDER) as ProviderInfo; }); const { showChat } = useStore(chatStore); @@ -169,11 +188,13 @@ export const ChatImpl = memo( }, []); useEffect(() => { - parseMessages(messages, isLoading); - - if (messages.length > initialMessages.length) { - storeMessageHistory(messages).catch((error) => toast.error(error.message)); - } + processSampledMessages({ + messages, + initialMessages, + isLoading, + parseMessages, + storeMessageHistory, + }); }, [messages, isLoading, parseMessages]); const scrollTextArea = () => { diff --git a/app/components/chat/ModelSelector.tsx b/app/components/chat/ModelSelector.tsx index 7571d636d..ec4da63ff 100644 --- a/app/components/chat/ModelSelector.tsx +++ b/app/components/chat/ModelSelector.tsx @@ -1,6 +1,6 @@ import type { ProviderInfo } from '~/types/model'; -import type { ModelInfo } from '~/utils/types'; import { useEffect } from 'react'; +import type { ModelInfo } from '~/lib/modules/llm/types'; interface ModelSelectorProps { model?: string; diff --git a/app/components/settings/SettingsWindow.tsx b/app/components/settings/SettingsWindow.tsx index 541323f50..f53d547c0 100644 --- a/app/components/settings/SettingsWindow.tsx +++ b/app/components/settings/SettingsWindow.tsx @@ -5,27 +5,27 @@ import { classNames } from '~/utils/classNames'; import { DialogTitle, dialogVariants, dialogBackdropVariants } from '~/components/ui/Dialog'; import { IconButton } from '~/components/ui/IconButton'; import styles from './Settings.module.scss'; -import ChatHistoryTab from './chat-history/ChatHistoryTab'; import ProvidersTab from './providers/ProvidersTab'; import { useSettings } from '~/lib/hooks/useSettings'; import FeaturesTab from './features/FeaturesTab'; import DebugTab from './debug/DebugTab'; import EventLogsTab from './event-logs/EventLogsTab'; import ConnectionsTab from './connections/ConnectionsTab'; +import DataTab from './data/DataTab'; interface SettingsProps { open: boolean; onClose: () => void; } -type TabType = 'chat-history' | 'providers' | 'features' | 'debug' | 'event-logs' | 'connection'; +type TabType = 'data' | 'providers' | 'features' | 'debug' | 'event-logs' | 'connection'; export const SettingsWindow = ({ open, onClose }: SettingsProps) => { const { debug, eventLogs } = useSettings(); - const [activeTab, setActiveTab] = useState('chat-history'); + const [activeTab, setActiveTab] = useState('data'); const tabs: { id: TabType; label: string; icon: string; component?: ReactElement }[] = [ - { id: 'chat-history', label: 'Chat History', icon: 'i-ph:book', component: }, + { id: 'data', label: 'Data', icon: 'i-ph:database', component: }, { id: 'providers', label: 'Providers', icon: 'i-ph:key', component: }, { id: 'connection', label: 'Connection', icon: 'i-ph:link', component: }, { id: 'features', label: 'Features', icon: 'i-ph:star', component: }, @@ -63,7 +63,7 @@ export const SettingsWindow = ({ open, onClose }: SettingsProps) => { variants={dialogBackdropVariants} /> - + { - const blob = new Blob([JSON.stringify(data, null, 2)], { type: 'application/json' }); - const url = URL.createObjectURL(blob); - const link = document.createElement('a'); - link.href = url; - link.download = filename; - document.body.appendChild(link); - link.click(); - document.body.removeChild(link); - URL.revokeObjectURL(url); - }; - - const handleDeleteAllChats = async () => { - const confirmDelete = window.confirm('Are you sure you want to delete all chats? This action cannot be undone.'); - - if (!confirmDelete) { - return; // Exit if the user cancels - } - - if (!db) { - const error = new Error('Database is not available'); - logStore.logError('Failed to delete chats - DB unavailable', error); - toast.error('Database is not available'); - - return; - } - - try { - setIsDeleting(true); - - const allChats = await getAll(db); - await Promise.all(allChats.map((chat) => deleteById(db!, chat.id))); - logStore.logSystem('All chats deleted successfully', { count: allChats.length }); - toast.success('All chats deleted successfully'); - navigate('/', { replace: true }); - } catch (error) { - logStore.logError('Failed to delete chats', error); - toast.error('Failed to delete chats'); - console.error(error); - } finally { - setIsDeleting(false); - } - }; - - const handleExportAllChats = async () => { - if (!db) { - const error = new Error('Database is not available'); - logStore.logError('Failed to export chats - DB unavailable', error); - toast.error('Database is not available'); - - return; - } - - try { - const allChats = await getAll(db); - const exportData = { - chats: allChats, - exportDate: new Date().toISOString(), - }; - - downloadAsJson(exportData, `all-chats-${new Date().toISOString()}.json`); - logStore.logSystem('Chats exported successfully', { count: allChats.length }); - toast.success('Chats exported successfully'); - } catch (error) { - logStore.logError('Failed to export chats', error); - toast.error('Failed to export chats'); - console.error(error); - } - }; - - return ( - <> -
-

Chat History

- - -
-

Danger Area

-

This action cannot be undone!

- -
-
- - ); -} diff --git a/app/components/settings/data/DataTab.tsx b/app/components/settings/data/DataTab.tsx new file mode 100644 index 000000000..756abaadb --- /dev/null +++ b/app/components/settings/data/DataTab.tsx @@ -0,0 +1,304 @@ +import React, { useState } from 'react'; +import { useNavigate } from '@remix-run/react'; +import Cookies from 'js-cookie'; +import { toast } from 'react-toastify'; +import { db, deleteById, getAll } from '~/lib/persistence'; +import { logStore } from '~/lib/stores/logs'; +import { classNames } from '~/utils/classNames'; +import styles from '~/components/settings/Settings.module.scss'; + +// List of supported providers that can have API keys +const API_KEY_PROVIDERS = [ + 'Anthropic', + 'OpenAI', + 'Google', + 'Groq', + 'HuggingFace', + 'OpenRouter', + 'Deepseek', + 'Mistral', + 'OpenAILike', + 'Together', + 'xAI', + 'Perplexity', + 'Cohere', + 'AzureOpenAI', +] as const; + +type Provider = typeof API_KEY_PROVIDERS[number]; + +interface ApiKeys { + [key: string]: string; +} + +export default function DataTab() { + const navigate = useNavigate(); + const [isDeleting, setIsDeleting] = useState(false); + + const downloadAsJson = (data: any, filename: string) => { + const blob = new Blob([JSON.stringify(data, null, 2)], { type: 'application/json' }); + const url = URL.createObjectURL(blob); + const link = document.createElement('a'); + link.href = url; + link.download = filename; + document.body.appendChild(link); + link.click(); + document.body.removeChild(link); + URL.revokeObjectURL(url); + }; + + const handleExportAllChats = async () => { + if (!db) { + const error = new Error('Database is not available'); + logStore.logError('Failed to export chats - DB unavailable', error); + toast.error('Database is not available'); + return; + } + + try { + const allChats = await getAll(db); + const exportData = { + chats: allChats, + exportDate: new Date().toISOString(), + }; + + downloadAsJson(exportData, `all-chats-${new Date().toISOString()}.json`); + logStore.logSystem('Chats exported successfully', { count: allChats.length }); + toast.success('Chats exported successfully'); + } catch (error) { + logStore.logError('Failed to export chats', error); + toast.error('Failed to export chats'); + console.error(error); + } + }; + + const handleDeleteAllChats = async () => { + const confirmDelete = window.confirm('Are you sure you want to delete all chats? This action cannot be undone.'); + + if (!confirmDelete) { + return; + } + + if (!db) { + const error = new Error('Database is not available'); + logStore.logError('Failed to delete chats - DB unavailable', error); + toast.error('Database is not available'); + return; + } + + try { + setIsDeleting(true); + const allChats = await getAll(db); + await Promise.all(allChats.map((chat) => deleteById(db!, chat.id))); + logStore.logSystem('All chats deleted successfully', { count: allChats.length }); + toast.success('All chats deleted successfully'); + navigate('/', { replace: true }); + } catch (error) { + logStore.logError('Failed to delete chats', error); + toast.error('Failed to delete chats'); + console.error(error); + } finally { + setIsDeleting(false); + } + }; + + const handleExportSettings = () => { + const settings = { + providers: Cookies.get('providers'), + isDebugEnabled: Cookies.get('isDebugEnabled'), + isEventLogsEnabled: Cookies.get('isEventLogsEnabled'), + isLocalModelsEnabled: Cookies.get('isLocalModelsEnabled'), + promptId: Cookies.get('promptId'), + isLatestBranch: Cookies.get('isLatestBranch'), + commitHash: Cookies.get('commitHash'), + eventLogs: Cookies.get('eventLogs'), + selectedModel: Cookies.get('selectedModel'), + selectedProvider: Cookies.get('selectedProvider'), + githubUsername: Cookies.get('githubUsername'), + githubToken: Cookies.get('githubToken'), + bolt_theme: localStorage.getItem('bolt_theme'), + }; + + downloadAsJson(settings, 'bolt-settings.json'); + toast.success('Settings exported successfully'); + }; + + const handleImportSettings = (event: React.ChangeEvent) => { + const file = event.target.files?.[0]; + if (!file) return; + + const reader = new FileReader(); + reader.onload = (e) => { + try { + const settings = JSON.parse(e.target?.result as string); + + Object.entries(settings).forEach(([key, value]) => { + if (key === 'bolt_theme') { + if (value) localStorage.setItem(key, value as string); + } else if (value) { + Cookies.set(key, value as string); + } + }); + + toast.success('Settings imported successfully. Please refresh the page for changes to take effect.'); + } catch (error) { + toast.error('Failed to import settings. Make sure the file is a valid JSON file.'); + console.error('Failed to import settings:', error); + } + }; + reader.readAsText(file); + event.target.value = ''; + }; + + const handleExportApiKeyTemplate = () => { + const template: ApiKeys = {}; + API_KEY_PROVIDERS.forEach(provider => { + template[`${provider}_API_KEY`] = ''; + }); + + template['OPENAI_LIKE_API_BASE_URL'] = ''; + template['LMSTUDIO_API_BASE_URL'] = ''; + template['OLLAMA_API_BASE_URL'] = ''; + template['TOGETHER_API_BASE_URL'] = ''; + + downloadAsJson(template, 'api-keys-template.json'); + toast.success('API keys template exported successfully'); + }; + + const handleImportApiKeys = (event: React.ChangeEvent) => { + const file = event.target.files?.[0]; + if (!file) return; + + const reader = new FileReader(); + reader.onload = (e) => { + try { + const apiKeys = JSON.parse(e.target?.result as string); + let importedCount = 0; + const consolidatedKeys: Record = {}; + + API_KEY_PROVIDERS.forEach(provider => { + const keyName = `${provider}_API_KEY`; + if (apiKeys[keyName]) { + consolidatedKeys[provider] = apiKeys[keyName]; + importedCount++; + } + }); + + if (importedCount > 0) { + // Store all API keys in a single cookie as JSON + Cookies.set('apiKeys', JSON.stringify(consolidatedKeys)); + + // Also set individual cookies for backward compatibility + Object.entries(consolidatedKeys).forEach(([provider, key]) => { + Cookies.set(`${provider}_API_KEY`, key); + }); + + toast.success(`Successfully imported ${importedCount} API keys/URLs. Refreshing page to apply changes...`); + // Reload the page after a short delay to allow the toast to be seen + setTimeout(() => { + window.location.reload(); + }, 1500); + } else { + toast.warn('No valid API keys found in the file'); + } + + // Set base URLs if they exist + ['OPENAI_LIKE_API_BASE_URL', 'LMSTUDIO_API_BASE_URL', 'OLLAMA_API_BASE_URL', 'TOGETHER_API_BASE_URL'].forEach(baseUrl => { + if (apiKeys[baseUrl]) { + Cookies.set(baseUrl, apiKeys[baseUrl]); + } + }); + + } catch (error) { + toast.error('Failed to import API keys. Make sure the file is a valid JSON file.'); + console.error('Failed to import API keys:', error); + } + }; + reader.readAsText(file); + event.target.value = ''; + }; + + return ( +
+
+

Data Management

+
+
+
+

Chat History

+

+ Export or delete all your chat history. +

+
+ + +
+
+ +
+

Settings Backup

+

+ Export your settings to a JSON file or import settings from a previously exported file. +

+
+ + +
+
+ +
+

API Keys Management

+

+ Import API keys from a JSON file or download a template to fill in your keys. +

+
+ + +
+
+
+
+
+
+ ); +} \ No newline at end of file diff --git a/app/components/settings/debug/DebugTab.tsx b/app/components/settings/debug/DebugTab.tsx index cf2341b55..3d1860313 100644 --- a/app/components/settings/debug/DebugTab.tsx +++ b/app/components/settings/debug/DebugTab.tsx @@ -1,7 +1,7 @@ import React, { useCallback, useEffect, useState } from 'react'; import { useSettings } from '~/lib/hooks/useSettings'; -import commit from '~/commit.json'; import { toast } from 'react-toastify'; +import { providerBaseUrlEnvKeys } from '~/utils/constants'; interface ProviderStatus { name: string; @@ -43,11 +43,16 @@ interface CommitData { version?: string; } -const connitJson: CommitData = commit; +const connitJson: CommitData = { + commit: __COMMIT_HASH, + version: __APP_VERSION, +}; const LOCAL_PROVIDERS = ['Ollama', 'LMStudio', 'OpenAILike']; + const versionHash = connitJson.commit; const versionTag = connitJson.version; + const GITHUB_URLS = { original: 'https://api.github.com/repos/stackblitz-labs/bolt.diy/commits/main', fork: 'https://api.github.com/repos/Stijnus/bolt.new-any-llm/commits/main', @@ -236,7 +241,7 @@ const checkProviderStatus = async (url: string | null, providerName: string): Pr } // Try different endpoints based on provider - const checkUrls = [`${url}/api/health`, `${url}/v1/models`]; + const checkUrls = [`${url}/api/health`, url.endsWith('v1') ? `${url}/models` : `${url}/v1/models`]; console.log(`[Debug] Checking additional endpoints:`, checkUrls); const results = await Promise.all( @@ -321,14 +326,16 @@ export default function DebugTab() { .filter(([, provider]) => LOCAL_PROVIDERS.includes(provider.name)) .map(async ([, provider]) => { const envVarName = - provider.name.toLowerCase() === 'ollama' - ? 'OLLAMA_API_BASE_URL' - : provider.name.toLowerCase() === 'lmstudio' - ? 'LMSTUDIO_API_BASE_URL' - : `REACT_APP_${provider.name.toUpperCase()}_URL`; + providerBaseUrlEnvKeys[provider.name].baseUrlKey || `REACT_APP_${provider.name.toUpperCase()}_URL`; // Access environment variables through import.meta.env - const url = import.meta.env[envVarName] || provider.settings.baseUrl || null; // Ensure baseUrl is used + let settingsUrl = provider.settings.baseUrl; + + if (settingsUrl && settingsUrl.trim().length === 0) { + settingsUrl = undefined; + } + + const url = settingsUrl || import.meta.env[envVarName] || null; // Ensure baseUrl is used console.log(`[Debug] Using URL for ${provider.name}:`, url, `(from ${envVarName})`); const status = await checkProviderStatus(url, provider.name); @@ -521,7 +528,7 @@ export default function DebugTab() {

Version

- {versionHash.slice(0, 7)} + {connitJson.commit.slice(0, 7)} (v{versionTag || '0.0.1'}) - {isLatestBranch ? 'nightly' : 'stable'} diff --git a/app/components/settings/providers/ProvidersTab.tsx b/app/components/settings/providers/ProvidersTab.tsx index 281b4c80d..e03731f43 100644 --- a/app/components/settings/providers/ProvidersTab.tsx +++ b/app/components/settings/providers/ProvidersTab.tsx @@ -7,6 +7,7 @@ import { logStore } from '~/lib/stores/logs'; // Import a default fallback icon import DefaultIcon from '/icons/Default.svg'; // Adjust the path as necessary +import { providerBaseUrlEnvKeys } from '~/utils/constants'; export default function ProvidersTab() { const { providers, updateProviderSettings, isLocalModel } = useSettings(); @@ -33,9 +34,87 @@ export default function ProvidersTab() { newFilteredProviders.sort((a, b) => a.name.localeCompare(b.name)); - setFilteredProviders(newFilteredProviders); + // Split providers into regular and URL-configurable + const regular = newFilteredProviders.filter((p) => !URL_CONFIGURABLE_PROVIDERS.includes(p.name)); + const urlConfigurable = newFilteredProviders.filter((p) => URL_CONFIGURABLE_PROVIDERS.includes(p.name)); + + setFilteredProviders([...regular, ...urlConfigurable]); }, [providers, searchTerm, isLocalModel]); + const renderProviderCard = (provider: IProviderConfig) => { + const envBaseUrlKey = providerBaseUrlEnvKeys[provider.name].baseUrlKey; + const envBaseUrl = envBaseUrlKey ? import.meta.env[envBaseUrlKey] : undefined; + const isUrlConfigurable = URL_CONFIGURABLE_PROVIDERS.includes(provider.name); + + return ( +

+
+
+ { + e.currentTarget.src = DefaultIcon; + }} + alt={`${provider.name} icon`} + className="w-6 h-6 dark:invert" + /> + {provider.name} +
+ { + updateProviderSettings(provider.name, { ...provider.settings, enabled }); + + if (enabled) { + logStore.logProvider(`Provider ${provider.name} enabled`, { provider: provider.name }); + } else { + logStore.logProvider(`Provider ${provider.name} disabled`, { provider: provider.name }); + } + }} + /> +
+ {isUrlConfigurable && provider.settings.enabled && ( +
+ {envBaseUrl && ( + + )} + + { + let newBaseUrl: string | undefined = e.target.value; + + if (newBaseUrl && newBaseUrl.trim().length === 0) { + newBaseUrl = undefined; + } + + updateProviderSettings(provider.name, { ...provider.settings, baseUrl: newBaseUrl }); + logStore.logProvider(`Base URL updated for ${provider.name}`, { + provider: provider.name, + baseUrl: newBaseUrl, + }); + }} + placeholder={`Enter ${provider.name} base URL`} + className="w-full bg-white dark:bg-bolt-elements-background-depth-4 relative px-2 py-1.5 rounded-md focus:outline-none placeholder-bolt-elements-textTertiary text-bolt-elements-textPrimary dark:text-bolt-elements-textPrimary border border-bolt-elements-borderColor" + /> +
+ )} +
+ ); + }; + + const regularProviders = filteredProviders.filter((p) => !URL_CONFIGURABLE_PROVIDERS.includes(p.name)); + const urlConfigurableProviders = filteredProviders.filter((p) => URL_CONFIGURABLE_PROVIDERS.includes(p.name)); + return (
@@ -47,60 +126,21 @@ export default function ProvidersTab() { className="w-full bg-white dark:bg-bolt-elements-background-depth-4 relative px-2 py-1.5 rounded-md focus:outline-none placeholder-bolt-elements-textTertiary text-bolt-elements-textPrimary dark:text-bolt-elements-textPrimary border border-bolt-elements-borderColor" />
- {filteredProviders.map((provider) => ( -
-
-
- { - // Fallback to default icon on error - e.currentTarget.src = DefaultIcon; - }} - alt={`${provider.name} icon`} - className="w-6 h-6 dark:invert" - /> - {provider.name} -
- { - updateProviderSettings(provider.name, { ...provider.settings, enabled }); - - if (enabled) { - logStore.logProvider(`Provider ${provider.name} enabled`, { provider: provider.name }); - } else { - logStore.logProvider(`Provider ${provider.name} disabled`, { provider: provider.name }); - } - }} - /> -
- {/* Base URL input for configurable providers */} - {URL_CONFIGURABLE_PROVIDERS.includes(provider.name) && provider.settings.enabled && ( -
- - { - const newBaseUrl = e.target.value; - updateProviderSettings(provider.name, { ...provider.settings, baseUrl: newBaseUrl }); - logStore.logProvider(`Base URL updated for ${provider.name}`, { - provider: provider.name, - baseUrl: newBaseUrl, - }); - }} - placeholder={`Enter ${provider.name} base URL`} - className="w-full bg-white dark:bg-bolt-elements-background-depth-4 relative px-2 py-1.5 rounded-md focus:outline-none placeholder-bolt-elements-textTertiary text-bolt-elements-textPrimary dark:text-bolt-elements-textPrimary border border-bolt-elements-borderColor" - /> -
- )} + + {/* Regular Providers Grid */} +
{regularProviders.map(renderProviderCard)}
+ + {/* URL Configurable Providers Section */} + {urlConfigurableProviders.length > 0 && ( +
+

Experimental Providers

+

+ These providers are experimental and allow you to run AI models locally or connect to your own + infrastructure. They require additional setup but offer more flexibility. +

+
{urlConfigurableProviders.map(renderProviderCard)}
- ))} + )}
); } diff --git a/app/entry.server.tsx b/app/entry.server.tsx index a44917f02..5e92d21ec 100644 --- a/app/entry.server.tsx +++ b/app/entry.server.tsx @@ -14,7 +14,7 @@ export default async function handleRequest( remixContext: EntryContext, _loadContext: AppLoadContext, ) { - await initializeModelList(); + await initializeModelList({}); const readable = await renderToReadableStream(, { signal: request.signal, diff --git a/app/lib/.server/llm/api-key.ts b/app/lib/.server/llm/api-key.ts deleted file mode 100644 index e82d08eb8..000000000 --- a/app/lib/.server/llm/api-key.ts +++ /dev/null @@ -1,73 +0,0 @@ -/* - * @ts-nocheck - * Preventing TS checks with files presented in the video for a better presentation. - */ -import { env } from 'node:process'; - -export function getAPIKey(cloudflareEnv: Env, provider: string, userApiKeys?: Record) { - /** - * The `cloudflareEnv` is only used when deployed or when previewing locally. - * In development the environment variables are available through `env`. - */ - - // First check user-provided API keys - if (userApiKeys?.[provider]) { - return userApiKeys[provider]; - } - - // Fall back to environment variables - switch (provider) { - case 'Anthropic': - return env.ANTHROPIC_API_KEY || cloudflareEnv.ANTHROPIC_API_KEY; - case 'OpenAI': - return env.OPENAI_API_KEY || cloudflareEnv.OPENAI_API_KEY; - case 'Google': - return env.GOOGLE_GENERATIVE_AI_API_KEY || cloudflareEnv.GOOGLE_GENERATIVE_AI_API_KEY; - case 'Groq': - return env.GROQ_API_KEY || cloudflareEnv.GROQ_API_KEY; - case 'HuggingFace': - return env.HuggingFace_API_KEY || cloudflareEnv.HuggingFace_API_KEY; - case 'OpenRouter': - return env.OPEN_ROUTER_API_KEY || cloudflareEnv.OPEN_ROUTER_API_KEY; - case 'Deepseek': - return env.DEEPSEEK_API_KEY || cloudflareEnv.DEEPSEEK_API_KEY; - case 'Mistral': - return env.MISTRAL_API_KEY || cloudflareEnv.MISTRAL_API_KEY; - case 'OpenAILike': - return env.OPENAI_LIKE_API_KEY || cloudflareEnv.OPENAI_LIKE_API_KEY; - case 'Together': - return env.TOGETHER_API_KEY || cloudflareEnv.TOGETHER_API_KEY; - case 'xAI': - return env.XAI_API_KEY || cloudflareEnv.XAI_API_KEY; - case 'Perplexity': - return env.PERPLEXITY_API_KEY || cloudflareEnv.PERPLEXITY_API_KEY; - case 'Cohere': - return env.COHERE_API_KEY; - case 'AzureOpenAI': - return env.AZURE_OPENAI_API_KEY; - default: - return ''; - } -} - -export function getBaseURL(cloudflareEnv: Env, provider: string) { - switch (provider) { - case 'Together': - return env.TOGETHER_API_BASE_URL || cloudflareEnv.TOGETHER_API_BASE_URL || 'https://api.together.xyz/v1'; - case 'OpenAILike': - return env.OPENAI_LIKE_API_BASE_URL || cloudflareEnv.OPENAI_LIKE_API_BASE_URL; - case 'LMStudio': - return env.LMSTUDIO_API_BASE_URL || cloudflareEnv.LMSTUDIO_API_BASE_URL || 'http://localhost:1234'; - case 'Ollama': { - let baseUrl = env.OLLAMA_API_BASE_URL || cloudflareEnv.OLLAMA_API_BASE_URL || 'http://localhost:11434'; - - if (env.RUNNING_IN_DOCKER === 'true') { - baseUrl = baseUrl.replace('localhost', 'host.docker.internal'); - } - - return baseUrl; - } - default: - return ''; - } -} diff --git a/app/lib/.server/llm/model.ts b/app/lib/.server/llm/model.ts deleted file mode 100644 index 1a5aab7eb..000000000 --- a/app/lib/.server/llm/model.ts +++ /dev/null @@ -1,187 +0,0 @@ -/* - * @ts-nocheck - * Preventing TS checks with files presented in the video for a better presentation. - */ -import { getAPIKey, getBaseURL } from '~/lib/.server/llm/api-key'; -import { createAnthropic } from '@ai-sdk/anthropic'; -import { createOpenAI } from '@ai-sdk/openai'; -import { createGoogleGenerativeAI } from '@ai-sdk/google'; -import { ollama } from 'ollama-ai-provider'; -import { createOpenRouter } from '@openrouter/ai-sdk-provider'; -import { createMistral } from '@ai-sdk/mistral'; -import { createCohere } from '@ai-sdk/cohere'; -import type { LanguageModelV1 } from 'ai'; -import type { IProviderSetting } from '~/types/model'; - -export const DEFAULT_NUM_CTX = process.env.DEFAULT_NUM_CTX ? parseInt(process.env.DEFAULT_NUM_CTX, 10) : 32768; - -type OptionalApiKey = string | undefined; - -export function getAnthropicModel(apiKey: OptionalApiKey, model: string) { - const anthropic = createAnthropic({ - apiKey, - }); - - return anthropic(model); -} -export function getOpenAILikeModel(baseURL: string, apiKey: OptionalApiKey, model: string) { - const openai = createOpenAI({ - baseURL, - apiKey, - }); - - return openai(model); -} - -export function getCohereAIModel(apiKey: OptionalApiKey, model: string) { - const cohere = createCohere({ - apiKey, - }); - - return cohere(model); -} - -export function getOpenAIModel(apiKey: OptionalApiKey, model: string) { - const openai = createOpenAI({ - apiKey, - }); - - return openai(model); -} - -export function getMistralModel(apiKey: OptionalApiKey, model: string) { - const mistral = createMistral({ - apiKey, - }); - - return mistral(model); -} - -export function getGoogleModel(apiKey: OptionalApiKey, model: string) { - const google = createGoogleGenerativeAI({ - apiKey, - }); - - return google(model); -} - -export function getGroqModel(apiKey: OptionalApiKey, model: string) { - const openai = createOpenAI({ - baseURL: 'https://api.groq.com/openai/v1', - apiKey, - }); - - return openai(model); -} - -export function getHuggingFaceModel(apiKey: OptionalApiKey, model: string) { - const openai = createOpenAI({ - baseURL: 'https://api-inference.huggingface.co/v1/', - apiKey, - }); - - return openai(model); -} - -export function getOllamaModel(baseURL: string, model: string) { - const ollamaInstance = ollama(model, { - numCtx: DEFAULT_NUM_CTX, - }) as LanguageModelV1 & { config: any }; - - ollamaInstance.config.baseURL = `${baseURL}/api`; - - return ollamaInstance; -} - -export function getDeepseekModel(apiKey: OptionalApiKey, model: string) { - const openai = createOpenAI({ - baseURL: 'https://api.deepseek.com/beta', - apiKey, - }); - - return openai(model); -} - -export function getOpenRouterModel(apiKey: OptionalApiKey, model: string) { - const openRouter = createOpenRouter({ - apiKey, - }); - - return openRouter.chat(model); -} - -export function getLMStudioModel(baseURL: string, model: string) { - const lmstudio = createOpenAI({ - baseUrl: `${baseURL}/v1`, - apiKey: '', - }); - - return lmstudio(model); -} - -export function getXAIModel(apiKey: OptionalApiKey, model: string) { - const openai = createOpenAI({ - baseURL: 'https://api.x.ai/v1', - apiKey, - }); - - return openai(model); -} - -export function getPerplexityModel(apiKey: OptionalApiKey, model: string) { - const perplexity = createOpenAI({ - baseURL: 'https://api.perplexity.ai/', - apiKey, - }); - - return perplexity(model); -} - -export function getModel( - provider: string, - model: string, - env: Env, - apiKeys?: Record, - providerSettings?: Record, -) { - /* - * let apiKey; // Declare first - * let baseURL; - */ - - const apiKey = getAPIKey(env, provider, apiKeys); // Then assign - const baseURL = providerSettings?.[provider].baseUrl || getBaseURL(env, provider); - - switch (provider) { - case 'Anthropic': - return getAnthropicModel(apiKey, model); - case 'OpenAI': - return getOpenAIModel(apiKey, model); - case 'Groq': - return getGroqModel(apiKey, model); - case 'HuggingFace': - return getHuggingFaceModel(apiKey, model); - case 'OpenRouter': - return getOpenRouterModel(apiKey, model); - case 'Google': - return getGoogleModel(apiKey, model); - case 'OpenAILike': - return getOpenAILikeModel(baseURL, apiKey, model); - case 'Together': - return getOpenAILikeModel(baseURL, apiKey, model); - case 'Deepseek': - return getDeepseekModel(apiKey, model); - case 'Mistral': - return getMistralModel(apiKey, model); - case 'LMStudio': - return getLMStudioModel(baseURL, model); - case 'xAI': - return getXAIModel(apiKey, model); - case 'Cohere': - return getCohereAIModel(apiKey, model); - case 'Perplexity': - return getPerplexityModel(apiKey, model); - default: - return getOllamaModel(baseURL, model); - } -} diff --git a/app/lib/.server/llm/stream-text.ts b/app/lib/.server/llm/stream-text.ts index 74cdd9d4f..a71792288 100644 --- a/app/lib/.server/llm/stream-text.ts +++ b/app/lib/.server/llm/stream-text.ts @@ -1,5 +1,4 @@ import { convertToCoreMessages, streamText as _streamText } from 'ai'; -import { getModel } from '~/lib/.server/llm/model'; import { MAX_TOKENS } from './constants'; import { getSystemPrompt } from '~/lib/common/prompts/prompts'; import { @@ -8,6 +7,7 @@ import { getModelList, MODEL_REGEX, MODIFICATIONS_TAG_NAME, + PROVIDER_LIST, PROVIDER_REGEX, WORK_DIR, } from '~/utils/constants'; @@ -151,10 +151,13 @@ export async function streamText(props: { providerSettings?: Record; promptId?: string; }) { - const { messages, env, options, apiKeys, files, providerSettings, promptId } = props; + const { messages, env: serverEnv, options, apiKeys, files, providerSettings, promptId } = props; + + // console.log({serverEnv}); + let currentModel = DEFAULT_MODEL; let currentProvider = DEFAULT_PROVIDER.name; - const MODEL_LIST = await getModelList(apiKeys || {}, providerSettings); + const MODEL_LIST = await getModelList({ apiKeys, providerSettings, serverEnv: serverEnv as any }); const processedMessages = messages.map((message) => { if (message.role === 'user') { const { model, provider, content } = extractPropertiesFromMessage(message); @@ -181,6 +184,8 @@ export async function streamText(props: { const dynamicMaxTokens = modelDetails && modelDetails.maxTokenAllowed ? modelDetails.maxTokenAllowed : MAX_TOKENS; + const provider = PROVIDER_LIST.find((p) => p.name === currentProvider) || DEFAULT_PROVIDER; + let systemPrompt = PromptLibrary.getPropmtFromLibrary(promptId || 'default', { cwd: WORK_DIR, @@ -196,7 +201,12 @@ export async function streamText(props: { } return _streamText({ - model: getModel(currentProvider, currentModel, env, apiKeys, providerSettings) as any, + model: provider.getModelInstance({ + model: currentModel, + serverEnv, + apiKeys, + providerSettings, + }), system: systemPrompt, maxTokens: dynamicMaxTokens, messages: convertToCoreMessages(processedMessages as any), diff --git a/app/lib/hooks/useEditChatDescription.ts b/app/lib/hooks/useEditChatDescription.ts index da07f2cd0..25147a020 100644 --- a/app/lib/hooks/useEditChatDescription.ts +++ b/app/lib/hooks/useEditChatDescription.ts @@ -92,7 +92,9 @@ export function useEditChatDescription({ } const lengthValid = trimmedDesc.length > 0 && trimmedDesc.length <= 100; - const characterValid = /^[a-zA-Z0-9\s]+$/.test(trimmedDesc); + + // Allow letters, numbers, spaces, and common punctuation but exclude characters that could cause issues + const characterValid = /^[a-zA-Z0-9\s\-_.,!?()[\]{}'"]+$/.test(trimmedDesc); if (!lengthValid) { toast.error('Description must be between 1 and 100 characters.'); @@ -100,7 +102,7 @@ export function useEditChatDescription({ } if (!characterValid) { - toast.error('Description can only contain alphanumeric characters and spaces.'); + toast.error('Description can only contain letters, numbers, spaces, and basic punctuation.'); return false; } diff --git a/app/lib/hooks/useSettings.tsx b/app/lib/hooks/useSettings.tsx index cbdc1894a..3f5515102 100644 --- a/app/lib/hooks/useSettings.tsx +++ b/app/lib/hooks/useSettings.tsx @@ -12,14 +12,16 @@ import { useCallback, useEffect, useState } from 'react'; import Cookies from 'js-cookie'; import type { IProviderSetting, ProviderInfo } from '~/types/model'; import { logStore } from '~/lib/stores/logs'; // assuming logStore is imported from this location -import commit from '~/commit.json'; interface CommitData { commit: string; version?: string; } -const commitJson: CommitData = commit; +const versionData: CommitData = { + commit: __COMMIT_HASH, + version: __APP_VERSION, +}; export function useSettings() { const providers = useStore(providersStore); @@ -34,7 +36,7 @@ export function useSettings() { const checkIsStableVersion = async () => { try { const stableResponse = await fetch( - `https://raw.githubusercontent.com/stackblitz-labs/bolt.diy/refs/tags/v${commitJson.version}/app/commit.json`, + `https://raw.githubusercontent.com/stackblitz-labs/bolt.diy/refs/tags/v${versionData.version}/app/commit.json`, ); if (!stableResponse.ok) { @@ -44,7 +46,7 @@ export function useSettings() { const stableData = (await stableResponse.json()) as CommitData; - return commit.commit === stableData.commit; + return versionData.commit === stableData.commit; } catch (error) { console.warn('Error checking stable version:', error); return false; @@ -58,15 +60,18 @@ export function useSettings() { if (savedProviders) { try { const parsedProviders: Record = JSON.parse(savedProviders); - Object.keys(parsedProviders).forEach((provider) => { - const currentProvider = providers[provider]; - providersStore.setKey(provider, { - ...currentProvider, - settings: { - ...parsedProviders[provider], - enabled: parsedProviders[provider].enabled ?? true, - }, - }); + Object.keys(providers).forEach((provider) => { + const currentProviderSettings = parsedProviders[provider]; + + if (currentProviderSettings) { + providersStore.setKey(provider, { + ...providers[provider], + settings: { + ...currentProviderSettings, + enabled: currentProviderSettings.enabled ?? true, + }, + }); + } }); } catch (error) { console.error('Failed to parse providers from cookies:', error); @@ -105,16 +110,16 @@ export function useSettings() { let checkCommit = Cookies.get('commitHash'); if (checkCommit === undefined) { - checkCommit = commit.commit; + checkCommit = versionData.commit; } - if (savedLatestBranch === undefined || checkCommit !== commit.commit) { + if (savedLatestBranch === undefined || checkCommit !== versionData.commit) { // If setting hasn't been set by user, check version checkIsStableVersion().then((isStable) => { const shouldUseLatest = !isStable; latestBranchStore.set(shouldUseLatest); Cookies.set('isLatestBranch', String(shouldUseLatest)); - Cookies.set('commitHash', String(commit.commit)); + Cookies.set('commitHash', String(versionData.commit)); }); } else { latestBranchStore.set(savedLatestBranch === 'true'); diff --git a/app/lib/modules/llm/base-provider.ts b/app/lib/modules/llm/base-provider.ts new file mode 100644 index 000000000..ebc2a3a53 --- /dev/null +++ b/app/lib/modules/llm/base-provider.ts @@ -0,0 +1,72 @@ +import type { LanguageModelV1 } from 'ai'; +import type { ProviderInfo, ProviderConfig, ModelInfo } from './types'; +import type { IProviderSetting } from '~/types/model'; +import { createOpenAI } from '@ai-sdk/openai'; +import { LLMManager } from './manager'; + +export abstract class BaseProvider implements ProviderInfo { + abstract name: string; + abstract staticModels: ModelInfo[]; + abstract config: ProviderConfig; + + getApiKeyLink?: string; + labelForGetApiKey?: string; + icon?: string; + + getProviderBaseUrlAndKey(options: { + apiKeys?: Record; + providerSettings?: IProviderSetting; + serverEnv?: Record; + defaultBaseUrlKey: string; + defaultApiTokenKey: string; + }) { + const { apiKeys, providerSettings, serverEnv, defaultBaseUrlKey, defaultApiTokenKey } = options; + let settingsBaseUrl = providerSettings?.baseUrl; + const manager = LLMManager.getInstance(); + + if (settingsBaseUrl && settingsBaseUrl.length == 0) { + settingsBaseUrl = undefined; + } + + const baseUrlKey = this.config.baseUrlKey || defaultBaseUrlKey; + let baseUrl = settingsBaseUrl || serverEnv?.[baseUrlKey] || process?.env?.[baseUrlKey] || manager.env?.[baseUrlKey]; + + if (baseUrl && baseUrl.endsWith('/')) { + baseUrl = baseUrl.slice(0, -1); + } + + const apiTokenKey = this.config.apiTokenKey || defaultApiTokenKey; + const apiKey = + apiKeys?.[this.name] || serverEnv?.[apiTokenKey] || process?.env?.[apiTokenKey] || manager.env?.[baseUrlKey]; + + return { + baseUrl, + apiKey, + }; + } + + // Declare the optional getDynamicModels method + getDynamicModels?( + apiKeys?: Record, + settings?: IProviderSetting, + serverEnv?: Record, + ): Promise; + + abstract getModelInstance(options: { + model: string; + serverEnv: Env; + apiKeys?: Record; + providerSettings?: Record; + }): LanguageModelV1; +} + +type OptionalApiKey = string | undefined; + +export function getOpenAILikeModel(baseURL: string, apiKey: OptionalApiKey, model: string) { + const openai = createOpenAI({ + baseURL, + apiKey, + }); + + return openai(model); +} diff --git a/app/lib/modules/llm/manager.ts b/app/lib/modules/llm/manager.ts new file mode 100644 index 000000000..38dc8254d --- /dev/null +++ b/app/lib/modules/llm/manager.ts @@ -0,0 +1,116 @@ +import type { IProviderSetting } from '~/types/model'; +import { BaseProvider } from './base-provider'; +import type { ModelInfo, ProviderInfo } from './types'; +import * as providers from './registry'; + +export class LLMManager { + private static _instance: LLMManager; + private _providers: Map = new Map(); + private _modelList: ModelInfo[] = []; + private readonly _env: any = {}; + + private constructor(_env: Record) { + this._registerProvidersFromDirectory(); + this._env = _env; + } + + static getInstance(env: Record = {}): LLMManager { + if (!LLMManager._instance) { + LLMManager._instance = new LLMManager(env); + } + + return LLMManager._instance; + } + get env() { + return this._env; + } + + private async _registerProvidersFromDirectory() { + try { + /* + * Dynamically import all files from the providers directory + * const providerModules = import.meta.glob('./providers/*.ts', { eager: true }); + */ + + // Look for exported classes that extend BaseProvider + for (const exportedItem of Object.values(providers)) { + if (typeof exportedItem === 'function' && exportedItem.prototype instanceof BaseProvider) { + const provider = new exportedItem(); + + try { + this.registerProvider(provider); + } catch (error: any) { + console.log('Failed To Register Provider: ', provider.name, 'error:', error.message); + } + } + } + } catch (error) { + console.error('Error registering providers:', error); + } + } + + registerProvider(provider: BaseProvider) { + if (this._providers.has(provider.name)) { + console.warn(`Provider ${provider.name} is already registered. Skipping.`); + return; + } + + console.log('Registering Provider: ', provider.name); + this._providers.set(provider.name, provider); + this._modelList = [...this._modelList, ...provider.staticModels]; + } + + getProvider(name: string): BaseProvider | undefined { + return this._providers.get(name); + } + + getAllProviders(): BaseProvider[] { + return Array.from(this._providers.values()); + } + + getModelList(): ModelInfo[] { + return this._modelList; + } + + async updateModelList(options: { + apiKeys?: Record; + providerSettings?: Record; + serverEnv?: Record; + }): Promise { + const { apiKeys, providerSettings, serverEnv } = options; + + // Get dynamic models from all providers that support them + const dynamicModels = await Promise.all( + Array.from(this._providers.values()) + .filter( + (provider): provider is BaseProvider & Required> => + !!provider.getDynamicModels, + ) + .map((provider) => + provider.getDynamicModels(apiKeys, providerSettings?.[provider.name], serverEnv).catch((err) => { + console.error(`Error getting dynamic models ${provider.name} :`, err); + return []; + }), + ), + ); + + // Combine static and dynamic models + const modelList = [ + ...dynamicModels.flat(), + ...Array.from(this._providers.values()).flatMap((p) => p.staticModels || []), + ]; + this._modelList = modelList; + + return modelList; + } + + getDefaultProvider(): BaseProvider { + const firstProvider = this._providers.values().next().value; + + if (!firstProvider) { + throw new Error('No providers registered'); + } + + return firstProvider; + } +} diff --git a/app/lib/modules/llm/providers/anthropic.ts b/app/lib/modules/llm/providers/anthropic.ts new file mode 100644 index 000000000..099f02d62 --- /dev/null +++ b/app/lib/modules/llm/providers/anthropic.ts @@ -0,0 +1,58 @@ +import { BaseProvider } from '~/lib/modules/llm/base-provider'; +import type { ModelInfo } from '~/lib/modules/llm/types'; +import type { LanguageModelV1 } from 'ai'; +import type { IProviderSetting } from '~/types/model'; +import { createAnthropic } from '@ai-sdk/anthropic'; + +export default class AnthropicProvider extends BaseProvider { + name = 'Anthropic'; + getApiKeyLink = 'https://console.anthropic.com/settings/keys'; + + config = { + apiTokenKey: 'ANTHROPIC_API_KEY', + }; + + staticModels: ModelInfo[] = [ + { + name: 'claude-3-5-sonnet-latest', + label: 'Claude 3.5 Sonnet (new)', + provider: 'Anthropic', + maxTokenAllowed: 8000, + }, + { + name: 'claude-3-5-sonnet-20240620', + label: 'Claude 3.5 Sonnet (old)', + provider: 'Anthropic', + maxTokenAllowed: 8000, + }, + { + name: 'claude-3-5-haiku-latest', + label: 'Claude 3.5 Haiku (new)', + provider: 'Anthropic', + maxTokenAllowed: 8000, + }, + { name: 'claude-3-opus-latest', label: 'Claude 3 Opus', provider: 'Anthropic', maxTokenAllowed: 8000 }, + { name: 'claude-3-sonnet-20240229', label: 'Claude 3 Sonnet', provider: 'Anthropic', maxTokenAllowed: 8000 }, + { name: 'claude-3-haiku-20240307', label: 'Claude 3 Haiku', provider: 'Anthropic', maxTokenAllowed: 8000 }, + ]; + getModelInstance: (options: { + model: string; + serverEnv: Env; + apiKeys?: Record; + providerSettings?: Record; + }) => LanguageModelV1 = (options) => { + const { apiKeys, providerSettings, serverEnv, model } = options; + const { apiKey } = this.getProviderBaseUrlAndKey({ + apiKeys, + providerSettings, + serverEnv: serverEnv as any, + defaultBaseUrlKey: '', + defaultApiTokenKey: 'ANTHROPIC_API_KEY', + }); + const anthropic = createAnthropic({ + apiKey, + }); + + return anthropic(model); + }; +} diff --git a/app/lib/modules/llm/providers/cohere.ts b/app/lib/modules/llm/providers/cohere.ts new file mode 100644 index 000000000..9233b966b --- /dev/null +++ b/app/lib/modules/llm/providers/cohere.ts @@ -0,0 +1,54 @@ +import { BaseProvider } from '~/lib/modules/llm/base-provider'; +import type { ModelInfo } from '~/lib/modules/llm/types'; +import type { IProviderSetting } from '~/types/model'; +import type { LanguageModelV1 } from 'ai'; +import { createCohere } from '@ai-sdk/cohere'; + +export default class CohereProvider extends BaseProvider { + name = 'Cohere'; + getApiKeyLink = 'https://dashboard.cohere.com/api-keys'; + + config = { + apiTokenKey: 'COHERE_API_KEY', + }; + + staticModels: ModelInfo[] = [ + { name: 'command-r-plus-08-2024', label: 'Command R plus Latest', provider: 'Cohere', maxTokenAllowed: 4096 }, + { name: 'command-r-08-2024', label: 'Command R Latest', provider: 'Cohere', maxTokenAllowed: 4096 }, + { name: 'command-r-plus', label: 'Command R plus', provider: 'Cohere', maxTokenAllowed: 4096 }, + { name: 'command-r', label: 'Command R', provider: 'Cohere', maxTokenAllowed: 4096 }, + { name: 'command', label: 'Command', provider: 'Cohere', maxTokenAllowed: 4096 }, + { name: 'command-nightly', label: 'Command Nightly', provider: 'Cohere', maxTokenAllowed: 4096 }, + { name: 'command-light', label: 'Command Light', provider: 'Cohere', maxTokenAllowed: 4096 }, + { name: 'command-light-nightly', label: 'Command Light Nightly', provider: 'Cohere', maxTokenAllowed: 4096 }, + { name: 'c4ai-aya-expanse-8b', label: 'c4AI Aya Expanse 8b', provider: 'Cohere', maxTokenAllowed: 4096 }, + { name: 'c4ai-aya-expanse-32b', label: 'c4AI Aya Expanse 32b', provider: 'Cohere', maxTokenAllowed: 4096 }, + ]; + + getModelInstance(options: { + model: string; + serverEnv: Env; + apiKeys?: Record; + providerSettings?: Record; + }): LanguageModelV1 { + const { model, serverEnv, apiKeys, providerSettings } = options; + + const { apiKey } = this.getProviderBaseUrlAndKey({ + apiKeys, + providerSettings: providerSettings?.[this.name], + serverEnv: serverEnv as any, + defaultBaseUrlKey: '', + defaultApiTokenKey: 'COHERE_API_KEY', + }); + + if (!apiKey) { + throw new Error(`Missing API key for ${this.name} provider`); + } + + const cohere = createCohere({ + apiKey, + }); + + return cohere(model); + } +} diff --git a/app/lib/modules/llm/providers/deepseek.ts b/app/lib/modules/llm/providers/deepseek.ts new file mode 100644 index 000000000..dac0d23f1 --- /dev/null +++ b/app/lib/modules/llm/providers/deepseek.ts @@ -0,0 +1,47 @@ +import { BaseProvider } from '~/lib/modules/llm/base-provider'; +import type { ModelInfo } from '~/lib/modules/llm/types'; +import type { IProviderSetting } from '~/types/model'; +import type { LanguageModelV1 } from 'ai'; +import { createOpenAI } from '@ai-sdk/openai'; + +export default class DeepseekProvider extends BaseProvider { + name = 'Deepseek'; + getApiKeyLink = 'https://platform.deepseek.com/apiKeys'; + + config = { + apiTokenKey: 'DEEPSEEK_API_KEY', + }; + + staticModels: ModelInfo[] = [ + { name: 'deepseek-coder', label: 'Deepseek-Coder', provider: 'Deepseek', maxTokenAllowed: 8000 }, + { name: 'deepseek-chat', label: 'Deepseek-Chat', provider: 'Deepseek', maxTokenAllowed: 8000 }, + ]; + + getModelInstance(options: { + model: string; + serverEnv: Env; + apiKeys?: Record; + providerSettings?: Record; + }): LanguageModelV1 { + const { model, serverEnv, apiKeys, providerSettings } = options; + + const { apiKey } = this.getProviderBaseUrlAndKey({ + apiKeys, + providerSettings: providerSettings?.[this.name], + serverEnv: serverEnv as any, + defaultBaseUrlKey: '', + defaultApiTokenKey: 'DEEPSEEK_API_KEY', + }); + + if (!apiKey) { + throw new Error(`Missing API key for ${this.name} provider`); + } + + const openai = createOpenAI({ + baseURL: 'https://api.deepseek.com/beta', + apiKey, + }); + + return openai(model); + } +} diff --git a/app/lib/modules/llm/providers/google.ts b/app/lib/modules/llm/providers/google.ts new file mode 100644 index 000000000..edc8e1dd3 --- /dev/null +++ b/app/lib/modules/llm/providers/google.ts @@ -0,0 +1,51 @@ +import { BaseProvider } from '~/lib/modules/llm/base-provider'; +import type { ModelInfo } from '~/lib/modules/llm/types'; +import type { IProviderSetting } from '~/types/model'; +import type { LanguageModelV1 } from 'ai'; +import { createGoogleGenerativeAI } from '@ai-sdk/google'; + +export default class GoogleProvider extends BaseProvider { + name = 'Google'; + getApiKeyLink = 'https://aistudio.google.com/app/apikey'; + + config = { + apiTokenKey: 'GOOGLE_GENERATIVE_AI_API_KEY', + }; + + staticModels: ModelInfo[] = [ + { name: 'gemini-1.5-flash-latest', label: 'Gemini 1.5 Flash', provider: 'Google', maxTokenAllowed: 8192 }, + { name: 'gemini-2.0-flash-exp', label: 'Gemini 2.0 Flash', provider: 'Google', maxTokenAllowed: 8192 }, + { name: 'gemini-1.5-flash-002', label: 'Gemini 1.5 Flash-002', provider: 'Google', maxTokenAllowed: 8192 }, + { name: 'gemini-1.5-flash-8b', label: 'Gemini 1.5 Flash-8b', provider: 'Google', maxTokenAllowed: 8192 }, + { name: 'gemini-1.5-pro-latest', label: 'Gemini 1.5 Pro', provider: 'Google', maxTokenAllowed: 8192 }, + { name: 'gemini-1.5-pro-002', label: 'Gemini 1.5 Pro-002', provider: 'Google', maxTokenAllowed: 8192 }, + { name: 'gemini-exp-1206', label: 'Gemini exp-1206', provider: 'Google', maxTokenAllowed: 8192 }, + ]; + + getModelInstance(options: { + model: string; + serverEnv: any; + apiKeys?: Record; + providerSettings?: Record; + }): LanguageModelV1 { + const { model, serverEnv, apiKeys, providerSettings } = options; + + const { apiKey } = this.getProviderBaseUrlAndKey({ + apiKeys, + providerSettings: providerSettings?.[this.name], + serverEnv: serverEnv as any, + defaultBaseUrlKey: '', + defaultApiTokenKey: 'GOOGLE_GENERATIVE_AI_API_KEY', + }); + + if (!apiKey) { + throw new Error(`Missing API key for ${this.name} provider`); + } + + const google = createGoogleGenerativeAI({ + apiKey, + }); + + return google(model); + } +} diff --git a/app/lib/modules/llm/providers/groq.ts b/app/lib/modules/llm/providers/groq.ts new file mode 100644 index 000000000..034dab12e --- /dev/null +++ b/app/lib/modules/llm/providers/groq.ts @@ -0,0 +1,51 @@ +import { BaseProvider } from '~/lib/modules/llm/base-provider'; +import type { ModelInfo } from '~/lib/modules/llm/types'; +import type { IProviderSetting } from '~/types/model'; +import type { LanguageModelV1 } from 'ai'; +import { createOpenAI } from '@ai-sdk/openai'; + +export default class GroqProvider extends BaseProvider { + name = 'Groq'; + getApiKeyLink = 'https://console.groq.com/keys'; + + config = { + apiTokenKey: 'GROQ_API_KEY', + }; + + staticModels: ModelInfo[] = [ + { name: 'llama-3.1-8b-instant', label: 'Llama 3.1 8b (Groq)', provider: 'Groq', maxTokenAllowed: 8000 }, + { name: 'llama-3.2-11b-vision-preview', label: 'Llama 3.2 11b (Groq)', provider: 'Groq', maxTokenAllowed: 8000 }, + { name: 'llama-3.2-90b-vision-preview', label: 'Llama 3.2 90b (Groq)', provider: 'Groq', maxTokenAllowed: 8000 }, + { name: 'llama-3.2-3b-preview', label: 'Llama 3.2 3b (Groq)', provider: 'Groq', maxTokenAllowed: 8000 }, + { name: 'llama-3.2-1b-preview', label: 'Llama 3.2 1b (Groq)', provider: 'Groq', maxTokenAllowed: 8000 }, + { name: 'llama-3.3-70b-versatile', label: 'Llama 3.3 70b (Groq)', provider: 'Groq', maxTokenAllowed: 8000 }, + ]; + + getModelInstance(options: { + model: string; + serverEnv: Env; + apiKeys?: Record; + providerSettings?: Record; + }): LanguageModelV1 { + const { model, serverEnv, apiKeys, providerSettings } = options; + + const { apiKey } = this.getProviderBaseUrlAndKey({ + apiKeys, + providerSettings: providerSettings?.[this.name], + serverEnv: serverEnv as any, + defaultBaseUrlKey: '', + defaultApiTokenKey: 'GROQ_API_KEY', + }); + + if (!apiKey) { + throw new Error(`Missing API key for ${this.name} provider`); + } + + const openai = createOpenAI({ + baseURL: 'https://api.groq.com/openai/v1', + apiKey, + }); + + return openai(model); + } +} diff --git a/app/lib/modules/llm/providers/huggingface.ts b/app/lib/modules/llm/providers/huggingface.ts new file mode 100644 index 000000000..5ae1d1b46 --- /dev/null +++ b/app/lib/modules/llm/providers/huggingface.ts @@ -0,0 +1,69 @@ +import { BaseProvider } from '~/lib/modules/llm/base-provider'; +import type { ModelInfo } from '~/lib/modules/llm/types'; +import type { IProviderSetting } from '~/types/model'; +import type { LanguageModelV1 } from 'ai'; +import { createOpenAI } from '@ai-sdk/openai'; + +export default class HuggingFaceProvider extends BaseProvider { + name = 'HuggingFace'; + getApiKeyLink = 'https://huggingface.co/settings/tokens'; + + config = { + apiTokenKey: 'HuggingFace_API_KEY', + }; + + staticModels: ModelInfo[] = [ + { + name: 'Qwen/Qwen2.5-Coder-32B-Instruct', + label: 'Qwen2.5-Coder-32B-Instruct (HuggingFace)', + provider: 'HuggingFace', + maxTokenAllowed: 8000, + }, + { + name: '01-ai/Yi-1.5-34B-Chat', + label: 'Yi-1.5-34B-Chat (HuggingFace)', + provider: 'HuggingFace', + maxTokenAllowed: 8000, + }, + { + name: 'meta-llama/Llama-3.1-70B-Instruct', + label: 'Llama-3.1-70B-Instruct (HuggingFace)', + provider: 'HuggingFace', + maxTokenAllowed: 8000, + }, + { + name: 'meta-llama/Llama-3.1-405B', + label: 'Llama-3.1-405B (HuggingFace)', + provider: 'HuggingFace', + maxTokenAllowed: 8000, + }, + ]; + + getModelInstance(options: { + model: string; + serverEnv: Env; + apiKeys?: Record; + providerSettings?: Record; + }): LanguageModelV1 { + const { model, serverEnv, apiKeys, providerSettings } = options; + + const { apiKey } = this.getProviderBaseUrlAndKey({ + apiKeys, + providerSettings: providerSettings?.[this.name], + serverEnv: serverEnv as any, + defaultBaseUrlKey: '', + defaultApiTokenKey: 'HuggingFace_API_KEY', + }); + + if (!apiKey) { + throw new Error(`Missing API key for ${this.name} provider`); + } + + const openai = createOpenAI({ + baseURL: 'https://api-inference.huggingface.co/v1/', + apiKey, + }); + + return openai(model); + } +} diff --git a/app/lib/modules/llm/providers/lmstudio.ts b/app/lib/modules/llm/providers/lmstudio.ts new file mode 100644 index 000000000..404045342 --- /dev/null +++ b/app/lib/modules/llm/providers/lmstudio.ts @@ -0,0 +1,73 @@ +import { BaseProvider } from '~/lib/modules/llm/base-provider'; +import type { ModelInfo } from '~/lib/modules/llm/types'; +import type { IProviderSetting } from '~/types/model'; +import { createOpenAI } from '@ai-sdk/openai'; +import type { LanguageModelV1 } from 'ai'; + +export default class LMStudioProvider extends BaseProvider { + name = 'LMStudio'; + getApiKeyLink = 'https://lmstudio.ai/'; + labelForGetApiKey = 'Get LMStudio'; + icon = 'i-ph:cloud-arrow-down'; + + config = { + baseUrlKey: 'LMSTUDIO_API_BASE_URL', + }; + + staticModels: ModelInfo[] = []; + + async getDynamicModels( + apiKeys?: Record, + settings?: IProviderSetting, + serverEnv: Record = {}, + ): Promise { + try { + const { baseUrl } = this.getProviderBaseUrlAndKey({ + apiKeys, + providerSettings: settings, + serverEnv, + defaultBaseUrlKey: 'LMSTUDIO_API_BASE_URL', + defaultApiTokenKey: '', + }); + + if (!baseUrl) { + return []; + } + + const response = await fetch(`${baseUrl}/v1/models`); + const data = (await response.json()) as { data: Array<{ id: string }> }; + + return data.data.map((model) => ({ + name: model.id, + label: model.id, + provider: this.name, + maxTokenAllowed: 8000, + })); + } catch (error: any) { + console.log('Error getting LMStudio models:', error.message); + + return []; + } + } + getModelInstance: (options: { + model: string; + serverEnv: Env; + apiKeys?: Record; + providerSettings?: Record; + }) => LanguageModelV1 = (options) => { + const { apiKeys, providerSettings, serverEnv, model } = options; + const { baseUrl } = this.getProviderBaseUrlAndKey({ + apiKeys, + providerSettings, + serverEnv: serverEnv as any, + defaultBaseUrlKey: 'OLLAMA_API_BASE_URL', + defaultApiTokenKey: '', + }); + const lmstudio = createOpenAI({ + baseUrl: `${baseUrl}/v1`, + apiKey: '', + }); + + return lmstudio(model); + }; +} diff --git a/app/lib/modules/llm/providers/mistral.ts b/app/lib/modules/llm/providers/mistral.ts new file mode 100644 index 000000000..c5becee00 --- /dev/null +++ b/app/lib/modules/llm/providers/mistral.ts @@ -0,0 +1,53 @@ +import { BaseProvider } from '~/lib/modules/llm/base-provider'; +import type { ModelInfo } from '~/lib/modules/llm/types'; +import type { IProviderSetting } from '~/types/model'; +import type { LanguageModelV1 } from 'ai'; +import { createMistral } from '@ai-sdk/mistral'; + +export default class MistralProvider extends BaseProvider { + name = 'Mistral'; + getApiKeyLink = 'https://console.mistral.ai/api-keys/'; + + config = { + apiTokenKey: 'MISTRAL_API_KEY', + }; + + staticModels: ModelInfo[] = [ + { name: 'open-mistral-7b', label: 'Mistral 7B', provider: 'Mistral', maxTokenAllowed: 8000 }, + { name: 'open-mixtral-8x7b', label: 'Mistral 8x7B', provider: 'Mistral', maxTokenAllowed: 8000 }, + { name: 'open-mixtral-8x22b', label: 'Mistral 8x22B', provider: 'Mistral', maxTokenAllowed: 8000 }, + { name: 'open-codestral-mamba', label: 'Codestral Mamba', provider: 'Mistral', maxTokenAllowed: 8000 }, + { name: 'open-mistral-nemo', label: 'Mistral Nemo', provider: 'Mistral', maxTokenAllowed: 8000 }, + { name: 'ministral-8b-latest', label: 'Mistral 8B', provider: 'Mistral', maxTokenAllowed: 8000 }, + { name: 'mistral-small-latest', label: 'Mistral Small', provider: 'Mistral', maxTokenAllowed: 8000 }, + { name: 'codestral-latest', label: 'Codestral', provider: 'Mistral', maxTokenAllowed: 8000 }, + { name: 'mistral-large-latest', label: 'Mistral Large Latest', provider: 'Mistral', maxTokenAllowed: 8000 }, + ]; + + getModelInstance(options: { + model: string; + serverEnv: Env; + apiKeys?: Record; + providerSettings?: Record; + }): LanguageModelV1 { + const { model, serverEnv, apiKeys, providerSettings } = options; + + const { apiKey } = this.getProviderBaseUrlAndKey({ + apiKeys, + providerSettings: providerSettings?.[this.name], + serverEnv: serverEnv as any, + defaultBaseUrlKey: '', + defaultApiTokenKey: 'MISTRAL_API_KEY', + }); + + if (!apiKey) { + throw new Error(`Missing API key for ${this.name} provider`); + } + + const mistral = createMistral({ + apiKey, + }); + + return mistral(model); + } +} diff --git a/app/lib/modules/llm/providers/ollama.ts b/app/lib/modules/llm/providers/ollama.ts new file mode 100644 index 000000000..2c99be3cf --- /dev/null +++ b/app/lib/modules/llm/providers/ollama.ts @@ -0,0 +1,106 @@ +import { BaseProvider } from '~/lib/modules/llm/base-provider'; +import type { ModelInfo } from '~/lib/modules/llm/types'; +import type { IProviderSetting } from '~/types/model'; +import type { LanguageModelV1 } from 'ai'; +import { ollama } from 'ollama-ai-provider'; + +interface OllamaModelDetails { + parent_model: string; + format: string; + family: string; + families: string[]; + parameter_size: string; + quantization_level: string; +} + +export interface OllamaModel { + name: string; + model: string; + modified_at: string; + size: number; + digest: string; + details: OllamaModelDetails; +} + +export interface OllamaApiResponse { + models: OllamaModel[]; +} + +export const DEFAULT_NUM_CTX = process?.env?.DEFAULT_NUM_CTX ? parseInt(process.env.DEFAULT_NUM_CTX, 10) : 32768; + +export default class OllamaProvider extends BaseProvider { + name = 'Ollama'; + getApiKeyLink = 'https://ollama.com/download'; + labelForGetApiKey = 'Download Ollama'; + icon = 'i-ph:cloud-arrow-down'; + + config = { + baseUrlKey: 'OLLAMA_API_BASE_URL', + }; + + staticModels: ModelInfo[] = []; + + async getDynamicModels( + apiKeys?: Record, + settings?: IProviderSetting, + serverEnv: Record = {}, + ): Promise { + try { + const { baseUrl } = this.getProviderBaseUrlAndKey({ + apiKeys, + providerSettings: settings, + serverEnv, + defaultBaseUrlKey: 'OLLAMA_API_BASE_URL', + defaultApiTokenKey: '', + }); + + if (!baseUrl) { + return []; + } + + const response = await fetch(`${baseUrl}/api/tags`); + const data = (await response.json()) as OllamaApiResponse; + + // console.log({ ollamamodels: data.models }); + + return data.models.map((model: OllamaModel) => ({ + name: model.name, + label: `${model.name} (${model.details.parameter_size})`, + provider: this.name, + maxTokenAllowed: 8000, + })); + } catch (e) { + console.error('Failed to get Ollama models:', e); + return []; + } + } + getModelInstance: (options: { + model: string; + serverEnv: Env; + apiKeys?: Record; + providerSettings?: Record; + }) => LanguageModelV1 = (options) => { + const { apiKeys, providerSettings, serverEnv, model } = options; + let { baseUrl } = this.getProviderBaseUrlAndKey({ + apiKeys, + providerSettings, + serverEnv: serverEnv as any, + defaultBaseUrlKey: 'OLLAMA_API_BASE_URL', + defaultApiTokenKey: '', + }); + + // Backend: Check if we're running in Docker + const isDocker = process.env.RUNNING_IN_DOCKER === 'true'; + + baseUrl = isDocker ? baseUrl.replace('localhost', 'host.docker.internal') : baseUrl; + baseUrl = isDocker ? baseUrl.replace('127.0.0.1', 'host.docker.internal') : baseUrl; + + const ollamaInstance = ollama(model, { + numCtx: DEFAULT_NUM_CTX, + }) as LanguageModelV1 & { config: any }; + + ollamaInstance.config.baseURL = `${baseUrl}/api`; + + return ollamaInstance; + }; +} diff --git a/app/lib/modules/llm/providers/open-router.ts b/app/lib/modules/llm/providers/open-router.ts new file mode 100644 index 000000000..45defb2a8 --- /dev/null +++ b/app/lib/modules/llm/providers/open-router.ts @@ -0,0 +1,132 @@ +import { BaseProvider } from '~/lib/modules/llm/base-provider'; +import type { ModelInfo } from '~/lib/modules/llm/types'; +import type { IProviderSetting } from '~/types/model'; +import type { LanguageModelV1 } from 'ai'; +import { createOpenRouter } from '@openrouter/ai-sdk-provider'; + +interface OpenRouterModel { + name: string; + id: string; + context_length: number; + pricing: { + prompt: number; + completion: number; + }; +} + +interface OpenRouterModelsResponse { + data: OpenRouterModel[]; +} + +export default class OpenRouterProvider extends BaseProvider { + name = 'OpenRouter'; + getApiKeyLink = 'https://openrouter.ai/settings/keys'; + + config = { + apiTokenKey: 'OPEN_ROUTER_API_KEY', + }; + + staticModels: ModelInfo[] = [ + { name: 'gpt-4o', label: 'GPT-4o', provider: 'OpenAI', maxTokenAllowed: 8000 }, + { + name: 'anthropic/claude-3.5-sonnet', + label: 'Anthropic: Claude 3.5 Sonnet (OpenRouter)', + provider: 'OpenRouter', + maxTokenAllowed: 8000, + }, + { + name: 'anthropic/claude-3-haiku', + label: 'Anthropic: Claude 3 Haiku (OpenRouter)', + provider: 'OpenRouter', + maxTokenAllowed: 8000, + }, + { + name: 'deepseek/deepseek-coder', + label: 'Deepseek-Coder V2 236B (OpenRouter)', + provider: 'OpenRouter', + maxTokenAllowed: 8000, + }, + { + name: 'google/gemini-flash-1.5', + label: 'Google Gemini Flash 1.5 (OpenRouter)', + provider: 'OpenRouter', + maxTokenAllowed: 8000, + }, + { + name: 'google/gemini-pro-1.5', + label: 'Google Gemini Pro 1.5 (OpenRouter)', + provider: 'OpenRouter', + maxTokenAllowed: 8000, + }, + { name: 'x-ai/grok-beta', label: 'xAI Grok Beta (OpenRouter)', provider: 'OpenRouter', maxTokenAllowed: 8000 }, + { + name: 'mistralai/mistral-nemo', + label: 'OpenRouter Mistral Nemo (OpenRouter)', + provider: 'OpenRouter', + maxTokenAllowed: 8000, + }, + { + name: 'qwen/qwen-110b-chat', + label: 'OpenRouter Qwen 110b Chat (OpenRouter)', + provider: 'OpenRouter', + maxTokenAllowed: 8000, + }, + { name: 'cohere/command', label: 'Cohere Command (OpenRouter)', provider: 'OpenRouter', maxTokenAllowed: 4096 }, + ]; + + async getDynamicModels( + _apiKeys?: Record, + _settings?: IProviderSetting, + _serverEnv: Record = {}, + ): Promise { + try { + const response = await fetch('https://openrouter.ai/api/v1/models', { + headers: { + 'Content-Type': 'application/json', + }, + }); + + const data = (await response.json()) as OpenRouterModelsResponse; + + return data.data + .sort((a, b) => a.name.localeCompare(b.name)) + .map((m) => ({ + name: m.id, + label: `${m.name} - in:$${(m.pricing.prompt * 1_000_000).toFixed(2)} out:$${(m.pricing.completion * 1_000_000).toFixed(2)} - context ${Math.floor(m.context_length / 1000)}k`, + provider: this.name, + maxTokenAllowed: 8000, + })); + } catch (error) { + console.error('Error getting OpenRouter models:', error); + return []; + } + } + + getModelInstance(options: { + model: string; + serverEnv: Env; + apiKeys?: Record; + providerSettings?: Record; + }): LanguageModelV1 { + const { model, serverEnv, apiKeys, providerSettings } = options; + + const { apiKey } = this.getProviderBaseUrlAndKey({ + apiKeys, + providerSettings: providerSettings?.[this.name], + serverEnv: serverEnv as any, + defaultBaseUrlKey: '', + defaultApiTokenKey: 'OPEN_ROUTER_API_KEY', + }); + + if (!apiKey) { + throw new Error(`Missing API key for ${this.name} provider`); + } + + const openRouter = createOpenRouter({ + apiKey, + }); + const instance = openRouter.chat(model) as LanguageModelV1; + + return instance; + } +} diff --git a/app/lib/modules/llm/providers/openai-like.ts b/app/lib/modules/llm/providers/openai-like.ts new file mode 100644 index 000000000..44fb1ab9c --- /dev/null +++ b/app/lib/modules/llm/providers/openai-like.ts @@ -0,0 +1,77 @@ +import { BaseProvider, getOpenAILikeModel } from '~/lib/modules/llm/base-provider'; +import type { ModelInfo } from '~/lib/modules/llm/types'; +import type { IProviderSetting } from '~/types/model'; +import type { LanguageModelV1 } from 'ai'; + +export default class OpenAILikeProvider extends BaseProvider { + name = 'OpenAILike'; + getApiKeyLink = undefined; + + config = { + baseUrlKey: 'OPENAI_LIKE_API_BASE_URL', + apiTokenKey: 'OPENAI_LIKE_API_KEY', + }; + + staticModels: ModelInfo[] = []; + + async getDynamicModels( + apiKeys?: Record, + settings?: IProviderSetting, + serverEnv: Record = {}, + ): Promise { + try { + const { baseUrl, apiKey } = this.getProviderBaseUrlAndKey({ + apiKeys, + providerSettings: settings, + serverEnv, + defaultBaseUrlKey: 'OPENAI_LIKE_API_BASE_URL', + defaultApiTokenKey: 'OPENAI_LIKE_API_KEY', + }); + + if (!baseUrl || !apiKey) { + return []; + } + + const response = await fetch(`${baseUrl}/models`, { + headers: { + Authorization: `Bearer ${apiKey}`, + }, + }); + + const res = (await response.json()) as any; + + return res.data.map((model: any) => ({ + name: model.id, + label: model.id, + provider: this.name, + maxTokenAllowed: 8000, + })); + } catch (error) { + console.error('Error getting OpenAILike models:', error); + return []; + } + } + + getModelInstance(options: { + model: string; + serverEnv: Env; + apiKeys?: Record; + providerSettings?: Record; + }): LanguageModelV1 { + const { model, serverEnv, apiKeys, providerSettings } = options; + + const { baseUrl, apiKey } = this.getProviderBaseUrlAndKey({ + apiKeys, + providerSettings: providerSettings?.[this.name], + serverEnv: serverEnv as any, + defaultBaseUrlKey: 'OPENAI_LIKE_API_BASE_URL', + defaultApiTokenKey: 'OPENAI_LIKE_API_KEY', + }); + + if (!baseUrl || !apiKey) { + throw new Error(`Missing configuration for ${this.name} provider`); + } + + return getOpenAILikeModel(baseUrl, apiKey, model); + } +} diff --git a/app/lib/modules/llm/providers/openai.ts b/app/lib/modules/llm/providers/openai.ts new file mode 100644 index 000000000..9a5411893 --- /dev/null +++ b/app/lib/modules/llm/providers/openai.ts @@ -0,0 +1,48 @@ +import { BaseProvider } from '~/lib/modules/llm/base-provider'; +import type { ModelInfo } from '~/lib/modules/llm/types'; +import type { IProviderSetting } from '~/types/model'; +import type { LanguageModelV1 } from 'ai'; +import { createOpenAI } from '@ai-sdk/openai'; + +export default class OpenAIProvider extends BaseProvider { + name = 'OpenAI'; + getApiKeyLink = 'https://platform.openai.com/api-keys'; + + config = { + apiTokenKey: 'OPENAI_API_KEY', + }; + + staticModels: ModelInfo[] = [ + { name: 'gpt-4o-mini', label: 'GPT-4o Mini', provider: 'OpenAI', maxTokenAllowed: 8000 }, + { name: 'gpt-4-turbo', label: 'GPT-4 Turbo', provider: 'OpenAI', maxTokenAllowed: 8000 }, + { name: 'gpt-4', label: 'GPT-4', provider: 'OpenAI', maxTokenAllowed: 8000 }, + { name: 'gpt-3.5-turbo', label: 'GPT-3.5 Turbo', provider: 'OpenAI', maxTokenAllowed: 8000 }, + ]; + + getModelInstance(options: { + model: string; + serverEnv: Env; + apiKeys?: Record; + providerSettings?: Record; + }): LanguageModelV1 { + const { model, serverEnv, apiKeys, providerSettings } = options; + + const { apiKey } = this.getProviderBaseUrlAndKey({ + apiKeys, + providerSettings: providerSettings?.[this.name], + serverEnv: serverEnv as any, + defaultBaseUrlKey: '', + defaultApiTokenKey: 'OPENAI_API_KEY', + }); + + if (!apiKey) { + throw new Error(`Missing API key for ${this.name} provider`); + } + + const openai = createOpenAI({ + apiKey, + }); + + return openai(model); + } +} diff --git a/app/lib/modules/llm/providers/perplexity.ts b/app/lib/modules/llm/providers/perplexity.ts new file mode 100644 index 000000000..eb58d7456 --- /dev/null +++ b/app/lib/modules/llm/providers/perplexity.ts @@ -0,0 +1,63 @@ +import { BaseProvider } from '~/lib/modules/llm/base-provider'; +import type { ModelInfo } from '~/lib/modules/llm/types'; +import type { IProviderSetting } from '~/types/model'; +import type { LanguageModelV1 } from 'ai'; +import { createOpenAI } from '@ai-sdk/openai'; + +export default class PerplexityProvider extends BaseProvider { + name = 'Perplexity'; + getApiKeyLink = 'https://www.perplexity.ai/settings/api'; + + config = { + apiTokenKey: 'PERPLEXITY_API_KEY', + }; + + staticModels: ModelInfo[] = [ + { + name: 'llama-3.1-sonar-small-128k-online', + label: 'Sonar Small Online', + provider: 'Perplexity', + maxTokenAllowed: 8192, + }, + { + name: 'llama-3.1-sonar-large-128k-online', + label: 'Sonar Large Online', + provider: 'Perplexity', + maxTokenAllowed: 8192, + }, + { + name: 'llama-3.1-sonar-huge-128k-online', + label: 'Sonar Huge Online', + provider: 'Perplexity', + maxTokenAllowed: 8192, + }, + ]; + + getModelInstance(options: { + model: string; + serverEnv: Env; + apiKeys?: Record; + providerSettings?: Record; + }): LanguageModelV1 { + const { model, serverEnv, apiKeys, providerSettings } = options; + + const { apiKey } = this.getProviderBaseUrlAndKey({ + apiKeys, + providerSettings: providerSettings?.[this.name], + serverEnv: serverEnv as any, + defaultBaseUrlKey: '', + defaultApiTokenKey: 'PERPLEXITY_API_KEY', + }); + + if (!apiKey) { + throw new Error(`Missing API key for ${this.name} provider`); + } + + const perplexity = createOpenAI({ + baseURL: 'https://api.perplexity.ai/', + apiKey, + }); + + return perplexity(model); + } +} diff --git a/app/lib/modules/llm/providers/together.ts b/app/lib/modules/llm/providers/together.ts new file mode 100644 index 000000000..1a908b849 --- /dev/null +++ b/app/lib/modules/llm/providers/together.ts @@ -0,0 +1,100 @@ +import { BaseProvider, getOpenAILikeModel } from '~/lib/modules/llm/base-provider'; +import type { ModelInfo } from '~/lib/modules/llm/types'; +import type { IProviderSetting } from '~/types/model'; +import type { LanguageModelV1 } from 'ai'; + +export default class TogetherProvider extends BaseProvider { + name = 'Together'; + getApiKeyLink = 'https://api.together.xyz/settings/api-keys'; + + config = { + baseUrlKey: 'TOGETHER_API_BASE_URL', + apiTokenKey: 'TOGETHER_API_KEY', + }; + + staticModels: ModelInfo[] = [ + { + name: 'Qwen/Qwen2.5-Coder-32B-Instruct', + label: 'Qwen/Qwen2.5-Coder-32B-Instruct', + provider: 'Together', + maxTokenAllowed: 8000, + }, + { + name: 'meta-llama/Llama-3.2-90B-Vision-Instruct-Turbo', + label: 'meta-llama/Llama-3.2-90B-Vision-Instruct-Turbo', + provider: 'Together', + maxTokenAllowed: 8000, + }, + { + name: 'mistralai/Mixtral-8x7B-Instruct-v0.1', + label: 'Mixtral 8x7B Instruct', + provider: 'Together', + maxTokenAllowed: 8192, + }, + ]; + + async getDynamicModels( + apiKeys?: Record, + settings?: IProviderSetting, + serverEnv: Record = {}, + ): Promise { + try { + const { baseUrl: fetchBaseUrl, apiKey } = this.getProviderBaseUrlAndKey({ + apiKeys, + providerSettings: settings, + serverEnv, + defaultBaseUrlKey: 'TOGETHER_API_BASE_URL', + defaultApiTokenKey: 'TOGETHER_API_KEY', + }); + const baseUrl = fetchBaseUrl || 'https://api.together.xyz/v1'; + + if (!baseUrl || !apiKey) { + return []; + } + + // console.log({ baseUrl, apiKey }); + + const response = await fetch(`${baseUrl}/models`, { + headers: { + Authorization: `Bearer ${apiKey}`, + }, + }); + + const res = (await response.json()) as any; + const data = (res || []).filter((model: any) => model.type === 'chat'); + + return data.map((m: any) => ({ + name: m.id, + label: `${m.display_name} - in:$${m.pricing.input.toFixed(2)} out:$${m.pricing.output.toFixed(2)} - context ${Math.floor(m.context_length / 1000)}k`, + provider: this.name, + maxTokenAllowed: 8000, + })); + } catch (error: any) { + console.error('Error getting Together models:', error.message); + return []; + } + } + + getModelInstance(options: { + model: string; + serverEnv: Env; + apiKeys?: Record; + providerSettings?: Record; + }): LanguageModelV1 { + const { model, serverEnv, apiKeys, providerSettings } = options; + + const { baseUrl, apiKey } = this.getProviderBaseUrlAndKey({ + apiKeys, + providerSettings: providerSettings?.[this.name], + serverEnv: serverEnv as any, + defaultBaseUrlKey: 'TOGETHER_API_BASE_URL', + defaultApiTokenKey: 'TOGETHER_API_KEY', + }); + + if (!baseUrl || !apiKey) { + throw new Error(`Missing configuration for ${this.name} provider`); + } + + return getOpenAILikeModel(baseUrl, apiKey, model); + } +} diff --git a/app/lib/modules/llm/providers/xai.ts b/app/lib/modules/llm/providers/xai.ts new file mode 100644 index 000000000..032b01bfe --- /dev/null +++ b/app/lib/modules/llm/providers/xai.ts @@ -0,0 +1,47 @@ +import { BaseProvider } from '~/lib/modules/llm/base-provider'; +import type { ModelInfo } from '~/lib/modules/llm/types'; +import type { IProviderSetting } from '~/types/model'; +import type { LanguageModelV1 } from 'ai'; +import { createOpenAI } from '@ai-sdk/openai'; + +export default class XAIProvider extends BaseProvider { + name = 'xAI'; + getApiKeyLink = 'https://docs.x.ai/docs/quickstart#creating-an-api-key'; + + config = { + apiTokenKey: 'XAI_API_KEY', + }; + + staticModels: ModelInfo[] = [ + { name: 'grok-beta', label: 'xAI Grok Beta', provider: 'xAI', maxTokenAllowed: 8000 }, + { name: 'grok-2-1212', label: 'xAI Grok2 1212', provider: 'xAI', maxTokenAllowed: 8000 }, + ]; + + getModelInstance(options: { + model: string; + serverEnv: Env; + apiKeys?: Record; + providerSettings?: Record; + }): LanguageModelV1 { + const { model, serverEnv, apiKeys, providerSettings } = options; + + const { apiKey } = this.getProviderBaseUrlAndKey({ + apiKeys, + providerSettings: providerSettings?.[this.name], + serverEnv: serverEnv as any, + defaultBaseUrlKey: '', + defaultApiTokenKey: 'XAI_API_KEY', + }); + + if (!apiKey) { + throw new Error(`Missing API key for ${this.name} provider`); + } + + const openai = createOpenAI({ + baseURL: 'https://api.x.ai/v1', + apiKey, + }); + + return openai(model); + } +} diff --git a/app/lib/modules/llm/registry.ts b/app/lib/modules/llm/registry.ts new file mode 100644 index 000000000..fb5a31f93 --- /dev/null +++ b/app/lib/modules/llm/registry.ts @@ -0,0 +1,33 @@ +import AnthropicProvider from './providers/anthropic'; +import CohereProvider from './providers/cohere'; +import DeepseekProvider from './providers/deepseek'; +import GoogleProvider from './providers/google'; +import GroqProvider from './providers/groq'; +import HuggingFaceProvider from './providers/huggingface'; +import LMStudioProvider from './providers/lmstudio'; +import MistralProvider from './providers/mistral'; +import OllamaProvider from './providers/ollama'; +import OpenRouterProvider from './providers/open-router'; +import OpenAILikeProvider from './providers/openai-like'; +import OpenAIProvider from './providers/openai'; +import PerplexityProvider from './providers/perplexity'; +import TogetherProvider from './providers/together'; +import XAIProvider from './providers/xai'; + +export { + AnthropicProvider, + CohereProvider, + DeepseekProvider, + GoogleProvider, + GroqProvider, + HuggingFaceProvider, + MistralProvider, + OllamaProvider, + OpenAIProvider, + OpenRouterProvider, + OpenAILikeProvider, + PerplexityProvider, + XAIProvider, + TogetherProvider, + LMStudioProvider, +}; diff --git a/app/lib/modules/llm/types.ts b/app/lib/modules/llm/types.ts new file mode 100644 index 000000000..337b110c7 --- /dev/null +++ b/app/lib/modules/llm/types.ts @@ -0,0 +1,32 @@ +import type { LanguageModelV1 } from 'ai'; +import type { IProviderSetting } from '~/types/model'; + +export interface ModelInfo { + name: string; + label: string; + provider: string; + maxTokenAllowed: number; +} + +export interface ProviderInfo { + name: string; + staticModels: ModelInfo[]; + getDynamicModels?: ( + apiKeys?: Record, + settings?: IProviderSetting, + serverEnv?: Record, + ) => Promise; + getModelInstance: (options: { + model: string; + serverEnv: Env; + apiKeys?: Record; + providerSettings?: Record; + }) => LanguageModelV1; + getApiKeyLink?: string; + labelForGetApiKey?: string; + icon?: string; +} +export interface ProviderConfig { + baseUrlKey?: string; + apiTokenKey?: string; +} diff --git a/app/routes/api.enhancer.ts b/app/routes/api.enhancer.ts index c2dbba4aa..2b8fee83b 100644 --- a/app/routes/api.enhancer.ts +++ b/app/routes/api.enhancer.ts @@ -5,9 +5,6 @@ import { streamText } from '~/lib/.server/llm/stream-text'; import { stripIndents } from '~/utils/stripIndent'; import type { IProviderSetting, ProviderInfo } from '~/types/model'; -const encoder = new TextEncoder(); -const decoder = new TextDecoder(); - export async function action(args: ActionFunctionArgs) { return enhancerAction(args); } @@ -107,29 +104,7 @@ async function enhancerAction({ context, request }: ActionFunctionArgs) { providerSettings, }); - const transformStream = new TransformStream({ - transform(chunk, controller) { - const text = decoder.decode(chunk); - const lines = text.split('\n').filter((line) => line.trim() !== ''); - - for (const line of lines) { - try { - const parsed = JSON.parse(line); - - if (parsed.type === 'text') { - controller.enqueue(encoder.encode(parsed.value)); - } - } catch (e) { - // skip invalid JSON lines - console.warn('Failed to parse stream part:', line, e); - } - } - }, - }); - - const transformedStream = result.toDataStream().pipeThrough(transformStream); - - return new Response(transformedStream, { + return new Response(result.textStream, { status: 200, headers: { 'Content-Type': 'text/plain; charset=utf-8', diff --git a/app/types/model.ts b/app/types/model.ts index 3bfbfde92..d16b10ae4 100644 --- a/app/types/model.ts +++ b/app/types/model.ts @@ -1,9 +1,14 @@ -import type { ModelInfo } from '~/utils/types'; +import type { ModelInfo } from '~/lib/modules/llm/types'; export type ProviderInfo = { staticModels: ModelInfo[]; name: string; - getDynamicModels?: (apiKeys?: Record, providerSettings?: IProviderSetting) => Promise; + getDynamicModels?: ( + providerName: string, + apiKeys?: Record, + providerSettings?: IProviderSetting, + serverEnv?: Record, + ) => Promise; getApiKeyLink?: string; labelForGetApiKey?: string; icon?: string; diff --git a/app/utils/constants.ts b/app/utils/constants.ts index 642599541..64e08a739 100644 --- a/app/utils/constants.ts +++ b/app/utils/constants.ts @@ -1,8 +1,7 @@ -import Cookies from 'js-cookie'; -import type { ModelInfo, OllamaApiResponse, OllamaModel } from './types'; -import type { ProviderInfo, IProviderSetting } from '~/types/model'; -import { createScopedLogger } from './logger'; -import { logStore } from '~/lib/stores/logs'; +import type { IProviderSetting } from '~/types/model'; + +import { LLMManager } from '~/lib/modules/llm/manager'; +import type { ModelInfo } from '~/lib/modules/llm/types'; export const WORK_DIR_NAME = 'project'; export const WORK_DIR = `/home/${WORK_DIR_NAME}`; @@ -12,533 +11,351 @@ export const PROVIDER_REGEX = /\[Provider: (.*?)\]\n\n/; export const DEFAULT_MODEL = 'claude-3-5-sonnet-latest'; export const PROMPT_COOKIE_KEY = 'cachedPrompt'; -const logger = createScopedLogger('Constants'); - -const PROVIDER_LIST: ProviderInfo[] = [ - { - name: 'Anthropic', - staticModels: [ - { - name: 'claude-3-5-sonnet-latest', - label: 'Claude 3.5 Sonnet (new)', - provider: 'Anthropic', - maxTokenAllowed: 8000, - }, - { - name: 'claude-3-5-sonnet-20240620', - label: 'Claude 3.5 Sonnet (old)', - provider: 'Anthropic', - maxTokenAllowed: 8000, - }, - { - name: 'claude-3-5-haiku-latest', - label: 'Claude 3.5 Haiku (new)', - provider: 'Anthropic', - maxTokenAllowed: 8000, - }, - { name: 'claude-3-opus-latest', label: 'Claude 3 Opus', provider: 'Anthropic', maxTokenAllowed: 8000 }, - { name: 'claude-3-sonnet-20240229', label: 'Claude 3 Sonnet', provider: 'Anthropic', maxTokenAllowed: 8000 }, - { name: 'claude-3-haiku-20240307', label: 'Claude 3 Haiku', provider: 'Anthropic', maxTokenAllowed: 8000 }, - ], - getApiKeyLink: 'https://console.anthropic.com/settings/keys', - }, - { - name: 'Ollama', - staticModels: [], - getDynamicModels: getOllamaModels, - getApiKeyLink: 'https://ollama.com/download', - labelForGetApiKey: 'Download Ollama', - icon: 'i-ph:cloud-arrow-down', - }, - { - name: 'OpenAILike', - staticModels: [], - getDynamicModels: getOpenAILikeModels, - }, - { - name: 'Cohere', - staticModels: [ - { name: 'command-r-plus-08-2024', label: 'Command R plus Latest', provider: 'Cohere', maxTokenAllowed: 4096 }, - { name: 'command-r-08-2024', label: 'Command R Latest', provider: 'Cohere', maxTokenAllowed: 4096 }, - { name: 'command-r-plus', label: 'Command R plus', provider: 'Cohere', maxTokenAllowed: 4096 }, - { name: 'command-r', label: 'Command R', provider: 'Cohere', maxTokenAllowed: 4096 }, - { name: 'command', label: 'Command', provider: 'Cohere', maxTokenAllowed: 4096 }, - { name: 'command-nightly', label: 'Command Nightly', provider: 'Cohere', maxTokenAllowed: 4096 }, - { name: 'command-light', label: 'Command Light', provider: 'Cohere', maxTokenAllowed: 4096 }, - { name: 'command-light-nightly', label: 'Command Light Nightly', provider: 'Cohere', maxTokenAllowed: 4096 }, - { name: 'c4ai-aya-expanse-8b', label: 'c4AI Aya Expanse 8b', provider: 'Cohere', maxTokenAllowed: 4096 }, - { name: 'c4ai-aya-expanse-32b', label: 'c4AI Aya Expanse 32b', provider: 'Cohere', maxTokenAllowed: 4096 }, - ], - getApiKeyLink: 'https://dashboard.cohere.com/api-keys', - }, - { - name: 'OpenRouter', - staticModels: [ - { name: 'gpt-4o', label: 'GPT-4o', provider: 'OpenAI', maxTokenAllowed: 8000 }, - { - name: 'anthropic/claude-3.5-sonnet', - label: 'Anthropic: Claude 3.5 Sonnet (OpenRouter)', - provider: 'OpenRouter', - maxTokenAllowed: 8000, - }, - { - name: 'anthropic/claude-3-haiku', - label: 'Anthropic: Claude 3 Haiku (OpenRouter)', - provider: 'OpenRouter', - maxTokenAllowed: 8000, - }, - { - name: 'deepseek/deepseek-coder', - label: 'Deepseek-Coder V2 236B (OpenRouter)', - provider: 'OpenRouter', - maxTokenAllowed: 8000, - }, - { - name: 'google/gemini-flash-1.5', - label: 'Google Gemini Flash 1.5 (OpenRouter)', - provider: 'OpenRouter', - maxTokenAllowed: 8000, - }, - { - name: 'google/gemini-pro-1.5', - label: 'Google Gemini Pro 1.5 (OpenRouter)', - provider: 'OpenRouter', - maxTokenAllowed: 8000, - }, - { name: 'x-ai/grok-beta', label: 'xAI Grok Beta (OpenRouter)', provider: 'OpenRouter', maxTokenAllowed: 8000 }, - { - name: 'mistralai/mistral-nemo', - label: 'OpenRouter Mistral Nemo (OpenRouter)', - provider: 'OpenRouter', - maxTokenAllowed: 8000, - }, - { - name: 'qwen/qwen-110b-chat', - label: 'OpenRouter Qwen 110b Chat (OpenRouter)', - provider: 'OpenRouter', - maxTokenAllowed: 8000, - }, - { name: 'cohere/command', label: 'Cohere Command (OpenRouter)', provider: 'OpenRouter', maxTokenAllowed: 4096 }, - ], - getDynamicModels: getOpenRouterModels, - getApiKeyLink: 'https://openrouter.ai/settings/keys', - }, - { - name: 'Google', - staticModels: [ - { name: 'gemini-1.5-flash-latest', label: 'Gemini 1.5 Flash', provider: 'Google', maxTokenAllowed: 8192 }, - { name: 'gemini-2.0-flash-exp', label: 'Gemini 2.0 Flash', provider: 'Google', maxTokenAllowed: 8192 }, - { name: 'gemini-1.5-flash-002', label: 'Gemini 1.5 Flash-002', provider: 'Google', maxTokenAllowed: 8192 }, - { name: 'gemini-1.5-flash-8b', label: 'Gemini 1.5 Flash-8b', provider: 'Google', maxTokenAllowed: 8192 }, - { name: 'gemini-1.5-pro-latest', label: 'Gemini 1.5 Pro', provider: 'Google', maxTokenAllowed: 8192 }, - { name: 'gemini-1.5-pro-002', label: 'Gemini 1.5 Pro-002', provider: 'Google', maxTokenAllowed: 8192 }, - { name: 'gemini-exp-1206', label: 'Gemini exp-1206', provider: 'Google', maxTokenAllowed: 8192 }, - ], - getApiKeyLink: 'https://aistudio.google.com/app/apikey', - }, - { - name: 'Groq', - staticModels: [ - { name: 'llama-3.1-8b-instant', label: 'Llama 3.1 8b (Groq)', provider: 'Groq', maxTokenAllowed: 8000 }, - { name: 'llama-3.2-11b-vision-preview', label: 'Llama 3.2 11b (Groq)', provider: 'Groq', maxTokenAllowed: 8000 }, - { name: 'llama-3.2-90b-vision-preview', label: 'Llama 3.2 90b (Groq)', provider: 'Groq', maxTokenAllowed: 8000 }, - { name: 'llama-3.2-3b-preview', label: 'Llama 3.2 3b (Groq)', provider: 'Groq', maxTokenAllowed: 8000 }, - { name: 'llama-3.2-1b-preview', label: 'Llama 3.2 1b (Groq)', provider: 'Groq', maxTokenAllowed: 8000 }, - { name: 'llama-3.3-70b-versatile', label: 'Llama 3.3 70b (Groq)', provider: 'Groq', maxTokenAllowed: 8000 }, - ], - getApiKeyLink: 'https://console.groq.com/keys', - }, - { - name: 'HuggingFace', - staticModels: [ - { - name: 'Qwen/Qwen2.5-Coder-32B-Instruct', - label: 'Qwen2.5-Coder-32B-Instruct (HuggingFace)', - provider: 'HuggingFace', - maxTokenAllowed: 8000, - }, - { - name: '01-ai/Yi-1.5-34B-Chat', - label: 'Yi-1.5-34B-Chat (HuggingFace)', - provider: 'HuggingFace', - maxTokenAllowed: 8000, - }, - { - name: 'codellama/CodeLlama-34b-Instruct-hf', - label: 'CodeLlama-34b-Instruct (HuggingFace)', - provider: 'HuggingFace', - maxTokenAllowed: 8000, - }, - { - name: 'NousResearch/Hermes-3-Llama-3.1-8B', - label: 'Hermes-3-Llama-3.1-8B (HuggingFace)', - provider: 'HuggingFace', - maxTokenAllowed: 8000, - }, - { - name: 'Qwen/Qwen2.5-Coder-32B-Instruct', - label: 'Qwen2.5-Coder-32B-Instruct (HuggingFace)', - provider: 'HuggingFace', - maxTokenAllowed: 8000, - }, - { - name: 'Qwen/Qwen2.5-72B-Instruct', - label: 'Qwen2.5-72B-Instruct (HuggingFace)', - provider: 'HuggingFace', - maxTokenAllowed: 8000, - }, - { - name: 'meta-llama/Llama-3.1-70B-Instruct', - label: 'Llama-3.1-70B-Instruct (HuggingFace)', - provider: 'HuggingFace', - maxTokenAllowed: 8000, - }, - { - name: 'meta-llama/Llama-3.1-405B', - label: 'Llama-3.1-405B (HuggingFace)', - provider: 'HuggingFace', - maxTokenAllowed: 8000, - }, - { - name: '01-ai/Yi-1.5-34B-Chat', - label: 'Yi-1.5-34B-Chat (HuggingFace)', - provider: 'HuggingFace', - maxTokenAllowed: 8000, - }, - { - name: 'codellama/CodeLlama-34b-Instruct-hf', - label: 'CodeLlama-34b-Instruct (HuggingFace)', - provider: 'HuggingFace', - maxTokenAllowed: 8000, - }, - { - name: 'NousResearch/Hermes-3-Llama-3.1-8B', - label: 'Hermes-3-Llama-3.1-8B (HuggingFace)', - provider: 'HuggingFace', - maxTokenAllowed: 8000, - }, - ], - getApiKeyLink: 'https://huggingface.co/settings/tokens', - }, - - { - name: 'OpenAI', - staticModels: [ - { name: 'gpt-4o-mini', label: 'GPT-4o Mini', provider: 'OpenAI', maxTokenAllowed: 8000 }, - { name: 'gpt-4-turbo', label: 'GPT-4 Turbo', provider: 'OpenAI', maxTokenAllowed: 8000 }, - { name: 'gpt-4', label: 'GPT-4', provider: 'OpenAI', maxTokenAllowed: 8000 }, - { name: 'gpt-3.5-turbo', label: 'GPT-3.5 Turbo', provider: 'OpenAI', maxTokenAllowed: 8000 }, - ], - getApiKeyLink: 'https://platform.openai.com/api-keys', - }, - { - name: 'xAI', - staticModels: [{ name: 'grok-beta', label: 'xAI Grok Beta', provider: 'xAI', maxTokenAllowed: 8000 }], - getApiKeyLink: 'https://docs.x.ai/docs/quickstart#creating-an-api-key', - }, - { - name: 'Deepseek', - staticModels: [ - { name: 'deepseek-coder', label: 'Deepseek-Coder', provider: 'Deepseek', maxTokenAllowed: 8000 }, - { name: 'deepseek-chat', label: 'Deepseek-Chat', provider: 'Deepseek', maxTokenAllowed: 8000 }, - ], - getApiKeyLink: 'https://platform.deepseek.com/apiKeys', - }, - { - name: 'Mistral', - staticModels: [ - { name: 'open-mistral-7b', label: 'Mistral 7B', provider: 'Mistral', maxTokenAllowed: 8000 }, - { name: 'open-mixtral-8x7b', label: 'Mistral 8x7B', provider: 'Mistral', maxTokenAllowed: 8000 }, - { name: 'open-mixtral-8x22b', label: 'Mistral 8x22B', provider: 'Mistral', maxTokenAllowed: 8000 }, - { name: 'open-codestral-mamba', label: 'Codestral Mamba', provider: 'Mistral', maxTokenAllowed: 8000 }, - { name: 'open-mistral-nemo', label: 'Mistral Nemo', provider: 'Mistral', maxTokenAllowed: 8000 }, - { name: 'ministral-8b-latest', label: 'Mistral 8B', provider: 'Mistral', maxTokenAllowed: 8000 }, - { name: 'mistral-small-latest', label: 'Mistral Small', provider: 'Mistral', maxTokenAllowed: 8000 }, - { name: 'codestral-latest', label: 'Codestral', provider: 'Mistral', maxTokenAllowed: 8000 }, - { name: 'mistral-large-latest', label: 'Mistral Large Latest', provider: 'Mistral', maxTokenAllowed: 8000 }, - ], - getApiKeyLink: 'https://console.mistral.ai/api-keys/', - }, - { - name: 'LMStudio', - staticModels: [], - getDynamicModels: getLMStudioModels, - getApiKeyLink: 'https://lmstudio.ai/', - labelForGetApiKey: 'Get LMStudio', - icon: 'i-ph:cloud-arrow-down', - }, - { - name: 'Together', - getDynamicModels: getTogetherModels, - staticModels: [ - { - name: 'Qwen/Qwen2.5-Coder-32B-Instruct', - label: 'Qwen/Qwen2.5-Coder-32B-Instruct', - provider: 'Together', - maxTokenAllowed: 8000, - }, - { - name: 'meta-llama/Llama-3.2-90B-Vision-Instruct-Turbo', - label: 'meta-llama/Llama-3.2-90B-Vision-Instruct-Turbo', - provider: 'Together', - maxTokenAllowed: 8000, - }, - - { - name: 'mistralai/Mixtral-8x7B-Instruct-v0.1', - label: 'Mixtral 8x7B Instruct', - provider: 'Together', - maxTokenAllowed: 8192, - }, - ], - getApiKeyLink: 'https://api.together.xyz/settings/api-keys', - }, - { - name: 'Perplexity', - staticModels: [ - { - name: 'llama-3.1-sonar-small-128k-online', - label: 'Sonar Small Online', - provider: 'Perplexity', - maxTokenAllowed: 8192, - }, - { - name: 'llama-3.1-sonar-large-128k-online', - label: 'Sonar Large Online', - provider: 'Perplexity', - maxTokenAllowed: 8192, - }, - { - name: 'llama-3.1-sonar-huge-128k-online', - label: 'Sonar Huge Online', - provider: 'Perplexity', - maxTokenAllowed: 8192, - }, - ], - getApiKeyLink: 'https://www.perplexity.ai/settings/api', - }, -]; - -export const DEFAULT_PROVIDER = PROVIDER_LIST[0]; - -const staticModels: ModelInfo[] = PROVIDER_LIST.map((p) => p.staticModels).flat(); - -export let MODEL_LIST: ModelInfo[] = [...staticModels]; - -export async function getModelList( - apiKeys: Record, - providerSettings?: Record, -) { - MODEL_LIST = [ - ...( - await Promise.all( - PROVIDER_LIST.filter( - (p): p is ProviderInfo & { getDynamicModels: () => Promise } => !!p.getDynamicModels, - ).map((p) => p.getDynamicModels(apiKeys, providerSettings?.[p.name])), - ) - ).flat(), - ...staticModels, - ]; - return MODEL_LIST; -} - -async function getTogetherModels(apiKeys?: Record, settings?: IProviderSetting): Promise { - try { - const baseUrl = settings?.baseUrl || import.meta.env.TOGETHER_API_BASE_URL || ''; - const provider = 'Together'; - - if (!baseUrl) { - return []; - } - - let apiKey = import.meta.env.OPENAI_LIKE_API_KEY ?? ''; - - if (apiKeys && apiKeys[provider]) { - apiKey = apiKeys[provider]; - } - - if (!apiKey) { - return []; - } - - const response = await fetch(`${baseUrl}/models`, { - headers: { - Authorization: `Bearer ${apiKey}`, - }, - }); - const res = (await response.json()) as any; - const data: any[] = (res || []).filter((model: any) => model.type == 'chat'); - - return data.map((m: any) => ({ - name: m.id, - label: `${m.display_name} - in:$${m.pricing.input.toFixed( - 2, - )} out:$${m.pricing.output.toFixed(2)} - context ${Math.floor(m.context_length / 1000)}k`, - provider, - maxTokenAllowed: 8000, - })); - } catch (e) { - console.error('Error getting OpenAILike models:', e); - return []; - } -} - -const getOllamaBaseUrl = (settings?: IProviderSetting) => { - const defaultBaseUrl = settings?.baseUrl || import.meta.env.OLLAMA_API_BASE_URL || 'http://localhost:11434'; - - // Check if we're in the browser - if (typeof window !== 'undefined') { - // Frontend always uses localhost - return defaultBaseUrl; - } - - // Backend: Check if we're running in Docker - const isDocker = process.env.RUNNING_IN_DOCKER === 'true'; - - return isDocker ? defaultBaseUrl.replace('localhost', 'host.docker.internal') : defaultBaseUrl; -}; - -async function getOllamaModels(apiKeys?: Record, settings?: IProviderSetting): Promise { - try { - const baseUrl = getOllamaBaseUrl(settings); - const response = await fetch(`${baseUrl}/api/tags`); - const data = (await response.json()) as OllamaApiResponse; - - return data.models.map((model: OllamaModel) => ({ - name: model.name, - label: `${model.name} (${model.details.parameter_size})`, - provider: 'Ollama', - maxTokenAllowed: 8000, - })); - } catch (e: any) { - logStore.logError('Failed to get Ollama models', e, { baseUrl: settings?.baseUrl }); - logger.warn('Failed to get Ollama models: ', e.message || ''); - - return []; - } +const llmManager = LLMManager.getInstance(import.meta.env); + +export const PROVIDER_LIST = llmManager.getAllProviders(); +export const DEFAULT_PROVIDER = llmManager.getDefaultProvider(); + +let MODEL_LIST = llmManager.getModelList(); + +/* + *const PROVIDER_LIST_OLD: ProviderInfo[] = [ + * { + * name: 'Anthropic', + * staticModels: [ + * { + * name: 'claude-3-5-sonnet-latest', + * label: 'Claude 3.5 Sonnet (new)', + * provider: 'Anthropic', + * maxTokenAllowed: 8000, + * }, + * { + * name: 'claude-3-5-sonnet-20240620', + * label: 'Claude 3.5 Sonnet (old)', + * provider: 'Anthropic', + * maxTokenAllowed: 8000, + * }, + * { + * name: 'claude-3-5-haiku-latest', + * label: 'Claude 3.5 Haiku (new)', + * provider: 'Anthropic', + * maxTokenAllowed: 8000, + * }, + * { name: 'claude-3-opus-latest', label: 'Claude 3 Opus', provider: 'Anthropic', maxTokenAllowed: 8000 }, + * { name: 'claude-3-sonnet-20240229', label: 'Claude 3 Sonnet', provider: 'Anthropic', maxTokenAllowed: 8000 }, + * { name: 'claude-3-haiku-20240307', label: 'Claude 3 Haiku', provider: 'Anthropic', maxTokenAllowed: 8000 }, + * ], + * getApiKeyLink: 'https://console.anthropic.com/settings/keys', + * }, + * { + * name: 'Ollama', + * staticModels: [], + * getDynamicModels: getOllamaModels, + * getApiKeyLink: 'https://ollama.com/download', + * labelForGetApiKey: 'Download Ollama', + * icon: 'i-ph:cloud-arrow-down', + * }, + * { + * name: 'OpenAILike', + * staticModels: [], + * getDynamicModels: getOpenAILikeModels, + * }, + * { + * name: 'Cohere', + * staticModels: [ + * { name: 'command-r-plus-08-2024', label: 'Command R plus Latest', provider: 'Cohere', maxTokenAllowed: 4096 }, + * { name: 'command-r-08-2024', label: 'Command R Latest', provider: 'Cohere', maxTokenAllowed: 4096 }, + * { name: 'command-r-plus', label: 'Command R plus', provider: 'Cohere', maxTokenAllowed: 4096 }, + * { name: 'command-r', label: 'Command R', provider: 'Cohere', maxTokenAllowed: 4096 }, + * { name: 'command', label: 'Command', provider: 'Cohere', maxTokenAllowed: 4096 }, + * { name: 'command-nightly', label: 'Command Nightly', provider: 'Cohere', maxTokenAllowed: 4096 }, + * { name: 'command-light', label: 'Command Light', provider: 'Cohere', maxTokenAllowed: 4096 }, + * { name: 'command-light-nightly', label: 'Command Light Nightly', provider: 'Cohere', maxTokenAllowed: 4096 }, + * { name: 'c4ai-aya-expanse-8b', label: 'c4AI Aya Expanse 8b', provider: 'Cohere', maxTokenAllowed: 4096 }, + * { name: 'c4ai-aya-expanse-32b', label: 'c4AI Aya Expanse 32b', provider: 'Cohere', maxTokenAllowed: 4096 }, + * ], + * getApiKeyLink: 'https://dashboard.cohere.com/api-keys', + * }, + * { + * name: 'OpenRouter', + * staticModels: [ + * { name: 'gpt-4o', label: 'GPT-4o', provider: 'OpenAI', maxTokenAllowed: 8000 }, + * { + * name: 'anthropic/claude-3.5-sonnet', + * label: 'Anthropic: Claude 3.5 Sonnet (OpenRouter)', + * provider: 'OpenRouter', + * maxTokenAllowed: 8000, + * }, + * { + * name: 'anthropic/claude-3-haiku', + * label: 'Anthropic: Claude 3 Haiku (OpenRouter)', + * provider: 'OpenRouter', + * maxTokenAllowed: 8000, + * }, + * { + * name: 'deepseek/deepseek-coder', + * label: 'Deepseek-Coder V2 236B (OpenRouter)', + * provider: 'OpenRouter', + * maxTokenAllowed: 8000, + * }, + * { + * name: 'google/gemini-flash-1.5', + * label: 'Google Gemini Flash 1.5 (OpenRouter)', + * provider: 'OpenRouter', + * maxTokenAllowed: 8000, + * }, + * { + * name: 'google/gemini-pro-1.5', + * label: 'Google Gemini Pro 1.5 (OpenRouter)', + * provider: 'OpenRouter', + * maxTokenAllowed: 8000, + * }, + * { name: 'x-ai/grok-beta', label: 'xAI Grok Beta (OpenRouter)', provider: 'OpenRouter', maxTokenAllowed: 8000 }, + * { + * name: 'mistralai/mistral-nemo', + * label: 'OpenRouter Mistral Nemo (OpenRouter)', + * provider: 'OpenRouter', + * maxTokenAllowed: 8000, + * }, + * { + * name: 'qwen/qwen-110b-chat', + * label: 'OpenRouter Qwen 110b Chat (OpenRouter)', + * provider: 'OpenRouter', + * maxTokenAllowed: 8000, + * }, + * { name: 'cohere/command', label: 'Cohere Command (OpenRouter)', provider: 'OpenRouter', maxTokenAllowed: 4096 }, + * ], + * getDynamicModels: getOpenRouterModels, + * getApiKeyLink: 'https://openrouter.ai/settings/keys', + * }, + * { + * name: 'Google', + * staticModels: [ + * { name: 'gemini-1.5-flash-latest', label: 'Gemini 1.5 Flash', provider: 'Google', maxTokenAllowed: 8192 }, + * { name: 'gemini-2.0-flash-exp', label: 'Gemini 2.0 Flash', provider: 'Google', maxTokenAllowed: 8192 }, + * { name: 'gemini-1.5-flash-002', label: 'Gemini 1.5 Flash-002', provider: 'Google', maxTokenAllowed: 8192 }, + * { name: 'gemini-1.5-flash-8b', label: 'Gemini 1.5 Flash-8b', provider: 'Google', maxTokenAllowed: 8192 }, + * { name: 'gemini-1.5-pro-latest', label: 'Gemini 1.5 Pro', provider: 'Google', maxTokenAllowed: 8192 }, + * { name: 'gemini-1.5-pro-002', label: 'Gemini 1.5 Pro-002', provider: 'Google', maxTokenAllowed: 8192 }, + * { name: 'gemini-exp-1206', label: 'Gemini exp-1206', provider: 'Google', maxTokenAllowed: 8192 }, + * ], + * getApiKeyLink: 'https://aistudio.google.com/app/apikey', + * }, + * { + * name: 'Groq', + * staticModels: [ + * { name: 'llama-3.1-8b-instant', label: 'Llama 3.1 8b (Groq)', provider: 'Groq', maxTokenAllowed: 8000 }, + * { name: 'llama-3.2-11b-vision-preview', label: 'Llama 3.2 11b (Groq)', provider: 'Groq', maxTokenAllowed: 8000 }, + * { name: 'llama-3.2-90b-vision-preview', label: 'Llama 3.2 90b (Groq)', provider: 'Groq', maxTokenAllowed: 8000 }, + * { name: 'llama-3.2-3b-preview', label: 'Llama 3.2 3b (Groq)', provider: 'Groq', maxTokenAllowed: 8000 }, + * { name: 'llama-3.2-1b-preview', label: 'Llama 3.2 1b (Groq)', provider: 'Groq', maxTokenAllowed: 8000 }, + * { name: 'llama-3.3-70b-versatile', label: 'Llama 3.3 70b (Groq)', provider: 'Groq', maxTokenAllowed: 8000 }, + * ], + * getApiKeyLink: 'https://console.groq.com/keys', + * }, + * { + * name: 'HuggingFace', + * staticModels: [ + * { + * name: 'Qwen/Qwen2.5-Coder-32B-Instruct', + * label: 'Qwen2.5-Coder-32B-Instruct (HuggingFace)', + * provider: 'HuggingFace', + * maxTokenAllowed: 8000, + * }, + * { + * name: '01-ai/Yi-1.5-34B-Chat', + * label: 'Yi-1.5-34B-Chat (HuggingFace)', + * provider: 'HuggingFace', + * maxTokenAllowed: 8000, + * }, + * { + * name: 'codellama/CodeLlama-34b-Instruct-hf', + * label: 'CodeLlama-34b-Instruct (HuggingFace)', + * provider: 'HuggingFace', + * maxTokenAllowed: 8000, + * }, + * { + * name: 'NousResearch/Hermes-3-Llama-3.1-8B', + * label: 'Hermes-3-Llama-3.1-8B (HuggingFace)', + * provider: 'HuggingFace', + * maxTokenAllowed: 8000, + * }, + * { + * name: 'Qwen/Qwen2.5-Coder-32B-Instruct', + * label: 'Qwen2.5-Coder-32B-Instruct (HuggingFace)', + * provider: 'HuggingFace', + * maxTokenAllowed: 8000, + * }, + * { + * name: 'Qwen/Qwen2.5-72B-Instruct', + * label: 'Qwen2.5-72B-Instruct (HuggingFace)', + * provider: 'HuggingFace', + * maxTokenAllowed: 8000, + * }, + * { + * name: 'meta-llama/Llama-3.1-70B-Instruct', + * label: 'Llama-3.1-70B-Instruct (HuggingFace)', + * provider: 'HuggingFace', + * maxTokenAllowed: 8000, + * }, + * { + * name: 'meta-llama/Llama-3.1-405B', + * label: 'Llama-3.1-405B (HuggingFace)', + * provider: 'HuggingFace', + * maxTokenAllowed: 8000, + * }, + * { + * name: '01-ai/Yi-1.5-34B-Chat', + * label: 'Yi-1.5-34B-Chat (HuggingFace)', + * provider: 'HuggingFace', + * maxTokenAllowed: 8000, + * }, + * { + * name: 'codellama/CodeLlama-34b-Instruct-hf', + * label: 'CodeLlama-34b-Instruct (HuggingFace)', + * provider: 'HuggingFace', + * maxTokenAllowed: 8000, + * }, + * { + * name: 'NousResearch/Hermes-3-Llama-3.1-8B', + * label: 'Hermes-3-Llama-3.1-8B (HuggingFace)', + * provider: 'HuggingFace', + * maxTokenAllowed: 8000, + * }, + * ], + * getApiKeyLink: 'https://huggingface.co/settings/tokens', + * }, + * { + * name: 'OpenAI', + * staticModels: [ + * { name: 'gpt-4o-mini', label: 'GPT-4o Mini', provider: 'OpenAI', maxTokenAllowed: 8000 }, + * { name: 'gpt-4-turbo', label: 'GPT-4 Turbo', provider: 'OpenAI', maxTokenAllowed: 8000 }, + * { name: 'gpt-4', label: 'GPT-4', provider: 'OpenAI', maxTokenAllowed: 8000 }, + * { name: 'gpt-3.5-turbo', label: 'GPT-3.5 Turbo', provider: 'OpenAI', maxTokenAllowed: 8000 }, + * ], + * getApiKeyLink: 'https://platform.openai.com/api-keys', + * }, + * { + * name: 'xAI', + * staticModels: [{ name: 'grok-beta', label: 'xAI Grok Beta', provider: 'xAI', maxTokenAllowed: 8000 }], + * getApiKeyLink: 'https://docs.x.ai/docs/quickstart#creating-an-api-key', + * }, + * { + * name: 'Deepseek', + * staticModels: [ + * { name: 'deepseek-coder', label: 'Deepseek-Coder', provider: 'Deepseek', maxTokenAllowed: 8000 }, + * { name: 'deepseek-chat', label: 'Deepseek-Chat', provider: 'Deepseek', maxTokenAllowed: 8000 }, + * ], + * getApiKeyLink: 'https://platform.deepseek.com/apiKeys', + * }, + * { + * name: 'Mistral', + * staticModels: [ + * { name: 'open-mistral-7b', label: 'Mistral 7B', provider: 'Mistral', maxTokenAllowed: 8000 }, + * { name: 'open-mixtral-8x7b', label: 'Mistral 8x7B', provider: 'Mistral', maxTokenAllowed: 8000 }, + * { name: 'open-mixtral-8x22b', label: 'Mistral 8x22B', provider: 'Mistral', maxTokenAllowed: 8000 }, + * { name: 'open-codestral-mamba', label: 'Codestral Mamba', provider: 'Mistral', maxTokenAllowed: 8000 }, + * { name: 'open-mistral-nemo', label: 'Mistral Nemo', provider: 'Mistral', maxTokenAllowed: 8000 }, + * { name: 'ministral-8b-latest', label: 'Mistral 8B', provider: 'Mistral', maxTokenAllowed: 8000 }, + * { name: 'mistral-small-latest', label: 'Mistral Small', provider: 'Mistral', maxTokenAllowed: 8000 }, + * { name: 'codestral-latest', label: 'Codestral', provider: 'Mistral', maxTokenAllowed: 8000 }, + * { name: 'mistral-large-latest', label: 'Mistral Large Latest', provider: 'Mistral', maxTokenAllowed: 8000 }, + * ], + * getApiKeyLink: 'https://console.mistral.ai/api-keys/', + * }, + * { + * name: 'LMStudio', + * staticModels: [], + * getDynamicModels: getLMStudioModels, + * getApiKeyLink: 'https://lmstudio.ai/', + * labelForGetApiKey: 'Get LMStudio', + * icon: 'i-ph:cloud-arrow-down', + * }, + * { + * name: 'Together', + * getDynamicModels: getTogetherModels, + * staticModels: [ + * { + * name: 'Qwen/Qwen2.5-Coder-32B-Instruct', + * label: 'Qwen/Qwen2.5-Coder-32B-Instruct', + * provider: 'Together', + * maxTokenAllowed: 8000, + * }, + * { + * name: 'meta-llama/Llama-3.2-90B-Vision-Instruct-Turbo', + * label: 'meta-llama/Llama-3.2-90B-Vision-Instruct-Turbo', + * provider: 'Together', + * maxTokenAllowed: 8000, + * }, + * + * { + * name: 'mistralai/Mixtral-8x7B-Instruct-v0.1', + * label: 'Mixtral 8x7B Instruct', + * provider: 'Together', + * maxTokenAllowed: 8192, + * }, + * ], + * getApiKeyLink: 'https://api.together.xyz/settings/api-keys', + * }, + * { + * name: 'Perplexity', + * staticModels: [ + * { + * name: 'llama-3.1-sonar-small-128k-online', + * label: 'Sonar Small Online', + * provider: 'Perplexity', + * maxTokenAllowed: 8192, + * }, + * { + * name: 'llama-3.1-sonar-large-128k-online', + * label: 'Sonar Large Online', + * provider: 'Perplexity', + * maxTokenAllowed: 8192, + * }, + * { + * name: 'llama-3.1-sonar-huge-128k-online', + * label: 'Sonar Huge Online', + * provider: 'Perplexity', + * maxTokenAllowed: 8192, + * }, + * ], + * getApiKeyLink: 'https://www.perplexity.ai/settings/api', + * }, + *]; + */ + +const providerBaseUrlEnvKeys: Record = {}; +PROVIDER_LIST.forEach((provider) => { + providerBaseUrlEnvKeys[provider.name] = { + baseUrlKey: provider.config.baseUrlKey, + apiTokenKey: provider.config.apiTokenKey, + }; +}); + +// Export the getModelList function using the manager +export async function getModelList(options: { + apiKeys?: Record; + providerSettings?: Record; + serverEnv?: Record; +}) { + return await llmManager.updateModelList(options); } -async function getOpenAILikeModels( - apiKeys?: Record, - settings?: IProviderSetting, -): Promise { - try { - const baseUrl = settings?.baseUrl || import.meta.env.OPENAI_LIKE_API_BASE_URL || ''; - - if (!baseUrl) { - return []; - } - - let apiKey = ''; - - if (apiKeys && apiKeys.OpenAILike) { - apiKey = apiKeys.OpenAILike; - } - - const response = await fetch(`${baseUrl}/models`, { - headers: { - Authorization: `Bearer ${apiKey}`, - }, - }); - const res = (await response.json()) as any; - - return res.data.map((model: any) => ({ - name: model.id, - label: model.id, - provider: 'OpenAILike', - })); - } catch (e) { - console.error('Error getting OpenAILike models:', e); - return []; - } -} - -type OpenRouterModelsResponse = { - data: { - name: string; - id: string; - context_length: number; - pricing: { - prompt: number; - completion: number; - }; - }[]; -}; - -async function getOpenRouterModels(): Promise { - const data: OpenRouterModelsResponse = await ( - await fetch('https://openrouter.ai/api/v1/models', { - headers: { - 'Content-Type': 'application/json', - }, - }) - ).json(); - - return data.data - .sort((a, b) => a.name.localeCompare(b.name)) - .map((m) => ({ - name: m.id, - label: `${m.name} - in:$${(m.pricing.prompt * 1_000_000).toFixed( - 2, - )} out:$${(m.pricing.completion * 1_000_000).toFixed(2)} - context ${Math.floor(m.context_length / 1000)}k`, - provider: 'OpenRouter', - maxTokenAllowed: 8000, - })); -} - -async function getLMStudioModels(_apiKeys?: Record, settings?: IProviderSetting): Promise { - try { - const baseUrl = settings?.baseUrl || import.meta.env.LMSTUDIO_API_BASE_URL || 'http://localhost:1234'; - const response = await fetch(`${baseUrl}/v1/models`); - const data = (await response.json()) as any; - - return data.data.map((model: any) => ({ - name: model.id, - label: model.id, - provider: 'LMStudio', - })); - } catch (e: any) { - logStore.logError('Failed to get LMStudio models', e, { baseUrl: settings?.baseUrl }); - return []; - } -} - -async function initializeModelList(providerSettings?: Record): Promise { - let apiKeys: Record = {}; - - try { - const storedApiKeys = Cookies.get('apiKeys'); - - if (storedApiKeys) { - const parsedKeys = JSON.parse(storedApiKeys); - - if (typeof parsedKeys === 'object' && parsedKeys !== null) { - apiKeys = parsedKeys; - } - } - } catch (error: any) { - logStore.logError('Failed to fetch API keys from cookies', error); - logger.warn(`Failed to fetch apikeys from cookies: ${error?.message}`); - } - MODEL_LIST = [ - ...( - await Promise.all( - PROVIDER_LIST.filter( - (p): p is ProviderInfo & { getDynamicModels: () => Promise } => !!p.getDynamicModels, - ).map((p) => p.getDynamicModels(apiKeys, providerSettings?.[p.name])), - ) - ).flat(), - ...staticModels, - ]; - - return MODEL_LIST; +async function initializeModelList(options: { + env?: Record; + providerSettings?: Record; + apiKeys?: Record; +}): Promise { + const { providerSettings, apiKeys, env } = options; + const list = await getModelList({ + apiKeys, + providerSettings, + serverEnv: env, + }); + MODEL_LIST = list || MODEL_LIST; + + return list; } -export { - getOllamaModels, - getOpenAILikeModels, - getLMStudioModels, - initializeModelList, - getOpenRouterModels, - PROVIDER_LIST, -}; +// initializeModelList({}) +export { initializeModelList, providerBaseUrlEnvKeys, MODEL_LIST }; diff --git a/app/utils/shell.ts b/app/utils/shell.ts index 53b450f4c..0ffea4225 100644 --- a/app/utils/shell.ts +++ b/app/utils/shell.ts @@ -105,6 +105,7 @@ export class BoltShell { * this.#shellInputStream?.write('\x03'); */ this.terminal.input('\x03'); + await this.waitTillOscCode('prompt'); if (state && state.executionPrms) { await state.executionPrms; diff --git a/app/utils/types.ts b/app/utils/types.ts index 1fa253fa4..5f8bc392b 100644 --- a/app/utils/types.ts +++ b/app/utils/types.ts @@ -19,10 +19,3 @@ export interface OllamaModel { export interface OllamaApiResponse { models: OllamaModel[]; } - -export interface ModelInfo { - name: string; - label: string; - provider: string; - maxTokenAllowed: number; -} diff --git a/app/vite-env.d.ts b/app/vite-env.d.ts new file mode 100644 index 000000000..ab9286583 --- /dev/null +++ b/app/vite-env.d.ts @@ -0,0 +1,2 @@ +declare const __COMMIT_HASH: string; +declare const __APP_VERSION: string; diff --git a/changelog.md b/changelog.md index ad934eae4..9c4d50f1b 100644 --- a/changelog.md +++ b/changelog.md @@ -1,271 +1,31 @@ -# Release v0.0.2 - -### πŸ”„ Changes since v0.0.1 - -#### ✨ Features - -- add unit configuration to uno.config.ts -- added perplexity model -- Experimental Prompt Library Added -- start update by branch +# Release v0.0.3 +### πŸ”„ Changes since v0.0.2 #### πŸ› Bug Fixes -- added more controlled rate for code streaming -- handle conflicts between input method engine and enter key -- LM Studio sending messgae -- adjust intro section margin and textarea outline style in BaseChat component -- commit-file-ignore -- lm studio fix -- start new chat icon -- removed context optimization temporarily, to be moved to optional from menu +- Prompt Enhance -#### ♻️ Code Refactoring +#### πŸ“š Documentation -- remove unused React import in ImportButtons component -- simplify GitCloneButton component by removing unused tooltip and streamlining button structure +- miniflare error knowledge #### πŸ”§ Chores -- update commit hash to 7bafd2a5d67dce70d15b77201ef8de9745efab61 -- update commit hash to e5ecb0b7d5e0fb53f13654689cebd8eb99b10578 -- update commit hash to 8f15c81f37f36667fe796b1f75d0003a7c0f395b -- update commit hash to d13da30bda2d10eb2da42113493625cd55e0d34d -- update commit hash to dd296ab00d4d51ea0bc30ebe9aed0e6632feb37a -- update commit hash to eeafc12522b184dcbded28c5c6606e4a23e6849f -- update commit hash to d479daa5781a533c68a6f9ffdb3b919914c9305e -- update commit hash to 5773b1e271c8effec20ff1c10a759d9a654a2a94 -- update commit hash to 5f3405151043b3c32da7acc6353247a5508969b3 -- update commit hash to 5f3405151043b3c32da7acc6353247a5508969b3 -- update commit hash to 0c899e430a4d33e78e3e44ebf7100b5da14eda3f -- update commit hash to 1d64a15ed0110fc62091b1dca90139de9fb9fdb4 -- update commit hash to d1fa70fc97dc7839ea8cd005feb03266f201cf4f -- update commit hash to 1e04ab38b07e82852626b164890f4a6df1f98cef -- update commit hash to 8c4397a19f3eab2382082a39526d66385e9d2a49 -- update commit hash to 55094392cf4c5bc607aff796680ad50236a4cf20 -- update commit hash to 9666b2ab67d25345542722ab9d870b36ad06252e -- update commit hash to 6a5ed21c0fed92a8c842b683bf9a430901e6bb05 -- update commit hash to 4af18c069f2429ffaf410d92702a1e1294af2628 -- update commit hash to a71cfba660f04a8440960ab772670b192e2d066f -- update commit hash to 4f02887565e13eeaabbfb6f699cbe089e802338f -- update commit hash to f27f7bba5132346db18e70e514a6a6202d6ab634 -- update commit hash to eb53146937cbe49a84aaaaa59882df6db4a1e459 -- update commit hash to 4f10fb1294e11cf8f5a68b30a1e85acdf65ffcbc -- update commit hash to 43370f515df1184be2fb54db637a73bb683d6d86 -- update commit hash to ece0213500a94a6b29e29512c5040baf57884014 -- update commit hash to b06f6e3a3e7e5b2b5f8d9b13a761422993559f3e -- update commit hash to 25fe15232fcd6cee83f179adbd1d3e7d6a90acca -- update commit hash to a87cfd79503a62db2be00656f4874ec747d76a09 -- update commit hash to 7c3a3bbde6c61f374a6d37c888c6900a335e3d33 -- update commit hash to d936c012bdeb210ee876be1941ef8e370ea0b2e3 -- update commit hash to b3f7a5c3785060c7937dcd681b38f17b5396fc84 -- update commit hash to 23346f6271bf2f438489660357e6ffee803befb1 -- update commit hash to 9cd9ee9088467882e1e4efdf491959619307cc9d -- update commit hash to 87a90718d31bd8ec501cb32f863efd26156fb1e2 -- update commit hash to e223e9b6af1f6f31300fd7ed9ce498236cedd5dc -- update commit hash to 4016f54933102bf67336b8ae58e14673dfad72ee -- update commit hash to 1e7c3a4ff8f3153f53e0b0ed7cb13434825e41d9 -- update commit hash to d75899d737243cd7303704adef16d77290de5a0b -- update commit hash to b5867835f5da5c93bd9a8376df9e9d32b97acff5 -- update commit hash to d22b32ae636b9f134cdb5f96a10e4398aa2171b7 -- update commit hash to d9b2801434011b60dca700c19cabd0652f31f8e4 -- update commit hash to 0157fddc76fd5eebc545085e2c3c4ab37d9ca925 -- update commit hash to 810cc81a16955eebec943f7d504749dbcbb85b25 -- update commit hash to d3727459aa594505efd0cef58c4218eaf48d5baf -- update commit hash to 6ba93974a02a98c83badf2f0002ff4812b8f75a9 -- update commit hash to 960f532f8234663d0b3630d18033c959fac6882c -- update commit hash to 77073a5e7f759ae8e5752628131d0c56df6b5c34 -- update commit hash to 78505ed2f347dd3a7778b4c1c7c38c89ecacedd3 -- update commit hash to f752bf7da532ec6196dafff1c388250d44db4de5 -- update commit hash to 995fb81ac7a03eb1a6d1c56cf2fc92a60028c024 -- update commit hash to 8aee6ebf477c08d896b4419fbdeb670cc2bb8f29 -- update commit hash to 6987ceae9e1e91bec301f9e25ed9e8e03449d806 -- update commit hash to eb1d5417e77e699e0489f09814e87fb5afed9dd5 -- update commit hash to de2cb43d170033c43a6cf436af02e033f66a7e4d -- update commit hash to 49b02dd885919e24a201f07b1a7b0fd0371b4f85 -- update commit hash to 43e1f436f57fc4adb43b5481b403967803d4786d -- update commit hash to 0a4ef117ae5d3687b04415e64a22794ea55841d1 -- update commit hash to 25b80ab267541b6ea290985dde09863f1a29c85c -- update commit hash to c257129a61e258650b321c19323ddebaf03b0a54 +- adding back semantic pull pr check for better changelog system +- update commit hash to 1e72d52278730f7d22448be9d5cf2daf12559486 +- update commit hash to 282beb96e2ee92ba8b1174aaaf9f270e03a288e8 #### πŸ” Other Changes -- Check the render method of SlotClone. #432 -- Initial commit for screen cap feature -- Second commit for screen cap feature -- Add 90b llama-3.2 model for better performance -- More selection tool changes -- feat(context optimization):improved context management and redused chat overhead -- added backdrop and loading screen -- basic context menu for folders -- copyPath and copyRelativePath for files and folders -- pnpm lock file -- Refactor to use newver v4 version of Vercel AI package -- removed console logs -- Update README.md -- Update README.md -- Update README.md -- Update README.md -- Merge branch 'main' into context-optimization -- Merge branch 'main' into context-optimization -- added prompt url params -- added support for private github repo through github connections -- Add Logo icons LLM's -- Settings UI enhancement -- Event logs bug fix -- Merge branch 'stackblitz-labs:main' into main -- auto select model on provider disabled -- Update debug tab to check against fork -- debug fixes -- minor bug fixes -- Merge branch 'main' of https://github.com/stackblitz-labs/bolt.diy -- Update commit.json -- Merge branch 'main' of https://github.com/Stijnus/bolt.new-any-llm -- Update commit.json -- Merge pull request #684 from thecodacus/fix-auto-select-model -- ui styles fixed -- Update README.md -- some clean up and added a all log option -- Merge remote-tracking branch 'github-desktop-stijnus/main' into pr/676 -- update README.md -- Merge branch 'main' into main -- Merge pull request #676 from Stijnus/main -- Update .gitignore -- Update commit.json -- Merge branch 'main' into fix/start-new-chat-icon -- Merge branch 'main' into fix/ui-enhancements -- Merge pull request #708 from SujalXplores/fix/ui-enhancements -- Update constants.ts -- Merge pull request #578 from thecodacus/context-optimization -- Merge pull request #713 from thecodacus/context-optimization-fix -- merged main -- Merge branch 'main' into feat/image-select-merge -- merge main into image -- Merge pull request #670 from thecodacus/private-github-repo -- Merge branch 'main' into streaming-fixed -- Merge pull request #655 from thecodacus/streaming-fixed -- Update BaseChat.tsx -- Merge pull request #679 from Dlouxgit/main -- Merge branch 'main' into feat/image-select -- merge main -- groq-llama3.3-70b -- Merge branch 'main' into feat/image-select -- Merge pull request #582 from emcconnell/feat/image-select -- update readme -- update readme -- Merge branch 'main' into update-readme -- Merge pull request #722 from emcconnell/update-readme -- Groq Llama 3.2 90B Vision Preview -- Merge -- Setting Modal Changes -- Renamed feature -- combined optional features -- Update DebugTab.tsx -- Update DebugTab.tsx -- Branding updates -- Update DebugTab.tsx -- prompt enhanced toast notification -- Merge branch 'main' into perplexity-models -- Merge pull request #715 from meetpateltech/perplexity-models -- Merge pull request #602 from mark-when/contextMenu2 -- Merge pull request #728 from dustinwloring1988/branding/Change-Bolt-to-bolt -- Setting-Menu -- prompt-enhanced-toast -- Merge pull request #726 from dustinwloring1988/ui-ux/features-tab -- fallback icon for provider -- fix-perplexity-icon -- Update README.md -- updated readme -- updated readme -- Perplexity Provider Icon -- perplexity-provider-icon -- README-formatting -- Merge branch 'main' into system-prompt-variations -- update by branch -- Merge branch 'main' into ui-ux/debug-tab -- updated the examples and added strict rules -- Merge branch 'main' into system-prompt-variations -- Update commit.yaml -- Update commit.yaml -- branding update -- updated to use settings for branch selection -- Update useSettings.tsx -- quick fix -- Update FAQ.md -- Update CONTRIBUTING.md -- quick fix -- update-Bolt-to-bolt -- debug-tab -- Update mkdocs.yml -- Update vite.config.ts -- added auto detect branch name and version tag -- Update constants.ts -- Update DebugTab.tsx -- a fav.ico -- favicon-ico -- fix -- Merge pull request #753 from dustinwloring1988/fix/lm-studio-fetch-warning -- Merge pull request #751 from dustinwloring1988/fix/v3_lazyRouteDiscovery-warn -- mkdoc-update-names -- mkdoc consistent style -- Merge branch 'main' into system-prompt-variations-local -- Update ConnectionsTab.tsx -- quick fix -- mkdoc-docs-styled -- new section heading -- new section heading -- Make links clickable in docs -- Update CONTRIBUTING.md -- fix clickable links docs -- default provider icon -- default-provider-image -- Another attempt to add toek usage info -- merge -- Lint fix -- updated implementation -- Merge branch 'main' into fix-variable-name -- Merge pull request #755 from thecodacus/fix-variable-name -- Merge branch 'main' into token-usage -- Merge pull request #769 from thecodacus/token-usage -- Merge remote-tracking branch 'upstream/main' -- Merge remote-tracking branch 'origin/main' into system-prompt-variations-local -- Merge branch 'main' into main -- added missing icons for safari -- Merge pull request #760 from Stijnus/main -- Merge branch 'main' into app-fail-safari-fix -- Merge pull request #771 from thecodacus/app-fail-safari-fix -- Merge pull request #433 from DiegoSouzaPW/feature/SlotCloneError -- Merge remote-tracking branch 'upstream/main' -- commit workflow fix -- Merge pull request #772 from thecodacus/commit-workflow-fix -- Merge remote-tracking branch 'upstream/main' -- Merge branch 'main' into system-prompt-variations-local -- Merge pull request #744 from thecodacus/system-prompt-variations -- Merge remote-tracking branch 'upstream/main' -- updated workflow for commit and stable release -- Merge pull request #773 from thecodacus/workflowfix -- Fixed theming of Copy Code button -- Merge branch 'main' into copyMyFix -- Merge remote-tracking branch 'upstream/main' -- minor bugfix -- Merge branch 'minor-bugfix' into bugfix-for-stable -- Merge branch 'main' into prompt-url-params -- Merge pull request #669 from thecodacus/prompt-url-params -- Merge branch 'main' into add-loading-on-git-import-from-url -- added UI fix for loading screen -- Merge branch 'main' into add-loading-on-git-import-from-url -- Merge pull request #597 from thecodacus/add-loading-on-git-import-from-url -- Merge branch 'main' into copyMyFix -- Merge pull request #774 from D-Byte/copyMyFix -- Merge remote-tracking branch 'upstream/main' -- Merge branch 'main' into bugfix-for-stable -- Merge pull request #757 from dustinwloring1988/feat/enhanced-github-connection - Merge remote-tracking branch 'upstream/main' -- Merge branch 'main' into bugfix-for-stable +- Merge pull request #781 from thecodacus/semantic-pull-pr +- miniflare and wrangler error +- simplified the fix +- Merge branch 'main' into fix/prompt-enhance -**Full Changelog**: [`v0.0.1..v0.0.2`](https://github.com/stackblitz-labs/bolt.diy/compare/v0.0.1...v0.0.2) +**Full Changelog**: [`v0.0.2..v0.0.3`](https://github.com/stackblitz-labs/bolt.diy/compare/v0.0.2...v0.0.3) diff --git a/docs/docs/CONTRIBUTING.md b/docs/docs/CONTRIBUTING.md index 7b18010da..3a8d5be8f 100644 --- a/docs/docs/CONTRIBUTING.md +++ b/docs/docs/CONTRIBUTING.md @@ -1,246 +1,219 @@ # Contribution Guidelines -## πŸ“‹ Table of Contents -- [Code of Conduct](#code-of-conduct) -- [How Can I Contribute?](#how-can-i-contribute) -- [Pull Request Guidelines](#pull-request-guidelines) -- [Coding Standards](#coding-standards) -- [Development Setup](#development-setup) -- [Deploymnt with Docker](#docker-deployment-documentation) +Welcome! This guide provides all the details you need to contribute effectively to the project. Thank you for helping us make **bolt.diy** a better tool for developers worldwide. πŸ’‘ --- -## Code of Conduct +## πŸ“‹ Table of Contents -This project and everyone participating in it is governed by our Code of Conduct. By participating, you are expected to uphold this code. Please report unacceptable behavior to the project maintainers. +1. [Code of Conduct](#code-of-conduct) +2. [How Can I Contribute?](#how-can-i-contribute) +3. [Pull Request Guidelines](#pull-request-guidelines) +4. [Coding Standards](#coding-standards) +5. [Development Setup](#development-setup) +6. [Testing](#testing) +7. [Deployment](#deployment) +8. [Docker Deployment](#docker-deployment) +9. [VS Code Dev Containers Integration](#vs-code-dev-containers-integration) --- -## How Can I Contribute? - -### 🐞 Reporting Bugs and Feature Requests -- Check the issue tracker to avoid duplicates -- Use the issue templates when available -- Include as much relevant information as possible -- For bugs, add steps to reproduce the issue - -### πŸ”§ Code Contributions -1. Fork the repository -2. Create a new branch for your feature/fix -3. Write your code -4. Submit a pull request +## πŸ›‘οΈ Code of Conduct -### ✨ Becoming a Core Contributor -We're looking for dedicated contributors to help maintain and grow this project. If you're interested in becoming a core contributor, please fill out our [Contributor Application Form](https://forms.gle/TBSteXSDCtBDwr5m7). +This project is governed by our **Code of Conduct**. By participating, you agree to uphold this code. Report unacceptable behavior to the project maintainers. --- -## Pull Request Guidelines +## πŸ› οΈ How Can I Contribute? -### πŸ“ PR Checklist -- [ ] Branch from the main branch -- [ ] Update documentation if needed -- [ ] Manually verify all new functionality works as expected -- [ ] Keep PRs focused and atomic +### 1️⃣ Reporting Bugs or Feature Requests +- Check the [issue tracker](#) to avoid duplicates. +- Use issue templates (if available). +- Provide detailed, relevant information and steps to reproduce bugs. -### πŸ‘€ Review Process -1. Manually test the changes -2. At least one maintainer review required -3. Address all review comments -4. Maintain clean commit history +### 2️⃣ Code Contributions +1. Fork the repository. +2. Create a feature or fix branch. +3. Write and test your code. +4. Submit a pull request (PR). ---- - -## Coding Standards - -### πŸ’» General Guidelines -- Follow existing code style -- Comment complex logic -- Keep functions focused and small -- Use meaningful variable names +### 3️⃣ Join as a Core Contributor +Interested in maintaining and growing the project? Fill out our [Contributor Application Form](https://forms.gle/TBSteXSDCtBDwr5m7). --- -## Development Setup +## βœ… Pull Request Guidelines -### πŸ”„ Initial Setup -1. Clone the repository: -```bash -git clone https://github.com/stackblitz-labs/bolt.diy.git -``` +### PR Checklist +- Branch from the **main** branch. +- Update documentation, if needed. +- Test all functionality manually. +- Focus on one feature/bug per PR. -2. Install dependencies: -```bash -pnpm install -``` +### Review Process +1. Manual testing by reviewers. +2. At least one maintainer review required. +3. Address review comments. +4. Maintain a clean commit history. -3. Set up environment variables: - - Rename `.env.example` to `.env.local` - - Add your LLM API keys (only set the ones you plan to use): -```bash -GROQ_API_KEY=XXX -HuggingFace_API_KEY=XXX -OPENAI_API_KEY=XXX -ANTHROPIC_API_KEY=XXX -... -``` - - Optionally set debug level: -```bash -VITE_LOG_LEVEL=debug -``` +--- - - Optionally set context size: -```bash -DEFAULT_NUM_CTX=32768 -``` +## πŸ“ Coding Standards -Some Example Context Values for the qwen2.5-coder:32b models are. - -* DEFAULT_NUM_CTX=32768 - Consumes 36GB of VRAM -* DEFAULT_NUM_CTX=24576 - Consumes 32GB of VRAM -* DEFAULT_NUM_CTX=12288 - Consumes 26GB of VRAM -* DEFAULT_NUM_CTX=6144 - Consumes 24GB of VRAM +### General Guidelines +- Follow existing code style. +- Comment complex logic. +- Keep functions small and focused. +- Use meaningful variable names. -**Important**: Never commit your `.env.local` file to version control. It's already included in .gitignore. +--- -### πŸš€ Running the Development Server +## πŸ–₯️ Development Setup + +### 1️⃣ Initial Setup +- Clone the repository: + ```bash + git clone https://github.com/stackblitz-labs/bolt.diy.git + ``` +- Install dependencies: + ```bash + pnpm install + ``` +- Set up environment variables: + 1. Rename `.env.example` to `.env.local`. + 2. Add your API keys: + ```bash + GROQ_API_KEY=XXX + HuggingFace_API_KEY=XXX + OPENAI_API_KEY=XXX + ... + ``` + 3. Optionally set: + - Debug level: `VITE_LOG_LEVEL=debug` + - Context size: `DEFAULT_NUM_CTX=32768` + +**Note**: Never commit your `.env.local` file to version control. It’s already in `.gitignore`. + +### 2️⃣ Run Development Server ```bash pnpm run dev ``` - -**Note**: You will need Google Chrome Canary to run this locally if you use Chrome! It's an easy install and a good browser for web development anyway. +**Tip**: Use **Google Chrome Canary** for local testing. --- -## Testing - -Run the test suite with: +## πŸ§ͺ Testing +Run the test suite with: ```bash pnpm test ``` --- -## Deployment - -To deploy the application to Cloudflare Pages: +## πŸš€ Deployment +### Deploy to Cloudflare Pages ```bash pnpm run deploy ``` - -Make sure you have the necessary permissions and Wrangler is correctly configured for your Cloudflare account. +Ensure you have required permissions and that Wrangler is configured. --- -# Docker Deployment Documentation +## 🐳 Docker Deployment -This guide outlines various methods for building and deploying the application using Docker. +This section outlines the methods for deploying the application using Docker. The processes for **Development** and **Production** are provided separately for clarity. -## Build Methods +--- -### 1. Using Helper Scripts +### πŸ§‘β€πŸ’» Development Environment -NPM scripts are provided for convenient building: +#### Build Options +**Option 1: Helper Scripts** ```bash # Development build npm run dockerbuild - -# Production build -npm run dockerbuild:prod ``` -### 2. Direct Docker Build Commands - -You can use Docker's target feature to specify the build environment: - +**Option 2: Direct Docker Build Command** ```bash -# Development build docker build . --target bolt-ai-development - -# Production build -docker build . --target bolt-ai-production ``` -### 3. Docker Compose with Profiles - -Use Docker Compose profiles to manage different environments: - +**Option 3: Docker Compose Profile** ```bash -# Development environment docker-compose --profile development up +``` -# Production environment -docker-compose --profile production up +#### Running the Development Container +```bash +docker run -p 5173:5173 --env-file .env.local bolt-ai:development ``` --- -## Running the Application +### 🏭 Production Environment -After building using any of the methods above, run the container with: +#### Build Options +**Option 1: Helper Scripts** ```bash -# Development -docker run -p 5173:5173 --env-file .env.local bolt-ai:development +# Production build +npm run dockerbuild:prod +``` + +**Option 2: Direct Docker Build Command** +```bash +docker build . --target bolt-ai-production +``` + +**Option 3: Docker Compose Profile** +```bash +docker-compose --profile production up +``` -# Production +#### Running the Production Container +```bash docker run -p 5173:5173 --env-file .env.local bolt-ai:production ``` --- -## Deployment with Coolify +### Coolify Deployment -[Coolify](https://github.com/coollabsio/coolify) provides a straightforward deployment process: - -1. Import your Git repository as a new project -2. Select your target environment (development/production) -3. Choose "Docker Compose" as the Build Pack -4. Configure deployment domains -5. Set the custom start command: +For an easy deployment process, use [Coolify](https://github.com/coollabsio/coolify): +1. Import your Git repository into Coolify. +2. Choose **Docker Compose** as the build pack. +3. Configure environment variables (e.g., API keys). +4. Set the start command: ```bash docker compose --profile production up ``` -6. Configure environment variables - - Add necessary AI API keys - - Adjust other environment variables as needed -7. Deploy the application --- -## VS Code Integration +## πŸ› οΈ VS Code Dev Containers Integration -The `docker-compose.yaml` configuration is compatible with VS Code dev containers: +The `docker-compose.yaml` configuration is compatible with **VS Code Dev Containers**, making it easy to set up a development environment directly in Visual Studio Code. -1. Open the command palette in VS Code -2. Select the dev container configuration -3. Choose the "development" profile from the context menu +### Steps to Use Dev Containers ---- - -## Environment Files - -Ensure you have the appropriate `.env.local` file configured before running the containers. This file should contain: -- API keys -- Environment-specific configurations -- Other required environment variables +1. Open the command palette in VS Code (`Ctrl+Shift+P` or `Cmd+Shift+P` on macOS). +2. Select **Dev Containers: Reopen in Container**. +3. Choose the **development** profile when prompted. +4. VS Code will rebuild the container and open it with the pre-configured environment. --- -## DEFAULT_NUM_CTX +## πŸ”‘ Environment Variables -The `DEFAULT_NUM_CTX` environment variable can be used to limit the maximum number of context values used by the qwen2.5-coder model. For example, to limit the context to 24576 values (which uses 32GB of VRAM), set `DEFAULT_NUM_CTX=24576` in your `.env.local` file. +Ensure `.env.local` is configured correctly with: +- API keys. +- Context-specific configurations. -First off, thank you for considering contributing to bolt.diy! This fork aims to expand the capabilities of the original project by integrating multiple LLM providers and enhancing functionality. Every contribution helps make bolt.diy a better tool for developers worldwide. - ---- - -## Notes - -- Port 5173 is exposed and mapped for both development and production environments -- Environment variables are loaded from `.env.local` -- Different profiles (development/production) can be used for different deployment scenarios -- The configuration supports both local development and production deployment +Example for the `DEFAULT_NUM_CTX` variable: +```bash +DEFAULT_NUM_CTX=24576 # Uses 32GB VRAM +``` \ No newline at end of file diff --git a/docs/docs/FAQ.md b/docs/docs/FAQ.md index de1b4b14b..a09fae885 100644 --- a/docs/docs/FAQ.md +++ b/docs/docs/FAQ.md @@ -1,6 +1,21 @@ # Frequently Asked Questions (FAQ) -## How do I get the best results with bolt.diy? +
+What are the best models for bolt.diy? + +For the best experience with bolt.diy, we recommend using the following models: + +- **Claude 3.5 Sonnet (old)**: Best overall coder, providing excellent results across all use cases +- **Gemini 2.0 Flash**: Exceptional speed while maintaining good performance +- **GPT-4o**: Strong alternative to Claude 3.5 Sonnet with comparable capabilities +- **DeepSeekCoder V2 236b**: Best open source model (available through OpenRouter, DeepSeek API, or self-hosted) +- **Qwen 2.5 Coder 32b**: Best model for self-hosting with reasonable hardware requirements + +**Note**: Models with less than 7b parameters typically lack the capability to properly interact with bolt! +
+ +
+How do I get the best results with bolt.diy? - **Be specific about your stack**: Mention the frameworks or libraries you want to use (e.g., Astro, Tailwind, ShadCN) in your initial prompt. This ensures that bolt.diy scaffolds the project according to your preferences. @@ -14,62 +29,63 @@ - **Batch simple instructions**: Combine simple tasks into a single prompt to save time and reduce API credit consumption. For example: *"Change the color scheme, add mobile responsiveness, and restart the dev server."* +
---- - -## How do I contribute to bolt.diy? +
+How do I contribute to bolt.diy? Check out our [Contribution Guide](CONTRIBUTING.md) for more details on how to get involved! +
---- - -## What are the future plans for bolt.diy? +
+What are the future plans for bolt.diy? Visit our [Roadmap](https://roadmap.sh/r/ottodev-roadmap-2ovzo) for the latest updates. New features and improvements are on the way! +
---- - -## Why are there so many open issues/pull requests? +
+Why are there so many open issues/pull requests? bolt.diy began as a small showcase project on @ColeMedin's YouTube channel to explore editing open-source projects with local LLMs. However, it quickly grew into a massive community effort! -We’re forming a team of maintainers to manage demand and streamline issue resolution. The maintainers are rockstars, and we’re also exploring partnerships to help the project thrive. - ---- +We're forming a team of maintainers to manage demand and streamline issue resolution. The maintainers are rockstars, and we're also exploring partnerships to help the project thrive. +
-## How do local LLMs compare to larger models like Claude 3.5 Sonnet for bolt.diy? +
+How do local LLMs compare to larger models like Claude 3.5 Sonnet for bolt.diy? While local LLMs are improving rapidly, larger models like GPT-4o, Claude 3.5 Sonnet, and DeepSeek Coder V2 236b still offer the best results for complex applications. Our ongoing focus is to improve prompts, agents, and the platform to better support smaller local LLMs. +
---- - -## Common Errors and Troubleshooting +
+Common Errors and Troubleshooting ### **"There was an error processing this request"** This generic error message means something went wrong. Check both: - The terminal (if you started the app with Docker or `pnpm`). - The developer console in your browser (press `F12` or right-click > *Inspect*, then go to the *Console* tab). ---- - ### **"x-api-key header missing"** This error is sometimes resolved by restarting the Docker container. -If that doesn’t work, try switching from Docker to `pnpm` or vice versa. We’re actively investigating this issue. - ---- +If that doesn't work, try switching from Docker to `pnpm` or vice versa. We're actively investigating this issue. ### **Blank preview when running the app** A blank preview often occurs due to hallucinated bad code or incorrect commands. To troubleshoot: - Check the developer console for errors. -- Remember, previews are core functionality, so the app isn’t broken! We’re working on making these errors more transparent. - ---- +- Remember, previews are core functionality, so the app isn't broken! We're working on making these errors more transparent. ### **"Everything works, but the results are bad"** Local LLMs like Qwen-2.5-Coder are powerful for small applications but still experimental for larger projects. For better results, consider using larger models like GPT-4o, Claude 3.5 Sonnet, or DeepSeek Coder V2 236b. +### **"Received structured exception #0xc0000005: access violation"** +If you are getting this, you are probably on Windows. The fix is generally to update the [Visual C++ Redistributable](https://learn.microsoft.com/en-us/cpp/windows/latest-supported-vc-redist?view=msvc-170) + +### **"Miniflare or Wrangler errors in Windows"** +You will need to make sure you have the latest version of Visual Studio C++ installed (14.40.33816), more information here https://github.com/stackblitz-labs/bolt.diy/issues/19. +
+ --- Got more questions? Feel free to reach out or open an issue in our GitHub repo! diff --git a/docs/docs/index.md b/docs/docs/index.md index 389e74ffa..641d45a72 100644 --- a/docs/docs/index.md +++ b/docs/docs/index.md @@ -1,6 +1,24 @@ # Welcome to bolt diy bolt.diy allows you to choose the LLM that you use for each prompt! Currently, you can use OpenAI, Anthropic, Ollama, OpenRouter, Gemini, LMStudio, Mistral, xAI, HuggingFace, DeepSeek, or Groq models - and it is easily extended to use any other model supported by the Vercel AI SDK! See the instructions below for running this locally and extending it to include more models. +## Table of Contents +- [Join the community!](#join-the-community) +- [Features](#features) +- [Setup](#setup) + - [Prerequisites](#prerequisites) + - [Clone the Repository](#clone-the-repository) + - [Entering API Keys](#entering-api-keys) + - [1. Set API Keys in the `.env.local` File](#1-set-api-keys-in-the-envlocal-file) + - [2. Configure API Keys Directly in the Application](#2-configure-api-keys-directly-in-the-application) +- [Run the Application](#run-the-application) + - [Option 1: Without Docker](#option-1-without-docker) + - [Option 2: With Docker](#option-2-with-docker) +- [Update Your Local Version to the Latest](#update-your-local-version-to-the-latest) +- [Adding New LLMs](#adding-new-llms) +- [Available Scripts](#available-scripts) +- [Development](#development) +- [Tips and Tricks](#tips-and-tricks) + --- ## Join the community! @@ -9,72 +27,65 @@ bolt.diy allows you to choose the LLM that you use for each prompt! Currently, y --- -## Whats bolt.diy +## Features -bolt.diy is an AI-powered web development agent that allows you to prompt, run, edit, and deploy full-stack applications directly from your browserβ€”no local setup required. If you're here to build your own AI-powered web dev agent using the Bolt open source codebase, [click here to get started!](./CONTRIBUTING.md) +- **AI-powered full-stack web development** directly in your browser. +- **Support for multiple LLMs** with an extensible architecture to integrate additional models. +- **Attach images to prompts** for better contextual understanding. +- **Integrated terminal** to view output of LLM-run commands. +- **Revert code to earlier versions** for easier debugging and quicker changes. +- **Download projects as ZIP** for easy portability. +- **Integration-ready Docker support** for a hassle-free setup. --- -## What Makes bolt.diy Different - -Claude, v0, etc are incredible- but you can't install packages, run backends, or edit code. That’s where bolt.diy stands out: - -- **Full-Stack in the Browser**: bolt.diy integrates cutting-edge AI models with an in-browser development environment powered by **StackBlitz’s WebContainers**. This allows you to: - - Install and run npm tools and libraries (like Vite, Next.js, and more) - - Run Node.js servers - - Interact with third-party APIs - - Deploy to production from chat - - Share your work via a URL - -- **AI with Environment Control**: Unlike traditional dev environments where the AI can only assist in code generation, bolt.diy gives AI models **complete control** over the entire environment including the filesystem, node server, package manager, terminal, and browser console. This empowers AI agents to handle the whole app lifecycleβ€”from creation to deployment. - -Whether you’re an experienced developer, a PM, or a designer, bolt.diy allows you to easily build production-grade full-stack applications. +## Setup -For developers interested in building their own AI-powered development tools with WebContainers, check out the open-source Bolt codebase in this repo! +If you're new to installing software from GitHub, don't worry! If you encounter any issues, feel free to submit an "issue" using the provided links or improve this documentation by forking the repository, editing the instructions, and submitting a pull request. The following instruction will help you get the stable branch up and running on your local machine in no time. ---- - -## Setup +### Prerequisites -Many of you are new users to installing software from Github. If you have any installation troubles reach out and submit an "issue" using the links above, or feel free to enhance this documentation by forking, editing the instructions, and doing a pull request. +1. **Install Git**: [Download Git](https://git-scm.com/downloads) +2. **Install Node.js**: [Download Node.js](https://nodejs.org/en/download/) -1. [Install Git from](https://git-scm.com/downloads) + - After installation, the Node.js path is usually added to your system automatically. To verify: + - **Windows**: Search for "Edit the system environment variables," click "Environment Variables," and check if `Node.js` is in the `Path` variable. + - **Mac/Linux**: Open a terminal and run: + ```bash + echo $PATH + ``` + Look for `/usr/local/bin` in the output. -2. [Install Node.js from](https://nodejs.org/en/download/) +### Clone the Repository -Pay attention to the installer notes after completion. +Alternatively, you can download the latest version of the project directly from the [Releases Page](https://github.com/stackblitz-labs/bolt.diy/releases/latest). Simply download the .zip file, extract it, and proceed with the setup instructions below. If you are comfertiable using git then run the command below. -On all operating systems, the path to Node.js should automatically be added to your system path. But you can check your path if you want to be sure. On Windows, you can search for "edit the system environment variables" in your system, select "Environment Variables..." once you are in the system properties, and then check for a path to Node in your "Path" system variable. On a Mac or Linux machine, it will tell you to check if /usr/local/bin is in your $PATH. To determine if usr/local/bin is included in $PATHΒ open your Terminal and run: +Clone the repository using Git: -``` -echo $PATHΒ . +```bash +git clone -b stable https://github.com/stackblitz-labs/bolt.diy ``` -If you see usr/local/bin in the output then you're good to go. +--- -3. Clone the repository (if you haven't already) by opening a Terminal window (or CMD with admin permissions) and then typing in this: +### Entering API Keys -``` -git clone https://github.com/stackblitz-labs/bolt.diy.git -``` +There are two ways to configure your API keys in bolt.diy: -3. Rename .env.example to .env.local and add your LLM API keys. You will find this file on a Mac at "[your name]/bolt.diy/.env.example". For Windows and Linux the path will be similar. +#### 1. Set API Keys in the `.env.local` File -![image](https://github.com/user-attachments/assets/7e6a532c-2268-401f-8310-e8d20c731328) +When setting up the application, you will need to add your API keys for the LLMs you wish to use. You can do this by renaming the `.env.example` file to `.env.local` and adding your API keys there. -If you can't see the file indicated above, its likely you can't view hidden files. On Mac, open a Terminal window and enter this command below. On Windows, you will see the hidden files option in File Explorer Settings. A quick Google search will help you if you are stuck here. +- On **Mac**, you can find the file at `[your name]/bolt.diy/.env.example`. +- On **Windows/Linux**, the path will be similar. -``` +If you can't see the file, it's likely because hidden files are not being shown. On **Mac**, open a Terminal window and enter the following command to show hidden files: + +```bash defaults write com.apple.finder AppleShowAllFiles YES ``` -**NOTE**: you only have to set the ones you want to use and Ollama doesn't need an API key because it runs locally on your computer: - -[Get your GROQ API Key here](https://console.groq.com/keys) - -[Get your Open AI API Key by following these instructions](https://help.openai.com/en/articles/4936850-where-do-i-find-my-openai-api-key) - -Get your Anthropic API Key in your [account settings](https://console.anthropic.com/settings/keys) +Make sure to add your API keys for each provider you want to use, for example: ``` GROQ_API_KEY=XXX @@ -82,81 +93,108 @@ OPENAI_API_KEY=XXX ANTHROPIC_API_KEY=XXX ``` -Optionally, you can set the debug level: +Once you've set your keys, you can proceed with running the app. You will set these keys up during the initial setup, and you can revisit and update them later after the app is running. -``` -VITE_LOG_LEVEL=debug -``` +**Note**: Never commit your `.env.local` file to version control. It’s already included in the `.gitignore`. -**Important**: Never commit your `.env.local` file to version control. It's already included in .gitignore. +#### 2. Configure API Keys Directly in the Application -## Run with Docker +Alternatively, you can configure your API keys directly in the application once it's running. To do this: -Prerequisites: +1. Launch the application and navigate to the provider selection dropdown. +2. Select the provider you wish to configure. +3. Click the pencil icon next to the selected provider. +4. Enter your API key in the provided field. -Git and Node.js as mentioned above, as well as Docker: https://www.docker.com/ +This method allows you to easily add or update your keys without needing to modify files directly. -### 1a. Using Helper Scripts +Once you've configured your keys, the application will be ready to use the selected LLMs. -NPM scripts are provided for convenient building: -```bash -# Development build -npm run dockerbuild +--- -# Production build -npm run dockerbuild:prod -``` +## Run the Application -### 1b. Direct Docker Build Commands (alternative to using NPM scripts) +### Option 1: Without Docker -You can use Docker's target feature to specify the build environment instead of using NPM scripts if you wish: +1. **Install Dependencies**: + ```bash + pnpm install + ``` + If `pnpm` is not installed, install it using: + ```bash + sudo npm install -g pnpm + ``` -```bash -# Development build -docker build . --target bolt-ai-development +2. **Start the Application**: + ```bash + pnpm run dev + ``` + This will start the Remix Vite development server. You will need Google Chrome Canary to run this locally if you use Chrome! It's an easy install and a good browser for web development anyway. -# Production build -docker build . --target bolt-ai-production -``` +### Option 2: With Docker -### 2. Docker Compose with Profiles to Run the Container +#### Prerequisites +- Ensure Git, Node.js, and Docker are installed: [Download Docker](https://www.docker.com/) -Use Docker Compose profiles to manage different environments: +#### Steps -```bash -# Development environment -docker-compose --profile development up +1. **Build the Docker Image**: -# Production environment -docker-compose --profile production up -``` + Use the provided NPM scripts: + ```bash + npm run dockerbuild + ``` + + Alternatively, use Docker commands directly: + ```bash + docker build . --target bolt-ai-development + ``` + +2. **Run the Container**: + Use Docker Compose profiles to manage environments: + ```bash + docker-compose --profile development up + ``` -When you run the Docker Compose command with the development profile, any changes you -make on your machine to the code will automatically be reflected in the site running -on the container (i.e. hot reloading still applies!). + - With the development profile, changes to your code will automatically reflect in the running container (hot reloading). --- -## Run Without Docker +### Update Your Local Version to the Latest -1. Install dependencies using Terminal (or CMD in Windows with admin permissions): +To keep your local version of bolt.diy up to date with the latest changes, follow these steps for your operating system: -``` -pnpm install -``` +#### 1. **Navigate to your project folder** + Navigate to the directory where you cloned the repository and open a terminal: -If you get an error saying "command not found: pnpm" or similar, then that means pnpm isn't installed. You can install it via this: +#### 2. **Fetch the Latest Changes** + Use Git to pull the latest changes from the main repository: -``` -sudo npm install -g pnpm -``` + ```bash + git pull origin main + ``` -2. Start the application with the command: +#### 3. **Update Dependencies** + After pulling the latest changes, update the project dependencies by running the following command: -```bash -pnpm run dev -``` + ```bash + pnpm install + ``` + +#### 4. **Rebuild and Start the Application** + + - **If using Docker**, ensure you rebuild the Docker image to avoid using a cached version: + ```bash + docker-compose --profile development up --build + ``` + + - **If not using Docker**, you can start the application as usual with: + ```bash + pnpm run dev + ``` + +This ensures that you're running the latest version of bolt.diy and can take advantage of all the newest features and bug fixes. --- diff --git a/docs/images/api-key-ui-section.png b/docs/images/api-key-ui-section.png new file mode 100644 index 000000000..4dc4a7b56 Binary files /dev/null and b/docs/images/api-key-ui-section.png differ diff --git a/docs/images/bolt-settings-button.png b/docs/images/bolt-settings-button.png new file mode 100644 index 000000000..2a3c55bae Binary files /dev/null and b/docs/images/bolt-settings-button.png differ diff --git a/docs/images/provider-base-url.png b/docs/images/provider-base-url.png new file mode 100644 index 000000000..49e59d48d Binary files /dev/null and b/docs/images/provider-base-url.png differ diff --git a/package.json b/package.json index 8456734dd..05d483b91 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,7 @@ "license": "MIT", "sideEffects": false, "type": "module", - "version": "0.0.2", + "version": "0.0.3", "scripts": { "deploy": "npm run build && wrangler pages deploy", "build": "remix vite:build", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index efec89864..da73295af 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -11957,4 +11957,4 @@ snapshots: zod@3.23.8: {} - zwitch@2.0.4: {} + zwitch@2.0.4: {} \ No newline at end of file diff --git a/pre-start.cjs b/pre-start.cjs index e6b7001ef..cd24d93c4 100644 --- a/pre-start.cjs +++ b/pre-start.cjs @@ -1,4 +1,18 @@ -const { commit } = require('./app/commit.json'); +const { execSync } =require('child_process'); + +// Get git hash with fallback +const getGitHash = () => { + try { + return execSync('git rev-parse --short HEAD').toString().trim(); + } catch { + return 'no-git-info'; + } +}; + +let commitJson = { + hash: JSON.stringify(getGitHash()), + version: JSON.stringify(process.env.npm_package_version), +}; console.log(` β˜…β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β˜… @@ -6,5 +20,7 @@ console.log(` ⚑️ Welcome ⚑️ β˜…β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β˜… `); -console.log('πŸ“ Current Commit Version:', commit); -console.log('β˜…β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β˜…'); \ No newline at end of file +console.log('πŸ“ Current Version Tag:', `v${commitJson.version}`); +console.log('πŸ“ Current Commit Version:', commitJson.hash); +console.log(' Please wait until the URL appears here'); +console.log('β˜…β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β•β˜…'); diff --git a/vite.config.ts b/vite.config.ts index f18b8b934..312230a0a 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -5,8 +5,24 @@ import { nodePolyfills } from 'vite-plugin-node-polyfills'; import { optimizeCssModules } from 'vite-plugin-optimize-css-modules'; import tsconfigPaths from 'vite-tsconfig-paths'; +import { execSync } from 'child_process'; + +// Get git hash with fallback +const getGitHash = () => { + try { + return execSync('git rev-parse --short HEAD').toString().trim(); + } catch { + return 'no-git-info'; + } +}; + + export default defineConfig((config) => { return { + define: { + __COMMIT_HASH: JSON.stringify(getGitHash()), + __APP_VERSION: JSON.stringify(process.env.npm_package_version), + }, build: { target: 'esnext', }, @@ -28,7 +44,7 @@ export default defineConfig((config) => { chrome129IssuePlugin(), config.mode === 'production' && optimizeCssModules({ apply: 'build' }), ], - envPrefix: ["VITE_", "OPENAI_LIKE_API_", "OLLAMA_API_BASE_URL", "LMSTUDIO_API_BASE_URL","TOGETHER_API_BASE_URL"], + envPrefix: ["VITE_","OPENAI_LIKE_API_BASE_URL", "OLLAMA_API_BASE_URL", "LMSTUDIO_API_BASE_URL","TOGETHER_API_BASE_URL"], css: { preprocessorOptions: { scss: { diff --git a/worker-configuration.d.ts b/worker-configuration.d.ts index ed2afcac3..fb5157da6 100644 --- a/worker-configuration.d.ts +++ b/worker-configuration.d.ts @@ -1,4 +1,5 @@ interface Env { + DEFAULT_NUM_CTX:Settings; ANTHROPIC_API_KEY: string; OPENAI_API_KEY: string; GROQ_API_KEY: string;