+
${loraCountLabel}
` : ''}
@@ -154,17 +174,38 @@ class RecipeCard {
return card;
}
- getLoraStatusTitle(totalCount, missingCount) {
+ getLoraStatusTitle(totalCount, availableCount, missingCount, unavailableCount) {
if (totalCount === 0) {
return translate('recipes.loraStatus.none', {}, 'No LoRAs in this recipe');
}
- if (missingCount === 0) {
+ if (availableCount === totalCount) {
return translate('recipes.loraStatus.allAvailable', {}, 'All LoRAs available - Ready to use');
}
+ if (missingCount > 0 && unavailableCount > 0) {
+ return translate(
+ 'recipes.loraStatus.missingAndUnavailable',
+ { missing: missingCount, unavailable: unavailableCount, total: totalCount },
+ `${missingCount} of ${totalCount} LoRAs missing, ${unavailableCount} unavailable (deleted from source or unresolvable hash)`
+ );
+ }
+ if (missingCount > 0) {
+ return translate(
+ 'recipes.loraStatus.missing',
+ { missing: missingCount, total: totalCount },
+ `${missingCount} of ${totalCount} LoRAs missing`
+ );
+ }
+ if (availableCount > 0) {
+ return translate(
+ 'recipes.loraStatus.partial',
+ { unavailable: unavailableCount, total: totalCount },
+ `${unavailableCount} of ${totalCount} LoRAs unavailable (deleted from source or unresolvable hash) - skipped when recipe is used`
+ );
+ }
return translate(
- 'recipes.loraStatus.missing',
- { missing: missingCount, total: totalCount },
- `${missingCount} of ${totalCount} LoRAs missing`
+ 'recipes.loraStatus.noneUsable',
+ { unavailable: unavailableCount, total: totalCount },
+ `No usable LoRAs - ${unavailableCount} of ${totalCount} deleted from source or unresolvable hash`
);
}
diff --git a/static/js/components/shared/RecipeTab.js b/static/js/components/shared/RecipeTab.js
index 1384de13..a17bfc74 100644
--- a/static/js/components/shared/RecipeTab.js
+++ b/static/js/components/shared/RecipeTab.js
@@ -130,17 +130,29 @@ function renderRecipes(tabElement, recipes, options) {
const baseModel = recipe.base_model || '';
const loras = recipe.loras || [];
const lorasCount = loras.length;
- const missingLorasCount = loras.filter(lora => !lora.inLibrary && !lora.isDeleted).length;
- const allLorasAvailable = missingLorasCount === 0 && lorasCount > 0;
- const statusClass = lorasCount === 0 ? 'empty' : (allLorasAvailable ? 'ready' : 'missing');
+ // Missing = still downloadable; unavailable = deleted from the source
+ // or unresolvable hash, silently skipped when the recipe is used.
+ const availableLorasCount = loras.filter(lora => lora.inLibrary).length;
+ const missingLorasCount = loras.filter(lora => !lora.inLibrary && !lora.isDeleted && !lora.hashInvalid).length;
+ const unavailableLorasCount = lorasCount - availableLorasCount - missingLorasCount;
+ const statusClass = lorasCount === 0 ? 'empty'
+ : (availableLorasCount === lorasCount ? 'ready'
+ : (missingLorasCount > 0 ? 'missing'
+ : (availableLorasCount > 0 ? 'partial' : 'unavailable')));
let statusLabel;
if (lorasCount === 0) {
statusLabel = 'No linked LoRAs';
- } else if (allLorasAvailable) {
+ } else if (statusClass === 'ready') {
statusLabel = `${lorasCount} LoRA${lorasCount > 1 ? 's' : ''} ready`;
+ } else if (statusClass === 'missing') {
+ statusLabel = unavailableLorasCount > 0
+ ? `Missing ${missingLorasCount}, ${unavailableLorasCount} of ${lorasCount} unavailable`
+ : `Missing ${missingLorasCount} of ${lorasCount}`;
+ } else if (statusClass === 'partial') {
+ statusLabel = `${unavailableLorasCount} of ${lorasCount} unavailable - skipped when used`;
} else {
- statusLabel = `Missing ${missingLorasCount} of ${lorasCount}`;
+ statusLabel = 'No usable LoRAs';
}
const imageUrl = recipe.file_url ||
@@ -207,8 +219,16 @@ function renderRecipes(tabElement, recipes, options) {
const statusBadge = document.createElement('span');
statusBadge.className = `recipe-card__badge recipe-card__badge--${statusClass}`;
+ // Icon switches by state so status never relies on color alone.
+ const statusIcons = {
+ ready: 'fa-check',
+ missing: 'fa-exclamation-triangle',
+ partial: 'fa-circle-minus',
+ unavailable: 'fa-ban',
+ empty: 'fa-layer-group',
+ };
const statusIcon = document.createElement('i');
- statusIcon.className = 'fas fa-layer-group';
+ statusIcon.className = `fas ${statusIcons[statusClass] || 'fa-layer-group'}`;
statusIcon.setAttribute('aria-hidden', 'true');
statusBadge.appendChild(statusIcon);
@@ -216,7 +236,7 @@ function renderRecipes(tabElement, recipes, options) {
statusText.textContent = statusLabel;
statusBadge.appendChild(statusText);
- statusBadge.title = getLoraStatusTitle(lorasCount, missingLorasCount);
+ statusBadge.title = getLoraStatusTitle(lorasCount, availableLorasCount, missingLorasCount, unavailableLorasCount);
meta.appendChild(statusBadge);
body.appendChild(meta);
@@ -264,13 +284,23 @@ function renderRecipes(tabElement, recipes, options) {
/**
* Returns a descriptive title for the LoRA status indicator
* @param {number} totalCount - Total number of LoRAs in recipe
- * @param {number} missingCount - Number of missing LoRAs
+ * @param {number} availableCount - Number of LoRAs present in the library
+ * @param {number} missingCount - Number of missing LoRAs (still downloadable)
+ * @param {number} unavailableCount - Number of unobtainable LoRAs (deleted
+ * from the source or unresolvable hash)
* @returns {string} Status title text
*/
-function getLoraStatusTitle(totalCount, missingCount) {
+function getLoraStatusTitle(totalCount, availableCount, missingCount, unavailableCount) {
if (totalCount === 0) return "No LoRAs in this recipe";
- if (missingCount === 0) return "All LoRAs available - Ready to use";
- return `${missingCount} of ${totalCount} LoRAs missing`;
+ if (availableCount === totalCount) return "All LoRAs available - Ready to use";
+ if (missingCount > 0 && unavailableCount > 0) {
+ return `${missingCount} of ${totalCount} LoRAs missing, ${unavailableCount} unavailable (deleted from source or unresolvable hash)`;
+ }
+ if (missingCount > 0) return `${missingCount} of ${totalCount} LoRAs missing`;
+ if (availableCount > 0) {
+ return `${unavailableCount} of ${totalCount} LoRAs unavailable (deleted from source or unresolvable hash) - skipped when recipe is used`;
+ }
+ return `No usable LoRAs - ${unavailableCount} of ${totalCount} deleted from source or unresolvable hash`;
}
/**
diff --git a/static/js/managers/BulkMissingLoraDownloadManager.js b/static/js/managers/BulkMissingLoraDownloadManager.js
index baa8359a..fdc0b281 100644
--- a/static/js/managers/BulkMissingLoraDownloadManager.js
+++ b/static/js/managers/BulkMissingLoraDownloadManager.js
@@ -30,8 +30,9 @@ export class BulkMissingLoraDownloadManager {
if (recipe.loras && Array.isArray(recipe.loras)) {
recipe.loras.forEach(lora => {
- // Only include LoRAs not in library and not deleted
- if (!lora.inLibrary && !lora.isDeleted) {
+ // Only include LoRAs not in library and still downloadable
+ // (not deleted from the source, hash still resolvable)
+ if (!lora.inLibrary && !lora.isDeleted && !lora.hashInvalid) {
const uniqueKey = lora.hash || lora.id || lora.modelVersionId;
if (uniqueKey && !uniqueLoras.has(uniqueKey)) {
diff --git a/tests/frontend/components/recipeCard.loraBadges.test.js b/tests/frontend/components/recipeCard.loraBadges.test.js
index 45ed92fb..7a6fb119 100644
--- a/tests/frontend/components/recipeCard.loraBadges.test.js
+++ b/tests/frontend/components/recipeCard.loraBadges.test.js
@@ -130,14 +130,61 @@ describe('RecipeCard LoRA status pill', () => {
expect(card.element.querySelector('.lora-count.missing')).toBeNull();
});
- it('does not count deleted LoRAs as missing', async () => {
+ it('marks deleted-from-source LoRAs as partial instead of ready', async () => {
const card = await createCard([
{ name: 'a', inLibrary: true },
{ name: 'b', inLibrary: false, isDeleted: true },
]);
expect(card.element.querySelector('.lora-count.missing')).toBeNull();
- expect(card.element.querySelector('.lora-count.ready')).not.toBeNull();
+ expect(card.element.querySelector('.lora-count.ready')).toBeNull();
+
+ const pill = card.element.querySelector('.lora-count.partial');
+ expect(pill).not.toBeNull();
+ expect(pill.querySelector('.fa-circle-minus')).not.toBeNull();
+ expect(pill.textContent).toContain('1/2');
+ expect(pill.title).toBe('1 of 2 LoRAs unavailable (deleted from source or unresolvable hash) - skipped when recipe is used');
+ });
+
+ it('treats an unresolvable hash as unobtainable, not missing', async () => {
+ const card = await createCard([
+ { name: 'a', inLibrary: true },
+ { name: 'b', inLibrary: false, hashInvalid: true },
+ ]);
+
+ expect(card.element.querySelector('.lora-count.missing')).toBeNull();
+
+ const pill = card.element.querySelector('.lora-count.partial');
+ expect(pill).not.toBeNull();
+ expect(pill.textContent).toContain('1/2');
+ });
+
+ it('shows 0/n unavailable when every LoRA is deleted and none is in the library', async () => {
+ const card = await createCard([
+ { name: 'a', inLibrary: false, isDeleted: true },
+ { name: 'b', inLibrary: false, isDeleted: true },
+ ]);
+
+ const pill = card.element.querySelector('.lora-count.unavailable');
+ expect(pill).not.toBeNull();
+ expect(pill.querySelector('.fa-ban')).not.toBeNull();
+ expect(pill.textContent).toContain('0/2');
+ expect(pill.title).toBe('No usable LoRAs - 2 of 2 deleted from source or unresolvable hash');
+ expect(card.element.querySelector('.lora-count.ready')).toBeNull();
+ });
+
+ it('keeps the actionable missing state when LoRAs are both missing and deleted', async () => {
+ const card = await createCard([
+ { name: 'a', inLibrary: true },
+ { name: 'b', inLibrary: false },
+ { name: 'c', inLibrary: false, isDeleted: true },
+ ]);
+
+ const pill = card.element.querySelector('.lora-count.missing');
+ expect(pill).not.toBeNull();
+ expect(pill.textContent).toContain('1/3');
+ expect(pill.title).toBe('1 of 3 LoRAs missing, 1 unavailable (deleted from source or unresolvable hash)');
+ expect(card.element.querySelector('.lora-count.partial')).toBeNull();
});
it('shows a neutral layers icon with a bare 0 when the recipe has no LoRAs', async () => {
diff --git a/tests/services/test_recipe_scanner.py b/tests/services/test_recipe_scanner.py
index def8ee42..e76c06e3 100644
--- a/tests/services/test_recipe_scanner.py
+++ b/tests/services/test_recipe_scanner.py
@@ -374,6 +374,34 @@ async def test_set_lora_entry_hash_invalid_persists_flag(tmp_path: Path, recipe_
assert cleared_lora["hashInvalid"] is False
+@pytest.mark.asyncio
+async def test_get_recipe_syntax_tokens_skips_unobtainable_loras(tmp_path: Path, recipe_scanner):
+ scanner, _ = recipe_scanner
+ recipes_dir = Path(config.loras_roots[0]) / "recipes"
+ recipes_dir.mkdir(parents=True, exist_ok=True)
+
+ recipe_id = "syntax-skip-1"
+ recipe_path = recipes_dir / f"{recipe_id}.recipe.json"
+ recipe_data = {
+ "id": recipe_id,
+ "file_path": str(tmp_path / "image.png"),
+ "title": "Syntax skip",
+ "modified": 0.0,
+ "created_date": 0.0,
+ "loras": [
+ {"file_name": "usable_lora", "strength": 0.8, "hash": ""},
+ {"file_name": "deleted_lora", "strength": 1.0, "hash": "", "isDeleted": True},
+ {"file_name": "invalid_hash_lora", "strength": 1.0, "hash": "", "hashInvalid": True},
+ ],
+ }
+ recipe_path.write_text(json.dumps(recipe_data))
+ await scanner.add_recipe(dict(recipe_data))
+
+ tokens = await scanner.get_recipe_syntax_tokens(recipe_id)
+
+ assert tokens == ["
"]
+
+
@pytest.mark.asyncio
async def test_load_recipe_rewrites_missing_image_path(tmp_path: Path, recipe_scanner):
scanner, _ = recipe_scanner