refactor: remove retired agent provider integration
This commit is contained in:
+2
-2
@@ -2,7 +2,7 @@ import {
|
||||
readSidebarSelectionFromUrl, buildWorkspaceUrl,
|
||||
PROVIDER_FALLBACK_MODELS, EMPTY_MODEL_CATALOG,
|
||||
createClientRequestId, isRecoverableStreamDisconnect, hasNewPersistedUserMessage,
|
||||
getModelOptions, getVisibleProviders, loadStoredModelPreferences, saveModelPreferences,
|
||||
getModelOptions, PROVIDERS, loadStoredModelPreferences, saveModelPreferences,
|
||||
loadStoredQuickQuestionModelSelection, saveQuickQuestionModelSelection, pickProviderModel, buildCompletionMessages,
|
||||
type ProviderModelPreferences,
|
||||
} from "@/lib/workspace-domain";
|
||||
@@ -1147,7 +1147,7 @@ export default function App() {
|
||||
() => getModelOptions(modelCatalog, chatSettingsProviderDraft),
|
||||
[chatSettingsProviderDraft, modelCatalog]
|
||||
);
|
||||
const providerOptions = useMemo(() => getVisibleProviders(modelCatalog), [modelCatalog]);
|
||||
const providerOptions = PROVIDERS;
|
||||
|
||||
useEffect(() => {
|
||||
if (model.trim()) return;
|
||||
|
||||
@@ -3,7 +3,7 @@ import { ModelCombobox } from "@/components/chat/model-combobox";
|
||||
import { Button } from "@/components/ui/button";
|
||||
import type { ModelCatalogResponse, Provider } from "@/lib/api";
|
||||
import { getProviderLabel } from "@/lib/message-generation";
|
||||
import { getModelOptions, getVisibleProviders, pickProviderModel, type ProviderModelPreferences } from "@/lib/workspace-domain";
|
||||
import { getModelOptions, PROVIDERS, pickProviderModel, type ProviderModelPreferences } from "@/lib/workspace-domain";
|
||||
|
||||
export type ModelSettingsProps = {
|
||||
modelCatalog: ModelCatalogResponse["providers"];
|
||||
@@ -19,9 +19,7 @@ export type ModelSettingsProps = {
|
||||
};
|
||||
|
||||
export function ModelSettings(props: ModelSettingsProps) {
|
||||
const providers = getVisibleProviders(props.modelCatalog);
|
||||
// Retain a previously selected optional provider even while its catalog is unavailable.
|
||||
const quickProviders = providers.includes(props.quickProvider) ? providers : [...providers, props.quickProvider];
|
||||
const providers = PROVIDERS;
|
||||
return <section aria-labelledby="model-settings-title" className="space-y-6">
|
||||
<div className="space-y-2">
|
||||
<h3 id="model-settings-title" className="flex items-center gap-2 text-base font-semibold text-violet-50"><Cpu aria-hidden="true" className="h-4 w-4 text-violet-300" />Models</h3>
|
||||
@@ -49,7 +47,7 @@ export function ModelSettings(props: ModelSettingsProps) {
|
||||
<select id="settings-quick-provider" aria-label="Quick Questions provider" value={props.quickProvider}
|
||||
onChange={event => props.onQuickProviderChange(event.currentTarget.value as Provider)}
|
||||
className="h-11 w-full rounded-lg border border-violet-300/22 bg-background/72 px-3 text-base outline-none focus:border-violet-300/45 focus:ring-1 focus:ring-ring/70 disabled:opacity-50 md:text-sm">
|
||||
{quickProviders.map(provider => <option key={provider} value={provider}>{getProviderLabel(provider)}</option>)}
|
||||
{providers.map(provider => <option key={provider} value={provider}>{getProviderLabel(provider)}</option>)}
|
||||
</select>
|
||||
</div>
|
||||
<div className="space-y-1.5 md:grid md:grid-cols-[88px_minmax(0,1fr)] md:gap-3 md:space-y-0">
|
||||
|
||||
@@ -9,7 +9,7 @@ import { shouldRequestChatTitle } from "@/lib/chat-forking";
|
||||
import type { SidebarSelection } from "@/lib/sidebar-selection";
|
||||
import {
|
||||
buildCompletionMessages, buildWorkspaceUrl, createClientRequestId, EMPTY_MODEL_CATALOG,
|
||||
getModelOptions, getVisibleProviders, hasNewPersistedUserMessage, isRecoverableStreamDisconnect,
|
||||
getModelOptions, PROVIDERS, hasNewPersistedUserMessage, isRecoverableStreamDisconnect,
|
||||
loadStoredModelPreferences, pickProviderModel, readSidebarSelectionFromUrl, saveModelPreferences,
|
||||
} from "@/lib/workspace-domain";
|
||||
|
||||
@@ -293,7 +293,7 @@ export function useLiteWorkspace(isAuthenticated: boolean, onAuthFailure: (messa
|
||||
: selection?.kind === "search" ? activeRuns.searches.includes(selection.id) : false;
|
||||
return {
|
||||
selection, draftKind, items, chat, search, provider, model,
|
||||
providerOptions: getVisibleProviders(catalog), modelOptions: getModelOptions(catalog, provider),
|
||||
providerOptions: PROVIDERS, modelOptions: getModelOptions(catalog, provider),
|
||||
isLoading, isBusy: isSending || selectedRun, isSending, error, activeRuns,
|
||||
selectItem, newChat: () => startDraft("chat"), newSearch: () => startDraft("search"),
|
||||
setProvider, setModel, send, refresh,
|
||||
|
||||
+3
-2
@@ -156,7 +156,8 @@ export type CompletionRequestMessage = {
|
||||
attachments?: ChatAttachment[];
|
||||
};
|
||||
|
||||
export type Provider = "openai" | "anthropic" | "xai" | "gemini" | "hermes-agent";
|
||||
export type Provider = "openai" | "anthropic" | "xai" | "gemini";
|
||||
export type CompletionProvider = Provider | "sybil-agent";
|
||||
|
||||
export type ProviderModelInfo = {
|
||||
models: string[];
|
||||
@@ -187,7 +188,7 @@ type CompletionResponse = {
|
||||
};
|
||||
|
||||
type CompletionStreamHandlers = {
|
||||
onMeta?: (payload: { chatId: string | null; callId: string | null; provider: Provider; model: string; agentAside?: boolean }) => void;
|
||||
onMeta?: (payload: { chatId: string | null; callId: string | null; provider: CompletionProvider; model: string; agentAside?: boolean }) => void;
|
||||
onToolCall?: (payload: ToolCallEvent) => void;
|
||||
onDelta?: (payload: { text: string }) => void;
|
||||
onDone?: (payload: { text: string; usage?: { inputTokens?: number; outputTokens?: number; totalTokens?: number } }) => void;
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
import type { Provider } from "./api";
|
||||
import { PROVIDERS } from "./workspace-domain.ts";
|
||||
|
||||
type PersistedChatModel = {
|
||||
lastUsedProvider: Provider | null;
|
||||
@@ -11,7 +12,7 @@ export type ChatModelSelection = {
|
||||
};
|
||||
|
||||
export function getChatModelSelection(chat: PersistedChatModel | null): ChatModelSelection | null {
|
||||
if (!chat?.lastUsedProvider || !chat.lastUsedModel?.trim()) return null;
|
||||
if (!chat?.lastUsedProvider || !PROVIDERS.includes(chat.lastUsedProvider) || !chat.lastUsedModel?.trim()) return null;
|
||||
return {
|
||||
provider: chat.lastUsedProvider,
|
||||
model: chat.lastUsedModel.trim(),
|
||||
|
||||
@@ -5,7 +5,6 @@ export function getProviderLabel(provider: unknown) {
|
||||
if (provider === "anthropic") return "Anthropic";
|
||||
if (provider === "xai") return "xAI";
|
||||
if (provider === "gemini") return "Gemini";
|
||||
if (provider === "hermes-agent") return "Hermes Agent";
|
||||
return "";
|
||||
}
|
||||
|
||||
|
||||
@@ -36,7 +36,6 @@ export const PROVIDER_FALLBACK_MODELS: Record<Provider, string[]> = {
|
||||
anthropic: ["claude-3-5-sonnet-latest"],
|
||||
xai: ["grok-3-mini"],
|
||||
gemini: ["gemini-3.5-flash", "gemini-flash-latest"],
|
||||
"hermes-agent": ["hermes-agent"],
|
||||
};
|
||||
|
||||
export const EMPTY_MODEL_CATALOG: ModelCatalogResponse["providers"] = {
|
||||
@@ -46,8 +45,7 @@ export const EMPTY_MODEL_CATALOG: ModelCatalogResponse["providers"] = {
|
||||
gemini: { models: [], loadedAt: null, error: null },
|
||||
};
|
||||
|
||||
export const BASE_PROVIDERS: Provider[] = ["openai", "anthropic", "xai", "gemini"];
|
||||
export const ALL_PROVIDERS: Provider[] = [...BASE_PROVIDERS, "hermes-agent"];
|
||||
export const PROVIDERS: Provider[] = ["openai", "anthropic", "xai", "gemini"];
|
||||
|
||||
export const MODEL_PREFERENCES_STORAGE_KEY = "sybil:modelPreferencesByProvider";
|
||||
export const QUICK_QUESTION_MODEL_SELECTION_STORAGE_KEY = "sybil:quickQuestionModelSelection";
|
||||
@@ -60,7 +58,6 @@ export const EMPTY_MODEL_PREFERENCES: ProviderModelPreferences = {
|
||||
anthropic: null,
|
||||
xai: null,
|
||||
gemini: null,
|
||||
"hermes-agent": null,
|
||||
};
|
||||
|
||||
export function createClientRequestId() {
|
||||
@@ -97,10 +94,6 @@ export function getModelOptions(catalog: ModelCatalogResponse["providers"], prov
|
||||
return PROVIDER_FALLBACK_MODELS[provider];
|
||||
}
|
||||
|
||||
export function getVisibleProviders(catalog: ModelCatalogResponse["providers"]) {
|
||||
return ALL_PROVIDERS.filter((provider) => provider !== "hermes-agent" || catalog[provider] !== undefined);
|
||||
}
|
||||
|
||||
export function loadStoredModelPreferences() {
|
||||
if (typeof window === "undefined") return EMPTY_MODEL_PREFERENCES;
|
||||
try {
|
||||
@@ -113,7 +106,7 @@ export function loadStoredModelPreferences() {
|
||||
}
|
||||
|
||||
export function normalizeStoredProvider(value: unknown): Provider {
|
||||
return value === "anthropic" || value === "xai" || value === "gemini" || value === "openai" || value === "hermes-agent"
|
||||
return value === "anthropic" || value === "xai" || value === "gemini" || value === "openai"
|
||||
? value
|
||||
: "openai";
|
||||
}
|
||||
@@ -126,8 +119,6 @@ export function normalizeStoredModelPreferences(value: unknown): ProviderModelPr
|
||||
anthropic: typeof parsed.anthropic === "string" && parsed.anthropic.trim() ? parsed.anthropic.trim() : null,
|
||||
xai: typeof parsed.xai === "string" && parsed.xai.trim() ? parsed.xai.trim() : null,
|
||||
gemini: typeof parsed.gemini === "string" && parsed.gemini.trim() ? parsed.gemini.trim() : null,
|
||||
"hermes-agent":
|
||||
typeof parsed["hermes-agent"] === "string" && parsed["hermes-agent"].trim() ? parsed["hermes-agent"].trim() : null,
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user