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

Refactor data sources and feed model

Browse Source
This commit is contained in:
Kenneth
2026-01-10 00:25:36 +00:00
parent 1e65a3f57d
commit 324b35a464
15 changed files with 631 additions and 609 deletions
Download Patch File Download Diff File Expand all files Collapse all files

80
IrisCompanion/iris/Models/FeedEnvelope.swift
View File

@@ -11,7 +11,7 @@ import WeatherKit
struct FeedEnvelope: Codable, Equatable {
let schema: Int
let generatedAt: Int
let feed: [FeedCard]
let feed: [FeedItem]
let meta: FeedMeta
enum CodingKeys: String, CodingKey {
@@ -22,19 +22,20 @@ struct FeedEnvelope: Codable, Equatable {
}
}
struct FeedCard: Codable, Equatable {
struct FeedItem: Codable, Equatable {
enum Bucket: String, Codable {
case rightNow = "RIGHT_NOW"
case fyi = "FYI"
}
let id: String
let type: WinnerType
let type: FeedItemType
let title: String
let subtitle: String
let priority: Double
let ttlSec: Int
let condition: WeatherKit.WeatherCondition?
let startsAt: Int?
let bucket: Bucket
let actions: [String]
@@ -46,17 +47,19 @@ struct FeedCard: Codable, Equatable {
case priority
case ttlSec = "ttl_sec"
case condition
case startsAt = "starts_at"
case bucket
case actions
}
init(id: String,
type: WinnerType,
type: FeedItemType,
title: String,
subtitle: String,
priority: Double,
ttlSec: Int,
condition: WeatherKit.WeatherCondition? = nil,
startsAt: Int? = nil,
bucket: Bucket,
actions: [String]) {
self.id = id
@@ -66,6 +69,7 @@ struct FeedCard: Codable, Equatable {
self.priority = priority
self.ttlSec = ttlSec
self.condition = condition
self.startsAt = startsAt
self.bucket = bucket
self.actions = actions
}
@@ -73,13 +77,14 @@ struct FeedCard: Codable, Equatable {
init(from decoder: Decoder) throws {
let container = try decoder.container(keyedBy: CodingKeys.self)
id = try container.decode(String.self, forKey: .id)
type = try container.decode(WinnerType.self, forKey: .type)
type = try container.decode(FeedItemType.self, forKey: .type)
title = try container.decode(String.self, forKey: .title)
subtitle = try container.decode(String.self, forKey: .subtitle)
priority = try container.decode(Double.self, forKey: .priority)
ttlSec = try container.decode(Int.self, forKey: .ttlSec)
bucket = try container.decode(Bucket.self, forKey: .bucket)
actions = try container.decode([String].self, forKey: .actions)
startsAt = try container.decodeIfPresent(Int.self, forKey: .startsAt)
if let encoded = try container.decodeIfPresent(String.self, forKey: .condition) {
condition = WeatherKit.WeatherCondition.irisDecode(encoded)
@@ -98,6 +103,7 @@ struct FeedCard: Codable, Equatable {
try container.encode(ttlSec, forKey: .ttlSec)
try container.encode(bucket, forKey: .bucket)
try container.encode(actions, forKey: .actions)
try container.encodeIfPresent(startsAt, forKey: .startsAt)
if let condition {
try container.encode(condition.irisScreamingCase(), forKey: .condition)
}
@@ -114,50 +120,9 @@ struct FeedMeta: Codable, Equatable {
}
}
extension FeedEnvelope {
static func fromWinnerAndWeather(now: Int, winner: WinnerEnvelope, weather: Candidate?) -> FeedEnvelope {
var cards: [FeedCard] = []
let winnerCard = FeedCard(
id: winner.winner.id,
type: winner.winner.type,
title: winner.winner.title.truncated(maxLength: TextConstraints.titleMax),
subtitle: winner.winner.subtitle.truncated(maxLength: TextConstraints.subtitleMax),
priority: min(max(winner.winner.priority, 0.0), 1.0),
ttlSec: max(1, winner.winner.ttlSec),
condition: nil,
bucket: .rightNow,
actions: ["DISMISS"]
)
cards.append(winnerCard)
if let weather, weather.id != winner.winner.id {
let weatherCard = FeedCard(
id: weather.id,
type: weather.type,
title: weather.title.truncated(maxLength: TextConstraints.titleMax),
subtitle: weather.subtitle.truncated(maxLength: TextConstraints.subtitleMax),
priority: min(max(weather.confidence, 0.0), 1.0),
ttlSec: max(1, weather.ttlSec),
condition: weather.condition,
bucket: .fyi,
actions: ["DISMISS"]
)
cards.append(weatherCard)
}
return FeedEnvelope(
schema: 1,
generatedAt: now,
feed: cards,
meta: FeedMeta(winnerId: winner.winner.id, unreadCount: cards.count)
)
}
}
extension FeedEnvelope {
static func allQuiet(now: Int, reason: String = "no_candidates", source: String = "engine") -> FeedEnvelope {
let card = FeedCard(
let item = FeedItem(
id: "quiet-000",
type: .allQuiet,
title: "All Quiet",
@@ -165,29 +130,14 @@ extension FeedEnvelope {
priority: 0.05,
ttlSec: 300,
condition: nil,
startsAt: nil,
bucket: .rightNow,
actions: ["DISMISS"]
)
return FeedEnvelope(schema: 1, generatedAt: now, feed: [card], meta: FeedMeta(winnerId: card.id, unreadCount: 1))
return FeedEnvelope(schema: 1, generatedAt: now, feed: [item], meta: FeedMeta(winnerId: item.id, unreadCount: 1))
}
func winnerCard() -> FeedCard? {
func winnerItem() -> FeedItem? {
feed.first(where: { $0.id == meta.winnerId }) ?? feed.first
}
func asWinnerEnvelope() -> WinnerEnvelope {
let now = generatedAt
guard let winnerCard = winnerCard() else {
return WinnerEnvelope.allQuiet(now: now)
}
let winner = Winner(
id: winnerCard.id,
type: winnerCard.type,
title: winnerCard.title.truncated(maxLength: TextConstraints.titleMax),
subtitle: winnerCard.subtitle.truncated(maxLength: TextConstraints.subtitleMax),
priority: min(max(winnerCard.priority, 0.0), 1.0),
ttlSec: max(1, winnerCard.ttlSec)
)
return WinnerEnvelope(schema: 1, generatedAt: now, winner: winner, debug: nil)
}
}