Skip to content

Cache owner model shelves and reload on Refresh #250

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
NeilJo-GY merged 1 commit into from
Oct 29, 2026
Merged

Cache owner model shelves and reload on Refresh #250

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
94 changes: 79 additions & 15 deletions packages/agent-chat/src/ranch-shell/AgentOwnerSettings.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,6 +216,41 @@ type CatalogPair = {
currency?: string;
};

type OwnerCatalogRow = { id: string } & CatalogPair;

/** Session cache for owner settings catalog pages (avoids re-paging every open). */
const OWNER_CATALOG_TTL_MS = 5 * 60 * 1000;
const ownerCatalogCache = new Map<string, { at: number; rows: OwnerCatalogRow[] }>();

function ownerCatalogCacheKey(book: string, official: boolean, geo: string): string {
return `${book}|${official ? "official" : "byo"}|${(geo || "").trim().toLowerCase() || "any"}`;
}

function readOwnerCatalogCache(key: string): OwnerCatalogRow[] | null {
const hit = ownerCatalogCache.get(key);
if (!hit) return null;
if (Date.now() - hit.at > OWNER_CATALOG_TTL_MS) {
ownerCatalogCache.delete(key);
return null;
}
return hit.rows;
}

function writeOwnerCatalogCache(key: string, rows: OwnerCatalogRow[]): void {
ownerCatalogCache.set(key, { at: Date.now(), rows });
}

function invalidateOwnerCatalogCache(book?: string): void {
if (!book) {
ownerCatalogCache.clear();
return;
}
const prefix = `${book.trim().toLowerCase()}|`;
for (const key of [...ownerCatalogCache.keys()]) {
if (key.startsWith(prefix) || !book) ownerCatalogCache.delete(key);
}
}

const TOKENPLUS_PRICE_URL = "https://www.tokenplus.cn/models";
const SILICONFLOW_PRICE_URL = "https://www.siliconflow.cn/pricing";

Expand Down Expand Up @@ -969,6 +1004,7 @@ export function AgentOwnerSettings({
>([]);
const [officialCatalogLoading, setOfficialCatalogLoading] = useState(false);
const [byoCatalogLoading, setByoCatalogLoading] = useState(false);
const [catalogEpoch, setCatalogEpoch] = useState(0);
const [settingsProvider, setSettingsProvider] = useState(() =>
detail.host_inference_ready ? OFFICIAL_OPENROUTER : "",
);
Expand Down Expand Up @@ -1191,7 +1227,12 @@ export function AgentOwnerSettings({

const book = (priceBookSource || "openrouter").trim().toLowerCase();
const loadCatalog = async (official: boolean) => {
const acc: Array<{ id: string } & CatalogPair> = [];
const geo = official ? officialKeyGeo : "";
const cacheKey = ownerCatalogCacheKey(book, official, geo);
const cached = readOwnerCatalogCache(cacheKey);
if (cached) return cached;

const acc: OwnerCatalogRow[] = [];
let offset = 0;
let total = Number.POSITIVE_INFINITY;
while (!cancelled && offset < total && offset < 8000) {
Expand All @@ -1210,7 +1251,7 @@ export function AgentOwnerSettings({
if (!id) continue;
const quote = official ? officialCatalogRates(row) : syncCatalogRates(row);
if (!quote) continue;
if (official && !officialShelfAllows(id, officialKeyGeo)) continue;
if (official && !officialShelfAllows(id, geo)) continue;
if (acc.some((item) => sameModelId(item.id, id))) continue;
const bookRates = official ? syncCatalogRates(row) : null;
acc.push({
Expand All @@ -1226,14 +1267,16 @@ export function AgentOwnerSettings({
if (!data.items.length) break;
offset += data.items.length;
}
if (!cancelled) writeOwnerCatalogCache(cacheKey, acc);
return acc;
};

setOfficialCatalogLoading(true);
setByoCatalogLoading(true);
void (async () => {
try {
if (hostReady && officialKeyGeo) {
// Do not wait for officialKeyGeo — empty geo allows all non-CN-blocked v0 models.
if (hostReady) {
const officialAcc = await loadCatalog(true);
if (!cancelled) setOfficialCatalog(officialAcc);
} else if (!cancelled) {
Expand All @@ -1258,7 +1301,7 @@ export function AgentOwnerSettings({
return () => {
cancelled = true;
};
}, [client, hostReady, officialKeyGeo, priceBookSource]);
}, [client, hostReady, officialKeyGeo, priceBookSource, catalogEpoch]);

useEffect(() => {
setDeliveryDraft(deliveryFromDetail(detail.delivery));
Expand Down Expand Up @@ -1891,9 +1934,11 @@ export function AgentOwnerSettings({
const refreshRuntimeStatus = () => {
if (refreshingRuntime || modelsLoading || busy) return;
setRefreshingRuntime(true);
void client
.getAgentModelStatus(detail.agent_id)
.then((status) => {
void Promise.all([
client.getAgentModelStatus(detail.agent_id),
client.getMyAgentOfficialModels(detail.agent_id).catch(() => null),
])
.then(([status, officialRow]) => {
const declared = Array.isArray(status.agent_providers) ? status.agent_providers : [];
setAgentProviders(declared);
const reported = uniqModelIds(status.self_reported_models);
Expand All @@ -1918,10 +1963,24 @@ export function AgentOwnerSettings({
if (Array.isArray(status.official_models)) {
setOfficialSaved(status.official_models);
}
const ready =
typeof status.host_inference_ready === "boolean"
? status.host_inference_ready
: hostReady;
if (officialRow?.official_key_geo) {
setOfficialKeyGeo(officialRow.official_key_geo);
}
if (typeof officialRow?.host_inference_ready === "boolean") {
setHostReady(officialRow.host_inference_ready);
}
if (typeof status.price_book_source === "string" && status.price_book_source.trim()) {
setPriceBookSource(status.price_book_source);
}
if (officialRow?.official_default_model_id) {
setOfficialDefaultModelId(officialRow.official_default_model_id);
}
const ready = Boolean(
officialRow?.host_inference_ready ??
(typeof status.host_inference_ready === "boolean"
? status.host_inference_ready
: hostReady),
);
const fallback = defaultDeclaredProvider(declared, ready);
const nextProvider =
providerChosen.current &&
Expand All @@ -1942,10 +2001,15 @@ export function AgentOwnerSettings({
runtime_model_id: status.runtime_model_id ?? detail.runtime_model_id,
official_models: status.official_models ?? detail.official_models,
host_inference_ready:
typeof status.host_inference_ready === "boolean"
? status.host_inference_ready
: detail.host_inference_ready,
typeof officialRow?.host_inference_ready === "boolean"
? officialRow.host_inference_ready
: typeof status.host_inference_ready === "boolean"
? status.host_inference_ready
: detail.host_inference_ready,
});
// Bust session catalog cache and reload official/BYO shelves.
invalidateOwnerCatalogCache(priceBookSource || "openrouter");
setCatalogEpoch((n) => n + 1);
})
.finally(() => setRefreshingRuntime(false));
};
Expand Down Expand Up @@ -2439,7 +2503,7 @@ export function AgentOwnerSettings({
{t.myAgentsPricingModelLabel}
<FieldHint label={t.fieldHintLabel} text={modelFieldHint} />
</span>
{catalogSourceUrl && priceSource ? (
{hasPricingModels && catalogSourceUrl && priceSource ? (
<span
style={{
display: "inline-flex",
Expand Down
8 changes: 4 additions & 4 deletions packages/agent-chat/src/ranch-shell/i18n.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1314,9 +1314,9 @@ const en: RanchMessages = {
myAgentsPricingModelSearch: "Search",
myAgentsPricingOfficialEmpty: "No matching models on this price list.",
myAgentsPricingShelfEmpty:
"No models on this price list for the selected provider. Switch provider, or Refresh status after the shelf updates.",
"No models on this price list for the selected provider. Switch provider, or tap Refresh status to reload the shelf.",
myAgentsPricingShelfEmptyRuntime:
"No models on this price list for the selected provider. Runtime still reports ${model}. Switch provider or Refresh status.",
"No models on this price list for the selected provider. Runtime still reports ${model}. Switch provider, or tap Refresh status to reload the shelf.",
myAgentsPricingEmptyRuntimeNote: "Runtime still reports ${model}.",
myAgentsPricingOptionLine: "${name} · in ${in} · out ${out}",
myAgentsPricingCreditsLine: "in ${in} · out ${out} credits / 1M",
Expand Down Expand Up @@ -2158,9 +2158,9 @@ const zh: RanchMessages = {
myAgentsPricingModelSearch: "搜索",
myAgentsPricingOfficialEmpty: "价目里没有匹配的模型。",
myAgentsPricingShelfEmpty:
"当前供应商价目里没有可用模型。请换供应商，或等货架更新后点「刷新状态」。",
"当前供应商价目里没有可用模型。请换供应商，或点「刷新状态」重新拉取货架。",
myAgentsPricingShelfEmptyRuntime:
"当前供应商价目里没有可用模型。运行环境仍上报 ${model}。请换供应商或点「刷新状态」。",
"当前供应商价目里没有可用模型。运行环境仍上报 ${model}。请换供应商，或点「刷新状态」重新拉取货架。",
myAgentsPricingEmptyRuntimeNote: "运行环境仍上报 ${model}。",
myAgentsPricingOptionLine: "${name} · 入 ${in} · 出 ${out}",
myAgentsPricingCreditsLine: "入 ${in} · 出 ${out} 星币 /百万",
Expand Down
Loading