refactor: reorganize user info retrieval by moving getRunningUserInfoByTmbId to user/team module and updating imports across the codebase

ctrlz526 · ctrlz526 · commit 45f33d16bbcb · 2025-08-10T17:50:47.000+08:00
(cherry picked from commit 1cf99ec)
diff --git a/packages/service/core/workflow/dispatch/child/runApp.ts b/packages/service/core/workflow/dispatch/child/runApp.ts
@@ -20,10 +20,8 @@ import { authAppByTmbId } from '../../../../support/permission/app/auth';
 import { ReadPermissionVal } from '@fastgpt/global/support/permission/constant';
 import { getAppVersionById } from '../../../app/version/controller';
 import { parseUrlToFileType } from '@fastgpt/global/common/file/tools';
-import {
-  getUserChatInfoAndAuthTeamPoints,
-  getRunningUserInfoByTmbId
-} from '../../../../support/permission/auth/team';
+import { getUserChatInfoAndAuthTeamPoints } from '../../../../support/permission/auth/team';
+import { getRunningUserInfoByTmbId } from '../../../../support/permission/user/team';
 
 type Props = ModuleDispatchProps<{
   [NodeInputKeyEnum.userChatInput]: string;
diff --git a/packages/service/core/workflow/dispatch/child/runTool.ts b/packages/service/core/workflow/dispatch/child/runTool.ts
@@ -90,8 +90,8 @@ export const dispatchRunTool = async (props: RunToolProps): Promise<RunToolRespo
         systemVar: {
           user: {
             id: variables.userId,
-            userId: runningUserInfo.username,
-            rank: runningUserInfo.contact,
+            username: runningUserInfo.username,
+            contact: runningUserInfo.contact,
             membername: runningUserInfo.memberName,
             teamName: runningUserInfo.teamName,
             teamId: runningUserInfo.teamId,
diff --git a/packages/service/support/permission/auth/team.ts b/packages/service/support/permission/auth/team.ts
@@ -30,33 +30,3 @@ export async function getUserChatInfoAndAuthTeamPoints(tmbId: string) {
     }
   };
 }
-
-export async function getRunningUserInfoByTmbId(tmbId: string) {
-  if (tmbId) {
-    const tmb = await MongoTeamMember.findById(tmbId, 'teamId name userId') // team_members name is the user's name
-      .populate<{ team: TeamSchema; user: UserModelSchema }>([
-        {
-          path: 'team',
-          select: 'name'
-        },
-        {
-          path: 'user',
-          select: 'username contact'
-        }
-      ])
-      .lean();
-
-    if (!tmb) return Promise.reject(TeamErrEnum.notUser);
-
-    return {
-      username: tmb.user.username,
-      teamName: tmb.team.name,
-      memberName: tmb.name,
-      contact: tmb.user.contact || '',
-      teamId: tmb.teamId,
-      tmbId: tmb._id
-    };
-  }
-
-  return Promise.reject(TeamErrEnum.notUser);
-}
diff --git a/packages/service/support/permission/user/team.ts b/packages/service/support/permission/user/team.ts
@@ -0,0 +1,34 @@
+import { MongoTeamMember } from '../../user/team/teamMemberSchema';
+import { type UserModelSchema } from '@fastgpt/global/support/user/type';
+import { type TeamSchema } from '@fastgpt/global/support/user/team/type';
+import { TeamErrEnum } from '@fastgpt/global/common/error/code/team';
+
+export async function getRunningUserInfoByTmbId(tmbId: string) {
+  if (tmbId) {
+    const tmb = await MongoTeamMember.findById(tmbId, 'teamId name userId') // team_members name is the user's name
+      .populate<{ team: TeamSchema; user: UserModelSchema }>([
+        {
+          path: 'team',
+          select: 'name'
+        },
+        {
+          path: 'user',
+          select: 'username contact'
+        }
+      ])
+      .lean();
+
+    if (!tmb) return Promise.reject(TeamErrEnum.notUser);
+
+    return {
+      username: tmb.user.username,
+      teamName: tmb.team.name,
+      memberName: tmb.name,
+      contact: tmb.user.contact || '',
+      teamId: tmb.teamId,
+      tmbId: tmb._id
+    };
+  }
+
+  return Promise.reject(TeamErrEnum.notUser);
+}
diff --git a/projects/app/src/components/core/chat/ChatContainer/ChatBox/components/ResponseTags.tsx b/projects/app/src/components/core/chat/ChatContainer/ChatBox/components/ResponseTags.tsx
@@ -70,24 +70,26 @@ const ResponseTags = ({
     : true;
 
   // Dataset citation render items
-  const datasetCitationList = useMemo(() => {
-    // Keep first item per collectionId and preserve first-seen order
-    const firstByCollection = new Map<string, SearchDataResponseItemType>();
-    quoteList.forEach((cur) => {
-      if (!firstByCollection.has(cur.collectionId)) {
-        firstByCollection.set(cur.collectionId, cur);
-      }
-    });
-    return Array.from(firstByCollection.values()).map((item) => ({
-      itemType: 'dataset' as const,
-      sourceName: item.sourceName,
-      sourceId: item.sourceId,
-      icon: item.imageId
-        ? 'core/dataset/imageFill'
-        : getSourceNameIcon({ sourceId: item.sourceId, sourceName: item.sourceName }),
-      collectionId: item.collectionId,
-      datasetId: item.datasetId
-    }));
+  const sourceList = useMemo(() => {
+    return Object.values(
+      quoteList.reduce((acc: Record<string, SearchDataResponseItemType[]>, cur) => {
+        if (!acc[cur.collectionId]) {
+          acc[cur.collectionId] = [cur];
+        }
+        return acc;
+      }, {})
+    )
+      .flat()
+      .map((item) => ({
+        itemType: 'dataset' as const,
+        sourceName: item.sourceName,
+        sourceId: item.sourceId,
+        icon: item.imageId
+          ? 'core/dataset/imageFill'
+          : getSourceNameIcon({ sourceId: item.sourceId, sourceName: item.sourceName }),
+        collectionId: item.collectionId,
+        datasetId: item.datasetId
+      }));
   }, [quoteList]);
 
   // Merge dataset citations and external link references for unified rendering
@@ -107,8 +109,8 @@ const ResponseTags = ({
       ...r,
       itemType: 'link'
     }));
-    return [...datasetCitationList, ...linkItems];
-  }, [datasetCitationList, externalLinkList]);
+    return [...sourceList, ...linkItems];
+  }, [sourceList, externalLinkList]);
 
   const notEmptyTags = notSharePage || quoteList.length > 0 || (isPc && durationSeconds > 0);
 
diff --git a/projects/app/src/global/core/chat/utils.ts b/projects/app/src/global/core/chat/utils.ts
@@ -37,14 +37,6 @@ export function addStatisticalDataToHistoryItem(historyItem: ChatItemType) {
   // Flat children
   const flatResData = getFlatAppResponses(historyItem.responseData || []);
 
-  const llmModuleAccount = flatResData.filter(isLLMNode).length;
-  const totalQuoteList = flatResData
-    .filter((item) => item.moduleType === FlowNodeTypeEnum.datasetSearchNode)
-    .map((item) => item.quoteList)
-    .flat()
-    .filter(Boolean) as SearchDataResponseItemType[];
-  const historyPreviewLength = flatResData.find(isLLMNode)?.historyPreview?.length;
-
   // Extract external link references from final tool responses in responseData
   const externalLinkList = (() => {
     try {
@@ -84,9 +76,13 @@ export function addStatisticalDataToHistoryItem(historyItem: ChatItemType) {
 
   return {
     ...historyItem,
-    ...(llmModuleAccount ? { llmModuleAccount } : {}),
-    ...(totalQuoteList.length ? { totalQuoteList } : {}),
-    ...(historyPreviewLength ? { historyPreviewLength } : {}),
+    llmModuleAccount: flatResData.filter(isLLMNode).length,
+    totalQuoteList: flatResData
+      .filter((item) => item.moduleType === FlowNodeTypeEnum.datasetSearchNode)
+      .map((item) => item.quoteList)
+      .flat()
+      .filter(Boolean) as SearchDataResponseItemType[],
+    historyPreviewLength: flatResData.find(isLLMNode)?.historyPreview?.length,
     ...(externalLinkList.length ? { externalLinkList } : {})
   };
 }
diff --git a/projects/app/src/pages/api/core/chat/chatTest.ts b/projects/app/src/pages/api/core/chat/chatTest.ts
@@ -10,10 +10,8 @@ import { UsageSourceEnum } from '@fastgpt/global/support/wallet/usage/constants'
 import type { AIChatItemType, UserChatItemType } from '@fastgpt/global/core/chat/type';
 import { authApp } from '@fastgpt/service/support/permission/app/auth';
 import { dispatchWorkFlow } from '@fastgpt/service/core/workflow/dispatch';
-import {
-  getUserChatInfoAndAuthTeamPoints,
-  getRunningUserInfoByTmbId
-} from '@fastgpt/service/support/permission/auth/team';
+import { getUserChatInfoAndAuthTeamPoints } from '@fastgpt/service/support/permission/auth/team';
+import { getRunningUserInfoByTmbId } from '@fastgpt/service/support/permission/user/team';
 import type { StoreEdgeItemType } from '@fastgpt/global/core/workflow/type/edge';
 import {
   concatHistories,
diff --git a/projects/app/src/pages/api/core/workflow/debug.ts b/projects/app/src/pages/api/core/workflow/debug.ts
@@ -4,10 +4,8 @@ import { UsageSourceEnum } from '@fastgpt/global/support/wallet/usage/constants'
 import { authApp } from '@fastgpt/service/support/permission/app/auth';
 import { dispatchWorkFlow } from '@fastgpt/service/core/workflow/dispatch';
 import { authCert } from '@fastgpt/service/support/permission/auth/common';
-import {
-  getUserChatInfoAndAuthTeamPoints,
-  getRunningUserInfoByTmbId
-} from '@fastgpt/service/support/permission/auth/team';
+import { getUserChatInfoAndAuthTeamPoints } from '@fastgpt/service/support/permission/auth/team';
+import { getRunningUserInfoByTmbId } from '@fastgpt/service/support/permission/user/team';
 import type { PostWorkflowDebugProps, PostWorkflowDebugResponse } from '@/global/core/workflow/api';
 import { NextAPI } from '@/service/middleware/entry';
 import { ReadPermissionVal } from '@fastgpt/global/support/permission/constant';
diff --git a/projects/app/src/pages/api/v1/chat/completions.ts b/projects/app/src/pages/api/v1/chat/completions.ts
@@ -34,10 +34,8 @@ import {
   removeEmptyUserInput
 } from '@fastgpt/global/core/chat/utils';
 import { updateApiKeyUsage } from '@fastgpt/service/support/openapi/tools';
-import {
-  getUserChatInfoAndAuthTeamPoints,
-  getRunningUserInfoByTmbId
-} from '@fastgpt/service/support/permission/auth/team';
+import { getUserChatInfoAndAuthTeamPoints } from '@fastgpt/service/support/permission/auth/team';
+import { getRunningUserInfoByTmbId } from '@fastgpt/service/support/permission/user/team';
 import { AuthUserTypeEnum } from '@fastgpt/global/support/permission/constant';
 import { MongoApp } from '@fastgpt/service/core/app/schema';
 import { type AppSchema } from '@fastgpt/global/core/app/type';
diff --git a/projects/app/src/pages/api/v2/chat/completions.ts b/projects/app/src/pages/api/v2/chat/completions.ts
@@ -34,10 +34,8 @@ import {
   removeEmptyUserInput
 } from '@fastgpt/global/core/chat/utils';
 import { updateApiKeyUsage } from '@fastgpt/service/support/openapi/tools';
-import {
-  getUserChatInfoAndAuthTeamPoints,
-  getRunningUserInfoByTmbId
-} from '@fastgpt/service/support/permission/auth/team';
+import { getUserChatInfoAndAuthTeamPoints } from '@fastgpt/service/support/permission/auth/team';
+import { getRunningUserInfoByTmbId } from '@fastgpt/service/support/permission/user/team';
 import { AuthUserTypeEnum } from '@fastgpt/global/support/permission/constant';
 import { MongoApp } from '@fastgpt/service/core/app/schema';
 import { type AppSchema } from '@fastgpt/global/core/app/type';
diff --git a/projects/app/src/service/core/app/utils.ts b/projects/app/src/service/core/app/utils.ts
@@ -1,7 +1,5 @@
-import {
-  getUserChatInfoAndAuthTeamPoints,
-  getRunningUserInfoByTmbId
-} from '@fastgpt/service/support/permission/auth/team';
+import { getUserChatInfoAndAuthTeamPoints } from '@fastgpt/service/support/permission/auth/team';
+import { getRunningUserInfoByTmbId } from '@fastgpt/service/support/permission/user/team';
 import { createChatUsage } from '@fastgpt/service/support/wallet/usage/controller';
 import { getNextTimeByCronStringAndTimezone } from '@fastgpt/global/common/string/time';
 import { getNanoid } from '@fastgpt/global/common/string/tools';
diff --git a/projects/app/src/service/support/mcp/utils.ts b/projects/app/src/service/support/mcp/utils.ts
@@ -12,10 +12,8 @@ import { AppTypeEnum } from '@fastgpt/global/core/app/constants';
 import { type FlowNodeInputItemType } from '@fastgpt/global/core/workflow/type/io';
 import { type toolCallProps } from './type';
 import { type AppSchema } from '@fastgpt/global/core/app/type';
-import {
-  getRunningUserInfoByTmbId,
-  getUserChatInfoAndAuthTeamPoints
-} from '@fastgpt/service/support/permission/auth/team';
+import { getUserChatInfoAndAuthTeamPoints } from '@fastgpt/service/support/permission/auth/team';
+import { getRunningUserInfoByTmbId } from '@fastgpt/service/support/permission/user/team';
 import { getNanoid } from '@fastgpt/global/common/string/tools';
 import { type AIChatItemType, type UserChatItemType } from '@fastgpt/global/core/chat/type';
 import {
