Andreas/LibreChat
1
0
Fork 0
mirror of https://github.com/danny-avila/LibreChat.git synced 2025-12-16 16:30:15 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

🦙 refactor: Normalize Ollama Config Names (#4657)

Browse source
This commit is contained in:
Danny Avila 2024-11-07 08:26:35 -05:00 • committed by GitHub
parent c27b26cc31
commit d60a0af878
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 17 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

5
api/server/services/Config/loadConfigEndpoints.js
View file

@ -1,6 +1,6 @@
const { EModelEndpoint, extractEnvVariable } = require('librechat-data-provider');
const { isUserProvided, normalizeEndpointName } = require('~/server/utils');
const { getCustomConfig } = require('./getCustomConfig');
const { isUserProvided } = require('~/server/utils');
/**
* Load config endpoints from the cached configuration object
@ -29,7 +29,8 @@ async function loadConfigEndpoints(req) {
for (let i = 0; i < customEndpoints.length; i++) {
const endpoint = customEndpoints[i];
const { baseURL, apiKey, name, iconURL, modelDisplayLabel } = endpoint;
const { baseURL, apiKey, name: configName, iconURL, modelDisplayLabel } = endpoint;
const name = normalizeEndpointName(configName);
const resolvedApiKey = extractEnvVariable(apiKey);
const resolvedBaseURL = extractEnvVariable(baseURL);

11
api/server/services/Config/loadConfigModels.js
View file

@ -1,16 +1,7 @@
const { Providers } = require('@librechat/agents');
const { EModelEndpoint, extractEnvVariable } = require('librechat-data-provider');
const { isUserProvided, normalizeEndpointName } = require('~/server/utils');
const { fetchModels } = require('~/server/services/ModelService');
const { getCustomConfig } = require('./getCustomConfig');
const { isUserProvided } = require('~/server/utils');
/**
* @param {string} name
* @returns {string}
*/
function normalizeEndpointName(name = '') {
return name.toLowerCase() === Providers.OLLAMA ? Providers.OLLAMA : name;
}
/**
* Load config endpoints from the cached configuration object

15
api/server/utils/handleText.js
View file

@ -7,6 +7,7 @@ const {
defaultRetrievalModels,
defaultAssistantsVersion,
} = require('librechat-data-provider');
const { Providers } = require('@librechat/agents');
const { getCitations, citeText } = require('./citations');
const partialRight = require('lodash/partialRight');
const { sendMessage } = require('./streamResponse');
@ -212,13 +213,23 @@ function generateConfig(key, baseURL, endpoint) {
return config;
}
/**
* Normalize the endpoint name to system-expected value.
* @param {string} name
* @returns {string}
*/
function normalizeEndpointName(name = '') {
return name.toLowerCase() === Providers.OLLAMA ? Providers.OLLAMA : name;
}
module.exports = {
createOnProgress,
isEnabled,
handleText,
formatSteps,
formatAction,
addSpaceIfNeeded,
isUserProvided,
generateConfig,
addSpaceIfNeeded,
createOnProgress,
normalizeEndpointName,
};