diff --git a/ts/cli/config-handler.ts b/ts/cli/config-handler.ts index dea4baa..843a64e 100644 --- a/ts/cli/config-handler.ts +++ b/ts/cli/config-handler.ts @@ -26,11 +26,8 @@ export class ConfigHandler { const configContent = await fs.readFile(configPath, 'utf-8'); const config = JSON.parse(configContent) as IModelGridConfig; const modelConfig = { - registryUrl: config.models.registryUrl || - (config.models as { greenlistUrl?: string }).greenlistUrl || - 'https://list.modelgrid.com/catalog/models.json', - autoDeploy: config.models.autoDeploy ?? - (config.models as { autoPull?: boolean }).autoPull ?? true, + registryUrl: config.models.registryUrl || 'https://list.modelgrid.com/catalog/models.json', + autoDeploy: config.models.autoDeploy ?? true, defaultEngine: config.models.defaultEngine || 'vllm', autoLoad: config.models.autoLoad || [], }; diff --git a/ts/modelgrid.ts b/ts/modelgrid.ts index f001e30..8d2c431 100644 --- a/ts/modelgrid.ts +++ b/ts/modelgrid.ts @@ -295,12 +295,7 @@ export class ModelGrid { } private normalizeConfig( - config: Partial & { - models?: { - greenlistUrl?: string; - autoPull?: boolean; - } & Partial; - }, + config: Partial, ): IModelGridConfig { const filteredContainers = (config.containers || []).filter( (container) => (container as { type?: string }).type !== 'ollama', @@ -333,9 +328,9 @@ export class ModelGrid { }, containers: filteredContainers, models: { - registryUrl: config.models?.registryUrl || config.models?.greenlistUrl || + registryUrl: config.models?.registryUrl || 'https://list.modelgrid.com/catalog/models.json', - autoDeploy: config.models?.autoDeploy ?? config.models?.autoPull ?? true, + autoDeploy: config.models?.autoDeploy ?? true, defaultEngine: 'vllm', autoLoad: config.models?.autoLoad || [], },