kennethnym/aris-old
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move POI alerts to FYI

Browse Source
This commit is contained in:
Kenneth
2026-01-10 19:35:55 +00:00
parent c13a4f3247
commit c28e3ecc4b
2 changed files with 55 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
IrisCompanion/iris/Orchestrator/ContextOrchestrator.swift
View File

@@ -327,6 +327,7 @@ final class ContextOrchestrator: NSObject, ObservableObject {
if pois.isEmpty { if pois.isEmpty {
logger.info("no points of interests found") logger.info("no points of interests found")
} }
// POIs are FYI-only; do not compete for the right-now winner.
for poi in pois.prefix(2) { for poi in pois.prefix(2) {
let subtitle = poiSubtitle(for: poi) let subtitle = poiSubtitle(for: poi)
let confidence = min(max(poi.confidence, 0.0), 1.0) let confidence = min(max(poi.confidence, 0.0), 1.0)
@@ -344,7 +345,6 @@ final class ContextOrchestrator: NSObject, ObservableObject {
actions: ["DISMISS"] actions: ["DISMISS"]
) )
poiItems.append(item) poiItems.append(item)
rightNowCandidates.append(.init(item: item, confidence: confidence, isEligibleForRightNow: true))
} }
case .failure(let error): case .failure(let error):
fetchFailed = true fetchFailed = true
@@ -402,10 +402,17 @@ final class ContextOrchestrator: NSObject, ObservableObject {
return return
} }
let eligibleUnsuppressed = rightNowCandidates.filter { ranked in let poiCandidateCount = rightNowCandidates.filter { $0.item.type == .poiNearby }.count
!store.isSuppressed(id: ranked.item.id, type: ranked.item.type, now: nowEpoch) if poiCandidateCount > 0 {
logger.warning("dropping poi candidates from right-now ranking count=\(poiCandidateCount)")
} }
let eligibleUnsuppressed = rightNowCandidates
.filter { $0.item.type != .poiNearby }
.filter { ranked in
!store.isSuppressed(id: ranked.item.id, type: ranked.item.type, now: nowEpoch)
}
let winnerSelection = ranker.pickWinner(from: eligibleUnsuppressed, now: nowEpoch, context: userContext) let winnerSelection = ranker.pickWinner(from: eligibleUnsuppressed, now: nowEpoch, context: userContext)
let winnerItem = winnerSelection?.item ?? FeedEnvelope.allQuiet(now: nowEpoch).feed[0] let winnerItem = winnerSelection?.item ?? FeedEnvelope.allQuiet(now: nowEpoch).feed[0]

70
IrisCompanion/iris/Views/OrchestratorView.swift
View File

@@ -45,7 +45,7 @@ struct OrchestratorView: View {
Button("Recompute Now") { orchestrator.recomputeNow() } Button("Recompute Now") { orchestrator.recomputeNow() }
} }
Section("Feed") { Section("Winner") {
if let feed = orchestrator.lastFeed, let winner = feed.winnerItem() { if let feed = orchestrator.lastFeed, let winner = feed.winnerItem() {
Text(winner.title) Text(winner.title)
.font(.headline) .font(.headline)
@@ -54,36 +54,56 @@ struct OrchestratorView: View {
.font(.subheadline) .font(.subheadline)
.foregroundStyle(.secondary) .foregroundStyle(.secondary)
} }
Text("type \(winner.type.rawValue) • prio \(String(format: "%.2f", winner.priority)) • ttl \(winner.ttlSec)s") LabeledContent("Type") { Text(winner.type.rawValue) }
.font(.caption) LabeledContent("Bucket") { Text(winner.bucket.rawValue) }
.foregroundStyle(.secondary) LabeledContent("Priority") { Text(String(format: "%.2f", winner.priority)) }
LabeledContent("TTL") { Text("\(winner.ttlSec)s") }
if feed.feed.count > 1 { if let poiType = winner.poiType {
Divider() LabeledContent("POI type") { Text(poiType.rawValue) }
} }
if let startsAt = winner.startsAt {
LabeledContent("Starts at") { Text("\(startsAt)") }
}
LabeledContent("ID") {
Text(winner.id)
.font(.caption)
.textSelection(.enabled)
}
} else {
Text("No winner yet")
.foregroundStyle(.secondary)
}
}
ForEach(feed.feed, id: \.id) { item in Section("Feed") {
VStack(alignment: .leading, spacing: 6) { if let feed = orchestrator.lastFeed {
HStack { if feed.feed.isEmpty {
Text(item.title) Text("No feed items yet")
.font(.headline) .foregroundStyle(.secondary)
.lineLimit(1) } else {
Spacer() ForEach(feed.feed, id: \.id) { item in
Text(item.type.rawValue) VStack(alignment: .leading, spacing: 6) {
HStack {
Text(item.title)
.font(.headline)
.lineLimit(1)
Spacer()
Text(item.type.rawValue)
.font(.caption)
.foregroundStyle(.secondary)
}
if !item.subtitle.isEmpty {
Text(item.subtitle)
.font(.subheadline)
.foregroundStyle(.secondary)
.lineLimit(1)
}
Text("bucket \(item.bucket.rawValue) • prio \(String(format: "%.2f", item.priority)) • ttl \(item.ttlSec)s")
.font(.caption) .font(.caption)
.foregroundStyle(.secondary) .foregroundStyle(.secondary)
} }
if !item.subtitle.isEmpty { .padding(.vertical, 4)
Text(item.subtitle)
.font(.subheadline)
.foregroundStyle(.secondary)
.lineLimit(1)
}
Text("bucket \(item.bucket.rawValue) • prio \(String(format: "%.2f", item.priority)) • ttl \(item.ttlSec)s")
.font(.caption)
.foregroundStyle(.secondary)
} }
.padding(.vertical, 4)
} }
} else { } else {
Text("No feed yet") Text("No feed yet")