Skip to content

fix: 阻止批量删除模型后被自动拉回 #312

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
panzeyu2013 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: 阻止批量删除模型后被自动拉回 #312

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
27 changes: 21 additions & 6 deletions crates/service/src/apikey/apikey_models.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ pub(crate) fn read_managed_model_catalog(
storage_helpers::open_storage().ok_or_else(|| "storage unavailable".to_string())?;
let cached_catalog = read_managed_model_catalog_from_storage(&storage)?;
let cached = managed_catalog_to_models_response(&cached_catalog);
if !refresh_remote && !cached.is_empty() {
if !refresh_remote {
return Ok(cached_catalog);
}

Expand Down Expand Up @@ -864,11 +864,16 @@ fn read_account_pool_platform_catalog(
}

if allow_remote_catalog_fetch {
if let Ok(models) = gateway::fetch_models_for_picker() {
let catalog = merge_managed_model_catalog(cached_catalog.clone(), models);
if !catalog.items.is_empty() {
save_managed_model_catalog_with_storage(storage, &catalog)?;
return Ok(catalog);
let scope_record = storage
.get_model_catalog_scope(MODEL_CACHE_SCOPE_DEFAULT)
.map_err(|e| e.to_string())?;
if scope_record.is_none() {
if let Ok(models) = gateway::fetch_models_for_picker() {
let catalog = merge_managed_model_catalog(cached_catalog.clone(), models);
if !catalog.items.is_empty() {
save_managed_model_catalog_with_storage(storage, &catalog)?;
return Ok(catalog);
}
}
}
}
Expand Down Expand Up @@ -1794,6 +1799,16 @@ fn replace_model_catalog_entry(
}

fn delete_model_catalog_entry(storage: &Storage, slug: &str) -> Result<(), String> {
if let Ok(mappings) = storage.list_model_source_mappings(Some(slug)) {
for mapping in &mappings {
let _ = storage.upsert_model_source_mapping_preference(
&mapping.source_kind,
&mapping.source_id,
&mapping.upstream_model,
"unlinked",
);
}
}
storage
.delete_model_group_model_references(slug)
.map_err(|e| e.to_string())?;
Expand Down