michael/merlyn
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit from fork

Browse Source
This commit is contained in:
Timothy Carambat 2025-05-07 09:37:31 -07:00 committed by GitHub
parent 684ddc6453
commit f0104fe1a9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
frontend/src/components/LLMSelection/OllamaLLMOptions/index.jsx
View File

@ -19,7 +19,6 @@ export default function OllamaLLMOptions({ settings }) {
} = useProviderEndpointAutoDiscovery({
provider: "ollama",
initialBasePath: settings?.OllamaLLMBasePath,
initialAuthToken: settings?.OllamaLLMAuthToken,
ENDPOINTS: OLLAMA_COMMON_URLS,
});
const [performanceMode, setPerformanceMode] = useState(
@ -209,6 +208,9 @@ export default function OllamaLLMOptions({ settings }) {
name="OllamaLLMAuthToken"
className="border-none bg-theme-settings-input-bg mt-2 text-white placeholder:text-theme-settings-input-placeholder text-sm rounded-lg outline-none block w-full p-2.5"
placeholder="Ollama Auth Token"
defaultValue={
settings?.OllamaLLMAuthToken ? "*".repeat(20) : ""
}
value={authTokenValue.value}
onChange={authToken.onChange}
onBlur={authToken.onBlur}

2
server/models/systemSettings.js
View File

@ -467,12 +467,12 @@ const SystemSettings = {
LocalAiTokenLimit: process.env.LOCAL_AI_MODEL_TOKEN_LIMIT,
// Ollama LLM Keys
OllamaLLMAuthToken: !!process.env.OLLAMA_AUTH_TOKEN,
OllamaLLMBasePath: process.env.OLLAMA_BASE_PATH,
OllamaLLMModelPref: process.env.OLLAMA_MODEL_PREF,
OllamaLLMTokenLimit: process.env.OLLAMA_MODEL_TOKEN_LIMIT,
OllamaLLMKeepAliveSeconds: process.env.OLLAMA_KEEP_ALIVE_TIMEOUT ?? 300,
OllamaLLMPerformanceMode: process.env.OLLAMA_PERFORMANCE_MODE ?? "base",
OllamaLLMAuthToken: process.env.OLLAMA_AUTH_TOKEN ?? null,
// Novita LLM Keys
NovitaLLMApiKey: !!process.env.NOVITA_LLM_API_KEY,