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
8b8e510b
Unverified
Commit
8b8e510b
authored
Aug 30, 2023
by
yezhwi
Committed by
GitHub
Aug 30, 2023
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: handle AttributeError for datasets and index (#1052)
parent
3db839a5
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
6 deletions
+9
-6
datasets_document.py
api/controllers/console/datasets/datasets_document.py
+7
-5
indexing_runner.py
api/core/indexing_runner.py
+2
-1
No files found.
api/controllers/console/datasets/datasets_document.py
View file @
8b8e510b
...
...
@@ -138,6 +138,10 @@ class GetProcessRuleApi(Resource):
req_data
=
request
.
args
document_id
=
req_data
.
get
(
'document_id'
)
# get default rules
mode
=
DocumentService
.
DEFAULT_RULES
[
'mode'
]
rules
=
DocumentService
.
DEFAULT_RULES
[
'rules'
]
if
document_id
:
# get the latest process rule
document
=
Document
.
query
.
get_or_404
(
document_id
)
...
...
@@ -158,11 +162,9 @@ class GetProcessRuleApi(Resource):
order_by
(
DatasetProcessRule
.
created_at
.
desc
())
.
\
limit
(
1
)
.
\
one_or_none
()
mode
=
dataset_process_rule
.
mode
rules
=
dataset_process_rule
.
rules_dict
else
:
mode
=
DocumentService
.
DEFAULT_RULES
[
'mode'
]
rules
=
DocumentService
.
DEFAULT_RULES
[
'rules'
]
if
dataset_process_rule
:
mode
=
dataset_process_rule
.
mode
rules
=
dataset_process_rule
.
rules_dict
return
{
'mode'
:
mode
,
...
...
api/core/indexing_runner.py
View file @
8b8e510b
...
...
@@ -406,7 +406,8 @@ class IndexingRunner:
filter
(
UploadFile
.
id
==
data_source_info
[
'upload_file_id'
])
.
\
one_or_none
()
text_docs
=
FileExtractor
.
load
(
file_detail
)
if
file_detail
:
text_docs
=
FileExtractor
.
load
(
file_detail
)
elif
dataset_document
.
data_source_type
==
'notion_import'
:
loader
=
NotionLoader
.
from_document
(
dataset_document
)
text_docs
=
loader
.
load
()
...
...
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