Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion webview-ui/src/components/settings/providers/Ollama.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,8 @@ export const Ollama = ({ apiConfiguration, setApiConfigurationField }: OllamaPro
const availableModels = Object.keys(routerModels.data.ollama)
// Show warning if model is not in the list (regardless of how many models there are)
if (!availableModels.includes(selectedModel)) {
return t("settings:validation.modelAvailability", { modelId: selectedModel })
// Use more specific message for Ollama explaining that the model may not support tools
return t("settings:validation.modelMayNotSupportTools", { modelId: selectedModel })
}
}

Expand Down Expand Up @@ -111,6 +112,7 @@ export const Ollama = ({ apiConfiguration, setApiConfigurationField }: OllamaPro
errorMessage={modelNotAvailableError}
hidePricing
/>
<div className="text-xs text-vscode-descriptionForeground">{t("settings:providers.ollama.toolsNote")}</div>
<VSCodeTextField
value={apiConfiguration?.ollamaNumCtx?.toString() || ""}
onInput={(e) => {
Expand Down
6 changes: 4 additions & 2 deletions webview-ui/src/i18n/locales/ca/settings.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 3 additions & 1 deletion webview-ui/src/i18n/locales/de/settings.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 3 additions & 1 deletion webview-ui/src/i18n/locales/en/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -475,7 +475,8 @@
"numCtx": "Context Window Size (num_ctx)",
"numCtxHelp": "Override the model's default context window size. Leave empty to use the model's Modelfile configuration. Minimum value is 128.",
"description": "Ollama allows you to run models locally on your computer. For instructions on how to get started, see their quickstart guide.",
"warning": "Note: Roo Code uses complex prompts and works best with Claude models. Less capable models may not work as expected."
"warning": "Note: Roo Code uses complex prompts and works best with Claude models. Less capable models may not work as expected.",
"toolsNote": "Models that do not support native tool calling are excluded from this list."
},
"unboundApiKey": "Unbound API Key",
"getUnboundApiKey": "Get Unbound API Key",
Expand Down Expand Up @@ -943,6 +944,7 @@
"regionMismatch": "Warning: The region in your ARN ({{arnRegion}}) does not match your selected region ({{region}}). This may cause access issues. The provider will use the region from the ARN."
},
"modelAvailability": "The model ID ({{modelId}}) you provided is not available. Please choose a different model.",
"modelMayNotSupportTools": "The model ID ({{modelId}}) you provided is not in the available models list. This may be because the model does not support native tool calling, which is required for Roo Code.",
"modelDeprecated": "This model is no longer available. Please select a different model.",
"providerNotAllowed": "Provider '{{provider}}' is not allowed by your organization",
"modelNotAllowed": "Model '{{model}}' is not allowed for provider '{{provider}}' by your organization",
Expand Down
6 changes: 4 additions & 2 deletions webview-ui/src/i18n/locales/es/settings.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 4 additions & 2 deletions webview-ui/src/i18n/locales/fr/settings.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 4 additions & 2 deletions webview-ui/src/i18n/locales/hi/settings.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 4 additions & 2 deletions webview-ui/src/i18n/locales/id/settings.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 4 additions & 2 deletions webview-ui/src/i18n/locales/it/settings.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 4 additions & 2 deletions webview-ui/src/i18n/locales/ja/settings.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 4 additions & 2 deletions webview-ui/src/i18n/locales/ko/settings.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading