mirror of
https://github.com/kilyabin/psysonic.git
synced 2026-07-22 06:25:41 +00:00
003b280a77
* feat(enrichment): oximedia BPM/mood facts, mood search, and queue UI Run client-side oximedia analysis after CPU seed and persist BPM, mood JSON, and searchable mood_tag facts. Add product mood groups (joy/sadness/dance/work/ romance) with Advanced Search filter on the local index, queue BPM/mood display, migration 008 mood_tag index, and refreshed licenses for oximedia crates. * fix(enrichment): keep mood_groups module comment in English * feat(search): virtual mood groups, anger filter, and Advanced Search UX Expand mood search via overlapping virtual groups (tag expansion only), add anger/Злость group, skip album/artist shortcuts for track-only filters, and simplify mood search UI (songs-only, hide type tabs). Fix CustomSelect spurious scrollbar on short option lists. * feat(analysis): unified track analysis plan and enqueue path Add TrackAnalysisPlan (waveform, LUFS, enrichment) with a single enqueue_track_analysis entry for all byte-backed triggers. Run enrichment when cache is full but library facts are missing; route playback, cache, and backfill through the planner. Fix browseTextSearch LocalSearchOpts tsc gap and remove obsolete read_seed_bytes_if_needed helper. * fix(analysis): wire playback dispatch, preload enrichment, and UI refresh Route stream, gapless, preload, and local-file playback through analysis_dispatch so BPM/mood enrichment runs when waveform/LUFS are already cached. Fix audio_preload cache-hit and hot-cache paths, emit preload-cancelled for retry, and add analysis:enrichment-updated plus content_cache_coverage key resolution. * fix(audio): preload local files from disk and stop analysis retry loop Seed hot/offline next tracks via LocalFilePlayback (512 MiB) instead of copying into the RAM preload slot. Keep bytePreloadingId set after preload-ready so progress ticks do not re-invoke audio_preload every second. * fix(enrichment): clippy, album bpm filter routing, and queue mood display Clippy-clean analysis_dispatch and engine imports; restrict track-derived album routing to mood_group/mood_tag only so bpm is skipped on album queries. Log enrichment plan errors with retry-all plan; filter queue mood labels to oximedia ids. * fix(enrichment): simplify mood_tag backfill branch in plan_track_enrichment Remove empty if-block; keep same behaviour when backfill fails and moods row exists. * docs: CHANGELOG and credits for track enrichment PR #863 * docs(credits): track enrichment PR #863 contributor line * chore(enrichment): clippy-clean plan branch and trim dead exports Collapse mood_tag backfill if for clippy; remove unused moodGroupById and OXIMEDIA_MOOD_LABELS re-exports; stop poll when server BPM is already known. * fix(enrichment): close R2/S1–S3 limits and Song Info BPM fallback Return TrackEnrichmentOutcome::Failed on oximedia errors so retries are not masked as complete; extract mood Advanced Search SQL, unify top-3 mood tag selection in mood_groups with TS invariant tests, and show measured BPM in Song Info when tag BPM is missing or zero. * fix(enrichment): restore offline coverage and show mood in Song Info Add unit tests for offline download cancel/clear registry after the analysis seed refactor dropped read_seed_bytes coverage; show localized mood labels in Song Info when library enrichment facts exist. * fix(enrichment): soft mood scoring and unblock offline cancel tests Replace oximedia quadrant happy/excited mapping with valence/arousal soft scores across all mood tags for display, storage, and backfill; fix offline cancel unit tests that deadlocked by calling clear while holding the global offline_cancel_flags mutex. * fix(enrichment): dedupe joy cluster and cap mood display at two labels Never show happy and excited together; pick one tag per V/A cluster, tighten oximedia recalibration, and limit queue/Song Info to two moods that pass a relative score floor. * fix(enrichment): disable oximedia mood labels in UI and search tags Oximedia 0.1.7 mood is a spectral energy heuristic, not independent mood weights; valence correlates with loud/bright audio and false-labels metal and lyrical tracks as happy. Hide queue/Song Info mood and stop writing mood_tag facts until a reliable detector lands; keep V/A/moods JSON stored. * fix(enrichment): disable oximedia mood analysis and add BPM advanced search Stop planning, running, and storing oximedia mood facts; purge accumulated mood rows via migration 009. Hide mood filters in Advanced Search, expose BPM range filter with dual-storage resolution, and show a BPM column in song results when that filter is active. * feat(search): analysis BPM priority, source tooltip, and filter UX Prefer analysis track_fact over file tags for BPM resolution; show source in list tooltips. Validate BPM range on blur, add clear button, fix double tooltip. * fix(enrichment): prefer analysis BPM in Song Info and queue tech row Show measured track_fact BPM before file tags until analysis completes; pick the highest-confidence analysis fact when several exist.
151 lines
4.4 KiB
TypeScript
151 lines
4.4 KiB
TypeScript
import { describe, expect, it } from 'vitest';
|
|
import type { TFunction } from 'i18next';
|
|
import {
|
|
deriveMoodScores,
|
|
formatQueueBpmTech,
|
|
formatQueueMoodLabels,
|
|
parseTrackEnrichmentFacts,
|
|
resolveQueueBpm,
|
|
resolveDisplayBpm,
|
|
topMoodLabelIds,
|
|
} from './trackEnrichment';
|
|
import { topDistinctOximediaMoodTagIds, topOximediaMoodTagIds } from '../../config/moodGroups';
|
|
|
|
const t = ((key: string, opts?: Record<string, unknown>) => {
|
|
if (key === 'queue.bpm') return `${opts?.bpm} BPM`;
|
|
if (key === 'queue.moods.calm') return 'Calm';
|
|
if (key === 'queue.moods.peaceful') return 'Peaceful';
|
|
return key;
|
|
}) as TFunction;
|
|
|
|
describe('parseTrackEnrichmentFacts', () => {
|
|
it('does not surface oximedia mood labels in UI while detector is disabled', () => {
|
|
const parsed = parseTrackEnrichmentFacts(
|
|
[
|
|
{
|
|
serverId: 's1',
|
|
trackId: 't1',
|
|
factKind: 'moods',
|
|
sourceKind: 'analysis',
|
|
sourceId: 'oximedia-60s-center',
|
|
valueText: '{"calm":0.6,"peaceful":0.4}',
|
|
confidence: 0.9,
|
|
fetchedAt: 1,
|
|
},
|
|
{
|
|
serverId: 's1',
|
|
trackId: 't1',
|
|
factKind: 'valence',
|
|
sourceKind: 'analysis',
|
|
sourceId: 'oximedia-60s-center',
|
|
valueReal: 0.55,
|
|
confidence: 0.9,
|
|
fetchedAt: 1,
|
|
},
|
|
{
|
|
serverId: 's1',
|
|
trackId: 't1',
|
|
factKind: 'arousal',
|
|
sourceKind: 'analysis',
|
|
sourceId: 'oximedia-60s-center',
|
|
valueReal: 0.42,
|
|
confidence: 0.9,
|
|
fetchedAt: 1,
|
|
},
|
|
],
|
|
null,
|
|
);
|
|
expect(parsed.moodLabels).toEqual([]);
|
|
});
|
|
|
|
it('reads analysis bpm fact with highest confidence', () => {
|
|
const parsed = parseTrackEnrichmentFacts(
|
|
[
|
|
{
|
|
serverId: 's1',
|
|
trackId: 't1',
|
|
factKind: 'bpm',
|
|
sourceKind: 'analysis',
|
|
sourceId: 'oximedia-60s-center',
|
|
valueInt: 128,
|
|
confidence: 0.9,
|
|
fetchedAt: 1,
|
|
},
|
|
{
|
|
serverId: 's1',
|
|
trackId: 't1',
|
|
factKind: 'bpm',
|
|
sourceKind: 'analysis',
|
|
sourceId: 'other',
|
|
valueInt: 110,
|
|
confidence: 0.5,
|
|
fetchedAt: 1,
|
|
},
|
|
],
|
|
120,
|
|
);
|
|
expect(parsed.measuredBpm).toBe(128);
|
|
expect(parsed.serverBpm).toBe(120);
|
|
expect(resolveQueueBpm(parsed)).toBe(128);
|
|
});
|
|
});
|
|
|
|
describe('resolveQueueBpm', () => {
|
|
it('prefers measured analysis bpm over tag', () => {
|
|
expect(resolveQueueBpm({ serverBpm: 120, measuredBpm: 128, moodLabels: [] })).toBe(128);
|
|
});
|
|
|
|
it('falls back to tag bpm when no analysis fact', () => {
|
|
expect(resolveQueueBpm({ serverBpm: 120, measuredBpm: null, moodLabels: [] })).toBe(120);
|
|
});
|
|
|
|
it('falls back to measured when tag bpm missing', () => {
|
|
expect(resolveQueueBpm({ serverBpm: null, measuredBpm: 128, moodLabels: [] })).toBe(128);
|
|
});
|
|
});
|
|
|
|
describe('resolveDisplayBpm', () => {
|
|
it('ignores zero tag bpm and uses measured', () => {
|
|
expect(resolveDisplayBpm(0, 132)).toBe(132);
|
|
});
|
|
});
|
|
|
|
describe('formatters', () => {
|
|
it('formats bpm for tech row', () => {
|
|
expect(formatQueueBpmTech({ serverBpm: 120, measuredBpm: 128, moodLabels: [] }, t)).toBe('128 BPM');
|
|
});
|
|
|
|
it('localizes mood labels without weights', () => {
|
|
expect(formatQueueMoodLabels(['calm', 'peaceful'], t)).toBe('Calm · Peaceful');
|
|
});
|
|
});
|
|
|
|
describe('topMoodLabelIds', () => {
|
|
it('returns at most two distinct cluster labels from valence/arousal', () => {
|
|
const labels = topMoodLabelIds(0.4, 0.75);
|
|
expect(labels.includes('happy') && labels.includes('excited')).toBe(false);
|
|
expect(labels.length).toBeLessThanOrEqual(2);
|
|
});
|
|
});
|
|
|
|
describe('distinct mood tag picking', () => {
|
|
it('never keeps both happy and excited from raw scores', () => {
|
|
expect(topDistinctOximediaMoodTagIds({ calm: 0.52, happy: 0.9, excited: 0.5 })).toEqual(['happy', 'calm']);
|
|
});
|
|
|
|
it('sorts by score descending with id tie-break', () => {
|
|
expect(topOximediaMoodTagIds({ calm: 0.2, happy: 0.9, excited: 0.5 })).toEqual([
|
|
'happy',
|
|
'excited',
|
|
'calm',
|
|
]);
|
|
});
|
|
});
|
|
|
|
describe('deriveMoodScores', () => {
|
|
it('delegates to soft valence/arousal scoring', () => {
|
|
const scores = deriveMoodScores(0.55, 0.42);
|
|
expect(topDistinctOximediaMoodTagIds(scores, 2).some(id => id === 'calm' || id === 'peaceful')).toBe(true);
|
|
});
|
|
});
|