addressing comments + renaming

sanchitmonga22 · sanchitmonga22 · commit 16356e8d0f16 · 2026-02-22T12:16:36.000-08:00
diff --git a/Playground/YapRun/YapRun.xcodeproj/project.pbxproj b/Playground/YapRun/YapRun.xcodeproj/project.pbxproj
@@ -373,7 +373,7 @@
 			mainGroup = 54398FB12F4979D2009D6B51;
 			minimizedProjectReferenceProxies = 1;
 			packageReferences = (
-				543991CB2F498152009D6B51 /* XCLocalSwiftPackageReference "runanywhere-sdks" */,
+				543991CB2F498152009D6B51 /* XCRemoteSwiftPackageReference "runanywhere-sdks" */,
 			);
 			preferredProjectObjectVersion = 77;
 			productRefGroup = 54398FBB2F4979D2009D6B51 /* Products */;
@@ -992,24 +992,31 @@
 		};
 /* End XCConfigurationList section */
 
-/* Begin XCLocalSwiftPackageReference section */
-		543991CB2F498152009D6B51 /* XCLocalSwiftPackageReference "runanywhere-sdks" */ = {
-			isa = XCLocalSwiftPackageReference;
-			relativePath = "../..";
+/* Begin XCRemoteSwiftPackageReference section */
+		543991CB2F498152009D6B51 /* XCRemoteSwiftPackageReference "runanywhere-sdks" */ = {
+			isa = XCRemoteSwiftPackageReference;
+			repositoryURL = "https://github.com/RunanywhereAI/runanywhere-sdks";
+			requirement = {
+				kind = upToNextMajorVersion;
+				minimumVersion = 0.19.2;
+			};
 		};
-/* End XCLocalSwiftPackageReference section */
+/* End XCRemoteSwiftPackageReference section */
 
 /* Begin XCSwiftPackageProductDependency section */
 		543991CC2F498152009D6B51 /* RunAnywhere */ = {
 			isa = XCSwiftPackageProductDependency;
+			package = 543991CB2F498152009D6B51 /* XCRemoteSwiftPackageReference "runanywhere-sdks" */;
 			productName = RunAnywhere;
 		};
 		543991CE2F498152009D6B51 /* RunAnywhereONNX */ = {
 			isa = XCSwiftPackageProductDependency;
+			package = 543991CB2F498152009D6B51 /* XCRemoteSwiftPackageReference "runanywhere-sdks" */;
 			productName = RunAnywhereONNX;
 		};
 		543991D02F498152009D6B51 /* RunAnywhereWhisperKit */ = {
 			isa = XCSwiftPackageProductDependency;
+			package = 543991CB2F498152009D6B51 /* XCRemoteSwiftPackageReference "runanywhere-sdks" */;
 			productName = RunAnywhereWhisperKit;
 		};
 /* End XCSwiftPackageProductDependency section */
diff --git a/Playground/YapRun/YapRun.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Playground/YapRun/YapRun.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
diff --git a/Playground/YapRun/YapRun/Core/ModelRegistry.swift b/Playground/YapRun/YapRun/Core/ModelRegistry.swift
@@ -64,15 +64,15 @@ enum ModelRegistry {
             name: "Whisper Tiny EN (WhisperKit)",
             url: URL(string: "https://github.com/RunanywhereAI/sherpa-onnx/releases/download/runanywhere-models-v2/whisperkit-tiny.en.tar.gz")!,
             archiveType: .tarGz,
-            framework: .whisperKit,
+            framework: .whisperKitCoreML,
             sizeBytes: 70_000_000
         ),
         ASRModel(
             id: "whisperkit-base.en",
             name: "Whisper Base EN (WhisperKit)",
             url: URL(string: "https://github.com/RunanywhereAI/sherpa-onnx/releases/download/runanywhere-models-v2/whisperkit-base.en.tar.gz")!,
             archiveType: .tarGz,
-            framework: .whisperKit,
+            framework: .whisperKitCoreML,
             sizeBytes: 134_000_000
         ),
     ]
diff --git a/Playground/YapRun/YapRun/Features/Home/HomeViewModel.swift b/Playground/YapRun/YapRun/Features/Home/HomeViewModel.swift
@@ -247,7 +247,7 @@ extension ModelInfo {
         case .llamaCpp:         return .purple
         case .foundationModels: return .blue
         case .coreml:           return .cyan
-        case .whisperKit:       return .green
+        case .whisperKitCoreML:  return .green
         default:                return .gray
         }
     }
diff --git a/examples/ios/RunAnywhereAI/RunAnywhereAI/App/RunAnywhereAIApp.swift b/examples/ios/RunAnywhereAI/RunAnywhereAI/App/RunAnywhereAIApp.swift
@@ -175,17 +175,8 @@ struct RunAnywhereAIApp: App {
     private func registerModulesAndModels() async { // swiftlint:disable:this function_body_length
         logger.info("📦 Registering modules with their models...")
 
-        // Register LlamaCPP backend with C++ commons
-        LlamaCPP.register(priority: 100)
-        logger.info("✅ LlamaCPP backend registered")
-
-        // Register ONNX backend service providers
-        ONNX.register(priority: 100)
-        logger.info("✅ ONNX backend registered")
-
-        // Register WhisperKit (Apple Neural Engine STT)
-        WhisperKitSTT.register(priority: 200)
-        logger.info("✅ WhisperKit STT backend registered")
+        // NOTE: LlamaCPP, ONNX, and WhisperKitSTT backends are registered once
+        // in initializeSDK() before any await. No duplicate registration needed here.
 
         // Register LLM models using the new RunAnywhere.registerModel API
         // Using explicit IDs ensures models are recognized after download across app restarts
@@ -362,7 +353,7 @@ struct RunAnywhereAIApp: App {
                 id: "whisperkit-tiny.en",
                 name: "Whisper Tiny EN (WhisperKit)",
                 url: whisperKitTinyURL,
-                framework: .whisperKit,
+                framework: .whisperKitCoreML,
                 modality: .speechRecognition,
                 artifactType: .archive(.tarGz, structure: .nestedDirectory),
                 memoryRequirement: 70_000_000
@@ -373,7 +364,7 @@ struct RunAnywhereAIApp: App {
                 id: "whisperkit-base.en",
                 name: "Whisper Base EN (WhisperKit)",
                 url: whisperKitBaseURL,
-                framework: .whisperKit,
+                framework: .whisperKitCoreML,
                 modality: .speechRecognition,
                 artifactType: .archive(.tarGz, structure: .nestedDirectory),
                 memoryRequirement: 134_000_000
diff --git a/sdk/runanywhere-commons/include/rac/infrastructure/model_management/rac_model_types.h b/sdk/runanywhere-commons/include/rac/infrastructure/model_management/rac_model_types.h
@@ -185,7 +185,7 @@ typedef enum rac_inference_framework {
     RAC_FRAMEWORK_NONE = 6,              /**< No framework needed */
     RAC_FRAMEWORK_MLX = 7,               /**< MLX C++ (Apple Silicon VLM) */
     RAC_FRAMEWORK_COREML = 8,            /**< Core ML (Apple Neural Engine) */
-    RAC_FRAMEWORK_WHISPERKIT = 9,        /**< WhisperKit (Apple Neural Engine STT) */
+    RAC_FRAMEWORK_WHISPERKIT_COREML = 9,  /**< WhisperKit CoreML (Apple Neural Engine STT) */
     RAC_FRAMEWORK_UNKNOWN = 99           /**< Unknown framework */
 } rac_inference_framework_t;
 
diff --git a/sdk/runanywhere-commons/src/infrastructure/model_management/model_paths.cpp b/sdk/runanywhere-commons/src/infrastructure/model_management/model_paths.cpp
@@ -110,8 +110,8 @@ const char* rac_framework_raw_value(rac_inference_framework_t framework) {
             return "SystemTTS";
         case RAC_FRAMEWORK_FLUID_AUDIO:
             return "FluidAudio";
-        case RAC_FRAMEWORK_WHISPERKIT:
-            return "WhisperKit";
+        case RAC_FRAMEWORK_WHISPERKIT_COREML:
+            return "WhisperKitCoreML";
         case RAC_FRAMEWORK_BUILTIN:
             return "BuiltIn";
         case RAC_FRAMEWORK_NONE:
@@ -408,8 +408,8 @@ rac_result_t rac_model_paths_extract_framework(const char* path,
     } else if (nextComponent == "FluidAudio") {
         *out_framework = RAC_FRAMEWORK_FLUID_AUDIO;
         return RAC_SUCCESS;
-    } else if (nextComponent == "WhisperKit") {
-        *out_framework = RAC_FRAMEWORK_WHISPERKIT;
+    } else if (nextComponent == "WhisperKitCoreML") {
+        *out_framework = RAC_FRAMEWORK_WHISPERKIT_COREML;
         return RAC_SUCCESS;
     } else if (nextComponent == "BuiltIn") {
         *out_framework = RAC_FRAMEWORK_BUILTIN;
diff --git a/sdk/runanywhere-commons/src/infrastructure/model_management/model_registry.cpp b/sdk/runanywhere-commons/src/infrastructure/model_management/model_registry.cpp
@@ -614,7 +614,7 @@ rac_result_t rac_model_registry_discover_downloaded(rac_model_registry_handle_t
     rac_inference_framework_t frameworks[] = {RAC_FRAMEWORK_LLAMACPP,   RAC_FRAMEWORK_ONNX,
                                               RAC_FRAMEWORK_COREML,     RAC_FRAMEWORK_MLX,
                                               RAC_FRAMEWORK_FLUID_AUDIO, RAC_FRAMEWORK_FOUNDATION_MODELS,
-                                              RAC_FRAMEWORK_SYSTEM_TTS, RAC_FRAMEWORK_WHISPERKIT,
+                                              RAC_FRAMEWORK_SYSTEM_TTS, RAC_FRAMEWORK_WHISPERKIT_COREML,
                                               RAC_FRAMEWORK_UNKNOWN};
     size_t framework_count = sizeof(frameworks) / sizeof(frameworks[0]);
 
diff --git a/sdk/runanywhere-commons/src/infrastructure/model_management/model_types.cpp b/sdk/runanywhere-commons/src/infrastructure/model_management/model_types.cpp
@@ -179,7 +179,7 @@ rac_bool_t rac_framework_uses_directory_based_models(rac_inference_framework_t f
     switch (framework) {
         case RAC_FRAMEWORK_ONNX:
         case RAC_FRAMEWORK_COREML:      // CoreML compiled models (.mlmodelc) are directories
-        case RAC_FRAMEWORK_WHISPERKIT:   // WhisperKit models are directories of .mlmodelc files
+        case RAC_FRAMEWORK_WHISPERKIT_COREML:   // WhisperKit models are directories of .mlmodelc files
             return RAC_TRUE;
         default:
             return RAC_FALSE;
@@ -202,7 +202,7 @@ rac_bool_t rac_framework_supports_stt(rac_inference_framework_t framework) {
     // Mirrors Swift's InferenceFramework.supportsSTT
     switch (framework) {
         case RAC_FRAMEWORK_ONNX:
-        case RAC_FRAMEWORK_WHISPERKIT:
+        case RAC_FRAMEWORK_WHISPERKIT_COREML:
             return RAC_TRUE;
         default:
             return RAC_FALSE;
@@ -235,8 +235,8 @@ const char* rac_framework_display_name(rac_inference_framework_t framework) {
             return "System TTS";
         case RAC_FRAMEWORK_FLUID_AUDIO:
             return "FluidAudio";
-        case RAC_FRAMEWORK_WHISPERKIT:
-            return "WhisperKit";
+        case RAC_FRAMEWORK_WHISPERKIT_COREML:
+            return "WhisperKit CoreML";
         case RAC_FRAMEWORK_BUILTIN:
             return "Built-in";
         case RAC_FRAMEWORK_NONE:
@@ -263,8 +263,8 @@ const char* rac_framework_analytics_key(rac_inference_framework_t framework) {
             return "system_tts";
         case RAC_FRAMEWORK_FLUID_AUDIO:
             return "fluid_audio";
-        case RAC_FRAMEWORK_WHISPERKIT:
-            return "whisper_kit";
+        case RAC_FRAMEWORK_WHISPERKIT_COREML:
+            return "whisperkit_coreml";
         case RAC_FRAMEWORK_BUILTIN:
             return "built_in";
         case RAC_FRAMEWORK_NONE:
diff --git a/sdk/runanywhere-swift/Sources/RunAnywhere/CRACommons/include/rac_model_types.h b/sdk/runanywhere-swift/Sources/RunAnywhere/CRACommons/include/rac_model_types.h
@@ -185,7 +185,7 @@ typedef enum rac_inference_framework {
     RAC_FRAMEWORK_NONE = 6,              /**< No framework needed */
     RAC_FRAMEWORK_MLX = 7,               /**< MLX C++ (Apple Silicon VLM) */
     RAC_FRAMEWORK_COREML = 8,            /**< Core ML (Apple Neural Engine) */
-    RAC_FRAMEWORK_WHISPERKIT = 9,        /**< WhisperKit (Apple Neural Engine STT) */
+    RAC_FRAMEWORK_WHISPERKIT_COREML = 9,  /**< WhisperKit CoreML (Apple Neural Engine STT) */
     RAC_FRAMEWORK_UNKNOWN = 99           /**< Unknown framework */
 } rac_inference_framework_t;
 
diff --git a/sdk/runanywhere-swift/Sources/RunAnywhere/Foundation/Bridge/Extensions/ModelTypes+CppBridge.swift b/sdk/runanywhere-swift/Sources/RunAnywhere/Foundation/Bridge/Extensions/ModelTypes+CppBridge.swift
@@ -115,8 +115,8 @@ extension InferenceFramework {
             return RAC_FRAMEWORK_COREML
         case .mlx:
             return RAC_FRAMEWORK_MLX
-        case .whisperKit:
-            return RAC_FRAMEWORK_WHISPERKIT
+        case .whisperKitCoreML:
+            return RAC_FRAMEWORK_WHISPERKIT_COREML
         case .builtIn:
             return RAC_FRAMEWORK_BUILTIN
         case .none:
@@ -143,8 +143,8 @@ extension InferenceFramework {
             self = .coreml
         case RAC_FRAMEWORK_MLX:
             self = .mlx
-        case RAC_FRAMEWORK_WHISPERKIT:
-            self = .whisperKit
+        case RAC_FRAMEWORK_WHISPERKIT_COREML:
+            self = .whisperKitCoreML
         case RAC_FRAMEWORK_BUILTIN:
             self = .builtIn
         case RAC_FRAMEWORK_NONE:
diff --git a/sdk/runanywhere-swift/Sources/RunAnywhere/Public/Extensions/Models/ModelTypes.swift b/sdk/runanywhere-swift/Sources/RunAnywhere/Public/Extensions/Models/ModelTypes.swift
@@ -80,7 +80,7 @@ public enum InferenceFramework: String, CaseIterable, Codable, Sendable {
     case fluidAudio = "FluidAudio"
     case coreml = "CoreML"        // Core ML (Apple Neural Engine) for diffusion models
     case mlx = "MLX"              // MLX (Apple Silicon VLM via MLX C++)
-    case whisperKit = "WhisperKit" // WhisperKit (Apple Neural Engine) for STT
+    case whisperKitCoreML = "WhisperKitCoreML" // WhisperKit CoreML (Apple Neural Engine) for STT
 
     // Special cases
     case builtIn = "BuiltIn"      // For simple services (e.g., energy-based VAD)
@@ -97,7 +97,7 @@ public enum InferenceFramework: String, CaseIterable, Codable, Sendable {
         case .fluidAudio: return "FluidAudio"
         case .coreml: return "Core ML"
         case .mlx: return "MLX"
-        case .whisperKit: return "WhisperKit"
+        case .whisperKitCoreML: return "WhisperKit CoreML"
         case .builtIn: return "Built-in"
         case .none: return "None"
         case .unknown: return "Unknown"
@@ -114,7 +114,7 @@ public enum InferenceFramework: String, CaseIterable, Codable, Sendable {
         case .fluidAudio: return "fluid_audio"
         case .coreml: return "coreml"
         case .mlx: return "mlx"
-        case .whisperKit: return "whisper_kit"
+        case .whisperKitCoreML: return "whisperkit_coreml"
         case .builtIn: return "built_in"
         case .none: return "none"
         case .unknown: return "unknown"
@@ -135,7 +135,7 @@ public extension InferenceFramework {
         case .fluidAudio: return RAC_FRAMEWORK_FLUID_AUDIO
         case .coreml: return RAC_FRAMEWORK_COREML
         case .mlx: return RAC_FRAMEWORK_MLX
-        case .whisperKit: return RAC_FRAMEWORK_WHISPERKIT
+        case .whisperKitCoreML: return RAC_FRAMEWORK_WHISPERKIT_COREML
         case .builtIn: return RAC_FRAMEWORK_BUILTIN
         case .none: return RAC_FRAMEWORK_NONE
         case .unknown: return RAC_FRAMEWORK_UNKNOWN
@@ -152,7 +152,7 @@ public extension InferenceFramework {
         case RAC_FRAMEWORK_FLUID_AUDIO: return .fluidAudio
         case RAC_FRAMEWORK_COREML: return .coreml
         case RAC_FRAMEWORK_MLX: return .mlx
-        case RAC_FRAMEWORK_WHISPERKIT: return .whisperKit
+        case RAC_FRAMEWORK_WHISPERKIT_COREML: return .whisperKitCoreML
         case RAC_FRAMEWORK_BUILTIN: return .builtIn
         case RAC_FRAMEWORK_NONE: return .none
         default: return .unknown
diff --git a/sdk/runanywhere-swift/Sources/RunAnywhere/Public/Extensions/Models/RunAnywhere+ModelAssignments.swift b/sdk/runanywhere-swift/Sources/RunAnywhere/Public/Extensions/Models/RunAnywhere+ModelAssignments.swift
@@ -1,16 +1,14 @@
 import Foundation
+import os
 
 // MARK: - Pending Registration Tracking
 
 extension RunAnywhere {
 
-    private static let pendingRegistrationsLock = NSLock()
-    private static var _pendingRegistrations: [Task<Void, Never>] = []
+    private static let pendingRegistrationsLock = OSAllocatedUnfairLock(initialState: [Task<Void, Never>]())
 
     static func trackPendingRegistration(_ task: Task<Void, Never>) {
-        pendingRegistrationsLock.lock()
-        _pendingRegistrations.append(task)
-        pendingRegistrationsLock.unlock()
+        pendingRegistrationsLock.withLock { $0.append(task) }
     }
 
     /// Await all pending `registerModel()` saves to the C++ registry.
@@ -19,10 +17,11 @@ extension RunAnywhere {
     /// Call this before `discoverDownloadedModels()` to ensure all models are in
     /// the registry so discovery can match them to files on disk.
     public static func flushPendingRegistrations() async {
-        pendingRegistrationsLock.lock()
-        let tasks = _pendingRegistrations
-        _pendingRegistrations.removeAll()
-        pendingRegistrationsLock.unlock()
+        let tasks = pendingRegistrationsLock.withLock { state -> [Task<Void, Never>] in
+            let current = state
+            state.removeAll()
+            return current
+        }
 
         for task in tasks {
             _ = await task.result
diff --git a/sdk/runanywhere-swift/Sources/RunAnywhere/Public/Extensions/Models/RunAnywhere+ModelManagement.swift b/sdk/runanywhere-swift/Sources/RunAnywhere/Public/Extensions/Models/RunAnywhere+ModelManagement.swift
@@ -58,7 +58,7 @@ extension RunAnywhere {
         }
 
         // For WhisperKit models (directory-based), find the folder with .mlmodelc files
-        if model.framework == .whisperKit {
+        if model.framework == .whisperKitCoreML {
             return resolveWhisperKitModelPath(modelFolder: modelFolder, modelId: model.id)
         }
 
@@ -292,7 +292,7 @@ extension RunAnywhere {
         logger.info("Loading STT model from resolved path: \(modelPath.path)")
 
         // Route to Swift STT handler for frameworks like WhisperKit
-        if modelInfo.framework == .whisperKit {
+        if modelInfo.framework == .whisperKitCoreML {
             guard let handler = swiftSTTHandler else {
                 throw SDKError.stt(.notInitialized, "WhisperKit module not registered. Call WhisperKitSTT.register() first.")
             }
diff --git a/sdk/runanywhere-swift/Sources/RunAnywhere/Public/Extensions/STT/RunAnywhere+STT.swift b/sdk/runanywhere-swift/Sources/RunAnywhere/Public/Extensions/STT/RunAnywhere+STT.swift
@@ -47,7 +47,8 @@ public extension RunAnywhere {
 
     /// Handler for Swift-only STT backends (e.g., WhisperKit).
     /// Set by the module's `register()` call; nil if no Swift backend is registered.
-    static var swiftSTTHandler: (any SwiftSTTHandler)?
+    /// Written once at startup from `@MainActor` before any reads occur.
+    nonisolated(unsafe) static var swiftSTTHandler: (any SwiftSTTHandler)?
 
     // MARK: - Simple Transcription
 
diff --git a/sdk/runanywhere-swift/Sources/WhisperKitRuntime/WhisperKitSTT.swift b/sdk/runanywhere-swift/Sources/WhisperKitRuntime/WhisperKitSTT.swift
@@ -47,7 +47,7 @@ public enum WhisperKitSTT: RunAnywhereModule {
     public static let moduleName = "WhisperKit"
     public static let capabilities: Set<SDKComponent> = [.stt]
     public static let defaultPriority: Int = 200
-    public static let inferenceFramework: InferenceFramework = .whisperKit
+    public static let inferenceFramework: InferenceFramework = .whisperKitCoreML
 
     // MARK: - Registration State
 
@@ -76,6 +76,7 @@ public enum WhisperKitSTT: RunAnywhereModule {
     }
 
     /// Unregister the WhisperKit backend.
+    @MainActor
     public static func unregister() {
         guard isRegistered else { return }
 
diff --git a/sdk/runanywhere-swift/Sources/WhisperKitRuntime/WhisperKitSTTService.swift b/sdk/runanywhere-swift/Sources/WhisperKitRuntime/WhisperKitSTTService.swift

Original file line number	Diff line number	Diff line change
`@@ -247,7 +247,7 @@ extension ModelInfo {`
`247`	`247`	`case .llamaCpp: return .purple`
`248`	`248`	`case .foundationModels: return .blue`
`249`	`249`	`case .coreml: return .cyan`
`250`		`- case .whisperKit: return .green`
	`250`	`+ case .whisperKitCoreML: return .green`
`251`	`251`	`default: return .gray`
`252`	`252`	`}`
`253`	`253`	`}`