Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
D
dify
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
ai-tech
dify
Commits
d33a2695
Unverified
Commit
d33a2695
authored
Aug 31, 2023
by
yezhwi
Committed by
GitHub
Aug 31, 2023
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
refactor(file extractor): file extractor (#1059)
parent
d3f8ea2d
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
11 additions
and
10 deletions
+11
-10
file.py
api/controllers/console/datasets/file.py
+2
-2
file_extractor.py
api/core/data_loader/file_extractor.py
+7
-6
index.tsx
web/app/components/datasets/create/file-uploader/index.tsx
+1
-1
index.tsx
web/app/components/datasets/create/index.tsx
+1
-1
No files found.
api/controllers/console/datasets/file.py
View file @
d33a2695
...
@@ -83,7 +83,7 @@ class FileApi(Resource):
...
@@ -83,7 +83,7 @@ class FileApi(Resource):
raise
FileTooLargeError
(
message
)
raise
FileTooLargeError
(
message
)
extension
=
file
.
filename
.
split
(
'.'
)[
-
1
]
extension
=
file
.
filename
.
split
(
'.'
)[
-
1
]
if
extension
not
in
ALLOWED_EXTENSIONS
:
if
extension
.
lower
()
not
in
ALLOWED_EXTENSIONS
:
raise
UnsupportedFileTypeError
()
raise
UnsupportedFileTypeError
()
# user uuid as file name
# user uuid as file name
...
@@ -136,7 +136,7 @@ class FilePreviewApi(Resource):
...
@@ -136,7 +136,7 @@ class FilePreviewApi(Resource):
# extract text from file
# extract text from file
extension
=
upload_file
.
extension
extension
=
upload_file
.
extension
if
extension
not
in
ALLOWED_EXTENSIONS
:
if
extension
.
lower
()
not
in
ALLOWED_EXTENSIONS
:
raise
UnsupportedFileTypeError
()
raise
UnsupportedFileTypeError
()
text
=
FileExtractor
.
load
(
upload_file
,
return_text
=
True
)
text
=
FileExtractor
.
load
(
upload_file
,
return_text
=
True
)
...
...
api/core/data_loader/file_extractor.py
View file @
d33a2695
...
@@ -47,17 +47,18 @@ class FileExtractor:
...
@@ -47,17 +47,18 @@ class FileExtractor:
upload_file
:
Optional
[
UploadFile
]
=
None
)
->
Union
[
List
[
Document
]
|
str
]:
upload_file
:
Optional
[
UploadFile
]
=
None
)
->
Union
[
List
[
Document
]
|
str
]:
input_file
=
Path
(
file_path
)
input_file
=
Path
(
file_path
)
delimiter
=
'
\n
'
delimiter
=
'
\n
'
if
input_file
.
suffix
==
'.xlsx'
:
file_extension
=
input_file
.
suffix
.
lower
()
if
file_extension
==
'.xlsx'
:
loader
=
ExcelLoader
(
file_path
)
loader
=
ExcelLoader
(
file_path
)
elif
input_file
.
suffix
==
'.pdf'
:
elif
file_extension
==
'.pdf'
:
loader
=
PdfLoader
(
file_path
,
upload_file
=
upload_file
)
loader
=
PdfLoader
(
file_path
,
upload_file
=
upload_file
)
elif
input_file
.
suffix
in
[
'.md'
,
'.markdown'
]:
elif
file_extension
in
[
'.md'
,
'.markdown'
]:
loader
=
MarkdownLoader
(
file_path
,
autodetect_encoding
=
True
)
loader
=
MarkdownLoader
(
file_path
,
autodetect_encoding
=
True
)
elif
input_file
.
suffix
in
[
'.htm'
,
'.html'
]:
elif
file_extension
in
[
'.htm'
,
'.html'
]:
loader
=
HTMLLoader
(
file_path
)
loader
=
HTMLLoader
(
file_path
)
elif
input_file
.
suffix
==
'.docx'
:
elif
file_extension
==
'.docx'
:
loader
=
Docx2txtLoader
(
file_path
)
loader
=
Docx2txtLoader
(
file_path
)
elif
input_file
.
suffix
==
'.csv'
:
elif
file_extension
==
'.csv'
:
loader
=
CSVLoader
(
file_path
,
autodetect_encoding
=
True
)
loader
=
CSVLoader
(
file_path
,
autodetect_encoding
=
True
)
else
:
else
:
# txt
# txt
...
...
web/app/components/datasets/create/file-uploader/index.tsx
View file @
d33a2695
...
@@ -78,7 +78,7 @@ const FileUploader = ({
...
@@ -78,7 +78,7 @@ const FileUploader = ({
const
isValid
=
useCallback
((
file
:
File
)
=>
{
const
isValid
=
useCallback
((
file
:
File
)
=>
{
const
{
size
}
=
file
const
{
size
}
=
file
const
ext
=
`.
${
getFileType
(
file
)}
`
const
ext
=
`.
${
getFileType
(
file
)}
`
const
isValidType
=
ACCEPTS
.
includes
(
ext
)
const
isValidType
=
ACCEPTS
.
includes
(
ext
.
toLowerCase
()
)
if
(
!
isValidType
)
if
(
!
isValidType
)
notify
({
type
:
'error'
,
message
:
t
(
'datasetCreation.stepOne.uploader.validation.typeError'
)
})
notify
({
type
:
'error'
,
message
:
t
(
'datasetCreation.stepOne.uploader.validation.typeError'
)
})
...
...
web/app/components/datasets/create/index.tsx
View file @
d33a2695
...
@@ -151,4 +151,4 @@ const DatasetUpdateForm = ({ datasetId }: DatasetUpdateFormProps) => {
...
@@ -151,4 +151,4 @@ const DatasetUpdateForm = ({ datasetId }: DatasetUpdateFormProps) => {
)
)
}
}
export
default
DatasetUpdateForm
export
default
DatasetUpdateForm
\ No newline at end of file
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