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
b88a8f7b
Unverified
Commit
b88a8f7b
authored
Jan 04, 2024
by
takatost
Committed by
GitHub
Jan 04, 2024
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat: optimize invoke errors (#1922)
parent
b4225bed
Changes
15
Hide whitespace changes
Inline
Side-by-side
Showing
15 changed files
with
29 additions
and
29 deletions
+29
-29
audio.py
api/controllers/console/app/audio.py
+1
-1
completion.py
api/controllers/console/app/completion.py
+2
-2
generator.py
api/controllers/console/app/generator.py
+1
-1
message.py
api/controllers/console/app/message.py
+3
-3
audio.py
api/controllers/console/explore/audio.py
+1
-1
completion.py
api/controllers/console/explore/completion.py
+3
-3
message.py
api/controllers/console/explore/message.py
+3
-3
audio.py
api/controllers/console/universal_chat/audio.py
+1
-1
chat.py
api/controllers/console/universal_chat/chat.py
+2
-2
message.py
api/controllers/console/universal_chat/message.py
+1
-1
audio.py
api/controllers/service_api/app/audio.py
+1
-1
completion.py
api/controllers/service_api/app/completion.py
+3
-3
audio.py
api/controllers/web/audio.py
+1
-1
completion.py
api/controllers/web/completion.py
+3
-3
message.py
api/controllers/web/message.py
+3
-3
No files found.
api/controllers/console/app/audio.py
View file @
b88a8f7b
...
...
@@ -58,7 +58,7 @@ class ChatMessageAudioApi(Resource):
except
ModelCurrentlyNotSupportError
:
raise
ProviderModelCurrentlyNotSupportError
()
except
InvokeError
as
e
:
raise
CompletionRequestError
(
str
(
e
)
)
raise
CompletionRequestError
(
e
.
description
)
except
ValueError
as
e
:
raise
e
except
Exception
as
e
:
...
...
api/controllers/console/app/completion.py
View file @
b88a8f7b
...
...
@@ -78,7 +78,7 @@ class CompletionMessageApi(Resource):
except
ModelCurrentlyNotSupportError
:
raise
ProviderModelCurrentlyNotSupportError
()
except
InvokeError
as
e
:
raise
CompletionRequestError
(
str
(
e
)
)
raise
CompletionRequestError
(
e
.
description
)
except
ValueError
as
e
:
raise
e
except
Exception
as
e
:
...
...
@@ -153,7 +153,7 @@ class ChatMessageApi(Resource):
except
ModelCurrentlyNotSupportError
:
raise
ProviderModelCurrentlyNotSupportError
()
except
InvokeError
as
e
:
raise
CompletionRequestError
(
str
(
e
)
)
raise
CompletionRequestError
(
e
.
description
)
except
ValueError
as
e
:
raise
e
except
Exception
as
e
:
...
...
api/controllers/console/app/generator.py
View file @
b88a8f7b
...
...
@@ -38,7 +38,7 @@ class RuleGenerateApi(Resource):
except
ModelCurrentlyNotSupportError
:
raise
ProviderModelCurrentlyNotSupportError
()
except
InvokeError
as
e
:
raise
CompletionRequestError
(
str
(
e
)
)
raise
CompletionRequestError
(
e
.
description
)
return
rules
...
...
api/controllers/console/app/message.py
View file @
b88a8f7b
...
...
@@ -228,7 +228,7 @@ class MessageMoreLikeThisApi(Resource):
except
ModelCurrentlyNotSupportError
:
raise
ProviderModelCurrentlyNotSupportError
()
except
InvokeError
as
e
:
raise
CompletionRequestError
(
str
(
e
)
)
raise
CompletionRequestError
(
e
.
description
)
except
ValueError
as
e
:
raise
e
except
Exception
as
e
:
...
...
@@ -256,7 +256,7 @@ def compact_response(response: Union[dict, Generator]) -> Response:
yield
"data: "
+
json
.
dumps
(
api
.
handle_error
(
ProviderModelCurrentlyNotSupportError
())
.
get_json
())
+
"
\n\n
"
except
InvokeError
as
e
:
yield
"data: "
+
json
.
dumps
(
api
.
handle_error
(
CompletionRequestError
(
str
(
e
)
))
.
get_json
())
+
"
\n\n
"
yield
"data: "
+
json
.
dumps
(
api
.
handle_error
(
CompletionRequestError
(
e
.
description
))
.
get_json
())
+
"
\n\n
"
except
ValueError
as
e
:
yield
"data: "
+
json
.
dumps
(
api
.
handle_error
(
e
)
.
get_json
())
+
"
\n\n
"
except
Exception
:
...
...
@@ -296,7 +296,7 @@ class MessageSuggestedQuestionApi(Resource):
except
ModelCurrentlyNotSupportError
:
raise
ProviderModelCurrentlyNotSupportError
()
except
InvokeError
as
e
:
raise
CompletionRequestError
(
str
(
e
)
)
raise
CompletionRequestError
(
e
.
description
)
except
Exception
:
logging
.
exception
(
"internal server error."
)
raise
InternalServerError
()
...
...
api/controllers/console/explore/audio.py
View file @
b88a8f7b
...
...
@@ -54,7 +54,7 @@ class ChatAudioApi(InstalledAppResource):
except
ModelCurrentlyNotSupportError
:
raise
ProviderModelCurrentlyNotSupportError
()
except
InvokeError
as
e
:
raise
CompletionRequestError
(
str
(
e
)
)
raise
CompletionRequestError
(
e
.
description
)
except
ValueError
as
e
:
raise
e
except
Exception
as
e
:
...
...
api/controllers/console/explore/completion.py
View file @
b88a8f7b
...
...
@@ -70,7 +70,7 @@ class CompletionApi(InstalledAppResource):
except
ModelCurrentlyNotSupportError
:
raise
ProviderModelCurrentlyNotSupportError
()
except
InvokeError
as
e
:
raise
CompletionRequestError
(
str
(
e
)
)
raise
CompletionRequestError
(
e
.
description
)
except
ValueError
as
e
:
raise
e
except
Exception
as
e
:
...
...
@@ -134,7 +134,7 @@ class ChatApi(InstalledAppResource):
except
ModelCurrentlyNotSupportError
:
raise
ProviderModelCurrentlyNotSupportError
()
except
InvokeError
as
e
:
raise
CompletionRequestError
(
str
(
e
)
)
raise
CompletionRequestError
(
e
.
description
)
except
ValueError
as
e
:
raise
e
except
Exception
as
e
:
...
...
@@ -175,7 +175,7 @@ def compact_response(response: Union[dict, Generator]) -> Response:
except
ModelCurrentlyNotSupportError
:
yield
"data: "
+
json
.
dumps
(
api
.
handle_error
(
ProviderModelCurrentlyNotSupportError
())
.
get_json
())
+
"
\n\n
"
except
InvokeError
as
e
:
yield
"data: "
+
json
.
dumps
(
api
.
handle_error
(
CompletionRequestError
(
str
(
e
)
))
.
get_json
())
+
"
\n\n
"
yield
"data: "
+
json
.
dumps
(
api
.
handle_error
(
CompletionRequestError
(
e
.
description
))
.
get_json
())
+
"
\n\n
"
except
ValueError
as
e
:
yield
"data: "
+
json
.
dumps
(
api
.
handle_error
(
e
)
.
get_json
())
+
"
\n\n
"
except
Exception
:
...
...
api/controllers/console/explore/message.py
View file @
b88a8f7b
...
...
@@ -104,7 +104,7 @@ class MessageMoreLikeThisApi(InstalledAppResource):
except
ModelCurrentlyNotSupportError
:
raise
ProviderModelCurrentlyNotSupportError
()
except
InvokeError
as
e
:
raise
CompletionRequestError
(
str
(
e
)
)
raise
CompletionRequestError
(
e
.
description
)
except
ValueError
as
e
:
raise
e
except
Exception
:
...
...
@@ -131,7 +131,7 @@ def compact_response(response: Union[dict, Generator]) -> Response:
except
ModelCurrentlyNotSupportError
:
yield
"data: "
+
json
.
dumps
(
api
.
handle_error
(
ProviderModelCurrentlyNotSupportError
())
.
get_json
())
+
"
\n\n
"
except
InvokeError
as
e
:
yield
"data: "
+
json
.
dumps
(
api
.
handle_error
(
CompletionRequestError
(
str
(
e
)
))
.
get_json
())
+
"
\n\n
"
yield
"data: "
+
json
.
dumps
(
api
.
handle_error
(
CompletionRequestError
(
e
.
description
))
.
get_json
())
+
"
\n\n
"
except
ValueError
as
e
:
yield
"data: "
+
json
.
dumps
(
api
.
handle_error
(
e
)
.
get_json
())
+
"
\n\n
"
except
Exception
:
...
...
@@ -169,7 +169,7 @@ class MessageSuggestedQuestionApi(InstalledAppResource):
except
ModelCurrentlyNotSupportError
:
raise
ProviderModelCurrentlyNotSupportError
()
except
InvokeError
as
e
:
raise
CompletionRequestError
(
str
(
e
)
)
raise
CompletionRequestError
(
e
.
description
)
except
Exception
:
logging
.
exception
(
"internal server error."
)
raise
InternalServerError
()
...
...
api/controllers/console/universal_chat/audio.py
View file @
b88a8f7b
...
...
@@ -54,7 +54,7 @@ class UniversalChatAudioApi(UniversalChatResource):
except
ModelCurrentlyNotSupportError
:
raise
ProviderModelCurrentlyNotSupportError
()
except
InvokeError
as
e
:
raise
CompletionRequestError
(
str
(
e
)
)
raise
CompletionRequestError
(
e
.
description
)
except
ValueError
as
e
:
raise
e
except
Exception
as
e
:
...
...
api/controllers/console/universal_chat/chat.py
View file @
b88a8f7b
...
...
@@ -89,7 +89,7 @@ class UniversalChatApi(UniversalChatResource):
except
ModelCurrentlyNotSupportError
:
raise
ProviderModelCurrentlyNotSupportError
()
except
InvokeError
as
e
:
raise
CompletionRequestError
(
str
(
e
)
)
raise
CompletionRequestError
(
e
.
description
)
except
ValueError
as
e
:
raise
e
except
Exception
as
e
:
...
...
@@ -126,7 +126,7 @@ def compact_response(response: Union[dict, Generator]) -> Response:
except
ModelCurrentlyNotSupportError
:
yield
"data: "
+
json
.
dumps
(
api
.
handle_error
(
ProviderModelCurrentlyNotSupportError
())
.
get_json
())
+
"
\n\n
"
except
InvokeError
as
e
:
yield
"data: "
+
json
.
dumps
(
api
.
handle_error
(
CompletionRequestError
(
str
(
e
)
))
.
get_json
())
+
"
\n\n
"
yield
"data: "
+
json
.
dumps
(
api
.
handle_error
(
CompletionRequestError
(
e
.
description
))
.
get_json
())
+
"
\n\n
"
except
ValueError
as
e
:
yield
"data: "
+
json
.
dumps
(
api
.
handle_error
(
e
)
.
get_json
())
+
"
\n\n
"
except
Exception
:
...
...
api/controllers/console/universal_chat/message.py
View file @
b88a8f7b
...
...
@@ -133,7 +133,7 @@ class UniversalChatMessageSuggestedQuestionApi(UniversalChatResource):
except
ModelCurrentlyNotSupportError
:
raise
ProviderModelCurrentlyNotSupportError
()
except
InvokeError
as
e
:
raise
CompletionRequestError
(
str
(
e
)
)
raise
CompletionRequestError
(
e
.
description
)
except
Exception
:
logging
.
exception
(
"internal server error."
)
raise
InternalServerError
()
...
...
api/controllers/service_api/app/audio.py
View file @
b88a8f7b
...
...
@@ -50,7 +50,7 @@ class AudioApi(AppApiResource):
except
ModelCurrentlyNotSupportError
:
raise
ProviderModelCurrentlyNotSupportError
()
except
InvokeError
as
e
:
raise
CompletionRequestError
(
str
(
e
)
)
raise
CompletionRequestError
(
e
.
description
)
except
ValueError
as
e
:
raise
e
except
Exception
as
e
:
...
...
api/controllers/service_api/app/completion.py
View file @
b88a8f7b
...
...
@@ -67,7 +67,7 @@ class CompletionApi(AppApiResource):
except
ModelCurrentlyNotSupportError
:
raise
ProviderModelCurrentlyNotSupportError
()
except
InvokeError
as
e
:
raise
CompletionRequestError
(
str
(
e
)
)
raise
CompletionRequestError
(
e
.
description
)
except
ValueError
as
e
:
raise
e
except
Exception
as
e
:
...
...
@@ -131,7 +131,7 @@ class ChatApi(AppApiResource):
except
ModelCurrentlyNotSupportError
:
raise
ProviderModelCurrentlyNotSupportError
()
except
InvokeError
as
e
:
raise
CompletionRequestError
(
str
(
e
)
)
raise
CompletionRequestError
(
e
.
description
)
except
ValueError
as
e
:
raise
e
except
Exception
as
e
:
...
...
@@ -171,7 +171,7 @@ def compact_response(response: Union[dict, Generator]) -> Response:
except
ModelCurrentlyNotSupportError
:
yield
"data: "
+
json
.
dumps
(
api
.
handle_error
(
ProviderModelCurrentlyNotSupportError
())
.
get_json
())
+
"
\n\n
"
except
InvokeError
as
e
:
yield
"data: "
+
json
.
dumps
(
api
.
handle_error
(
CompletionRequestError
(
str
(
e
)
))
.
get_json
())
+
"
\n\n
"
yield
"data: "
+
json
.
dumps
(
api
.
handle_error
(
CompletionRequestError
(
e
.
description
))
.
get_json
())
+
"
\n\n
"
except
ValueError
as
e
:
yield
"data: "
+
json
.
dumps
(
api
.
handle_error
(
e
)
.
get_json
())
+
"
\n\n
"
except
Exception
:
...
...
api/controllers/web/audio.py
View file @
b88a8f7b
...
...
@@ -52,7 +52,7 @@ class AudioApi(WebApiResource):
except
ModelCurrentlyNotSupportError
:
raise
ProviderModelCurrentlyNotSupportError
()
except
InvokeError
as
e
:
raise
CompletionRequestError
(
str
(
e
)
)
raise
CompletionRequestError
(
e
.
description
)
except
ValueError
as
e
:
raise
e
except
Exception
as
e
:
...
...
api/controllers/web/completion.py
View file @
b88a8f7b
...
...
@@ -64,7 +64,7 @@ class CompletionApi(WebApiResource):
except
ModelCurrentlyNotSupportError
:
raise
ProviderModelCurrentlyNotSupportError
()
except
InvokeError
as
e
:
raise
CompletionRequestError
(
str
(
e
)
)
raise
CompletionRequestError
(
e
.
description
)
except
ValueError
as
e
:
raise
e
except
Exception
as
e
:
...
...
@@ -124,7 +124,7 @@ class ChatApi(WebApiResource):
except
ModelCurrentlyNotSupportError
:
raise
ProviderModelCurrentlyNotSupportError
()
except
InvokeError
as
e
:
raise
CompletionRequestError
(
str
(
e
)
)
raise
CompletionRequestError
(
e
.
description
)
except
ValueError
as
e
:
raise
e
except
Exception
as
e
:
...
...
@@ -164,7 +164,7 @@ def compact_response(response: Union[dict, Generator]) -> Response:
except
ModelCurrentlyNotSupportError
:
yield
"data: "
+
json
.
dumps
(
api
.
handle_error
(
ProviderModelCurrentlyNotSupportError
())
.
get_json
())
+
"
\n\n
"
except
InvokeError
as
e
:
yield
"data: "
+
json
.
dumps
(
api
.
handle_error
(
CompletionRequestError
(
str
(
e
)
))
.
get_json
())
+
"
\n\n
"
yield
"data: "
+
json
.
dumps
(
api
.
handle_error
(
CompletionRequestError
(
e
.
description
))
.
get_json
())
+
"
\n\n
"
except
ValueError
as
e
:
yield
"data: "
+
json
.
dumps
(
api
.
handle_error
(
e
)
.
get_json
())
+
"
\n\n
"
except
Exception
:
...
...
api/controllers/web/message.py
View file @
b88a8f7b
...
...
@@ -138,7 +138,7 @@ class MessageMoreLikeThisApi(WebApiResource):
except
ModelCurrentlyNotSupportError
:
raise
ProviderModelCurrentlyNotSupportError
()
except
InvokeError
as
e
:
raise
CompletionRequestError
(
str
(
e
)
)
raise
CompletionRequestError
(
e
.
description
)
except
ValueError
as
e
:
raise
e
except
Exception
:
...
...
@@ -165,7 +165,7 @@ def compact_response(response: Union[dict, Generator]) -> Response:
except
ModelCurrentlyNotSupportError
:
yield
"data: "
+
json
.
dumps
(
api
.
handle_error
(
ProviderModelCurrentlyNotSupportError
())
.
get_json
())
+
"
\n\n
"
except
InvokeError
as
e
:
yield
"data: "
+
json
.
dumps
(
api
.
handle_error
(
CompletionRequestError
(
str
(
e
)
))
.
get_json
())
+
"
\n\n
"
yield
"data: "
+
json
.
dumps
(
api
.
handle_error
(
CompletionRequestError
(
e
.
description
))
.
get_json
())
+
"
\n\n
"
except
ValueError
as
e
:
yield
"data: "
+
json
.
dumps
(
api
.
handle_error
(
e
)
.
get_json
())
+
"
\n\n
"
except
Exception
:
...
...
@@ -202,7 +202,7 @@ class MessageSuggestedQuestionApi(WebApiResource):
except
ModelCurrentlyNotSupportError
:
raise
ProviderModelCurrentlyNotSupportError
()
except
InvokeError
as
e
:
raise
CompletionRequestError
(
str
(
e
)
)
raise
CompletionRequestError
(
e
.
description
)
except
Exception
:
logging
.
exception
(
"internal server error."
)
raise
InternalServerError
()
...
...
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