fix colection create api (#766)

Co-authored-by: heheer <71265218+newfish-cmyk@users.noreply.github.com>
2025-07-30 02:12:38 +00:00 · 2024-01-23 09:01:24 +08:00
parent aab6ee51eb
commit 379673cae1
143 changed files with 40737 additions and 274 deletions
--- a/projects/app/src/pages/account/components/BillDetail.tsx
+++ b/projects/app/src/pages/account/components/BillDetail.tsx
@@ -32,7 +32,8 @@ const BillDetail = ({ bill, onClose }: { bill: BillItemType; onClose: () => void
    hasOutputTokens,
    hasCharsLen,
    hasDuration,
-    hasDataLen
+    hasDataLen,
+    hasDatasetSize
  } = useMemo(() => {
    let hasModel = false;
    let hasTokens = false;
@@ -41,6 +42,7 @@ const BillDetail = ({ bill, onClose }: { bill: BillItemType; onClose: () => void
    let hasCharsLen = false;
    let hasDuration = false;
    let hasDataLen = false;
+    let hasDatasetSize = false;

    bill.list.forEach((item) => {
      if (item.model !== undefined) {
@@ -61,6 +63,9 @@ const BillDetail = ({ bill, onClose }: { bill: BillItemType; onClose: () => void
      if (typeof item.duration === 'number') {
        hasDuration = true;
      }
+      if (typeof item.datasetSize === 'number') {
+        hasDatasetSize = true;
+      }
    });

    return {
@@ -70,7 +75,8 @@ const BillDetail = ({ bill, onClose }: { bill: BillItemType; onClose: () => void
      hasOutputTokens,
      hasCharsLen,
      hasDuration,
-      hasDataLen
+      hasDataLen,
+      hasDatasetSize
    };
  }, [bill.list]);

@@ -83,10 +89,10 @@ const BillDetail = ({ bill, onClose }: { bill: BillItemType; onClose: () => void
      maxW={['90vw', '700px']}
    >
      <ModalBody>
-        <Flex alignItems={'center'} pb={4}>
+        {/* <Flex alignItems={'center'} pb={4}>
          <Box flex={'0 0 80px'}>{t('wallet.bill.bill username')}:</Box>
          <Box>{t(bill.memberName)}</Box>
-        </Flex>
+        </Flex> */}
        <Flex alignItems={'center'} pb={4}>
          <Box flex={'0 0 80px'}>{t('wallet.bill.Number')}:</Box>
          <Box>{bill.id}</Box>
@@ -101,7 +107,7 @@ const BillDetail = ({ bill, onClose }: { bill: BillItemType; onClose: () => void
        </Flex>
        <Flex alignItems={'center'} pb={4}>
          <Box flex={'0 0 80px'}>{t('wallet.bill.Source')}:</Box>
-          <Box>{BillSourceMap[bill.source]}</Box>
+          <Box>{BillSourceMap[bill.source]?.label}</Box>
        </Flex>
        <Flex alignItems={'center'} pb={4}>
          <Box flex={'0 0 80px'}>{t('wallet.bill.Total')}:</Box>
@@ -122,6 +128,9 @@ const BillDetail = ({ bill, onClose }: { bill: BillItemType; onClose: () => void
                  {hasOutputTokens && <Th>{t('wallet.bill.Output Token Length')}</Th>}
                  {hasCharsLen && <Th>{t('wallet.bill.Text Length')}</Th>}
                  {hasDuration && <Th>{t('wallet.bill.Duration')}</Th>}
+                  {hasDatasetSize && (
+                    <Th>{t('support.user.team.subscription.type.extraDatasetSize')}</Th>
+                  )}
                  <Th>费用(￥)</Th>
                </Tr>
              </Thead>
@@ -135,6 +144,7 @@ const BillDetail = ({ bill, onClose }: { bill: BillItemType; onClose: () => void
                    {hasOutputTokens && <Td>{item.outputTokens ?? '-'}</Td>}
                    {hasCharsLen && <Td>{item.charsLength ?? '-'}</Td>}
                    {hasDuration && <Td>{item.duration ?? '-'}</Td>}
+                    {hasDatasetSize && <Td>{item.datasetSize ?? '-'}</Td>}
                    <Td>{formatStorePrice2Read(item.amount)}</Td>
                  </Tr>
                ))}
--- a/projects/app/src/pages/account/components/BillTable.tsx
+++ b/projects/app/src/pages/account/components/BillTable.tsx
@@ -1,4 +1,4 @@
-import React, { useState } from 'react';
+import React, { useEffect, useMemo, useState } from 'react';
 import {
  Table,
  Thead,
@@ -11,7 +11,7 @@ import {
  Box,
  Button
 } from '@chakra-ui/react';
-import { BillSourceMap } from '@fastgpt/global/support/wallet/bill/constants';
+import { BillSourceEnum, BillSourceMap } from '@fastgpt/global/support/wallet/bill/constants';
 import { getUserBills } from '@/web/support/wallet/bill/api';
 import type { BillItemType } from '@fastgpt/global/support/wallet/bill/type';
 import { usePagination } from '@/web/common/hooks/usePagination';
@@ -23,6 +23,11 @@ import { addDays } from 'date-fns';
 import dynamic from 'next/dynamic';
 import { useSystemStore } from '@/web/common/system/useSystemStore';
 import { useTranslation } from 'next-i18next';
+import MySelect from '@/components/Select';
+import { useQuery } from '@tanstack/react-query';
+import { useUserStore } from '@/web/support/user/useUserStore';
+import { getTeamMembers } from '@/web/support/user/team/api';
+import Avatar from '@/components/Avatar';
 const BillDetail = dynamic(() => import('./BillDetail'));

 const BillTable = () => {
@@ -32,9 +37,39 @@ const BillTable = () => {
    from: addDays(new Date(), -7),
    to: new Date()
  });
+  const [billSource, setBillSource] = useState<`${BillSourceEnum}` | ''>('');
  const { isPc } = useSystemStore();
+  const { userInfo } = useUserStore();
  const [billDetail, setBillDetail] = useState<BillItemType>();

+  const sourceList = useMemo(
+    () => [
+      { label: t('common.All'), value: '' },
+      ...Object.entries(BillSourceMap).map(([key, value]) => ({ label: value.label, value: key }))
+    ],
+    [t]
+  );
+
+  const [selectTmbId, setSelectTmbId] = useState(userInfo?.team?.tmbId);
+  const { data: members = [] } = useQuery(['getMembers', userInfo?.team?.teamId], () => {
+    if (!userInfo?.team?.teamId) return [];
+    return getTeamMembers(userInfo.team.teamId);
+  });
+  const tmbList = useMemo(
+    () =>
+      members.map((item) => ({
+        label: (
+          <Flex alignItems={'center'}>
+            <Avatar src={item.avatar} w={'16px'} mr={1} />
+            {item.memberName}
+          </Flex>
+        ),
+        value: item.tmbId
+      })),
+    [members]
+  );
+  console.log(members);
+
  const {
    data: bills,
    isLoading,
@@ -45,19 +80,68 @@ const BillTable = () => {
    pageSize: isPc ? 20 : 10,
    params: {
      dateStart: dateRange.from || new Date(),
-      dateEnd: addDays(dateRange.to || new Date(), 1)
-    }
+      dateEnd: addDays(dateRange.to || new Date(), 1),
+      source: billSource,
+      teamMemberId: selectTmbId
+    },
+    defaultRequest: false
  });

+  useEffect(() => {
+    getData(1);
+  }, [billSource, selectTmbId]);
+
  return (
    <Flex flexDirection={'column'} py={[0, 5]} h={'100%'} position={'relative'}>
+      <Flex
+        flexDir={['column', 'row']}
+        gap={2}
+        w={'100%'}
+        px={[3, 8]}
+        alignItems={['flex-end', 'center']}
+      >
+        {tmbList.length > 1 && userInfo?.team?.canWrite && (
+          <Flex alignItems={'center'}>
+            <Box mr={2} flexShrink={0}>
+              {t('support.user.team.member')}
+            </Box>
+            <MySelect
+              size={'sm'}
+              minW={'100px'}
+              list={tmbList}
+              value={selectTmbId}
+              onchange={setSelectTmbId}
+            />
+          </Flex>
+        )}
+        <Box flex={'1'} />
+        <Flex alignItems={'center'} gap={3}>
+          <DateRangePicker
+            defaultDate={dateRange}
+            position="bottom"
+            onChange={setDateRange}
+            onSuccess={() => getData(1)}
+          />
+          <Pagination />
+        </Flex>
+      </Flex>
      <TableContainer px={[3, 8]} position={'relative'} flex={'1 0 0'} h={0} overflowY={'auto'}>
        <Table>
          <Thead>
            <Tr>
-              <Th>{t('user.team.Member Name')}</Th>
+              {/* <Th>{t('user.team.Member Name')}</Th> */}
              <Th>{t('user.Time')}</Th>
-              <Th>{t('user.Source')}</Th>
+              <Th>
+                <MySelect
+                  list={sourceList}
+                  value={billSource}
+                  size={'sm'}
+                  onchange={(e) => {
+                    setBillSource(e);
+                  }}
+                  w={'130px'}
+                ></MySelect>
+              </Th>
              <Th>{t('user.Application Name')}</Th>
              <Th>{t('user.Total Amount')}</Th>
              <Th></Th>
@@ -66,9 +150,9 @@ const BillTable = () => {
          <Tbody fontSize={'sm'}>
            {bills.map((item) => (
              <Tr key={item.id}>
-                <Td>{item.memberName}</Td>
+                {/* <Td>{item.memberName}</Td> */}
                <Td>{dayjs(item.time).format('YYYY/MM/DD HH:mm:ss')}</Td>
-                <Td>{BillSourceMap[item.source]}</Td>
+                <Td>{BillSourceMap[item.source]?.label}</Td>
                <Td>{t(item.appName) || '-'}</Td>
                <Td>{item.total}元</Td>
                <Td>
@@ -90,17 +174,7 @@ const BillTable = () => {
          </Box>
        </Flex>
      )}
-      <Flex w={'100%'} mt={4} px={[3, 8]} alignItems={'center'} justifyContent={'flex-end'}>
-        <DateRangePicker
-          defaultDate={dateRange}
-          position="top"
-          onChange={setDateRange}
-          onSuccess={() => getData(1)}
-        />
-        <Box ml={3}>
-          <Pagination />
-        </Box>
-      </Flex>
+
      <Loading loading={isLoading} fixed={false} />
      {!!billDetail && <BillDetail bill={billDetail} onClose={() => setBillDetail(undefined)} />}
    </Flex>
--- a/projects/app/src/pages/account/index.tsx
+++ b/projects/app/src/pages/account/index.tsx
@@ -51,7 +51,16 @@ const Account = ({ currentTab }: { currentTab: `${TabEnum}` }) => {
          }
        ]
      : []),
-    ...(feConfigs?.isPlus && feConfigs?.show_pay
+    ...(feConfigs?.show_pay && userInfo?.team.canWrite
+      ? [
+          {
+            icon: 'support/pay/payRecordLight',
+            label: t('user.Recharge Record'),
+            id: TabEnum.pay
+          }
+        ]
+      : []),
+    ...(feConfigs?.show_pay
      ? [
          {
            icon: 'support/pay/priceLight',
@@ -60,6 +69,7 @@ const Account = ({ currentTab }: { currentTab: `${TabEnum}` }) => {
          }
        ]
      : []),
+
    ...(feConfigs?.show_promotion
      ? [
          {
@@ -69,15 +79,6 @@ const Account = ({ currentTab }: { currentTab: `${TabEnum}` }) => {
          }
        ]
      : []),
-    ...(feConfigs?.show_pay && userInfo?.team.canWrite
-      ? [
-          {
-            icon: 'support/pay/payRecordLight',
-            label: t('user.Recharge Record'),
-            id: TabEnum.pay
-          }
-        ]
-      : []),
    ...(userInfo?.team.canWrite
      ? [
          {
--- a/projects/app/src/pages/api/core/app/getChatLogs.ts
+++ b/projects/app/src/pages/api/core/app/getChatLogs.ts
@@ -40,6 +40,16 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
    const [data, total] = await Promise.all([
      MongoChat.aggregate([
        { $match: where },
+        {
+          $sort: {
+            userBadFeedbackCount: -1,
+            userGoodFeedbackCount: -1,
+            customFeedbacksCount: -1,
+            updateTime: -1
+          }
+        },
+        { $skip: (pageNum - 1) * pageSize },
+        { $limit: pageSize },
        {
          $lookup: {
            from: ChatItemCollectionName,
@@ -107,16 +117,6 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
            }
          }
        },
-        {
-          $sort: {
-            userBadFeedbackCount: -1,
-            userGoodFeedbackCount: -1,
-            customFeedbacksCount: -1,
-            updateTime: -1
-          }
-        },
-        { $skip: (pageNum - 1) * pageSize },
-        { $limit: pageSize },
        {
          $project: {
            _id: 1,
--- a/projects/app/src/pages/api/core/chat/init.ts
+++ b/projects/app/src/pages/api/core/chat/init.ts
@@ -35,7 +35,7 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
    ]);

    // auth chat permission
-    if (!app.canWrite && String(tmbId) !== String(chat?.tmbId)) {
+    if (chat && !app.canWrite && String(tmbId) !== String(chat?.tmbId)) {
      throw new Error(ChatErrEnum.unAuthChat);
    }

--- a/projects/app/src/pages/api/core/dataset/collection/create/file.ts
+++ b/projects/app/src/pages/api/core/dataset/collection/create/file.ts
@@ -0,0 +1,85 @@
+import type { NextApiRequest, NextApiResponse } from 'next';
+import { jsonRes } from '@fastgpt/service/common/response';
+import { connectToDatabase } from '@/service/mongo';
+import { uploadFile } from '@fastgpt/service/common/file/gridfs/controller';
+import { getUploadModel } from '@fastgpt/service/common/file/multer';
+import { authDataset } from '@fastgpt/service/support/permission/auth/dataset';
+import { FileCreateDatasetCollectionParams } from '@fastgpt/global/core/dataset/api';
+import { removeFilesByPaths } from '@fastgpt/service/common/file/utils';
+import { createOneCollection } from '@fastgpt/service/core/dataset/collection/controller';
+import { DatasetCollectionTypeEnum } from '@fastgpt/global/core/dataset/constants';
+
+/**
+ * Creates the multer uploader
+ */
+const upload = getUploadModel({
+  maxSize: 500 * 1024 * 1024
+});
+
+export default async function handler(req: NextApiRequest, res: NextApiResponse<any>) {
+  let filePaths: string[] = [];
+
+  const { datasetId } = req.query as { datasetId: string };
+
+  try {
+    await connectToDatabase();
+
+    const { teamId, tmbId } = await authDataset({
+      req,
+      authToken: true,
+      authApiKey: true,
+      per: 'w',
+      datasetId
+    });
+
+    const { file, bucketName, data } = await upload.doUpload<FileCreateDatasetCollectionParams>(
+      req,
+      res
+    );
+    filePaths = [file.path];
+
+    if (!file || !bucketName) {
+      throw new Error('file is empty');
+    }
+
+    const { fileMetadata, collectionMetadata, ...collectionData } = data;
+
+    // upload file and create collection
+    const fileId = await uploadFile({
+      teamId,
+      tmbId,
+      bucketName,
+      path: file.path,
+      filename: file.originalname,
+      contentType: file.mimetype,
+      metadata: fileMetadata
+    });
+
+    // create collection
+    const collectionId = await createOneCollection({
+      ...collectionData,
+      metadata: collectionMetadata,
+      teamId,
+      tmbId,
+      type: DatasetCollectionTypeEnum.file,
+      fileId
+    });
+
+    jsonRes(res, {
+      data: collectionId
+    });
+  } catch (error) {
+    jsonRes(res, {
+      code: 500,
+      error
+    });
+  }
+
+  removeFilesByPaths(filePaths);
+}
+
+export const config = {
+  api: {
+    bodyParser: false
+  }
+};
--- a/projects/app/src/pages/api/core/dataset/collection/list.ts
+++ b/projects/app/src/pages/api/core/dataset/collection/list.ts
@@ -78,16 +78,25 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse<
        {
          $match: match
        },
+        {
+          $sort: { updateTime: -1 }
+        },
+        {
+          $skip: (pageNum - 1) * pageSize
+        },
+        {
+          $limit: pageSize
+        },
        // count training data
        {
          $lookup: {
            from: DatasetTrainingCollectionName,
-            let: { id: '$_id' },
+            let: { id: '$_id', team_id: match.teamId, dataset_id: match.datasetId },
            pipeline: [
              {
                $match: {
                  $expr: {
-                    $and: [{ $eq: ['$teamId', match.teamId] }, { $eq: ['$collectionId', '$$id'] }]
+                    $and: [{ $eq: ['$teamId', '$$team_id'] }, { $eq: ['$collectionId', '$$id'] }]
                  }
                }
              },
@@ -100,14 +109,14 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse<
        {
          $lookup: {
            from: DatasetDataCollectionName,
-            let: { id: '$_id' },
+            let: { id: '$_id', team_id: match.teamId, dataset_id: match.datasetId },
            pipeline: [
              {
                $match: {
                  $expr: {
                    $and: [
-                      { $eq: ['$teamId', match.teamId] },
-                      { $eq: ['$datasetId', match.datasetId] },
+                      { $eq: ['$teamId', '$$team_id'] },
+                      { $eq: ['$datasetId', '$$dataset_id'] },
                      { $eq: ['$collectionId', '$$id'] }
                    ]
                  }
@@ -136,15 +145,6 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse<
              $ifNull: [{ $arrayElemAt: ['$trainingCount.count', 0] }, 0]
            }
          }
-        },
-        {
-          $sort: { updateTime: -1 }
-        },
-        {
-          $skip: (pageNum - 1) * pageSize
-        },
-        {
-          $limit: pageSize
        }
      ]),
      MongoDatasetCollection.countDocuments(match)