refactor: remove retired agent provider integration
This commit is contained in:
@@ -58,4 +58,3 @@ Instructions for work under `/Users/buzzert/src/sybil-2/ios`.
|
||||
- Anthropic: `claude-3-5-sonnet-latest`
|
||||
- xAI: `grok-3-mini`
|
||||
- Gemini: `gemini-3.5-flash`
|
||||
- Hermes Agent: `hermes-agent`
|
||||
|
||||
@@ -5,7 +5,6 @@ public enum Provider: String, Codable, CaseIterable, Hashable, Sendable {
|
||||
case anthropic
|
||||
case xai
|
||||
case gemini
|
||||
case hermesAgent = "hermes-agent"
|
||||
|
||||
public var displayName: String {
|
||||
switch self {
|
||||
@@ -13,7 +12,6 @@ public enum Provider: String, Codable, CaseIterable, Hashable, Sendable {
|
||||
case .anthropic: return "Anthropic"
|
||||
case .xai: return "xAI"
|
||||
case .gemini: return "Gemini"
|
||||
case .hermesAgent: return "Hermes Agent"
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -192,9 +190,9 @@ extension ChatSummary {
|
||||
updatedAt = try container.decode(Date.self, forKey: .updatedAt)
|
||||
starred = try container.decodeIfPresent(Bool.self, forKey: .starred) ?? false
|
||||
starredAt = try container.decodeIfPresent(Date.self, forKey: .starredAt)
|
||||
initiatedProvider = try container.decodeIfPresent(Provider.self, forKey: .initiatedProvider)
|
||||
initiatedProvider = try container.decodeIfPresent(String.self, forKey: .initiatedProvider).flatMap(Provider.init(rawValue:))
|
||||
initiatedModel = try container.decodeIfPresent(String.self, forKey: .initiatedModel)
|
||||
lastUsedProvider = try container.decodeIfPresent(Provider.self, forKey: .lastUsedProvider)
|
||||
lastUsedProvider = try container.decodeIfPresent(String.self, forKey: .lastUsedProvider).flatMap(Provider.init(rawValue:))
|
||||
lastUsedModel = try container.decodeIfPresent(String.self, forKey: .lastUsedModel)
|
||||
}
|
||||
}
|
||||
@@ -329,9 +327,9 @@ extension WorkspaceItem {
|
||||
updatedAt = try container.decode(Date.self, forKey: .updatedAt)
|
||||
starred = try container.decodeIfPresent(Bool.self, forKey: .starred) ?? false
|
||||
starredAt = try container.decodeIfPresent(Date.self, forKey: .starredAt)
|
||||
initiatedProvider = try container.decodeIfPresent(Provider.self, forKey: .initiatedProvider)
|
||||
initiatedProvider = try container.decodeIfPresent(String.self, forKey: .initiatedProvider).flatMap(Provider.init(rawValue:))
|
||||
initiatedModel = try container.decodeIfPresent(String.self, forKey: .initiatedModel)
|
||||
lastUsedProvider = try container.decodeIfPresent(Provider.self, forKey: .lastUsedProvider)
|
||||
lastUsedProvider = try container.decodeIfPresent(String.self, forKey: .lastUsedProvider).flatMap(Provider.init(rawValue:))
|
||||
lastUsedModel = try container.decodeIfPresent(String.self, forKey: .lastUsedModel)
|
||||
}
|
||||
}
|
||||
@@ -522,9 +520,9 @@ extension ChatDetail {
|
||||
updatedAt = try container.decode(Date.self, forKey: .updatedAt)
|
||||
starred = try container.decodeIfPresent(Bool.self, forKey: .starred) ?? false
|
||||
starredAt = try container.decodeIfPresent(Date.self, forKey: .starredAt)
|
||||
initiatedProvider = try container.decodeIfPresent(Provider.self, forKey: .initiatedProvider)
|
||||
initiatedProvider = try container.decodeIfPresent(String.self, forKey: .initiatedProvider).flatMap(Provider.init(rawValue:))
|
||||
initiatedModel = try container.decodeIfPresent(String.self, forKey: .initiatedModel)
|
||||
lastUsedProvider = try container.decodeIfPresent(Provider.self, forKey: .lastUsedProvider)
|
||||
lastUsedProvider = try container.decodeIfPresent(String.self, forKey: .lastUsedProvider).flatMap(Provider.init(rawValue:))
|
||||
lastUsedModel = try container.decodeIfPresent(String.self, forKey: .lastUsedModel)
|
||||
messages = try container.decode([Message].self, forKey: .messages)
|
||||
}
|
||||
@@ -625,7 +623,8 @@ public struct CompletionRequestMessage: Codable, Sendable {
|
||||
public struct CompletionStreamMeta: Codable, Sendable {
|
||||
public var chatId: String?
|
||||
public var callId: String?
|
||||
public var provider: Provider
|
||||
// Responses may identify Sybil Agent, which is not a selectable LLM provider.
|
||||
public var provider: String
|
||||
public var model: String
|
||||
public var agentAside: Bool? = nil
|
||||
}
|
||||
|
||||
@@ -12,13 +12,11 @@ final class SybilSettingsStore {
|
||||
static let preferredAnthropicModel = "sybil.ios.preferredAnthropicModel"
|
||||
static let preferredXAIModel = "sybil.ios.preferredXAIModel"
|
||||
static let preferredGeminiModel = "sybil.ios.preferredGeminiModel"
|
||||
static let preferredHermesAgentModel = "sybil.ios.preferredHermesAgentModel"
|
||||
static let quickQuestionPreferredProvider = "sybil.ios.quickQuestionPreferredProvider"
|
||||
static let quickQuestionPreferredOpenAIModel = "sybil.ios.quickQuestionPreferredOpenAIModel"
|
||||
static let quickQuestionPreferredAnthropicModel = "sybil.ios.quickQuestionPreferredAnthropicModel"
|
||||
static let quickQuestionPreferredXAIModel = "sybil.ios.quickQuestionPreferredXAIModel"
|
||||
static let quickQuestionPreferredGeminiModel = "sybil.ios.quickQuestionPreferredGeminiModel"
|
||||
static let quickQuestionPreferredHermesAgentModel = "sybil.ios.quickQuestionPreferredHermesAgentModel"
|
||||
}
|
||||
|
||||
private let defaults: UserDefaults
|
||||
@@ -46,8 +44,7 @@ final class SybilSettingsStore {
|
||||
.openai: defaults.string(forKey: Keys.preferredOpenAIModel) ?? "gpt-4.1-mini",
|
||||
.anthropic: defaults.string(forKey: Keys.preferredAnthropicModel) ?? "claude-3-5-sonnet-latest",
|
||||
.xai: defaults.string(forKey: Keys.preferredXAIModel) ?? "grok-3-mini",
|
||||
.gemini: defaults.string(forKey: Keys.preferredGeminiModel) ?? "gemini-3.5-flash",
|
||||
.hermesAgent: defaults.string(forKey: Keys.preferredHermesAgentModel) ?? "hermes-agent"
|
||||
.gemini: defaults.string(forKey: Keys.preferredGeminiModel) ?? "gemini-3.5-flash"
|
||||
]
|
||||
self.preferredModelByProvider = preferredModels
|
||||
|
||||
@@ -57,8 +54,7 @@ final class SybilSettingsStore {
|
||||
.openai: defaults.string(forKey: Keys.quickQuestionPreferredOpenAIModel) ?? "chat-latest",
|
||||
.anthropic: defaults.string(forKey: Keys.quickQuestionPreferredAnthropicModel) ?? preferredModels[.anthropic] ?? "claude-3-5-sonnet-latest",
|
||||
.xai: defaults.string(forKey: Keys.quickQuestionPreferredXAIModel) ?? preferredModels[.xai] ?? "grok-3-mini",
|
||||
.gemini: defaults.string(forKey: Keys.quickQuestionPreferredGeminiModel) ?? preferredModels[.gemini] ?? "gemini-3.5-flash",
|
||||
.hermesAgent: defaults.string(forKey: Keys.quickQuestionPreferredHermesAgentModel) ?? preferredModels[.hermesAgent] ?? "hermes-agent"
|
||||
.gemini: defaults.string(forKey: Keys.quickQuestionPreferredGeminiModel) ?? preferredModels[.gemini] ?? "gemini-3.5-flash"
|
||||
]
|
||||
}
|
||||
|
||||
@@ -77,14 +73,12 @@ final class SybilSettingsStore {
|
||||
defaults.set(preferredModelByProvider[.anthropic], forKey: Keys.preferredAnthropicModel)
|
||||
defaults.set(preferredModelByProvider[.xai], forKey: Keys.preferredXAIModel)
|
||||
defaults.set(preferredModelByProvider[.gemini], forKey: Keys.preferredGeminiModel)
|
||||
defaults.set(preferredModelByProvider[.hermesAgent], forKey: Keys.preferredHermesAgentModel)
|
||||
|
||||
defaults.set(quickQuestionPreferredProvider.rawValue, forKey: Keys.quickQuestionPreferredProvider)
|
||||
defaults.set(quickQuestionPreferredModelByProvider[.openai], forKey: Keys.quickQuestionPreferredOpenAIModel)
|
||||
defaults.set(quickQuestionPreferredModelByProvider[.anthropic], forKey: Keys.quickQuestionPreferredAnthropicModel)
|
||||
defaults.set(quickQuestionPreferredModelByProvider[.xai], forKey: Keys.quickQuestionPreferredXAIModel)
|
||||
defaults.set(quickQuestionPreferredModelByProvider[.gemini], forKey: Keys.quickQuestionPreferredGeminiModel)
|
||||
defaults.set(quickQuestionPreferredModelByProvider[.hermesAgent], forKey: Keys.quickQuestionPreferredHermesAgentModel)
|
||||
}
|
||||
|
||||
var trimmedTokenOrNil: String? {
|
||||
|
||||
@@ -254,8 +254,7 @@ final class SybilViewModel {
|
||||
.openai: ["gpt-4.1-mini", "chat-latest"],
|
||||
.anthropic: ["claude-3-5-sonnet-latest"],
|
||||
.xai: ["grok-3-mini"],
|
||||
.gemini: ["gemini-3.5-flash", "gemini-flash-latest"],
|
||||
.hermesAgent: ["hermes-agent"]
|
||||
.gemini: ["gemini-3.5-flash", "gemini-flash-latest"]
|
||||
]
|
||||
|
||||
init(
|
||||
@@ -283,9 +282,7 @@ final class SybilViewModel {
|
||||
}
|
||||
|
||||
var providerOptions: [Provider] {
|
||||
Provider.allCases.filter { candidate in
|
||||
candidate != .hermesAgent || modelCatalog[candidate] != nil
|
||||
}
|
||||
Provider.allCases
|
||||
}
|
||||
|
||||
var quickQuestionProviderModelOptions: [String] {
|
||||
|
||||
@@ -0,0 +1,39 @@
|
||||
import Foundation
|
||||
import Testing
|
||||
@testable import Sybil
|
||||
|
||||
@Suite
|
||||
struct ProviderTests {
|
||||
@Test func selectableProvidersAndCatalogIgnoreRetiredIntegrations() throws {
|
||||
#expect(Provider.allCases.map(\.rawValue) == ["openai", "anthropic", "xai", "gemini"])
|
||||
let data = Data(#"{"providers":{"openai":{"models":["test-model"],"loadedAt":null,"error":null},"retired-provider":{"models":["old-model"],"loadedAt":null,"error":null}}}"#.utf8)
|
||||
let catalog = try JSONDecoder().decode(ModelCatalogResponse.self, from: data)
|
||||
#expect(catalog.providers.count == 1)
|
||||
#expect(catalog.providers[.openai]?.models == ["test-model"])
|
||||
}
|
||||
|
||||
@Test func historicalChatWithUnsupportedProviderStillDecodes() throws {
|
||||
let data = Data(#"{"id":"old-chat","createdAt":0,"updatedAt":0,"initiatedProvider":"retired-provider","initiatedModel":"old-model","lastUsedProvider":"retired-provider","lastUsedModel":"old-model"}"#.utf8)
|
||||
let chat = try JSONDecoder().decode(ChatSummary.self, from: data)
|
||||
#expect(chat.initiatedProvider == nil)
|
||||
#expect(chat.lastUsedProvider == nil)
|
||||
#expect(chat.id == "old-chat")
|
||||
}
|
||||
|
||||
@MainActor @Test func retiredSavedPreferencesUseSupportedDefaults() throws {
|
||||
let suite = "ProviderTests.\(UUID().uuidString)"
|
||||
let defaults = try #require(UserDefaults(suiteName: suite))
|
||||
defer { defaults.removePersistentDomain(forName: suite) }
|
||||
defaults.set("retired-provider", forKey: "sybil.ios.preferredProvider")
|
||||
defaults.set("retired-provider", forKey: "sybil.ios.quickQuestionPreferredProvider")
|
||||
defaults.set("kept-custom-model", forKey: "sybil.ios.preferredOpenAIModel")
|
||||
let settings = SybilSettingsStore(defaults: defaults)
|
||||
#expect(settings.preferredProvider == .openai)
|
||||
#expect(settings.quickQuestionPreferredProvider == .openai)
|
||||
#expect(settings.preferredModelByProvider[.openai] == "kept-custom-model")
|
||||
#expect(settings.preferredModelByProvider.count == 4)
|
||||
settings.persist()
|
||||
#expect(defaults.string(forKey: "sybil.ios.preferredProvider") == "openai")
|
||||
#expect(defaults.string(forKey: "sybil.ios.quickQuestionPreferredProvider") == "openai")
|
||||
}
|
||||
}
|
||||
@@ -32,11 +32,14 @@ struct SybilInlineMentionTests {
|
||||
@Test func streamMetaAcceptsOptionalAgentAsideFlag() throws {
|
||||
let legacyData = Data(#"{"chatId":"chat-1","provider":"openai","model":"test-model"}"#.utf8)
|
||||
let legacy = try JSONDecoder().decode(CompletionStreamMeta.self, from: legacyData)
|
||||
#expect(legacy.provider == "openai")
|
||||
#expect(legacy.agentAside == nil)
|
||||
|
||||
let asideData = Data(#"{"chatId":"chat-1","provider":"openai","model":"test-model","agentAside":true}"#.utf8)
|
||||
let asideData = Data(#"{"chatId":"chat-1","provider":"sybil-agent","model":"sybil-agent","agentAside":true}"#.utf8)
|
||||
let aside = try JSONDecoder().decode(CompletionStreamMeta.self, from: asideData)
|
||||
#expect(aside.agentAside == true)
|
||||
#expect(aside.provider == "sybil-agent")
|
||||
#expect(Provider(rawValue: aside.provider) == nil)
|
||||
}
|
||||
|
||||
@Test func asidePresentationUsesAssistantMetadata() {
|
||||
|
||||
Reference in New Issue
Block a user