diff --git a/api/controllers/console/app/audio.py b/api/controllers/console/app/audio.py index 7829374238..c78005adf2 100644 --- a/api/controllers/console/app/audio.py +++ b/api/controllers/console/app/audio.py @@ -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: diff --git a/api/controllers/console/app/completion.py b/api/controllers/console/app/completion.py index b1deb100da..70bd92a25a 100644 --- a/api/controllers/console/app/completion.py +++ b/api/controllers/console/app/completion.py @@ -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: diff --git a/api/controllers/console/app/generator.py b/api/controllers/console/app/generator.py index 90cb0a8367..48d1d5c0bb 100644 --- a/api/controllers/console/app/generator.py +++ b/api/controllers/console/app/generator.py @@ -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 diff --git a/api/controllers/console/app/message.py b/api/controllers/console/app/message.py index fb13f4f68e..499cd0a2bd 100644 --- a/api/controllers/console/app/message.py +++ b/api/controllers/console/app/message.py @@ -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() diff --git a/api/controllers/console/explore/audio.py b/api/controllers/console/explore/audio.py index 12a5ff518c..a01b7b40d3 100644 --- a/api/controllers/console/explore/audio.py +++ b/api/controllers/console/explore/audio.py @@ -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: diff --git a/api/controllers/console/explore/completion.py b/api/controllers/console/explore/completion.py index 8d554720d4..5b690af052 100644 --- a/api/controllers/console/explore/completion.py +++ b/api/controllers/console/explore/completion.py @@ -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: diff --git a/api/controllers/console/explore/message.py b/api/controllers/console/explore/message.py index 13d3696e12..a521beae18 100644 --- a/api/controllers/console/explore/message.py +++ b/api/controllers/console/explore/message.py @@ -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() diff --git a/api/controllers/console/universal_chat/audio.py b/api/controllers/console/universal_chat/audio.py index ea48b2d82d..2f0b2568ac 100644 --- a/api/controllers/console/universal_chat/audio.py +++ b/api/controllers/console/universal_chat/audio.py @@ -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: diff --git a/api/controllers/console/universal_chat/chat.py b/api/controllers/console/universal_chat/chat.py index e7257157f7..cf900efced 100644 --- a/api/controllers/console/universal_chat/chat.py +++ b/api/controllers/console/universal_chat/chat.py @@ -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: diff --git a/api/controllers/console/universal_chat/message.py b/api/controllers/console/universal_chat/message.py index 38f3712a15..6421d85a1f 100644 --- a/api/controllers/console/universal_chat/message.py +++ b/api/controllers/console/universal_chat/message.py @@ -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() diff --git a/api/controllers/service_api/app/audio.py b/api/controllers/service_api/app/audio.py index 87bdadcdd1..466ead670f 100644 --- a/api/controllers/service_api/app/audio.py +++ b/api/controllers/service_api/app/audio.py @@ -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: diff --git a/api/controllers/service_api/app/completion.py b/api/controllers/service_api/app/completion.py index a98b7c7721..c8674356d1 100644 --- a/api/controllers/service_api/app/completion.py +++ b/api/controllers/service_api/app/completion.py @@ -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: diff --git a/api/controllers/web/audio.py b/api/controllers/web/audio.py index e8c2fd335e..67825c2b3b 100644 --- a/api/controllers/web/audio.py +++ b/api/controllers/web/audio.py @@ -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: diff --git a/api/controllers/web/completion.py b/api/controllers/web/completion.py index 01dd3e1ab0..8a492f8ca2 100644 --- a/api/controllers/web/completion.py +++ b/api/controllers/web/completion.py @@ -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: diff --git a/api/controllers/web/message.py b/api/controllers/web/message.py index d0789ee10a..9734aa177f 100644 --- a/api/controllers/web/message.py +++ b/api/controllers/web/message.py @@ -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()