Skip to content
Open
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
46 changes: 41 additions & 5 deletions Dayflow/Dayflow/Core/AI/OllamaProvider+Transcription.swift
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,15 @@ extension OllamaProvider {
}
}

private func describeFrameResult(_ frame: FrameData, batchId: Int64?) async -> (
TimeInterval, String
)? {
guard let description = await getSimpleFrameDescription(frame, batchId: batchId) else {
return nil
}
return (frame.timestamp, description)
}

private func parseVideoTimestamp(_ timestamp: String) -> Int {
let components = timestamp.components(separatedBy: ":")

Expand Down Expand Up @@ -474,20 +483,47 @@ extension OllamaProvider {
let lastTs = sampledScreenshots.last!.capturedAt
let durationSeconds = TimeInterval(lastTs - firstTs)

// Describe each screenshot
var frameDescriptions: [(timestamp: TimeInterval, description: String)] = []

// Describe each screenshot. Loading is cheap CPU work done sequentially; the
// describe calls are the slow, independent part, so run up to `maxConcurrency`
// of them in flight against the local server. Completion order is
// non-deterministic, so results are re-sorted by timestamp afterward.
var frames: [FrameData] = []
for screenshot in sampledScreenshots {
guard let frameData = loadScreenshotAsFrameData(screenshot, relativeTo: firstTs) else {
print("[OLLAMA] ⚠️ Failed to load screenshot: \(screenshot.filePath)")
continue
}
frames.append(frameData)
}

if let description = await getSimpleFrameDescription(frameData, batchId: batchId) {
frameDescriptions.append((timestamp: frameData.timestamp, description: description))
let concurrency = max(1, maxConcurrency)
var frameDescriptions = await withTaskGroup(
of: (TimeInterval, String)?.self,
returning: [(timestamp: TimeInterval, description: String)].self
) { group in
var cursor = 0
while cursor < frames.count && cursor < concurrency {
let frameData = frames[cursor]
group.addTask { await self.describeFrameResult(frameData, batchId: batchId) }
cursor += 1
}

var collected: [(timestamp: TimeInterval, description: String)] = []
while let result = await group.next() {
if let (timestamp, description) = result {
collected.append((timestamp: timestamp, description: description))
}
if cursor < frames.count {
let frameData = frames[cursor]
group.addTask { await self.describeFrameResult(frameData, batchId: batchId) }
cursor += 1
}
}
return collected
}

frameDescriptions.sort { $0.timestamp < $1.timestamp }

guard !frameDescriptions.isEmpty else {
throw NSError(
domain: "OllamaProvider",
Expand Down
12 changes: 11 additions & 1 deletion Dayflow/Dayflow/Core/AI/OllamaProvider.swift
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import AppKit
import Foundation

final class OllamaProvider {
final class OllamaProvider: @unchecked Sendable {
let endpoint: String
let screenshotInterval: TimeInterval = 10 // seconds between screenshots
// Read persisted local settings
Expand Down Expand Up @@ -36,6 +36,16 @@ final class OllamaProvider {
UserDefaults.standard.string(forKey: "llmLocalEngine") ?? "ollama"
}

// How many describe_frame requests to run against the local server at once.
// The server caps this itself (LM Studio "Max Concurrent Predictions", Ollama
// OLLAMA_NUM_PARALLEL) and doesn't expose the limit over HTTP, so keep this ≤
// that value. Default 1 (sequential). Override via
// `defaults write teleportlabs.com.Dayflow llmLocalMaxConcurrency <n>`.
var maxConcurrency: Int {
let configured = UserDefaults.standard.integer(forKey: "llmLocalMaxConcurrency")
return configured > 0 ? min(configured, 16) : 1
}

init(endpoint: String = "http://localhost:1234") {
self.endpoint = endpoint
}
Expand Down
10 changes: 10 additions & 0 deletions Dayflow/Dayflow/Views/UI/Settings/ProvidersSettingsViewModel.swift
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,12 @@ final class ProvidersSettingsViewModel: ObservableObject {
persistLocalAPIKey(localAPIKey)
}
}
@Published var localMaxConcurrency: Int {
didSet {
guard oldValue != localMaxConcurrency else { return }
UserDefaults.standard.set(localMaxConcurrency, forKey: "llmLocalMaxConcurrency")
}
}
@Published var showLocalModelUpgradeBanner = false
@Published var isShowingLocalModelUpgradeSheet = false
@Published var upgradeStatusMessage: String?
Expand Down Expand Up @@ -136,6 +142,8 @@ final class ProvidersSettingsViewModel: ObservableObject {
}

localAPIKey = UserDefaults.standard.string(forKey: "llmLocalAPIKey") ?? ""
let storedConcurrency = UserDefaults.standard.integer(forKey: "llmLocalMaxConcurrency")
localMaxConcurrency = storedConcurrency > 0 ? min(storedConcurrency, 16) : 1
if let raw = UserDefaults.standard.string(forKey: "chatCLIPreferredTool") {
preferredCLITool = CLITool(rawValue: raw)
} else {
Expand Down Expand Up @@ -189,6 +197,8 @@ final class ProvidersSettingsViewModel: ObservableObject {
localBaseURL = UserDefaults.standard.string(forKey: "llmLocalBaseURL") ?? localBaseURL
localModelId = UserDefaults.standard.string(forKey: "llmLocalModelId") ?? localModelId
localAPIKey = UserDefaults.standard.string(forKey: "llmLocalAPIKey") ?? localAPIKey
let storedConcurrency = UserDefaults.standard.integer(forKey: "llmLocalMaxConcurrency")
localMaxConcurrency = storedConcurrency > 0 ? min(storedConcurrency, 16) : 1
let raw = UserDefaults.standard.string(forKey: "llmLocalEngine") ?? localEngine.rawValue
localEngine = LocalEngine(rawValue: raw) ?? localEngine
LocalModelPreferences.syncPreset(for: localEngine, modelId: localModelId)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,14 @@ struct SettingsProvidersTabView: View {
text: viewModel.localModelId.isEmpty ? "Not configured" : viewModel.localModelId)
}
SettingsRow(label: "Endpoint") { SettingsMetadata(text: viewModel.localBaseURL) }
SettingsRow(label: "Max concurrent requests") {
HStack(spacing: 8) {
SettingsMetadata(text: "\(viewModel.localMaxConcurrency)")
Stepper("", value: $viewModel.localMaxConcurrency, in: 1...16)
.labelsHidden()
.fixedSize()
}
}
let hasKey = !viewModel.localAPIKey.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty
SettingsRow(label: "API key", showsDivider: false) {
SettingsMetadata(text: hasKey ? "Stored in UserDefaults" : "Not set")
Expand Down