refactor(config): remove legacy model config aliases
This commit is contained in:
@@ -26,11 +26,8 @@ export class ConfigHandler {
|
|||||||
const configContent = await fs.readFile(configPath, 'utf-8');
|
const configContent = await fs.readFile(configPath, 'utf-8');
|
||||||
const config = JSON.parse(configContent) as IModelGridConfig;
|
const config = JSON.parse(configContent) as IModelGridConfig;
|
||||||
const modelConfig = {
|
const modelConfig = {
|
||||||
registryUrl: config.models.registryUrl ||
|
registryUrl: config.models.registryUrl || 'https://list.modelgrid.com/catalog/models.json',
|
||||||
(config.models as { greenlistUrl?: string }).greenlistUrl ||
|
autoDeploy: config.models.autoDeploy ?? true,
|
||||||
'https://list.modelgrid.com/catalog/models.json',
|
|
||||||
autoDeploy: config.models.autoDeploy ??
|
|
||||||
(config.models as { autoPull?: boolean }).autoPull ?? true,
|
|
||||||
defaultEngine: config.models.defaultEngine || 'vllm',
|
defaultEngine: config.models.defaultEngine || 'vllm',
|
||||||
autoLoad: config.models.autoLoad || [],
|
autoLoad: config.models.autoLoad || [],
|
||||||
};
|
};
|
||||||
|
|||||||
+3
-8
@@ -295,12 +295,7 @@ export class ModelGrid {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private normalizeConfig(
|
private normalizeConfig(
|
||||||
config: Partial<IModelGridConfig> & {
|
config: Partial<IModelGridConfig>,
|
||||||
models?: {
|
|
||||||
greenlistUrl?: string;
|
|
||||||
autoPull?: boolean;
|
|
||||||
} & Partial<IModelGridConfig['models']>;
|
|
||||||
},
|
|
||||||
): IModelGridConfig {
|
): IModelGridConfig {
|
||||||
const filteredContainers = (config.containers || []).filter(
|
const filteredContainers = (config.containers || []).filter(
|
||||||
(container) => (container as { type?: string }).type !== 'ollama',
|
(container) => (container as { type?: string }).type !== 'ollama',
|
||||||
@@ -333,9 +328,9 @@ export class ModelGrid {
|
|||||||
},
|
},
|
||||||
containers: filteredContainers,
|
containers: filteredContainers,
|
||||||
models: {
|
models: {
|
||||||
registryUrl: config.models?.registryUrl || config.models?.greenlistUrl ||
|
registryUrl: config.models?.registryUrl ||
|
||||||
'https://list.modelgrid.com/catalog/models.json',
|
'https://list.modelgrid.com/catalog/models.json',
|
||||||
autoDeploy: config.models?.autoDeploy ?? config.models?.autoPull ?? true,
|
autoDeploy: config.models?.autoDeploy ?? true,
|
||||||
defaultEngine: 'vllm',
|
defaultEngine: 'vllm',
|
||||||
autoLoad: config.models?.autoLoad || [],
|
autoLoad: config.models?.autoLoad || [],
|
||||||
},
|
},
|
||||||
|
|||||||
Reference in New Issue
Block a user