Sync with upstream main: Gemma4 video input coexisting with our audio port

.github/workflows/integration_tests.yml

@@ -0,0 +1,72 @@
+name: Integration Tests
+
+# Heavy integration tests (Hugging Face model downloads, Metal GPU, long-running).
+# Kept out of the PR path so they never block merges
+on:
+  workflow_dispatch:
+
+permissions:
+  contents: read
+
+jobs:
+  integration_tests:
+    if: github.repository == 'ml-explore/mlx-swift-lm'
+    runs-on: [self-hosted, macos]
+    timeout-minutes: 120
+    steps:
+      - uses: actions/checkout@v6
+        with:
+          submodules: recursive
+
+      - name: Select Xcode
+        shell: bash
+        run: |
+          # The FoundationModels integration tests only build against the macOS 27
+          # SDK (canImport(FoundationModels, _version: 2)); on the macOS 26 SDK the
+          # MLXFoundationModels adapter compiles out and those tests are skipped.
+          # Prefer Xcode 27 when the runner has it so the full suite runs; otherwise
+          # fall back to the default toolchain and run the SDK-agnostic tests.
+          dev=""
+          for app in /Applications/Xcode_27*.app /Applications/Xcode-27*.app /Applications/Xcode.app; do
+            [ -d "$app" ] || continue
+            v=$("$app/Contents/Developer/usr/bin/xcodebuild" -version 2>/dev/null | head -1)
+            case "$v" in "Xcode 27"*) dev="$app/Contents/Developer" ;; esac
+            [ -n "$dev" ] && break
+          done
+          if [ -n "$dev" ]; then
+            echo "Using Xcode 27 at $dev (full suite, incl. FoundationModels tests)"
+            echo "DEVELOPER_DIR=$dev" >> "$GITHUB_ENV"
+          else
+            echo "Xcode 27 not found; using default $(xcode-select -p)."
+            echo "FoundationModels tests will be compiled out (macOS 27 SDK required)."
+          fi
+
+      - name: Verify MetalToolchain installed
+        shell: bash
+        run: xcodebuild -showComponent MetalToolchain
+
+      - name: Run IntegrationTesting tests (Xcode, macOS)
+        shell: sh
+        run: |
+          xcodebuild -version
+          swift --version
+          # Model-dependent tests must run in a single xctest worker: concurrent
+          # workers race on the shared on-disk Hugging Face cache. Disable parallel
+          # testing (see IntegrationTestingTests/.../Support/FMTestHelpers.swift).
+          xcodebuild test \
+            -project IntegrationTesting/IntegrationTesting.xcodeproj \
+            -scheme IntegrationTesting \
+            -destination 'platform=macOS' \
+            -parallel-testing-enabled NO \
+            -skipPackagePluginValidation \
+            -resultBundlePath IntegrationTesting.xcresult
+
+      - name: Upload test results
+        if: failure()
+        uses: actions/upload-artifact@v4
+        with:
+          name: integration-test-results
+          path: |
+            IntegrationTesting.xcresult
+            ~/Library/Logs/DiagnosticReports/*
+          retention-days: 7

IntegrationTesting/IntegrationTesting.xcodeproj/xcshareddata/xcschemes/IntegrationTesting.xcscheme

@@ -39,6 +39,13 @@
             </BuildableReference>
          </TestableReference>
       </Testables>
+      <EnvironmentVariables>
+         <EnvironmentVariable
+            key = "OS_ACTIVITY_MODE"
+            value = "disable"
+            isEnabled = "YES">
+         </EnvironmentVariable>
+      </EnvironmentVariables>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"

IntegrationTesting/IntegrationTestingTests/Gemma4AssistantDraftModelIntegrationTests.swift

@@ -1,8 +1,10 @@
 // Copyright © 2026 Apple Inc.
 
 import Foundation
+import HuggingFace
 import IntegrationTestHelpers
 import MLX
+import MLXHuggingFace
 import MLXLMCommon
 import MLXNN
 @_spi(Testing) import MLXVLM
@@ -35,16 +37,34 @@ private func drafterForwardFixturesOrSkip(name: String) async -> URL? {
 // on MLX runtime state and produce non-deterministic numeric divergence in
 // the Rung 2/3 forward parity assertion.
 
+/// Model ID of the 31B assistant drafter checkpoint shared by the tests below.
+private let drafter31BModelId = "mlx-community/gemma-4-31B-it-assistant-bf16"
+
+/// Pinned checkpoint revision matching the weights that were live when the
+/// Rung 4 `drafter_block` fixtures were generated. Kept in sync with
+/// `MTPRung4TokenParityTests`.
+private let drafter31BRevision = "28e92270316e89288579ec59c17939541d9ca433"
+
+/// Shared downloader for the drafter checkpoint. Fetches to the local HF
+/// cache on first use; subsequent tests and runs reuse the cache.
+private let downloader: any Downloader = #hubDownloader()
+
+private func drafter31BDirectory() async throws -> URL {
+    try await downloader.download(
+        id: drafter31BModelId,
+        revision: drafter31BRevision,
+        matching: ["*.safetensors", "*.json"],
+        useLatest: false,
+        progressHandler: { _ in }
+    )
+}
+
 @Suite(.serialized)
 struct Gemma4AssistantIntegrationTests {
 
     @Test
-    func testGemma4AssistantConfigurationDecodesRealCheckpoint() throws {
-        let drafterDir = hfSnapshotDir(modelId: "mlx-community/gemma-4-31B-it-assistant-bf16")
-        guard let drafterDir else {
-            Issue.record("31B drafter checkpoint not present in HF cache; skipping")
-            return
-        }
+    func testGemma4AssistantConfigurationDecodesRealCheckpoint() async throws {
+        let drafterDir = try await drafter31BDirectory()
         let configURL = drafterDir.appendingPathComponent("config.json")
         let data = try Data(contentsOf: configURL)
         let cfg = try JSONDecoder().decode(Gemma4AssistantConfiguration.self, from: data)
@@ -64,13 +84,8 @@ struct Gemma4AssistantIntegrationTests {
     }
 
     @Test
-    func testRung1WeightsLoadFrom31BCheckpoint() throws {
-        guard
-            let drafterDir = hfSnapshotDir(modelId: "mlx-community/gemma-4-31B-it-assistant-bf16")
-        else {
-            Issue.record("31B drafter checkpoint not in HF cache; skipping Rung 1")
-            return
-        }
+    func testRung1WeightsLoadFrom31BCheckpoint() async throws {
+        let drafterDir = try await drafter31BDirectory()
         let configURL = drafterDir.appendingPathComponent("config.json")
         let cfg = try JSONDecoder().decode(
             Gemma4AssistantConfiguration.self, from: Data(contentsOf: configURL))
@@ -86,12 +101,7 @@ struct Gemma4AssistantIntegrationTests {
         guard let fixturesDir = await drafterForwardFixturesOrSkip(name: "case_01") else {
             return
         }
-        guard
-            let drafterDir = hfSnapshotDir(modelId: "mlx-community/gemma-4-31B-it-assistant-bf16")
-        else {
-            Issue.record("31B drafter checkpoint not in HF cache; skipping Rung 2/3")
-            return
-        }
+        let drafterDir = try await drafter31BDirectory()
 
         let configURL = drafterDir.appendingPathComponent("config.json")
         let cfg = try JSONDecoder().decode(

IntegrationTesting/IntegrationTestingTests/MLXFoundationModelsIntegration/GoldenReplay/GoldenFixtureManifestTests.swift

@@ -1,6 +1,6 @@
 // Copyright © 2026 Apple Inc.
 
-#if FoundationModelsIntegration
+#if FoundationModelsIntegration && canImport(FoundationModels, _version: 2)
 
 import Testing
 import Foundation

IntegrationTesting/IntegrationTestingTests/MLXFoundationModelsIntegration/GoldenReplay/GoldenReplayTests.swift

@@ -66,7 +66,7 @@
 // Gated on both traits because the tokenizer path routes through the
 // same `loadTestModelContainer` as the bridge tests.
 
-#if FoundationModelsIntegration
+#if FoundationModelsIntegration && canImport(FoundationModels, _version: 2)
 
 import Testing
 import Foundation

IntegrationTesting/IntegrationTestingTests/MLXFoundationModelsIntegration/GoldenReplay/MalformedSchemaErrorParityTests.swift

@@ -34,7 +34,7 @@
 // Gated on both traits because the tokenizer path routes through
 // `loadTestModelContainer` the same as the other integration tests.
 
-#if FoundationModelsIntegration
+#if FoundationModelsIntegration && canImport(FoundationModels, _version: 2)
 
 import Testing
 import Foundation

IntegrationTesting/IntegrationTestingTests/MLXFoundationModelsIntegration/GuidedGeneration/GenerableRoundTripTests.swift

@@ -1,6 +1,6 @@
 // Copyright © 2025 Apple Inc.
 
-#if FoundationModelsIntegration
+#if FoundationModelsIntegration && canImport(FoundationModels, _version: 2)
 
 import Testing
 import Foundation
@@ -33,10 +33,8 @@ struct GenerableRoundTripTests {
         let stream = try await executeResponse(executor, request: request, model: model)
         var text = ""
         for try await event in stream {
-            if let response = event as? LanguageModelExecutorGenerationChannel.Response,
-                case .appendText(let delta) = response.action
-            {
-                text += delta.content
+            if case .appendText(let chunk, _, .response) = event {
+                text += chunk
             }
         }
         return text

IntegrationTesting/IntegrationTestingTests/MLXFoundationModelsIntegration/GuidedGeneration/Grammar/EmitStopSignalTests.swift

@@ -21,7 +21,7 @@
 // text because the schema -- a single `const` string field -- forces
 // the entire body as FF after the opening `{`.
 
-#if FoundationModelsIntegration
+#if FoundationModelsIntegration && canImport(FoundationModels, _version: 2)
 
 import Testing
 import Foundation

IntegrationTesting/IntegrationTestingTests/MLXFoundationModelsIntegration/GuidedGeneration/Grammar/FastForwardTokenizationDisagreementTests.swift

@@ -95,7 +95,7 @@
 // `loadTestModelContainer`. The GrammarConstraint type lives in the
 // MLXGuidedGeneration library and is always available alongside the adapter.
 
-#if FoundationModelsIntegration
+#if FoundationModelsIntegration && canImport(FoundationModels, _version: 2)
 
 import Testing
 import Foundation

IntegrationTesting/IntegrationTestingTests/MLXFoundationModelsIntegration/GuidedGeneration/Grammar/ForkIndependenceTests.swift

@@ -21,7 +21,7 @@
 // Gated on both traits because the tokenizer path routes through
 // `loadTestModelContainer`.
 
-#if FoundationModelsIntegration
+#if FoundationModelsIntegration && canImport(FoundationModels, _version: 2)
 
 import Testing
 import Foundation

IntegrationTesting/IntegrationTestingTests/MLXFoundationModelsIntegration/GuidedGeneration/Grammar/LoopInvariantsOnXGrammarTests.swift

@@ -37,7 +37,7 @@
 // `loadTestModelContainer`. `GrammarConstraint` lives in the
 // MLXGuidedGeneration library and is always available alongside the adapter.
 
-#if FoundationModelsIntegration
+#if FoundationModelsIntegration && canImport(FoundationModels, _version: 2)
 
 import Testing
 import Foundation

IntegrationTesting/IntegrationTestingTests/MLXFoundationModelsIntegration/GuidedGeneration/Grammar/RollbackDeterminismTests.swift

@@ -19,7 +19,7 @@
 // Gated on both traits because the tokenizer path routes through
 // the same `loadTestModelContainer` as the other tests.
 
-#if FoundationModelsIntegration
+#if FoundationModelsIntegration && canImport(FoundationModels, _version: 2)
 
 import Testing
 import Foundation

IntegrationTesting/IntegrationTestingTests/MLXFoundationModelsIntegration/GuidedGeneration/Grammar/TokenizerVocabExtractorTests.swift

@@ -1,6 +1,6 @@
 // Copyright © 2026 Apple Inc.
 
-#if FoundationModelsIntegration
+#if FoundationModelsIntegration && canImport(FoundationModels, _version: 2)
 
 import Testing
 import Foundation

IntegrationTesting/IntegrationTestingTests/MLXFoundationModelsIntegration/GuidedGeneration/Grammar/XGrammarBridgeTests.swift

@@ -45,7 +45,7 @@
 // fixture is not yet available. Llama-3 coverage is pending its
 // `tokenizer_llama3.json` fixture.
 
-#if FoundationModelsIntegration
+#if FoundationModelsIntegration && canImport(FoundationModels, _version: 2)
 
 import Testing
 import Foundation

IntegrationTesting/IntegrationTestingTests/MLXFoundationModelsIntegration/GuidedGeneration/GuidedGenerationBenchmarkTests.swift

@@ -1,6 +1,6 @@
 // Copyright © 2025 Apple Inc.
 
-#if FoundationModelsIntegration
+#if FoundationModelsIntegration && canImport(FoundationModels, _version: 2)
 
 import Testing
 import Foundation