V4.8.17 feature (#3493)

* split tokens into input and output (#3477) * split tokens into input and output * query extension & tool call & question guide * fix * perf: input and output tokens * perf: tool call if else * perf: remove code * fix: extract usage count * fix: qa usage count --------- Co-authored-by: heheer <heheer@sealos.io>
2024-12-30 10:13:25 +08:00
parent da2831b948
commit 50bf7f9a3b
46 changed files with 467 additions and 230 deletions
--- a/projects/app/src/pages/account/usage/UsageDetail.tsx
+++ b/projects/app/src/pages/account/usage/UsageDetail.tsx
@@ -26,37 +26,48 @@ const UsageDetail = ({ usage, onClose }: { usage: UsageItemType; onClose: () =>
    [usage.list]
  );

-  const { hasModel, hasToken, hasCharsLen, hasDuration } = useMemo(() => {
-    let hasModel = false;
-    let hasToken = false;
-    let hasCharsLen = false;
-    let hasDuration = false;
-    let hasDataLen = false;
+  const { hasModel, hasToken, hasInputToken, hasOutputToken, hasCharsLen, hasDuration } =
+    useMemo(() => {
+      let hasModel = false;
+      let hasToken = false;
+      let hasInputToken = false;
+      let hasOutputToken = false;
+      let hasCharsLen = false;
+      let hasDuration = false;
+      let hasDataLen = false;

-    usage.list.forEach((item) => {
-      if (item.model !== undefined) {
-        hasModel = true;
-      }
+      usage.list.forEach((item) => {
+        if (item.model !== undefined) {
+          hasModel = true;
+        }

-      if (typeof item.tokens === 'number') {
-        hasToken = true;
-      }
-      if (typeof item.charsLength === 'number') {
-        hasCharsLen = true;
-      }
-      if (typeof item.duration === 'number') {
-        hasDuration = true;
-      }
-    });
+        if (typeof item.tokens === 'number') {
+          hasToken = true;
+        }
+        if (typeof item.inputTokens === 'number') {
+          hasInputToken = true;
+        }
+        if (typeof item.outputTokens === 'number') {
+          hasOutputToken = true;
+        }
+        if (typeof item.charsLength === 'number') {
+          hasCharsLen = true;
+        }
+        if (typeof item.duration === 'number') {
+          hasDuration = true;
+        }
+      });

-    return {
-      hasModel,
-      hasToken,
-      hasCharsLen,
-      hasDuration,
-      hasDataLen
-    };
-  }, [usage.list]);
+      return {
+        hasModel,
+        hasToken,
+        hasInputToken,
+        hasOutputToken,
+        hasCharsLen,
+        hasDuration,
+        hasDataLen
+      };
+    }, [usage.list]);

  return (
    <MyModal
@@ -98,6 +109,8 @@ const UsageDetail = ({ usage, onClose }: { usage: UsageItemType; onClose: () =>
                  <Th>{t('account_usage:module_name')}</Th>
                  {hasModel && <Th>{t('account_usage:ai_model')}</Th>}
                  {hasToken && <Th>{t('account_usage:token_length')}</Th>}
+                  {hasInputToken && <Th>{t('account_usage:input_token_length')}</Th>}
+                  {hasOutputToken && <Th>{t('account_usage:output_token_length')}</Th>}
                  {hasCharsLen && <Th>{t('account_usage:text_length')}</Th>}
                  {hasDuration && <Th>{t('account_usage:duration_seconds')}</Th>}
                  <Th>{t('account_usage:total_points_consumed')}</Th>
@@ -109,6 +122,8 @@ const UsageDetail = ({ usage, onClose }: { usage: UsageItemType; onClose: () =>
                    <Td>{t(item.moduleName as any)}</Td>
                    {hasModel && <Td>{item.model ?? '-'}</Td>}
                    {hasToken && <Td>{item.tokens ?? '-'}</Td>}
+                    {hasInputToken && <Td>{item.inputTokens ?? '-'}</Td>}
+                    {hasOutputToken && <Td>{item.outputTokens ?? '-'}</Td>}
                    {hasCharsLen && <Td>{item.charsLength ?? '-'}</Td>}
                    {hasDuration && <Td>{item.duration ?? '-'}</Td>}
                    <Td>{formatNumber(item.amount)}</Td>
--- a/projects/app/src/pages/api/core/ai/agent/createQuestionGuide.ts
+++ b/projects/app/src/pages/api/core/ai/agent/createQuestionGuide.ts
@@ -37,7 +37,7 @@ async function handler(

    const qgModel = global.llmModels[0];

-    const { result, tokens } = await createQuestionGuide({
+    const { result, inputTokens, outputTokens } = await createQuestionGuide({
      messages,
      model: qgModel.model
    });
@@ -47,7 +47,8 @@ async function handler(
    });

    pushQuestionGuideUsage({
-      tokens,
+      inputTokens,
+      outputTokens,
      teamId,
      tmbId
    });
--- a/projects/app/src/pages/api/core/ai/agent/v2/createQuestionGuide.ts
+++ b/projects/app/src/pages/api/core/ai/agent/v2/createQuestionGuide.ts
@@ -52,14 +52,15 @@ async function handler(req: ApiRequestProps<CreateQuestionGuideParams>, res: Nex

  const qgModel = questionGuide?.model || global.llmModels[0].model;

-  const { result, tokens } = await createQuestionGuide({
+  const { result, inputTokens, outputTokens } = await createQuestionGuide({
    messages,
    model: qgModel,
    customPrompt: questionGuide?.customPrompt
  });

  pushQuestionGuideUsage({
-    tokens,
+    inputTokens,
+    outputTokens,
    teamId,
    tmbId
  });
--- a/projects/app/src/pages/api/core/dataset/data/insertData.ts
+++ b/projects/app/src/pages/api/core/dataset/data/insertData.ts
@@ -89,7 +89,7 @@ async function handler(req: NextApiRequest) {
  pushGenerateVectorUsage({
    teamId,
    tmbId,
-    tokens,
+    inputTokens: tokens,
    model: vectorModelData.model
  });

--- a/projects/app/src/pages/api/core/dataset/data/update.ts
+++ b/projects/app/src/pages/api/core/dataset/data/update.ts
@@ -36,7 +36,7 @@ async function handler(req: ApiRequestProps<UpdateDatasetDataProps>) {
    pushGenerateVectorUsage({
      teamId,
      tmbId,
-      tokens,
+      inputTokens: tokens,
      model: vectorModel
    });
  } else {
--- a/projects/app/src/pages/api/core/dataset/searchTest.ts
+++ b/projects/app/src/pages/api/core/dataset/searchTest.ts
@@ -74,14 +74,15 @@ async function handler(req: NextApiRequest) {
  const { totalPoints } = pushGenerateVectorUsage({
    teamId,
    tmbId,
-    tokens,
+    inputTokens: tokens,
    model: dataset.vectorModel,
    source: apikey ? UsageSourceEnum.api : UsageSourceEnum.fastgpt,

    ...(aiExtensionResult &&
      extensionModel && {
        extensionModel: extensionModel.name,
-        extensionTokens: aiExtensionResult.tokens
+        extensionInputTokens: aiExtensionResult.inputTokens,
+        extensionOutputTokens: aiExtensionResult.outputTokens
      })
  });
  if (apikey) {
--- a/projects/app/src/pages/api/v1/embeddings.ts
+++ b/projects/app/src/pages/api/v1/embeddings.ts
@@ -57,7 +57,7 @@ async function handler(req: NextApiRequest, res: NextApiResponse<any>) {
  const { totalPoints } = pushGenerateVectorUsage({
    teamId,
    tmbId,
-    tokens,
+    inputTokens: tokens,
    model,
    billId,
    source: getUsageSourceByAuthType({ authType })
--- a/projects/app/src/pages/dataset/detail/components/Import/Context.tsx
+++ b/projects/app/src/pages/dataset/detail/components/Import/Context.tsx
@@ -196,7 +196,7 @@ const DatasetImportContextProvider = ({ children }: { children: React.ReactNode
      chunkSize: vectorModel?.defaultToken ? vectorModel?.defaultToken * 2 : 1024,
      showChunkInput: false,
      showPromptInput: false,
-      charsPointsPrice: agentModel.charsPointsPrice,
+      charsPointsPrice: agentModel.charsPointsPrice || 0,
      priceTip: t('dataset:import.Auto mode Estimated Price Tips', {
        price: agentModel.charsPointsPrice
      }),
@@ -211,7 +211,7 @@ const DatasetImportContextProvider = ({ children }: { children: React.ReactNode
      chunkSize: embeddingChunkSize,
      showChunkInput: true,
      showPromptInput: false,
-      charsPointsPrice: vectorModel.charsPointsPrice,
+      charsPointsPrice: vectorModel.charsPointsPrice || 0,
      priceTip: t('dataset:import.Embedding Estimated Price Tips', {
        price: vectorModel.charsPointsPrice
      }),
@@ -226,7 +226,7 @@ const DatasetImportContextProvider = ({ children }: { children: React.ReactNode
      chunkSize: qaChunkSize,
      showChunkInput: true,
      showPromptInput: true,
-      charsPointsPrice: agentModel.charsPointsPrice,
+      charsPointsPrice: agentModel.charsPointsPrice || 0,
      priceTip: t('dataset:import.Auto mode Estimated Price Tips', {
        price: agentModel.charsPointsPrice
      }),