diff --git a/src/vs/platform/void/common/voidSettingsTypes.ts b/src/vs/platform/void/common/voidSettingsTypes.ts index c704accb..5f02e5d1 100644 --- a/src/vs/platform/void/common/voidSettingsTypes.ts +++ b/src/vs/platform/void/common/voidSettingsTypes.ts @@ -141,11 +141,11 @@ export const defaultProviderSettings = { } } as const - export type ProviderName = keyof typeof defaultProviderSettings export const providerNames = Object.keys(defaultProviderSettings) as ProviderName[] - +export const localProviderNames: ProviderName[] = ['ollama'] // all local names +export const nonlocalProviderNames = providerNames.filter((name) => !localProviderNames.includes(name)) // all non-local names type CustomSettingName = UnionOfKeys type CustomProviderSettings = { @@ -203,7 +203,7 @@ export const displayInfoOfProviderName = (providerName: ProviderName): DisplayIn } else if (providerName === 'openAICompatible') { return { - title: 'OpenAI-Compatible', + title: 'Other', } } else if (providerName === 'gemini') { diff --git a/src/vs/workbench/contrib/void/browser/react/src/markdown/ChatMarkdownRender.tsx b/src/vs/workbench/contrib/void/browser/react/src/markdown/ChatMarkdownRender.tsx index 73c7160d..9a40d646 100644 --- a/src/vs/workbench/contrib/void/browser/react/src/markdown/ChatMarkdownRender.tsx +++ b/src/vs/workbench/contrib/void/browser/react/src/markdown/ChatMarkdownRender.tsx @@ -190,7 +190,7 @@ const RenderToken = ({ token, nested = false }: { token: Token | string, nested? // inline code if (t.type === "codespan") { return ( - + {t.text} ) diff --git a/src/vs/workbench/contrib/void/browser/react/src/void-settings-tsx/Settings.tsx b/src/vs/workbench/contrib/void/browser/react/src/void-settings-tsx/Settings.tsx index f060e066..d4db44cf 100644 --- a/src/vs/workbench/contrib/void/browser/react/src/void-settings-tsx/Settings.tsx +++ b/src/vs/workbench/contrib/void/browser/react/src/void-settings-tsx/Settings.tsx @@ -1,6 +1,6 @@ import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react' import { InputBox } from '../../../../../../../base/browser/ui/inputbox/inputBox.js' -import { ProviderName, SettingName, displayInfoOfSettingName, providerNames, VoidModelInfo, featureFlagNames, displayInfoOfFeatureFlag, customSettingNamesOfProvider, RefreshableProviderName, refreshableProviderNames, displayInfoOfProviderName, defaultProviderSettings } from '../../../../../../../platform/void/common/voidSettingsTypes.js' +import { ProviderName, SettingName, displayInfoOfSettingName, providerNames, VoidModelInfo, featureFlagNames, displayInfoOfFeatureFlag, customSettingNamesOfProvider, RefreshableProviderName, refreshableProviderNames, displayInfoOfProviderName, defaultProviderSettings, nonlocalProviderNames, localProviderNames } from '../../../../../../../platform/void/common/voidSettingsTypes.js' import ErrorBoundary from '../sidebar-tsx/ErrorBoundary.js' import { VoidCheckBox, VoidInputBox, VoidSelectBox, VoidSwitch } from '../util/inputs.js' import { useAccessor, useIsDark, useRefreshModelListener, useRefreshModelState, useSettingsState } from '../util/services.js' @@ -219,7 +219,7 @@ export const ModelDump = () => { const ProviderSetting = ({ providerName, settingName }: { providerName: ProviderName, settingName: SettingName }) => { - const { title: providerTitle, } = displayInfoOfProviderName(providerName) + // const { title: providerTitle, } = displayInfoOfProviderName(providerName) const { title: settingTitle, placeholder, subTextMd } = displayInfoOfSettingName(providerName, settingName) @@ -231,7 +231,8 @@ const ProviderSetting = ({ providerName, settingName }: { providerName: Provider return
{ if (weChangedTextRef) return voidSettingsService.setSettingOfProvider(providerName, settingName, newVal) @@ -315,7 +316,7 @@ const SettingsForProvider = ({ providerName }: { providerName: ProviderName }) = } -export const VoidProviderSettings = () => { +export const VoidProviderSettings = ({ providerNames }: { providerNames: ProviderName[] }) => { return <> {providerNames.map(providerName => @@ -406,12 +407,29 @@ export const Settings = () => {
-

Providers

+

Local Providers

+

{`Keep your data private by hosting AI locally on your computer.`}

+

{`Instructions:`}

+
+

+

+

+

+

+ {/* TODO we should create UI for downloading models without user going into terminal */} +
+ - + -

Models

+

More Providers

+

{`Access models like ChatGPT and Claude. We recommend using Anthropic or OpenAI as providers, or Groq as a faster alternative.`}

+ + + + +

Models

diff --git a/src/vs/workbench/contrib/void/browser/react/tailwind.config.js b/src/vs/workbench/contrib/void/browser/react/tailwind.config.js index 972d9b18..9d488e83 100644 --- a/src/vs/workbench/contrib/void/browser/react/tailwind.config.js +++ b/src/vs/workbench/contrib/void/browser/react/tailwind.config.js @@ -103,6 +103,10 @@ module.exports = { // other colors (these are partially complete) + // text formatting + "text-preformat-bg": "var(--vscode-textPreformat-background)", + "text-preformat-fg": "var(--vscode-textPreformat-foreground)", + // editor colors "editor-bg": "var(--vscode-editor-background)", "editor-fg": "var(--vscode-editor-foreground)",