lzt404
492aa75e81
- Align model management with Management Center by separating model viewing, account exclusions, and provider-wide exclusions - Read and update excluded_models per credential without affecting other accounts - Make checked models represent exclusions and support manual wildcard rules - Limit Select All to candidate models and preserve wildcard and off-list rules when clearing selections - Allow rule editing when the model list is empty or unavailable, including removal of wildcard bans - Update translations and add regression coverage for account isolation and rule persistence
82 lines
3.0 KiB
TypeScript
82 lines
3.0 KiB
TypeScript
import { isRecord, readString } from './managementApi';
|
|
|
|
export type OAuthModelDefinition = {
|
|
id: string;
|
|
displayName?: string;
|
|
};
|
|
|
|
export const oauthModelsFromPayload = (payload: unknown): OAuthModelDefinition[] => {
|
|
if (!isRecord(payload) || !Array.isArray(payload.models)) return [];
|
|
const seen = new Set<string>();
|
|
return payload.models.flatMap((item) => {
|
|
if (!isRecord(item)) return [];
|
|
const id = readString(item, 'id', 'name');
|
|
const key = id.toLowerCase();
|
|
if (!id || seen.has(key)) return [];
|
|
seen.add(key);
|
|
const displayName = readString(item, 'display_name', 'displayName');
|
|
return [{ id, displayName: displayName && displayName !== id ? displayName : undefined }];
|
|
});
|
|
};
|
|
|
|
export const oauthExcludedRulesFromPayload = (payload: unknown, provider: string): string[] => {
|
|
if (!isRecord(payload)) return [];
|
|
const source = isRecord(payload['oauth-excluded-models'])
|
|
? payload['oauth-excluded-models']
|
|
: payload;
|
|
const value = source[provider.trim().toLowerCase()];
|
|
if (!Array.isArray(value)) return [];
|
|
return value
|
|
.map(String)
|
|
.map((rule) => rule.trim().toLowerCase())
|
|
.filter((rule, index, rules) => rule && rules.indexOf(rule) === index);
|
|
};
|
|
|
|
const wildcardPattern = (rule: string) => new RegExp(
|
|
`^${rule.replace(/[.+?^${}()|[\]\\]/g, '\\$&').replace(/\*/g, '.*')}$`,
|
|
'i',
|
|
);
|
|
|
|
export const modelMatchesRule = (modelId: string, rule: string) => {
|
|
const normalizedRule = rule.trim();
|
|
if (!normalizedRule) return false;
|
|
return wildcardPattern(normalizedRule).test(modelId.trim());
|
|
};
|
|
|
|
export const openOAuthModelNames = (
|
|
models: OAuthModelDefinition[],
|
|
excludedRules: Iterable<string>,
|
|
) => {
|
|
const rules = Array.from(excludedRules, (rule) => rule.trim()).filter(Boolean);
|
|
return new Set(
|
|
models
|
|
.filter((model) => !rules.some((rule) => modelMatchesRule(model.id, rule)))
|
|
.map((model) => model.id.toLowerCase()),
|
|
);
|
|
};
|
|
|
|
export const normalizeOAuthExcludedRules = (rules: Iterable<string>): string[] =>
|
|
[...new Set(Array.from(rules, (rule) => rule.trim().toLowerCase()).filter(Boolean))];
|
|
|
|
export const oauthModelCandidates = (
|
|
models: OAuthModelDefinition[],
|
|
rules: Iterable<string>,
|
|
): OAuthModelDefinition[] => {
|
|
const candidates = new Map(models.map((model) => [model.id.toLowerCase(), model]));
|
|
for (const rule of normalizeOAuthExcludedRules(rules)) {
|
|
if (!rule.includes('*') && !candidates.has(rule)) candidates.set(rule, { id: rule });
|
|
}
|
|
return [...candidates.values()].sort((left, right) => left.id.localeCompare(right.id));
|
|
};
|
|
|
|
export const setOAuthModelsExcluded = (
|
|
rules: Iterable<string>,
|
|
models: OAuthModelDefinition[],
|
|
excluded: boolean,
|
|
): string[] => {
|
|
const normalized = normalizeOAuthExcludedRules(rules);
|
|
if (excluded) return normalizeOAuthExcludedRules([...normalized, ...models.map((model) => model.id)]);
|
|
const modelIds = new Set(models.map((model) => model.id.toLowerCase()));
|
|
return normalized.filter((rule) => rule.includes('*') || !modelIds.has(rule));
|
|
};
|