Merge pull request #197 from soniqo/chore/transcribe-context-tests

Add transcribe --context parser tests and fix stale Qwen3-ASR test paths

Author: ivan-digital

Tests/AudioCLITests/AudioCLITests.swift

@@ -85,6 +85,21 @@ final class TranscribeCommandTests: XCTestCase {
         XCTAssertEqual(transcribe.language, "zh")
     }
 
+    func testDefaultContextIsNil() throws {
+        let cmd = try AudioCLI.parseAsRoot(["transcribe", "audio.wav"])
+        let transcribe = try XCTUnwrap(cmd as? TranscribeCommand)
+        XCTAssertNil(transcribe.context)
+    }
+
+    func testParsesContext() throws {
+        let cmd = try AudioCLI.parseAsRoot([
+            "transcribe", "audio.wav",
+            "--context", "Project: Meander, participants: Will, Adam"
+        ])
+        let transcribe = try XCTUnwrap(cmd as? TranscribeCommand)
+        XCTAssertEqual(transcribe.context, "Project: Meander, participants: Will, Adam")
+    }
+
     func testParsesFullModelId() throws {
         let cmd = try AudioCLI.parseAsRoot(["transcribe", "audio.wav", "-m", "org/my-custom-model"])
         let transcribe = try XCTUnwrap(cmd as? TranscribeCommand)

Tests/Qwen3ASRTests/Qwen3ASRTests.swift

@@ -198,10 +198,7 @@ final class Qwen3ASRTests: XCTestCase {
     // MARK: - Tokenizer Tests
 
     func testTokenizerLoadsVocab() throws {
-        let cacheDir = FileManager.default.urls(for: .cachesDirectory, in: .userDomainMask).first!
-            .appendingPathComponent("qwen3-asr")
-            .appendingPathComponent("aufklarer_Qwen3-ASR-0.6B-MLX-4bit")
-
+        let cacheDir = try HuggingFaceDownloader.getCacheDirectory(for: "aufklarer/Qwen3-ASR-0.6B-MLX-4bit")
         let vocabPath = cacheDir.appendingPathComponent("vocab.json")
 
         guard FileManager.default.fileExists(atPath: vocabPath.path) else {
@@ -218,10 +215,7 @@ final class Qwen3ASRTests: XCTestCase {
     }
 
     func testTokenizerLoadsAddedTokens() throws {
-        let cacheDir = FileManager.default.urls(for: .cachesDirectory, in: .userDomainMask).first!
-            .appendingPathComponent("qwen3-asr")
-            .appendingPathComponent("aufklarer_Qwen3-ASR-0.6B-MLX-4bit")
-
+        let cacheDir = try HuggingFaceDownloader.getCacheDirectory(for: "aufklarer/Qwen3-ASR-0.6B-MLX-4bit")
         let vocabPath = cacheDir.appendingPathComponent("vocab.json")
 
         guard FileManager.default.fileExists(atPath: vocabPath.path) else {
@@ -242,10 +236,7 @@ final class Qwen3ASRTests: XCTestCase {
     }
 
     func testTokenizerDecodeWithASRMarker() throws {
-        let cacheDir = FileManager.default.urls(for: .cachesDirectory, in: .userDomainMask).first!
-            .appendingPathComponent("qwen3-asr")
-            .appendingPathComponent("aufklarer_Qwen3-ASR-0.6B-MLX-4bit")
-
+        let cacheDir = try HuggingFaceDownloader.getCacheDirectory(for: "aufklarer/Qwen3-ASR-0.6B-MLX-4bit")
         let vocabPath = cacheDir.appendingPathComponent("vocab.json")
 
         guard FileManager.default.fileExists(atPath: vocabPath.path) else {
@@ -460,10 +451,7 @@ final class Qwen3ASRTests: XCTestCase {
     }
 
     func testTokenizerSkipsSpecialTokensWithPipes() throws {
-        let cacheDir = FileManager.default.urls(for: .cachesDirectory, in: .userDomainMask).first!
-            .appendingPathComponent("qwen3-asr")
-            .appendingPathComponent("aufklarer_Qwen3-ASR-0.6B-MLX-4bit")
-
+        let cacheDir = try HuggingFaceDownloader.getCacheDirectory(for: "aufklarer/Qwen3-ASR-0.6B-MLX-4bit")
         let vocabPath = cacheDir.appendingPathComponent("vocab.json")
 
         guard FileManager.default.fileExists(atPath: vocabPath.path) else {

Tests/Qwen3ASRTests/SecurityHardeningTests.swift

@@ -208,23 +208,24 @@ final class DownloadSecurityTests: XCTestCase {
         let legacyKey = modelId.replacingOccurrences(of: "/", with: "_")
         XCTAssertEqual(key, legacyKey, "New sanitized key should match legacy format for standard model IDs")
 
-        // Check the cached directory actually exists if model was downloaded
-        let cacheDir = FileManager.default.urls(for: .cachesDirectory, in: .userDomainMask).first!
-            .appendingPathComponent("qwen3-asr")
-            .appendingPathComponent(key)
-        if FileManager.default.fileExists(atPath: cacheDir.path) {
-            // Verify expected files are present
-            let vocabPath = cacheDir.appendingPathComponent("vocab.json")
-            XCTAssertTrue(FileManager.default.fileExists(atPath: vocabPath.path), "vocab.json should exist in cache")
+        // Resolve the actual cache directory via the downloader (handles both
+        // legacy flat layout and the current Hub-style nested layout).
+        // Note: getCacheDirectory creates the dir as a side effect, so check
+        // for vocab.json — not just dir existence — to detect a real cache.
+        let cacheDir = try HuggingFaceDownloader.getCacheDirectory(for: modelId)
+        let vocabPath = cacheDir.appendingPathComponent("vocab.json")
+        if FileManager.default.fileExists(atPath: vocabPath.path) {
 
             // Verify tokenizer loads from the cached path
             let tokenizer = Qwen3Tokenizer()
             try tokenizer.load(from: vocabPath)
             XCTAssertEqual(tokenizer.getTokenId(for: "<|im_start|>"), 151644)
 
-            // Verify file validation passes on real cached files
+            // Verify file validation passes on real cached files. Skip hidden
+            // entries like HuggingFace Hub's `.cache/` metadata directory —
+            // those are local bookkeeping, not downloaded artifacts.
             let contents = try FileManager.default.contentsOfDirectory(at: cacheDir, includingPropertiesForKeys: nil)
-            for file in contents {
+            for file in contents where !file.lastPathComponent.hasPrefix(".") {
                 let name = file.lastPathComponent
                 XCTAssertNoThrow(try Qwen3ASRModel.validatedRemoteFileName(name),
                     "Cached file '\(name)' should pass validation")