Unverified Commit b88a8f7b authored by takatost's avatar takatost Committed by GitHub

feat: optimize invoke errors (#1922)

parent b4225bed
...@@ -58,7 +58,7 @@ class ChatMessageAudioApi(Resource): ...@@ -58,7 +58,7 @@ class ChatMessageAudioApi(Resource):
except ModelCurrentlyNotSupportError: except ModelCurrentlyNotSupportError:
raise ProviderModelCurrentlyNotSupportError() raise ProviderModelCurrentlyNotSupportError()
except InvokeError as e: except InvokeError as e:
raise CompletionRequestError(str(e)) raise CompletionRequestError(e.description)
except ValueError as e: except ValueError as e:
raise e raise e
except Exception as e: except Exception as e:
......
...@@ -78,7 +78,7 @@ class CompletionMessageApi(Resource): ...@@ -78,7 +78,7 @@ class CompletionMessageApi(Resource):
except ModelCurrentlyNotSupportError: except ModelCurrentlyNotSupportError:
raise ProviderModelCurrentlyNotSupportError() raise ProviderModelCurrentlyNotSupportError()
except InvokeError as e: except InvokeError as e:
raise CompletionRequestError(str(e)) raise CompletionRequestError(e.description)
except ValueError as e: except ValueError as e:
raise e raise e
except Exception as e: except Exception as e:
...@@ -153,7 +153,7 @@ class ChatMessageApi(Resource): ...@@ -153,7 +153,7 @@ class ChatMessageApi(Resource):
except ModelCurrentlyNotSupportError: except ModelCurrentlyNotSupportError:
raise ProviderModelCurrentlyNotSupportError() raise ProviderModelCurrentlyNotSupportError()
except InvokeError as e: except InvokeError as e:
raise CompletionRequestError(str(e)) raise CompletionRequestError(e.description)
except ValueError as e: except ValueError as e:
raise e raise e
except Exception as e: except Exception as e:
......
...@@ -38,7 +38,7 @@ class RuleGenerateApi(Resource): ...@@ -38,7 +38,7 @@ class RuleGenerateApi(Resource):
except ModelCurrentlyNotSupportError: except ModelCurrentlyNotSupportError:
raise ProviderModelCurrentlyNotSupportError() raise ProviderModelCurrentlyNotSupportError()
except InvokeError as e: except InvokeError as e:
raise CompletionRequestError(str(e)) raise CompletionRequestError(e.description)
return rules return rules
......
...@@ -228,7 +228,7 @@ class MessageMoreLikeThisApi(Resource): ...@@ -228,7 +228,7 @@ class MessageMoreLikeThisApi(Resource):
except ModelCurrentlyNotSupportError: except ModelCurrentlyNotSupportError:
raise ProviderModelCurrentlyNotSupportError() raise ProviderModelCurrentlyNotSupportError()
except InvokeError as e: except InvokeError as e:
raise CompletionRequestError(str(e)) raise CompletionRequestError(e.description)
except ValueError as e: except ValueError as e:
raise e raise e
except Exception as e: except Exception as e:
...@@ -256,7 +256,7 @@ def compact_response(response: Union[dict, Generator]) -> Response: ...@@ -256,7 +256,7 @@ def compact_response(response: Union[dict, Generator]) -> Response:
yield "data: " + json.dumps( yield "data: " + json.dumps(
api.handle_error(ProviderModelCurrentlyNotSupportError()).get_json()) + "\n\n" api.handle_error(ProviderModelCurrentlyNotSupportError()).get_json()) + "\n\n"
except InvokeError as e: 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: except ValueError as e:
yield "data: " + json.dumps(api.handle_error(e).get_json()) + "\n\n" yield "data: " + json.dumps(api.handle_error(e).get_json()) + "\n\n"
except Exception: except Exception:
...@@ -296,7 +296,7 @@ class MessageSuggestedQuestionApi(Resource): ...@@ -296,7 +296,7 @@ class MessageSuggestedQuestionApi(Resource):
except ModelCurrentlyNotSupportError: except ModelCurrentlyNotSupportError:
raise ProviderModelCurrentlyNotSupportError() raise ProviderModelCurrentlyNotSupportError()
except InvokeError as e: except InvokeError as e:
raise CompletionRequestError(str(e)) raise CompletionRequestError(e.description)
except Exception: except Exception:
logging.exception("internal server error.") logging.exception("internal server error.")
raise InternalServerError() raise InternalServerError()
......
...@@ -54,7 +54,7 @@ class ChatAudioApi(InstalledAppResource): ...@@ -54,7 +54,7 @@ class ChatAudioApi(InstalledAppResource):
except ModelCurrentlyNotSupportError: except ModelCurrentlyNotSupportError:
raise ProviderModelCurrentlyNotSupportError() raise ProviderModelCurrentlyNotSupportError()
except InvokeError as e: except InvokeError as e:
raise CompletionRequestError(str(e)) raise CompletionRequestError(e.description)
except ValueError as e: except ValueError as e:
raise e raise e
except Exception as e: except Exception as e:
......
...@@ -70,7 +70,7 @@ class CompletionApi(InstalledAppResource): ...@@ -70,7 +70,7 @@ class CompletionApi(InstalledAppResource):
except ModelCurrentlyNotSupportError: except ModelCurrentlyNotSupportError:
raise ProviderModelCurrentlyNotSupportError() raise ProviderModelCurrentlyNotSupportError()
except InvokeError as e: except InvokeError as e:
raise CompletionRequestError(str(e)) raise CompletionRequestError(e.description)
except ValueError as e: except ValueError as e:
raise e raise e
except Exception as e: except Exception as e:
...@@ -134,7 +134,7 @@ class ChatApi(InstalledAppResource): ...@@ -134,7 +134,7 @@ class ChatApi(InstalledAppResource):
except ModelCurrentlyNotSupportError: except ModelCurrentlyNotSupportError:
raise ProviderModelCurrentlyNotSupportError() raise ProviderModelCurrentlyNotSupportError()
except InvokeError as e: except InvokeError as e:
raise CompletionRequestError(str(e)) raise CompletionRequestError(e.description)
except ValueError as e: except ValueError as e:
raise e raise e
except Exception as e: except Exception as e:
...@@ -175,7 +175,7 @@ def compact_response(response: Union[dict, Generator]) -> Response: ...@@ -175,7 +175,7 @@ def compact_response(response: Union[dict, Generator]) -> Response:
except ModelCurrentlyNotSupportError: except ModelCurrentlyNotSupportError:
yield "data: " + json.dumps(api.handle_error(ProviderModelCurrentlyNotSupportError()).get_json()) + "\n\n" yield "data: " + json.dumps(api.handle_error(ProviderModelCurrentlyNotSupportError()).get_json()) + "\n\n"
except InvokeError as e: 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: except ValueError as e:
yield "data: " + json.dumps(api.handle_error(e).get_json()) + "\n\n" yield "data: " + json.dumps(api.handle_error(e).get_json()) + "\n\n"
except Exception: except Exception:
......
...@@ -104,7 +104,7 @@ class MessageMoreLikeThisApi(InstalledAppResource): ...@@ -104,7 +104,7 @@ class MessageMoreLikeThisApi(InstalledAppResource):
except ModelCurrentlyNotSupportError: except ModelCurrentlyNotSupportError:
raise ProviderModelCurrentlyNotSupportError() raise ProviderModelCurrentlyNotSupportError()
except InvokeError as e: except InvokeError as e:
raise CompletionRequestError(str(e)) raise CompletionRequestError(e.description)
except ValueError as e: except ValueError as e:
raise e raise e
except Exception: except Exception:
...@@ -131,7 +131,7 @@ def compact_response(response: Union[dict, Generator]) -> Response: ...@@ -131,7 +131,7 @@ def compact_response(response: Union[dict, Generator]) -> Response:
except ModelCurrentlyNotSupportError: except ModelCurrentlyNotSupportError:
yield "data: " + json.dumps(api.handle_error(ProviderModelCurrentlyNotSupportError()).get_json()) + "\n\n" yield "data: " + json.dumps(api.handle_error(ProviderModelCurrentlyNotSupportError()).get_json()) + "\n\n"
except InvokeError as e: 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: except ValueError as e:
yield "data: " + json.dumps(api.handle_error(e).get_json()) + "\n\n" yield "data: " + json.dumps(api.handle_error(e).get_json()) + "\n\n"
except Exception: except Exception:
...@@ -169,7 +169,7 @@ class MessageSuggestedQuestionApi(InstalledAppResource): ...@@ -169,7 +169,7 @@ class MessageSuggestedQuestionApi(InstalledAppResource):
except ModelCurrentlyNotSupportError: except ModelCurrentlyNotSupportError:
raise ProviderModelCurrentlyNotSupportError() raise ProviderModelCurrentlyNotSupportError()
except InvokeError as e: except InvokeError as e:
raise CompletionRequestError(str(e)) raise CompletionRequestError(e.description)
except Exception: except Exception:
logging.exception("internal server error.") logging.exception("internal server error.")
raise InternalServerError() raise InternalServerError()
......
...@@ -54,7 +54,7 @@ class UniversalChatAudioApi(UniversalChatResource): ...@@ -54,7 +54,7 @@ class UniversalChatAudioApi(UniversalChatResource):
except ModelCurrentlyNotSupportError: except ModelCurrentlyNotSupportError:
raise ProviderModelCurrentlyNotSupportError() raise ProviderModelCurrentlyNotSupportError()
except InvokeError as e: except InvokeError as e:
raise CompletionRequestError(str(e)) raise CompletionRequestError(e.description)
except ValueError as e: except ValueError as e:
raise e raise e
except Exception as e: except Exception as e:
......
...@@ -89,7 +89,7 @@ class UniversalChatApi(UniversalChatResource): ...@@ -89,7 +89,7 @@ class UniversalChatApi(UniversalChatResource):
except ModelCurrentlyNotSupportError: except ModelCurrentlyNotSupportError:
raise ProviderModelCurrentlyNotSupportError() raise ProviderModelCurrentlyNotSupportError()
except InvokeError as e: except InvokeError as e:
raise CompletionRequestError(str(e)) raise CompletionRequestError(e.description)
except ValueError as e: except ValueError as e:
raise e raise e
except Exception as e: except Exception as e:
...@@ -126,7 +126,7 @@ def compact_response(response: Union[dict, Generator]) -> Response: ...@@ -126,7 +126,7 @@ def compact_response(response: Union[dict, Generator]) -> Response:
except ModelCurrentlyNotSupportError: except ModelCurrentlyNotSupportError:
yield "data: " + json.dumps(api.handle_error(ProviderModelCurrentlyNotSupportError()).get_json()) + "\n\n" yield "data: " + json.dumps(api.handle_error(ProviderModelCurrentlyNotSupportError()).get_json()) + "\n\n"
except InvokeError as e: 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: except ValueError as e:
yield "data: " + json.dumps(api.handle_error(e).get_json()) + "\n\n" yield "data: " + json.dumps(api.handle_error(e).get_json()) + "\n\n"
except Exception: except Exception:
......
...@@ -133,7 +133,7 @@ class UniversalChatMessageSuggestedQuestionApi(UniversalChatResource): ...@@ -133,7 +133,7 @@ class UniversalChatMessageSuggestedQuestionApi(UniversalChatResource):
except ModelCurrentlyNotSupportError: except ModelCurrentlyNotSupportError:
raise ProviderModelCurrentlyNotSupportError() raise ProviderModelCurrentlyNotSupportError()
except InvokeError as e: except InvokeError as e:
raise CompletionRequestError(str(e)) raise CompletionRequestError(e.description)
except Exception: except Exception:
logging.exception("internal server error.") logging.exception("internal server error.")
raise InternalServerError() raise InternalServerError()
......
...@@ -50,7 +50,7 @@ class AudioApi(AppApiResource): ...@@ -50,7 +50,7 @@ class AudioApi(AppApiResource):
except ModelCurrentlyNotSupportError: except ModelCurrentlyNotSupportError:
raise ProviderModelCurrentlyNotSupportError() raise ProviderModelCurrentlyNotSupportError()
except InvokeError as e: except InvokeError as e:
raise CompletionRequestError(str(e)) raise CompletionRequestError(e.description)
except ValueError as e: except ValueError as e:
raise e raise e
except Exception as e: except Exception as e:
......
...@@ -67,7 +67,7 @@ class CompletionApi(AppApiResource): ...@@ -67,7 +67,7 @@ class CompletionApi(AppApiResource):
except ModelCurrentlyNotSupportError: except ModelCurrentlyNotSupportError:
raise ProviderModelCurrentlyNotSupportError() raise ProviderModelCurrentlyNotSupportError()
except InvokeError as e: except InvokeError as e:
raise CompletionRequestError(str(e)) raise CompletionRequestError(e.description)
except ValueError as e: except ValueError as e:
raise e raise e
except Exception as e: except Exception as e:
...@@ -131,7 +131,7 @@ class ChatApi(AppApiResource): ...@@ -131,7 +131,7 @@ class ChatApi(AppApiResource):
except ModelCurrentlyNotSupportError: except ModelCurrentlyNotSupportError:
raise ProviderModelCurrentlyNotSupportError() raise ProviderModelCurrentlyNotSupportError()
except InvokeError as e: except InvokeError as e:
raise CompletionRequestError(str(e)) raise CompletionRequestError(e.description)
except ValueError as e: except ValueError as e:
raise e raise e
except Exception as e: except Exception as e:
...@@ -171,7 +171,7 @@ def compact_response(response: Union[dict, Generator]) -> Response: ...@@ -171,7 +171,7 @@ def compact_response(response: Union[dict, Generator]) -> Response:
except ModelCurrentlyNotSupportError: except ModelCurrentlyNotSupportError:
yield "data: " + json.dumps(api.handle_error(ProviderModelCurrentlyNotSupportError()).get_json()) + "\n\n" yield "data: " + json.dumps(api.handle_error(ProviderModelCurrentlyNotSupportError()).get_json()) + "\n\n"
except InvokeError as e: 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: except ValueError as e:
yield "data: " + json.dumps(api.handle_error(e).get_json()) + "\n\n" yield "data: " + json.dumps(api.handle_error(e).get_json()) + "\n\n"
except Exception: except Exception:
......
...@@ -52,7 +52,7 @@ class AudioApi(WebApiResource): ...@@ -52,7 +52,7 @@ class AudioApi(WebApiResource):
except ModelCurrentlyNotSupportError: except ModelCurrentlyNotSupportError:
raise ProviderModelCurrentlyNotSupportError() raise ProviderModelCurrentlyNotSupportError()
except InvokeError as e: except InvokeError as e:
raise CompletionRequestError(str(e)) raise CompletionRequestError(e.description)
except ValueError as e: except ValueError as e:
raise e raise e
except Exception as e: except Exception as e:
......
...@@ -64,7 +64,7 @@ class CompletionApi(WebApiResource): ...@@ -64,7 +64,7 @@ class CompletionApi(WebApiResource):
except ModelCurrentlyNotSupportError: except ModelCurrentlyNotSupportError:
raise ProviderModelCurrentlyNotSupportError() raise ProviderModelCurrentlyNotSupportError()
except InvokeError as e: except InvokeError as e:
raise CompletionRequestError(str(e)) raise CompletionRequestError(e.description)
except ValueError as e: except ValueError as e:
raise e raise e
except Exception as e: except Exception as e:
...@@ -124,7 +124,7 @@ class ChatApi(WebApiResource): ...@@ -124,7 +124,7 @@ class ChatApi(WebApiResource):
except ModelCurrentlyNotSupportError: except ModelCurrentlyNotSupportError:
raise ProviderModelCurrentlyNotSupportError() raise ProviderModelCurrentlyNotSupportError()
except InvokeError as e: except InvokeError as e:
raise CompletionRequestError(str(e)) raise CompletionRequestError(e.description)
except ValueError as e: except ValueError as e:
raise e raise e
except Exception as e: except Exception as e:
...@@ -164,7 +164,7 @@ def compact_response(response: Union[dict, Generator]) -> Response: ...@@ -164,7 +164,7 @@ def compact_response(response: Union[dict, Generator]) -> Response:
except ModelCurrentlyNotSupportError: except ModelCurrentlyNotSupportError:
yield "data: " + json.dumps(api.handle_error(ProviderModelCurrentlyNotSupportError()).get_json()) + "\n\n" yield "data: " + json.dumps(api.handle_error(ProviderModelCurrentlyNotSupportError()).get_json()) + "\n\n"
except InvokeError as e: 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: except ValueError as e:
yield "data: " + json.dumps(api.handle_error(e).get_json()) + "\n\n" yield "data: " + json.dumps(api.handle_error(e).get_json()) + "\n\n"
except Exception: except Exception:
......
...@@ -138,7 +138,7 @@ class MessageMoreLikeThisApi(WebApiResource): ...@@ -138,7 +138,7 @@ class MessageMoreLikeThisApi(WebApiResource):
except ModelCurrentlyNotSupportError: except ModelCurrentlyNotSupportError:
raise ProviderModelCurrentlyNotSupportError() raise ProviderModelCurrentlyNotSupportError()
except InvokeError as e: except InvokeError as e:
raise CompletionRequestError(str(e)) raise CompletionRequestError(e.description)
except ValueError as e: except ValueError as e:
raise e raise e
except Exception: except Exception:
...@@ -165,7 +165,7 @@ def compact_response(response: Union[dict, Generator]) -> Response: ...@@ -165,7 +165,7 @@ def compact_response(response: Union[dict, Generator]) -> Response:
except ModelCurrentlyNotSupportError: except ModelCurrentlyNotSupportError:
yield "data: " + json.dumps(api.handle_error(ProviderModelCurrentlyNotSupportError()).get_json()) + "\n\n" yield "data: " + json.dumps(api.handle_error(ProviderModelCurrentlyNotSupportError()).get_json()) + "\n\n"
except InvokeError as e: 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: except ValueError as e:
yield "data: " + json.dumps(api.handle_error(e).get_json()) + "\n\n" yield "data: " + json.dumps(api.handle_error(e).get_json()) + "\n\n"
except Exception: except Exception:
...@@ -202,7 +202,7 @@ class MessageSuggestedQuestionApi(WebApiResource): ...@@ -202,7 +202,7 @@ class MessageSuggestedQuestionApi(WebApiResource):
except ModelCurrentlyNotSupportError: except ModelCurrentlyNotSupportError:
raise ProviderModelCurrentlyNotSupportError() raise ProviderModelCurrentlyNotSupportError()
except InvokeError as e: except InvokeError as e:
raise CompletionRequestError(str(e)) raise CompletionRequestError(e.description)
except Exception: except Exception:
logging.exception("internal server error.") logging.exception("internal server error.")
raise InternalServerError() raise InternalServerError()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment