Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add ability to prevent config.json being written to ~/Documents/huggingface/... #262

Merged
merged 2 commits into from
Nov 19, 2024
+8 −8
Merged

Add ability to prevent config.json being written to ~/Documents/huggingface/... #262

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
029b2e7
`fetchAvailableModels` and `fetchAvailableModels` take `downloadBase:…
iandundas Nov 18, 2024
04465ec
`recommendedRemoteModels` also gets passed the downloadBase (and repo…
iandundas Nov 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions Sources/WhisperKit/Core/WhisperKit.swift
View file
Original file line number Diff line number Diff line change
@@ -152,14 +152,14 @@ open class WhisperKit {
return modelSupport(for: deviceName)
}

public static func recommendedRemoteModels(from repo: String = "argmaxinc/whisperkit-coreml") async -> ModelSupport {
public static func recommendedRemoteModels(from repo: String = "argmaxinc/whisperkit-coreml", downloadBase: URL? = nil) async -> ModelSupport {
let deviceName = Self.deviceName()
let config = await Self.fetchModelSupportConfig(from: repo)
let config = await Self.fetchModelSupportConfig(from: repo, downloadBase: downloadBase)
return modelSupport(for: deviceName, from: config)
}

public static func fetchModelSupportConfig(from repo: String = "argmaxinc/whisperkit-coreml") async -> ModelSupportConfig {
let hubApi = HubApi()
public static func fetchModelSupportConfig(from repo: String = "argmaxinc/whisperkit-coreml", downloadBase: URL? = nil) async -> ModelSupportConfig {
let hubApi = HubApi(downloadBase: downloadBase)
var modelSupportConfig = Constants.fallbackModelSupportConfig

do {
@@ -176,8 +176,8 @@ open class WhisperKit {
return modelSupportConfig
}

public static func fetchAvailableModels(from repo: String = "argmaxinc/whisperkit-coreml", matching: [String] = ["*"]) async throws -> [String] {
let modelSupportConfig = await fetchModelSupportConfig(from: repo)
public static func fetchAvailableModels(from repo: String = "argmaxinc/whisperkit-coreml", matching: [String] = ["*"], downloadBase: URL? = nil) async throws -> [String] {
let modelSupportConfig = await fetchModelSupportConfig(from: repo, downloadBase: downloadBase)
let supportedModels = modelSupportConfig.modelSupport().supported
var filteredSupportSet: Set<String> = []
for glob in matching {
@@ -290,10 +290,10 @@ open class WhisperKit {
self.modelFolder = URL(fileURLWithPath: folder)
} else if download {
// Determine the model variant to use
let modelSupport = await WhisperKit.recommendedRemoteModels()
let repo = modelRepo ?? "argmaxinc/whisperkit-coreml"
let modelSupport = await WhisperKit.recommendedRemoteModels(from: repo, downloadBase: downloadBase)
let modelVariant = model ?? modelSupport.default

let repo = modelRepo ?? "argmaxinc/whisperkit-coreml"
do {
self.modelFolder = try await Self.download(
variant: modelVariant,