Skip to content

fix: models.dev 拉取失败后 UI 永久卡在 loading 态 (#145) #285

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

Open
zerx-lab wants to merge 2 commits into
base: main
Choose a base branch
from
Open

fix: models.dev 拉取失败后 UI 永久卡在 loading 态 (#145) #285

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e847f13
fix: models.dev 拉取失败后 UI 永久卡在 loading 态 (Fixes #145)
claude Jun 26, 2026
6aa836b
fix: address review comments on PR #285
claude Jun 26, 2026
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
1 change: 1 addition & 0 deletions app/i18n/en/warp.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1516,6 +1516,7 @@ settings-agent-providers-quick-add-title = Quick add
settings-agent-providers-refresh-catalog = Refresh catalog
settings-agent-providers-loading-catalog = Loading models.dev catalog… (the first load may take a few seconds)
settings-agent-providers-catalog-empty = models.dev catalog is empty. Click [Refresh catalog] to retry.
settings-agent-providers-catalog-load-failed = Failed to load models.dev catalog. Click [Refresh catalog] to retry.
settings-agent-providers-no-match = No match for "{ $query }"
settings-agent-providers-collapse = Collapse ▲
settings-agent-providers-expand-remaining = Expand remaining { $count } ▼
Expand Down
1 change: 1 addition & 0 deletions app/i18n/ja/warp.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1451,6 +1451,7 @@ settings-agent-providers-quick-add-title = クイック追加
settings-agent-providers-refresh-catalog = カタログを更新
settings-agent-providers-loading-catalog = models.dev カタログを読み込み中… (初回読み込みは数秒かかる場合があります)
settings-agent-providers-catalog-empty = models.dev カタログが空です。[カタログを更新] をクリックして再試行してください。
settings-agent-providers-catalog-load-failed = models.dev カタログの取得に失敗しました。[カタログを更新] をクリックして再試行してください。
settings-agent-providers-no-match = 「{ $query }」に一致する項目はありません
settings-agent-providers-collapse = 折りたたむ ▲
settings-agent-providers-expand-remaining = 残り { $count } 件を展開 ▼
Expand Down
1 change: 1 addition & 0 deletions app/i18n/zh-CN/warp.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1491,6 +1491,7 @@ settings-agent-providers-quick-add-title = 快速添加
settings-agent-providers-refresh-catalog = 刷新目录
settings-agent-providers-loading-catalog = 正在拉取 models.dev 目录…（第一次可能需要几秒）
settings-agent-providers-catalog-empty = models.dev 目录为空，点 [刷新目录] 重试。
settings-agent-providers-catalog-load-failed = models.dev 目录拉取失败，点 [刷新目录] 重试。
settings-agent-providers-no-match = 无匹配「{ $query }」
settings-agent-providers-collapse = 收起 ▲
settings-agent-providers-expand-remaining = 展开剩余 { $count } 个 ▼
Expand Down
14 changes: 14 additions & 0 deletions app/src/ai/agent_providers/models_dev.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,6 +269,20 @@ pub fn toggle_chips_expanded() {
CHIPS_EXPANDED.fetch_xor(true, Ordering::Relaxed);
}

// ── 最近一次网络拉取失败标志 ─────────────────────────────────────────────────

static FETCH_FAILED: AtomicBool = AtomicBool::new(false);

/// 最近一次网络拉取是否失败（cached() == None 时有意义）。
pub fn last_fetch_failed() -> bool {
FETCH_FAILED.load(Ordering::Relaxed)
}

/// 由调用方在 spawn 回调中设置（失败 true，成功不需要重置，因为 cached() 此时为 Some）。
pub fn set_fetch_failed(failed: bool) {
FETCH_FAILED.store(failed, Ordering::Relaxed);
}

// ── 快速添加 chip 行的搜索过滤 ──────────────────────────────────────────────

fn search_state() -> &'static RwLock<String> {
Expand Down
7 changes: 6 additions & 1 deletion app/src/settings_view/agent_providers_widget.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1462,10 +1462,15 @@ impl AgentProvidersWidget {

match models_dev::cached() {
None => {
let catalog_text = if models_dev::last_fetch_failed() {

@zerx-lab zerx-lab Jun 26, 2026

Copy link
Copy Markdown
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Question：这里复用了 settings-agent-providers-catalog-empty，但这个 key 的语义是"目录为空"，而此处的上下文是"网络拉取失败"。两种情形对用户的含义截然不同——前者暗示配置问题或 providers 未接入，后者是网络/CDN 故障。Issue #145 中明确要求渲染独立的错误态（"设置后应该显示错误文字而不是 loading 文字"）。

建议新增一条专用 i18n key（例如 settings-agent-providers-catalog-load-failed），措辞应说明拉取失败并引导用户点击页面顶部已存在的 Refresh 按钮重试，避免与"空目录"产生歧义。

Generated by Claude Code

crate::t!("settings-agent-providers-catalog-load-failed")
} else {
crate::t!("settings-agent-providers-loading-catalog")
};
body.add_child(
Container::new(
Text::new(
crate::t!("settings-agent-providers-loading-catalog"),
catalog_text,
appearance.ui_font_family(),
appearance.ui_font_size(),
)
Expand Down
22 changes: 18 additions & 4 deletions app/src/settings_view/ai_page.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3401,8 +3401,15 @@ impl TypedActionView for AISettingsPageView {
ctx.spawn(
async move { models_dev::fetch_and_cache(client).await },
|view, result, ctx| match result {
Ok(()) => view.rebuild_current_page(ctx),
Err(e) => log::warn!("[models.dev] 拉取失败: {e}"),
Ok(()) => {
models_dev::set_fetch_failed(false);
view.rebuild_current_page(ctx);
}
Err(e) => {
log::warn!("[models.dev] 拉取失败: {e}");
models_dev::set_fetch_failed(true);
ctx.notify();
}
},
);
} else {
Expand All @@ -3415,8 +3422,15 @@ impl TypedActionView for AISettingsPageView {
ctx.spawn(
async move { models_dev::fetch_and_cache(client).await },
|view, result, ctx| match result {
Ok(()) => view.rebuild_current_page(ctx),
Err(e) => log::warn!("[models.dev] 刷新失败: {e}"),
Ok(()) => {
models_dev::set_fetch_failed(false);
view.rebuild_current_page(ctx);
}
Err(e) => {
log::warn!("[models.dev] 刷新失败: {e}");
models_dev::set_fetch_failed(true);
ctx.notify();
}
},
);
}
Expand Down