Skip to content
Merged
Changes from all commits
Commits
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
27 changes: 15 additions & 12 deletions src/routers/organizations/organization-settings-router.ts
Original file line number Diff line number Diff line change
Expand Up @@ -220,20 +220,23 @@ export const organizationsSettingsRouter = createTRPCRouter({
settingsUpdate.provider_deny_list = [...new Set(provider_deny_list)]; // Deduplicate slugs
}

// Check if default_model needs to be cleared
// Check if default_model needs to be cleared when deny lists change
if (
settingsUpdate.model_deny_list !== undefined &&
currentSettings.default_model &&
settingsUpdate.model_deny_list.length > 0
(model_deny_list !== undefined || provider_deny_list !== undefined) &&
currentSettings.default_model
) {
const isAllowed = createAllowPredicateFromDenyList(
settingsUpdate.model_deny_list,
settingsUpdate.provider_deny_list
);

if (!(await isAllowed(currentSettings.default_model))) {
// Clear default_model if it's no longer allowed
settingsUpdate.default_model = undefined;
const effectiveModelDenyList = settingsUpdate.model_deny_list ?? [];
const effectiveProviderDenyList = settingsUpdate.provider_deny_list ?? [];
if (effectiveModelDenyList.length > 0 || effectiveProviderDenyList.length > 0) {
const isAllowed = createAllowPredicateFromDenyList(
effectiveModelDenyList,
effectiveProviderDenyList
);

if (!(await isAllowed(currentSettings.default_model))) {
// Clear default_model if it's no longer allowed
settingsUpdate.default_model = undefined;
}
}
}

Expand Down