Skip to content

Refactor filtered model alias snapshots #8818

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lpcox merged 2 commits into from
Sep 21, 2026
Merged

Refactor filtered model alias snapshots #8818

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c115654
Initial plan
Copilot Sep 20, 2026
0a99efc
refactor: share filtered model alias snapshots
Copilot Sep 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
62 changes: 28 additions & 34 deletions containers/api-proxy/server.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,31 @@ configureKeyValidation({
getModelAliases: () => MODEL_ALIASES,
});

function getFilteredModelAliases() {
if (!MODEL_ALIASES) return null;
const configuredProviders = getConfiguredModelCacheKeys();
return {
models: filterResolvableAliases(
MODEL_ALIASES.models,
filterAvailableModelsToConfiguredProviders(cachedModels, configuredProviders),
configuredProviders,
),
};
}

function buildModelsSnapshot() {
const filteredAliases = getFilteredModelAliases();
return {
filteredAliases,
modelsJson: _buildModelsJson(
registeredAdapters,
cachedModels,
filteredAliases,
getRuntimeCatalogSnapshot(),
),
};
}

const { healthResponse, reflectEndpoints, handleManagementEndpoint } = createManagementHandlers({
getAdapters: () => registeredAdapters,
getCachedModels: () => cachedModels,
Expand All @@ -144,17 +169,7 @@ const { healthResponse, reflectEndpoints, handleManagementEndpoint } = createMan
getKeyValidationState: () => ({ complete: isKeyValidationComplete(), results: keyValidationResults }),
getLimiter: () => limiter,
httpsProxy: HTTPS_PROXY,
getModelAliases: () => {
if (!MODEL_ALIASES) return null;
const configuredProviders = getConfiguredModelCacheKeys();
return {
models: filterResolvableAliases(
MODEL_ALIASES.models,
filterAvailableModelsToConfiguredProviders(cachedModels, configuredProviders),
configuredProviders,
),
};
},
getModelAliases: getFilteredModelAliases,
getModelFallback: () => MODEL_FALLBACK,
getEffectiveModelFallback: () => getEffectiveModelFallbackForReflect(registeredAdapters),
getEffectiveTokenUsage: () => getEffectiveTokenReflectState(),
Expand All @@ -165,32 +180,11 @@ const { healthResponse, reflectEndpoints, handleManagementEndpoint } = createMan
});

function buildModelsJson() {
const configuredProviders = getConfiguredModelCacheKeys();
const filteredAliases = MODEL_ALIASES ? {
models: filterResolvableAliases(
MODEL_ALIASES.models,
filterAvailableModelsToConfiguredProviders(cachedModels, configuredProviders),
configuredProviders,
),
} : null;
return _buildModelsJson(registeredAdapters, cachedModels, filteredAliases, getRuntimeCatalogSnapshot());
return buildModelsSnapshot().modelsJson;
}

function writeModelsJson(logDir) {
const configuredProviders = getConfiguredModelCacheKeys();
const filteredAliases = MODEL_ALIASES ? {
models: filterResolvableAliases(
MODEL_ALIASES.models,
filterAvailableModelsToConfiguredProviders(cachedModels, configuredProviders),
configuredProviders,
),
} : null;
const modelsJson = _buildModelsJson(
registeredAdapters,
cachedModels,
filteredAliases,
getRuntimeCatalogSnapshot(),
);
const { filteredAliases, modelsJson } = buildModelsSnapshot();
return _writeModelsJson(registeredAdapters, cachedModels, filteredAliases, logDir, modelsJson);
}

Expand Down
30 changes: 30 additions & 0 deletions containers/api-proxy/server.models.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -603,6 +603,36 @@ describe('writeModelsJson', () => {
expect(data).toHaveProperty('model_aliases');
});

it('should persist the same filtered aliases as the in-memory snapshot', () => {
const previousAliases = process.env.AWF_MODEL_ALIASES;
const previousOpenAiKey = process.env.OPENAI_API_KEY;
process.env.AWF_MODEL_ALIASES = JSON.stringify({
models: {
available: ['openai/gpt-4o'],
unavailable: ['openai/gpt-5'],
},
});
process.env.OPENAI_API_KEY = 'test-key';

try {
let isolatedServer;
jest.isolateModules(() => { isolatedServer = require('./server'); });
isolatedServer.cachedModels.openai = ['gpt-4o'];

const snapshot = isolatedServer.buildModelsJson();
isolatedServer.writeModelsJson(tmpDir);
const persisted = JSON.parse(fs.readFileSync(path.join(tmpDir, 'models.json'), 'utf8'));

expect(persisted.model_aliases).toEqual(snapshot.model_aliases);
expect(persisted.model_aliases).toEqual({ available: ['openai/gpt-4o'] });
} finally {
if (previousAliases === undefined) delete process.env.AWF_MODEL_ALIASES;
else process.env.AWF_MODEL_ALIASES = previousAliases;
if (previousOpenAiKey === undefined) delete process.env.OPENAI_API_KEY;
else process.env.OPENAI_API_KEY = previousOpenAiKey;
}
});

it('should create the directory if it does not exist', () => {
const nestedDir = path.join(tmpDir, 'sub', 'dir');
writeModelsJson(nestedDir);
Expand Down
Loading