Skip to content

Api error details #160

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 2, 2025
Merged

Api error details #160

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eb8ae53
fix: decode api error details for streaming requests too
longseespace Jul 25, 2025
589517d
Let application decide how to construct the final error message.
longseespace Jul 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 27 additions & 9 deletions Sources/OpenAI/Public/Service/OpenAIService.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1028,10 +1028,9 @@ extension OpenAIService {
var errorMessage = "status code \(response.statusCode)"
do {
let error = try decoder.decode(OpenAIErrorResponse.self, from: data)
errorMessage += " \(error.error.message ?? "NO ERROR MESSAGE PROVIDED")"
errorMessage = error.error.message ?? "NO ERROR MESSAGE PROVIDED"
} catch {
// If decoding fails, proceed with a general error message
errorMessage = "status code \(response.statusCode)"
// If decoding fails, keep the original error message with status code
}
throw APIError.responseUnsuccessful(
description: errorMessage,
Expand Down Expand Up @@ -1077,7 +1076,7 @@ extension OpenAIService {
var errorMessage = "Status code \(response.statusCode)"
do {
let errorResponse = try decoder.decode(OpenAIErrorResponse.self, from: data)
errorMessage += " \(errorResponse.error.message ?? "NO ERROR MESSAGE PROVIDED")"
errorMessage = errorResponse.error.message ?? "NO ERROR MESSAGE PROVIDED"
} catch {
if let errorString = String(data: data, encoding: .utf8), !errorString.isEmpty {
errorMessage += " - \(errorString)"
Expand Down Expand Up @@ -1123,10 +1122,9 @@ extension OpenAIService {
var errorMessage = "status code \(response.statusCode)"
do {
let error = try decoder.decode(OpenAIErrorResponse.self, from: data)
errorMessage += " \(error.error.message ?? "NO ERROR MESSAGE PROVIDED")"
errorMessage = error.error.message ?? "NO ERROR MESSAGE PROVIDED"
} catch {
// If decoding fails, proceed with a general error message
errorMessage = "status code \(response.statusCode)"
// If decoding fails, keep the original error message with status code
}
throw APIError.responseUnsuccessful(
description: errorMessage,
Expand Down Expand Up @@ -1189,8 +1187,18 @@ extension OpenAIService {
}

guard response.statusCode == 200 else {
var errorMessage = "status code \(response.statusCode)"
do {
// For error responses, we need to get the raw data instead of using the stream
// as error responses are regular JSON, not streaming data
let (errorData, _) = try await httpClient.data(for: httpRequest)
let error = try decoder.decode(OpenAIErrorResponse.self, from: errorData)
errorMessage = error.error.message ?? "NO ERROR MESSAGE PROVIDED"
} catch {
// If decoding fails, keep the original error message with status code
}
throw APIError.responseUnsuccessful(
description: "status code \(response.statusCode)",
description: errorMessage,
statusCode: response.statusCode)
}

Expand Down Expand Up @@ -1277,8 +1285,18 @@ extension OpenAIService {
printHTTPResponse(response)

guard response.statusCode == 200 else {
var errorMessage = "status code \(response.statusCode)"
do {
// For error responses, we need to get the raw data instead of using the stream
// as error responses are regular JSON, not streaming data
let (errorData, _) = try await httpClient.data(for: httpRequest)
let error = try decoder.decode(OpenAIErrorResponse.self, from: errorData)
errorMessage = error.error.message ?? "NO ERROR MESSAGE PROVIDED"
} catch {
// If decoding fails, keep the original error message with status code
}
throw APIError.responseUnsuccessful(
description: "status code \(response.statusCode)",
description: errorMessage,
statusCode: response.statusCode)
}

Expand Down
Loading