gitea/FastGPT
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rerank api (#525)

Browse Source
This commit is contained in:
Archer 2023-11-28 21:13:15 +08:00 committed by GitHub
parent a74e1d7166
commit abc1e576b7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/global/core/ai/api.d.ts vendored
View File

@ -2,4 +2,4 @@ export type PostReRankProps = {
query: string; query: string;
inputs: { id: string; text: string }[]; inputs: { id: string; text: string }[];
}; };
export type PostReRankResponse = { id: string; score: number }[]; export type PostReRankResponse = { id: string; score?: number }[];

13
projects/app/src/pages/api/v1/rerank.ts
View File

@ -5,12 +5,12 @@ import { withNextCors } from '@fastgpt/service/common/middle/cors';
import { pushReRankBill } from '@/service/support/wallet/bill/push'; import { pushReRankBill } from '@/service/support/wallet/bill/push';
import { connectToDatabase } from '@/service/mongo'; import { connectToDatabase } from '@/service/mongo';
import { authTeamBalance } from '@/service/support/permission/auth/bill'; import { authTeamBalance } from '@/service/support/permission/auth/bill';
import { PostReRankProps } from '@fastgpt/global/core/ai/api'; import { PostReRankProps, PostReRankResponse } from '@fastgpt/global/core/ai/api';
import { reRankRecall } from '@/service/core/ai/rerank'; import { reRankRecall } from '@/service/core/ai/rerank';
export default withNextCors(async function handler(req: NextApiRequest, res: NextApiResponse<any>) { export default withNextCors(async function handler(req: NextApiRequest, res: NextApiResponse<any>) {
try {
let { query, inputs } = req.body as PostReRankProps; let { query, inputs } = req.body as PostReRankProps;
try {
await connectToDatabase(); await connectToDatabase();
const { teamId, tmbId } = await authCert({ const { teamId, tmbId } = await authCert({
req, req,
@ -29,14 +29,15 @@ export default withNextCors(async function handler(req: NextApiRequest, res: Nex
source: 'api' source: 'api'
}); });
jsonRes(res, { jsonRes<PostReRankResponse>(res, {
data: result data: result
}); });
} catch (err) { } catch (err) {
console.log(err); console.log(err);
jsonRes(res, { jsonRes<PostReRankResponse>(res, {
code: 500, data: inputs.map((input) => ({
error: err id: input.id
}))
}); });
} }
}); });

2
projects/app/src/service/core/dataset/data/pg.ts
View File

@ -398,7 +398,7 @@ export async function reRankSearchResult({
if (!target) return null; if (!target) return null;
return { return {
...target, ...target,
score: item.score || 0 score: item.score || target.score
}; };
}) })
.filter(Boolean) as SearchDataResponseItemType[]; .filter(Boolean) as SearchDataResponseItemType[];