mirror of
https://github.com/labring/FastGPT.git
synced 2025-07-23 21:13:50 +00:00

* Revert "lafAccount add pat & re request when token invalid (#76)" (#77) This reverts commit 83d85dfe37adcaef4833385ea52ee79fd84720be. * perf: workflow ux * system config * Newflow (#89) * docs: Add doc for Xinference (#1266) Signed-off-by: Carson Yang <yangchuansheng33@gmail.com> * Revert "lafAccount add pat & re request when token invalid (#76)" (#77) This reverts commit 83d85dfe37adcaef4833385ea52ee79fd84720be. * perf: workflow ux * system config * Revert "lafAccount add pat & re request when token invalid (#76)" (#77) This reverts commit 83d85dfe37adcaef4833385ea52ee79fd84720be. * Revert "lafAccount add pat & re request when token invalid (#76)" (#77) This reverts commit 83d85dfe37adcaef4833385ea52ee79fd84720be. * Revert "lafAccount add pat & re request when token invalid (#76)" (#77) This reverts commit 83d85dfe37adcaef4833385ea52ee79fd84720be. * rename code * move code * update flow * input type selector * perf: workflow runtime * feat: node adapt newflow * feat: adapt plugin * feat: 360 connection * check workflow * perf: flow 性能 * change plugin input type (#81) * change plugin input type * plugin label mode * perf: nodecard * debug * perf: debug ui * connection ui * change workflow ui (#82) * feat: workflow debug * adapt openAPI for new workflow (#83) * adapt openAPI for new workflow * i18n * perf: plugin debug * plugin input ui * delete * perf: global variable select * fix rebase * perf: workflow performance * feat: input render type icon * input icon * adapt flow (#84) * adapt newflow * temp * temp * fix * feat: app schedule trigger * feat: app schedule trigger * perf: schedule ui * feat: ioslatevm run js code * perf: workflow varialbe table ui * feat: adapt simple mode * feat: adapt input params * output * feat: adapt tamplate * fix: ts * add if-else module (#86) * perf: worker * if else node * perf: tiktoken worker * fix: ts * perf: tiktoken * fix if-else node (#87) * fix if-else node * type * fix * perf: audio render * perf: Parallel worker * log * perf: if else node * adapt plugin * prompt * perf: reference ui * reference ui * handle ux * template ui and plugin tool * adapt v1 workflow * adapt v1 workflow completions * perf: time variables * feat: workflow keyboard shortcuts * adapt v1 workflow * update workflow example doc (#88) * fix: simple mode select tool --------- Signed-off-by: Carson Yang <yangchuansheng33@gmail.com> Co-authored-by: Carson Yang <yangchuansheng33@gmail.com> Co-authored-by: heheer <71265218+newfish-cmyk@users.noreply.github.com> * doc * perf: extract node * extra node field * update plugin version * doc * variable * change doc & fix prompt editor (#90) * fold workflow code * value type label --------- Signed-off-by: Carson Yang <yangchuansheng33@gmail.com> Co-authored-by: Carson Yang <yangchuansheng33@gmail.com> Co-authored-by: heheer <71265218+newfish-cmyk@users.noreply.github.com>
73 lines
2.0 KiB
TypeScript
73 lines
2.0 KiB
TypeScript
import { SearchScoreTypeEnum } from '../constants';
|
|
import { SearchDataResponseItemType } from '../type';
|
|
|
|
/* dataset search result concat */
|
|
export const datasetSearchResultConcat = (
|
|
arr: { k: number; list: SearchDataResponseItemType[] }[]
|
|
): SearchDataResponseItemType[] => {
|
|
arr = arr.filter((item) => item.list.length > 0);
|
|
|
|
if (arr.length === 0) return [];
|
|
if (arr.length === 1) return arr[0].list;
|
|
|
|
const map = new Map<string, SearchDataResponseItemType & { rrfScore: number }>();
|
|
|
|
// rrf
|
|
arr.forEach((item) => {
|
|
const k = item.k;
|
|
|
|
item.list.forEach((data, index) => {
|
|
const rank = index + 1;
|
|
const score = 1 / (k + rank);
|
|
|
|
const record = map.get(data.id);
|
|
if (record) {
|
|
// 合并两个score,有相同type的score,取最大值
|
|
const concatScore = [...record.score];
|
|
for (const dataItem of data.score) {
|
|
const sameScore = concatScore.find((item) => item.type === dataItem.type);
|
|
if (sameScore) {
|
|
sameScore.value = Math.max(sameScore.value, dataItem.value);
|
|
} else {
|
|
concatScore.push(dataItem);
|
|
}
|
|
}
|
|
|
|
map.set(data.id, {
|
|
...record,
|
|
score: concatScore,
|
|
rrfScore: record.rrfScore + score
|
|
});
|
|
} else {
|
|
map.set(data.id, {
|
|
...data,
|
|
rrfScore: score
|
|
});
|
|
}
|
|
});
|
|
});
|
|
|
|
// sort
|
|
const mapArray = Array.from(map.values());
|
|
const results = mapArray.sort((a, b) => b.rrfScore - a.rrfScore);
|
|
|
|
return results.map((item, index) => {
|
|
// if SearchScoreTypeEnum.rrf exist, reset score
|
|
const rrfScore = item.score.find((item) => item.type === SearchScoreTypeEnum.rrf);
|
|
if (rrfScore) {
|
|
rrfScore.value = item.rrfScore;
|
|
rrfScore.index = index;
|
|
} else {
|
|
item.score.push({
|
|
type: SearchScoreTypeEnum.rrf,
|
|
value: item.rrfScore,
|
|
index
|
|
});
|
|
}
|
|
|
|
// @ts-ignore
|
|
delete item.rrfScore;
|
|
return item;
|
|
});
|
|
};
|