fix(recipe): resolve recipe metadata update bugs in cache sort, allowed fields, and bulk API routing

- Use safe .get() in RecipeCache._resort_locked instead of itemgetter to prevent KeyError when recipe missing created_date; align sort key with _sort_cache_sync (prefer modified, fallback created_date, fallback 0)
- Add base_model to allowed_fields in persistence_service.update_recipe() so the field passes validation
- Route bulk base model updates through updateRecipeMetadata() on recipes page instead of generic saveModelMetadata(), matching existing isRecipesPage pattern used in setBulkFavorites and saveBulkTags
This commit is contained in:
Will Miao
2026-07-20 11:20:06 +08:00
parent c68d7559a0
commit 57983df4bd
3 changed files with 15 additions and 4 deletions

View File

@@ -1,7 +1,6 @@
import asyncio import asyncio
from typing import Iterable, List, Dict, Optional from typing import Iterable, List, Dict, Optional
from dataclasses import dataclass, field from dataclasses import dataclass, field
from operator import itemgetter
from natsort import natsorted from natsort import natsorted
@@ -149,5 +148,10 @@ class RecipeCache:
) )
if not name_only: if not name_only:
self.sorted_by_date = sorted( self.sorted_by_date = sorted(
self.raw_data, key=itemgetter("created_date", "file_path"), reverse=True self.raw_data,
key=lambda x: (
x.get("modified", x.get("created_date", 0)),
x.get("file_path", ""),
),
reverse=True,
) )

View File

@@ -216,11 +216,12 @@ class RecipePersistenceService:
"preview_nsfw_level", "preview_nsfw_level",
"favorite", "favorite",
"gen_params", "gen_params",
"base_model",
) )
if not any(key in updates for key in allowed_fields): if not any(key in updates for key in allowed_fields):
raise RecipeValidationError( raise RecipeValidationError(
"At least one field to update must be provided (title or tags or source_path or preview_nsfw_level or favorite or gen_params)" "At least one field to update must be provided (title or tags or source_path or preview_nsfw_level or favorite or gen_params or base_model)"
) )
if "gen_params" in updates and not isinstance(updates["gen_params"], dict): if "gen_params" in updates and not isinstance(updates["gen_params"], dict):

View File

@@ -1665,13 +1665,19 @@ export class BulkManager {
cancelled = true; cancelled = true;
}); });
const isRecipesPage = state.currentPageType === 'recipes';
for (const filepath of state.selectedModels) { for (const filepath of state.selectedModels) {
if (cancelled) { if (cancelled) {
showToast('toast.api.operationCancelled', {}, 'info'); showToast('toast.api.operationCancelled', {}, 'info');
break; break;
} }
try { try {
await getModelApiClient().saveModelMetadata(filepath, { base_model: newBaseModel }); if (isRecipesPage) {
await updateRecipeMetadata(filepath, { base_model: newBaseModel });
} else {
await getModelApiClient().saveModelMetadata(filepath, { base_model: newBaseModel });
}
successCount++; successCount++;
} catch (error) { } catch (error) {
errorCount++; errorCount++;