Add model support config fetching from model repo #216
Conversation
- New github runner image does not include visionOS, so to prevent downloading for all platforms this will specify the platform from the test matrix
| @@ -956,8 +956,7 @@ struct ContentView: View { | |||
|
|
|||
| localModels = WhisperKit.formatModelFiles(localModels) | |||
| for model in localModels { | |||
| if !availableModels.contains(model), | |||
| !disabledModels.contains(model) | |||
| if !availableModels.contains(model) | |||
| { | |||
There was a problem hiding this comment.
cuddle curly braces here and LOC 972-981
or consider replacing the for loops with filter:
availableModels.append(contentsOf: localModels.filter { !availableModels.contains($0) })
| let currentFrameLength = startIndex - seekClipStart | ||
| if startIndex >= currentFrameLength, startIndex < 0 { | ||
| let currentFrameLength = audioArray.count | ||
| if startIndex < 0 || startIndex >= currentFrameLength { |
There was a problem hiding this comment.
nit: don't need currentFrameLength and use guard startIndex >= 0 && startIndex < audioArray.count else {
| @@ -95,7 +95,7 @@ public extension AudioProcessing { | |||
| static func padOrTrimAudio(fromArray audioArray: [Float], startAt startIndex: Int = 0, toLength frameLength: Int = 480_000, saveSegment: Bool = false) -> MLMultiArray? { | |||
| let currentFrameLength = audioArray.count | |||
|
|
|||
| if startIndex >= currentFrameLength, startIndex < 0 { | |||
| if startIndex < 0 || startIndex >= currentFrameLength { | |||
| return support.models | ||
| } | ||
| } | ||
| return defaultSupport.models |
There was a problem hiding this comment.
add log that defaultSupport was used
Sources/WhisperKit/Core/Models.swift
Outdated
| public struct ModelSupportConfig: Codable { | ||
| public let repoName: String | ||
| public let repoVersion: String | ||
| public var deviceSupport: [DeviceSupport] |
There was a problem hiding this comment.
nit: plural deviceSupports since it stores an array of DeviceSupport
Sources/WhisperKit/Core/Models.swift
Outdated
| } | ||
|
|
||
| // Add fallback device support that don't overlap with remote | ||
| for fallbackSupport in fallback { |
There was a problem hiding this comment.
nit: use filter
mergedSupports.append(contentsOf: fallback.filter { !$0.identifiers.contains(where: remoteIdentifiers.contains) })
| public static let fallbackModelSupportConfig: ModelSupportConfig = { | ||
| var config = ModelSupportConfig( | ||
| repoName: "whisperkit-coreml", | ||
| repoVersion: "0.2", |
There was a problem hiding this comment.
would we need to identify that it's a fallback config? maybe append -local to version here?
| modelSupportConfig = try decoder.decode(ModelSupportConfig.self, from: jsonData) | ||
| } catch { | ||
| // Allow this to fail gracefully as it uses fallback config by default | ||
| Logging.debug(error) |
There was a problem hiding this comment.
log as error and add some text that this error happened when fetching model support config
This PR adds capability to fetch supported models for a specific device based on the config.json file in the model repo on HF. Config will update over time as new models and devices come out. Need for this arose with the latest whisper turbo model release.
Changes:
WhisperKit.recommendedRemoteModels()to fetch the config.json file and return aModelSupportobjectNew optional parameters for synchronousThis proved difficult to conform to swift concurrency as a static function for macOS 14.6 and below, so removed for now.WhisperKit.recommendedModels()function to try to fetch the remote config, and a timeout for the requestConstants.fallbackModelSupportConfigfor when remote config is unavailable in offline environmentsWhisperKit.deviceName()to use a similar device identifier for mac as it does for iOS etc