Make HTTPClient.createRequest non-async

Author: mattt

Sources/HuggingFace/Hub/HubClient+Files.swift

@@ -47,7 +47,7 @@ public extension HubClient {
         message: String? = nil
     ) async throws -> (path: String, commit: String?) {
         let urlPath = "/api/\(kind.pluralized)/\(repo)/upload/\(branch)"
-        var request = try await httpClient.createRequest(.post, urlPath)
+        var request = try httpClient.createRequest(.post, urlPath)
 
         let boundary = "----hf-\(UUID().uuidString)"
         request.setValue(
@@ -184,7 +184,7 @@ public extension HubClient {
     ) async throws -> Data {
         let endpoint = useRaw ? "raw" : "resolve"
         let urlPath = "/\(repo)/\(endpoint)/\(revision)/\(repoPath)"
-        var request = try await httpClient.createRequest(.get, urlPath)
+        var request = try httpClient.createRequest(.get, urlPath)
         request.cachePolicy = cachePolicy
 
         let (data, response) = try await session.data(for: request)
@@ -216,7 +216,7 @@ public extension HubClient {
     ) async throws -> URL {
         let endpoint = useRaw ? "raw" : "resolve"
         let urlPath = "/\(repo)/\(endpoint)/\(revision)/\(repoPath)"
-        var request = try await httpClient.createRequest(.get, urlPath)
+        var request = try httpClient.createRequest(.get, urlPath)
         request.cachePolicy = cachePolicy
 
         let (tempURL, response) = try await session.download(
@@ -421,7 +421,7 @@ public extension HubClient {
         revision: String = "main"
     ) async throws -> File {
         let urlPath = "/\(repo)/resolve/\(revision)/\(repoPath)"
-        var request = try await httpClient.createRequest(.head, urlPath)
+        var request = try httpClient.createRequest(.head, urlPath)
         request.setValue("bytes=0-0", forHTTPHeaderField: "Range")
 
         do {

Sources/HuggingFace/Shared/HTTPClient.swift

@@ -71,7 +71,7 @@ final class HTTPClient: @unchecked Sendable {
         params: [String: Value]? = nil,
         headers: [String: String]? = nil
     ) async throws -> T {
-        let request = try await createRequest(method, path, params: params, headers: headers)
+        let request = try createRequest(method, path, params: params, headers: headers)
         let (data, response) = try await session.data(for: request)
         let httpResponse = try validateResponse(response, data: data)
 
@@ -98,7 +98,7 @@ final class HTTPClient: @unchecked Sendable {
         params: [String: Value]? = nil,
         headers: [String: String]? = nil
     ) async throws -> PaginatedResponse<T> {
-        let request = try await createRequest(method, path, params: params, headers: headers)
+        let request = try createRequest(method, path, params: params, headers: headers)
         let (data, response) = try await session.data(for: request)
         let httpResponse = try validateResponse(response, data: data)
 
@@ -123,7 +123,7 @@ final class HTTPClient: @unchecked Sendable {
         AsyncThrowingStream { @Sendable continuation in
             let task = Task {
                 do {
-                    let request = try await createRequest(method, path, params: params, headers: headers)
+                    let request = try createRequest(method, path, params: params, headers: headers)
                     let (bytes, response) = try await session.bytes(for: request)
                     let httpResponse = try validateResponse(response)
 
@@ -176,7 +176,7 @@ final class HTTPClient: @unchecked Sendable {
         params: [String: Value]? = nil,
         headers: [String: String]? = nil
     ) async throws -> Data {
-        let request = try await createRequest(method, path, params: params, headers: headers)
+        let request = try createRequest(method, path, params: params, headers: headers)
         let (data, response) = try await session.data(for: request)
         let _ = try validateResponse(response, data: data)
 
@@ -188,7 +188,7 @@ final class HTTPClient: @unchecked Sendable {
         _ path: String,
         params: [String: Value]? = nil,
         headers: [String: String]? = nil
-    ) async throws -> URLRequest {
+    ) throws -> URLRequest {
         var urlComponents = URLComponents(url: host, resolvingAgainstBaseURL: true)
         urlComponents?.path = path
 
@@ -230,7 +230,7 @@ final class HTTPClient: @unchecked Sendable {
         }
 
         // Get authentication token from provider
-        if let token = try await tokenProvider.getToken() {
+        if let token = try tokenProvider.getToken() {
             request.addValue("Bearer \(token)", forHTTPHeaderField: "Authorization")
         }
 

Sources/HuggingFace/Shared/TokenProvider.swift

@@ -177,27 +177,31 @@ public indirect enum TokenProvider: Sendable {
     /// let token = try await provider.getToken()
     /// // Returns: "hf_abc123"
     /// ```
-    public func getToken() async throws -> String? {
+    public func getToken() throws -> String? {
         switch self {
         case .fixed(let token):
             return token
 
         case .environment:
-            return try await getTokenFromEnvironment()
+            return try getTokenFromEnvironment()
 
         case .oauth(let manager):
-            return try await manager.getValidToken()
+            fatalError(
+                "OAuth token provider requires async context. Use getToken() in an async context or switch to a synchronous provider."
+            )
 
         case .composite(let providers):
             for provider in providers {
-                if let token = try await provider.getToken() {
+                if let token = try provider.getToken() {
                     return token
                 }
             }
             return nil
 
         case .custom(let implementation):
-            return try await implementation()
+            fatalError(
+                "Custom async token provider requires async context. Use getToken() in an async context or switch to a synchronous provider."
+            )
 
         case .none:
             return nil
@@ -267,7 +271,7 @@ private func readTokenFromPath(_ path: String, fileManager: FileManager = .defau
 private func getTokenFromEnvironment(
     _ env: [String: String] = ProcessInfo.processInfo.environment,
     fileManager: FileManager = .default
-) async throws -> String? {
+) throws -> String? {
     let tokenSources: [() -> String?] = [
         { env["HF_TOKEN"] },
         { env["HUGGING_FACE_HUB_TOKEN"] },