Fastest and only macOS Dictation app with on-device STT and custom trained AI enhancement model. Windows, iOS testflight! Android, Linux waitlist open! A local Wispr Flow alternative. Follow https://x.com/fluidvoiceapp for more
lint and formatting changes
altic-devcf6e3acbef02
diff --git a/.swiftlint.yml b/.swiftlint.ymlindex 1b34eca5..48371d09 100644--- a/.swiftlint.yml+++ b/.swiftlint.yml@@ -30,7 +30,7 @@ excluded:- .build- DerivedData- Fluid.xcodeproj-+ - scratchline_length:warning: 250error: 300diff --git a/Sources/Fluid/ContentView.swift b/Sources/Fluid/ContentView.swiftindex 99ffb97b..be514103 100644--- a/Sources/Fluid/ContentView.swift+++ b/Sources/Fluid/ContentView.swift@@ -1247,7 +1247,7 @@ struct ContentView: View {let reasoningConfig = SettingsStore.shared.getReasoningConfig(forModel: derivedSelectedModel, provider: providerKey)// Build extra parameters from reasoning config- var extraParams: [String: Any]? = nil+ var extraParams: [String: Any] = [:]if let config = reasoningConfig, config.isEnabled {if config.parameterName == "enable_thinking" {// DeepSeek uses boolean@@ -1282,7 +1282,7 @@ struct ContentView: View {baseURL: derivedBaseURL,apiKey: apiKey,streaming: enableStreaming,- tools: nil,+ tools: [],temperature: isReasoningModel ? nil : 0.2,extraParameters: extraParams)diff --git a/Sources/Fluid/Networking/FunctionCallingProvider.swift b/Sources/Fluid/Networking/FunctionCallingProvider.swiftindex f75c6b1e..87e238f1 100644--- a/Sources/Fluid/Networking/FunctionCallingProvider.swift+++ b/Sources/Fluid/Networking/FunctionCallingProvider.swift@@ -24,10 +24,10 @@ final class FunctionCallingProvider {case role, content, tool_calls, tool_call_id, name}- init(role: String, content: String?, tool_calls: [ToolCall]? = nil, tool_call_id: String? = nil, name: String? = nil) {+ init(role: String, content: String?, tool_calls: [ToolCall] = [], tool_call_id: String? = nil, name: String? = nil) {self.role = roleself.content = content- self.tool_calls = tool_calls ?? []+ self.tool_calls = tool_callsself.tool_call_id = tool_call_idself.name = name}diff --git a/Sources/Fluid/Networking/ModelDownloader.swift b/Sources/Fluid/Networking/ModelDownloader.swiftindex 673f83e7..c6916e88 100644--- a/Sources/Fluid/Networking/ModelDownloader.swift+++ b/Sources/Fluid/Networking/ModelDownloader.swift@@ -32,17 +32,23 @@ final class HuggingFaceModelDownloader {self.owner = "FluidInference"self.repo = "parakeet-tdt-0.6b-v3-coreml"self.revision = "main"- self.baseApiURL = URL(string: "https://huggingface.co/api/models/")!- .appendingPathComponent(self.owner)- .appendingPathComponent(self.repo)- .appendingPathComponent("tree")- .appendingPathComponent(self.revision)-- self.baseResolveURL = URL(string: "https://huggingface.co/")!- .appendingPathComponent(self.owner)- .appendingPathComponent(self.repo)- .appendingPathComponent("resolve")- .appendingPathComponent(self.revision)+ guard var apiBase = URL(string: "https://huggingface.co/api/models/") else {+ preconditionFailure("Invalid base Hugging Face API URL")+ }+ apiBase.appendPathComponent(self.owner)+ apiBase.appendPathComponent(self.repo)+ apiBase.appendPathComponent("tree")+ apiBase.appendPathComponent(self.revision)+ self.baseApiURL = apiBase++ guard var resolveBase = URL(string: "https://huggingface.co/") else {+ preconditionFailure("Invalid base Hugging Face resolve URL")+ }+ resolveBase.appendPathComponent(self.owner)+ resolveBase.appendPathComponent(self.repo)+ resolveBase.appendPathComponent("resolve")+ resolveBase.appendPathComponent(self.revision)+ self.baseResolveURL = resolveBase}/// Initialize with custom model repository settingsdiff --git a/Sources/Fluid/Services/CommandModeService.swift b/Sources/Fluid/Services/CommandModeService.swiftindex 932a8fd7..53e3fee2 100644--- a/Sources/Fluid/Services/CommandModeService.swift+++ b/Sources/Fluid/Services/CommandModeService.swift@@ -804,7 +804,7 @@ final class CommandModeService: ObservableObject {// Get reasoning config for this model (e.g., reasoning_effort, enable_thinking)let reasoningConfig = SettingsStore.shared.getReasoningConfig(forModel: model, provider: providerID)- var extraParams: [String: Any]? = nil+ var extraParams: [String: Any] = [:]if let rConfig = reasoningConfig, rConfig.isEnabled {if rConfig.parameterName == "enable_thinking" {extraParams = [rConfig.parameterName: rConfig.parameterValue == "true"]@@ -913,8 +913,7 @@ final class CommandModeService: ObservableObject {// Convert LLMClient.Response to our internal LLMResponse// Check for tool calls- if let toolCalls = response.toolCalls,- let tc = toolCalls.first,+ if let tc = response.toolCalls.first,tc.name == "execute_terminal_command"{let command = tc.getString("command") ?? ""diff --git a/Sources/Fluid/Services/LLMClient.swift b/Sources/Fluid/Services/LLMClient.swiftindex d92ce031..0072f2d5 100644--- a/Sources/Fluid/Services/LLMClient.swift+++ b/Sources/Fluid/Services/LLMClient.swift@@ -43,7 +43,7 @@ final class LLMClient {/// Main response content with thinking tags strippedlet content: String/// Parsed tool calls for agentic modes (nil if none)- let toolCalls: [ToolCall]?+ let toolCalls: [ToolCall]}struct ToolCall {@@ -71,7 +71,7 @@ final class LLMClient {let baseURL: Stringlet apiKey: Stringlet streaming: Bool- let tools: [[String: Any]]?+ let tools: [[String: Any]]let temperature: Double?/// Optional token limit (max_tokens or max_completion_tokens depending on model)@@ -79,7 +79,7 @@ final class LLMClient {/// Extra parameters to add to the request body (e.g., reasoning_effort, enable_thinking)/// These are model-specific and come from user settings- var extraParameters: [String: Any]?+ var extraParameters: [String: Any]// Retry configurationvar maxRetries: Int = 3@@ -98,10 +98,10 @@ final class LLMClient {baseURL: String,apiKey: String,streaming: Bool = true,- tools: [[String: Any]]? = nil,+ tools: [[String: Any]] = [],temperature: Double? = nil,maxTokens: Int? = nil,- extraParameters: [String: Any]? = nil+ extraParameters: [String: Any] = [:]) {self.messages = messagesself.model = model@@ -184,8 +184,8 @@ final class LLMClient {}// Add tools if provided- if let tools = config.tools, !tools.isEmpty {- body["tools"] = tools+ if !config.tools.isEmpty {+ body["tools"] = config.toolsbody["tool_choice"] = "auto"}@@ -199,17 +199,14 @@ final class LLMClient {// 2. User-provided parameters (can override model defaults)// Layer 1: Model-specific parameters (e.g., enable_thinking for Nemotron)- if let modelExtras = ThinkingParserFactory.getExtraParameters(for: config.model) {- for (key, value) in modelExtras {- body[key] = value- }+ let modelExtras = ThinkingParserFactory.getExtraParameters(for: config.model)+ for (key, value) in modelExtras {+ body[key] = value}// Layer 2: User-provided extra parameters (e.g., reasoning_effort from settings)- if let extras = config.extraParameters {- for (key, value) in extras {- body[key] = value- }+ for (key, value) in config.extraParameters {+ body[key] = value}// Final Layer: Common parameters with model-specific keys@@ -413,7 +410,7 @@ final class LLMClient {DebugLogger.shared.debug("LLMClient: Streaming complete. Thinking: \(thinkingText.count) chars, Content: \(contentText.count) chars", source: "LLMClient")// Build tool calls array- var parsedToolCalls: [ToolCall]? = nil+ var parsedToolCalls: [ToolCall] = []if let name = toolCallName,let argsData = toolCallArguments.data(using: .utf8),let args = try? JSONSerialization.jsonObject(with: argsData) as? [String: Any]@@ -444,7 +441,7 @@ final class LLMClient {let rawContent = message["content"] as? String ?? ""// Check for tool calls- var parsedToolCalls: [ToolCall]? = nil+ var parsedToolCalls: [ToolCall] = []if let toolCalls = message["tool_calls"] as? [[String: Any]] {parsedToolCalls = toolCalls.compactMap { tc -> ToolCall? inguard let function = tc["function"] as? [String: Any],@@ -458,9 +455,7 @@ final class LLMClient {let id = tc["id"] as? String ?? "call_\(UUID().uuidString.prefix(8))"return ToolCall(id: id, name: name, arguments: args)}- if parsedToolCalls?.isEmpty == true {- parsedToolCalls = nil- }+ // Empty tool calls are fine, no action needed}// Strip thinking tags and extract thinking contentdiff --git a/Sources/Fluid/Services/MenuBarManager.swift b/Sources/Fluid/Services/MenuBarManager.swiftindex 66617c07..38921302 100644--- a/Sources/Fluid/Services/MenuBarManager.swift+++ b/Sources/Fluid/Services/MenuBarManager.swift@@ -343,14 +343,18 @@ final class MenuBarManager: ObservableObject {// Status indicator with hotkey infoself.statusMenuItem = NSMenuItem(title: "", action: nil, keyEquivalent: "")self.statusMenuItem?.isEnabled = false- menu.addItem(self.statusMenuItem!)+ if let statusItem = statusMenuItem {+ menu.addItem(statusItem)+ }menu.addItem(.separator())// AI Processing Toggleself.aiMenuItem = NSMenuItem(title: "", action: #selector(self.toggleAIProcessing), keyEquivalent: "")self.aiMenuItem?.target = self- menu.addItem(self.aiMenuItem!)+ if let aiItem = aiMenuItem {+ menu.addItem(aiItem)+ }menu.addItem(.separator())diff --git a/Sources/Fluid/Services/RewriteModeService.swift b/Sources/Fluid/Services/RewriteModeService.swiftindex 154160ae..12a578d4 100644--- a/Sources/Fluid/Services/RewriteModeService.swift+++ b/Sources/Fluid/Services/RewriteModeService.swift@@ -195,7 +195,7 @@ final class RewriteModeService: ObservableObject {// Get reasoning config for this model (e.g., reasoning_effort, enable_thinking)let reasoningConfig = settings.getReasoningConfig(forModel: model, provider: providerID)- var extraParams: [String: Any]? = nil+ var extraParams: [String: Any] = [:]if let rConfig = reasoningConfig, rConfig.isEnabled {if rConfig.parameterName == "enable_thinking" {extraParams = [rConfig.parameterName: rConfig.parameterValue == "true"]@@ -212,7 +212,7 @@ final class RewriteModeService: ObservableObject {baseURL: baseURL,apiKey: apiKey,streaming: enableStreaming,- tools: nil,+ tools: [],temperature: isReasoningModel ? nil : 0.7,extraParameters: extraParams)diff --git a/Sources/Fluid/Services/SimpleUpdater.swift b/Sources/Fluid/Services/SimpleUpdater.swiftindex 99ce96db..e023cd8c 100644--- a/Sources/Fluid/Services/SimpleUpdater.swift+++ b/Sources/Fluid/Services/SimpleUpdater.swift@@ -218,7 +218,10 @@ final class SimpleUpdater {let curTeam = teamID(from: curID)let newTeam = teamID(from: newID)let sameTeam = (curTeam != nil && curTeam == newTeam)- let bothAllowed = (curTeam != nil && newTeam != nil && self.allowedTeamIDs.contains(curTeam!) && self.allowedTeamIDs.contains(newTeam!))+ let bothAllowed: Bool = {+ guard let ct = curTeam, let nt = newTeam else { return false }+ return self.allowedTeamIDs.contains(ct) && self.allowedTeamIDs.contains(nt)+ }()guard sameIdentity || sameTeam || bothAllowed else {print("SimpleUpdater: Code-sign mismatch. Current=\(curID) New=\(newID)")diff --git a/Sources/Fluid/Services/ThinkingParsers.swift b/Sources/Fluid/Services/ThinkingParsers.swiftindex cb911b7c..4439bd60 100644--- a/Sources/Fluid/Services/ThinkingParsers.swift+++ b/Sources/Fluid/Services/ThinkingParsers.swift@@ -68,7 +68,7 @@ enum ThinkingParserFactory {/// Get model-specific extra parameters for the API request./// These are parameters beyond the standard model/messages/temperature.- static func getExtraParameters(for model: String) -> [String: Any]? {+ static func getExtraParameters(for model: String) -> [String: Any] {let modelLower = model.lowercased()// Nemotron/Nemo models: require enable_thinking flag@@ -91,7 +91,7 @@ enum ThinkingParserFactory {// Claude with thinking: requires thinking parameters (handled via Anthropic API differently)// OpenAI o1/o3 with reasoning: uses reasoning_effort parameter- return nil+ return [:]}}diff --git a/Sources/Fluid/Services/WhisperProvider.swift b/Sources/Fluid/Services/WhisperProvider.swiftindex 6ea7488b..14cf66e9 100644--- a/Sources/Fluid/Services/WhisperProvider.swift+++ b/Sources/Fluid/Services/WhisperProvider.swift@@ -23,7 +23,9 @@ final class WhisperProvider: TranscriptionProvider {}private var modelURL: URL {- let cacheDir = FileManager.default.urls(for: .cachesDirectory, in: .userDomainMask).first!+ guard let cacheDir = FileManager.default.urls(for: .cachesDirectory, in: .userDomainMask).first else {+ preconditionFailure("Could not find caches directory")+ }return cacheDir.appendingPathComponent("WhisperModels").appendingPathComponent(self.modelName)}diff --git a/Sources/Fluid/UI/AISettingsView.swift b/Sources/Fluid/UI/AISettingsView.swiftindex 10dd7f4b..6da6615f 100644--- a/Sources/Fluid/UI/AISettingsView.swift+++ b/Sources/Fluid/UI/AISettingsView.swift@@ -1218,9 +1218,13 @@ struct AISettingsView: View {Picker("", selection: Binding(get: {// Map current value to picker options- if self.editingReasoningParamName == "reasoning_effort" { return "reasoning_effort" }- else if self.editingReasoningParamName == "enable_thinking" { return "enable_thinking" }- else { return "custom" }+ if self.editingReasoningParamName == "reasoning_effort" {+ return "reasoning_effort"+ } else if self.editingReasoningParamName == "enable_thinking" {+ return "enable_thinking"+ } else {+ return "custom"+ }},set: { newValue inif newValue == "custom" {diff --git a/Sources/Fluid/UI/MeetingTranscriptionView.swift b/Sources/Fluid/UI/MeetingTranscriptionView.swiftindex 042bd71c..455aa224 100644--- a/Sources/Fluid/UI/MeetingTranscriptionView.swift+++ b/Sources/Fluid/UI/MeetingTranscriptionView.swift@@ -172,9 +172,9 @@ struct MeetingTranscriptionView: View {.audio,.movie,.mpeg4Movie,- UTType(filenameExtension: "wav")!,- UTType(filenameExtension: "mp3")!,- UTType(filenameExtension: "m4a")!,+ UTType(filenameExtension: "wav") ?? .audio,+ UTType(filenameExtension: "mp3") ?? .audio,+ UTType(filenameExtension: "m4a") ?? .audio,],allowsMultipleSelection: false) { result indiff --git a/Sources/Fluid/Views/CommandModeView.swift b/Sources/Fluid/Views/CommandModeView.swiftindex aec6cb9d..04e4b66b 100644--- a/Sources/Fluid/Views/CommandModeView.swift+++ b/Sources/Fluid/Views/CommandModeView.swift@@ -355,7 +355,7 @@ struct CommandModeView: View {.frame(maxHeight: 200)} else {// Preview - first 150 chars- if self.service.streamingThinkingText.count > 0 {+ if !self.service.streamingThinkingText.isEmpty {Text(String(self.service.streamingThinkingText.prefix(150)) + (self.service.streamingThinkingText.count > 150 ? "..." : "")).font(.system(size: 11)).foregroundStyle(.secondary.opacity(0.7))diff --git a/Sources/Fluid/Views/RewriteModeView.swift b/Sources/Fluid/Views/RewriteModeView.swiftindex 58d55647..300f9d3c 100644--- a/Sources/Fluid/Views/RewriteModeView.swift+++ b/Sources/Fluid/Views/RewriteModeView.swift@@ -459,7 +459,7 @@ struct RewriteModeView: View {.frame(maxHeight: 150)} else {// Preview - first 100 chars- if self.service.streamingThinkingText.count > 0 {+ if !self.service.streamingThinkingText.isEmpty {Text(String(self.service.streamingThinkingText.prefix(100)) + (self.service.streamingThinkingText.count > 100 ? "..." : "")).font(.system(size: 11)).foregroundStyle(.secondary.opacity(0.7))