5c3f8ebd70
The headline bug: aliases created from the modal NEVER resolved. Create
sent the normalized display name ('Sword', 'Uchiha Sasuke') while
resolution keys on the raw booru model key ('sword', 'uchiha_sasuke',
case-sensitive) — so the mapping was stored under a key nothing looks up,
and the prediction kept reappearing unaliased. The raw key wasn't even in
the /suggestions response, so the modal couldn't send it.
- Suggestion now carries raw_name (the model key an alias must use) and
via_alias (surfaced via an operator alias); both serialized by the API.
- Modal alias-create sends raw_name, not display_name (the fix). Aliased
suggestions show an 'alias' badge and a 'Remove alias' action; 'Treat as
alias for…' is hidden for centroid hits (no model key) and already-aliased
rows.
- Tag-side management: TagCard ⋮ → 'Aliases…' opens a dialog listing the
model keys that fold into a tag, with remove (GET /api/tags/<id>/aliases +
AliasService.list_for_tag). Creation stays in the modal suggestion flow.
Tests: full API round-trip locking the raw-key contract (raw_name exposed →
alias authored with it → resolves + via_alias on a later image);
list_for_tag (service + API); via_alias/raw_name on the existing service
suggestion tests. No migration.
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
145 lines
4.9 KiB
Vue
145 lines
4.9 KiB
Vue
<template>
|
|
<section class="fc-suggestions" aria-label="Tag suggestions">
|
|
<h3 class="fc-suggestions__title">Suggestions</h3>
|
|
|
|
<div v-if="store.loading" class="fc-suggestions__skeleton">
|
|
<div v-for="i in 4" :key="i" class="fc-suggestions__skel-row" />
|
|
</div>
|
|
<v-alert v-else-if="store.error" type="error" variant="tonal" density="compact">
|
|
{{ store.error }}
|
|
</v-alert>
|
|
<div v-else-if="isEmpty" class="text-caption">
|
|
No suggestions above threshold.
|
|
</div>
|
|
|
|
<template v-else>
|
|
<SuggestionsCategoryGroup
|
|
v-for="cat in peopleCats" :key="cat"
|
|
v-show="store.byCategory[cat] && store.byCategory[cat].length"
|
|
:label="labelFor(cat)" :items="store.byCategory[cat] || []"
|
|
@accept="onAccept" @alias="onAlias" @remove-alias="onRemoveAlias"
|
|
@dismiss="store.dismiss"
|
|
/>
|
|
<SuggestionsCategoryGroup
|
|
v-if="store.byCategory.general && store.byCategory.general.length"
|
|
label="General" :items="store.byCategory.general"
|
|
collapsible :default-open="true"
|
|
@accept="onAccept" @alias="onAlias" @remove-alias="onRemoveAlias"
|
|
@dismiss="store.dismiss"
|
|
/>
|
|
</template>
|
|
|
|
<v-dialog v-model="aliasDialog" max-width="480">
|
|
<AliasPickerDialog
|
|
v-if="aliasTarget"
|
|
:category="aliasTarget.category"
|
|
@confirm="onAliasConfirm" @cancel="aliasDialog = false"
|
|
/>
|
|
</v-dialog>
|
|
</section>
|
|
</template>
|
|
|
|
<script setup>
|
|
import { toast } from '../../utils/toast.js'
|
|
import { computed, ref, watch } from 'vue'
|
|
import { useSuggestionsStore, CATEGORY_LABELS } from '../../stores/suggestions.js'
|
|
import { useModalStore } from '../../stores/modal.js'
|
|
import SuggestionsCategoryGroup from './SuggestionsCategoryGroup.vue'
|
|
import AliasPickerDialog from './AliasPickerDialog.vue'
|
|
|
|
const props = defineProps({ imageId: { type: Number, required: true } })
|
|
// 'accepted' lets the parent return focus to the tag input after a suggestion is
|
|
// applied (operator-asked 2026-06-08).
|
|
const emit = defineEmits(['accepted'])
|
|
const store = useSuggestionsStore()
|
|
const modal = useModalStore()
|
|
|
|
// 'artist' (FC-2d-vii-c) and 'copyright' (2026-06-01) retired as
|
|
// suggestion categories. Only 'character' remains as a people-style
|
|
// category alongside the general bucket.
|
|
const peopleCats = ['character']
|
|
function labelFor(c) { return CATEGORY_LABELS[c] || c }
|
|
|
|
const isEmpty = computed(() =>
|
|
Object.values(store.byCategory).every(list => !list || list.length === 0)
|
|
)
|
|
|
|
watch(() => props.imageId, (id) => {
|
|
if (id == null) return
|
|
store.load(id) // panel: curated, ≥ threshold
|
|
store.loadAll(id) // dropdown: full prediction set (low-confidence included)
|
|
}, { immediate: true })
|
|
|
|
// After a successful accept/alias-accept, refresh the modal's current
|
|
// tag list so TagPanel's chip rail reflects the newly-attached tag.
|
|
// Operator-flagged 2026-06-01: the suggestion store dropped the
|
|
// suggestion (correct) but didn't propagate the new tag back into the
|
|
// modal store, so the chip rail looked unchanged even though the
|
|
// backend had recorded the application. Mirrors the addExistingTag /
|
|
// createAndAdd flows which already call reloadTags() after applying.
|
|
async function onAccept(s) {
|
|
try {
|
|
await store.accept(s)
|
|
await modal.reloadTags()
|
|
emit('accepted')
|
|
} catch (e) {
|
|
toast({ text: `Accept failed: ${e.message}`, type: 'error' })
|
|
}
|
|
}
|
|
|
|
const aliasDialog = ref(false)
|
|
const aliasTarget = ref(null)
|
|
function onAlias(s) { aliasTarget.value = s; aliasDialog.value = true }
|
|
async function onAliasConfirm(canonicalTagId) {
|
|
try {
|
|
await store.aliasAccept(aliasTarget.value, canonicalTagId)
|
|
aliasDialog.value = false
|
|
await modal.reloadTags()
|
|
emit('accepted')
|
|
} catch (e) {
|
|
toast({ text: `Alias failed: ${e.message}`, type: 'error' })
|
|
}
|
|
}
|
|
|
|
// Undo the model-key→tag mapping behind an aliased suggestion. The store
|
|
// reloads suggestions so the prediction reverts to its raw form; the applied
|
|
// canonical tag (if any) stays, so no tag-rail reload is needed.
|
|
async function onRemoveAlias(s) {
|
|
try {
|
|
await store.removeAlias(s)
|
|
} catch (e) {
|
|
toast({ text: `Remove alias failed: ${e.message}`, type: 'error' })
|
|
}
|
|
}
|
|
</script>
|
|
|
|
<style scoped>
|
|
.fc-suggestions {
|
|
margin-top: 16px;
|
|
padding-top: 12px;
|
|
border-top: 1px solid rgb(var(--v-theme-surface-light));
|
|
}
|
|
.fc-suggestions__title {
|
|
font-family: 'Fraunces', Georgia, serif;
|
|
font-size: 16px; font-weight: 500;
|
|
color: rgb(var(--v-theme-on-surface));
|
|
margin-bottom: 8px;
|
|
}
|
|
.fc-suggestions__skeleton { display: flex; flex-direction: column; gap: 8px; }
|
|
.fc-suggestions__skel-row {
|
|
height: 18px; border-radius: 4px;
|
|
background: linear-gradient(
|
|
90deg,
|
|
rgb(var(--v-theme-surface)) 0%,
|
|
rgb(var(--v-theme-surface-light)) 50%,
|
|
rgb(var(--v-theme-surface)) 100%
|
|
);
|
|
background-size: 200% 100%;
|
|
animation: fc-shimmer 1.4s infinite;
|
|
}
|
|
@keyframes fc-shimmer {
|
|
0% { background-position: 200% 0; }
|
|
100% { background-position: -200% 0; }
|
|
}
|
|
</style>
|