Skip to content

Feature/throw bad responses #60

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

Open
ConfusedVorlon wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Feature/throw bad responses #60

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3c3132f
throw errors for non-200 responses
ConfusedVorlon Mar 22, 2023
60481df
Use a custom error type
ConfusedVorlon Mar 24, 2023
e49657a
use existing error struct
ConfusedVorlon Mar 24, 2023
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
13 changes: 13 additions & 0 deletions Sources/OpenAISwift/OpenAISwift.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import FoundationXML
public enum OpenAIError: Error {
case genericError(error: Error)
case decodingError(error: Error)
case badResponse(code: Int, response: String?)
}

public class OpenAISwift {
Expand Down Expand Up @@ -170,8 +171,20 @@ extension OpenAISwift {
private func makeRequest(request: URLRequest, completionHandler: @escaping (Result<Data, Error>) -> Void) {
let session = config.session
let task = session.dataTask(with: request) { (data, response, error) in

if let error = error {
completionHandler(.failure(error))
} else if let response = response as? HTTPURLResponse,
!(200...299).contains(response.statusCode) {
//Responses outside the 2xx range don't necessarily throw errors, but we should treat them as errors
//E.g. a rejected api key will generate a 401 and a helpful message, but no error
let code = response.statusCode
var responseString:String?
if let data {
responseString = String(data:data,encoding: .utf8)
}

completionHandler(.failure(OpenAIError.badResponse(code: code, response: responseString)))
} else if let data = data {
completionHandler(.success(data))
}
Expand Down