Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
赵月辉
/
fastgpt-migrated
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Members
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Unverified
Commit
d70efe1d
authored
May 10, 2024
by
Archer
Committed by
GitHub
May 10, 2024
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix export dataset (#1436)
* fix: export dataset * remove file buffer
parent
435b2fba
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
23 additions
and
31 deletions
+23
-31
projects/app/src/pages/api/core/dataset/collection/create/file.ts
+5
-4
projects/app/src/pages/api/support/user/team/limit/exportDatasetLimit.ts
+16
-26
projects/app/src/service/middle/entry.ts
+2
-1
No files found.
projects/app/src/pages/api/core/dataset/collection/create/file.ts
View file @
d70efe1d
import
type
{
NextApiRequest
,
NextApiResponse
}
from
'next'
;
import
{
jsonRes
}
from
'@fastgpt/service/common/response'
;
import
{
connectToDatabase
}
from
'@/service/mongo'
;
import
{
delFileByFileIdList
,
readFileContentFromMongo
}
from
'@fastgpt/service/common/file/gridfs/controller'
;
import
{
readFileContentFromMongo
}
from
'@fastgpt/service/common/file/gridfs/controller'
;
import
{
authDataset
}
from
'@fastgpt/service/support/permission/auth/dataset'
;
import
{
FileIdCreateDatasetCollectionParams
}
from
'@fastgpt/global/core/dataset/api'
;
import
{
createOneCollection
}
from
'@fastgpt/service/core/dataset/collection/controller'
;
...
...
@@ -24,6 +21,7 @@ import { UsageSourceEnum } from '@fastgpt/global/support/wallet/usage/constants'
import
{
getLLMModel
,
getVectorModel
}
from
'@fastgpt/service/core/ai/model'
;
import
{
hashStr
}
from
'@fastgpt/global/common/string/tools'
;
import
{
startTrainingQueue
}
from
'@/service/core/dataset/training/utils'
;
import
{
MongoRawTextBuffer
}
from
'@fastgpt/service/common/buffer/rawText/schema'
;
export
default
async
function
handler
(
req
:
NextApiRequest
,
res
:
NextApiResponse
<
any
>
)
{
const
{
...
...
@@ -139,6 +137,9 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse<
return
collectionId
;
});
// remove buffer
await
MongoRawTextBuffer
.
deleteOne
({
sourceId
:
fileId
});
startTrainingQueue
(
true
);
jsonRes
(
res
);
...
...
projects/app/src/pages/api/support/user/team/limit/exportDatasetLimit.ts
View file @
d70efe1d
import
type
{
NextApiRequest
,
NextApiResponse
}
from
'next'
;
import
{
jsonRes
}
from
'@fastgpt/service/common/response'
;
import
{
connectToDatabase
}
from
'@/service/mongo'
;
import
{
authDataset
}
from
'@fastgpt/service/support/permission/auth/dataset'
;
import
{
checkExportDatasetLimit
}
from
'@fastgpt/service/support/user/utils'
;
import
{
NextAPI
}
from
'@/service/middle/entry'
;
export
default
async
function
handler
(
req
:
NextApiRequest
,
res
:
NextApiResponse
<
any
>
)
{
try
{
await
connectToDatabase
();
const
{
datasetId
}
=
req
.
query
as
{
datasetId
:
string
;
};
async
function
handler
(
req
:
NextApiRequest
,
res
:
NextApiResponse
<
any
>
)
{
const
{
datasetId
}
=
req
.
query
as
{
datasetId
:
string
;
};
if
(
!
datasetId
)
{
throw
new
Error
(
'datasetId is required'
);
}
// 凭证校验
const
{
teamId
}
=
await
authDataset
({
req
,
authToken
:
true
,
datasetId
,
per
:
'w'
});
if
(
!
datasetId
)
{
throw
new
Error
(
'datasetId is required'
);
}
await
checkExportDatasetLimit
({
teamId
,
limitMinutes
:
global
.
feConfigs
?.
limit
?.
exportDatasetLimitMinutes
});
// 凭证校验
const
{
teamId
}
=
await
authDataset
({
req
,
authToken
:
true
,
datasetId
,
per
:
'w'
});
jsonRes
(
res
);
}
catch
(
err
)
{
res
.
status
(
500
);
jsonRes
(
res
,
{
code
:
500
,
error
:
err
});
}
await
checkExportDatasetLimit
({
teamId
,
limitMinutes
:
global
.
feConfigs
?.
limit
?.
exportDatasetLimitMinutes
});
}
export
default
NextAPI
(
handler
);
projects/app/src/service/middle/entry.ts
View file @
d70efe1d
...
...
@@ -13,7 +13,8 @@ export const NextAPI = (...args: NextApiHandler[]): NextApiHandler => {
response
=
await
handler
(
req
,
res
);
}
if
(
!
res
.
writableFinished
)
{
const
contentType
=
res
.
getHeader
(
'Content-Type'
);
if
((
!
contentType
||
contentType
===
'application/json'
)
&&
!
res
.
writableFinished
)
{
return
jsonRes
(
res
,
{
code
:
200
,
data
:
response
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment