Compatible with the 2023-07-01-preview API interface of Azure Openai, when content interception is triggered, the error message will contain innererror (#460)
* Compatible with Azure Openai's 2023-07-01-preview version API interface about the error information returned by the intercepted interface * Compatible with the 2023-07-01-preview API interface of Azure Openai, when content interception is triggered, the error message will contain innererror.InnerError struct is only valid for Azure OpenAI Service.
This commit is contained in:
15
error.go
15
error.go
@@ -7,12 +7,20 @@ import (
|
|||||||
)
|
)
|
||||||
|
|
||||||
// APIError provides error information returned by the OpenAI API.
|
// APIError provides error information returned by the OpenAI API.
|
||||||
|
// InnerError struct is only valid for Azure OpenAI Service.
|
||||||
type APIError struct {
|
type APIError struct {
|
||||||
Code any `json:"code,omitempty"`
|
Code any `json:"code,omitempty"`
|
||||||
Message string `json:"message"`
|
Message string `json:"message"`
|
||||||
Param *string `json:"param,omitempty"`
|
Param *string `json:"param,omitempty"`
|
||||||
Type string `json:"type"`
|
Type string `json:"type"`
|
||||||
HTTPStatusCode int `json:"-"`
|
HTTPStatusCode int `json:"-"`
|
||||||
|
InnerError *InnerError `json:"innererror,omitempty"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// InnerError Azure Content filtering. Only valid for Azure OpenAI Service.
|
||||||
|
type InnerError struct {
|
||||||
|
Code string `json:"code,omitempty"`
|
||||||
|
ContentFilterResults ContentFilterResults `json:"content_filter_result,omitempty"`
|
||||||
}
|
}
|
||||||
|
|
||||||
// RequestError provides informations about generic request errors.
|
// RequestError provides informations about generic request errors.
|
||||||
@@ -61,6 +69,13 @@ func (e *APIError) UnmarshalJSON(data []byte) (err error) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if _, ok := rawMap["innererror"]; ok {
|
||||||
|
err = json.Unmarshal(rawMap["innererror"], &e.InnerError)
|
||||||
|
if err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// optional fields
|
// optional fields
|
||||||
if _, ok := rawMap["param"]; ok {
|
if _, ok := rawMap["param"]; ok {
|
||||||
err = json.Unmarshal(rawMap["param"], &e.Param)
|
err = json.Unmarshal(rawMap["param"], &e.Param)
|
||||||
|
|||||||
@@ -3,6 +3,7 @@ package openai_test
|
|||||||
import (
|
import (
|
||||||
"errors"
|
"errors"
|
||||||
"net/http"
|
"net/http"
|
||||||
|
"reflect"
|
||||||
"testing"
|
"testing"
|
||||||
|
|
||||||
. "github.com/sashabaranov/go-openai"
|
. "github.com/sashabaranov/go-openai"
|
||||||
@@ -57,6 +58,77 @@ func TestAPIErrorUnmarshalJSON(t *testing.T) {
|
|||||||
assertAPIErrorMessage(t, apiErr, "")
|
assertAPIErrorMessage(t, apiErr, "")
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
name: "parse succeeds when the innerError is not exists (Azure Openai)",
|
||||||
|
response: `{
|
||||||
|
"message": "test message",
|
||||||
|
"type": null,
|
||||||
|
"param": "prompt",
|
||||||
|
"code": "content_filter",
|
||||||
|
"status": 400,
|
||||||
|
"innererror": {
|
||||||
|
"code": "ResponsibleAIPolicyViolation",
|
||||||
|
"content_filter_result": {
|
||||||
|
"hate": {
|
||||||
|
"filtered": false,
|
||||||
|
"severity": "safe"
|
||||||
|
},
|
||||||
|
"self_harm": {
|
||||||
|
"filtered": false,
|
||||||
|
"severity": "safe"
|
||||||
|
},
|
||||||
|
"sexual": {
|
||||||
|
"filtered": true,
|
||||||
|
"severity": "medium"
|
||||||
|
},
|
||||||
|
"violence": {
|
||||||
|
"filtered": false,
|
||||||
|
"severity": "safe"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}`,
|
||||||
|
hasError: false,
|
||||||
|
checkFunc: func(t *testing.T, apiErr APIError) {
|
||||||
|
assertAPIErrorInnerError(t, apiErr, &InnerError{
|
||||||
|
Code: "ResponsibleAIPolicyViolation",
|
||||||
|
ContentFilterResults: ContentFilterResults{
|
||||||
|
Hate: Hate{
|
||||||
|
Filtered: false,
|
||||||
|
Severity: "safe",
|
||||||
|
},
|
||||||
|
SelfHarm: SelfHarm{
|
||||||
|
Filtered: false,
|
||||||
|
Severity: "safe",
|
||||||
|
},
|
||||||
|
Sexual: Sexual{
|
||||||
|
Filtered: true,
|
||||||
|
Severity: "medium",
|
||||||
|
},
|
||||||
|
Violence: Violence{
|
||||||
|
Filtered: false,
|
||||||
|
Severity: "safe",
|
||||||
|
},
|
||||||
|
},
|
||||||
|
})
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "parse succeeds when the innerError is empty (Azure Openai)",
|
||||||
|
response: `{"message": "","type": null,"param": "","code": "","status": 0,"innererror": {}}`,
|
||||||
|
hasError: false,
|
||||||
|
checkFunc: func(t *testing.T, apiErr APIError) {
|
||||||
|
assertAPIErrorInnerError(t, apiErr, &InnerError{})
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "parse succeeds when the innerError is not InnerError struct (Azure Openai)",
|
||||||
|
response: `{"message": "","type": null,"param": "","code": "","status": 0,"innererror": "test"}`,
|
||||||
|
hasError: true,
|
||||||
|
checkFunc: func(t *testing.T, apiErr APIError) {
|
||||||
|
assertAPIErrorInnerError(t, apiErr, &InnerError{})
|
||||||
|
},
|
||||||
|
},
|
||||||
{
|
{
|
||||||
name: "parse failed when the message is object",
|
name: "parse failed when the message is object",
|
||||||
response: `{"message":{},"type":"invalid_request_error","param":null,"code":null}`,
|
response: `{"message":{},"type":"invalid_request_error","param":null,"code":null}`,
|
||||||
@@ -152,6 +224,12 @@ func assertAPIErrorMessage(t *testing.T, apiErr APIError, expected string) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func assertAPIErrorInnerError(t *testing.T, apiErr APIError, expected interface{}) {
|
||||||
|
if !reflect.DeepEqual(apiErr.InnerError, expected) {
|
||||||
|
t.Errorf("Unexpected APIError InnerError: %v; expected: %v; ", apiErr, expected)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
func assertAPIErrorCode(t *testing.T, apiErr APIError, expected interface{}) {
|
func assertAPIErrorCode(t *testing.T, apiErr APIError, expected interface{}) {
|
||||||
switch v := apiErr.Code.(type) {
|
switch v := apiErr.Code.(type) {
|
||||||
case int:
|
case int:
|
||||||
|
|||||||
Reference in New Issue
Block a user