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
ba019a26
Unverified
Commit
ba019a26
authored
Feb 26, 2024
by
Yeuoly
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: unknown error
parent
08bf23a5
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
10 deletions
+11
-10
app.py
api/controllers/inner_api/app.py
+8
-7
generate_task_pipeline.py
api/core/app_runner/generate_task_pipeline.py
+3
-3
No files found.
api/controllers/inner_api/app.py
View file @
ba019a26
...
@@ -45,15 +45,16 @@ class EnterpriseAppInvokeApi(Resource):
...
@@ -45,15 +45,16 @@ class EnterpriseAppInvokeApi(Resource):
args
=
request_parser
.
parse_args
()
args
=
request_parser
.
parse_args
()
app_id
=
args
[
'app_id'
]
app_model
:
App
=
db
.
session
.
query
(
App
)
.
filter
(
App
.
id
==
app_id
)
.
first
()
if
app_model
is
None
:
raise
NotFound
(
"App Not Exists."
)
# disable auto generate name
args
[
'auto_generate_name'
]
=
False
try
:
try
:
app_id
=
args
[
'app_id'
]
app_model
:
App
=
db
.
session
.
query
(
App
)
.
filter
(
App
.
id
==
app_id
)
.
first
()
if
app_model
is
None
:
raise
NotFound
(
"App Not Exists."
)
# disable auto generate name
args
[
'auto_generate_name'
]
=
False
response
=
CompletionService
.
completion
(
response
=
CompletionService
.
completion
(
app_model
=
app_model
,
app_model
=
app_model
,
user
=
current_user
,
user
=
current_user
,
...
...
api/core/app_runner/generate_task_pipeline.py
View file @
ba019a26
...
@@ -523,7 +523,7 @@ class GenerateTaskPipeline:
...
@@ -523,7 +523,7 @@ class GenerateTaskPipeline:
# show_retrieve_source
# show_retrieve_source
if
'retriever_resources'
in
self
.
_task_state
.
metadata
:
if
'retriever_resources'
in
self
.
_task_state
.
metadata
:
if
self
.
_application_generate_entity
.
invoke_from
in
[
InvokeFrom
.
DEBUGGER
,
InvokeFrom
.
SERVICE_API
]:
if
self
.
_application_generate_entity
.
invoke_from
in
[
InvokeFrom
.
DEBUGGER
,
InvokeFrom
.
SERVICE_API
,
InvokeFrom
.
INNER_API
]:
metadata
[
'retriever_resources'
]
=
self
.
_task_state
.
metadata
[
'retriever_resources'
]
metadata
[
'retriever_resources'
]
=
self
.
_task_state
.
metadata
[
'retriever_resources'
]
else
:
else
:
metadata
[
'retriever_resources'
]
=
[]
metadata
[
'retriever_resources'
]
=
[]
...
@@ -537,11 +537,11 @@ class GenerateTaskPipeline:
...
@@ -537,11 +537,11 @@ class GenerateTaskPipeline:
})
})
# show annotation reply
# show annotation reply
if
'annotation_reply'
in
self
.
_task_state
.
metadata
:
if
'annotation_reply'
in
self
.
_task_state
.
metadata
:
if
self
.
_application_generate_entity
.
invoke_from
in
[
InvokeFrom
.
DEBUGGER
,
InvokeFrom
.
SERVICE_API
]:
if
self
.
_application_generate_entity
.
invoke_from
in
[
InvokeFrom
.
DEBUGGER
,
InvokeFrom
.
SERVICE_API
,
InvokeFrom
.
INNER_API
]:
metadata
[
'annotation_reply'
]
=
self
.
_task_state
.
metadata
[
'annotation_reply'
]
metadata
[
'annotation_reply'
]
=
self
.
_task_state
.
metadata
[
'annotation_reply'
]
# show usage
# show usage
if
self
.
_application_generate_entity
.
invoke_from
in
[
InvokeFrom
.
DEBUGGER
,
InvokeFrom
.
SERVICE_API
]:
if
self
.
_application_generate_entity
.
invoke_from
in
[
InvokeFrom
.
DEBUGGER
,
InvokeFrom
.
SERVICE_API
,
InvokeFrom
.
INNER_API
]:
metadata
[
'usage'
]
=
self
.
_task_state
.
metadata
[
'usage'
]
metadata
[
'usage'
]
=
self
.
_task_state
.
metadata
[
'usage'
]
return
metadata
return
metadata
...
...
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