Accept only sendable model type in request handler

Author: Recouse

Sources/OpenAI/Models/ModelsResponse.swift

@@ -5,8 +5,8 @@
 //  Created by Firdavs Khaydarov on 15/04/2023.
 //
 
-public struct ModelsResponse: Decodable {
-    public struct Model: Decodable, Identifiable {
+public struct ModelsResponse: Decodable, Sendable {
+    public struct Model: Decodable, Identifiable, Sendable {
         public let id: String
         public let object: String
         public let created: Int

Sources/OpenAI/Request/Handler/BaseRequestHandler.swift

@@ -14,7 +14,7 @@ import FoundationNetworking
 public struct BaseRequestHandler: RequestHandler, Sendable {
     let urlSession: URLSession
     let eventSource: EventSource
-    
+
     private let decoder: JSONDecoder = .openAIDecoder
 
     private let logger = PlatformLogger(subsystem: "me.recouse.OpenAI", category: "BaseRequestHandler")
@@ -23,8 +23,8 @@ public struct BaseRequestHandler: RequestHandler, Sendable {
         self.urlSession = urlSession
         self.eventSource = eventSource
     }
-    
-    public func perform<T>(for model: T.Type, with request: Request) async throws -> T where T: Decodable {
+
+    public func perform<T>(for model: T.Type, with request: Request) async throws -> T where T: Decodable, T: Sendable {
         let urlRequest = urlRequest(from: request)
         let (data, response) = try await urlSession.data(for: urlRequest)
 
@@ -40,13 +40,13 @@ public struct BaseRequestHandler: RequestHandler, Sendable {
         let parsed = try decoder.decode(T.self, from: data)
         return parsed
     }
-    
+
     public func stream<T>(
         for model: T.Type,
         with request: Request
-    ) -> AsyncThrowingStream<T, Error> where T: Decodable {
+    ) -> AsyncThrowingStream<T, Error> where T: Decodable, T: Sendable {
         let urlRequest = urlRequest(from: request)
-        
+
         return AsyncThrowingStream { continuation in
             Task { @Sendable in
                 let dataTask = eventSource.dataTask(for: urlRequest)
@@ -91,7 +91,7 @@ public struct BaseRequestHandler: RequestHandler, Sendable {
             }
         }
     }
-    
+
     private func urlRequest(from request: Request) -> URLRequest {
         var url = URL(string: "https://\(request.host)")!
         if #available(macOS 13.0, iOS 16.0, tvOS 16.0, watchOS 9.0, *) {
@@ -109,7 +109,7 @@ public struct BaseRequestHandler: RequestHandler, Sendable {
 
         return urlRequest
     }
-    
+
     private func parseError(from data: Data, with httpStatusCode: Int) -> OpenAIError {
         do {
             let error = try decoder.decode(APIError.self, from: data)

Sources/OpenAI/Request/Handler/RequestHandler.swift

@@ -6,7 +6,7 @@
 //
 
 public protocol RequestHandler {
-    func perform<T>(for model: T.Type, with request: Request) async throws -> T where T: Decodable
-    
-    func stream<T>(for model: T.Type, with request: Request) -> AsyncThrowingStream<T, Error> where T: Decodable
+    func perform<T>(for model: T.Type, with request: Request) async throws -> T where T: Decodable, T: Sendable
+
+    func stream<T>(for model: T.Type, with request: Request) -> AsyncThrowingStream<T, Error> where T: Decodable, T: Sendable
 }