From 67e812d08d396c3d9a1cf46a7d35db3f49681725 Mon Sep 17 00:00:00 2001 From: Mattt Zmuda Date: Thu, 11 Sep 2025 05:30:09 -0700 Subject: [PATCH 1/6] Remove unused DownloadError --- Tests/HubTests/DownloaderTests.swift | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/Tests/HubTests/DownloaderTests.swift b/Tests/HubTests/DownloaderTests.swift index 09156aab..4aec8315 100644 --- a/Tests/HubTests/DownloaderTests.swift +++ b/Tests/HubTests/DownloaderTests.swift @@ -11,21 +11,6 @@ import XCTest @testable import Hub import XCTest -/// Errors that can occur during the download process -enum DownloadError: LocalizedError { - case invalidDownloadLocation - case unexpectedError - - var errorDescription: String? { - switch self { - case .invalidDownloadLocation: - String(localized: "The download location is invalid or inaccessible.", comment: "Error when download destination is invalid") - case .unexpectedError: - String(localized: "An unexpected error occurred during the download process.", comment: "Generic download error message") - } - } -} - private extension Downloader { func interruptDownload() async { await session.get()?.invalidateAndCancel() From 48da9b60a7e4120533ff3d4f14be142134873c17 Mon Sep 17 00:00:00 2001 From: Mattt Zmuda Date: Thu, 11 Sep 2025 05:34:18 -0700 Subject: [PATCH 2/6] Inline interruptDownload helper method --- Tests/HubTests/DownloaderTests.swift | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/Tests/HubTests/DownloaderTests.swift b/Tests/HubTests/DownloaderTests.swift index 4aec8315..7ce43260 100644 --- a/Tests/HubTests/DownloaderTests.swift +++ b/Tests/HubTests/DownloaderTests.swift @@ -11,12 +11,6 @@ import XCTest @testable import Hub import XCTest -private extension Downloader { - func interruptDownload() async { - await session.get()?.invalidateAndCancel() - } -} - final class DownloaderTests: XCTestCase { var tempDir: URL! @@ -149,7 +143,8 @@ final class DownloaderTests: XCTestCase { if threshold != 1.0, progress >= threshold { // Move to next threshold and interrupt threshold = threshold == 0.5 ? 0.75 : 1.0 - await downloader.interruptDownload() + // Interrupt download + await downloader.session.get()?.invalidateAndCancel() } case let .failed(error): throw error From 3e578dcc628638e39f98e071cef487f61f2412f2 Mon Sep 17 00:00:00 2001 From: Mattt Zmuda Date: Thu, 11 Sep 2025 05:35:35 -0700 Subject: [PATCH 3/6] Change MARK to TODO --- Tests/HubTests/HubApiTests.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Tests/HubTests/HubApiTests.swift b/Tests/HubTests/HubApiTests.swift index 56dfadbc..619e2d12 100644 --- a/Tests/HubTests/HubApiTests.swift +++ b/Tests/HubTests/HubApiTests.swift @@ -17,7 +17,7 @@ class HubApiTests: XCTestCase { // Put teardown code here. This method is called after the invocation of each test method in the class. } - // MARK: use a specific revision for these tests + // TODO: use a specific revision for these tests func testFilenameRetrieval() async { do { From 43bc90136a812c25a63cddf8ed90506fec50ee8d Mon Sep 17 00:00:00 2001 From: Mattt Zmuda Date: Thu, 11 Sep 2025 05:37:39 -0700 Subject: [PATCH 4/6] Remove empty overrides for setup and teardown --- Tests/HubTests/HubApiTests.swift | 8 -------- Tests/TokenizersTests/BertTokenizerTests.swift | 8 -------- 2 files changed, 16 deletions(-) diff --git a/Tests/HubTests/HubApiTests.swift b/Tests/HubTests/HubApiTests.swift index 619e2d12..7fa20b97 100644 --- a/Tests/HubTests/HubApiTests.swift +++ b/Tests/HubTests/HubApiTests.swift @@ -9,14 +9,6 @@ import XCTest @testable import Hub class HubApiTests: XCTestCase { - override func setUp() { - // Put setup code here. This method is called before the invocation of each test method in the class. - } - - override func tearDown() { - // Put teardown code here. This method is called after the invocation of each test method in the class. - } - // TODO: use a specific revision for these tests func testFilenameRetrieval() async { diff --git a/Tests/TokenizersTests/BertTokenizerTests.swift b/Tests/TokenizersTests/BertTokenizerTests.swift index a98f5092..bd72fd22 100644 --- a/Tests/TokenizersTests/BertTokenizerTests.swift +++ b/Tests/TokenizersTests/BertTokenizerTests.swift @@ -11,14 +11,6 @@ import XCTest class BertTokenizerTests: XCTestCase { - override func setUp() { - // Put setup code here. This method is called before the invocation of each test method in the class. - } - - override func tearDown() { - // Put teardown code here. This method is called after the invocation of each test method in the class. - } - lazy var bertTokenizer: BertTokenizer = { let vocab = { let url = Bundle.module.url(forResource: "bert-vocab", withExtension: "txt")! From 4581175a395559c24fc96bea2374fe57c788fff3 Mon Sep 17 00:00:00 2001 From: Mattt Zmuda Date: Thu, 11 Sep 2025 05:44:12 -0700 Subject: [PATCH 5/6] Consolidate NormalizerTests, PostProcessorTest, and PreTokenizerTests into TokenizerTests target --- .vscode/launch.json | 40 +++++++++++++++++++ Package.swift | 3 -- .../NormalizerTests.swift | 0 .../PostProcessorTests.swift | 0 .../PreTokenizerTests.swift | 0 5 files changed, 40 insertions(+), 3 deletions(-) create mode 100644 .vscode/launch.json rename Tests/{NormalizerTests => TokenizersTests}/NormalizerTests.swift (100%) rename Tests/{PostProcessorTests => TokenizersTests}/PostProcessorTests.swift (100%) rename Tests/{PreTokenizerTests => TokenizersTests}/PreTokenizerTests.swift (100%) diff --git a/.vscode/launch.json b/.vscode/launch.json new file mode 100644 index 00000000..1b1c3733 --- /dev/null +++ b/.vscode/launch.json @@ -0,0 +1,40 @@ +{ + "configurations": [ + { + "type": "swift", + "request": "launch", + "args": [], + "cwd": "${workspaceFolder:swift-transformers--main}", + "name": "Debug transformers", + "program": "${workspaceFolder:swift-transformers--main}/.build/debug/transformers", + "preLaunchTask": "swift: Build Debug transformers" + }, + { + "type": "swift", + "request": "launch", + "args": [], + "cwd": "${workspaceFolder:swift-transformers--main}", + "name": "Release transformers", + "program": "${workspaceFolder:swift-transformers--main}/.build/release/transformers", + "preLaunchTask": "swift: Build Release transformers" + }, + { + "type": "swift", + "request": "launch", + "args": [], + "cwd": "${workspaceFolder:swift-transformers--main}", + "name": "Debug hub-cli", + "program": "${workspaceFolder:swift-transformers--main}/.build/debug/hub-cli", + "preLaunchTask": "swift: Build Debug hub-cli" + }, + { + "type": "swift", + "request": "launch", + "args": [], + "cwd": "${workspaceFolder:swift-transformers--main}", + "name": "Release hub-cli", + "program": "${workspaceFolder:swift-transformers--main}/.build/release/hub-cli", + "preLaunchTask": "swift: Build Release hub-cli" + } + ] +} diff --git a/Package.swift b/Package.swift index a7bc2b2e..94905245 100644 --- a/Package.swift +++ b/Package.swift @@ -36,9 +36,6 @@ let package = Package( .target(name: "Models", dependencies: ["Tokenizers", "Generation", "TensorUtils"]), .testTarget(name: "TokenizersTests", dependencies: ["Tokenizers", "Models", "Hub"], resources: [.process("Resources"), .process("Vocabs")]), .testTarget(name: "HubTests", dependencies: ["Hub", .product(name: "Jinja", package: "Jinja")], swiftSettings: swiftSettings), - .testTarget(name: "PreTokenizerTests", dependencies: ["Tokenizers", "Hub"]), .testTarget(name: "TensorUtilsTests", dependencies: ["TensorUtils", "Models", "Hub"], resources: [.process("Resources")]), - .testTarget(name: "NormalizerTests", dependencies: ["Tokenizers", "Hub"]), - .testTarget(name: "PostProcessorTests", dependencies: ["Tokenizers", "Hub"]), ] ) diff --git a/Tests/NormalizerTests/NormalizerTests.swift b/Tests/TokenizersTests/NormalizerTests.swift similarity index 100% rename from Tests/NormalizerTests/NormalizerTests.swift rename to Tests/TokenizersTests/NormalizerTests.swift diff --git a/Tests/PostProcessorTests/PostProcessorTests.swift b/Tests/TokenizersTests/PostProcessorTests.swift similarity index 100% rename from Tests/PostProcessorTests/PostProcessorTests.swift rename to Tests/TokenizersTests/PostProcessorTests.swift diff --git a/Tests/PreTokenizerTests/PreTokenizerTests.swift b/Tests/TokenizersTests/PreTokenizerTests.swift similarity index 100% rename from Tests/PreTokenizerTests/PreTokenizerTests.swift rename to Tests/TokenizersTests/PreTokenizerTests.swift From 8ca4acb5b8a8c86930ec8017afb7c7c28ac66a1b Mon Sep 17 00:00:00 2001 From: Mattt Zmuda Date: Thu, 11 Sep 2025 06:08:20 -0700 Subject: [PATCH 6/6] Remove launch.json and disable automatic generation --- .vscode/launch.json | 40 ---------------------------------------- .vscode/settings.json | 4 +++- 2 files changed, 3 insertions(+), 41 deletions(-) delete mode 100644 .vscode/launch.json diff --git a/.vscode/launch.json b/.vscode/launch.json deleted file mode 100644 index 1b1c3733..00000000 --- a/.vscode/launch.json +++ /dev/null @@ -1,40 +0,0 @@ -{ - "configurations": [ - { - "type": "swift", - "request": "launch", - "args": [], - "cwd": "${workspaceFolder:swift-transformers--main}", - "name": "Debug transformers", - "program": "${workspaceFolder:swift-transformers--main}/.build/debug/transformers", - "preLaunchTask": "swift: Build Debug transformers" - }, - { - "type": "swift", - "request": "launch", - "args": [], - "cwd": "${workspaceFolder:swift-transformers--main}", - "name": "Release transformers", - "program": "${workspaceFolder:swift-transformers--main}/.build/release/transformers", - "preLaunchTask": "swift: Build Release transformers" - }, - { - "type": "swift", - "request": "launch", - "args": [], - "cwd": "${workspaceFolder:swift-transformers--main}", - "name": "Debug hub-cli", - "program": "${workspaceFolder:swift-transformers--main}/.build/debug/hub-cli", - "preLaunchTask": "swift: Build Debug hub-cli" - }, - { - "type": "swift", - "request": "launch", - "args": [], - "cwd": "${workspaceFolder:swift-transformers--main}", - "name": "Release hub-cli", - "program": "${workspaceFolder:swift-transformers--main}/.build/release/hub-cli", - "preLaunchTask": "swift: Build Release hub-cli" - } - ] -} diff --git a/.vscode/settings.json b/.vscode/settings.json index 29293adb..9b00789e 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -34,5 +34,7 @@ }, "swift.swiftEnvironmentVariables": { "DEVELOPER_DIR": "/Applications/Xcode.app" - } + }, + // Disable automatic generation of launch `launch.json` + "swift.autoGenerateLaunchConfigurations": false } \ No newline at end of file