codacus commited on
Commit
c3c9e43
·
unverified ·
2 Parent(s): bc6b848 960f532

Merge branch 'main' into fix-variable-name

Browse files
app/commit.json CHANGED
@@ -1 +1 @@
1
- { "commit": "885e104f279ab8b63d31e0759cbb675c2a409cc5" }
 
1
+ { "commit": "6ba93974a02a98c83badf2f0002ff4812b8f75a9" }
app/components/settings/providers/ProvidersTab.tsx CHANGED
@@ -6,7 +6,7 @@ import type { IProviderConfig } from '~/types/model';
6
  import { logStore } from '~/lib/stores/logs';
7
 
8
  // Import a default fallback icon
9
- import DefaultIcon from '/icons/Ollama.svg'; // Adjust the path as necessary
10
 
11
  export default function ProvidersTab() {
12
  const { providers, updateProviderSettings, isLocalModel } = useSettings();
 
6
  import { logStore } from '~/lib/stores/logs';
7
 
8
  // Import a default fallback icon
9
+ import DefaultIcon from '/icons/Default.svg'; // Adjust the path as necessary
10
 
11
  export default function ProvidersTab() {
12
  const { providers, updateProviderSettings, isLocalModel } = useSettings();
app/utils/constants.ts CHANGED
@@ -499,8 +499,6 @@ async function getLMStudioModels(_apiKeys?: Record<string, string>, settings?: I
499
  }));
500
  } catch (e: any) {
501
  logStore.logError('Failed to get LMStudio models', e, { baseUrl: settings?.baseUrl });
502
- logger.warn('Failed to get LMStudio models: ', e.message || '');
503
-
504
  return [];
505
  }
506
  }
 
499
  }));
500
  } catch (e: any) {
501
  logStore.logError('Failed to get LMStudio models', e, { baseUrl: settings?.baseUrl });
 
 
502
  return [];
503
  }
504
  }
docs/docs/CONTRIBUTING.md CHANGED
@@ -8,10 +8,14 @@
8
  - [Development Setup](#development-setup)
9
  - [Deploymnt with Docker](#docker-deployment-documentation)
10
 
 
 
11
  ## Code of Conduct
12
 
13
  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.
14
 
 
 
15
  ## How Can I Contribute?
16
 
17
  ### 🐞 Reporting Bugs and Feature Requests
@@ -29,6 +33,8 @@ This project and everyone participating in it is governed by our Code of Conduct
29
  ### ✨ Becoming a Core Contributor
30
  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).
31
 
 
 
32
  ## Pull Request Guidelines
33
 
34
  ### 📝 PR Checklist
@@ -43,6 +49,8 @@ We're looking for dedicated contributors to help maintain and grow this project.
43
  3. Address all review comments
44
  4. Maintain clean commit history
45
 
 
 
46
  ## Coding Standards
47
 
48
  ### 💻 General Guidelines
@@ -51,6 +59,8 @@ We're looking for dedicated contributors to help maintain and grow this project.
51
  - Keep functions focused and small
52
  - Use meaningful variable names
53
 
 
 
54
  ## Development Setup
55
 
56
  ### 🔄 Initial Setup
@@ -100,6 +110,8 @@ pnpm run dev
100
 
101
  **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.
102
 
 
 
103
  ## Testing
104
 
105
  Run the test suite with:
@@ -108,6 +120,8 @@ Run the test suite with:
108
  pnpm test
109
  ```
110
 
 
 
111
  ## Deployment
112
 
113
  To deploy the application to Cloudflare Pages:
@@ -118,6 +132,8 @@ pnpm run deploy
118
 
119
  Make sure you have the necessary permissions and Wrangler is correctly configured for your Cloudflare account.
120
 
 
 
121
  # Docker Deployment Documentation
122
 
123
  This guide outlines various methods for building and deploying the application using Docker.
@@ -160,6 +176,8 @@ docker-compose --profile development up
160
  docker-compose --profile production up
161
  ```
162
 
 
 
163
  ## Running the Application
164
 
165
  After building using any of the methods above, run the container with:
@@ -172,6 +190,8 @@ docker run -p 5173:5173 --env-file .env.local bolt-ai:development
172
  docker run -p 5173:5173 --env-file .env.local bolt-ai:production
173
  ```
174
 
 
 
175
  ## Deployment with Coolify
176
 
177
  [Coolify](https://github.com/coollabsio/coolify) provides a straightforward deployment process:
@@ -189,6 +209,8 @@ docker run -p 5173:5173 --env-file .env.local bolt-ai:production
189
  - Adjust other environment variables as needed
190
  7. Deploy the application
191
 
 
 
192
  ## VS Code Integration
193
 
194
  The `docker-compose.yaml` configuration is compatible with VS Code dev containers:
@@ -197,6 +219,8 @@ The `docker-compose.yaml` configuration is compatible with VS Code dev container
197
  2. Select the dev container configuration
198
  3. Choose the "development" profile from the context menu
199
 
 
 
200
  ## Environment Files
201
 
202
  Ensure you have the appropriate `.env.local` file configured before running the containers. This file should contain:
@@ -204,12 +228,16 @@ Ensure you have the appropriate `.env.local` file configured before running the
204
  - Environment-specific configurations
205
  - Other required environment variables
206
 
 
 
207
  ## DEFAULT_NUM_CTX
208
 
209
  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.
210
 
211
  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.
212
 
 
 
213
  ## Notes
214
 
215
  - Port 5173 is exposed and mapped for both development and production environments
 
8
  - [Development Setup](#development-setup)
9
  - [Deploymnt with Docker](#docker-deployment-documentation)
10
 
11
+ ---
12
+
13
  ## Code of Conduct
14
 
15
  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.
16
 
17
+ ---
18
+
19
  ## How Can I Contribute?
20
 
21
  ### 🐞 Reporting Bugs and Feature Requests
 
33
  ### ✨ Becoming a Core Contributor
34
  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).
35
 
36
+ ---
37
+
38
  ## Pull Request Guidelines
39
 
40
  ### 📝 PR Checklist
 
49
  3. Address all review comments
50
  4. Maintain clean commit history
51
 
52
+ ---
53
+
54
  ## Coding Standards
55
 
56
  ### 💻 General Guidelines
 
59
  - Keep functions focused and small
60
  - Use meaningful variable names
61
 
62
+ ---
63
+
64
  ## Development Setup
65
 
66
  ### 🔄 Initial Setup
 
110
 
111
  **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.
112
 
113
+ ---
114
+
115
  ## Testing
116
 
117
  Run the test suite with:
 
120
  pnpm test
121
  ```
122
 
123
+ ---
124
+
125
  ## Deployment
126
 
127
  To deploy the application to Cloudflare Pages:
 
132
 
133
  Make sure you have the necessary permissions and Wrangler is correctly configured for your Cloudflare account.
134
 
135
+ ---
136
+
137
  # Docker Deployment Documentation
138
 
139
  This guide outlines various methods for building and deploying the application using Docker.
 
176
  docker-compose --profile production up
177
  ```
178
 
179
+ ---
180
+
181
  ## Running the Application
182
 
183
  After building using any of the methods above, run the container with:
 
190
  docker run -p 5173:5173 --env-file .env.local bolt-ai:production
191
  ```
192
 
193
+ ---
194
+
195
  ## Deployment with Coolify
196
 
197
  [Coolify](https://github.com/coollabsio/coolify) provides a straightforward deployment process:
 
209
  - Adjust other environment variables as needed
210
  7. Deploy the application
211
 
212
+ ---
213
+
214
  ## VS Code Integration
215
 
216
  The `docker-compose.yaml` configuration is compatible with VS Code dev containers:
 
219
  2. Select the dev container configuration
220
  3. Choose the "development" profile from the context menu
221
 
222
+ ---
223
+
224
  ## Environment Files
225
 
226
  Ensure you have the appropriate `.env.local` file configured before running the containers. This file should contain:
 
228
  - Environment-specific configurations
229
  - Other required environment variables
230
 
231
+ ---
232
+
233
  ## DEFAULT_NUM_CTX
234
 
235
  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.
236
 
237
  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.
238
 
239
+ ---
240
+
241
  ## Notes
242
 
243
  - Port 5173 is exposed and mapped for both development and production environments
docs/docs/FAQ.md CHANGED
@@ -23,7 +23,6 @@ Check out our [Contribution Guide](CONTRIBUTING.md) for more details on how to g
23
 
24
  ---
25
 
26
-
27
  ## What are the future plans for bolt.diy?
28
 
29
  Visit our [Roadmap](https://roadmap.sh/r/ottodev-roadmap-2ovzo) for the latest updates.
 
23
 
24
  ---
25
 
 
26
  ## What are the future plans for bolt.diy?
27
 
28
  Visit our [Roadmap](https://roadmap.sh/r/ottodev-roadmap-2ovzo) for the latest updates.
docs/docs/index.md CHANGED
@@ -1,14 +1,20 @@
1
  # Welcome to bolt diy
2
  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.
3
 
4
- Join the community!
5
 
6
- https://thinktank.ottomator.ai
 
 
 
 
7
 
8
  ## Whats bolt.diy
9
 
10
  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)
11
 
 
 
12
  ## What Makes bolt.diy Different
13
 
14
  Claude, v0, etc are incredible- but you can't install packages, run backends, or edit code. That’s where bolt.diy stands out:
@@ -26,13 +32,15 @@ Whether you’re an experienced developer, a PM, or a designer, bolt.diy allows
26
 
27
  For developers interested in building their own AI-powered development tools with WebContainers, check out the open-source Bolt codebase in this repo!
28
 
 
 
29
  ## Setup
30
 
31
  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.
32
 
33
- 1. Install Git from https://git-scm.com/downloads
34
 
35
- 2. Install Node.js from https://nodejs.org/en/download/
36
 
37
  Pay attention to the installer notes after completion.
38
 
@@ -62,11 +70,11 @@ defaults write com.apple.finder AppleShowAllFiles YES
62
 
63
  **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:
64
 
65
- Get your GROQ API Key here: https://console.groq.com/keys
66
 
67
- 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
68
 
69
- Get your Anthropic API Key in your account settings: https://console.anthropic.com/settings/keys
70
 
71
  ```
72
  GROQ_API_KEY=XXX
@@ -128,6 +136,8 @@ When you run the Docker Compose command with the development profile, any change
128
  make on your machine to the code will automatically be reflected in the site running
129
  on the container (i.e. hot reloading still applies!).
130
 
 
 
131
  ## Run Without Docker
132
 
133
  1. Install dependencies using Terminal (or CMD in Windows with admin permissions):
@@ -148,6 +158,8 @@ sudo npm install -g pnpm
148
  pnpm run dev
149
  ```
150
 
 
 
151
  ## Adding New LLMs:
152
 
153
  To make new LLMs available to use in this version of bolt.diy, 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.
@@ -156,6 +168,8 @@ By default, Anthropic, OpenAI, Groq, and Ollama are implemented as providers, bu
156
 
157
  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!
158
 
 
 
159
  ## Available Scripts
160
 
161
  - `pnpm run dev`: Starts the development server.
@@ -167,6 +181,8 @@ When you add a new model to the MODEL_LIST array, it will immediately be availab
167
  - `pnpm run typegen`: Generates TypeScript types using Wrangler.
168
  - `pnpm run deploy`: Builds the project and deploys it to Cloudflare Pages.
169
 
 
 
170
  ## Development
171
 
172
  To start the development server:
@@ -177,6 +193,8 @@ pnpm run dev
177
 
178
  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.
179
 
 
 
180
  ## Tips and Tricks
181
 
182
  Here are some tips to get the most out of bolt.diy:
 
1
  # Welcome to bolt diy
2
  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.
3
 
4
+ ---
5
 
6
+ ## Join the community!
7
+
8
+ [Join the community!](https://thinktank.ottomator.ai)
9
+
10
+ ---
11
 
12
  ## Whats bolt.diy
13
 
14
  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)
15
 
16
+ ---
17
+
18
  ## What Makes bolt.diy Different
19
 
20
  Claude, v0, etc are incredible- but you can't install packages, run backends, or edit code. That’s where bolt.diy stands out:
 
32
 
33
  For developers interested in building their own AI-powered development tools with WebContainers, check out the open-source Bolt codebase in this repo!
34
 
35
+ ---
36
+
37
  ## Setup
38
 
39
  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.
40
 
41
+ 1. [Install Git from](https://git-scm.com/downloads)
42
 
43
+ 2. [Install Node.js from](https://nodejs.org/en/download/)
44
 
45
  Pay attention to the installer notes after completion.
46
 
 
70
 
71
  **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:
72
 
73
+ [Get your GROQ API Key here](https://console.groq.com/keys)
74
 
75
+ [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)
76
 
77
+ Get your Anthropic API Key in your [account settings](https://console.anthropic.com/settings/keys)
78
 
79
  ```
80
  GROQ_API_KEY=XXX
 
136
  make on your machine to the code will automatically be reflected in the site running
137
  on the container (i.e. hot reloading still applies!).
138
 
139
+ ---
140
+
141
  ## Run Without Docker
142
 
143
  1. Install dependencies using Terminal (or CMD in Windows with admin permissions):
 
158
  pnpm run dev
159
  ```
160
 
161
+ ---
162
+
163
  ## Adding New LLMs:
164
 
165
  To make new LLMs available to use in this version of bolt.diy, 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.
 
168
 
169
  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!
170
 
171
+ ---
172
+
173
  ## Available Scripts
174
 
175
  - `pnpm run dev`: Starts the development server.
 
181
  - `pnpm run typegen`: Generates TypeScript types using Wrangler.
182
  - `pnpm run deploy`: Builds the project and deploys it to Cloudflare Pages.
183
 
184
+ ---
185
+
186
  ## Development
187
 
188
  To start the development server:
 
193
 
194
  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.
195
 
196
+ ---
197
+
198
  ## Tips and Tricks
199
 
200
  Here are some tips to get the most out of bolt.diy:
docs/mkdocs.yml CHANGED
@@ -1,4 +1,4 @@
1
- site_name: Bolt.diy Docs
2
  site_dir: ../site
3
  theme:
4
  name: material
@@ -31,7 +31,7 @@ theme:
31
  repo: fontawesome/brands/github
32
  # logo: assets/logo.png
33
  # favicon: assets/logo.png
34
- repo_name: Bolt.diy
35
  repo_url: https://github.com/stackblitz-labs/bolt.diy
36
  edit_uri: ""
37
 
@@ -40,16 +40,16 @@ extra:
40
  social:
41
  - icon: fontawesome/brands/github
42
  link: https://github.com/stackblitz-labs/bolt.diy
43
- name: Bolt.diy
44
  - icon: fontawesome/brands/discourse
45
  link: https://thinktank.ottomator.ai/
46
- name: Bolt.diy Discourse
47
  - icon: fontawesome/brands/x-twitter
48
  link: https://x.com/bolt_diy
49
- name: Bolt.diy on X
50
  - icon: fontawesome/brands/bluesky
51
  link: https://bsky.app/profile/bolt.diy
52
- name: Bolt.diy on Bluesky
53
 
54
 
55
 
 
1
+ site_name: bolt.diy Docs
2
  site_dir: ../site
3
  theme:
4
  name: material
 
31
  repo: fontawesome/brands/github
32
  # logo: assets/logo.png
33
  # favicon: assets/logo.png
34
+ repo_name: bolt.diy
35
  repo_url: https://github.com/stackblitz-labs/bolt.diy
36
  edit_uri: ""
37
 
 
40
  social:
41
  - icon: fontawesome/brands/github
42
  link: https://github.com/stackblitz-labs/bolt.diy
43
+ name: bolt.diy
44
  - icon: fontawesome/brands/discourse
45
  link: https://thinktank.ottomator.ai/
46
+ name: bolt.diy Discourse
47
  - icon: fontawesome/brands/x-twitter
48
  link: https://x.com/bolt_diy
49
+ name: bolt.diy on X
50
  - icon: fontawesome/brands/bluesky
51
  link: https://bsky.app/profile/bolt.diy
52
+ name: bolt.diy on Bluesky
53
 
54
 
55
 
public/favicon.ico ADDED
public/icons/Default.svg ADDED
vite.config.ts CHANGED
@@ -19,7 +19,8 @@ export default defineConfig((config) => {
19
  future: {
20
  v3_fetcherPersist: true,
21
  v3_relativeSplatPath: true,
22
- v3_throwAbortReason: true
 
23
  },
24
  }),
25
  UnoCSS(),
 
19
  future: {
20
  v3_fetcherPersist: true,
21
  v3_relativeSplatPath: true,
22
+ v3_throwAbortReason: true,
23
+ v3_lazyRouteDiscovery: true
24
  },
25
  }),
26
  UnoCSS(),