Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
26 changes: 13 additions & 13 deletions Package.resolved

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Package.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,15 +12,15 @@ let package = Package(
.executable(name: "OpenTypeCLI", targets: ["OpenTypeCLI"]),
],
dependencies: [
.package(url: "https://github.com/argmaxinc/WhisperKit.git", from: "1.0.0"),
.package(url: "https://github.com/argmaxinc/argmax-oss-swift.git", from: "1.0.0"),
.package(url: "https://github.com/huggingface/swift-transformers", from: "1.3.3"),
.package(url: "https://github.com/ml-explore/mlx-swift-lm", branch: "main"),
],
targets: [
.executableTarget(
name: "OpenType",
dependencies: [
.product(name: "WhisperKit", package: "WhisperKit"),
.product(name: "WhisperKit", package: "argmax-oss-swift"),
.product(name: "Hub", package: "swift-transformers"),
.product(name: "Tokenizers", package: "swift-transformers"),
.product(name: "MLXLLM", package: "mlx-swift-lm"),
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,7 @@
[![Apple Silicon](https://img.shields.io/badge/Apple%20Silicon-M1%2FM2%2FM3%2FM4-black?style=flat-square&logo=apple&logoColor=white)](https://www.apple.com/mac/m1/)
[![License](https://img.shields.io/badge/license-MIT-blue?style=flat-square)](LICENSE)

[![WhisperKit](https://img.shields.io/badge/Powered%20by-WhisperKit-blue?style=flat-square)](https://github.com/argmaxinc/WhisperKit)
[![WhisperKit](https://img.shields.io/badge/Powered%20by-WhisperKit-blue?style=flat-square)](https://github.com/argmaxinc/argmax-oss-swift)
[![MLX](https://img.shields.io/badge/Powered%20by-MLX--LM-orange?style=flat-square)](https://github.com/ml-explore/mlx-swift-lm)

[Website](https://opentype.idevlab.dev) · [中文文档](README_zh.md)
Expand DownExpand Up@@ -161,7 +161,7 @@ scripts/

## Tech Stack

- [WhisperKit](https://github.com/argmaxinc/WhisperKit) — offline Whisper speech recognition
- [WhisperKit](https://github.com/argmaxinc/argmax-oss-swift) — offline Whisper speech recognition
- [mlx-swift-lm](https://github.com/ml-explore/mlx-swift-lm) — local LLM inference on Apple Silicon (Qwen2.5 / Qwen3)
- **SwiftUI + AppKit** — native macOS UI
- **ScreenCaptureKit + Vision** — screen OCR
Expand Down
4 changes: 2 additions & 2 deletions README_zh.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,7 @@
[![Apple Silicon](https://img.shields.io/badge/Apple%20Silicon-M1%2FM2%2FM3%2FM4-black?style=flat-square&logo=apple&logoColor=white)](https://www.apple.com/mac/m1/)
[![License](https://img.shields.io/badge/license-MIT-blue?style=flat-square)](LICENSE)

[![WhisperKit](https://img.shields.io/badge/驱动-WhisperKit-blue?style=flat-square)](https://github.com/argmaxinc/WhisperKit)
[![WhisperKit](https://img.shields.io/badge/驱动-WhisperKit-blue?style=flat-square)](https://github.com/argmaxinc/argmax-oss-swift)
[![MLX](https://img.shields.io/badge/驱动-MLX--LM-orange?style=flat-square)](https://github.com/ml-explore/mlx-swift-lm)

[官网](https://opentype.idevlab.dev) · [English](README.md)
Expand DownExpand Up@@ -161,7 +161,7 @@ scripts/

## 技术栈

- [WhisperKit](https://github.com/argmaxinc/WhisperKit) — 离线 Whisper 语音识别
- [WhisperKit](https://github.com/argmaxinc/argmax-oss-swift) — 离线 Whisper 语音识别
- [mlx-swift-lm](https://github.com/ml-explore/mlx-swift-lm) — Apple Silicon 本地 LLM 推理(Qwen2.5 / Qwen3)
- **SwiftUI + AppKit** — macOS 原生 UI
- **ScreenCaptureKit + Vision** — 屏幕 OCR
Expand Down
11 changes: 11 additions & 0 deletions Sources/App/VoicePipeline+Models.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -115,6 +115,17 @@ extension VoicePipeline {
case .qwen3:
let settings = appState.settings
let catalog = ModelCatalog.shared
if !LocalASRRuntime.isReady(for: .qwen3),
!catalog.asrModelPath(for: settings.qwenASRModel).isEmpty {
do {
_ = try await LocalASRRuntime.ensurePythonPath(
for: .qwen3,
preferredPath: settings.localASRPythonPath
)
} catch {
Log.error("[VoicePipeline] Qwen ASR runtime migration failed: \(error.localizedDescription)")
}
}
guard localASRIsAvailable(settings.qwenASRModel) else {
qwenSpeechEngine = nil
markSpeechModelDownloadRequired(showInStatus: requestPermission)
Expand Down
2 changes: 1 addition & 1 deletion Sources/Config/AppSettings.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -357,7 +357,7 @@ final class AppSettings: ObservableObject {
appIconAppearance = AppIconAppearance(rawValue: ud.string(forKey: Key.appIconAppearance.rawValue) ?? "") ?? .system
volcAppKey = ud.string(forKey: Key.volcAppKey.rawValue) ?? ""
volcAccessKey = ud.string(forKey: Key.volcAccessKey.rawValue) ?? ""
volcResourceId = ud.string(forKey: Key.volcResourceId.rawValue) ?? "volc.bigasr.sauc.duration"
volcResourceId = ud.string(forKey: Key.volcResourceId.rawValue) ?? VolcASRModel.recommended.rawValue
localASRPythonPath = ud.string(forKey: Key.localASRPythonPath.rawValue) ?? LocalASRConfiguration.defaultPythonPath
qwenASRModel = ud.string(forKey: Key.qwenASRModel.rawValue)
?? ud.string(forKey: Key.qwenASRModelPath.rawValue)
Expand Down
17 changes: 17 additions & 0 deletions Sources/Config/VolcASRModel.swift
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
import Foundation

enum VolcASRModel: String, CaseIterable, Identifiable {
case seedASR2 = "volc.seedasr.sauc.duration"
case bigASR1 = "volc.bigasr.sauc.duration"

var id: String { rawValue }

var displayName: String {
switch self {
case .seedASR2: return L("volc.model.seed_asr_2")
case .bigASR1: return L("volc.model.big_asr_1")
}
}

static let recommended = VolcASRModel.seedASR2
}
3 changes: 3 additions & 0 deletions Sources/Resources/en.lproj/Localizable.strings
Original file line numberDiff line numberDiff line change
Expand Up@@ -339,6 +339,9 @@

/* ── Volc ASR ── */
"volc.config_hint" = "Enter your Volcengine Doubao ASR credentials. Get them from the Volcengine console.";
"volc.model" = "Recognition model";
"volc.model.seed_asr_2" = "SeedASR 2.0 (Recommended)";
"volc.model.big_asr_1" = "BigASR 1.0 (Legacy)";
"volc.app_key" = "App Key (App ID)";
"volc.access_key" = "Access Token";
"volc.resource_id" = "Resource ID";
Expand Down
3 changes: 3 additions & 0 deletions Sources/Resources/zh-Hans.lproj/Localizable.strings
Original file line numberDiff line numberDiff line change
Expand Up@@ -339,6 +339,9 @@

/* ── 豆包语音识别 ── */
"volc.config_hint" = "填写火山引擎豆包语音识别凭据,可从火山引擎控制台获取。";
"volc.model" = "识别模型";
"volc.model.seed_asr_2" = "SeedASR 2.0(推荐)";
"volc.model.big_asr_1" = "BigASR 1.0(旧版)";
"volc.app_key" = "App Key(应用 ID)";
"volc.access_key" = "Access Token";
"volc.resource_id" = "Resource ID(资源 ID)";
Expand Down
79 changes: 79 additions & 0 deletions Sources/Speech/AppleSpeechAnalyzer.swift
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,79 @@
import AVFoundation
import Foundation
@preconcurrency import Speech

enum AppleSpeechAnalyzer {
static func prepare(locale: Locale) async throws {
let transcriber = try await makeTranscriber(locale: locale)
try await ensureModel(for: transcriber)
}

static func transcribe(audioURL: URL, locale: Locale) async throws -> String {
let transcriber = try await makeTranscriber(locale: locale)
try await ensureModel(for: transcriber)

let file = try AVAudioFile(forReading: audioURL)
let resultTask = Task<String, Error> {
var transcript = ""
for try await result in transcriber.results where result.isFinal {
transcript += String(result.text.characters)
}
return transcript
}

let analyzer = SpeechAnalyzer(
modules: [transcriber],
options: .init(priority: .userInitiated, modelRetention: .lingering)
)
do {
if let lastSample = try await analyzer.analyzeSequence(from: file) {
try await analyzer.finalizeAndFinish(through: lastSample)
} else {
await analyzer.cancelAndFinishNow()
}
return try await resultTask.value
} catch {
resultTask.cancel()
await analyzer.cancelAndFinishNow()
throw error
}
}

private static func makeTranscriber(locale: Locale) async throws -> SpeechTranscriber {
guard SpeechTranscriber.isAvailable else {
throw AppleSpeechAnalyzerError.unavailable
}
guard let supported = await SpeechTranscriber.supportedLocale(equivalentTo: locale) else {
throw AppleSpeechAnalyzerError.unsupportedLocale(locale.identifier)
}
return SpeechTranscriber(locale: supported, preset: .transcription)
}

private static func ensureModel(for transcriber: SpeechTranscriber) async throws {
let modules: [any SpeechModule] = [transcriber]
if await AssetInventory.status(forModules: modules) == .installed { return }
if let request = try await AssetInventory.assetInstallationRequest(supporting: modules) {
try await request.downloadAndInstall()
}
guard await AssetInventory.status(forModules: modules) == .installed else {
throw AppleSpeechAnalyzerError.modelUnavailable
}
}
}

enum AppleSpeechAnalyzerError: LocalizedError {
case unavailable
case unsupportedLocale(String)
case modelUnavailable

var errorDescription: String? {
switch self {
case .unavailable:
return "SpeechAnalyzer is unavailable on this Mac"
case .unsupportedLocale(let locale):
return "SpeechAnalyzer does not support locale \(locale)"
case .modelUnavailable:
return "SpeechAnalyzer model is not installed"
}
}
}
2 changes: 1 addition & 1 deletion Sources/Speech/AppleSpeechEngine.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@ import Foundation
@preconcurrency import Speech
import AVFoundation

final class AppleSpeechEngine: SpeechEngine, @unchecked Sendable {
final class LegacyAppleSpeechEngine: SpeechEngine, @unchecked Sendable {
private var recognizer: SFSpeechRecognizer
private(set) var isReady = false
private var recognitionTask: SFSpeechRecognitionTask?
Expand Down
88 changes: 88 additions & 0 deletions Sources/Speech/AppleSpeechEngineAdapter.swift
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,88 @@
import AVFoundation
import Foundation

final class AppleSpeechEngine: SpeechEngine, @unchecked Sendable {
private let locale: Locale
private let legacy: LegacyAppleSpeechEngine

init(locale: Locale = Locale(identifier: "zh-CN")) {
self.locale = locale
self.legacy = LegacyAppleSpeechEngine(locale: locale)
}

var isReady: Bool { legacy.isReady }
var supportsStreaming: Bool { true }

func requestAccess() {
legacy.requestAccess()
}

func prepare() async {
do {
try await AppleSpeechAnalyzer.prepare(locale: locale)
} catch {
Log.info("[AppleSpeech] SpeechAnalyzer preparation deferred: \(error.localizedDescription)")
}
}

func startListening(language: String?, onPartialResult: @escaping @Sendable (String) -> Void) {
legacy.startListening(language: language, onPartialResult: onPartialResult)
}

func appendAudioBuffer(_ buffer: AVAudioPCMBuffer) {
legacy.appendAudioBuffer(buffer)
}

func finishListening(audioURL: URL?, language: String?) async throws -> String {
let fallbackTask = Task {
try await legacy.finishListening(audioURL: audioURL, language: language)
}
guard let audioURL else { return try await fallbackTask.value }

do {
let text = try await AppleSpeechAnalyzer.transcribe(
audioURL: audioURL,
locale: resolvedLocale(for: language)
)
legacy.cancelListening()
let fallback = try? await fallbackTask.value
return text.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty
? fallback ?? ""
: text
} catch {
Log.info("[AppleSpeech] SpeechAnalyzer failed, using legacy result: \(error.localizedDescription)")
return try await fallbackTask.value
}
}

func cancelListening() {
legacy.cancelListening()
}

func transcribe(audioURL: URL?, language: String?) async throws -> String {
guard let audioURL else { throw AppleSpeechError.noAudioFile }
do {
let text = try await AppleSpeechAnalyzer.transcribe(
audioURL: audioURL,
locale: resolvedLocale(for: language)
)
if !text.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty {
return text
}
} catch {
Log.info("[AppleSpeech] SpeechAnalyzer failed, using legacy recognizer: \(error.localizedDescription)")
}
return try await legacy.transcribe(audioURL: audioURL, language: language)
}

private func resolvedLocale(for language: String?) -> Locale {
switch language {
case "zh": return Locale(identifier: "zh-CN")
case "en": return Locale(identifier: "en-US")
case "ja": return Locale(identifier: "ja-JP")
case "ko": return Locale(identifier: "ko-KR")
case "yue": return Locale(identifier: "yue-CN")
default: return locale
}
}
}
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
26 changes: 13 additions & 13 deletions Package.resolved

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Package.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,15 +12,15 @@ let package = Package(
.executable(name: "OpenTypeCLI", targets: ["OpenTypeCLI"]),
],
dependencies: [
.package(url: "https://github.com/argmaxinc/WhisperKit.git", from: "1.0.0"),
.package(url: "https://github.com/argmaxinc/argmax-oss-swift.git", from: "1.0.0"),
.package(url: "https://github.com/huggingface/swift-transformers", from: "1.3.3"),
.package(url: "https://github.com/ml-explore/mlx-swift-lm", branch: "main"),
],
targets: [
.executableTarget(
name: "OpenType",
dependencies: [
.product(name: "WhisperKit", package: "WhisperKit"),
.product(name: "WhisperKit", package: "argmax-oss-swift"),
.product(name: "Hub", package: "swift-transformers"),
.product(name: "Tokenizers", package: "swift-transformers"),
.product(name: "MLXLLM", package: "mlx-swift-lm"),
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,7 @@
[![Apple Silicon](https://img.shields.io/badge/Apple%20Silicon-M1%2FM2%2FM3%2FM4-black?style=flat-square&logo=apple&logoColor=white)](https://www.apple.com/mac/m1/)
[![License](https://img.shields.io/badge/license-MIT-blue?style=flat-square)](LICENSE)

[![WhisperKit](https://img.shields.io/badge/Powered%20by-WhisperKit-blue?style=flat-square)](https://github.com/argmaxinc/WhisperKit)
[![WhisperKit](https://img.shields.io/badge/Powered%20by-WhisperKit-blue?style=flat-square)](https://github.com/argmaxinc/argmax-oss-swift)
[![MLX](https://img.shields.io/badge/Powered%20by-MLX--LM-orange?style=flat-square)](https://github.com/ml-explore/mlx-swift-lm)

[Website](https://opentype.idevlab.dev) · [中文文档](README_zh.md)
Expand DownExpand Up@@ -161,7 +161,7 @@ scripts/

## Tech Stack

- [WhisperKit](https://github.com/argmaxinc/WhisperKit) — offline Whisper speech recognition
- [WhisperKit](https://github.com/argmaxinc/argmax-oss-swift) — offline Whisper speech recognition
- [mlx-swift-lm](https://github.com/ml-explore/mlx-swift-lm) — local LLM inference on Apple Silicon (Qwen2.5 / Qwen3)
- **SwiftUI + AppKit** — native macOS UI
- **ScreenCaptureKit + Vision** — screen OCR
Expand Down
4 changes: 2 additions & 2 deletions README_zh.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,7 @@
[![Apple Silicon](https://img.shields.io/badge/Apple%20Silicon-M1%2FM2%2FM3%2FM4-black?style=flat-square&logo=apple&logoColor=white)](https://www.apple.com/mac/m1/)
[![License](https://img.shields.io/badge/license-MIT-blue?style=flat-square)](LICENSE)

[![WhisperKit](https://img.shields.io/badge/驱动-WhisperKit-blue?style=flat-square)](https://github.com/argmaxinc/WhisperKit)
[![WhisperKit](https://img.shields.io/badge/驱动-WhisperKit-blue?style=flat-square)](https://github.com/argmaxinc/argmax-oss-swift)
[![MLX](https://img.shields.io/badge/驱动-MLX--LM-orange?style=flat-square)](https://github.com/ml-explore/mlx-swift-lm)

[官网](https://opentype.idevlab.dev) · [English](README.md)
Expand DownExpand Up@@ -161,7 +161,7 @@ scripts/

## 技术栈

- [WhisperKit](https://github.com/argmaxinc/WhisperKit) — 离线 Whisper 语音识别
- [WhisperKit](https://github.com/argmaxinc/argmax-oss-swift) — 离线 Whisper 语音识别
- [mlx-swift-lm](https://github.com/ml-explore/mlx-swift-lm) — Apple Silicon 本地 LLM 推理(Qwen2.5 / Qwen3)
- **SwiftUI + AppKit** — macOS 原生 UI
- **ScreenCaptureKit + Vision** — 屏幕 OCR
Expand Down
11 changes: 11 additions & 0 deletions Sources/App/VoicePipeline+Models.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -115,6 +115,17 @@ extension VoicePipeline {
case .qwen3:
let settings = appState.settings
let catalog = ModelCatalog.shared
if !LocalASRRuntime.isReady(for: .qwen3),
!catalog.asrModelPath(for: settings.qwenASRModel).isEmpty {
do {
_ = try await LocalASRRuntime.ensurePythonPath(
for: .qwen3,
preferredPath: settings.localASRPythonPath
)
} catch {
Log.error("[VoicePipeline] Qwen ASR runtime migration failed: \(error.localizedDescription)")
}
}
guard localASRIsAvailable(settings.qwenASRModel) else {
qwenSpeechEngine = nil
markSpeechModelDownloadRequired(showInStatus: requestPermission)
Expand Down
2 changes: 1 addition & 1 deletion Sources/Config/AppSettings.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -357,7 +357,7 @@ final class AppSettings: ObservableObject {
appIconAppearance = AppIconAppearance(rawValue: ud.string(forKey: Key.appIconAppearance.rawValue) ?? "") ?? .system
volcAppKey = ud.string(forKey: Key.volcAppKey.rawValue) ?? ""
volcAccessKey = ud.string(forKey: Key.volcAccessKey.rawValue) ?? ""
volcResourceId = ud.string(forKey: Key.volcResourceId.rawValue) ?? "volc.bigasr.sauc.duration"
volcResourceId = ud.string(forKey: Key.volcResourceId.rawValue) ?? VolcASRModel.recommended.rawValue
localASRPythonPath = ud.string(forKey: Key.localASRPythonPath.rawValue) ?? LocalASRConfiguration.defaultPythonPath
qwenASRModel = ud.string(forKey: Key.qwenASRModel.rawValue)
?? ud.string(forKey: Key.qwenASRModelPath.rawValue)
Expand Down
17 changes: 17 additions & 0 deletions Sources/Config/VolcASRModel.swift
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
import Foundation

enum VolcASRModel: String, CaseIterable, Identifiable {
case seedASR2 = "volc.seedasr.sauc.duration"
case bigASR1 = "volc.bigasr.sauc.duration"

var id: String { rawValue }

var displayName: String {
switch self {
case .seedASR2: return L("volc.model.seed_asr_2")
case .bigASR1: return L("volc.model.big_asr_1")
}
}

static let recommended = VolcASRModel.seedASR2
}
3 changes: 3 additions & 0 deletions Sources/Resources/en.lproj/Localizable.strings
Original file line numberDiff line numberDiff line change
Expand Up@@ -339,6 +339,9 @@

/* ── Volc ASR ── */
"volc.config_hint" = "Enter your Volcengine Doubao ASR credentials. Get them from the Volcengine console.";
"volc.model" = "Recognition model";
"volc.model.seed_asr_2" = "SeedASR 2.0 (Recommended)";
"volc.model.big_asr_1" = "BigASR 1.0 (Legacy)";
"volc.app_key" = "App Key (App ID)";
"volc.access_key" = "Access Token";
"volc.resource_id" = "Resource ID";
Expand Down
3 changes: 3 additions & 0 deletions Sources/Resources/zh-Hans.lproj/Localizable.strings
Original file line numberDiff line numberDiff line change
Expand Up@@ -339,6 +339,9 @@

/* ── 豆包语音识别 ── */
"volc.config_hint" = "填写火山引擎豆包语音识别凭据,可从火山引擎控制台获取。";
"volc.model" = "识别模型";
"volc.model.seed_asr_2" = "SeedASR 2.0(推荐)";
"volc.model.big_asr_1" = "BigASR 1.0(旧版)";
"volc.app_key" = "App Key(应用 ID)";
"volc.access_key" = "Access Token";
"volc.resource_id" = "Resource ID(资源 ID)";
Expand Down
79 changes: 79 additions & 0 deletions Sources/Speech/AppleSpeechAnalyzer.swift
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,79 @@
import AVFoundation
import Foundation
@preconcurrency import Speech

enum AppleSpeechAnalyzer {
static func prepare(locale: Locale) async throws {
let transcriber = try await makeTranscriber(locale: locale)
try await ensureModel(for: transcriber)
}

static func transcribe(audioURL: URL, locale: Locale) async throws -> String {
let transcriber = try await makeTranscriber(locale: locale)
try await ensureModel(for: transcriber)

let file = try AVAudioFile(forReading: audioURL)
let resultTask = Task<String, Error> {
var transcript = ""
for try await result in transcriber.results where result.isFinal {
transcript += String(result.text.characters)
}
return transcript
}

let analyzer = SpeechAnalyzer(
modules: [transcriber],
options: .init(priority: .userInitiated, modelRetention: .lingering)
)
do {
if let lastSample = try await analyzer.analyzeSequence(from: file) {
try await analyzer.finalizeAndFinish(through: lastSample)
} else {
await analyzer.cancelAndFinishNow()
}
return try await resultTask.value
} catch {
resultTask.cancel()
await analyzer.cancelAndFinishNow()
throw error
}
}

private static func makeTranscriber(locale: Locale) async throws -> SpeechTranscriber {
guard SpeechTranscriber.isAvailable else {
throw AppleSpeechAnalyzerError.unavailable
}
guard let supported = await SpeechTranscriber.supportedLocale(equivalentTo: locale) else {
throw AppleSpeechAnalyzerError.unsupportedLocale(locale.identifier)
}
return SpeechTranscriber(locale: supported, preset: .transcription)
}

private static func ensureModel(for transcriber: SpeechTranscriber) async throws {
let modules: [any SpeechModule] = [transcriber]
if await AssetInventory.status(forModules: modules) == .installed { return }
if let request = try await AssetInventory.assetInstallationRequest(supporting: modules) {
try await request.downloadAndInstall()
}
guard await AssetInventory.status(forModules: modules) == .installed else {
throw AppleSpeechAnalyzerError.modelUnavailable
}
}
}

enum AppleSpeechAnalyzerError: LocalizedError {
case unavailable
case unsupportedLocale(String)
case modelUnavailable

var errorDescription: String? {
switch self {
case .unavailable:
return "SpeechAnalyzer is unavailable on this Mac"
case .unsupportedLocale(let locale):
return "SpeechAnalyzer does not support locale \(locale)"
case .modelUnavailable:
return "SpeechAnalyzer model is not installed"
}
}
}
2 changes: 1 addition & 1 deletion Sources/Speech/AppleSpeechEngine.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@ import Foundation
@preconcurrency import Speech
import AVFoundation

final class AppleSpeechEngine: SpeechEngine, @unchecked Sendable {
final class LegacyAppleSpeechEngine: SpeechEngine, @unchecked Sendable {
private var recognizer: SFSpeechRecognizer
private(set) var isReady = false
private var recognitionTask: SFSpeechRecognitionTask?
Expand Down
88 changes: 88 additions & 0 deletions Sources/Speech/AppleSpeechEngineAdapter.swift
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,88 @@
import AVFoundation
import Foundation

final class AppleSpeechEngine: SpeechEngine, @unchecked Sendable {
private let locale: Locale
private let legacy: LegacyAppleSpeechEngine

init(locale: Locale = Locale(identifier: "zh-CN")) {
self.locale = locale
self.legacy = LegacyAppleSpeechEngine(locale: locale)
}

var isReady: Bool { legacy.isReady }
var supportsStreaming: Bool { true }

func requestAccess() {
legacy.requestAccess()
}

func prepare() async {
do {
try await AppleSpeechAnalyzer.prepare(locale: locale)
} catch {
Log.info("[AppleSpeech] SpeechAnalyzer preparation deferred: \(error.localizedDescription)")
}
}

func startListening(language: String?, onPartialResult: @escaping @Sendable (String) -> Void) {
legacy.startListening(language: language, onPartialResult: onPartialResult)
}

func appendAudioBuffer(_ buffer: AVAudioPCMBuffer) {
legacy.appendAudioBuffer(buffer)
}

func finishListening(audioURL: URL?, language: String?) async throws -> String {
let fallbackTask = Task {
try await legacy.finishListening(audioURL: audioURL, language: language)
}
guard let audioURL else { return try await fallbackTask.value }

do {
let text = try await AppleSpeechAnalyzer.transcribe(
audioURL: audioURL,
locale: resolvedLocale(for: language)
)
legacy.cancelListening()
let fallback = try? await fallbackTask.value
return text.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty
? fallback ?? ""
: text
} catch {
Log.info("[AppleSpeech] SpeechAnalyzer failed, using legacy result: \(error.localizedDescription)")
return try await fallbackTask.value
}
}

func cancelListening() {
legacy.cancelListening()
}

func transcribe(audioURL: URL?, language: String?) async throws -> String {
guard let audioURL else { throw AppleSpeechError.noAudioFile }
do {
let text = try await AppleSpeechAnalyzer.transcribe(
audioURL: audioURL,
locale: resolvedLocale(for: language)
)
if !text.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty {
return text
}
} catch {
Log.info("[AppleSpeech] SpeechAnalyzer failed, using legacy recognizer: \(error.localizedDescription)")
}
return try await legacy.transcribe(audioURL: audioURL, language: language)
}

private func resolvedLocale(for language: String?) -> Locale {
switch language {
case "zh": return Locale(identifier: "zh-CN")
case "en": return Locale(identifier: "en-US")
case "ja": return Locale(identifier: "ja-JP")
case "ko": return Locale(identifier: "ko-KR")
case "yue": return Locale(identifier: "yue-CN")
default: return locale
}
}
}
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
26 changes: 13 additions & 13 deletions Package.resolved

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Package.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,15 +12,15 @@ let package = Package(
.executable(name: "OpenTypeCLI", targets: ["OpenTypeCLI"]),
],
dependencies: [
.package(url: "https://github.com/argmaxinc/WhisperKit.git", from: "1.0.0"),
.package(url: "https://github.com/argmaxinc/argmax-oss-swift.git", from: "1.0.0"),
.package(url: "https://github.com/huggingface/swift-transformers", from: "1.3.3"),
.package(url: "https://github.com/ml-explore/mlx-swift-lm", branch: "main"),
],
targets: [
.executableTarget(
name: "OpenType",
dependencies: [
.product(name: "WhisperKit", package: "WhisperKit"),
.product(name: "WhisperKit", package: "argmax-oss-swift"),
.product(name: "Hub", package: "swift-transformers"),
.product(name: "Tokenizers", package: "swift-transformers"),
.product(name: "MLXLLM", package: "mlx-swift-lm"),
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,7 @@
[![Apple Silicon](https://img.shields.io/badge/Apple%20Silicon-M1%2FM2%2FM3%2FM4-black?style=flat-square&logo=apple&logoColor=white)](https://www.apple.com/mac/m1/)
[![License](https://img.shields.io/badge/license-MIT-blue?style=flat-square)](LICENSE)

[![WhisperKit](https://img.shields.io/badge/Powered%20by-WhisperKit-blue?style=flat-square)](https://github.com/argmaxinc/WhisperKit)
[![WhisperKit](https://img.shields.io/badge/Powered%20by-WhisperKit-blue?style=flat-square)](https://github.com/argmaxinc/argmax-oss-swift)
[![MLX](https://img.shields.io/badge/Powered%20by-MLX--LM-orange?style=flat-square)](https://github.com/ml-explore/mlx-swift-lm)

[Website](https://opentype.idevlab.dev) · [中文文档](README_zh.md)
Expand DownExpand Up@@ -161,7 +161,7 @@ scripts/

## Tech Stack

- [WhisperKit](https://github.com/argmaxinc/WhisperKit) — offline Whisper speech recognition
- [WhisperKit](https://github.com/argmaxinc/argmax-oss-swift) — offline Whisper speech recognition
- [mlx-swift-lm](https://github.com/ml-explore/mlx-swift-lm) — local LLM inference on Apple Silicon (Qwen2.5 / Qwen3)
- **SwiftUI + AppKit** — native macOS UI
- **ScreenCaptureKit + Vision** — screen OCR
Expand Down
4 changes: 2 additions & 2 deletions README_zh.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,7 @@
[![Apple Silicon](https://img.shields.io/badge/Apple%20Silicon-M1%2FM2%2FM3%2FM4-black?style=flat-square&logo=apple&logoColor=white)](https://www.apple.com/mac/m1/)
[![License](https://img.shields.io/badge/license-MIT-blue?style=flat-square)](LICENSE)

[![WhisperKit](https://img.shields.io/badge/驱动-WhisperKit-blue?style=flat-square)](https://github.com/argmaxinc/WhisperKit)
[![WhisperKit](https://img.shields.io/badge/驱动-WhisperKit-blue?style=flat-square)](https://github.com/argmaxinc/argmax-oss-swift)
[![MLX](https://img.shields.io/badge/驱动-MLX--LM-orange?style=flat-square)](https://github.com/ml-explore/mlx-swift-lm)

[官网](https://opentype.idevlab.dev) · [English](README.md)
Expand DownExpand Up@@ -161,7 +161,7 @@ scripts/

## 技术栈

- [WhisperKit](https://github.com/argmaxinc/WhisperKit) — 离线 Whisper 语音识别
- [WhisperKit](https://github.com/argmaxinc/argmax-oss-swift) — 离线 Whisper 语音识别
- [mlx-swift-lm](https://github.com/ml-explore/mlx-swift-lm) — Apple Silicon 本地 LLM 推理(Qwen2.5 / Qwen3)
- **SwiftUI + AppKit** — macOS 原生 UI
- **ScreenCaptureKit + Vision** — 屏幕 OCR
Expand Down
11 changes: 11 additions & 0 deletions Sources/App/VoicePipeline+Models.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -115,6 +115,17 @@ extension VoicePipeline {
case .qwen3:
let settings = appState.settings
let catalog = ModelCatalog.shared
if !LocalASRRuntime.isReady(for: .qwen3),
!catalog.asrModelPath(for: settings.qwenASRModel).isEmpty {
do {
_ = try await LocalASRRuntime.ensurePythonPath(
for: .qwen3,
preferredPath: settings.localASRPythonPath
)
} catch {
Log.error("[VoicePipeline] Qwen ASR runtime migration failed: \(error.localizedDescription)")
}
}
guard localASRIsAvailable(settings.qwenASRModel) else {
qwenSpeechEngine = nil
markSpeechModelDownloadRequired(showInStatus: requestPermission)
Expand Down
2 changes: 1 addition & 1 deletion Sources/Config/AppSettings.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -357,7 +357,7 @@ final class AppSettings: ObservableObject {
appIconAppearance = AppIconAppearance(rawValue: ud.string(forKey: Key.appIconAppearance.rawValue) ?? "") ?? .system
volcAppKey = ud.string(forKey: Key.volcAppKey.rawValue) ?? ""
volcAccessKey = ud.string(forKey: Key.volcAccessKey.rawValue) ?? ""
volcResourceId = ud.string(forKey: Key.volcResourceId.rawValue) ?? "volc.bigasr.sauc.duration"
volcResourceId = ud.string(forKey: Key.volcResourceId.rawValue) ?? VolcASRModel.recommended.rawValue
localASRPythonPath = ud.string(forKey: Key.localASRPythonPath.rawValue) ?? LocalASRConfiguration.defaultPythonPath
qwenASRModel = ud.string(forKey: Key.qwenASRModel.rawValue)
?? ud.string(forKey: Key.qwenASRModelPath.rawValue)
Expand Down
17 changes: 17 additions & 0 deletions Sources/Config/VolcASRModel.swift
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
import Foundation

enum VolcASRModel: String, CaseIterable, Identifiable {
case seedASR2 = "volc.seedasr.sauc.duration"
case bigASR1 = "volc.bigasr.sauc.duration"

var id: String { rawValue }

var displayName: String {
switch self {
case .seedASR2: return L("volc.model.seed_asr_2")
case .bigASR1: return L("volc.model.big_asr_1")
}
}

static let recommended = VolcASRModel.seedASR2
}
3 changes: 3 additions & 0 deletions Sources/Resources/en.lproj/Localizable.strings
Original file line numberDiff line numberDiff line change
Expand Up@@ -339,6 +339,9 @@

/* ── Volc ASR ── */
"volc.config_hint" = "Enter your Volcengine Doubao ASR credentials. Get them from the Volcengine console.";
"volc.model" = "Recognition model";
"volc.model.seed_asr_2" = "SeedASR 2.0 (Recommended)";
"volc.model.big_asr_1" = "BigASR 1.0 (Legacy)";
"volc.app_key" = "App Key (App ID)";
"volc.access_key" = "Access Token";
"volc.resource_id" = "Resource ID";
Expand Down
3 changes: 3 additions & 0 deletions Sources/Resources/zh-Hans.lproj/Localizable.strings
Original file line numberDiff line numberDiff line change
Expand Up@@ -339,6 +339,9 @@

/* ── 豆包语音识别 ── */
"volc.config_hint" = "填写火山引擎豆包语音识别凭据,可从火山引擎控制台获取。";
"volc.model" = "识别模型";
"volc.model.seed_asr_2" = "SeedASR 2.0(推荐)";
"volc.model.big_asr_1" = "BigASR 1.0(旧版)";
"volc.app_key" = "App Key(应用 ID)";
"volc.access_key" = "Access Token";
"volc.resource_id" = "Resource ID(资源 ID)";
Expand Down
79 changes: 79 additions & 0 deletions Sources/Speech/AppleSpeechAnalyzer.swift
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,79 @@
import AVFoundation
import Foundation
@preconcurrency import Speech

enum AppleSpeechAnalyzer {
static func prepare(locale: Locale) async throws {
let transcriber = try await makeTranscriber(locale: locale)
try await ensureModel(for: transcriber)
}

static func transcribe(audioURL: URL, locale: Locale) async throws -> String {
let transcriber = try await makeTranscriber(locale: locale)
try await ensureModel(for: transcriber)

let file = try AVAudioFile(forReading: audioURL)
let resultTask = Task<String, Error> {
var transcript = ""
for try await result in transcriber.results where result.isFinal {
transcript += String(result.text.characters)
}
return transcript
}

let analyzer = SpeechAnalyzer(
modules: [transcriber],
options: .init(priority: .userInitiated, modelRetention: .lingering)
)
do {
if let lastSample = try await analyzer.analyzeSequence(from: file) {
try await analyzer.finalizeAndFinish(through: lastSample)
} else {
await analyzer.cancelAndFinishNow()
}
return try await resultTask.value
} catch {
resultTask.cancel()
await analyzer.cancelAndFinishNow()
throw error
}
}

private static func makeTranscriber(locale: Locale) async throws -> SpeechTranscriber {
guard SpeechTranscriber.isAvailable else {
throw AppleSpeechAnalyzerError.unavailable
}
guard let supported = await SpeechTranscriber.supportedLocale(equivalentTo: locale) else {
throw AppleSpeechAnalyzerError.unsupportedLocale(locale.identifier)
}
return SpeechTranscriber(locale: supported, preset: .transcription)
}

private static func ensureModel(for transcriber: SpeechTranscriber) async throws {
let modules: [any SpeechModule] = [transcriber]
if await AssetInventory.status(forModules: modules) == .installed { return }
if let request = try await AssetInventory.assetInstallationRequest(supporting: modules) {
try await request.downloadAndInstall()
}
guard await AssetInventory.status(forModules: modules) == .installed else {
throw AppleSpeechAnalyzerError.modelUnavailable
}
}
}

enum AppleSpeechAnalyzerError: LocalizedError {
case unavailable
case unsupportedLocale(String)
case modelUnavailable

var errorDescription: String? {
switch self {
case .unavailable:
return "SpeechAnalyzer is unavailable on this Mac"
case .unsupportedLocale(let locale):
return "SpeechAnalyzer does not support locale \(locale)"
case .modelUnavailable:
return "SpeechAnalyzer model is not installed"
}
}
}
2 changes: 1 addition & 1 deletion Sources/Speech/AppleSpeechEngine.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@ import Foundation
@preconcurrency import Speech
import AVFoundation

final class AppleSpeechEngine: SpeechEngine, @unchecked Sendable {
final class LegacyAppleSpeechEngine: SpeechEngine, @unchecked Sendable {
private var recognizer: SFSpeechRecognizer
private(set) var isReady = false
private var recognitionTask: SFSpeechRecognitionTask?
Expand Down
88 changes: 88 additions & 0 deletions Sources/Speech/AppleSpeechEngineAdapter.swift
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,88 @@
import AVFoundation
import Foundation

final class AppleSpeechEngine: SpeechEngine, @unchecked Sendable {
private let locale: Locale
private let legacy: LegacyAppleSpeechEngine

init(locale: Locale = Locale(identifier: "zh-CN")) {
self.locale = locale
self.legacy = LegacyAppleSpeechEngine(locale: locale)
}

var isReady: Bool { legacy.isReady }
var supportsStreaming: Bool { true }

func requestAccess() {
legacy.requestAccess()
}

func prepare() async {
do {
try await AppleSpeechAnalyzer.prepare(locale: locale)
} catch {
Log.info("[AppleSpeech] SpeechAnalyzer preparation deferred: \(error.localizedDescription)")
}
}

func startListening(language: String?, onPartialResult: @escaping @Sendable (String) -> Void) {
legacy.startListening(language: language, onPartialResult: onPartialResult)
}

func appendAudioBuffer(_ buffer: AVAudioPCMBuffer) {
legacy.appendAudioBuffer(buffer)
}

func finishListening(audioURL: URL?, language: String?) async throws -> String {
let fallbackTask = Task {
try await legacy.finishListening(audioURL: audioURL, language: language)
}
guard let audioURL else { return try await fallbackTask.value }

do {
let text = try await AppleSpeechAnalyzer.transcribe(
audioURL: audioURL,
locale: resolvedLocale(for: language)
)
legacy.cancelListening()
let fallback = try? await fallbackTask.value
return text.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty
? fallback ?? ""
: text
} catch {
Log.info("[AppleSpeech] SpeechAnalyzer failed, using legacy result: \(error.localizedDescription)")
return try await fallbackTask.value
}
}

func cancelListening() {
legacy.cancelListening()
}

func transcribe(audioURL: URL?, language: String?) async throws -> String {
guard let audioURL else { throw AppleSpeechError.noAudioFile }
do {
let text = try await AppleSpeechAnalyzer.transcribe(
audioURL: audioURL,
locale: resolvedLocale(for: language)
)
if !text.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty {
return text
}
} catch {
Log.info("[AppleSpeech] SpeechAnalyzer failed, using legacy recognizer: \(error.localizedDescription)")
}
return try await legacy.transcribe(audioURL: audioURL, language: language)
}

private func resolvedLocale(for language: String?) -> Locale {
switch language {
case "zh": return Locale(identifier: "zh-CN")
case "en": return Locale(identifier: "en-US")
case "ja": return Locale(identifier: "ja-JP")
case "ko": return Locale(identifier: "ko-KR")
case "yue": return Locale(identifier: "yue-CN")
default: return locale
}
}
}
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
26 changes: 13 additions & 13 deletions Package.resolved

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Package.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,15 +12,15 @@ let package = Package(
.executable(name: "OpenTypeCLI", targets: ["OpenTypeCLI"]),
],
dependencies: [
.package(url: "https://github.com/argmaxinc/WhisperKit.git", from: "1.0.0"),
.package(url: "https://github.com/argmaxinc/argmax-oss-swift.git", from: "1.0.0"),
.package(url: "https://github.com/huggingface/swift-transformers", from: "1.3.3"),
.package(url: "https://github.com/ml-explore/mlx-swift-lm", branch: "main"),
],
targets: [
.executableTarget(
name: "OpenType",
dependencies: [
.product(name: "WhisperKit", package: "WhisperKit"),
.product(name: "WhisperKit", package: "argmax-oss-swift"),
.product(name: "Hub", package: "swift-transformers"),
.product(name: "Tokenizers", package: "swift-transformers"),
.product(name: "MLXLLM", package: "mlx-swift-lm"),
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,7 @@
[![Apple Silicon](https://img.shields.io/badge/Apple%20Silicon-M1%2FM2%2FM3%2FM4-black?style=flat-square&logo=apple&logoColor=white)](https://www.apple.com/mac/m1/)
[![License](https://img.shields.io/badge/license-MIT-blue?style=flat-square)](LICENSE)

[![WhisperKit](https://img.shields.io/badge/Powered%20by-WhisperKit-blue?style=flat-square)](https://github.com/argmaxinc/WhisperKit)
[![WhisperKit](https://img.shields.io/badge/Powered%20by-WhisperKit-blue?style=flat-square)](https://github.com/argmaxinc/argmax-oss-swift)
[![MLX](https://img.shields.io/badge/Powered%20by-MLX--LM-orange?style=flat-square)](https://github.com/ml-explore/mlx-swift-lm)

[Website](https://opentype.idevlab.dev) · [中文文档](README_zh.md)
Expand DownExpand Up@@ -161,7 +161,7 @@ scripts/

## Tech Stack

- [WhisperKit](https://github.com/argmaxinc/WhisperKit) — offline Whisper speech recognition
- [WhisperKit](https://github.com/argmaxinc/argmax-oss-swift) — offline Whisper speech recognition
- [mlx-swift-lm](https://github.com/ml-explore/mlx-swift-lm) — local LLM inference on Apple Silicon (Qwen2.5 / Qwen3)
- **SwiftUI + AppKit** — native macOS UI
- **ScreenCaptureKit + Vision** — screen OCR
Expand Down
4 changes: 2 additions & 2 deletions README_zh.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,7 @@
[![Apple Silicon](https://img.shields.io/badge/Apple%20Silicon-M1%2FM2%2FM3%2FM4-black?style=flat-square&logo=apple&logoColor=white)](https://www.apple.com/mac/m1/)
[![License](https://img.shields.io/badge/license-MIT-blue?style=flat-square)](LICENSE)

[![WhisperKit](https://img.shields.io/badge/驱动-WhisperKit-blue?style=flat-square)](https://github.com/argmaxinc/WhisperKit)
[![WhisperKit](https://img.shields.io/badge/驱动-WhisperKit-blue?style=flat-square)](https://github.com/argmaxinc/argmax-oss-swift)
[![MLX](https://img.shields.io/badge/驱动-MLX--LM-orange?style=flat-square)](https://github.com/ml-explore/mlx-swift-lm)

[官网](https://opentype.idevlab.dev) · [English](README.md)
Expand DownExpand Up@@ -161,7 +161,7 @@ scripts/

## 技术栈

- [WhisperKit](https://github.com/argmaxinc/WhisperKit) — 离线 Whisper 语音识别
- [WhisperKit](https://github.com/argmaxinc/argmax-oss-swift) — 离线 Whisper 语音识别
- [mlx-swift-lm](https://github.com/ml-explore/mlx-swift-lm) — Apple Silicon 本地 LLM 推理(Qwen2.5 / Qwen3)
- **SwiftUI + AppKit** — macOS 原生 UI
- **ScreenCaptureKit + Vision** — 屏幕 OCR
Expand Down
11 changes: 11 additions & 0 deletions Sources/App/VoicePipeline+Models.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -115,6 +115,17 @@ extension VoicePipeline {
case .qwen3:
let settings = appState.settings
let catalog = ModelCatalog.shared
if !LocalASRRuntime.isReady(for: .qwen3),
!catalog.asrModelPath(for: settings.qwenASRModel).isEmpty {
do {
_ = try await LocalASRRuntime.ensurePythonPath(
for: .qwen3,
preferredPath: settings.localASRPythonPath
)
} catch {
Log.error("[VoicePipeline] Qwen ASR runtime migration failed: \(error.localizedDescription)")
}
}
guard localASRIsAvailable(settings.qwenASRModel) else {
qwenSpeechEngine = nil
markSpeechModelDownloadRequired(showInStatus: requestPermission)
Expand Down
2 changes: 1 addition & 1 deletion Sources/Config/AppSettings.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -357,7 +357,7 @@ final class AppSettings: ObservableObject {
appIconAppearance = AppIconAppearance(rawValue: ud.string(forKey: Key.appIconAppearance.rawValue) ?? "") ?? .system
volcAppKey = ud.string(forKey: Key.volcAppKey.rawValue) ?? ""
volcAccessKey = ud.string(forKey: Key.volcAccessKey.rawValue) ?? ""
volcResourceId = ud.string(forKey: Key.volcResourceId.rawValue) ?? "volc.bigasr.sauc.duration"
volcResourceId = ud.string(forKey: Key.volcResourceId.rawValue) ?? VolcASRModel.recommended.rawValue
localASRPythonPath = ud.string(forKey: Key.localASRPythonPath.rawValue) ?? LocalASRConfiguration.defaultPythonPath
qwenASRModel = ud.string(forKey: Key.qwenASRModel.rawValue)
?? ud.string(forKey: Key.qwenASRModelPath.rawValue)
Expand Down
17 changes: 17 additions & 0 deletions Sources/Config/VolcASRModel.swift
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
import Foundation

enum VolcASRModel: String, CaseIterable, Identifiable {
case seedASR2 = "volc.seedasr.sauc.duration"
case bigASR1 = "volc.bigasr.sauc.duration"

var id: String { rawValue }

var displayName: String {
switch self {
case .seedASR2: return L("volc.model.seed_asr_2")
case .bigASR1: return L("volc.model.big_asr_1")
}
}

static let recommended = VolcASRModel.seedASR2
}
3 changes: 3 additions & 0 deletions Sources/Resources/en.lproj/Localizable.strings
Original file line numberDiff line numberDiff line change
Expand Up@@ -339,6 +339,9 @@

/* ── Volc ASR ── */
"volc.config_hint" = "Enter your Volcengine Doubao ASR credentials. Get them from the Volcengine console.";
"volc.model" = "Recognition model";
"volc.model.seed_asr_2" = "SeedASR 2.0 (Recommended)";
"volc.model.big_asr_1" = "BigASR 1.0 (Legacy)";
"volc.app_key" = "App Key (App ID)";
"volc.access_key" = "Access Token";
"volc.resource_id" = "Resource ID";
Expand Down
3 changes: 3 additions & 0 deletions Sources/Resources/zh-Hans.lproj/Localizable.strings
Original file line numberDiff line numberDiff line change
Expand Up@@ -339,6 +339,9 @@

/* ── 豆包语音识别 ── */
"volc.config_hint" = "填写火山引擎豆包语音识别凭据,可从火山引擎控制台获取。";
"volc.model" = "识别模型";
"volc.model.seed_asr_2" = "SeedASR 2.0(推荐)";
"volc.model.big_asr_1" = "BigASR 1.0(旧版)";
"volc.app_key" = "App Key(应用 ID)";
"volc.access_key" = "Access Token";
"volc.resource_id" = "Resource ID(资源 ID)";
Expand Down
79 changes: 79 additions & 0 deletions Sources/Speech/AppleSpeechAnalyzer.swift
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,79 @@
import AVFoundation
import Foundation
@preconcurrency import Speech

enum AppleSpeechAnalyzer {
static func prepare(locale: Locale) async throws {
let transcriber = try await makeTranscriber(locale: locale)
try await ensureModel(for: transcriber)
}

static func transcribe(audioURL: URL, locale: Locale) async throws -> String {
let transcriber = try await makeTranscriber(locale: locale)
try await ensureModel(for: transcriber)

let file = try AVAudioFile(forReading: audioURL)
let resultTask = Task<String, Error> {
var transcript = ""
for try await result in transcriber.results where result.isFinal {
transcript += String(result.text.characters)
}
return transcript
}

let analyzer = SpeechAnalyzer(
modules: [transcriber],
options: .init(priority: .userInitiated, modelRetention: .lingering)
)
do {
if let lastSample = try await analyzer.analyzeSequence(from: file) {
try await analyzer.finalizeAndFinish(through: lastSample)
} else {
await analyzer.cancelAndFinishNow()
}
return try await resultTask.value
} catch {
resultTask.cancel()
await analyzer.cancelAndFinishNow()
throw error
}
}

private static func makeTranscriber(locale: Locale) async throws -> SpeechTranscriber {
guard SpeechTranscriber.isAvailable else {
throw AppleSpeechAnalyzerError.unavailable
}
guard let supported = await SpeechTranscriber.supportedLocale(equivalentTo: locale) else {
throw AppleSpeechAnalyzerError.unsupportedLocale(locale.identifier)
}
return SpeechTranscriber(locale: supported, preset: .transcription)
}

private static func ensureModel(for transcriber: SpeechTranscriber) async throws {
let modules: [any SpeechModule] = [transcriber]
if await AssetInventory.status(forModules: modules) == .installed { return }
if let request = try await AssetInventory.assetInstallationRequest(supporting: modules) {
try await request.downloadAndInstall()
}
guard await AssetInventory.status(forModules: modules) == .installed else {
throw AppleSpeechAnalyzerError.modelUnavailable
}
}
}

enum AppleSpeechAnalyzerError: LocalizedError {
case unavailable
case unsupportedLocale(String)
case modelUnavailable

var errorDescription: String? {
switch self {
case .unavailable:
return "SpeechAnalyzer is unavailable on this Mac"
case .unsupportedLocale(let locale):
return "SpeechAnalyzer does not support locale \(locale)"
case .modelUnavailable:
return "SpeechAnalyzer model is not installed"
}
}
}
2 changes: 1 addition & 1 deletion Sources/Speech/AppleSpeechEngine.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@ import Foundation
@preconcurrency import Speech
import AVFoundation

final class AppleSpeechEngine: SpeechEngine, @unchecked Sendable {
final class LegacyAppleSpeechEngine: SpeechEngine, @unchecked Sendable {
private var recognizer: SFSpeechRecognizer
private(set) var isReady = false
private var recognitionTask: SFSpeechRecognitionTask?
Expand Down
88 changes: 88 additions & 0 deletions Sources/Speech/AppleSpeechEngineAdapter.swift
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,88 @@
import AVFoundation
import Foundation

final class AppleSpeechEngine: SpeechEngine, @unchecked Sendable {
private let locale: Locale
private let legacy: LegacyAppleSpeechEngine

init(locale: Locale = Locale(identifier: "zh-CN")) {
self.locale = locale
self.legacy = LegacyAppleSpeechEngine(locale: locale)
}

var isReady: Bool { legacy.isReady }
var supportsStreaming: Bool { true }

func requestAccess() {
legacy.requestAccess()
}

func prepare() async {
do {
try await AppleSpeechAnalyzer.prepare(locale: locale)
} catch {
Log.info("[AppleSpeech] SpeechAnalyzer preparation deferred: \(error.localizedDescription)")
}
}

func startListening(language: String?, onPartialResult: @escaping @Sendable (String) -> Void) {
legacy.startListening(language: language, onPartialResult: onPartialResult)
}

func appendAudioBuffer(_ buffer: AVAudioPCMBuffer) {
legacy.appendAudioBuffer(buffer)
}

func finishListening(audioURL: URL?, language: String?) async throws -> String {
let fallbackTask = Task {
try await legacy.finishListening(audioURL: audioURL, language: language)
}
guard let audioURL else { return try await fallbackTask.value }

do {
let text = try await AppleSpeechAnalyzer.transcribe(
audioURL: audioURL,
locale: resolvedLocale(for: language)
)
legacy.cancelListening()
let fallback = try? await fallbackTask.value
return text.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty
? fallback ?? ""
: text
} catch {
Log.info("[AppleSpeech] SpeechAnalyzer failed, using legacy result: \(error.localizedDescription)")
return try await fallbackTask.value
}
}

func cancelListening() {
legacy.cancelListening()
}

func transcribe(audioURL: URL?, language: String?) async throws -> String {
guard let audioURL else { throw AppleSpeechError.noAudioFile }
do {
let text = try await AppleSpeechAnalyzer.transcribe(
audioURL: audioURL,
locale: resolvedLocale(for: language)
)
if !text.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty {
return text
}
} catch {
Log.info("[AppleSpeech] SpeechAnalyzer failed, using legacy recognizer: \(error.localizedDescription)")
}
return try await legacy.transcribe(audioURL: audioURL, language: language)
}

private func resolvedLocale(for language: String?) -> Locale {
switch language {
case "zh": return Locale(identifier: "zh-CN")
case "en": return Locale(identifier: "en-US")
case "ja": return Locale(identifier: "ja-JP")
case "ko": return Locale(identifier: "ko-KR")
case "yue": return Locale(identifier: "yue-CN")
default: return locale
}
}
}
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
26 changes: 13 additions & 13 deletions Package.resolved

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Package.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,15 +12,15 @@ let package = Package(
.executable(name: "OpenTypeCLI", targets: ["OpenTypeCLI"]),
],
dependencies: [
.package(url: "https://github.com/argmaxinc/WhisperKit.git", from: "1.0.0"),
.package(url: "https://github.com/argmaxinc/argmax-oss-swift.git", from: "1.0.0"),
.package(url: "https://github.com/huggingface/swift-transformers", from: "1.3.3"),
.package(url: "https://github.com/ml-explore/mlx-swift-lm", branch: "main"),
],
targets: [
.executableTarget(
name: "OpenType",
dependencies: [
.product(name: "WhisperKit", package: "WhisperKit"),
.product(name: "WhisperKit", package: "argmax-oss-swift"),
.product(name: "Hub", package: "swift-transformers"),
.product(name: "Tokenizers", package: "swift-transformers"),
.product(name: "MLXLLM", package: "mlx-swift-lm"),
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,7 @@
[![Apple Silicon](https://img.shields.io/badge/Apple%20Silicon-M1%2FM2%2FM3%2FM4-black?style=flat-square&logo=apple&logoColor=white)](https://www.apple.com/mac/m1/)
[![License](https://img.shields.io/badge/license-MIT-blue?style=flat-square)](LICENSE)

[![WhisperKit](https://img.shields.io/badge/Powered%20by-WhisperKit-blue?style=flat-square)](https://github.com/argmaxinc/WhisperKit)
[![WhisperKit](https://img.shields.io/badge/Powered%20by-WhisperKit-blue?style=flat-square)](https://github.com/argmaxinc/argmax-oss-swift)
[![MLX](https://img.shields.io/badge/Powered%20by-MLX--LM-orange?style=flat-square)](https://github.com/ml-explore/mlx-swift-lm)

[Website](https://opentype.idevlab.dev) · [中文文档](README_zh.md)
Expand DownExpand Up@@ -161,7 +161,7 @@ scripts/

## Tech Stack

- [WhisperKit](https://github.com/argmaxinc/WhisperKit) — offline Whisper speech recognition
- [WhisperKit](https://github.com/argmaxinc/argmax-oss-swift) — offline Whisper speech recognition
- [mlx-swift-lm](https://github.com/ml-explore/mlx-swift-lm) — local LLM inference on Apple Silicon (Qwen2.5 / Qwen3)
- **SwiftUI + AppKit** — native macOS UI
- **ScreenCaptureKit + Vision** — screen OCR
Expand Down
4 changes: 2 additions & 2 deletions README_zh.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,7 @@
[![Apple Silicon](https://img.shields.io/badge/Apple%20Silicon-M1%2FM2%2FM3%2FM4-black?style=flat-square&logo=apple&logoColor=white)](https://www.apple.com/mac/m1/)
[![License](https://img.shields.io/badge/license-MIT-blue?style=flat-square)](LICENSE)

[![WhisperKit](https://img.shields.io/badge/驱动-WhisperKit-blue?style=flat-square)](https://github.com/argmaxinc/WhisperKit)
[![WhisperKit](https://img.shields.io/badge/驱动-WhisperKit-blue?style=flat-square)](https://github.com/argmaxinc/argmax-oss-swift)
[![MLX](https://img.shields.io/badge/驱动-MLX--LM-orange?style=flat-square)](https://github.com/ml-explore/mlx-swift-lm)

[官网](https://opentype.idevlab.dev) · [English](README.md)
Expand DownExpand Up@@ -161,7 +161,7 @@ scripts/

## 技术栈

- [WhisperKit](https://github.com/argmaxinc/WhisperKit) — 离线 Whisper 语音识别
- [WhisperKit](https://github.com/argmaxinc/argmax-oss-swift) — 离线 Whisper 语音识别
- [mlx-swift-lm](https://github.com/ml-explore/mlx-swift-lm) — Apple Silicon 本地 LLM 推理(Qwen2.5 / Qwen3)
- **SwiftUI + AppKit** — macOS 原生 UI
- **ScreenCaptureKit + Vision** — 屏幕 OCR
Expand Down
11 changes: 11 additions & 0 deletions Sources/App/VoicePipeline+Models.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -115,6 +115,17 @@ extension VoicePipeline {
case .qwen3:
let settings = appState.settings
let catalog = ModelCatalog.shared
if !LocalASRRuntime.isReady(for: .qwen3),
!catalog.asrModelPath(for: settings.qwenASRModel).isEmpty {
do {
_ = try await LocalASRRuntime.ensurePythonPath(
for: .qwen3,
preferredPath: settings.localASRPythonPath
)
} catch {
Log.error("[VoicePipeline] Qwen ASR runtime migration failed: \(error.localizedDescription)")
}
}
guard localASRIsAvailable(settings.qwenASRModel) else {
qwenSpeechEngine = nil
markSpeechModelDownloadRequired(showInStatus: requestPermission)
Expand Down
2 changes: 1 addition & 1 deletion Sources/Config/AppSettings.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -357,7 +357,7 @@ final class AppSettings: ObservableObject {
appIconAppearance = AppIconAppearance(rawValue: ud.string(forKey: Key.appIconAppearance.rawValue) ?? "") ?? .system
volcAppKey = ud.string(forKey: Key.volcAppKey.rawValue) ?? ""
volcAccessKey = ud.string(forKey: Key.volcAccessKey.rawValue) ?? ""
volcResourceId = ud.string(forKey: Key.volcResourceId.rawValue) ?? "volc.bigasr.sauc.duration"
volcResourceId = ud.string(forKey: Key.volcResourceId.rawValue) ?? VolcASRModel.recommended.rawValue
localASRPythonPath = ud.string(forKey: Key.localASRPythonPath.rawValue) ?? LocalASRConfiguration.defaultPythonPath
qwenASRModel = ud.string(forKey: Key.qwenASRModel.rawValue)
?? ud.string(forKey: Key.qwenASRModelPath.rawValue)
Expand Down
17 changes: 17 additions & 0 deletions Sources/Config/VolcASRModel.swift
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
import Foundation

enum VolcASRModel: String, CaseIterable, Identifiable {
case seedASR2 = "volc.seedasr.sauc.duration"
case bigASR1 = "volc.bigasr.sauc.duration"

var id: String { rawValue }

var displayName: String {
switch self {
case .seedASR2: return L("volc.model.seed_asr_2")
case .bigASR1: return L("volc.model.big_asr_1")
}
}

static let recommended = VolcASRModel.seedASR2
}
3 changes: 3 additions & 0 deletions Sources/Resources/en.lproj/Localizable.strings
Original file line numberDiff line numberDiff line change
Expand Up@@ -339,6 +339,9 @@

/* ── Volc ASR ── */
"volc.config_hint" = "Enter your Volcengine Doubao ASR credentials. Get them from the Volcengine console.";
"volc.model" = "Recognition model";
"volc.model.seed_asr_2" = "SeedASR 2.0 (Recommended)";
"volc.model.big_asr_1" = "BigASR 1.0 (Legacy)";
"volc.app_key" = "App Key (App ID)";
"volc.access_key" = "Access Token";
"volc.resource_id" = "Resource ID";
Expand Down
3 changes: 3 additions & 0 deletions Sources/Resources/zh-Hans.lproj/Localizable.strings
Original file line numberDiff line numberDiff line change
Expand Up@@ -339,6 +339,9 @@

/* ── 豆包语音识别 ── */
"volc.config_hint" = "填写火山引擎豆包语音识别凭据,可从火山引擎控制台获取。";
"volc.model" = "识别模型";
"volc.model.seed_asr_2" = "SeedASR 2.0(推荐)";
"volc.model.big_asr_1" = "BigASR 1.0(旧版)";
"volc.app_key" = "App Key(应用 ID)";
"volc.access_key" = "Access Token";
"volc.resource_id" = "Resource ID(资源 ID)";
Expand Down
79 changes: 79 additions & 0 deletions Sources/Speech/AppleSpeechAnalyzer.swift
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,79 @@
import AVFoundation
import Foundation
@preconcurrency import Speech

enum AppleSpeechAnalyzer {
static func prepare(locale: Locale) async throws {
let transcriber = try await makeTranscriber(locale: locale)
try await ensureModel(for: transcriber)
}

static func transcribe(audioURL: URL, locale: Locale) async throws -> String {
let transcriber = try await makeTranscriber(locale: locale)
try await ensureModel(for: transcriber)

let file = try AVAudioFile(forReading: audioURL)
let resultTask = Task<String, Error> {
var transcript = ""
for try await result in transcriber.results where result.isFinal {
transcript += String(result.text.characters)
}
return transcript
}

let analyzer = SpeechAnalyzer(
modules: [transcriber],
options: .init(priority: .userInitiated, modelRetention: .lingering)
)
do {
if let lastSample = try await analyzer.analyzeSequence(from: file) {
try await analyzer.finalizeAndFinish(through: lastSample)
} else {
await analyzer.cancelAndFinishNow()
}
return try await resultTask.value
} catch {
resultTask.cancel()
await analyzer.cancelAndFinishNow()
throw error
}
}

private static func makeTranscriber(locale: Locale) async throws -> SpeechTranscriber {
guard SpeechTranscriber.isAvailable else {
throw AppleSpeechAnalyzerError.unavailable
}
guard let supported = await SpeechTranscriber.supportedLocale(equivalentTo: locale) else {
throw AppleSpeechAnalyzerError.unsupportedLocale(locale.identifier)
}
return SpeechTranscriber(locale: supported, preset: .transcription)
}

private static func ensureModel(for transcriber: SpeechTranscriber) async throws {
let modules: [any SpeechModule] = [transcriber]
if await AssetInventory.status(forModules: modules) == .installed { return }
if let request = try await AssetInventory.assetInstallationRequest(supporting: modules) {
try await request.downloadAndInstall()
}
guard await AssetInventory.status(forModules: modules) == .installed else {
throw AppleSpeechAnalyzerError.modelUnavailable
}
}
}

enum AppleSpeechAnalyzerError: LocalizedError {
case unavailable
case unsupportedLocale(String)
case modelUnavailable

var errorDescription: String? {
switch self {
case .unavailable:
return "SpeechAnalyzer is unavailable on this Mac"
case .unsupportedLocale(let locale):
return "SpeechAnalyzer does not support locale \(locale)"
case .modelUnavailable:
return "SpeechAnalyzer model is not installed"
}
}
}
2 changes: 1 addition & 1 deletion Sources/Speech/AppleSpeechEngine.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@ import Foundation
@preconcurrency import Speech
import AVFoundation

final class AppleSpeechEngine: SpeechEngine, @unchecked Sendable {
final class LegacyAppleSpeechEngine: SpeechEngine, @unchecked Sendable {
private var recognizer: SFSpeechRecognizer
private(set) var isReady = false
private var recognitionTask: SFSpeechRecognitionTask?
Expand Down
88 changes: 88 additions & 0 deletions Sources/Speech/AppleSpeechEngineAdapter.swift
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,88 @@
import AVFoundation
import Foundation

final class AppleSpeechEngine: SpeechEngine, @unchecked Sendable {
private let locale: Locale
private let legacy: LegacyAppleSpeechEngine

init(locale: Locale = Locale(identifier: "zh-CN")) {
self.locale = locale
self.legacy = LegacyAppleSpeechEngine(locale: locale)
}

var isReady: Bool { legacy.isReady }
var supportsStreaming: Bool { true }

func requestAccess() {
legacy.requestAccess()
}

func prepare() async {
do {
try await AppleSpeechAnalyzer.prepare(locale: locale)
} catch {
Log.info("[AppleSpeech] SpeechAnalyzer preparation deferred: \(error.localizedDescription)")
}
}

func startListening(language: String?, onPartialResult: @escaping @Sendable (String) -> Void) {
legacy.startListening(language: language, onPartialResult: onPartialResult)
}

func appendAudioBuffer(_ buffer: AVAudioPCMBuffer) {
legacy.appendAudioBuffer(buffer)
}

func finishListening(audioURL: URL?, language: String?) async throws -> String {
let fallbackTask = Task {
try await legacy.finishListening(audioURL: audioURL, language: language)
}
guard let audioURL else { return try await fallbackTask.value }

do {
let text = try await AppleSpeechAnalyzer.transcribe(
audioURL: audioURL,
locale: resolvedLocale(for: language)
)
legacy.cancelListening()
let fallback = try? await fallbackTask.value
return text.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty
? fallback ?? ""
: text
} catch {
Log.info("[AppleSpeech] SpeechAnalyzer failed, using legacy result: \(error.localizedDescription)")
return try await fallbackTask.value
}
}

func cancelListening() {
legacy.cancelListening()
}

func transcribe(audioURL: URL?, language: String?) async throws -> String {
guard let audioURL else { throw AppleSpeechError.noAudioFile }
do {
let text = try await AppleSpeechAnalyzer.transcribe(
audioURL: audioURL,
locale: resolvedLocale(for: language)
)
if !text.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty {
return text
}
} catch {
Log.info("[AppleSpeech] SpeechAnalyzer failed, using legacy recognizer: \(error.localizedDescription)")
}
return try await legacy.transcribe(audioURL: audioURL, language: language)
}

private func resolvedLocale(for language: String?) -> Locale {
switch language {
case "zh": return Locale(identifier: "zh-CN")
case "en": return Locale(identifier: "en-US")
case "ja": return Locale(identifier: "ja-JP")
case "ko": return Locale(identifier: "ko-KR")
case "yue": return Locale(identifier: "yue-CN")
default: return locale
}
}
}
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
26 changes: 13 additions & 13 deletions Package.resolved

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Package.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,15 +12,15 @@ let package = Package(
.executable(name: "OpenTypeCLI", targets: ["OpenTypeCLI"]),
],
dependencies: [
.package(url: "https://github.com/argmaxinc/WhisperKit.git", from: "1.0.0"),
.package(url: "https://github.com/argmaxinc/argmax-oss-swift.git", from: "1.0.0"),
.package(url: "https://github.com/huggingface/swift-transformers", from: "1.3.3"),
.package(url: "https://github.com/ml-explore/mlx-swift-lm", branch: "main"),
],
targets: [
.executableTarget(
name: "OpenType",
dependencies: [
.product(name: "WhisperKit", package: "WhisperKit"),
.product(name: "WhisperKit", package: "argmax-oss-swift"),
.product(name: "Hub", package: "swift-transformers"),
.product(name: "Tokenizers", package: "swift-transformers"),
.product(name: "MLXLLM", package: "mlx-swift-lm"),
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,7 @@
[![Apple Silicon](https://img.shields.io/badge/Apple%20Silicon-M1%2FM2%2FM3%2FM4-black?style=flat-square&logo=apple&logoColor=white)](https://www.apple.com/mac/m1/)
[![License](https://img.shields.io/badge/license-MIT-blue?style=flat-square)](LICENSE)

[![WhisperKit](https://img.shields.io/badge/Powered%20by-WhisperKit-blue?style=flat-square)](https://github.com/argmaxinc/WhisperKit)
[![WhisperKit](https://img.shields.io/badge/Powered%20by-WhisperKit-blue?style=flat-square)](https://github.com/argmaxinc/argmax-oss-swift)
[![MLX](https://img.shields.io/badge/Powered%20by-MLX--LM-orange?style=flat-square)](https://github.com/ml-explore/mlx-swift-lm)

[Website](https://opentype.idevlab.dev) · [中文文档](README_zh.md)
Expand DownExpand Up@@ -161,7 +161,7 @@ scripts/

## Tech Stack

- [WhisperKit](https://github.com/argmaxinc/WhisperKit) — offline Whisper speech recognition
- [WhisperKit](https://github.com/argmaxinc/argmax-oss-swift) — offline Whisper speech recognition
- [mlx-swift-lm](https://github.com/ml-explore/mlx-swift-lm) — local LLM inference on Apple Silicon (Qwen2.5 / Qwen3)
- **SwiftUI + AppKit** — native macOS UI
- **ScreenCaptureKit + Vision** — screen OCR
Expand Down
4 changes: 2 additions & 2 deletions README_zh.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,7 @@
[![Apple Silicon](https://img.shields.io/badge/Apple%20Silicon-M1%2FM2%2FM3%2FM4-black?style=flat-square&logo=apple&logoColor=white)](https://www.apple.com/mac/m1/)
[![License](https://img.shields.io/badge/license-MIT-blue?style=flat-square)](LICENSE)

[![WhisperKit](https://img.shields.io/badge/驱动-WhisperKit-blue?style=flat-square)](https://github.com/argmaxinc/WhisperKit)
[![WhisperKit](https://img.shields.io/badge/驱动-WhisperKit-blue?style=flat-square)](https://github.com/argmaxinc/argmax-oss-swift)
[![MLX](https://img.shields.io/badge/驱动-MLX--LM-orange?style=flat-square)](https://github.com/ml-explore/mlx-swift-lm)

[官网](https://opentype.idevlab.dev) · [English](README.md)
Expand DownExpand Up@@ -161,7 +161,7 @@ scripts/

## 技术栈

- [WhisperKit](https://github.com/argmaxinc/WhisperKit) — 离线 Whisper 语音识别
- [WhisperKit](https://github.com/argmaxinc/argmax-oss-swift) — 离线 Whisper 语音识别
- [mlx-swift-lm](https://github.com/ml-explore/mlx-swift-lm) — Apple Silicon 本地 LLM 推理(Qwen2.5 / Qwen3)
- **SwiftUI + AppKit** — macOS 原生 UI
- **ScreenCaptureKit + Vision** — 屏幕 OCR
Expand Down
11 changes: 11 additions & 0 deletions Sources/App/VoicePipeline+Models.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -115,6 +115,17 @@ extension VoicePipeline {
case .qwen3:
let settings = appState.settings
let catalog = ModelCatalog.shared
if !LocalASRRuntime.isReady(for: .qwen3),
!catalog.asrModelPath(for: settings.qwenASRModel).isEmpty {
do {
_ = try await LocalASRRuntime.ensurePythonPath(
for: .qwen3,
preferredPath: settings.localASRPythonPath
)
} catch {
Log.error("[VoicePipeline] Qwen ASR runtime migration failed: \(error.localizedDescription)")
}
}
guard localASRIsAvailable(settings.qwenASRModel) else {
qwenSpeechEngine = nil
markSpeechModelDownloadRequired(showInStatus: requestPermission)
Expand Down
2 changes: 1 addition & 1 deletion Sources/Config/AppSettings.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -357,7 +357,7 @@ final class AppSettings: ObservableObject {
appIconAppearance = AppIconAppearance(rawValue: ud.string(forKey: Key.appIconAppearance.rawValue) ?? "") ?? .system
volcAppKey = ud.string(forKey: Key.volcAppKey.rawValue) ?? ""
volcAccessKey = ud.string(forKey: Key.volcAccessKey.rawValue) ?? ""
volcResourceId = ud.string(forKey: Key.volcResourceId.rawValue) ?? "volc.bigasr.sauc.duration"
volcResourceId = ud.string(forKey: Key.volcResourceId.rawValue) ?? VolcASRModel.recommended.rawValue
localASRPythonPath = ud.string(forKey: Key.localASRPythonPath.rawValue) ?? LocalASRConfiguration.defaultPythonPath
qwenASRModel = ud.string(forKey: Key.qwenASRModel.rawValue)
?? ud.string(forKey: Key.qwenASRModelPath.rawValue)
Expand Down
17 changes: 17 additions & 0 deletions Sources/Config/VolcASRModel.swift
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
import Foundation

enum VolcASRModel: String, CaseIterable, Identifiable {
case seedASR2 = "volc.seedasr.sauc.duration"
case bigASR1 = "volc.bigasr.sauc.duration"

var id: String { rawValue }

var displayName: String {
switch self {
case .seedASR2: return L("volc.model.seed_asr_2")
case .bigASR1: return L("volc.model.big_asr_1")
}
}

static let recommended = VolcASRModel.seedASR2
}
3 changes: 3 additions & 0 deletions Sources/Resources/en.lproj/Localizable.strings
Original file line numberDiff line numberDiff line change
Expand Up@@ -339,6 +339,9 @@

/* ── Volc ASR ── */
"volc.config_hint" = "Enter your Volcengine Doubao ASR credentials. Get them from the Volcengine console.";
"volc.model" = "Recognition model";
"volc.model.seed_asr_2" = "SeedASR 2.0 (Recommended)";
"volc.model.big_asr_1" = "BigASR 1.0 (Legacy)";
"volc.app_key" = "App Key (App ID)";
"volc.access_key" = "Access Token";
"volc.resource_id" = "Resource ID";
Expand Down
3 changes: 3 additions & 0 deletions Sources/Resources/zh-Hans.lproj/Localizable.strings
Original file line numberDiff line numberDiff line change
Expand Up@@ -339,6 +339,9 @@

/* ── 豆包语音识别 ── */
"volc.config_hint" = "填写火山引擎豆包语音识别凭据,可从火山引擎控制台获取。";
"volc.model" = "识别模型";
"volc.model.seed_asr_2" = "SeedASR 2.0(推荐)";
"volc.model.big_asr_1" = "BigASR 1.0(旧版)";
"volc.app_key" = "App Key(应用 ID)";
"volc.access_key" = "Access Token";
"volc.resource_id" = "Resource ID(资源 ID)";
Expand Down
79 changes: 79 additions & 0 deletions Sources/Speech/AppleSpeechAnalyzer.swift
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,79 @@
import AVFoundation
import Foundation
@preconcurrency import Speech

enum AppleSpeechAnalyzer {
static func prepare(locale: Locale) async throws {
let transcriber = try await makeTranscriber(locale: locale)
try await ensureModel(for: transcriber)
}

static func transcribe(audioURL: URL, locale: Locale) async throws -> String {
let transcriber = try await makeTranscriber(locale: locale)
try await ensureModel(for: transcriber)

let file = try AVAudioFile(forReading: audioURL)
let resultTask = Task<String, Error> {
var transcript = ""
for try await result in transcriber.results where result.isFinal {
transcript += String(result.text.characters)
}
return transcript
}

let analyzer = SpeechAnalyzer(
modules: [transcriber],
options: .init(priority: .userInitiated, modelRetention: .lingering)
)
do {
if let lastSample = try await analyzer.analyzeSequence(from: file) {
try await analyzer.finalizeAndFinish(through: lastSample)
} else {
await analyzer.cancelAndFinishNow()
}
return try await resultTask.value
} catch {
resultTask.cancel()
await analyzer.cancelAndFinishNow()
throw error
}
}

private static func makeTranscriber(locale: Locale) async throws -> SpeechTranscriber {
guard SpeechTranscriber.isAvailable else {
throw AppleSpeechAnalyzerError.unavailable
}
guard let supported = await SpeechTranscriber.supportedLocale(equivalentTo: locale) else {
throw AppleSpeechAnalyzerError.unsupportedLocale(locale.identifier)
}
return SpeechTranscriber(locale: supported, preset: .transcription)
}

private static func ensureModel(for transcriber: SpeechTranscriber) async throws {
let modules: [any SpeechModule] = [transcriber]
if await AssetInventory.status(forModules: modules) == .installed { return }
if let request = try await AssetInventory.assetInstallationRequest(supporting: modules) {
try await request.downloadAndInstall()
}
guard await AssetInventory.status(forModules: modules) == .installed else {
throw AppleSpeechAnalyzerError.modelUnavailable
}
}
}

enum AppleSpeechAnalyzerError: LocalizedError {
case unavailable
case unsupportedLocale(String)
case modelUnavailable

var errorDescription: String? {
switch self {
case .unavailable:
return "SpeechAnalyzer is unavailable on this Mac"
case .unsupportedLocale(let locale):
return "SpeechAnalyzer does not support locale \(locale)"
case .modelUnavailable:
return "SpeechAnalyzer model is not installed"
}
}
}
2 changes: 1 addition & 1 deletion Sources/Speech/AppleSpeechEngine.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@ import Foundation
@preconcurrency import Speech
import AVFoundation

final class AppleSpeechEngine: SpeechEngine, @unchecked Sendable {
final class LegacyAppleSpeechEngine: SpeechEngine, @unchecked Sendable {
private var recognizer: SFSpeechRecognizer
private(set) var isReady = false
private var recognitionTask: SFSpeechRecognitionTask?
Expand Down
88 changes: 88 additions & 0 deletions Sources/Speech/AppleSpeechEngineAdapter.swift
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,88 @@
import AVFoundation
import Foundation

final class AppleSpeechEngine: SpeechEngine, @unchecked Sendable {
private let locale: Locale
private let legacy: LegacyAppleSpeechEngine

init(locale: Locale = Locale(identifier: "zh-CN")) {
self.locale = locale
self.legacy = LegacyAppleSpeechEngine(locale: locale)
}

var isReady: Bool { legacy.isReady }
var supportsStreaming: Bool { true }

func requestAccess() {
legacy.requestAccess()
}

func prepare() async {
do {
try await AppleSpeechAnalyzer.prepare(locale: locale)
} catch {
Log.info("[AppleSpeech] SpeechAnalyzer preparation deferred: \(error.localizedDescription)")
}
}

func startListening(language: String?, onPartialResult: @escaping @Sendable (String) -> Void) {
legacy.startListening(language: language, onPartialResult: onPartialResult)
}

func appendAudioBuffer(_ buffer: AVAudioPCMBuffer) {
legacy.appendAudioBuffer(buffer)
}

func finishListening(audioURL: URL?, language: String?) async throws -> String {
let fallbackTask = Task {
try await legacy.finishListening(audioURL: audioURL, language: language)
}
guard let audioURL else { return try await fallbackTask.value }

do {
let text = try await AppleSpeechAnalyzer.transcribe(
audioURL: audioURL,
locale: resolvedLocale(for: language)
)
legacy.cancelListening()
let fallback = try? await fallbackTask.value
return text.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty
? fallback ?? ""
: text
} catch {
Log.info("[AppleSpeech] SpeechAnalyzer failed, using legacy result: \(error.localizedDescription)")
return try await fallbackTask.value
}
}

func cancelListening() {
legacy.cancelListening()
}

func transcribe(audioURL: URL?, language: String?) async throws -> String {
guard let audioURL else { throw AppleSpeechError.noAudioFile }
do {
let text = try await AppleSpeechAnalyzer.transcribe(
audioURL: audioURL,
locale: resolvedLocale(for: language)
)
if !text.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty {
return text
}
} catch {
Log.info("[AppleSpeech] SpeechAnalyzer failed, using legacy recognizer: \(error.localizedDescription)")
}
return try await legacy.transcribe(audioURL: audioURL, language: language)
}

private func resolvedLocale(for language: String?) -> Locale {
switch language {
case "zh": return Locale(identifier: "zh-CN")
case "en": return Locale(identifier: "en-US")
case "ja": return Locale(identifier: "ja-JP")
case "ko": return Locale(identifier: "ko-KR")
case "yue": return Locale(identifier: "yue-CN")
default: return locale
}
}
}
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
26 changes: 13 additions & 13 deletions Package.resolved

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Package.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,15 +12,15 @@ let package = Package(
.executable(name: "OpenTypeCLI", targets: ["OpenTypeCLI"]),
],
dependencies: [
.package(url: "https://github.com/argmaxinc/WhisperKit.git", from: "1.0.0"),
.package(url: "https://github.com/argmaxinc/argmax-oss-swift.git", from: "1.0.0"),
.package(url: "https://github.com/huggingface/swift-transformers", from: "1.3.3"),
.package(url: "https://github.com/ml-explore/mlx-swift-lm", branch: "main"),
],
targets: [
.executableTarget(
name: "OpenType",
dependencies: [
.product(name: "WhisperKit", package: "WhisperKit"),
.product(name: "WhisperKit", package: "argmax-oss-swift"),
.product(name: "Hub", package: "swift-transformers"),
.product(name: "Tokenizers", package: "swift-transformers"),
.product(name: "MLXLLM", package: "mlx-swift-lm"),
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,7 @@
[![Apple Silicon](https://img.shields.io/badge/Apple%20Silicon-M1%2FM2%2FM3%2FM4-black?style=flat-square&logo=apple&logoColor=white)](https://www.apple.com/mac/m1/)
[![License](https://img.shields.io/badge/license-MIT-blue?style=flat-square)](LICENSE)

[![WhisperKit](https://img.shields.io/badge/Powered%20by-WhisperKit-blue?style=flat-square)](https://github.com/argmaxinc/WhisperKit)
[![WhisperKit](https://img.shields.io/badge/Powered%20by-WhisperKit-blue?style=flat-square)](https://github.com/argmaxinc/argmax-oss-swift)
[![MLX](https://img.shields.io/badge/Powered%20by-MLX--LM-orange?style=flat-square)](https://github.com/ml-explore/mlx-swift-lm)

[Website](https://opentype.idevlab.dev) · [中文文档](README_zh.md)
Expand DownExpand Up@@ -161,7 +161,7 @@ scripts/

## Tech Stack

- [WhisperKit](https://github.com/argmaxinc/WhisperKit) — offline Whisper speech recognition
- [WhisperKit](https://github.com/argmaxinc/argmax-oss-swift) — offline Whisper speech recognition
- [mlx-swift-lm](https://github.com/ml-explore/mlx-swift-lm) — local LLM inference on Apple Silicon (Qwen2.5 / Qwen3)
- **SwiftUI + AppKit** — native macOS UI
- **ScreenCaptureKit + Vision** — screen OCR
Expand Down
4 changes: 2 additions & 2 deletions README_zh.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,7 @@
[![Apple Silicon](https://img.shields.io/badge/Apple%20Silicon-M1%2FM2%2FM3%2FM4-black?style=flat-square&logo=apple&logoColor=white)](https://www.apple.com/mac/m1/)
[![License](https://img.shields.io/badge/license-MIT-blue?style=flat-square)](LICENSE)

[![WhisperKit](https://img.shields.io/badge/驱动-WhisperKit-blue?style=flat-square)](https://github.com/argmaxinc/WhisperKit)
[![WhisperKit](https://img.shields.io/badge/驱动-WhisperKit-blue?style=flat-square)](https://github.com/argmaxinc/argmax-oss-swift)
[![MLX](https://img.shields.io/badge/驱动-MLX--LM-orange?style=flat-square)](https://github.com/ml-explore/mlx-swift-lm)

[官网](https://opentype.idevlab.dev) · [English](README.md)
Expand DownExpand Up@@ -161,7 +161,7 @@ scripts/

## 技术栈

- [WhisperKit](https://github.com/argmaxinc/WhisperKit) — 离线 Whisper 语音识别
- [WhisperKit](https://github.com/argmaxinc/argmax-oss-swift) — 离线 Whisper 语音识别
- [mlx-swift-lm](https://github.com/ml-explore/mlx-swift-lm) — Apple Silicon 本地 LLM 推理(Qwen2.5 / Qwen3)
- **SwiftUI + AppKit** — macOS 原生 UI
- **ScreenCaptureKit + Vision** — 屏幕 OCR
Expand Down
11 changes: 11 additions & 0 deletions Sources/App/VoicePipeline+Models.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -115,6 +115,17 @@ extension VoicePipeline {
case .qwen3:
let settings = appState.settings
let catalog = ModelCatalog.shared
if !LocalASRRuntime.isReady(for: .qwen3),
!catalog.asrModelPath(for: settings.qwenASRModel).isEmpty {
do {
_ = try await LocalASRRuntime.ensurePythonPath(
for: .qwen3,
preferredPath: settings.localASRPythonPath
)
} catch {
Log.error("[VoicePipeline] Qwen ASR runtime migration failed: \(error.localizedDescription)")
}
}
guard localASRIsAvailable(settings.qwenASRModel) else {
qwenSpeechEngine = nil
markSpeechModelDownloadRequired(showInStatus: requestPermission)
Expand Down
2 changes: 1 addition & 1 deletion Sources/Config/AppSettings.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -357,7 +357,7 @@ final class AppSettings: ObservableObject {
appIconAppearance = AppIconAppearance(rawValue: ud.string(forKey: Key.appIconAppearance.rawValue) ?? "") ?? .system
volcAppKey = ud.string(forKey: Key.volcAppKey.rawValue) ?? ""
volcAccessKey = ud.string(forKey: Key.volcAccessKey.rawValue) ?? ""
volcResourceId = ud.string(forKey: Key.volcResourceId.rawValue) ?? "volc.bigasr.sauc.duration"
volcResourceId = ud.string(forKey: Key.volcResourceId.rawValue) ?? VolcASRModel.recommended.rawValue
localASRPythonPath = ud.string(forKey: Key.localASRPythonPath.rawValue) ?? LocalASRConfiguration.defaultPythonPath
qwenASRModel = ud.string(forKey: Key.qwenASRModel.rawValue)
?? ud.string(forKey: Key.qwenASRModelPath.rawValue)
Expand Down
17 changes: 17 additions & 0 deletions Sources/Config/VolcASRModel.swift
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
import Foundation

enum VolcASRModel: String, CaseIterable, Identifiable {
case seedASR2 = "volc.seedasr.sauc.duration"
case bigASR1 = "volc.bigasr.sauc.duration"

var id: String { rawValue }

var displayName: String {
switch self {
case .seedASR2: return L("volc.model.seed_asr_2")
case .bigASR1: return L("volc.model.big_asr_1")
}
}

static let recommended = VolcASRModel.seedASR2
}
3 changes: 3 additions & 0 deletions Sources/Resources/en.lproj/Localizable.strings
Original file line numberDiff line numberDiff line change
Expand Up@@ -339,6 +339,9 @@

/* ── Volc ASR ── */
"volc.config_hint" = "Enter your Volcengine Doubao ASR credentials. Get them from the Volcengine console.";
"volc.model" = "Recognition model";
"volc.model.seed_asr_2" = "SeedASR 2.0 (Recommended)";
"volc.model.big_asr_1" = "BigASR 1.0 (Legacy)";
"volc.app_key" = "App Key (App ID)";
"volc.access_key" = "Access Token";
"volc.resource_id" = "Resource ID";
Expand Down
3 changes: 3 additions & 0 deletions Sources/Resources/zh-Hans.lproj/Localizable.strings
Original file line numberDiff line numberDiff line change
Expand Up@@ -339,6 +339,9 @@

/* ── 豆包语音识别 ── */
"volc.config_hint" = "填写火山引擎豆包语音识别凭据,可从火山引擎控制台获取。";
"volc.model" = "识别模型";
"volc.model.seed_asr_2" = "SeedASR 2.0(推荐)";
"volc.model.big_asr_1" = "BigASR 1.0(旧版)";
"volc.app_key" = "App Key(应用 ID)";
"volc.access_key" = "Access Token";
"volc.resource_id" = "Resource ID(资源 ID)";
Expand Down
79 changes: 79 additions & 0 deletions Sources/Speech/AppleSpeechAnalyzer.swift
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,79 @@
import AVFoundation
import Foundation
@preconcurrency import Speech

enum AppleSpeechAnalyzer {
static func prepare(locale: Locale) async throws {
let transcriber = try await makeTranscriber(locale: locale)
try await ensureModel(for: transcriber)
}

static func transcribe(audioURL: URL, locale: Locale) async throws -> String {
let transcriber = try await makeTranscriber(locale: locale)
try await ensureModel(for: transcriber)

let file = try AVAudioFile(forReading: audioURL)
let resultTask = Task<String, Error> {
var transcript = ""
for try await result in transcriber.results where result.isFinal {
transcript += String(result.text.characters)
}
return transcript
}

let analyzer = SpeechAnalyzer(
modules: [transcriber],
options: .init(priority: .userInitiated, modelRetention: .lingering)
)
do {
if let lastSample = try await analyzer.analyzeSequence(from: file) {
try await analyzer.finalizeAndFinish(through: lastSample)
} else {
await analyzer.cancelAndFinishNow()
}
return try await resultTask.value
} catch {
resultTask.cancel()
await analyzer.cancelAndFinishNow()
throw error
}
}

private static func makeTranscriber(locale: Locale) async throws -> SpeechTranscriber {
guard SpeechTranscriber.isAvailable else {
throw AppleSpeechAnalyzerError.unavailable
}
guard let supported = await SpeechTranscriber.supportedLocale(equivalentTo: locale) else {
throw AppleSpeechAnalyzerError.unsupportedLocale(locale.identifier)
}
return SpeechTranscriber(locale: supported, preset: .transcription)
}

private static func ensureModel(for transcriber: SpeechTranscriber) async throws {
let modules: [any SpeechModule] = [transcriber]
if await AssetInventory.status(forModules: modules) == .installed { return }
if let request = try await AssetInventory.assetInstallationRequest(supporting: modules) {
try await request.downloadAndInstall()
}
guard await AssetInventory.status(forModules: modules) == .installed else {
throw AppleSpeechAnalyzerError.modelUnavailable
}
}
}

enum AppleSpeechAnalyzerError: LocalizedError {
case unavailable
case unsupportedLocale(String)
case modelUnavailable

var errorDescription: String? {
switch self {
case .unavailable:
return "SpeechAnalyzer is unavailable on this Mac"
case .unsupportedLocale(let locale):
return "SpeechAnalyzer does not support locale \(locale)"
case .modelUnavailable:
return "SpeechAnalyzer model is not installed"
}
}
}
2 changes: 1 addition & 1 deletion Sources/Speech/AppleSpeechEngine.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@ import Foundation
@preconcurrency import Speech
import AVFoundation

final class AppleSpeechEngine: SpeechEngine, @unchecked Sendable {
final class LegacyAppleSpeechEngine: SpeechEngine, @unchecked Sendable {
private var recognizer: SFSpeechRecognizer
private(set) var isReady = false
private var recognitionTask: SFSpeechRecognitionTask?
Expand Down
88 changes: 88 additions & 0 deletions Sources/Speech/AppleSpeechEngineAdapter.swift
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,88 @@
import AVFoundation
import Foundation

final class AppleSpeechEngine: SpeechEngine, @unchecked Sendable {
private let locale: Locale
private let legacy: LegacyAppleSpeechEngine

init(locale: Locale = Locale(identifier: "zh-CN")) {
self.locale = locale
self.legacy = LegacyAppleSpeechEngine(locale: locale)
}

var isReady: Bool { legacy.isReady }
var supportsStreaming: Bool { true }

func requestAccess() {
legacy.requestAccess()
}

func prepare() async {
do {
try await AppleSpeechAnalyzer.prepare(locale: locale)
} catch {
Log.info("[AppleSpeech] SpeechAnalyzer preparation deferred: \(error.localizedDescription)")
}
}

func startListening(language: String?, onPartialResult: @escaping @Sendable (String) -> Void) {
legacy.startListening(language: language, onPartialResult: onPartialResult)
}

func appendAudioBuffer(_ buffer: AVAudioPCMBuffer) {
legacy.appendAudioBuffer(buffer)
}

func finishListening(audioURL: URL?, language: String?) async throws -> String {
let fallbackTask = Task {
try await legacy.finishListening(audioURL: audioURL, language: language)
}
guard let audioURL else { return try await fallbackTask.value }

do {
let text = try await AppleSpeechAnalyzer.transcribe(
audioURL: audioURL,
locale: resolvedLocale(for: language)
)
legacy.cancelListening()
let fallback = try? await fallbackTask.value
return text.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty
? fallback ?? ""
: text
} catch {
Log.info("[AppleSpeech] SpeechAnalyzer failed, using legacy result: \(error.localizedDescription)")
return try await fallbackTask.value
}
}

func cancelListening() {
legacy.cancelListening()
}

func transcribe(audioURL: URL?, language: String?) async throws -> String {
guard let audioURL else { throw AppleSpeechError.noAudioFile }
do {
let text = try await AppleSpeechAnalyzer.transcribe(
audioURL: audioURL,
locale: resolvedLocale(for: language)
)
if !text.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty {
return text
}
} catch {
Log.info("[AppleSpeech] SpeechAnalyzer failed, using legacy recognizer: \(error.localizedDescription)")
}
return try await legacy.transcribe(audioURL: audioURL, language: language)
}

private func resolvedLocale(for language: String?) -> Locale {
switch language {
case "zh": return Locale(identifier: "zh-CN")
case "en": return Locale(identifier: "en-US")
case "ja": return Locale(identifier: "ja-JP")
case "ko": return Locale(identifier: "ko-KR")
case "yue": return Locale(identifier: "yue-CN")
default: return locale
}
}
}
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
26 changes: 13 additions & 13 deletions Package.resolved

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Package.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,15 +12,15 @@ let package = Package(
.executable(name: "OpenTypeCLI", targets: ["OpenTypeCLI"]),
],
dependencies: [
.package(url: "https://github.com/argmaxinc/WhisperKit.git", from: "1.0.0"),
.package(url: "https://github.com/argmaxinc/argmax-oss-swift.git", from: "1.0.0"),
.package(url: "https://github.com/huggingface/swift-transformers", from: "1.3.3"),
.package(url: "https://github.com/ml-explore/mlx-swift-lm", branch: "main"),
],
targets: [
.executableTarget(
name: "OpenType",
dependencies: [
.product(name: "WhisperKit", package: "WhisperKit"),
.product(name: "WhisperKit", package: "argmax-oss-swift"),
.product(name: "Hub", package: "swift-transformers"),
.product(name: "Tokenizers", package: "swift-transformers"),
.product(name: "MLXLLM", package: "mlx-swift-lm"),
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,7 @@
[![Apple Silicon](https://img.shields.io/badge/Apple%20Silicon-M1%2FM2%2FM3%2FM4-black?style=flat-square&logo=apple&logoColor=white)](https://www.apple.com/mac/m1/)
[![License](https://img.shields.io/badge/license-MIT-blue?style=flat-square)](LICENSE)

[![WhisperKit](https://img.shields.io/badge/Powered%20by-WhisperKit-blue?style=flat-square)](https://github.com/argmaxinc/WhisperKit)
[![WhisperKit](https://img.shields.io/badge/Powered%20by-WhisperKit-blue?style=flat-square)](https://github.com/argmaxinc/argmax-oss-swift)
[![MLX](https://img.shields.io/badge/Powered%20by-MLX--LM-orange?style=flat-square)](https://github.com/ml-explore/mlx-swift-lm)

[Website](https://opentype.idevlab.dev) · [中文文档](README_zh.md)
Expand DownExpand Up@@ -161,7 +161,7 @@ scripts/

## Tech Stack

- [WhisperKit](https://github.com/argmaxinc/WhisperKit) — offline Whisper speech recognition
- [WhisperKit](https://github.com/argmaxinc/argmax-oss-swift) — offline Whisper speech recognition
- [mlx-swift-lm](https://github.com/ml-explore/mlx-swift-lm) — local LLM inference on Apple Silicon (Qwen2.5 / Qwen3)
- **SwiftUI + AppKit** — native macOS UI
- **ScreenCaptureKit + Vision** — screen OCR
Expand Down
4 changes: 2 additions & 2 deletions README_zh.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,7 @@
[![Apple Silicon](https://img.shields.io/badge/Apple%20Silicon-M1%2FM2%2FM3%2FM4-black?style=flat-square&logo=apple&logoColor=white)](https://www.apple.com/mac/m1/)
[![License](https://img.shields.io/badge/license-MIT-blue?style=flat-square)](LICENSE)

[![WhisperKit](https://img.shields.io/badge/驱动-WhisperKit-blue?style=flat-square)](https://github.com/argmaxinc/WhisperKit)
[![WhisperKit](https://img.shields.io/badge/驱动-WhisperKit-blue?style=flat-square)](https://github.com/argmaxinc/argmax-oss-swift)
[![MLX](https://img.shields.io/badge/驱动-MLX--LM-orange?style=flat-square)](https://github.com/ml-explore/mlx-swift-lm)

[官网](https://opentype.idevlab.dev) · [English](README.md)
Expand DownExpand Up@@ -161,7 +161,7 @@ scripts/

## 技术栈

- [WhisperKit](https://github.com/argmaxinc/WhisperKit) — 离线 Whisper 语音识别
- [WhisperKit](https://github.com/argmaxinc/argmax-oss-swift) — 离线 Whisper 语音识别
- [mlx-swift-lm](https://github.com/ml-explore/mlx-swift-lm) — Apple Silicon 本地 LLM 推理(Qwen2.5 / Qwen3)
- **SwiftUI + AppKit** — macOS 原生 UI
- **ScreenCaptureKit + Vision** — 屏幕 OCR
Expand Down
11 changes: 11 additions & 0 deletions Sources/App/VoicePipeline+Models.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -115,6 +115,17 @@ extension VoicePipeline {
case .qwen3:
let settings = appState.settings
let catalog = ModelCatalog.shared
if !LocalASRRuntime.isReady(for: .qwen3),
!catalog.asrModelPath(for: settings.qwenASRModel).isEmpty {
do {
_ = try await LocalASRRuntime.ensurePythonPath(
for: .qwen3,
preferredPath: settings.localASRPythonPath
)
} catch {
Log.error("[VoicePipeline] Qwen ASR runtime migration failed: \(error.localizedDescription)")
}
}
guard localASRIsAvailable(settings.qwenASRModel) else {
qwenSpeechEngine = nil
markSpeechModelDownloadRequired(showInStatus: requestPermission)
Expand Down
2 changes: 1 addition & 1 deletion Sources/Config/AppSettings.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -357,7 +357,7 @@ final class AppSettings: ObservableObject {
appIconAppearance = AppIconAppearance(rawValue: ud.string(forKey: Key.appIconAppearance.rawValue) ?? "") ?? .system
volcAppKey = ud.string(forKey: Key.volcAppKey.rawValue) ?? ""
volcAccessKey = ud.string(forKey: Key.volcAccessKey.rawValue) ?? ""
volcResourceId = ud.string(forKey: Key.volcResourceId.rawValue) ?? "volc.bigasr.sauc.duration"
volcResourceId = ud.string(forKey: Key.volcResourceId.rawValue) ?? VolcASRModel.recommended.rawValue
localASRPythonPath = ud.string(forKey: Key.localASRPythonPath.rawValue) ?? LocalASRConfiguration.defaultPythonPath
qwenASRModel = ud.string(forKey: Key.qwenASRModel.rawValue)
?? ud.string(forKey: Key.qwenASRModelPath.rawValue)
Expand Down
17 changes: 17 additions & 0 deletions Sources/Config/VolcASRModel.swift
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
import Foundation

enum VolcASRModel: String, CaseIterable, Identifiable {
case seedASR2 = "volc.seedasr.sauc.duration"
case bigASR1 = "volc.bigasr.sauc.duration"

var id: String { rawValue }

var displayName: String {
switch self {
case .seedASR2: return L("volc.model.seed_asr_2")
case .bigASR1: return L("volc.model.big_asr_1")
}
}

static let recommended = VolcASRModel.seedASR2
}
3 changes: 3 additions & 0 deletions Sources/Resources/en.lproj/Localizable.strings
Original file line numberDiff line numberDiff line change
Expand Up@@ -339,6 +339,9 @@

/* ── Volc ASR ── */
"volc.config_hint" = "Enter your Volcengine Doubao ASR credentials. Get them from the Volcengine console.";
"volc.model" = "Recognition model";
"volc.model.seed_asr_2" = "SeedASR 2.0 (Recommended)";
"volc.model.big_asr_1" = "BigASR 1.0 (Legacy)";
"volc.app_key" = "App Key (App ID)";
"volc.access_key" = "Access Token";
"volc.resource_id" = "Resource ID";
Expand Down
3 changes: 3 additions & 0 deletions Sources/Resources/zh-Hans.lproj/Localizable.strings
Original file line numberDiff line numberDiff line change
Expand Up@@ -339,6 +339,9 @@

/* ── 豆包语音识别 ── */
"volc.config_hint" = "填写火山引擎豆包语音识别凭据,可从火山引擎控制台获取。";
"volc.model" = "识别模型";
"volc.model.seed_asr_2" = "SeedASR 2.0(推荐)";
"volc.model.big_asr_1" = "BigASR 1.0(旧版)";
"volc.app_key" = "App Key(应用 ID)";
"volc.access_key" = "Access Token";
"volc.resource_id" = "Resource ID(资源 ID)";
Expand Down
79 changes: 79 additions & 0 deletions Sources/Speech/AppleSpeechAnalyzer.swift
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,79 @@
import AVFoundation
import Foundation
@preconcurrency import Speech

enum AppleSpeechAnalyzer {
static func prepare(locale: Locale) async throws {
let transcriber = try await makeTranscriber(locale: locale)
try await ensureModel(for: transcriber)
}

static func transcribe(audioURL: URL, locale: Locale) async throws -> String {
let transcriber = try await makeTranscriber(locale: locale)
try await ensureModel(for: transcriber)

let file = try AVAudioFile(forReading: audioURL)
let resultTask = Task<String, Error> {
var transcript = ""
for try await result in transcriber.results where result.isFinal {
transcript += String(result.text.characters)
}
return transcript
}

let analyzer = SpeechAnalyzer(
modules: [transcriber],
options: .init(priority: .userInitiated, modelRetention: .lingering)
)
do {
if let lastSample = try await analyzer.analyzeSequence(from: file) {
try await analyzer.finalizeAndFinish(through: lastSample)
} else {
await analyzer.cancelAndFinishNow()
}
return try await resultTask.value
} catch {
resultTask.cancel()
await analyzer.cancelAndFinishNow()
throw error
}
}

private static func makeTranscriber(locale: Locale) async throws -> SpeechTranscriber {
guard SpeechTranscriber.isAvailable else {
throw AppleSpeechAnalyzerError.unavailable
}
guard let supported = await SpeechTranscriber.supportedLocale(equivalentTo: locale) else {
throw AppleSpeechAnalyzerError.unsupportedLocale(locale.identifier)
}
return SpeechTranscriber(locale: supported, preset: .transcription)
}

private static func ensureModel(for transcriber: SpeechTranscriber) async throws {
let modules: [any SpeechModule] = [transcriber]
if await AssetInventory.status(forModules: modules) == .installed { return }
if let request = try await AssetInventory.assetInstallationRequest(supporting: modules) {
try await request.downloadAndInstall()
}
guard await AssetInventory.status(forModules: modules) == .installed else {
throw AppleSpeechAnalyzerError.modelUnavailable
}
}
}

enum AppleSpeechAnalyzerError: LocalizedError {
case unavailable
case unsupportedLocale(String)
case modelUnavailable

var errorDescription: String? {
switch self {
case .unavailable:
return "SpeechAnalyzer is unavailable on this Mac"
case .unsupportedLocale(let locale):
return "SpeechAnalyzer does not support locale \(locale)"
case .modelUnavailable:
return "SpeechAnalyzer model is not installed"
}
}
}
2 changes: 1 addition & 1 deletion Sources/Speech/AppleSpeechEngine.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@ import Foundation
@preconcurrency import Speech
import AVFoundation

final class AppleSpeechEngine: SpeechEngine, @unchecked Sendable {
final class LegacyAppleSpeechEngine: SpeechEngine, @unchecked Sendable {
private var recognizer: SFSpeechRecognizer
private(set) var isReady = false
private var recognitionTask: SFSpeechRecognitionTask?
Expand Down
88 changes: 88 additions & 0 deletions Sources/Speech/AppleSpeechEngineAdapter.swift
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,88 @@
import AVFoundation
import Foundation

final class AppleSpeechEngine: SpeechEngine, @unchecked Sendable {
private let locale: Locale
private let legacy: LegacyAppleSpeechEngine

init(locale: Locale = Locale(identifier: "zh-CN")) {
self.locale = locale
self.legacy = LegacyAppleSpeechEngine(locale: locale)
}

var isReady: Bool { legacy.isReady }
var supportsStreaming: Bool { true }

func requestAccess() {
legacy.requestAccess()
}

func prepare() async {
do {
try await AppleSpeechAnalyzer.prepare(locale: locale)
} catch {
Log.info("[AppleSpeech] SpeechAnalyzer preparation deferred: \(error.localizedDescription)")
}
}

func startListening(language: String?, onPartialResult: @escaping @Sendable (String) -> Void) {
legacy.startListening(language: language, onPartialResult: onPartialResult)
}

func appendAudioBuffer(_ buffer: AVAudioPCMBuffer) {
legacy.appendAudioBuffer(buffer)
}

func finishListening(audioURL: URL?, language: String?) async throws -> String {
let fallbackTask = Task {
try await legacy.finishListening(audioURL: audioURL, language: language)
}
guard let audioURL else { return try await fallbackTask.value }

do {
let text = try await AppleSpeechAnalyzer.transcribe(
audioURL: audioURL,
locale: resolvedLocale(for: language)
)
legacy.cancelListening()
let fallback = try? await fallbackTask.value
return text.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty
? fallback ?? ""
: text
} catch {
Log.info("[AppleSpeech] SpeechAnalyzer failed, using legacy result: \(error.localizedDescription)")
return try await fallbackTask.value
}
}

func cancelListening() {
legacy.cancelListening()
}

func transcribe(audioURL: URL?, language: String?) async throws -> String {
guard let audioURL else { throw AppleSpeechError.noAudioFile }
do {
let text = try await AppleSpeechAnalyzer.transcribe(
audioURL: audioURL,
locale: resolvedLocale(for: language)
)
if !text.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty {
return text
}
} catch {
Log.info("[AppleSpeech] SpeechAnalyzer failed, using legacy recognizer: \(error.localizedDescription)")
}
return try await legacy.transcribe(audioURL: audioURL, language: language)
}

private func resolvedLocale(for language: String?) -> Locale {
switch language {
case "zh": return Locale(identifier: "zh-CN")
case "en": return Locale(identifier: "en-US")
case "ja": return Locale(identifier: "ja-JP")
case "ko": return Locale(identifier: "ko-KR")
case "yue": return Locale(identifier: "yue-CN")
default: return locale
}
}
}
Loading
Loading