zlei6/ragflow
1
0
Fork 0
mirror of https://github.com/infiniflow/ragflow.git synced 2026-07-24 01:16:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: improve model merging logic in useModelsDerived for better instance-specific values (#17250)

Browse Source
This commit is contained in:
chanx
2026-07-23 09:58:41 +08:00
committed by GitHub
parent db1559f71b
commit e3975b58eb
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
web/src/pages/user-setting/setting-model/instance-card/models-section/hooks.ts
View File

@@ -280,13 +280,20 @@ export function useModelsDerived({
});
}, [sourceItems, catalogFeatures]);
// Union of instance models + catalog, keyed by `name`. Catalog entries
// win on conflict; instance set listed first so already-added models
// stay at the top on the initial render.
// Union of instance models + catalog, keyed by `name`. Instance entries
// win on conflict so that editing an already-added model loads the
// instance-specific values (e.g. a user-customised `max_tokens`) rather
// than the upstream catalog defaults; catalog entries are only used to
// fill in models that have not been added yet. Instance set is listed
// first so already-added models stay at the top on the initial render.
const models: IProviderModelItem[] = useMemo(() => {
const byName = new Map<string, IProviderModelItem>();
instanceItems.forEach((m) => byName.set(m.name, m));
catalog.forEach((m) => byName.set(m.name, m));
catalog.forEach((m) => {
if (!byName.has(m.name)) {
byName.set(m.name, m);
}
});
return Array.from(byName.values());
}, [instanceItems, catalog]);