Merge pull request #1415 from feitianbubu/pr/fix-relayError-nil
fix: avoid relayError nil panic
This commit is contained in:
@@ -105,23 +105,25 @@ func (e *NewAPIError) SetMessage(message string) {
|
|||||||
func (e *NewAPIError) ToOpenAIError() OpenAIError {
|
func (e *NewAPIError) ToOpenAIError() OpenAIError {
|
||||||
switch e.ErrorType {
|
switch e.ErrorType {
|
||||||
case ErrorTypeOpenAIError:
|
case ErrorTypeOpenAIError:
|
||||||
return e.RelayError.(OpenAIError)
|
if openAIError, ok := e.RelayError.(OpenAIError); ok {
|
||||||
|
return openAIError
|
||||||
|
}
|
||||||
case ErrorTypeClaudeError:
|
case ErrorTypeClaudeError:
|
||||||
claudeError := e.RelayError.(ClaudeError)
|
if claudeError, ok := e.RelayError.(ClaudeError); ok {
|
||||||
return OpenAIError{
|
return OpenAIError{
|
||||||
Message: e.Error(),
|
Message: e.Error(),
|
||||||
Type: claudeError.Type,
|
Type: claudeError.Type,
|
||||||
Param: "",
|
Param: "",
|
||||||
Code: e.errorCode,
|
Code: e.errorCode,
|
||||||
}
|
}
|
||||||
default:
|
|
||||||
return OpenAIError{
|
|
||||||
Message: e.Error(),
|
|
||||||
Type: string(e.ErrorType),
|
|
||||||
Param: "",
|
|
||||||
Code: e.errorCode,
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
return OpenAIError{
|
||||||
|
Message: e.Error(),
|
||||||
|
Type: string(e.ErrorType),
|
||||||
|
Param: "",
|
||||||
|
Code: e.errorCode,
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func (e *NewAPIError) ToClaudeError() ClaudeError {
|
func (e *NewAPIError) ToClaudeError() ClaudeError {
|
||||||
@@ -162,8 +164,11 @@ func NewOpenAIError(err error, errorCode ErrorCode, statusCode int) *NewAPIError
|
|||||||
|
|
||||||
func NewErrorWithStatusCode(err error, errorCode ErrorCode, statusCode int) *NewAPIError {
|
func NewErrorWithStatusCode(err error, errorCode ErrorCode, statusCode int) *NewAPIError {
|
||||||
return &NewAPIError{
|
return &NewAPIError{
|
||||||
Err: err,
|
Err: err,
|
||||||
RelayError: nil,
|
RelayError: OpenAIError{
|
||||||
|
Message: err.Error(),
|
||||||
|
Type: string(errorCode),
|
||||||
|
},
|
||||||
ErrorType: ErrorTypeNewAPIError,
|
ErrorType: ErrorTypeNewAPIError,
|
||||||
StatusCode: statusCode,
|
StatusCode: statusCode,
|
||||||
errorCode: errorCode,
|
errorCode: errorCode,
|
||||||
|
|||||||
Reference in New Issue
Block a user