remove URLSession to work with Ubuntu

Author: ensan-hcl

Sources/Hub/HubApi.swift

@@ -73,76 +73,6 @@ public extension HubApi {
     struct SiblingsResponse: Codable {
         let siblings: [Sibling]
     }
-        
-    /// Throws error if the response code is not 20X
-    func httpGet(for url: URL) async throws -> (Data, HTTPURLResponse) {
-        var request = URLRequest(url: url)
-        if let hfToken = hfToken {
-            request.setValue("Bearer \(hfToken)", forHTTPHeaderField: "Authorization")
-        }
-        let (data, response) = try await URLSession.shared.data(for: request)
-        guard let response = response as? HTTPURLResponse else { throw Hub.HubClientError.unexpectedError }
-        
-        switch response.statusCode {
-        case 200..<300: break
-        case 400..<500: throw Hub.HubClientError.authorizationRequired
-        default: throw Hub.HubClientError.httpStatusCode(response.statusCode)
-        }
-
-        return (data, response)
-    }
-    
-    /// Throws error if page does not exist or is not accessible.
-    /// Allows relative redirects but ignores absolute ones for LFS files.
-    func httpHead(for url: URL) async throws -> (Data, HTTPURLResponse) {
-        var request = URLRequest(url: url)
-        request.httpMethod = "HEAD"
-        if let hfToken = hfToken {
-            request.setValue("Bearer \(hfToken)", forHTTPHeaderField: "Authorization")
-        }
-        request.setValue("identity", forHTTPHeaderField: "Accept-Encoding")
-        
-        let redirectDelegate = RedirectDelegate()
-        let session = URLSession(configuration: .default, delegate: redirectDelegate, delegateQueue: nil)
-        
-        let (data, response) = try await session.data(for: request)
-        guard let response = response as? HTTPURLResponse else { throw Hub.HubClientError.unexpectedError }
-
-        switch response.statusCode {
-        case 200..<400: break // Allow redirects to pass through to the redirect delegate
-        case 400..<500: throw Hub.HubClientError.authorizationRequired
-        default: throw Hub.HubClientError.httpStatusCode(response.statusCode)
-        }
-                
-        return (data, response)
-    }
-    
-    func getFilenames(from repo: Repo, matching globs: [String] = []) async throws -> [String] {
-        // Read repo info and only parse "siblings"
-        let url = URL(string: "\(endpoint)/api/\(repo.type)/\(repo.id)")!
-        let (data, _) = try await httpGet(for: url)
-        let response = try JSONDecoder().decode(SiblingsResponse.self, from: data)
-        let filenames = response.siblings.map { $0.rfilename }
-        guard globs.count > 0 else { return filenames }
-        
-        var selected: Set<String> = []
-        for glob in globs {
-            selected = selected.union(filenames.matching(glob: glob))
-        }
-        return Array(selected)
-    }
-    
-    func getFilenames(from repoId: String, matching globs: [String] = []) async throws -> [String] {
-        return try await getFilenames(from: Repo(id: repoId), matching: globs)
-    }
-    
-    func getFilenames(from repo: Repo, matching glob: String) async throws -> [String] {
-        return try await getFilenames(from: repo, matching: [glob])
-    }
-    
-    func getFilenames(from repoId: String, matching glob: String) async throws -> [String] {
-        return try await getFilenames(from: Repo(id: repoId), matching: [glob])
-    }
 }
 
 /// Additional Errors
@@ -178,20 +108,6 @@ public extension HubApi {
     }
 }
 
-/// Whoami
-public extension HubApi {
-    func whoami() async throws -> Config {
-        guard hfToken != nil else { throw Hub.HubClientError.authorizationRequired }
-        
-        let url = URL(string: "\(endpoint)/api/whoami-v2")!
-        let (data, _) = try await httpGet(for: url)
-
-        let parsed = try JSONSerialization.jsonObject(with: data, options: [])
-        guard let dictionary = parsed as? [NSString: Any] else { throw Hub.HubClientError.parse }
-        return Config(dictionary)
-    }
-}
-
 /// Snaphsot download
 public extension HubApi {
     func localRepoLocation(_ repo: Repo) -> URL {
@@ -236,130 +152,10 @@ public extension HubApi {
         guard let etag = etag else { return nil }
         return etag.trimmingPrefix("W/").trimmingCharacters(in: CharacterSet(charactersIn: "\""))
     }
-    
-    func getFileMetadata(url: URL) async throws -> FileMetadata {
-        let (_, response) = try await httpHead(for: url)
-        let location = response.statusCode == 302 ? response.value(forHTTPHeaderField: "Location") : response.url?.absoluteString
-        
-        return FileMetadata(
-            commitHash: response.value(forHTTPHeaderField: "X-Repo-Commit"),
-            etag: normalizeEtag(
-                (response.value(forHTTPHeaderField: "X-Linked-Etag")) ?? (response.value(forHTTPHeaderField: "Etag"))
-            ),
-            location: location ?? url.absoluteString,
-            size: Int(response.value(forHTTPHeaderField: "X-Linked-Size") ?? response.value(forHTTPHeaderField: "Content-Length") ?? "")
-        )
-    }
-    
-    func getFileMetadata(from repo: Repo, matching globs: [String] = []) async throws -> [FileMetadata] {
-        let files = try await getFilenames(from: repo, matching: globs)
-        let url = URL(string: "\(endpoint)/\(repo.id)/resolve/main")! // TODO: revisions
-        var selectedMetadata: Array<FileMetadata> = []
-        for file in files {
-            let fileURL = url.appending(path: file)
-            selectedMetadata.append(try await getFileMetadata(url: fileURL))
-        }
-        return selectedMetadata
-    }
-    
-    func getFileMetadata(from repoId: String, matching globs: [String] = []) async throws -> [FileMetadata] {
-        return try await getFileMetadata(from: Repo(id: repoId), matching: globs)
-    }
-    
-    func getFileMetadata(from repo: Repo, matching glob: String) async throws -> [FileMetadata] {
-        return try await getFileMetadata(from: repo, matching: [glob])
-    }
-    
-    func getFileMetadata(from repoId: String, matching glob: String) async throws -> [FileMetadata] {
-        return try await getFileMetadata(from: Repo(id: repoId), matching: [glob])
-    }
-}
-
-/// Stateless wrappers that use `HubApi` instances
-public extension Hub {
-    static func getFilenames(from repo: Hub.Repo, matching globs: [String] = []) async throws -> [String] {
-        return try await HubApi.shared.getFilenames(from: repo, matching: globs)
-    }
-    
-    static func getFilenames(from repoId: String, matching globs: [String] = []) async throws -> [String] {
-        return try await HubApi.shared.getFilenames(from: Repo(id: repoId), matching: globs)
-    }
-    
-    static func getFilenames(from repo: Repo, matching glob: String) async throws -> [String] {
-        return try await HubApi.shared.getFilenames(from: repo, matching: glob)
-    }
-    
-    static func getFilenames(from repoId: String, matching glob: String) async throws -> [String] {
-        return try await HubApi.shared.getFilenames(from: Repo(id: repoId), matching: glob)
-    }
-        
-    static func whoami(token: String) async throws -> Config {
-        return try await HubApi(hfToken: token).whoami()
-    }
-    
-    static func getFileMetadata(fileURL: URL) async throws -> HubApi.FileMetadata {
-        return try await HubApi.shared.getFileMetadata(url: fileURL)
-    }
-    
-    static func getFileMetadata(from repo: Repo, matching globs: [String] = []) async throws -> [HubApi.FileMetadata] {
-        return try await HubApi.shared.getFileMetadata(from: repo, matching: globs)
-    }
-    
-    static func getFileMetadata(from repoId: String, matching globs: [String] = []) async throws -> [HubApi.FileMetadata] {
-        return try await HubApi.shared.getFileMetadata(from: Repo(id: repoId), matching: globs)
-    }
-    
-    static func getFileMetadata(from repo: Repo, matching glob: String) async throws -> [HubApi.FileMetadata] {
-        return try await HubApi.shared.getFileMetadata(from: repo, matching: [glob])
-    }
-    
-    static func getFileMetadata(from repoId: String, matching glob: String) async throws -> [HubApi.FileMetadata] {
-        return try await HubApi.shared.getFileMetadata(from: Repo(id: repoId), matching: [glob])
-    }
 }
 
 public extension [String] {
     func matching(glob: String) -> [String] {
         filter { fnmatch(glob, $0, 0) == 0 }
     }
 }
-
-/// Only allow relative redirects and reject others
-/// Reference: https://github.com/huggingface/huggingface_hub/blob/b2c9a148d465b43ab90fab6e4ebcbbf5a9df27d4/src/huggingface_hub/file_download.py#L258
-private class RedirectDelegate: NSObject, URLSessionTaskDelegate {
-    func urlSession(_ session: URLSession, task: URLSessionTask, willPerformHTTPRedirection response: HTTPURLResponse, newRequest request: URLRequest, completionHandler: @escaping (URLRequest?) -> Void) {
-        // Check if it's a redirect status code (300-399)
-        if (300...399).contains(response.statusCode) {
-            // Get the Location header
-            if let locationString = response.value(forHTTPHeaderField: "Location"),
-               let locationUrl = URL(string: locationString) {
-                
-                // Check if it's a relative redirect (no host component)
-                if locationUrl.host == nil {
-                    // For relative redirects, construct the new URL using the original request's base
-                    if let originalUrl = task.originalRequest?.url,
-                       var components = URLComponents(url: originalUrl, resolvingAgainstBaseURL: true) {
-                        // Update the path component with the relative path
-                        components.path = locationUrl.path
-                        components.query = locationUrl.query
-                        
-                        // Create new request with the resolved URL
-                        if let resolvedUrl = components.url {
-                            var newRequest = URLRequest(url: resolvedUrl)
-                            // Copy headers from original request
-                            task.originalRequest?.allHTTPHeaderFields?.forEach { key, value in
-                                newRequest.setValue(value, forHTTPHeaderField: key)
-                            }
-                            newRequest.setValue(resolvedUrl.absoluteString, forHTTPHeaderField: "Location")
-                            completionHandler(newRequest)
-                            return
-                        }
-                    }
-                }
-            }
-        }
-        
-        // For all other cases (non-redirects or absolute redirects), prevent redirect
-        completionHandler(nil)
-    }
-}