diff --git a/errors.go b/errors.go index 5a86b256d27ba64dd37144a72e2cd939ef1d2ca2..1c77c1f709bb2d9eae94074006568e3c38759305 100644 --- a/errors.go +++ b/errors.go @@ -11,7 +11,6 @@ var markerSymbol = "fantasy.error" // AIError is a custom error type for AI SDK related errors. type AIError struct { - Name string Message string Cause error marker string @@ -28,9 +27,8 @@ func (e *AIError) Unwrap() error { } // NewAIError creates a new AI SDK Error. -func NewAIError(name, message string, cause error) *AIError { +func NewAIError(message string, cause error) *AIError { return &AIError{ - Name: name, Message: message, Cause: cause, marker: markerSymbol, @@ -61,7 +59,7 @@ func NewAPICallError(message, url string, requestDump string, statusCode int, re } return &APICallError{ - AIError: NewAIError("AI_APICallError", message, cause), + AIError: NewAIError(message, cause), URL: url, RequestDump: requestDump, StatusCode: statusCode, @@ -80,7 +78,7 @@ type InvalidArgumentError struct { // NewInvalidArgumentError creates a new invalid argument error. func NewInvalidArgumentError(argument, message string, cause error) *InvalidArgumentError { return &InvalidArgumentError{ - AIError: NewAIError("AI_InvalidArgumentError", message, cause), + AIError: NewAIError(message, cause), Argument: argument, } } @@ -94,7 +92,7 @@ type InvalidPromptError struct { // NewInvalidPromptError creates a new invalid prompt error. func NewInvalidPromptError(prompt any, message string, cause error) *InvalidPromptError { return &InvalidPromptError{ - AIError: NewAIError("AI_InvalidPromptError", fmt.Sprintf("Invalid prompt: %s", message), cause), + AIError: NewAIError(fmt.Sprintf("Invalid prompt: %s", message), cause), Prompt: prompt, } } @@ -112,7 +110,7 @@ func NewInvalidResponseDataError(data any, message string) *InvalidResponseDataE message = fmt.Sprintf("Invalid response data: %s.", string(dataJSON)) } return &InvalidResponseDataError{ - AIError: NewAIError("AI_InvalidResponseDataError", message, nil), + AIError: NewAIError(message, nil), Data: data, } } @@ -129,7 +127,7 @@ func NewUnsupportedFunctionalityError(functionality, message string) *Unsupporte message = fmt.Sprintf("'%s' functionality not supported.", functionality) } return &UnsupportedFunctionalityError{ - AIError: NewAIError("AI_UnsupportedFunctionalityError", message, nil), + AIError: NewAIError(message, nil), Functionality: functionality, } } diff --git a/providers/openaicompat/language_model_hooks.go b/providers/openaicompat/language_model_hooks.go index 5fa06818531331feb18b90d88f1c1948b1b961e8..f9f16b33f7cc97d46d059b444b9edf07d5ed28e0 100644 --- a/providers/openaicompat/language_model_hooks.go +++ b/providers/openaicompat/language_model_hooks.go @@ -86,7 +86,7 @@ func StreamExtraFunc(chunk openaisdk.ChatCompletionChunk, yield func(fantasy.Str if err != nil { yield(fantasy.StreamPart{ Type: fantasy.StreamPartTypeError, - Error: fantasy.NewAIError("Unexpected", "error unmarshalling delta", err), + Error: fantasy.NewAIError("error unmarshalling delta", err), }) return ctx, false } diff --git a/providers/openrouter/language_model_hooks.go b/providers/openrouter/language_model_hooks.go index 60488360bd2a7d07175c2a2a073df4171ebf850f..59a1935be43a96e297c9f590b6f844bba2388632 100644 --- a/providers/openrouter/language_model_hooks.go +++ b/providers/openrouter/language_model_hooks.go @@ -180,7 +180,7 @@ func languageModelStreamExtra(chunk openaisdk.ChatCompletionChunk, yield func(fa if err != nil { yield(fantasy.StreamPart{ Type: fantasy.StreamPartTypeError, - Error: fantasy.NewAIError("Unexpected", "error unmarshalling delta", err), + Error: fantasy.NewAIError("error unmarshalling delta", err), }) return ctx, false } diff --git a/retry.go b/retry.go index 0908bb7a5535ed435ad74c18a8fc241791e28450..4ef40d71361953837c718434559dc1a0df94c91e 100644 --- a/retry.go +++ b/retry.go @@ -34,7 +34,7 @@ type RetryError struct { // NewRetryError creates a new retry error. func NewRetryError(message string, reason RetryReason, errors []error) *RetryError { return &RetryError{ - AIError: NewAIError("AI_RetryError", message, nil), + AIError: NewAIError(message, nil), Reason: reason, Errors: errors, }