@dvai-bridge/ios 4.0.0 → 4.0.2

package/Package.swift

@@ -1,104 +1,104 @@
-// swift-tools-version: 6.0
-import PackageDescription
-
-let package = Package(
-    name: "DVAIBridge",
-    // iOS 18.1 link-time floor: DVAIFoundationCore requires it (the
-    // FoundationModels SDK is `@available(iOS 26, *)` at runtime; 18.1 is
-    // its link-time minimum). DVAILlamaCore allows 14.0, but the package
-    // as a whole takes the highest minimum. CoreML's MLState requires
-    // iOS 18 too, so 18.1 covers everything.
-    platforms: [.iOS("18.1"), .macOS(.v14)],
-    products: [
-        .library(name: "DVAIBridge", targets: ["DVAIBridge"]),
-        .library(name: "DVAICoreMLCore", targets: ["DVAICoreMLCore"]),
-    ],
-    dependencies: [
-        // Path-dep to the cores. Identity is derived from the path's last
-        // directory name; each core has its manifest at the package root,
-        // so identities are `dvai-bridge-ios-shared-core` /
-        // `dvai-bridge-ios-llama-core` / `dvai-bridge-ios-foundation-core` /
-        // `dvai-bridge-ios-mlx-core`.
-        .package(path: "../dvai-bridge-ios-shared-core"),
-        .package(path: "../dvai-bridge-ios-llama-core"),
-        .package(path: "../dvai-bridge-ios-foundation-core"),
-        .package(path: "../dvai-bridge-ios-mlx-core"),
-        // swift-transformers — provides Tokenizers product for HuggingFace
-        // tokenizer loading. Constraint relaxed to `from: 1.2.0` to keep
-        // our resolver compatible with mlx-swift-lm 2.x (which pins
-        // swift-transformers `<1.3.0`). Our usage of AutoTokenizer.from(modelFolder:)
-        // / applyChatTemplate / encode / decode is API-compatible across
-        // 1.2.x → 1.3.x.
-        .package(url: "https://github.com/huggingface/swift-transformers.git", from: "1.2.0"),
-        // v3.2.0 — Hummingbird is the iOS HTTP server backbone (replaces
-        // Telegraph). DVAISharedCore exports it transitively via its
-        // HttpServer actor, but we pull it here too so the OffloadProxy
-        // can use it directly without a `@_implementationOnly` import
-        // gymnastics step.
-        .package(url: "https://github.com/hummingbird-project/hummingbird.git", from: "2.0.0"),
-        // v3.2.2 — JWTKit drives the offline JWT license validator
-        // (ES256 ECDSA P-256). Refuses alg=none / HMAC to defend against
-        // algorithm-confusion attacks. Same .jwt format as the JS-side
-        // validator in @dvai-bridge/core.
-        .package(url: "https://github.com/vapor/jwt-kit.git", from: "5.5.0"),
-    ],
-    targets: [
-        .target(
-            name: "DVAICoreMLCore",
-            dependencies: [
-                .product(name: "Tokenizers", package: "swift-transformers"),
-                // CoreML backend uses shared HTTP types — DOES NOT depend on
-                // DVAILlamaCore (so CoreML-only consumers don't transitively
-                // pull llama.xcframework). DVAISharedCore brings Hummingbird
-                // transitively as of v3.2.0.
-                .product(name: "DVAISharedCore", package: "dvai-bridge-ios-shared-core"),
-            ],
-            path: "ios/Sources/DVAICoreMLCore",
-            // Keep Swift 5 language mode: the existing code in this
-            // package was written before Swift 6's strict-concurrency
-            // checks landed. Bumping `swift-tools-version` to 6.0 (to
-            // pull in JWTKit 5.x) doesn't require flipping the language
-            // mode; we opt out per-target to keep the source unchanged.
-            swiftSettings: [.swiftLanguageMode(.v5)]
-        ),
-        .target(
-            name: "DVAIBridge",
-            dependencies: [
-                // DVAIBridge depends on all four backends + shared types.
-                // The llama-core dep is what brings in ModelDownloader; if a
-                // future refactor extracts that too, DVAIBridge could drop
-                // the llama-core dep when the consumer is using only
-                // .mlx / .foundation / .coreml.
-                .product(name: "DVAISharedCore", package: "dvai-bridge-ios-shared-core"),
-                .product(name: "DVAILlamaCore", package: "dvai-bridge-ios-llama-core"),
-                .product(name: "DVAIFoundationCore", package: "dvai-bridge-ios-foundation-core"),
-                .product(name: "DVAIMLXCore", package: "dvai-bridge-ios-mlx-core"),
-                "DVAICoreMLCore",
-                // v3.2 Phase 5 — outgoing-offload pre-routing proxy.
-                // Hummingbird (built on swift-nio) gives us proper
-                // streaming SSE bodies through the proxy.
-                .product(name: "Hummingbird", package: "hummingbird"),
-                // v3.2.2 — offline JWT license validator.
-                .product(name: "JWTKit", package: "jwt-kit"),
-            ],
-            path: "ios/Sources/DVAIBridge",
-            swiftSettings: [.swiftLanguageMode(.v5)]
-        ),
-        .testTarget(
-            name: "DVAIBridgeTests",
-            dependencies: [
-                "DVAIBridge",
-                .product(name: "DVAISharedCore", package: "dvai-bridge-ios-shared-core"),
-                .product(name: "DVAILlamaCore", package: "dvai-bridge-ios-llama-core"),
-                .product(name: "DVAIFoundationCore", package: "dvai-bridge-ios-foundation-core"),
-                .product(name: "DVAIMLXCore", package: "dvai-bridge-ios-mlx-core"),
-                "DVAICoreMLCore",
-                // v3.2.2 — license validator tests sign their own test
-                // tokens with a freshly generated test ES256 keypair.
-                .product(name: "JWTKit", package: "jwt-kit"),
-            ],
-            path: "ios/Tests/DVAIBridgeTests",
-            swiftSettings: [.swiftLanguageMode(.v5)]
-        ),
-    ]
-)
+// swift-tools-version: 6.0
+import PackageDescription
+
+let package = Package(
+    name: "DVAIBridge",
+    // iOS 18.1 link-time floor: DVAIFoundationCore requires it (the
+    // FoundationModels SDK is `@available(iOS 26, *)` at runtime; 18.1 is
+    // its link-time minimum). DVAILlamaCore allows 14.0, but the package
+    // as a whole takes the highest minimum. CoreML's MLState requires
+    // iOS 18 too, so 18.1 covers everything.
+    platforms: [.iOS("18.1"), .macOS(.v14)],
+    products: [
+        .library(name: "DVAIBridge", targets: ["DVAIBridge"]),
+        .library(name: "DVAICoreMLCore", targets: ["DVAICoreMLCore"]),
+    ],
+    dependencies: [
+        // Path-dep to the cores. Identity is derived from the path's last
+        // directory name; each core has its manifest at the package root,
+        // so identities are `dvai-bridge-ios-shared-core` /
+        // `dvai-bridge-ios-llama-core` / `dvai-bridge-ios-foundation-core` /
+        // `dvai-bridge-ios-mlx-core`.
+        .package(path: "../dvai-bridge-ios-shared-core"),
+        .package(path: "../dvai-bridge-ios-llama-core"),
+        .package(path: "../dvai-bridge-ios-foundation-core"),
+        .package(path: "../dvai-bridge-ios-mlx-core"),
+        // swift-transformers — provides Tokenizers product for HuggingFace
+        // tokenizer loading. Constraint relaxed to `from: 1.2.0` to keep
+        // our resolver compatible with mlx-swift-lm 2.x (which pins
+        // swift-transformers `<1.3.0`). Our usage of AutoTokenizer.from(modelFolder:)
+        // / applyChatTemplate / encode / decode is API-compatible across
+        // 1.2.x → 1.3.x.
+        .package(url: "https://github.com/huggingface/swift-transformers.git", from: "1.2.0"),
+        // v3.2.0 — Hummingbird is the iOS HTTP server backbone (replaces
+        // Telegraph). DVAISharedCore exports it transitively via its
+        // HttpServer actor, but we pull it here too so the OffloadProxy
+        // can use it directly without a `@_implementationOnly` import
+        // gymnastics step.
+        .package(url: "https://github.com/hummingbird-project/hummingbird.git", from: "2.0.0"),
+        // v3.2.2 — JWTKit drives the offline JWT license validator
+        // (ES256 ECDSA P-256). Refuses alg=none / HMAC to defend against
+        // algorithm-confusion attacks. Same .jwt format as the JS-side
+        // validator in @dvai-bridge/core.
+        .package(url: "https://github.com/vapor/jwt-kit.git", from: "5.5.0"),
+    ],
+    targets: [
+        .target(
+            name: "DVAICoreMLCore",
+            dependencies: [
+                .product(name: "Tokenizers", package: "swift-transformers"),
+                // CoreML backend uses shared HTTP types — DOES NOT depend on
+                // DVAILlamaCore (so CoreML-only consumers don't transitively
+                // pull llama.xcframework). DVAISharedCore brings Hummingbird
+                // transitively as of v3.2.0.
+                .product(name: "DVAISharedCore", package: "dvai-bridge-ios-shared-core"),
+            ],
+            path: "ios/Sources/DVAICoreMLCore",
+            // Keep Swift 5 language mode: the existing code in this
+            // package was written before Swift 6's strict-concurrency
+            // checks landed. Bumping `swift-tools-version` to 6.0 (to
+            // pull in JWTKit 5.x) doesn't require flipping the language
+            // mode; we opt out per-target to keep the source unchanged.
+            swiftSettings: [.swiftLanguageMode(.v5)]
+        ),
+        .target(
+            name: "DVAIBridge",
+            dependencies: [
+                // DVAIBridge depends on all four backends + shared types.
+                // The llama-core dep is what brings in ModelDownloader; if a
+                // future refactor extracts that too, DVAIBridge could drop
+                // the llama-core dep when the consumer is using only
+                // .mlx / .foundation / .coreml.
+                .product(name: "DVAISharedCore", package: "dvai-bridge-ios-shared-core"),
+                .product(name: "DVAILlamaCore", package: "dvai-bridge-ios-llama-core"),
+                .product(name: "DVAIFoundationCore", package: "dvai-bridge-ios-foundation-core"),
+                .product(name: "DVAIMLXCore", package: "dvai-bridge-ios-mlx-core"),
+                "DVAICoreMLCore",
+                // v3.2 Phase 5 — outgoing-offload pre-routing proxy.
+                // Hummingbird (built on swift-nio) gives us proper
+                // streaming SSE bodies through the proxy.
+                .product(name: "Hummingbird", package: "hummingbird"),
+                // v3.2.2 — offline JWT license validator.
+                .product(name: "JWTKit", package: "jwt-kit"),
+            ],
+            path: "ios/Sources/DVAIBridge",
+            swiftSettings: [.swiftLanguageMode(.v5)]
+        ),
+        .testTarget(
+            name: "DVAIBridgeTests",
+            dependencies: [
+                "DVAIBridge",
+                .product(name: "DVAISharedCore", package: "dvai-bridge-ios-shared-core"),
+                .product(name: "DVAILlamaCore", package: "dvai-bridge-ios-llama-core"),
+                .product(name: "DVAIFoundationCore", package: "dvai-bridge-ios-foundation-core"),
+                .product(name: "DVAIMLXCore", package: "dvai-bridge-ios-mlx-core"),
+                "DVAICoreMLCore",
+                // v3.2.2 — license validator tests sign their own test
+                // tokens with a freshly generated test ES256 keypair.
+                .product(name: "JWTKit", package: "jwt-kit"),
+            ],
+            path: "ios/Tests/DVAIBridgeTests",
+            swiftSettings: [.swiftLanguageMode(.v5)]
+        ),
+    ]
+)

package/ios/Sources/DVAIBridge/BackendKind.swift

@@ -1,23 +1,23 @@
-import Foundation
-
-/// Inference backend used by `DVAIBridge.shared.start(...)`.
-public enum BackendKind: String, Sendable, Codable, CaseIterable {
-    /// Resolve the best available backend at runtime.
-    case auto
-    /// llama.cpp via Metal (iOS) — the broad-compatibility default.
-    case llama
-    /// Apple Foundation Models (LanguageModelSession). Requires iOS 26+ at runtime.
-    /// SwiftPM-only: omitted from CocoaPods builds (the `import FoundationModels`
-    /// auto-link directive references private frameworks CocoaPods consumers
-    /// cannot link). Selecting this under CocoaPods throws `backendUnavailable`.
-    case foundation
-    /// CoreML / Apple Neural Engine via `MLModel` + `MLState` (iOS 18+).
-    case coreml
-    /// MLX — Apple Silicon GPU/Neural Engine via `mlx-swift-lm`. Apple-Silicon
-    /// only at runtime; the iOS Simulator on Intel hosts has no MLX device.
-    /// Loads HuggingFace MLX-converted checkpoints (e.g.
-    /// "mlx-community/Llama-3.2-1B-Instruct-4bit"). SwiftPM-only for the
-    /// same reasons as `.foundation` — the mlx-swift-lm transitive deps
-    /// don't publish CocoaPods specs.
-    case mlx
-}
+import Foundation
+
+/// Inference backend used by `DVAIBridge.shared.start(...)`.
+public enum BackendKind: String, Sendable, Codable, CaseIterable {
+    /// Resolve the best available backend at runtime.
+    case auto
+    /// llama.cpp via Metal (iOS) — the broad-compatibility default.
+    case llama
+    /// Apple Foundation Models (LanguageModelSession). Requires iOS 26+ at runtime.
+    /// SwiftPM-only: omitted from CocoaPods builds (the `import FoundationModels`
+    /// auto-link directive references private frameworks CocoaPods consumers
+    /// cannot link). Selecting this under CocoaPods throws `backendUnavailable`.
+    case foundation
+    /// CoreML / Apple Neural Engine via `MLModel` + `MLState` (iOS 18+).
+    case coreml
+    /// MLX — Apple Silicon GPU/Neural Engine via `mlx-swift-lm`. Apple-Silicon
+    /// only at runtime; the iOS Simulator on Intel hosts has no MLX device.
+    /// Loads HuggingFace MLX-converted checkpoints (e.g.
+    /// "mlx-community/Llama-3.2-1B-Instruct-4bit"). SwiftPM-only for the
+    /// same reasons as `.foundation` — the mlx-swift-lm transitive deps
+    /// don't publish CocoaPods specs.
+    case mlx
+}

package/ios/Sources/DVAIBridge/BoundServer.swift

@@ -1,46 +1,46 @@
-import Foundation
-
-public struct BoundServer: Sendable, Equatable {
-    public let baseUrl: String
-    public let port: Int
-    public let backend: BackendKind
-    public let modelId: String
-    /// v3.2.2 — the license status the validator reported at startup.
-    /// `nil` when `DVAIBridge.start(_:)` was called without going through
-    /// the license gate (e.g. legacy test fixtures). `commercial` / `trial`
-    /// on the paid path; `freeDev` on debug / simulator. The two failure
-    /// cases (`freeProd` / `freeExpired`) never make it here because
-    /// `start(_:)` throws `LicenseRequiredError` before constructing
-    /// `BoundServer`.
-    public let licenseStatus: LicenseStatus?
-
-    public init(
-        baseUrl: String,
-        port: Int,
-        backend: BackendKind,
-        modelId: String,
-        licenseStatus: LicenseStatus? = nil
-    ) {
-        self.baseUrl = baseUrl
-        self.port = port
-        self.backend = backend
-        self.modelId = modelId
-        self.licenseStatus = licenseStatus
-    }
-
-    /// Construct from the underlying core PluginState's `[String: Any]` result.
-    internal init(coreResult: [String: Any], backend: BackendKind, licenseStatus: LicenseStatus? = nil) throws {
-        guard let baseUrl = coreResult["baseUrl"] as? String,
-              let port = (coreResult["port"] as? Int) ?? (coreResult["port"] as? NSNumber)?.intValue
-        else {
-            throw DVAIBridgeError.backendError(underlying: "core PluginState returned malformed start result")
-        }
-        let modelId = (coreResult["modelId"] as? String) ?? ""
-        self.init(baseUrl: baseUrl, port: port, backend: backend, modelId: modelId, licenseStatus: licenseStatus)
-    }
-
-    /// v3.2.2 — derive a copy with the license status attached.
-    internal func with(licenseStatus: LicenseStatus?) -> BoundServer {
-        BoundServer(baseUrl: baseUrl, port: port, backend: backend, modelId: modelId, licenseStatus: licenseStatus)
-    }
-}
+import Foundation
+
+public struct BoundServer: Sendable, Equatable {
+    public let baseUrl: String
+    public let port: Int
+    public let backend: BackendKind
+    public let modelId: String
+    /// v3.2.2 — the license status the validator reported at startup.
+    /// `nil` when `DVAIBridge.start(_:)` was called without going through
+    /// the license gate (e.g. legacy test fixtures). `commercial` / `trial`
+    /// on the paid path; `freeDev` on debug / simulator. The two failure
+    /// cases (`freeProd` / `freeExpired`) never make it here because
+    /// `start(_:)` throws `LicenseRequiredError` before constructing
+    /// `BoundServer`.
+    public let licenseStatus: LicenseStatus?
+
+    public init(
+        baseUrl: String,
+        port: Int,
+        backend: BackendKind,
+        modelId: String,
+        licenseStatus: LicenseStatus? = nil
+    ) {
+        self.baseUrl = baseUrl
+        self.port = port
+        self.backend = backend
+        self.modelId = modelId
+        self.licenseStatus = licenseStatus
+    }
+
+    /// Construct from the underlying core PluginState's `[String: Any]` result.
+    internal init(coreResult: [String: Any], backend: BackendKind, licenseStatus: LicenseStatus? = nil) throws {
+        guard let baseUrl = coreResult["baseUrl"] as? String,
+              let port = (coreResult["port"] as? Int) ?? (coreResult["port"] as? NSNumber)?.intValue
+        else {
+            throw DVAIBridgeError.backendError(underlying: "core PluginState returned malformed start result")
+        }
+        let modelId = (coreResult["modelId"] as? String) ?? ""
+        self.init(baseUrl: baseUrl, port: port, backend: backend, modelId: modelId, licenseStatus: licenseStatus)
+    }
+
+    /// v3.2.2 — derive a copy with the license status attached.
+    internal func with(licenseStatus: LicenseStatus?) -> BoundServer {
+        BoundServer(baseUrl: baseUrl, port: port, backend: backend, modelId: modelId, licenseStatus: licenseStatus)
+    }
+}