Use new options in more places

nezhyborets · nezhyborets · commit 95bb974240f3 · 2025-03-31T11:56:41.000+03:00
To fix parsing Gemini responses
diff --git a/Demo/DemoChat/Sources/ChatStore.swift b/Demo/DemoChat/Sources/ChatStore.swift
@@ -175,25 +175,25 @@ public final class ChatStore: ObservableObject {
             let chatQuery = ChatQuery(
                 messages: conversation.messages.map { message in
                     ChatQuery.ChatCompletionMessageParam(role: message.role, content: message.content)!
-                }, model: model,
+                },
+                model: model,
                 tools: functions
             )
             
             if stream {
                 try await completeConversationStreaming(
                     conversationIndex: conversationIndex,
-                    model: model,
                     query: chatQuery
                 )
             } else {
-                try await completeConversation(conversationIndex: conversationIndex, model: model, query: chatQuery)
+                try await completeConversation(conversationIndex: conversationIndex, query: chatQuery)
             }
         } catch {
             conversationErrors[conversationId] = error
         }
     }
     
-    private func completeConversation(conversationIndex: Int, model: Model, query: ChatQuery) async throws {
+    private func completeConversation(conversationIndex: Int, query: ChatQuery) async throws {
         let chatResult: ChatResult = try await openAIClient.chats(query: query)
         chatResult.choices
             .map {
@@ -212,7 +212,7 @@ public final class ChatStore: ObservableObject {
             }
     }
     
-    private func completeConversationStreaming(conversationIndex: Int, model: Model, query: ChatQuery) async throws {
+    private func completeConversationStreaming(conversationIndex: Int, query: ChatQuery) async throws {
         let chatsStream: AsyncThrowingStream<ChatStreamResult, Error> = openAIClient.chatsStream(query: query)
         
         var functionCalls = [Int: (name: String?, arguments: String)]()
diff --git a/Sources/OpenAI/OpenAI+OpenAIAsync.swift b/Sources/OpenAI/OpenAI+OpenAIAsync.swift
@@ -221,7 +221,11 @@ extension OpenAI: OpenAIAsync {
             do {
                 return try decoder.decode(ResultType.self, from: interceptedData ?? data)
             } catch {
-                throw (try? decoder.decode(APIErrorResponse.self, from: interceptedData ?? data)) ?? error
+                if let decoded = JSONResponseErrorDecoder(decoder: decoder).decodeErrorResponse(data: interceptedData ?? data) {
+                    throw decoded
+                } else {
+                    throw error
+                }
             }
         } else {
             let dataTaskStore = URLSessionDataTaskStore()
diff --git a/Sources/OpenAI/OpenAI.swift b/Sources/OpenAI/OpenAI.swift
@@ -406,7 +406,11 @@ extension OpenAI {
             do {
                 completion(.success(try decoder.decode(ResultType.self, from: data)))
             } catch {
-                completion(.failure((try? decoder.decode(APIErrorResponse.self, from: data)) ?? error))
+                if let decoded = JSONResponseErrorDecoder(decoder: decoder).decodeErrorResponse(data: data) {
+                    completion(.failure(decoded))
+                } else {
+                    completion(.failure(error))
+                }
             }
         }
     }
diff --git a/Sources/OpenAI/Private/JSONResponseErrorDecoder.swift b/Sources/OpenAI/Private/JSONResponseErrorDecoder.swift
@@ -0,0 +1,22 @@
+//
+//  JSONResponseErrorDecoder.swift
+//  OpenAI
+//
+//  Created by Oleksii Nezhyborets on 31.03.2025.
+//
+
+import Foundation
+
+struct JSONResponseErrorDecoder {
+    let decoder: JSONDecoder
+    
+    func decodeErrorResponse(data: Data) -> (any ErrorResponse)? {
+        if let decoded = try? decoder.decode(APIErrorResponse.self, from: data) {
+            return decoded
+        } else if let decoded = try? decoder.decode([GeminiAPIErrorResponse].self, from: data) {
+            return decoded[0]
+        } else {
+            return nil
+        }
+    }
+}
diff --git a/Sources/OpenAI/Private/Streaming/AudioSpeechStreamInterpreter.swift b/Sources/OpenAI/Private/Streaming/AudioSpeechStreamInterpreter.swift
@@ -28,7 +28,7 @@ final class AudioSpeechStreamInterpreter: @unchecked Sendable, StreamInterpreter
     func processData(_ data: Data) {
         executionSerializer.dispatch {
             let decoder = JSONDecoder()
-            if let decoded = try? decoder.decode(APIErrorResponse.self, from: data) {
+            if let decoded = JSONResponseErrorDecoder(decoder: decoder).decodeErrorResponse(data: data) {
                 self.onError?(decoded)
             }
             
diff --git a/Sources/OpenAI/Private/Streaming/ServerSentEventsStreamInterpreter.swift b/Sources/OpenAI/Private/Streaming/ServerSentEventsStreamInterpreter.swift
@@ -37,7 +37,7 @@ final class ServerSentEventsStreamInterpreter <ResultType: Codable & Sendable>:
     
     func processData(_ data: Data) {
         let decoder = JSONDecoder()
-        if let decoded = try? decoder.decode(APIErrorResponse.self, from: data) {
+        if let decoded = JSONResponseErrorDecoder(decoder: decoder).decodeErrorResponse(data: data) {
             onError?(decoded)
             return
         }
@@ -97,7 +97,7 @@ final class ServerSentEventsStreamInterpreter <ResultType: Codable & Sendable>:
                 let object = try decoder.decode(ResultType.self, from: jsonData)
                 onEventDispatched?(object)
             } catch {
-                if let decoded = try? decoder.decode(APIErrorResponse.self, from: jsonData) {
+                if let decoded = JSONResponseErrorDecoder(decoder: decoder).decodeErrorResponse(data: jsonData) {
                     onError?(decoded)
                     return
                 } else if index == jsonObjects.count - 1 {
diff --git a/Sources/OpenAI/Public/Errors/APIError.swift b/Sources/OpenAI/Public/Errors/APIError.swift
@@ -63,13 +63,17 @@ extension APIError: LocalizedError {
     }
 }
 
-public struct APIErrorResponse: Error, Decodable, Equatable {
+public struct APIErrorResponse: ErrorResponse {
     public let error: APIError
-}
-
-extension APIErrorResponse: LocalizedError {
     
     public var errorDescription: String? {
-        return error.errorDescription
+        error.errorDescription
     }
 }
+
+public protocol ErrorResponse: Error, Decodable, Equatable, LocalizedError {
+    associatedtype Err: Error, Decodable, Equatable, LocalizedError
+    
+    var error: Err { get }
+    var errorDescription: String? { get }
+}
diff --git a/Sources/OpenAI/Public/Errors/GeminiAPIError.swift b/Sources/OpenAI/Public/Errors/GeminiAPIError.swift
@@ -0,0 +1,26 @@
+//
+//  GeminiAPIError.swift
+//  OpenAI
+//
+//  Created by Oleksii Nezhyborets on 31.03.2025.
+//
+
+import Foundation
+
+public struct GeminiAPIErrorResponse: ErrorResponse {
+    public let error: GeminiAPIError
+    
+    public var errorDescription: String? {
+        error.errorDescription
+    }
+}
+
+public struct GeminiAPIError: Error, Decodable, Equatable, LocalizedError {
+    public let code: Int
+    public let message: String
+    public let status: String
+    
+    public var errorDescription: String? {
+        message
+    }
+}
diff --git a/Sources/OpenAI/Public/Models/ChatResult.swift b/Sources/OpenAI/Public/Models/ChatResult.swift
@@ -213,6 +213,20 @@ public struct ChatResult: Codable, Equatable, Sendable {
         case usage
         case citations
     }
+    
+    public init(from decoder: any Decoder) throws {
+        let container = try decoder.container(keyedBy: CodingKeys.self)
+        let parsingOptions = decoder.userInfo[.parsingOptions] as? ParsingOptions ?? []
+        self.id = try container.decodeString(forKey: .id, parsingOptions: parsingOptions)
+        self.object = try container.decodeString(forKey: .object, parsingOptions: parsingOptions)
+        self.created = try container.decode(Int.self, forKey: .created)
+        self.model = try container.decodeString(forKey: .model, parsingOptions: parsingOptions)
+        self.choices = try container.decode([ChatResult.Choice].self, forKey: .choices)
+        self.serviceTier = try container.decodeIfPresent(String.self, forKey: .serviceTier)
+        self.systemFingerprint = try container.decodeString(forKey: .systemFingerprint, parsingOptions: parsingOptions)
+        self.usage = try container.decodeIfPresent(ChatResult.CompletionUsage.self, forKey: .usage)
+        self.citations = try container.decodeIfPresent([String].self, forKey: .citations)
+    }
 }
 
 extension ChatQuery.ChatCompletionMessageParam {
diff --git a/Sources/OpenAI/Public/Models/ChatStreamResult.swift b/Sources/OpenAI/Public/Models/ChatStreamResult.swift
@@ -154,9 +154,9 @@ public struct ChatStreamResult: Codable, Equatable, Sendable {
         let parsingOptions = decoder.userInfo[.parsingOptions] as? ParsingOptions ?? []
         
         self.id = try container.decodeString(forKey: .id, parsingOptions: parsingOptions)
-        self.object = try container.decode(String.self, forKey: .object)
+        self.object = try container.decodeString(forKey: .object, parsingOptions: parsingOptions)
         self.created = try container.decode(TimeInterval.self, forKey: .created)
-        self.model = try container.decode(String.self, forKey: .model)
+        self.model = try container.decodeString(forKey: .model, parsingOptions: parsingOptions)
         self.citations = try container.decodeIfPresent([String].self, forKey: .citations)
         self.choices = try container.decode([ChatStreamResult.Choice].self, forKey: .choices)
         self.systemFingerprint = try container.decodeString(forKey: .systemFingerprint, parsingOptions: parsingOptions)

Original file line number	Diff line number	Diff line change
`@@ -175,25 +175,25 @@ public final class ChatStore: ObservableObject {`
`175`	`175`	`let chatQuery = ChatQuery(`
`176`	`176`	`messages: conversation.messages.map { message in`
`177`	`177`	`ChatQuery.ChatCompletionMessageParam(role: message.role, content: message.content)!`
`178`		`- }, model: model,`
	`178`	`+ },`
	`179`	`+ model: model,`
`179`	`180`	`tools: functions`
`180`	`181`	`)`
`181`	`182`
`182`	`183`	`if stream {`
`183`	`184`	`try await completeConversationStreaming(`
`184`	`185`	`conversationIndex: conversationIndex,`
`185`		`- model: model,`
`186`	`186`	`query: chatQuery`
`187`	`187`	`)`
`188`	`188`	`} else {`
`189`		`- try await completeConversation(conversationIndex: conversationIndex, model: model, query: chatQuery)`
	`189`	`+ try await completeConversation(conversationIndex: conversationIndex, query: chatQuery)`
`190`	`190`	`}`
`191`	`191`	`} catch {`
`192`	`192`	`conversationErrors[conversationId] = error`
`193`	`193`	`}`
`194`	`194`	`}`
`195`	`195`
`196`		`- private func completeConversation(conversationIndex: Int, model: Model, query: ChatQuery) async throws {`
	`196`	`+ private func completeConversation(conversationIndex: Int, query: ChatQuery) async throws {`
`197`	`197`	`let chatResult: ChatResult = try await openAIClient.chats(query: query)`
`198`	`198`	`chatResult.choices`
`199`	`199`	`.map {`
`@@ -212,7 +212,7 @@ public final class ChatStore: ObservableObject {`
`212`	`212`	`}`
`213`	`213`	`}`
`214`	`214`
`215`		`- private func completeConversationStreaming(conversationIndex: Int, model: Model, query: ChatQuery) async throws {`
	`215`	`+ private func completeConversationStreaming(conversationIndex: Int, query: ChatQuery) async throws {`
`216`	`216`	`let chatsStream: AsyncThrowingStream<ChatStreamResult, Error> = openAIClient.chatsStream(query: query)`
`217`	`217`
`218`	`218`	`var functionCalls = [Int: (name: String?, arguments: String)]()`
Original file line number	Diff line number	Diff line change
`@@ -406,7 +406,11 @@ extension OpenAI {`
`406`	`406`	`do {`
`407`	`407`	`completion(.success(try decoder.decode(ResultType.self, from: data)))`
`408`	`408`	`} catch {`
`409`		`- completion(.failure((try? decoder.decode(APIErrorResponse.self, from: data)) ?? error))`
	`409`	`+ if let decoded = JSONResponseErrorDecoder(decoder: decoder).decodeErrorResponse(data: data) {`
	`410`	`+ completion(.failure(decoded))`
	`411`	`+ } else {`
	`412`	`+ completion(.failure(error))`
	`413`	`+ }`
`410`	`414`	`}`
`411`	`415`	`}`
`412`	`416`	`}`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ final class AudioSpeechStreamInterpreter: @unchecked Sendable, StreamInterpreter`
`28`	`28`	`func processData(_ data: Data) {`
`29`	`29`	`executionSerializer.dispatch {`
`30`	`30`	`let decoder = JSONDecoder()`
`31`		`- if let decoded = try? decoder.decode(APIErrorResponse.self, from: data) {`
	`31`	`+ if let decoded = JSONResponseErrorDecoder(decoder: decoder).decodeErrorResponse(data: data) {`
`32`	`32`	`self.onError?(decoded)`
`33`	`33`	`}`
`34`	`34`
Original file line number	Diff line number	Diff line change
`@@ -63,13 +63,17 @@ extension APIError: LocalizedError {`
`63`	`63`	`}`
`64`	`64`	`}`
`65`	`65`
`66`		`-public struct APIErrorResponse: Error, Decodable, Equatable {`
	`66`	`+public struct APIErrorResponse: ErrorResponse {`
`67`	`67`	`public let error: APIError`
`68`		`-}`
`69`		`-`
`70`		`-extension APIErrorResponse: LocalizedError {`
`71`	`68`
`72`	`69`	`public var errorDescription: String? {`
`73`		`- return error.errorDescription`
	`70`	`+ error.errorDescription`
`74`	`71`	`}`
`75`	`72`	`}`
	`73`	`+`
	`74`	`+public protocol ErrorResponse: Error, Decodable, Equatable, LocalizedError {`
	`75`	`+ associatedtype Err: Error, Decodable, Equatable, LocalizedError`
	`76`	`+`
	`77`	`+ var error: Err { get }`
	`78`	`+ var errorDescription: String? { get }`
	`79`	`+}`