feat: concat usage code

Author: c121914yu

document/content/docs/toc.mdx

@@ -103,6 +103,7 @@ description: FastGPT 文档目录
 - [/docs/upgrading/4-12/4122](/docs/upgrading/4-12/4122)
 - [/docs/upgrading/4-12/4123](/docs/upgrading/4-12/4123)
 - [/docs/upgrading/4-12/4124](/docs/upgrading/4-12/4124)
+- [/docs/upgrading/4-12/4125](/docs/upgrading/4-12/4125)
 - [/docs/upgrading/4-8/40](/docs/upgrading/4-8/40)
 - [/docs/upgrading/4-8/41](/docs/upgrading/4-8/41)
 - [/docs/upgrading/4-8/42](/docs/upgrading/4-8/42)

document/content/docs/upgrading/4-12/4125.mdx

@@ -0,0 +1,18 @@
+---
+title: 'V4.12.5(进行)'
+description: 'FastGPT V4.12.5 更新说明'
+---
+
+
+## 🚀 新增内容
+
+
+## ⚙️ 优化
+
+1. 计量计费账单推送和合并逻辑。
+
+## 🐛 修复
+
+
+## 🔨 插件更新
+

document/data/doc-last-modified.json

@@ -106,7 +106,7 @@
   "document/content/docs/upgrading/4-12/4121.mdx": "2025-09-07T14:41:48+08:00",
   "document/content/docs/upgrading/4-12/4122.mdx": "2025-09-07T14:41:48+08:00",
   "document/content/docs/upgrading/4-12/4123.mdx": "2025-09-07T20:55:14+08:00",
-  "document/content/docs/upgrading/4-12/4124.mdx": "2025-09-15T20:39:54+08:00",
+  "document/content/docs/upgrading/4-12/4124.mdx": "2025-09-15T22:21:24+08:00",
   "document/content/docs/upgrading/4-8/40.mdx": "2025-08-02T19:38:37+08:00",
   "document/content/docs/upgrading/4-8/41.mdx": "2025-08-02T19:38:37+08:00",
   "document/content/docs/upgrading/4-8/42.mdx": "2025-08-02T19:38:37+08:00",
@@ -188,4 +188,4 @@
   "document/content/docs/use-cases/external-integration/openapi.mdx": "2025-08-14T18:54:47+08:00",
   "document/content/docs/use-cases/external-integration/wecom.mdx": "2025-09-15T20:02:54+08:00",
   "document/content/docs/use-cases/index.mdx": "2025-07-24T14:23:04+08:00"
-}
+}

packages/global/support/wallet/usage/api.d.ts

@@ -1,5 +1,5 @@
-import type { UsageSourceEnum } from './constants';
-import type { UsageListItemCountType, UsageListItemType } from './type';
+import type { UsageItemTypeEnum, UsageSourceEnum } from './constants';
+import type { UsageItemCountType, UsageItemType, UsageListItemType, UsageSchemaType } from './type';
 
 export type CreateTrainingUsageProps = {
   name: string;
@@ -22,21 +22,15 @@ export type GetUsageDashboardResponseItem = {
   totalPoints: number;
 };
 
-export type ConcatUsageProps = UsageListItemCountType & {
+export type CreateUsageProps = Omit<UsageSchemaType, '_id' | 'time'>;
+export type ConcatUsageProps = {
   teamId: string;
-  tmbId: string;
-  billId?: string;
+  usageId: string;
   totalPoints: number;
-  listIndex?: number;
-};
-
-export type CreateUsageProps = {
+  itemType: UsageItemTypeEnum;
+} & UsageItemCountType;
+export type PushUsageItemsProps = {
   teamId: string;
-  tmbId: string;
-  appName: string;
-  appId?: string;
-  pluginId?: string;
-  totalPoints: number;
-  source: `${UsageSourceEnum}`;
-  list: UsageListItemType[];
+  usageId: string;
+  list: UsageItemType[];
 };

packages/global/support/wallet/usage/constants.ts

@@ -61,3 +61,15 @@ export const UsageSourceMap = {
     label: i18nT('common:support.wallet.usage.Optimize Prompt')
   }
 };
+
+export enum UsageItemTypeEnum {
+  training_vector = 1,
+  training_qa = 2,
+  training_autoIndex = 3,
+  training_imageIndex = 4,
+  training_paragraph = 5,
+  training_imageParse = 6,
+
+  evaluation_generateAnswer = 7,
+  evaluation_answerAccuracy = 8
+}

packages/global/support/wallet/usage/type.d.ts

@@ -1,8 +1,33 @@
 import type { SourceMemberType } from '../../../support/user/type';
-import type { CreateUsageProps } from './api';
-import { UsageSourceEnum } from './constants';
+import type { UsageItemTypeEnum, UsageSourceEnum } from './constants';
 
-export type UsageListItemCountType = {
+export type UsageSchemaType = {
+  _id: string;
+  time: Date;
+
+  teamId: string;
+  tmbId: string;
+  appName: string;
+  appId?: string;
+  pluginId?: string;
+  totalPoints: number;
+  source: `${UsageSourceEnum}`;
+
+  // @deprecated
+  list?: UsageItemType[];
+};
+export type UsageItemSchemaType = {
+  _id: string;
+  teamId: string;
+  usageId: string;
+  name: string;
+  amount: number;
+  time: Date;
+  itemType?: UsageItemTypeEnum; // Use in usage concat
+} & UsageItemCountType;
+
+export type UsageItemCountType = {
+  model?: string;
   inputTokens?: number;
   outputTokens?: number;
   charsLength?: number;
@@ -14,24 +39,18 @@ export type UsageListItemCountType = {
   tokens?: number;
 };
 
-export type UsageListItemType = UsageListItemCountType & {
+export type UsageItemType = UsageItemCountType & {
   moduleName: string;
   amount: number;
-  model?: string;
-  count?: number;
-};
-
-export type UsageSchemaType = CreateUsageProps & {
-  _id: string;
-  time: Date;
+  itemType?: UsageItemTypeEnum;
 };
 
-export type UsageItemType = {
+export type UsageListItemType = {
   id: string;
   time: Date;
   appName: string;
   source: UsageSchemaType['source'];
   totalPoints: number;
-  list: UsageSchemaType['list'];
+  list: Omit<UsageItemType, 'itemType'>[];
   sourceMember: SourceMemberType;
 };

packages/service/common/api/type.d.ts

@@ -8,12 +8,17 @@ import type {
   SearchDatasetDataResponse
 } from '../../core/dataset/search/controller';
 import type { AuthOpenApiLimitProps } from '../../support/openapi/auth';
-import type { CreateUsageProps, ConcatUsageProps } from '@fastgpt/global/support/wallet/usage/api';
+import type {
+  CreateUsageProps,
+  ConcatUsageProps,
+  PushUsageItemsProps
+} from '@fastgpt/global/support/wallet/usage/api';
 
 declare global {
   var textCensorHandler: (params: { text: string }) => Promise<{ code: number; message?: string }>;
   var deepRagHandler: (data: DeepRagSearchProps) => Promise<SearchDatasetDataResponse>;
   var authOpenApiHandler: (data: AuthOpenApiLimitProps) => Promise<any>;
   var createUsageHandler: (data: CreateUsageProps) => any;
   var concatUsageHandler: (data: ConcatUsageProps) => any;
+  var pushUsageItemsHandler: (data: PushUsageItemsProps) => any;
 }

packages/service/common/file/gridfs/controller.ts

@@ -196,14 +196,16 @@ export const readFileContentFromMongo = async ({
   bucketName,
   fileId,
   customPdfParse = false,
-  getFormatText
+  getFormatText,
+  usageId
 }: {
   teamId: string;
   tmbId: string;
   bucketName: `${BucketNameEnum}`;
   fileId: string;
   customPdfParse?: boolean;
   getFormatText?: boolean; // 数据类型都尽可能转化成 markdown 格式
+  usageId?: string;
 }): Promise<{
   rawText: string;
   filename: string;
@@ -237,6 +239,7 @@ export const readFileContentFromMongo = async ({
   // Get raw text
   const { rawText } = await readRawContentByFileBuffer({
     customPdfParse,
+    usageId,
     getFormatText,
     extension,
     teamId,

packages/service/common/file/read/utils.ts

@@ -47,6 +47,7 @@ export const readRawContentByFileBuffer = async ({
   encoding,
   metadata,
   customPdfParse = false,
+  usageId,
   getFormatText = true
 }: {
   teamId: string;
@@ -58,6 +59,7 @@ export const readRawContentByFileBuffer = async ({
   metadata?: Record<string, any>;
 
   customPdfParse?: boolean;
+  usageId?: string;
   getFormatText?: boolean;
 }): Promise<{
   rawText: string;
@@ -104,7 +106,8 @@ export const readRawContentByFileBuffer = async ({
     createPdfParseUsage({
       teamId,
       tmbId,
-      pages: response.pages
+      pages: response.pages,
+      usageId
     });
 
     return {
@@ -123,7 +126,8 @@ export const readRawContentByFileBuffer = async ({
     createPdfParseUsage({
       teamId,
       tmbId,
-      pages
+      pages,
+      usageId
     });
 
     return {

packages/service/core/app/evaluation/evalSchema.ts

@@ -5,7 +5,7 @@ import {
 import { connectionMongo, getMongoModel } from '../../../common/mongo';
 import { AppCollectionName } from '../schema';
 import type { EvaluationSchemaType } from '@fastgpt/global/core/app/evaluation/type';
-import { UsageCollectionName } from '../../../support/wallet/usage/schema';
+import { UsageCollectionName } from '../../../support/wallet/usage/constants';
 const { Schema } = connectionMongo;
 
 export const EvaluationCollectionName = 'eval';