review 2: chatCompletionResponseError -> responseError (same for messages)

Author: pawbana

intercept/chatcompletions/base.go

@@ -174,7 +174,7 @@ func (i *interceptionBase) unmarshalArgs(in string) (args recorder.ToolArgs) {
 }
 
 // writeUpstreamError marshals and writes a given error.
-func (i *interceptionBase) writeUpstreamError(w http.ResponseWriter, oaiErr *chatCompletionResponseError) {
+func (i *interceptionBase) writeUpstreamError(w http.ResponseWriter, oaiErr *responseError) {
 	if oaiErr == nil {
 		return
 	}
@@ -229,13 +229,13 @@ func calculateActualInputTokenUsage(in openai.CompletionUsage) int64 {
 		in.PromptTokensDetails.CachedTokens /* The aggregated number of text input tokens that has been cached from previous requests. */
 }
 
-func getErrorResponse(err error) *chatCompletionResponseError {
+func getErrorResponse(err error) *responseError {
 	var apiErr *openai.Error
 	if !errors.As(err, &apiErr) {
 		return nil
 	}
 
-	return &chatCompletionResponseError{
+	return &responseError{
 		ErrorObject: &shared.ErrorObject{
 			Code:    apiErr.Code,
 			Message: apiErr.Message,
@@ -245,15 +245,15 @@ func getErrorResponse(err error) *chatCompletionResponseError {
 	}
 }
 
-var _ error = &chatCompletionResponseError{}
+var _ error = &responseError{}
 
-type chatCompletionResponseError struct {
+type responseError struct {
 	ErrorObject *shared.ErrorObject `json:"error"`
 	StatusCode  int                 `json:"-"`
 }
 
-func newErrorResponse(msg error) *chatCompletionResponseError {
-	return &chatCompletionResponseError{
+func newErrorResponse(msg error) *responseError {
+	return &responseError{
 		ErrorObject: &shared.ErrorObject{
 			Code:    "error",
 			Message: msg.Error(),
@@ -262,7 +262,7 @@ func newErrorResponse(msg error) *chatCompletionResponseError {
 	}
 }
 
-func (a *chatCompletionResponseError) Error() string {
+func (a *responseError) Error() string {
 	if a.ErrorObject == nil {
 		return ""
 	}

intercept/messages/base.go

@@ -405,7 +405,7 @@ func filterBedrockBetaFlags(headers http.Header, model string) {
 }
 
 // writeUpstreamError marshals and writes a given error.
-func (i *interceptionBase) writeUpstreamError(w http.ResponseWriter, antErr *messagesResponseError) {
+func (i *interceptionBase) writeUpstreamError(w http.ResponseWriter, antErr *responseError) {
 	if antErr == nil {
 		return
 	}
@@ -487,7 +487,7 @@ func accumulateUsage(dest, src any) {
 	}
 }
 
-func getErrorResponse(err error) *messagesResponseError {
+func getErrorResponse(err error) *responseError {
 	var apierr *anthropic.Error
 	if !errors.As(err, &apierr) {
 		return nil
@@ -505,7 +505,7 @@ func getErrorResponse(err error) *messagesResponseError {
 		typ = string(detail.Type)
 	}
 
-	return &messagesResponseError{
+	return &responseError{
 		ErrorResponse: &anthropic.ErrorResponse{
 			Error: anthropic.ErrorObjectUnion{
 				Message: msg,
@@ -517,16 +517,16 @@ func getErrorResponse(err error) *messagesResponseError {
 	}
 }
 
-var _ error = &messagesResponseError{}
+var _ error = &responseError{}
 
-type messagesResponseError struct {
+type responseError struct {
 	*anthropic.ErrorResponse
 
 	StatusCode int `json:"-"`
 }
 
-func newErrorResponse(msg error) *messagesResponseError {
-	return &messagesResponseError{
+func newErrorResponse(msg error) *responseError {
+	return &responseError{
 		ErrorResponse: &shared.ErrorResponse{
 			Error: shared.ErrorObjectUnion{
 				Message: msg.Error(),
@@ -536,7 +536,7 @@ func newErrorResponse(msg error) *messagesResponseError {
 	}
 }
 
-func (a *messagesResponseError) Error() string {
+func (a *responseError) Error() string {
 	if a.ErrorResponse == nil {
 		return ""
 	}