Skip to content
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

✨ feat: 调整模型列表，将自定义模型放在前面显示 #5180

Merged
merged 4 commits into from
Aug 5, 2024
Merged

✨ feat: 调整模型列表，将自定义模型放在前面显示 #5180

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8a4b8a8
✨ feat: 调整模型列表，将自定义模型放在前面显示
frostime Aug 3, 2024
b023a00
🔨 refactor(model): 更改原先的实现方法，在 collect table 函数后面增加额外的 sort 处理
frostime Aug 5, 2024
150fc84
✨ feat(model): 增加 sorted 字段，并使用该字段对模型列表进行排序
frostime Aug 5, 2024
3486954
🐛 fix(openai): 上次 commit 后 openai.ts 文件中出现类型不匹配的 bug
frostime Aug 5, 2024
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
25 changes: 14 additions & 11 deletions app/utils/model.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,6 @@ export function collectModelTable(
}
> = {};

// default models
models.forEach((m) => {
// using <modelName>@<providerId> as fullName
modelTable[`${m.name}@${m?.provider?.id}`] = {
...m,
displayName: m.name, // 'provider' is copied over if it exists
};
});

// server custom models
customModels
.split(",")
Expand Down Expand Up @@ -89,6 +80,15 @@ export function collectModelTable(
}
});

// default models
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

简单的把这个default models移到后面，可能会有一些逻辑上的问题。
正确的处理方法，应该是不更改这里的逻辑，而是在 collectModels函数中Object.values后面引入一个排序逻辑

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

好的，我在新的 commit (b023) 中，去掉了之前的实现方式；并按照你的建议，在 collect 函数后面增加了额外的排序处理。

models.forEach((m) => {
// using <modelName>@<providerId> as fullName
modelTable[`${m.name}@${m?.provider?.id}`] = {
...m,
displayName: m.name, // 'provider' is copied over if it exists
};
});

return modelTable;
}

Expand All @@ -99,13 +99,16 @@ export function collectModelTableWithDefaultModel(
) {
let modelTable = collectModelTable(models, customModels);
if (defaultModel && defaultModel !== "") {
if (defaultModel.includes('@')) {
if (defaultModel.includes("@")) {
if (defaultModel in modelTable) {
modelTable[defaultModel].isDefault = true;
}
} else {
for (const key of Object.keys(modelTable)) {
if (modelTable[key].available && key.split('@').shift() == defaultModel) {
if (
modelTable[key].available &&
key.split("@").shift() == defaultModel
) {
modelTable[key].isDefault = true;
break;
}
Expand Down
Loading