feat(api): My Wave sessions with a Go fallback and wave metrics (M4)
- /wave/options, POST /wave/sessions (activity, mood, seed), /next with reactions, PATCH to switch the context on the fly, DELETE - the recommender is called with an 800 ms budget; on failure the api serves a fallback wave of likes, favourite artists and random available tracks with the same dislike / recent / served filters - every served track is an impression with its source and model; wave events (context_type wave) set its outcome, reactions win - library status shows the analysis queue and 7-day wave metrics: listen-through, early skip and like rate Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
1 parent
ef29b85320
commit
3908814cda
13 files changed
+1811
-162
No files matched your search
+215
-1
@@ -17,6 +17,7 @@ tags:
|
|||||||
- name: search
|
- name: search
|
||||||
- name: playback
|
- name: playback
|
||||||
- name: collection
|
- name: collection
|
||||||
|
- name: wave
|
||||||
security:
|
security:
|
||||||
- bearerAuth: []
|
- bearerAuth: []
|
||||||
paths:
|
paths:
|
||||||
@@ -974,6 +975,93 @@ paths:
|
|||||||
description: Снято
|
description: Снято
|
||||||
default:
|
default:
|
||||||
$ref: "#/components/responses/Problem"
|
$ref: "#/components/responses/Problem"
|
||||||
|
/api/v1/wave/options:
|
||||||
|
get:
|
||||||
|
operationId: getWaveOptions
|
||||||
|
tags: [wave]
|
||||||
|
summary: Занятия и настроения (ключи для i18n и иконки)
|
||||||
|
responses:
|
||||||
|
"200":
|
||||||
|
description: Варианты
|
||||||
|
content:
|
||||||
|
application/json:
|
||||||
|
schema:
|
||||||
|
$ref: "#/components/schemas/WaveOptions"
|
||||||
|
default:
|
||||||
|
$ref: "#/components/responses/Problem"
|
||||||
|
/api/v1/wave/sessions:
|
||||||
|
post:
|
||||||
|
operationId: startWave
|
||||||
|
tags: [wave]
|
||||||
|
summary: Начать «Мою волну»
|
||||||
|
requestBody:
|
||||||
|
required: false
|
||||||
|
content:
|
||||||
|
application/json:
|
||||||
|
schema:
|
||||||
|
$ref: "#/components/schemas/WaveStart"
|
||||||
|
responses:
|
||||||
|
"201":
|
||||||
|
description: Сессия и первая пачка
|
||||||
|
content:
|
||||||
|
application/json:
|
||||||
|
schema:
|
||||||
|
$ref: "#/components/schemas/WaveBatch"
|
||||||
|
default:
|
||||||
|
$ref: "#/components/responses/Problem"
|
||||||
|
/api/v1/wave/sessions/{id}:
|
||||||
|
parameters:
|
||||||
|
- $ref: "#/components/parameters/EntityId"
|
||||||
|
patch:
|
||||||
|
operationId: updateWave
|
||||||
|
tags: [wave]
|
||||||
|
summary: Сменить занятие / настроение на лету — пачка пересобирается
|
||||||
|
requestBody:
|
||||||
|
required: true
|
||||||
|
content:
|
||||||
|
application/json:
|
||||||
|
schema:
|
||||||
|
$ref: "#/components/schemas/WaveContext"
|
||||||
|
responses:
|
||||||
|
"200":
|
||||||
|
description: Новая пачка
|
||||||
|
content:
|
||||||
|
application/json:
|
||||||
|
schema:
|
||||||
|
$ref: "#/components/schemas/WaveBatch"
|
||||||
|
default:
|
||||||
|
$ref: "#/components/responses/Problem"
|
||||||
|
delete:
|
||||||
|
operationId: endWave
|
||||||
|
tags: [wave]
|
||||||
|
summary: Завершить сессию волны
|
||||||
|
responses:
|
||||||
|
"204":
|
||||||
|
description: Завершена
|
||||||
|
default:
|
||||||
|
$ref: "#/components/responses/Problem"
|
||||||
|
/api/v1/wave/sessions/{id}/next:
|
||||||
|
parameters:
|
||||||
|
- $ref: "#/components/parameters/EntityId"
|
||||||
|
post:
|
||||||
|
operationId: nextWave
|
||||||
|
tags: [wave]
|
||||||
|
summary: Следующая пачка с учётом реакций на выданные треки
|
||||||
|
requestBody:
|
||||||
|
required: false
|
||||||
|
content:
|
||||||
|
application/json:
|
||||||
|
schema:
|
||||||
|
$ref: "#/components/schemas/WaveNext"
|
||||||
|
responses:
|
||||||
|
"200":
|
||||||
|
description: Пачка
|
||||||
|
content:
|
||||||
|
application/json:
|
||||||
|
schema:
|
||||||
|
$ref: "#/components/schemas/WaveBatch"
|
||||||
|
default:
|
||||||
|
$ref: "#/components/responses/Problem"
|
||||||
components:
|
components:
|
||||||
parameters:
|
parameters:
|
||||||
SourceId:
|
SourceId:
|
||||||
@@ -1566,8 +1654,12 @@ components:
|
|||||||
nullable: true
|
nullable: true
|
||||||
LibraryStatus:
|
LibraryStatus:
|
||||||
type: object
|
type: object
|
||||||
required: [artists, albums, tracks, files, missing_files, file_errors, sources]
|
required: [artists, albums, tracks, files, missing_files, file_errors, sources, analysis, wave]
|
||||||
properties:
|
properties:
|
||||||
|
analysis:
|
||||||
|
$ref: "#/components/schemas/AnalysisStatus"
|
||||||
|
wave:
|
||||||
|
$ref: "#/components/schemas/WaveMetrics"
|
||||||
artists:
|
artists:
|
||||||
type: integer
|
type: integer
|
||||||
albums:
|
albums:
|
||||||
@@ -2022,6 +2114,128 @@ components:
|
|||||||
properties:
|
properties:
|
||||||
reaction:
|
reaction:
|
||||||
$ref: "#/components/schemas/Reaction"
|
$ref: "#/components/schemas/Reaction"
|
||||||
|
WaveOption:
|
||||||
|
type: object
|
||||||
|
required: [key, icon]
|
||||||
|
properties:
|
||||||
|
key:
|
||||||
|
type: string
|
||||||
|
example: running
|
||||||
|
icon:
|
||||||
|
type: string
|
||||||
|
description: Имя иконки Material Symbols
|
||||||
|
WaveOptions:
|
||||||
|
type: object
|
||||||
|
required: [activities, moods]
|
||||||
|
properties:
|
||||||
|
activities:
|
||||||
|
type: array
|
||||||
|
items:
|
||||||
|
$ref: "#/components/schemas/WaveOption"
|
||||||
|
moods:
|
||||||
|
type: array
|
||||||
|
items:
|
||||||
|
$ref: "#/components/schemas/WaveOption"
|
||||||
|
WaveContext:
|
||||||
|
type: object
|
||||||
|
properties:
|
||||||
|
activity:
|
||||||
|
type: string
|
||||||
|
nullable: true
|
||||||
|
mood:
|
||||||
|
type: string
|
||||||
|
nullable: true
|
||||||
|
WaveStart:
|
||||||
|
type: object
|
||||||
|
properties:
|
||||||
|
activity:
|
||||||
|
type: string
|
||||||
|
nullable: true
|
||||||
|
mood:
|
||||||
|
type: string
|
||||||
|
nullable: true
|
||||||
|
seed:
|
||||||
|
type: object
|
||||||
|
required: [type, id]
|
||||||
|
properties:
|
||||||
|
type:
|
||||||
|
type: string
|
||||||
|
enum: [track, album, artist]
|
||||||
|
id:
|
||||||
|
type: string
|
||||||
|
format: uuid
|
||||||
|
WaveFeedback:
|
||||||
|
type: object
|
||||||
|
required: [track_id, outcome]
|
||||||
|
properties:
|
||||||
|
track_id:
|
||||||
|
type: string
|
||||||
|
format: uuid
|
||||||
|
outcome:
|
||||||
|
type: string
|
||||||
|
enum: [complete, skip, skip_early, like, dislike]
|
||||||
|
WaveNext:
|
||||||
|
type: object
|
||||||
|
properties:
|
||||||
|
feedback:
|
||||||
|
type: array
|
||||||
|
maxItems: 50
|
||||||
|
items:
|
||||||
|
$ref: "#/components/schemas/WaveFeedback"
|
||||||
|
WaveBatch:
|
||||||
|
type: object
|
||||||
|
required: [session_id, activity, mood, tracks, fallback]
|
||||||
|
properties:
|
||||||
|
session_id:
|
||||||
|
type: string
|
||||||
|
format: uuid
|
||||||
|
activity:
|
||||||
|
type: string
|
||||||
|
nullable: true
|
||||||
|
mood:
|
||||||
|
type: string
|
||||||
|
nullable: true
|
||||||
|
tracks:
|
||||||
|
type: array
|
||||||
|
items:
|
||||||
|
$ref: "#/components/schemas/Track"
|
||||||
|
fallback:
|
||||||
|
type: boolean
|
||||||
|
description: Рекомендатель недоступен — пачка собрана упрощённо (лайки, любимые исполнители)
|
||||||
|
AnalysisStatus:
|
||||||
|
type: object
|
||||||
|
required: [queued, running, done, failed, analyzer_ver]
|
||||||
|
properties:
|
||||||
|
queued:
|
||||||
|
type: integer
|
||||||
|
running:
|
||||||
|
type: integer
|
||||||
|
done:
|
||||||
|
type: integer
|
||||||
|
failed:
|
||||||
|
type: integer
|
||||||
|
analyzer_ver:
|
||||||
|
type: string
|
||||||
|
nullable: true
|
||||||
|
WaveMetrics:
|
||||||
|
type: object
|
||||||
|
required: [served, listen_through_rate, early_skip_rate, like_rate, sessions]
|
||||||
|
description: Метрики волны за 7 дней
|
||||||
|
properties:
|
||||||
|
served:
|
||||||
|
type: integer
|
||||||
|
listen_through_rate:
|
||||||
|
type: number
|
||||||
|
nullable: true
|
||||||
|
early_skip_rate:
|
||||||
|
type: number
|
||||||
|
nullable: true
|
||||||
|
like_rate:
|
||||||
|
type: number
|
||||||
|
nullable: true
|
||||||
|
description: Лайков на 100 треков
|
||||||
|
sessions:
|
||||||
|
type: integer
|
||||||
Session:
|
Session:
|
||||||
type: object
|
type: object
|
||||||
required: [id, device_name, client_type, created_at, last_used_at, current]
|
required: [id, device_name, client_type, created_at, last_used_at, current]
|
||||||
|
|||||||
@@ -809,6 +809,79 @@ export interface paths {
|
|||||||
patch?: never;
|
patch?: never;
|
||||||
trace?: never;
|
trace?: never;
|
||||||
};
|
};
|
||||||
|
"/api/v1/wave/options": {
|
||||||
|
parameters: {
|
||||||
|
query?: never;
|
||||||
|
header?: never;
|
||||||
|
path?: never;
|
||||||
|
cookie?: never;
|
||||||
|
};
|
||||||
|
/** Занятия и настроения (ключи для i18n и иконки) */
|
||||||
|
get: operations["getWaveOptions"];
|
||||||
|
put?: never;
|
||||||
|
post?: never;
|
||||||
|
delete?: never;
|
||||||
|
options?: never;
|
||||||
|
head?: never;
|
||||||
|
patch?: never;
|
||||||
|
trace?: never;
|
||||||
|
};
|
||||||
|
"/api/v1/wave/sessions": {
|
||||||
|
parameters: {
|
||||||
|
query?: never;
|
||||||
|
header?: never;
|
||||||
|
path?: never;
|
||||||
|
cookie?: never;
|
||||||
|
};
|
||||||
|
get?: never;
|
||||||
|
put?: never;
|
||||||
|
/** Начать «Мою волну» */
|
||||||
|
post: operations["startWave"];
|
||||||
|
delete?: never;
|
||||||
|
options?: never;
|
||||||
|
head?: never;
|
||||||
|
patch?: never;
|
||||||
|
trace?: never;
|
||||||
|
};
|
||||||
|
"/api/v1/wave/sessions/{id}": {
|
||||||
|
parameters: {
|
||||||
|
query?: never;
|
||||||
|
header?: never;
|
||||||
|
path: {
|
||||||
|
id: components["parameters"]["EntityId"];
|
||||||
|
};
|
||||||
|
cookie?: never;
|
||||||
|
};
|
||||||
|
get?: never;
|
||||||
|
put?: never;
|
||||||
|
post?: never;
|
||||||
|
/** Завершить сессию волны */
|
||||||
|
delete: operations["endWave"];
|
||||||
|
options?: never;
|
||||||
|
head?: never;
|
||||||
|
/** Сменить занятие / настроение на лету — пачка пересобирается */
|
||||||
|
patch: operations["updateWave"];
|
||||||
|
trace?: never;
|
||||||
|
};
|
||||||
|
"/api/v1/wave/sessions/{id}/next": {
|
||||||
|
parameters: {
|
||||||
|
query?: never;
|
||||||
|
header?: never;
|
||||||
|
path: {
|
||||||
|
id: components["parameters"]["EntityId"];
|
||||||
|
};
|
||||||
|
cookie?: never;
|
||||||
|
};
|
||||||
|
get?: never;
|
||||||
|
put?: never;
|
||||||
|
/** Следующая пачка с учётом реакций на выданные треки */
|
||||||
|
post: operations["nextWave"];
|
||||||
|
delete?: never;
|
||||||
|
options?: never;
|
||||||
|
head?: never;
|
||||||
|
patch?: never;
|
||||||
|
trace?: never;
|
||||||
|
};
|
||||||
}
|
}
|
||||||
export type webhooks = Record<string, never>;
|
export type webhooks = Record<string, never>;
|
||||||
export interface components {
|
export interface components {
|
||||||
@@ -1098,6 +1171,8 @@ export interface components {
|
|||||||
error: string | null;
|
error: string | null;
|
||||||
};
|
};
|
||||||
LibraryStatus: {
|
LibraryStatus: {
|
||||||
|
analysis: components["schemas"]["AnalysisStatus"];
|
||||||
|
wave: components["schemas"]["WaveMetrics"];
|
||||||
artists: number;
|
artists: number;
|
||||||
albums: number;
|
albums: number;
|
||||||
tracks: number;
|
tracks: number;
|
||||||
@@ -1306,6 +1381,64 @@ export interface components {
|
|||||||
ReactionInput: {
|
ReactionInput: {
|
||||||
reaction: components["schemas"]["Reaction"];
|
reaction: components["schemas"]["Reaction"];
|
||||||
};
|
};
|
||||||
|
WaveOption: {
|
||||||
|
/** @example running */
|
||||||
|
key: string;
|
||||||
|
/** @description Имя иконки Material Symbols */
|
||||||
|
icon: string;
|
||||||
|
};
|
||||||
|
WaveOptions: {
|
||||||
|
activities: components["schemas"]["WaveOption"][];
|
||||||
|
moods: components["schemas"]["WaveOption"][];
|
||||||
|
};
|
||||||
|
WaveContext: {
|
||||||
|
activity?: string | null;
|
||||||
|
mood?: string | null;
|
||||||
|
};
|
||||||
|
WaveStart: {
|
||||||
|
activity?: string | null;
|
||||||
|
mood?: string | null;
|
||||||
|
seed?: {
|
||||||
|
/** @enum {string} */
|
||||||
|
type: "track" | "album" | "artist";
|
||||||
|
/** Format: uuid */
|
||||||
|
id: string;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
WaveFeedback: {
|
||||||
|
/** Format: uuid */
|
||||||
|
track_id: string;
|
||||||
|
/** @enum {string} */
|
||||||
|
outcome: "complete" | "skip" | "skip_early" | "like" | "dislike";
|
||||||
|
};
|
||||||
|
WaveNext: {
|
||||||
|
feedback?: components["schemas"]["WaveFeedback"][];
|
||||||
|
};
|
||||||
|
WaveBatch: {
|
||||||
|
/** Format: uuid */
|
||||||
|
session_id: string;
|
||||||
|
activity: string | null;
|
||||||
|
mood: string | null;
|
||||||
|
tracks: components["schemas"]["Track"][];
|
||||||
|
/** @description Рекомендатель недоступен — пачка собрана упрощённо (лайки, любимые исполнители) */
|
||||||
|
fallback: boolean;
|
||||||
|
};
|
||||||
|
AnalysisStatus: {
|
||||||
|
queued: number;
|
||||||
|
running: number;
|
||||||
|
done: number;
|
||||||
|
failed: number;
|
||||||
|
analyzer_ver: string | null;
|
||||||
|
};
|
||||||
|
/** @description Метрики волны за 7 дней */
|
||||||
|
WaveMetrics: {
|
||||||
|
served: number;
|
||||||
|
listen_through_rate: number | null;
|
||||||
|
early_skip_rate: number | null;
|
||||||
|
/** @description Лайков на 100 треков */
|
||||||
|
like_rate: number | null;
|
||||||
|
sessions: number;
|
||||||
|
};
|
||||||
Session: {
|
Session: {
|
||||||
/** Format: uuid */
|
/** Format: uuid */
|
||||||
id: string;
|
id: string;
|
||||||
@@ -2580,4 +2713,125 @@ export interface operations {
|
|||||||
default: components["responses"]["Problem"];
|
default: components["responses"]["Problem"];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
getWaveOptions: {
|
||||||
|
parameters: {
|
||||||
|
query?: never;
|
||||||
|
header?: never;
|
||||||
|
path?: never;
|
||||||
|
cookie?: never;
|
||||||
|
};
|
||||||
|
requestBody?: never;
|
||||||
|
responses: {
|
||||||
|
/** @description Варианты */
|
||||||
|
200: {
|
||||||
|
headers: {
|
||||||
|
[name: string]: unknown;
|
||||||
|
};
|
||||||
|
content: {
|
||||||
|
"application/json": components["schemas"]["WaveOptions"];
|
||||||
|
};
|
||||||
|
};
|
||||||
|
default: components["responses"]["Problem"];
|
||||||
|
};
|
||||||
|
};
|
||||||
|
startWave: {
|
||||||
|
parameters: {
|
||||||
|
query?: never;
|
||||||
|
header?: never;
|
||||||
|
path?: never;
|
||||||
|
cookie?: never;
|
||||||
|
};
|
||||||
|
requestBody?: {
|
||||||
|
content: {
|
||||||
|
"application/json": components["schemas"]["WaveStart"];
|
||||||
|
};
|
||||||
|
};
|
||||||
|
responses: {
|
||||||
|
/** @description Сессия и первая пачка */
|
||||||
|
201: {
|
||||||
|
headers: {
|
||||||
|
[name: string]: unknown;
|
||||||
|
};
|
||||||
|
content: {
|
||||||
|
"application/json": components["schemas"]["WaveBatch"];
|
||||||
|
};
|
||||||
|
};
|
||||||
|
default: components["responses"]["Problem"];
|
||||||
|
};
|
||||||
|
};
|
||||||
|
endWave: {
|
||||||
|
parameters: {
|
||||||
|
query?: never;
|
||||||
|
header?: never;
|
||||||
|
path: {
|
||||||
|
id: components["parameters"]["EntityId"];
|
||||||
|
};
|
||||||
|
cookie?: never;
|
||||||
|
};
|
||||||
|
requestBody?: never;
|
||||||
|
responses: {
|
||||||
|
/** @description Завершена */
|
||||||
|
204: {
|
||||||
|
headers: {
|
||||||
|
[name: string]: unknown;
|
||||||
|
};
|
||||||
|
content?: never;
|
||||||
|
};
|
||||||
|
default: components["responses"]["Problem"];
|
||||||
|
};
|
||||||
|
};
|
||||||
|
updateWave: {
|
||||||
|
parameters: {
|
||||||
|
query?: never;
|
||||||
|
header?: never;
|
||||||
|
path: {
|
||||||
|
id: components["parameters"]["EntityId"];
|
||||||
|
};
|
||||||
|
cookie?: never;
|
||||||
|
};
|
||||||
|
requestBody: {
|
||||||
|
content: {
|
||||||
|
"application/json": components["schemas"]["WaveContext"];
|
||||||
|
};
|
||||||
|
};
|
||||||
|
responses: {
|
||||||
|
/** @description Новая пачка */
|
||||||
|
200: {
|
||||||
|
headers: {
|
||||||
|
[name: string]: unknown;
|
||||||
|
};
|
||||||
|
content: {
|
||||||
|
"application/json": components["schemas"]["WaveBatch"];
|
||||||
|
};
|
||||||
|
};
|
||||||
|
default: components["responses"]["Problem"];
|
||||||
|
};
|
||||||
|
};
|
||||||
|
nextWave: {
|
||||||
|
parameters: {
|
||||||
|
query?: never;
|
||||||
|
header?: never;
|
||||||
|
path: {
|
||||||
|
id: components["parameters"]["EntityId"];
|
||||||
|
};
|
||||||
|
cookie?: never;
|
||||||
|
};
|
||||||
|
requestBody?: {
|
||||||
|
content: {
|
||||||
|
"application/json": components["schemas"]["WaveNext"];
|
||||||
|
};
|
||||||
|
};
|
||||||
|
responses: {
|
||||||
|
/** @description Пачка */
|
||||||
|
200: {
|
||||||
|
headers: {
|
||||||
|
[name: string]: unknown;
|
||||||
|
};
|
||||||
|
content: {
|
||||||
|
"application/json": components["schemas"]["WaveBatch"];
|
||||||
|
};
|
||||||
|
};
|
||||||
|
default: components["responses"]["Problem"];
|
||||||
|
};
|
||||||
|
};
|
||||||
}
|
}
|
||||||
@@ -6,6 +6,7 @@ import (
|
|||||||
"crypto/ed25519"
|
"crypto/ed25519"
|
||||||
"fmt"
|
"fmt"
|
||||||
"log/slog"
|
"log/slog"
|
||||||
|
"net/http"
|
||||||
"os"
|
"os"
|
||||||
"os/signal"
|
"os/signal"
|
||||||
"path/filepath"
|
"path/filepath"
|
||||||
@@ -28,6 +29,7 @@ import (
|
|||||||
"pipu/api/internal/search"
|
"pipu/api/internal/search"
|
||||||
"pipu/api/internal/server"
|
"pipu/api/internal/server"
|
||||||
"pipu/api/internal/system"
|
"pipu/api/internal/system"
|
||||||
|
"pipu/api/internal/wave"
|
||||||
)
|
)
|
||||||
|
|
||||||
func main() {
|
func main() {
|
||||||
@@ -140,6 +142,8 @@ func run() error {
|
|||||||
Library: library.NewHandler(libSvc, libStore, dto, covers, cfg.XAccel),
|
Library: library.NewHandler(libSvc, libStore, dto, covers, cfg.XAccel),
|
||||||
Search: search.NewHandler(meili, libStore, indexer, dto, log),
|
Search: search.NewHandler(meili, libStore, indexer, dto, log),
|
||||||
Playback: pb,
|
Playback: pb,
|
||||||
|
Wave: wave.NewHandler(pool, &wave.Recommender{URL: cfg.RecommenderURL, Token: cfg.InternalToken,
|
||||||
|
Client: &http.Client{}}, libStore, func() library.DTO { return dto }, log),
|
||||||
}))
|
}))
|
||||||
log.Info("starting", "version", buildinfo.Version)
|
log.Info("starting", "version", buildinfo.Version)
|
||||||
return httpx.Serve(ctx, log, srv, cfg.ShutdownTimeout)
|
return httpx.Serve(ctx, log, srv, cfg.ShutdownTimeout)
|
||||||
|
|||||||
File diff suppressed because it is too large.
Load diff
@@ -261,6 +261,14 @@ func (h *Handler) GetLibraryStatus(ctx context.Context, _ gen.GetLibraryStatusRe
|
|||||||
out := gen.GetLibraryStatus200JSONResponse{
|
out := gen.GetLibraryStatus200JSONResponse{
|
||||||
Artists: int(c.Artists), Albums: int(c.Albums), Tracks: int(c.Tracks), Files: int(c.Files),
|
Artists: int(c.Artists), Albums: int(c.Albums), Tracks: int(c.Tracks), Files: int(c.Files),
|
||||||
MissingFiles: int(c.Missing), FileErrors: int(c.Errors), Sources: []gen.SourceStatusItem{},
|
MissingFiles: int(c.Missing), FileErrors: int(c.Errors), Sources: []gen.SourceStatusItem{},
|
||||||
|
Analysis: gen.AnalysisStatus{
|
||||||
|
Queued: st.Analysis.Queued, Running: st.Analysis.Running, Done: st.Analysis.Done,
|
||||||
|
Failed: st.Analysis.Failed, AnalyzerVer: st.Analysis.AnalyzerVer,
|
||||||
|
},
|
||||||
|
Wave: gen.WaveMetrics{
|
||||||
|
Served: st.Wave.Served, Sessions: st.Wave.Sessions, ListenThroughRate: st.Wave.ListenThrough,
|
||||||
|
EarlySkipRate: st.Wave.EarlySkip, LikeRate: st.Wave.LikeRate,
|
||||||
|
},
|
||||||
}
|
}
|
||||||
for _, s := range st.Sources {
|
for _, s := range st.Sources {
|
||||||
dto := h.sourceDTO(s)
|
dto := h.sourceDTO(s)
|
||||||
|
|||||||
@@ -576,8 +576,10 @@ func (s *Service) startScan(src Source, full bool) error {
|
|||||||
|
|
||||||
// Status — состояние библиотеки (admin, moderator).
|
// Status — состояние библиотеки (admin, moderator).
|
||||||
type Status struct {
|
type Status struct {
|
||||||
Counts Counts
|
Counts Counts
|
||||||
Sources []Source
|
Sources []Source
|
||||||
|
Analysis AnalysisCounts
|
||||||
|
Wave WaveMetrics
|
||||||
}
|
}
|
||||||
|
|
||||||
// Status собирает счётчики и состояние источников.
|
// Status собирает счётчики и состояние источников.
|
||||||
@@ -593,7 +595,15 @@ func (s *Service) Status(ctx context.Context) (Status, error) {
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
return Status{}, err
|
return Status{}, err
|
||||||
}
|
}
|
||||||
return Status{Counts: c, Sources: sources}, nil
|
analysis, err := s.store.AnalysisCounts(ctx)
|
||||||
|
if err != nil {
|
||||||
|
return Status{}, err
|
||||||
|
}
|
||||||
|
wave, err := s.store.WaveMetrics(ctx)
|
||||||
|
if err != nil {
|
||||||
|
return Status{}, err
|
||||||
|
}
|
||||||
|
return Status{Counts: c, Sources: sources, Analysis: analysis, Wave: wave}, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// FileErrors — файлы с ошибками чтения.
|
// FileErrors — файлы с ошибками чтения.
|
||||||
|
|||||||
@@ -574,3 +574,52 @@ func (st *Store) AlbumCoverPath(ctx context.Context, albumID uuid.UUID) (*string
|
|||||||
}
|
}
|
||||||
return p, nil
|
return p, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// AnalysisCounts — состояние очереди аудиоанализа.
|
||||||
|
type AnalysisCounts struct {
|
||||||
|
Queued, Running, Done, Failed int
|
||||||
|
AnalyzerVer *string
|
||||||
|
}
|
||||||
|
|
||||||
|
// AnalysisCounts считает задачи анализа по статусам и текущую версию анализатора.
|
||||||
|
func (st *Store) AnalysisCounts(ctx context.Context) (AnalysisCounts, error) {
|
||||||
|
var c AnalysisCounts
|
||||||
|
err := st.pool.QueryRow(ctx, `
|
||||||
|
SELECT count(*) FILTER (WHERE status = 'queued'), count(*) FILTER (WHERE status = 'running'),
|
||||||
|
count(*) FILTER (WHERE status = 'done'), count(*) FILTER (WHERE status = 'failed'),
|
||||||
|
(SELECT analyzer_ver FROM track_features ORDER BY analyzed_at DESC LIMIT 1)
|
||||||
|
FROM analysis_jobs`).Scan(&c.Queued, &c.Running, &c.Done, &c.Failed, &c.AnalyzerVer)
|
||||||
|
if err != nil {
|
||||||
|
return AnalysisCounts{}, fmt.Errorf("library: analysis counts: %w", err)
|
||||||
|
}
|
||||||
|
return c, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// WaveMetrics — метрики волны за 7 дней (docs/recommendations.md#1-цели-и-как-измеряем-успех).
|
||||||
|
type WaveMetrics struct {
|
||||||
|
Served, Sessions int
|
||||||
|
ListenThrough, EarlySkip, LikeRate *float32
|
||||||
|
}
|
||||||
|
|
||||||
|
// WaveMetrics считает метрики по показам с известным исходом.
|
||||||
|
func (st *Store) WaveMetrics(ctx context.Context) (WaveMetrics, error) {
|
||||||
|
var (
|
||||||
|
m WaveMetrics
|
||||||
|
judged, through, early, liked int
|
||||||
|
)
|
||||||
|
err := st.pool.QueryRow(ctx, `
|
||||||
|
SELECT count(*), count(DISTINCT wave_session_id), count(outcome),
|
||||||
|
count(*) FILTER (WHERE outcome IN ('complete', 'like')),
|
||||||
|
count(*) FILTER (WHERE outcome IN ('skip_early', 'dislike')),
|
||||||
|
count(*) FILTER (WHERE outcome = 'like')
|
||||||
|
FROM wave_impressions WHERE served_at > now() - interval '7 days'`).
|
||||||
|
Scan(&m.Served, &m.Sessions, &judged, &through, &early, &liked)
|
||||||
|
if err != nil {
|
||||||
|
return WaveMetrics{}, fmt.Errorf("library: wave metrics: %w", err)
|
||||||
|
}
|
||||||
|
if judged > 0 {
|
||||||
|
lt, es, lr := float32(through)/float32(judged), float32(early)/float32(judged), float32(liked)*100/float32(judged)
|
||||||
|
m.ListenThrough, m.EarlySkip, m.LikeRate = <, &es, &lr
|
||||||
|
}
|
||||||
|
return m, nil
|
||||||
|
}
|
||||||
@@ -50,6 +50,8 @@ type API struct {
|
|||||||
TranscodeConcurrency int `env:"TRANSCODE_CONCURRENCY" envDefault:"0"`
|
TranscodeConcurrency int `env:"TRANSCODE_CONCURRENCY" envDefault:"0"`
|
||||||
TranscodeCacheLimitGB int `env:"TRANSCODE_CACHE_LIMIT_GB" envDefault:"50"`
|
TranscodeCacheLimitGB int `env:"TRANSCODE_CACHE_LIMIT_GB" envDefault:"50"`
|
||||||
|
|
||||||
|
RecommenderURL string `env:"RECOMMENDER_URL" envDefault:"http://recommender:8000"`
|
||||||
|
|
||||||
MeiliURL string `env:"MEILI_URL" envDefault:"http://meilisearch:7700"`
|
MeiliURL string `env:"MEILI_URL" envDefault:"http://meilisearch:7700"`
|
||||||
MeiliMasterKey string `env:"MEILI_MASTER_KEY"`
|
MeiliMasterKey string `env:"MEILI_MASTER_KEY"`
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -268,11 +268,20 @@ func (h *Handler) PostEvents(ctx context.Context, req gen.PostEventsRequestObjec
|
|||||||
if e.PlayedMs != nil {
|
if e.PlayedMs != nil {
|
||||||
played = *e.PlayedMs
|
played = *e.PlayedMs
|
||||||
}
|
}
|
||||||
if o := Judge(ev.Type, played, dur); o != (Outcome{}) {
|
o := Judge(ev.Type, played, dur)
|
||||||
|
if o != (Outcome{}) {
|
||||||
if err := h.store.ApplyOutcome(ctx, tx, p.UserID, ev, o); err != nil {
|
if err := h.store.ApplyOutcome(ctx, tx, p.UserID, ev, o); err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
if outcome := impressionOutcome(ev.Type, o); outcome != "" && ev.ContextType != nil && *ev.ContextType == "wave" &&
|
||||||
|
ev.ContextID != nil {
|
||||||
|
if sid, err := uuid.Parse(*ev.ContextID); err == nil {
|
||||||
|
if err := h.store.MarkImpression(ctx, tx, sid, ev.TrackID, outcome); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
if err := tx.Commit(ctx); err != nil {
|
if err := tx.Commit(ctx); err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
@@ -551,3 +560,18 @@ func (h *Handler) ClearTrackReaction(ctx context.Context, req gen.ClearTrackReac
|
|||||||
}
|
}
|
||||||
|
|
||||||
var _ library.Personalizer = (*Handler)(nil)
|
var _ library.Personalizer = (*Handler)(nil)
|
||||||
|
|
||||||
|
// impressionOutcome — исход показа волны по событию: complete | skip_early | skip | like | dislike.
|
||||||
|
func impressionOutcome(eventType string, o Outcome) string {
|
||||||
|
switch {
|
||||||
|
case eventType == "like" || eventType == "dislike":
|
||||||
|
return eventType
|
||||||
|
case o.Complete:
|
||||||
|
return "complete"
|
||||||
|
case o.EarlySkip:
|
||||||
|
return "skip_early"
|
||||||
|
case o.Skip:
|
||||||
|
return "skip"
|
||||||
|
}
|
||||||
|
return ""
|
||||||
|
}
|
||||||
@@ -348,3 +348,17 @@ func (st *Store) PutState(ctx context.Context, userID uuid.UUID, s State) (State
|
|||||||
|
|
||||||
// Begin открывает транзакцию.
|
// Begin открывает транзакцию.
|
||||||
func (st *Store) Begin(ctx context.Context) (pgx.Tx, error) { return st.pool.Begin(ctx) }
|
func (st *Store) Begin(ctx context.Context) (pgx.Tx, error) { return st.pool.Begin(ctx) }
|
||||||
|
|
||||||
|
// MarkImpression записывает исход показа трека в сессии волны (для метрик и обучения).
|
||||||
|
// Реакция (like / dislike) важнее исхода прослушивания и перезаписывает его.
|
||||||
|
func (st *Store) MarkImpression(ctx context.Context, tx pgx.Tx, sessionID, trackID uuid.UUID, outcome string) error {
|
||||||
|
_, err := tx.Exec(ctx, `
|
||||||
|
UPDATE wave_impressions SET outcome = $3
|
||||||
|
WHERE wave_session_id = $1 AND track_id = $2
|
||||||
|
AND (outcome IS NULL OR $3 IN ('like', 'dislike') OR outcome NOT IN ('like', 'dislike'))`,
|
||||||
|
sessionID, trackID, outcome)
|
||||||
|
if err != nil {
|
||||||
|
return fmt.Errorf("playback: impression: %w", err)
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
@@ -15,6 +15,7 @@ import (
|
|||||||
"pipu/api/internal/playback"
|
"pipu/api/internal/playback"
|
||||||
"pipu/api/internal/search"
|
"pipu/api/internal/search"
|
||||||
"pipu/api/internal/system"
|
"pipu/api/internal/system"
|
||||||
|
"pipu/api/internal/wave"
|
||||||
)
|
)
|
||||||
|
|
||||||
// Deps — модули, реализующие части контракта API.
|
// Deps — модули, реализующие части контракта API.
|
||||||
@@ -27,6 +28,8 @@ type Deps struct {
|
|||||||
Search *search.Handler
|
Search *search.Handler
|
||||||
// Playback — стрим, события, история, реакции, состояние плеера.
|
// Playback — стрим, события, история, реакции, состояние плеера.
|
||||||
Playback *playback.Handler
|
Playback *playback.Handler
|
||||||
|
// Wave — «Моя волна».
|
||||||
|
Wave *wave.Handler
|
||||||
// AuthService проверяет access-токены в middleware. nil — только для тестов служебных эндпоинтов.
|
// AuthService проверяет access-токены в middleware. nil — только для тестов служебных эндпоинтов.
|
||||||
AuthService *auth.Service
|
AuthService *auth.Service
|
||||||
}
|
}
|
||||||
@@ -40,6 +43,7 @@ type (
|
|||||||
libraryHandler = library.Handler
|
libraryHandler = library.Handler
|
||||||
searchHandler = search.Handler
|
searchHandler = search.Handler
|
||||||
playbackHandler = playback.Handler
|
playbackHandler = playback.Handler
|
||||||
|
waveHandler = wave.Handler
|
||||||
)
|
)
|
||||||
|
|
||||||
type handlers struct {
|
type handlers struct {
|
||||||
@@ -48,6 +52,7 @@ type handlers struct {
|
|||||||
*libraryHandler
|
*libraryHandler
|
||||||
*searchHandler
|
*searchHandler
|
||||||
*playbackHandler
|
*playbackHandler
|
||||||
|
*waveHandler
|
||||||
}
|
}
|
||||||
|
|
||||||
var _ gen.StrictServerInterface = handlers{}
|
var _ gen.StrictServerInterface = handlers{}
|
||||||
@@ -67,7 +72,7 @@ func NewRouter(d Deps) http.Handler {
|
|||||||
r.NotFound(httpx.NotFound)
|
r.NotFound(httpx.NotFound)
|
||||||
r.MethodNotAllowed(httpx.MethodNotAllowed)
|
r.MethodNotAllowed(httpx.MethodNotAllowed)
|
||||||
|
|
||||||
strict := gen.NewStrictHandlerWithOptions(handlers{systemHandler: d.System, authHandler: d.Auth, libraryHandler: d.Library, searchHandler: d.Search, playbackHandler: d.Playback},
|
strict := gen.NewStrictHandlerWithOptions(handlers{systemHandler: d.System, authHandler: d.Auth, libraryHandler: d.Library, searchHandler: d.Search, playbackHandler: d.Playback, waveHandler: d.Wave},
|
||||||
[]gen.StrictMiddlewareFunc{httpx.StrictRequest}, gen.StrictHTTPServerOptions{
|
[]gen.StrictMiddlewareFunc{httpx.StrictRequest}, gen.StrictHTTPServerOptions{
|
||||||
RequestErrorHandlerFunc: httpx.RequestError,
|
RequestErrorHandlerFunc: httpx.RequestError,
|
||||||
ResponseErrorHandlerFunc: httpx.ResponseError(log),
|
ResponseErrorHandlerFunc: httpx.ResponseError(log),
|
||||||
|
|||||||
@@ -0,0 +1,16 @@
|
|||||||
|
package wave
|
||||||
|
|
||||||
|
import (
|
||||||
|
"math/rand/v2"
|
||||||
|
"sort"
|
||||||
|
)
|
||||||
|
|
||||||
|
func shuffle[T any](in []T) []T {
|
||||||
|
out := append([]T(nil), in...)
|
||||||
|
rand.Shuffle(len(out), func(i, j int) { out[i], out[j] = out[j], out[i] })
|
||||||
|
return out
|
||||||
|
}
|
||||||
|
|
||||||
|
func stableSort[T any](s []T, less func(a, b T) bool) {
|
||||||
|
sort.SliceStable(s, func(i, j int) bool { return less(s[i], s[j]) })
|
||||||
|
}
|
||||||
@@ -0,0 +1,429 @@
|
|||||||
|
// Package wave — «Моя волна»: сессии, вызов рекомендателя и запасная волна на Go (docs/recommendations.md).
|
||||||
|
package wave
|
||||||
|
|
||||||
|
import (
|
||||||
|
"bytes"
|
||||||
|
"context"
|
||||||
|
"encoding/json"
|
||||||
|
"errors"
|
||||||
|
"fmt"
|
||||||
|
"log/slog"
|
||||||
|
"net/http"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"github.com/google/uuid"
|
||||||
|
"github.com/jackc/pgx/v5"
|
||||||
|
"github.com/jackc/pgx/v5/pgxpool"
|
||||||
|
|
||||||
|
"pipu/api/internal/api/gen"
|
||||||
|
"pipu/api/internal/auth"
|
||||||
|
"pipu/api/internal/library"
|
||||||
|
"pipu/api/internal/platform/apperr"
|
||||||
|
)
|
||||||
|
|
||||||
|
// BatchSize — треков в пачке волны.
|
||||||
|
const BatchSize = 5
|
||||||
|
|
||||||
|
// RecommenderTimeout — сколько ждать рекомендатель, прежде чем отдать запасную волну.
|
||||||
|
const RecommenderTimeout = 800 * time.Millisecond
|
||||||
|
|
||||||
|
// Занятия и настроения — ключи совпадают с contexts.yaml рекомендателя, тексты — в i18n клиента.
|
||||||
|
var (
|
||||||
|
activities = []gen.WaveOption{
|
||||||
|
{Key: "running", Icon: "directions_run"}, {Key: "workout", Icon: "fitness_center"},
|
||||||
|
{Key: "waking_up", Icon: "wb_sunny"}, {Key: "focus", Icon: "headphones"},
|
||||||
|
{Key: "commute", Icon: "directions_car"}, {Key: "chill", Icon: "weekend"}, {Key: "sleep", Icon: "bedtime"},
|
||||||
|
}
|
||||||
|
moods = []gen.WaveOption{
|
||||||
|
{Key: "energetic", Icon: "bolt"}, {Key: "happy", Icon: "sentiment_satisfied"},
|
||||||
|
{Key: "calm", Icon: "spa"}, {Key: "sad", Icon: "rainy"},
|
||||||
|
}
|
||||||
|
)
|
||||||
|
|
||||||
|
func known(list []gen.WaveOption, key *string) bool {
|
||||||
|
if key == nil || *key == "" {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
for _, o := range list {
|
||||||
|
if o.Key == *key {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
|
||||||
|
// Pick — трек, выбранный рекомендателем.
|
||||||
|
type Pick struct {
|
||||||
|
ID string `json:"id"`
|
||||||
|
Source string `json:"source"`
|
||||||
|
Score float64 `json:"score"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// Feedback — реакция на выданный трек.
|
||||||
|
type Feedback struct {
|
||||||
|
TrackID string `json:"track_id"`
|
||||||
|
Outcome string `json:"outcome"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// BatchRequest — запрос к рекомендателю.
|
||||||
|
type BatchRequest struct {
|
||||||
|
UserID string `json:"user_id"`
|
||||||
|
SessionID string `json:"session_id"`
|
||||||
|
Activity *string `json:"activity"`
|
||||||
|
Mood *string `json:"mood"`
|
||||||
|
Seed *Seed `json:"seed,omitempty"`
|
||||||
|
ExcludeIDs []string `json:"exclude_ids"`
|
||||||
|
Feedback []Feedback `json:"feedback"`
|
||||||
|
N int `json:"n"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// Seed — от чего запущена волна.
|
||||||
|
type Seed struct {
|
||||||
|
Type string `json:"type"`
|
||||||
|
ID string `json:"id"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// Recommender — клиент внутреннего API рекомендаций.
|
||||||
|
type Recommender struct {
|
||||||
|
URL string
|
||||||
|
Token string
|
||||||
|
Client *http.Client
|
||||||
|
}
|
||||||
|
|
||||||
|
// Batch запрашивает пачку.
|
||||||
|
func (r *Recommender) Batch(ctx context.Context, req BatchRequest) ([]Pick, string, error) {
|
||||||
|
raw, err := json.Marshal(req)
|
||||||
|
if err != nil {
|
||||||
|
return nil, "", err
|
||||||
|
}
|
||||||
|
ctx, cancel := context.WithTimeout(ctx, RecommenderTimeout)
|
||||||
|
defer cancel()
|
||||||
|
hr, err := http.NewRequestWithContext(ctx, http.MethodPost, r.URL+"/internal/wave/batch", bytes.NewReader(raw))
|
||||||
|
if err != nil {
|
||||||
|
return nil, "", err
|
||||||
|
}
|
||||||
|
hr.Header.Set("Authorization", "Bearer "+r.Token)
|
||||||
|
hr.Header.Set("Content-Type", "application/json")
|
||||||
|
res, err := r.Client.Do(hr)
|
||||||
|
if err != nil {
|
||||||
|
return nil, "", fmt.Errorf("recommender: %w", err)
|
||||||
|
}
|
||||||
|
defer func() { _ = res.Body.Close() }()
|
||||||
|
if res.StatusCode != http.StatusOK {
|
||||||
|
return nil, "", fmt.Errorf("recommender: status %d", res.StatusCode)
|
||||||
|
}
|
||||||
|
var out struct {
|
||||||
|
Tracks []Pick `json:"tracks"`
|
||||||
|
ModelVer string `json:"model_ver"`
|
||||||
|
}
|
||||||
|
if err := json.NewDecoder(res.Body).Decode(&out); err != nil {
|
||||||
|
return nil, "", fmt.Errorf("recommender: %w", err)
|
||||||
|
}
|
||||||
|
return out.Tracks, out.ModelVer, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// session — строка wave_sessions.
|
||||||
|
type session struct {
|
||||||
|
ID uuid.UUID
|
||||||
|
UserID uuid.UUID
|
||||||
|
Activity *string
|
||||||
|
Mood *string
|
||||||
|
SeedType *string
|
||||||
|
SeedID *uuid.UUID
|
||||||
|
Served int
|
||||||
|
Ended bool
|
||||||
|
}
|
||||||
|
|
||||||
|
// Handler реализует wave-часть gen.StrictServerInterface.
|
||||||
|
type Handler struct {
|
||||||
|
pool *pgxpool.Pool
|
||||||
|
rec *Recommender
|
||||||
|
catalog *library.Store
|
||||||
|
dto func() library.DTO
|
||||||
|
log *slog.Logger
|
||||||
|
}
|
||||||
|
|
||||||
|
// NewHandler создаёт обработчик.
|
||||||
|
func NewHandler(pool *pgxpool.Pool, rec *Recommender, catalog *library.Store, dto func() library.DTO, log *slog.Logger) *Handler {
|
||||||
|
return &Handler{pool: pool, rec: rec, catalog: catalog, dto: dto, log: log}
|
||||||
|
}
|
||||||
|
|
||||||
|
func principal(ctx context.Context) (auth.Principal, error) {
|
||||||
|
p, ok := auth.PrincipalFrom(ctx)
|
||||||
|
if !ok {
|
||||||
|
return auth.Principal{}, apperr.Unauthorized(auth.CodeUnauthorized, "not authenticated")
|
||||||
|
}
|
||||||
|
return p, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetWaveOptions реализует gen.StrictServerInterface.
|
||||||
|
func (h *Handler) GetWaveOptions(context.Context, gen.GetWaveOptionsRequestObject) (gen.GetWaveOptionsResponseObject, error) {
|
||||||
|
return gen.GetWaveOptions200JSONResponse{Activities: activities, Moods: moods}, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func validateContext(activity, mood *string) error {
|
||||||
|
if !known(activities, activity) {
|
||||||
|
return apperr.Validation("activity", "validation.wave_activity_invalid", "unknown activity", nil)
|
||||||
|
}
|
||||||
|
if !known(moods, mood) {
|
||||||
|
return apperr.Validation("mood", "validation.wave_mood_invalid", "unknown mood", nil)
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func emptyToNil(s *string) *string {
|
||||||
|
if s == nil || *s == "" {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
return s
|
||||||
|
}
|
||||||
|
|
||||||
|
// StartWave реализует gen.StrictServerInterface.
|
||||||
|
func (h *Handler) StartWave(ctx context.Context, req gen.StartWaveRequestObject) (gen.StartWaveResponseObject, error) {
|
||||||
|
p, err := principal(ctx)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
s := session{ID: uuid.Must(uuid.NewV7()), UserID: p.UserID}
|
||||||
|
if b := req.Body; b != nil {
|
||||||
|
s.Activity, s.Mood = emptyToNil(b.Activity), emptyToNil(b.Mood)
|
||||||
|
if b.Seed != nil {
|
||||||
|
t, id := string(b.Seed.Type), b.Seed.Id
|
||||||
|
s.SeedType, s.SeedID = &t, &id
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if err := validateContext(s.Activity, s.Mood); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
if _, err := h.pool.Exec(ctx, `
|
||||||
|
INSERT INTO wave_sessions (id, user_id, activity, mood, seed_type, seed_id) VALUES ($1, $2, $3, $4, $5, $6)`,
|
||||||
|
s.ID, s.UserID, s.Activity, s.Mood, s.SeedType, s.SeedID); err != nil {
|
||||||
|
return nil, fmt.Errorf("wave: start: %w", err)
|
||||||
|
}
|
||||||
|
out, err := h.serve(ctx, s, nil)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
return gen.StartWave201JSONResponse(out), nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (h *Handler) load(ctx context.Context, p auth.Principal, id uuid.UUID) (session, error) {
|
||||||
|
var s session
|
||||||
|
err := h.pool.QueryRow(ctx, `
|
||||||
|
SELECT id, user_id, activity, mood, seed_type, seed_id, tracks_served, ended_at IS NOT NULL
|
||||||
|
FROM wave_sessions WHERE id = $1 AND user_id = $2`, id, p.UserID).
|
||||||
|
Scan(&s.ID, &s.UserID, &s.Activity, &s.Mood, &s.SeedType, &s.SeedID, &s.Served, &s.Ended)
|
||||||
|
if errors.Is(err, pgx.ErrNoRows) {
|
||||||
|
return s, apperr.NotFound("wave.session_not_found", "wave session not found")
|
||||||
|
}
|
||||||
|
if err != nil {
|
||||||
|
return s, fmt.Errorf("wave: load: %w", err)
|
||||||
|
}
|
||||||
|
return s, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// NextWave реализует gen.StrictServerInterface.
|
||||||
|
func (h *Handler) NextWave(ctx context.Context, req gen.NextWaveRequestObject) (gen.NextWaveResponseObject, error) {
|
||||||
|
p, err := principal(ctx)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
s, err := h.load(ctx, p, req.Id)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
var fb []Feedback
|
||||||
|
if req.Body != nil && req.Body.Feedback != nil {
|
||||||
|
for _, f := range *req.Body.Feedback {
|
||||||
|
fb = append(fb, Feedback{TrackID: f.TrackId.String(), Outcome: string(f.Outcome)})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
out, err := h.serve(ctx, s, fb)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
return gen.NextWave200JSONResponse(out), nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// UpdateWave реализует gen.StrictServerInterface.
|
||||||
|
func (h *Handler) UpdateWave(ctx context.Context, req gen.UpdateWaveRequestObject) (gen.UpdateWaveResponseObject, error) {
|
||||||
|
p, err := principal(ctx)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
s, err := h.load(ctx, p, req.Id)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
s.Activity, s.Mood = emptyToNil(req.Body.Activity), emptyToNil(req.Body.Mood)
|
||||||
|
if err := validateContext(s.Activity, s.Mood); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
if _, err := h.pool.Exec(ctx, `UPDATE wave_sessions SET activity = $2, mood = $3 WHERE id = $1`,
|
||||||
|
s.ID, s.Activity, s.Mood); err != nil {
|
||||||
|
return nil, fmt.Errorf("wave: update: %w", err)
|
||||||
|
}
|
||||||
|
out, err := h.serve(ctx, s, nil)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
return gen.UpdateWave200JSONResponse(out), nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// EndWave реализует gen.StrictServerInterface.
|
||||||
|
func (h *Handler) EndWave(ctx context.Context, req gen.EndWaveRequestObject) (gen.EndWaveResponseObject, error) {
|
||||||
|
p, err := principal(ctx)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
if _, err := h.pool.Exec(ctx, `UPDATE wave_sessions SET ended_at = now() WHERE id = $1 AND user_id = $2 AND ended_at IS NULL`,
|
||||||
|
req.Id, p.UserID); err != nil {
|
||||||
|
return nil, fmt.Errorf("wave: end: %w", err)
|
||||||
|
}
|
||||||
|
return gen.EndWave204Response{}, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// serve собирает пачку (рекомендатель или запасная волна), пишет показы и отдаёт треки.
|
||||||
|
func (h *Handler) serve(ctx context.Context, s session, fb []Feedback) (gen.WaveBatch, error) {
|
||||||
|
served, err := h.servedIDs(ctx, s.ID)
|
||||||
|
if err != nil {
|
||||||
|
return gen.WaveBatch{}, err
|
||||||
|
}
|
||||||
|
req := BatchRequest{
|
||||||
|
UserID: s.UserID.String(), SessionID: s.ID.String(), Activity: s.Activity, Mood: s.Mood,
|
||||||
|
ExcludeIDs: served, Feedback: fb, N: BatchSize,
|
||||||
|
}
|
||||||
|
if s.SeedType != nil && s.SeedID != nil {
|
||||||
|
req.Seed = &Seed{Type: *s.SeedType, ID: s.SeedID.String()}
|
||||||
|
}
|
||||||
|
if req.Feedback == nil {
|
||||||
|
req.Feedback = []Feedback{}
|
||||||
|
}
|
||||||
|
picks, modelVer, err := h.rec.Batch(ctx, req)
|
||||||
|
fallback := false
|
||||||
|
if err != nil || len(picks) == 0 {
|
||||||
|
if err != nil {
|
||||||
|
h.log.WarnContext(ctx, "recommender unavailable, serving fallback wave", "err", err)
|
||||||
|
}
|
||||||
|
fallback, modelVer = true, "fallback"
|
||||||
|
if picks, err = h.fallback(ctx, s, served); err != nil {
|
||||||
|
return gen.WaveBatch{}, err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
ids := make([]uuid.UUID, 0, len(picks))
|
||||||
|
for _, p := range picks {
|
||||||
|
if id, err := uuid.Parse(p.ID); err == nil {
|
||||||
|
ids = append(ids, id)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
rows, err := h.catalog.TracksByIDs(ctx, ids)
|
||||||
|
if err != nil {
|
||||||
|
return gen.WaveBatch{}, err
|
||||||
|
}
|
||||||
|
tracks, err := h.dto().Tracks(ctx, rows)
|
||||||
|
if err != nil {
|
||||||
|
return gen.WaveBatch{}, err
|
||||||
|
}
|
||||||
|
if err := h.record(ctx, s, picks, modelVer); err != nil {
|
||||||
|
return gen.WaveBatch{}, err
|
||||||
|
}
|
||||||
|
return gen.WaveBatch{SessionId: s.ID, Activity: s.Activity, Mood: s.Mood, Tracks: tracks, Fallback: fallback}, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (h *Handler) servedIDs(ctx context.Context, sessionID uuid.UUID) ([]string, error) {
|
||||||
|
rows, err := h.pool.Query(ctx, `SELECT track_id::text FROM wave_impressions WHERE wave_session_id = $1`, sessionID)
|
||||||
|
if err != nil {
|
||||||
|
return nil, fmt.Errorf("wave: served: %w", err)
|
||||||
|
}
|
||||||
|
ids, err := pgx.CollectRows(rows, pgx.RowTo[string])
|
||||||
|
if ids == nil {
|
||||||
|
ids = []string{}
|
||||||
|
}
|
||||||
|
return ids, err
|
||||||
|
}
|
||||||
|
|
||||||
|
// record пишет показы (для метрик и будущего обучения ранжировщика).
|
||||||
|
func (h *Handler) record(ctx context.Context, s session, picks []Pick, modelVer string) error {
|
||||||
|
return pgx.BeginFunc(ctx, h.pool, func(tx pgx.Tx) error {
|
||||||
|
var pos int
|
||||||
|
if err := tx.QueryRow(ctx, `
|
||||||
|
UPDATE wave_sessions SET tracks_served = tracks_served + $2 WHERE id = $1 RETURNING tracks_served - $2`,
|
||||||
|
s.ID, len(picks)).Scan(&pos); err != nil {
|
||||||
|
return fmt.Errorf("wave: impressions: %w", err)
|
||||||
|
}
|
||||||
|
for i, p := range picks {
|
||||||
|
if _, err := tx.Exec(ctx, `
|
||||||
|
INSERT INTO wave_impressions (wave_session_id, position, track_id, candidate_source, score, model_ver)
|
||||||
|
VALUES ($1, $2, $3, $4, $5, $6) ON CONFLICT DO NOTHING`,
|
||||||
|
s.ID, pos+i, p.ID, p.Source, p.Score, modelVer); err != nil {
|
||||||
|
return fmt.Errorf("wave: impressions: %w", err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
// fallback — запасная волна без рекомендателя: лайки, любимые исполнители и случайные доступные треки,
|
||||||
|
// без дизлайков, недавно игравших и уже выданных; один трек исполнителя на пачку.
|
||||||
|
func (h *Handler) fallback(ctx context.Context, s session, served []string) ([]Pick, error) {
|
||||||
|
rows, err := h.pool.Query(ctx, `
|
||||||
|
WITH liked AS (
|
||||||
|
SELECT track_id FROM track_reactions WHERE user_id = $1 AND reaction = 'like'
|
||||||
|
), fav_artists AS (
|
||||||
|
SELECT DISTINCT ta.artist_id FROM track_artists ta JOIN liked l ON l.track_id = ta.track_id
|
||||||
|
), pool AS (
|
||||||
|
SELECT t.id,
|
||||||
|
COALESCE((SELECT ta.artist_id FROM track_artists ta WHERE ta.track_id = t.id ORDER BY ta.position LIMIT 1),
|
||||||
|
al.album_artist_id) AS artist_id,
|
||||||
|
CASE WHEN t.id IN (SELECT track_id FROM liked) THEN 'liked'
|
||||||
|
WHEN EXISTS (SELECT 1 FROM track_artists ta WHERE ta.track_id = t.id
|
||||||
|
AND ta.artist_id IN (SELECT artist_id FROM fav_artists)) THEN 'artist'
|
||||||
|
ELSE 'random' END AS source
|
||||||
|
FROM tracks t
|
||||||
|
JOIN albums al ON al.id = t.album_id
|
||||||
|
JOIN media_files f ON f.id = t.primary_file_id AND f.missing_since IS NULL
|
||||||
|
JOIN library_sources src ON src.id = f.source_id AND src.status = 'mounted'
|
||||||
|
WHERE NOT EXISTS (SELECT 1 FROM track_reactions r WHERE r.user_id = $1 AND r.track_id = t.id AND r.reaction = 'dislike')
|
||||||
|
AND NOT (t.id::text = ANY($2))
|
||||||
|
AND NOT EXISTS (SELECT 1 FROM play_events e WHERE e.user_id = $1 AND e.track_id = t.id
|
||||||
|
AND e.type = 'play_start' AND e.occurred_at > now() - interval '3 hours')
|
||||||
|
)
|
||||||
|
SELECT DISTINCT ON (artist_id) id::text, source FROM (
|
||||||
|
SELECT * FROM pool ORDER BY CASE source WHEN 'liked' THEN 0 WHEN 'artist' THEN 1 ELSE 2 END, random() LIMIT 200
|
||||||
|
) c
|
||||||
|
ORDER BY artist_id, random()
|
||||||
|
LIMIT 50`, s.UserID, served)
|
||||||
|
if err != nil {
|
||||||
|
return nil, fmt.Errorf("wave: fallback: %w", err)
|
||||||
|
}
|
||||||
|
picks, err := pgx.CollectRows(rows, func(r pgx.CollectableRow) (Pick, error) {
|
||||||
|
var p Pick
|
||||||
|
return p, r.Scan(&p.ID, &p.Source)
|
||||||
|
})
|
||||||
|
if err != nil {
|
||||||
|
return nil, fmt.Errorf("wave: fallback: %w", err)
|
||||||
|
}
|
||||||
|
// DISTINCT ON упорядочил по исполнителю — перемешиваем, предпочитая лайки и любимых исполнителей.
|
||||||
|
rank := map[string]int{"liked": 0, "artist": 1, "random": 2}
|
||||||
|
shuffled := shuffle(picks)
|
||||||
|
stableSort(shuffled, func(a, b Pick) bool { return rank[a.Source] < rank[b.Source] })
|
||||||
|
// Половина пачки — любимое, половина — случайное: запасная волна не должна быть одними лайками.
|
||||||
|
var out []Pick
|
||||||
|
var fav, rnd []Pick
|
||||||
|
for _, p := range shuffled {
|
||||||
|
if p.Source == "random" {
|
||||||
|
rnd = append(rnd, p)
|
||||||
|
} else {
|
||||||
|
fav = append(fav, p)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
for len(out) < BatchSize && (len(fav) > 0 || len(rnd) > 0) {
|
||||||
|
if len(fav) > 0 && (len(out)%2 == 0 || len(rnd) == 0) {
|
||||||
|
out, fav = append(out, fav[0]), fav[1:]
|
||||||
|
} else if len(rnd) > 0 {
|
||||||
|
out, rnd = append(out, rnd[0]), rnd[1:]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return out, nil
|
||||||
|
}
|
||||||
Reference in new issue
Block a user