Skip to content

fix: support provider-filtered 'all' in CUSTOM_MODELS #6740

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

Open
octo-patch wants to merge 1 commit into
base: main
Choose a base branch
from
+17 −15
Open

fix: support provider-filtered 'all' in CUSTOM_MODELS #6740

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
32 changes: 17 additions & 15 deletions app/utils/model.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,14 +83,18 @@ export function collectModelTable(
m.startsWith("+") || m.startsWith("-") ? m.slice(1) : m;
let [name, displayName] = nameConfig.split("=");

const [customModelName, customProviderName] = getModelProvider(name);

// enable or disable all models
if (name === "all") {
Object.values(modelTable).forEach(
(model) => (model.available = available),
);
// supports optional @provider filter, e.g. "-all@azure" disables only Azure models
if (customModelName === "all") {
Object.values(modelTable).forEach((model) => {
if (!customProviderName || model.provider?.id === customProviderName) {
model.available = available;
}
});
} else {
// 1. find model by name, and set available value
const [customModelName, customProviderName] = getModelProvider(name);
let count = 0;
for (const fullName in modelTable) {
const [modelName, providerName] = getModelProvider(fullName);
Expand All @@ -113,20 +117,18 @@ export function collectModelTable(
}
// 2. if model not exists, create new model with available value
if (count === 0) {
let [customModelName, customProviderName] = getModelProvider(name);
const provider = customProvider(
customProviderName || customModelName,
);
let newModelName = customModelName;
const provider = customProvider(customProviderName || newModelName);
// swap name and displayName for bytedance
if (displayName && provider.providerName == "ByteDance") {
[customModelName, displayName] = [displayName, customModelName];
[newModelName, displayName] = [displayName, newModelName];
}
modelTable[`${customModelName}@${provider?.id}`] = {
name: customModelName,
displayName: displayName || customModelName,
modelTable[`${newModelName}@${provider?.id}`] = {
name: newModelName,
displayName: displayName || newModelName,
available,
provider, // Use optional chaining
sorted: CustomSeq.next(`${customModelName}@${provider?.id}`),
provider,
sorted: CustomSeq.next(`${newModelName}@${provider?.id}`),
};
}
}
Expand Down