mirrors/mcphub
1
0
Fork 0
mirror of https://github.com/samanhappy/mcphub.git synced 2025-12-31 20:00:00 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix: expand environment variables in database and OpenAI configuration (#162)

Browse Source
This commit is contained in:
samanhappy
2025-06-02 19:46:39 +08:00
committed by GitHub
parent ecf79eaef3
commit c1621805de
5 changed files with 258 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/services/mcpService.ts
View File

@@ -9,6 +9,7 @@ import { loadSettings, saveSettings, expandEnvVars, replaceEnvVars } from '../co
import config from '../config/index.js';
import { getGroup } from './sseService.js';
import { getServersInGroup } from './groupService.js';
import { getSmartRoutingConfig } from '../utils/smartRouting.js';
import { saveToolsAsVectorEmbeddings, searchToolsByVector } from './vectorSearchService.js';
const servers: { [sessionId: string]: Server } = {};
@@ -198,9 +199,8 @@ export const initializeClientsFromSettings = (isInit: boolean): ServerInfo[] =>
// Save tools as vector embeddings for search (only when smart routing is enabled)
if (serverInfo.tools.length > 0) {
try {
const settings = loadSettings();
const smartRoutingEnabled = settings.systemConfig?.smartRouting?.enabled || false;
if (smartRoutingEnabled) {
const smartRoutingConfig = getSmartRoutingConfig();
if (smartRoutingConfig.enabled) {
console.log(
`Smart routing enabled - saving vector embeddings for server ${name}`,
);

42
src/services/vectorSearchService.ts
View File

@@ -2,45 +2,17 @@ import { getRepositoryFactory } from '../db/index.js';
import { VectorEmbeddingRepository } from '../db/repositories/index.js';
import { ToolInfo } from '../types/index.js';
import { getAppDataSource, initializeDatabase } from '../db/connection.js';
import { loadSettings } from '../config/index.js';
import { getSmartRoutingConfig } from '../utils/smartRouting.js';
import OpenAI from 'openai';
// Get OpenAI configuration from smartRouting settings or fallback to environment variables
const getOpenAIConfig = () => {
try {
const settings = loadSettings();
const smartRouting = settings.systemConfig?.smartRouting;
return {
apiKey: smartRouting?.openaiApiKey || process.env.OPENAI_API_KEY,
baseURL:
smartRouting?.openaiApiBaseUrl ||
process.env.OPENAI_API_BASE_URL ||
'https://api.openai.com/v1',
embeddingModel:
smartRouting?.openaiApiEmbeddingModel ||
process.env.OPENAI_API_EMBEDDING_MODEL ||
'text-embedding-3-small',
};
} catch (error) {
console.warn(
'Failed to load smartRouting settings, falling back to environment variables:',
error,
);
return {
apiKey: '',
baseURL: 'https://api.openai.com/v1',
embeddingModel: 'text-embedding-3-small',
};
}
};
// Environment variables for embedding configuration
const EMBEDDING_ENV = {
// The embedding model to use - default to OpenAI but allow BAAI/BGE models
MODEL: process.env.EMBEDDING_MODEL || getOpenAIConfig().embeddingModel,
// Detect if using a BGE model from the environment variable
IS_BGE_MODEL: !!(process.env.EMBEDDING_MODEL && process.env.EMBEDDING_MODEL.includes('bge')),
const smartRoutingConfig = getSmartRoutingConfig();
return {
apiKey: smartRoutingConfig.openaiApiKey,
baseURL: smartRoutingConfig.openaiApiBaseUrl,
embeddingModel: smartRoutingConfig.openaiApiEmbeddingModel,
};
};
// Constants for embedding models