Compare commits
10 Commits
prochains-
...
16b3fdabed
| Author | SHA1 | Date | |
|---|---|---|---|
| 16b3fdabed | |||
| eeee538fcd | |||
| c366ca5ce0 | |||
| 774cb799a2 | |||
| 6ae861ff54 | |||
| b74c6b0b40 | |||
| 4d8fa57ab2 | |||
| 36652ea2cc | |||
| 3b236d6af4 | |||
| 64ba7f9006 |
@@ -17,6 +17,12 @@ ANALYSIS_NUM_WORKERS=4
|
||||
ESSENTIA_MODELS_PATH=/app/models
|
||||
AUDIO_LIBRARY_PATH=/path/to/your/audio/library
|
||||
|
||||
# Authentication
|
||||
ADMIN_EMAIL=admin@example.com
|
||||
ADMIN_PASSWORD=changeme
|
||||
JWT_SECRET_KEY=your-super-secret-jwt-key-change-this-in-production
|
||||
JWT_EXPIRATION_HOURS=24
|
||||
|
||||
# Frontend
|
||||
# API URL accessed by the browser (use port 8001 since backend is mapped to 8001)
|
||||
# For production on a remote server, set this to your server's public URL
|
||||
|
||||
@@ -13,6 +13,60 @@ env:
|
||||
IMAGE_FRONTEND: audio-classifier-frontend
|
||||
|
||||
jobs:
|
||||
build-backend:
|
||||
name: Build Backend Image
|
||||
runs-on: ubuntu-latest
|
||||
|
||||
steps:
|
||||
- name: Checkout code
|
||||
uses: actions/checkout@v4
|
||||
with:
|
||||
fetch-depth: 0
|
||||
|
||||
- name: Set up Docker Buildx
|
||||
uses: docker/setup-buildx-action@v3
|
||||
|
||||
- name: Login to Gitea Container Registry
|
||||
uses: docker/login-action@v3
|
||||
with:
|
||||
registry: ${{ env.REGISTRY }}
|
||||
username: ${{ gitea.actor }}
|
||||
password: ${{ secrets.REGISTRY_TOKEN }}
|
||||
|
||||
- name: Determine version
|
||||
id: version
|
||||
run: |
|
||||
if [[ "${{ gitea.ref }}" == refs/tags/v* ]]; then
|
||||
echo "VERSION=${GITEA_REF#refs/tags/}" >> $GITHUB_OUTPUT
|
||||
else
|
||||
echo "VERSION=dev-$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
|
||||
fi
|
||||
|
||||
- name: Extract metadata
|
||||
id: meta
|
||||
uses: docker/metadata-action@v5
|
||||
with:
|
||||
images: ${{ env.REGISTRY }}/${{ gitea.repository_owner }}/${{ env.IMAGE_BACKEND }}
|
||||
tags: |
|
||||
type=semver,pattern={{version}}
|
||||
type=semver,pattern={{major}}.{{minor}}
|
||||
type=raw,value=latest,enable=${{ startsWith(gitea.ref, 'refs/tags/v') }}
|
||||
type=raw,value=dev,enable=${{ gitea.ref == 'refs/heads/main' }}
|
||||
type=sha,prefix=dev-,format=short,enable=${{ gitea.ref == 'refs/heads/main' }}
|
||||
|
||||
- name: Build and push backend
|
||||
uses: docker/build-push-action@v5
|
||||
with:
|
||||
context: .
|
||||
file: ./backend/Dockerfile
|
||||
push: true
|
||||
build-args: |
|
||||
VERSION=${{ steps.version.outputs.VERSION }}
|
||||
tags: ${{ steps.meta.outputs.tags }}
|
||||
labels: ${{ steps.meta.outputs.labels }}
|
||||
cache-from: type=registry,ref=${{ env.REGISTRY }}/${{ gitea.repository_owner }}/${{ env.IMAGE_BACKEND }}:buildcache
|
||||
cache-to: type=registry,ref=${{ env.REGISTRY }}/${{ gitea.repository_owner }}/${{ env.IMAGE_BACKEND }}:buildcache,mode=max
|
||||
|
||||
build-frontend:
|
||||
name: Build Frontend Image
|
||||
runs-on: ubuntu-latest
|
||||
@@ -23,25 +77,6 @@ jobs:
|
||||
with:
|
||||
fetch-depth: 0
|
||||
|
||||
- name: Download Essentia models (for context)
|
||||
run: |
|
||||
mkdir -p backend/models
|
||||
cd backend/models
|
||||
|
||||
# Download models (needed because frontend build context is root)
|
||||
curl -L -o discogs-effnet-bs64-1.pb \
|
||||
https://essentia.upf.edu/models/feature-extractors/discogs-effnet/discogs-effnet-bs64-1.pb
|
||||
curl -L -o genre_discogs400-discogs-effnet-1.pb \
|
||||
https://essentia.upf.edu/models/classification-heads/genre_discogs400/genre_discogs400-discogs-effnet-1.pb
|
||||
curl -L -o genre_discogs400-discogs-effnet-1.json \
|
||||
https://essentia.upf.edu/models/classification-heads/genre_discogs400/genre_discogs400-discogs-effnet-1.json
|
||||
curl -L -o mtg_jamendo_moodtheme-discogs-effnet-1.pb \
|
||||
https://essentia.upf.edu/models/classification-heads/mtg_jamendo_moodtheme/mtg_jamendo_moodtheme-discogs-effnet-1.pb
|
||||
curl -L -o mtg_jamendo_instrument-discogs-effnet-1.pb \
|
||||
https://essentia.upf.edu/models/classification-heads/mtg_jamendo_instrument/mtg_jamendo_instrument-discogs-effnet-1.pb
|
||||
curl -L -o mtg_jamendo_genre-discogs-effnet-1.pb \
|
||||
https://essentia.upf.edu/models/classification-heads/mtg_jamendo_genre/mtg_jamendo_genre-discogs-effnet-1.pb
|
||||
|
||||
- name: Set up Docker Buildx
|
||||
uses: docker/setup-buildx-action@v3
|
||||
|
||||
|
||||
4
.gitignore
vendored
4
.gitignore
vendored
@@ -75,10 +75,6 @@ yarn-error.log*
|
||||
# Docker
|
||||
postgres_data/
|
||||
|
||||
# Essentia models (large files, download separately)
|
||||
backend/models/*.pb
|
||||
backend/models/*.json
|
||||
|
||||
# Audio analysis cache
|
||||
*.peaks.json
|
||||
.audio_cache/
|
||||
|
||||
140
DEPENDENCIES.md
Normal file
140
DEPENDENCIES.md
Normal file
@@ -0,0 +1,140 @@
|
||||
# Dépendances du projet
|
||||
|
||||
## Backend Python (requirements.txt)
|
||||
|
||||
### Web Framework
|
||||
- `fastapi==0.109.0` - Framework web moderne
|
||||
- `uvicorn[standard]==0.27.0` - Serveur ASGI
|
||||
- `python-multipart==0.0.6` - Support formulaires multipart
|
||||
|
||||
### Database
|
||||
- `sqlalchemy==2.0.25` - ORM
|
||||
- `psycopg2-binary==2.9.9` - Driver PostgreSQL
|
||||
- `pgvector==0.2.4` - Extension vecteurs PostgreSQL
|
||||
- `alembic==1.13.1` - Migrations de base de données
|
||||
|
||||
### Audio Processing
|
||||
- `librosa==0.10.1` - Analyse audio
|
||||
- `soundfile==0.12.1` - Lecture/écriture fichiers audio
|
||||
- `audioread==3.0.1` - Décodage formats audio
|
||||
- `mutagen==1.47.0` - Métadonnées ID3
|
||||
|
||||
### Machine Learning
|
||||
- `essentia-tensorflow` - Classification genre/mood/instruments (installé via Dockerfile)
|
||||
- `numpy==1.24.3` - Calcul numérique
|
||||
- `scipy==1.11.4` - Calcul scientifique
|
||||
|
||||
### Configuration & Validation
|
||||
- `pydantic==2.5.3` - Validation de données
|
||||
- `pydantic-settings==2.1.0` - Configuration via env vars
|
||||
- `python-dotenv==1.0.0` - Chargement fichier .env
|
||||
- `email-validator==2.1.0` - Validation emails (requis par Pydantic EmailStr)
|
||||
|
||||
### Authentication
|
||||
- `python-jose[cryptography]==3.3.0` - JWT tokens
|
||||
- `passlib[bcrypt]==1.7.4` - Hashing passwords
|
||||
|
||||
### Utilities
|
||||
- `aiofiles==23.2.1` - I/O fichiers asynchrones
|
||||
- `httpx==0.26.0` - Client HTTP asynchrone
|
||||
|
||||
## Dépendances Système (Dockerfile)
|
||||
|
||||
### Requis pour le backend
|
||||
```bash
|
||||
apt-get install -y \
|
||||
ffmpeg # Transcodage audio (MP3, etc.)
|
||||
libsndfile1 # Lecture formats audio
|
||||
gcc g++ gfortran # Compilation packages Python
|
||||
libopenblas-dev # Algèbre linéaire optimisée
|
||||
liblapack-dev # Routines algèbre linéaire
|
||||
libfftw3-dev # Transformées de Fourier rapides
|
||||
libavcodec-dev # Codecs audio/vidéo
|
||||
libavformat-dev # Formats conteneurs
|
||||
libavutil-dev # Utilitaires FFmpeg
|
||||
libswresample-dev # Resampling audio
|
||||
libsamplerate0-dev # Conversion taux d'échantillonnage
|
||||
libtag1-dev # Métadonnées audio
|
||||
libchromaprint-dev # Audio fingerprinting
|
||||
```
|
||||
|
||||
## Frontend (package.json)
|
||||
|
||||
### Framework
|
||||
- `next@15.5.6` - Framework React
|
||||
- `react@19.0.0` - Bibliothèque UI
|
||||
- `react-dom@19.0.0` - Rendu React
|
||||
|
||||
### State Management & Data Fetching
|
||||
- `@tanstack/react-query@5.62.11` - Gestion état serveur
|
||||
- `axios@1.7.9` - Client HTTP
|
||||
|
||||
### UI & Styling
|
||||
- `tailwindcss@3.4.17` - Framework CSS utility-first
|
||||
|
||||
### Types
|
||||
- `typescript@5.7.2` - Typage statique
|
||||
- `@types/react@19.0.1`
|
||||
- `@types/node@22.10.1`
|
||||
|
||||
## Modèles Essentia (inclus dans le repo)
|
||||
|
||||
Total: ~28 MB
|
||||
|
||||
- `discogs-effnet-bs64-1.pb` (18 MB) - Modèle d'embedding
|
||||
- `genre_discogs400-discogs-effnet-1.pb` (2 MB) - Classification genre
|
||||
- `genre_discogs400-discogs-effnet-1.json` (15 KB) - Métadonnées genres
|
||||
- `mtg_jamendo_moodtheme-discogs-effnet-1.pb` (2.6 MB) - Classification mood
|
||||
- `mtg_jamendo_instrument-discogs-effnet-1.pb` (2.6 MB) - Classification instruments
|
||||
- `mtg_jamendo_genre-discogs-effnet-1.pb` (2.7 MB) - Classification genre (alternatif)
|
||||
|
||||
## Vérification des dépendances
|
||||
|
||||
### Backend
|
||||
```bash
|
||||
cd backend
|
||||
python check_dependencies.py
|
||||
```
|
||||
|
||||
### Build Docker
|
||||
```bash
|
||||
# Backend
|
||||
docker build -t audio-classifier-backend -f backend/Dockerfile .
|
||||
|
||||
# Frontend
|
||||
docker build -t audio-classifier-frontend -f frontend/Dockerfile .
|
||||
```
|
||||
|
||||
## Notes de compatibilité
|
||||
|
||||
- **Python**: 3.9 (requis pour essentia-tensorflow)
|
||||
- **Architecture**: amd64 (meilleure compatibilité Essentia)
|
||||
- **Node.js**: 20+ (pour Next.js 15)
|
||||
- **PostgreSQL**: 16+ avec extension pgvector
|
||||
|
||||
## Installation locale
|
||||
|
||||
### Backend
|
||||
```bash
|
||||
cd backend
|
||||
python -m venv venv
|
||||
source venv/bin/activate # Windows: venv\Scripts\activate
|
||||
pip install -r requirements.txt
|
||||
pip install essentia-tensorflow
|
||||
```
|
||||
|
||||
### Frontend
|
||||
```bash
|
||||
cd frontend
|
||||
npm install
|
||||
```
|
||||
|
||||
## Variables d'environnement requises
|
||||
|
||||
Voir `.env.example` pour la liste complète des variables nécessaires.
|
||||
|
||||
### Critiques
|
||||
- `DATABASE_URL` - Connexion PostgreSQL
|
||||
- `ADMIN_EMAIL` - Email admin
|
||||
- `ADMIN_PASSWORD` - Mot de passe admin
|
||||
- `JWT_SECRET_KEY` - Secret pour JWT (générer avec `openssl rand -hex 32`)
|
||||
76
backend/check_dependencies.py
Normal file
76
backend/check_dependencies.py
Normal file
@@ -0,0 +1,76 @@
|
||||
#!/usr/bin/env python3
|
||||
"""Check all required dependencies are installed."""
|
||||
import sys
|
||||
|
||||
def check_import(module_name, package_name=None):
|
||||
"""Try to import a module and report status."""
|
||||
package = package_name or module_name
|
||||
try:
|
||||
__import__(module_name)
|
||||
print(f"✅ {package}")
|
||||
return True
|
||||
except ImportError as e:
|
||||
print(f"❌ {package}: {e}")
|
||||
return False
|
||||
|
||||
def main():
|
||||
"""Check all dependencies."""
|
||||
print("🔍 Checking Python dependencies...\n")
|
||||
|
||||
dependencies = [
|
||||
# Web Framework
|
||||
("fastapi", "fastapi"),
|
||||
("uvicorn", "uvicorn"),
|
||||
("multipart", "python-multipart"),
|
||||
|
||||
# Database
|
||||
("sqlalchemy", "sqlalchemy"),
|
||||
("psycopg2", "psycopg2-binary"),
|
||||
("pgvector.sqlalchemy", "pgvector"),
|
||||
("alembic", "alembic"),
|
||||
|
||||
# Audio Processing
|
||||
("librosa", "librosa"),
|
||||
("soundfile", "soundfile"),
|
||||
("audioread", "audioread"),
|
||||
("mutagen", "mutagen"),
|
||||
|
||||
# Scientific
|
||||
("numpy", "numpy"),
|
||||
("scipy", "scipy"),
|
||||
|
||||
# Configuration
|
||||
("pydantic", "pydantic"),
|
||||
("pydantic_settings", "pydantic-settings"),
|
||||
("dotenv", "python-dotenv"),
|
||||
("email_validator", "email-validator"),
|
||||
|
||||
# Authentication
|
||||
("jose", "python-jose"),
|
||||
("passlib", "passlib"),
|
||||
|
||||
# Utilities
|
||||
("aiofiles", "aiofiles"),
|
||||
("httpx", "httpx"),
|
||||
|
||||
# Essentia (optional)
|
||||
("essentia.standard", "essentia-tensorflow"),
|
||||
]
|
||||
|
||||
all_ok = True
|
||||
for module, package in dependencies:
|
||||
if not check_import(module, package):
|
||||
all_ok = False
|
||||
|
||||
print("\n" + "="*50)
|
||||
if all_ok:
|
||||
print("✅ All dependencies installed!")
|
||||
return 0
|
||||
else:
|
||||
print("❌ Some dependencies are missing")
|
||||
print("\nInstall missing dependencies with:")
|
||||
print(" pip install -r requirements.txt")
|
||||
return 1
|
||||
|
||||
if __name__ == "__main__":
|
||||
sys.exit(main())
|
||||
BIN
backend/models/discogs-effnet-bs64-1.pb
Normal file
BIN
backend/models/discogs-effnet-bs64-1.pb
Normal file
Binary file not shown.
462
backend/models/genre_discogs400-discogs-effnet-1.json
Normal file
462
backend/models/genre_discogs400-discogs-effnet-1.json
Normal file
@@ -0,0 +1,462 @@
|
||||
{
|
||||
"name": "Genre Discogs400",
|
||||
"type": "Music genre classification",
|
||||
"link": "https://essentia.upf.edu/models/classification-heads/genre_discogs400/genre_discogs400-discogs-effnet-1.pb",
|
||||
"version": "1",
|
||||
"description": "Prediction of 400 music styles in the from the Discogs taxonomy",
|
||||
"author": "Pablo Alonso",
|
||||
"email": "pablo.alonso@upf.edu",
|
||||
"release_date": "2023-05-04",
|
||||
"framework": "tensorflow",
|
||||
"framework_version": "2.8.0",
|
||||
"classes": [
|
||||
"Blues---Boogie Woogie",
|
||||
"Blues---Chicago Blues",
|
||||
"Blues---Country Blues",
|
||||
"Blues---Delta Blues",
|
||||
"Blues---Electric Blues",
|
||||
"Blues---Harmonica Blues",
|
||||
"Blues---Jump Blues",
|
||||
"Blues---Louisiana Blues",
|
||||
"Blues---Modern Electric Blues",
|
||||
"Blues---Piano Blues",
|
||||
"Blues---Rhythm & Blues",
|
||||
"Blues---Texas Blues",
|
||||
"Brass & Military---Brass Band",
|
||||
"Brass & Military---Marches",
|
||||
"Brass & Military---Military",
|
||||
"Children's---Educational",
|
||||
"Children's---Nursery Rhymes",
|
||||
"Children's---Story",
|
||||
"Classical---Baroque",
|
||||
"Classical---Choral",
|
||||
"Classical---Classical",
|
||||
"Classical---Contemporary",
|
||||
"Classical---Impressionist",
|
||||
"Classical---Medieval",
|
||||
"Classical---Modern",
|
||||
"Classical---Neo-Classical",
|
||||
"Classical---Neo-Romantic",
|
||||
"Classical---Opera",
|
||||
"Classical---Post-Modern",
|
||||
"Classical---Renaissance",
|
||||
"Classical---Romantic",
|
||||
"Electronic---Abstract",
|
||||
"Electronic---Acid",
|
||||
"Electronic---Acid House",
|
||||
"Electronic---Acid Jazz",
|
||||
"Electronic---Ambient",
|
||||
"Electronic---Bassline",
|
||||
"Electronic---Beatdown",
|
||||
"Electronic---Berlin-School",
|
||||
"Electronic---Big Beat",
|
||||
"Electronic---Bleep",
|
||||
"Electronic---Breakbeat",
|
||||
"Electronic---Breakcore",
|
||||
"Electronic---Breaks",
|
||||
"Electronic---Broken Beat",
|
||||
"Electronic---Chillwave",
|
||||
"Electronic---Chiptune",
|
||||
"Electronic---Dance-pop",
|
||||
"Electronic---Dark Ambient",
|
||||
"Electronic---Darkwave",
|
||||
"Electronic---Deep House",
|
||||
"Electronic---Deep Techno",
|
||||
"Electronic---Disco",
|
||||
"Electronic---Disco Polo",
|
||||
"Electronic---Donk",
|
||||
"Electronic---Downtempo",
|
||||
"Electronic---Drone",
|
||||
"Electronic---Drum n Bass",
|
||||
"Electronic---Dub",
|
||||
"Electronic---Dub Techno",
|
||||
"Electronic---Dubstep",
|
||||
"Electronic---Dungeon Synth",
|
||||
"Electronic---EBM",
|
||||
"Electronic---Electro",
|
||||
"Electronic---Electro House",
|
||||
"Electronic---Electroclash",
|
||||
"Electronic---Euro House",
|
||||
"Electronic---Euro-Disco",
|
||||
"Electronic---Eurobeat",
|
||||
"Electronic---Eurodance",
|
||||
"Electronic---Experimental",
|
||||
"Electronic---Freestyle",
|
||||
"Electronic---Future Jazz",
|
||||
"Electronic---Gabber",
|
||||
"Electronic---Garage House",
|
||||
"Electronic---Ghetto",
|
||||
"Electronic---Ghetto House",
|
||||
"Electronic---Glitch",
|
||||
"Electronic---Goa Trance",
|
||||
"Electronic---Grime",
|
||||
"Electronic---Halftime",
|
||||
"Electronic---Hands Up",
|
||||
"Electronic---Happy Hardcore",
|
||||
"Electronic---Hard House",
|
||||
"Electronic---Hard Techno",
|
||||
"Electronic---Hard Trance",
|
||||
"Electronic---Hardcore",
|
||||
"Electronic---Hardstyle",
|
||||
"Electronic---Hi NRG",
|
||||
"Electronic---Hip Hop",
|
||||
"Electronic---Hip-House",
|
||||
"Electronic---House",
|
||||
"Electronic---IDM",
|
||||
"Electronic---Illbient",
|
||||
"Electronic---Industrial",
|
||||
"Electronic---Italo House",
|
||||
"Electronic---Italo-Disco",
|
||||
"Electronic---Italodance",
|
||||
"Electronic---Jazzdance",
|
||||
"Electronic---Juke",
|
||||
"Electronic---Jumpstyle",
|
||||
"Electronic---Jungle",
|
||||
"Electronic---Latin",
|
||||
"Electronic---Leftfield",
|
||||
"Electronic---Makina",
|
||||
"Electronic---Minimal",
|
||||
"Electronic---Minimal Techno",
|
||||
"Electronic---Modern Classical",
|
||||
"Electronic---Musique Concr\u00e8te",
|
||||
"Electronic---Neofolk",
|
||||
"Electronic---New Age",
|
||||
"Electronic---New Beat",
|
||||
"Electronic---New Wave",
|
||||
"Electronic---Noise",
|
||||
"Electronic---Nu-Disco",
|
||||
"Electronic---Power Electronics",
|
||||
"Electronic---Progressive Breaks",
|
||||
"Electronic---Progressive House",
|
||||
"Electronic---Progressive Trance",
|
||||
"Electronic---Psy-Trance",
|
||||
"Electronic---Rhythmic Noise",
|
||||
"Electronic---Schranz",
|
||||
"Electronic---Sound Collage",
|
||||
"Electronic---Speed Garage",
|
||||
"Electronic---Speedcore",
|
||||
"Electronic---Synth-pop",
|
||||
"Electronic---Synthwave",
|
||||
"Electronic---Tech House",
|
||||
"Electronic---Tech Trance",
|
||||
"Electronic---Techno",
|
||||
"Electronic---Trance",
|
||||
"Electronic---Tribal",
|
||||
"Electronic---Tribal House",
|
||||
"Electronic---Trip Hop",
|
||||
"Electronic---Tropical House",
|
||||
"Electronic---UK Garage",
|
||||
"Electronic---Vaporwave",
|
||||
"Folk, World, & Country---African",
|
||||
"Folk, World, & Country---Bluegrass",
|
||||
"Folk, World, & Country---Cajun",
|
||||
"Folk, World, & Country---Canzone Napoletana",
|
||||
"Folk, World, & Country---Catalan Music",
|
||||
"Folk, World, & Country---Celtic",
|
||||
"Folk, World, & Country---Country",
|
||||
"Folk, World, & Country---Fado",
|
||||
"Folk, World, & Country---Flamenco",
|
||||
"Folk, World, & Country---Folk",
|
||||
"Folk, World, & Country---Gospel",
|
||||
"Folk, World, & Country---Highlife",
|
||||
"Folk, World, & Country---Hillbilly",
|
||||
"Folk, World, & Country---Hindustani",
|
||||
"Folk, World, & Country---Honky Tonk",
|
||||
"Folk, World, & Country---Indian Classical",
|
||||
"Folk, World, & Country---La\u00efk\u00f3",
|
||||
"Folk, World, & Country---Nordic",
|
||||
"Folk, World, & Country---Pacific",
|
||||
"Folk, World, & Country---Polka",
|
||||
"Folk, World, & Country---Ra\u00ef",
|
||||
"Folk, World, & Country---Romani",
|
||||
"Folk, World, & Country---Soukous",
|
||||
"Folk, World, & Country---S\u00e9ga",
|
||||
"Folk, World, & Country---Volksmusik",
|
||||
"Folk, World, & Country---Zouk",
|
||||
"Folk, World, & Country---\u00c9ntekhno",
|
||||
"Funk / Soul---Afrobeat",
|
||||
"Funk / Soul---Boogie",
|
||||
"Funk / Soul---Contemporary R&B",
|
||||
"Funk / Soul---Disco",
|
||||
"Funk / Soul---Free Funk",
|
||||
"Funk / Soul---Funk",
|
||||
"Funk / Soul---Gospel",
|
||||
"Funk / Soul---Neo Soul",
|
||||
"Funk / Soul---New Jack Swing",
|
||||
"Funk / Soul---P.Funk",
|
||||
"Funk / Soul---Psychedelic",
|
||||
"Funk / Soul---Rhythm & Blues",
|
||||
"Funk / Soul---Soul",
|
||||
"Funk / Soul---Swingbeat",
|
||||
"Funk / Soul---UK Street Soul",
|
||||
"Hip Hop---Bass Music",
|
||||
"Hip Hop---Boom Bap",
|
||||
"Hip Hop---Bounce",
|
||||
"Hip Hop---Britcore",
|
||||
"Hip Hop---Cloud Rap",
|
||||
"Hip Hop---Conscious",
|
||||
"Hip Hop---Crunk",
|
||||
"Hip Hop---Cut-up/DJ",
|
||||
"Hip Hop---DJ Battle Tool",
|
||||
"Hip Hop---Electro",
|
||||
"Hip Hop---G-Funk",
|
||||
"Hip Hop---Gangsta",
|
||||
"Hip Hop---Grime",
|
||||
"Hip Hop---Hardcore Hip-Hop",
|
||||
"Hip Hop---Horrorcore",
|
||||
"Hip Hop---Instrumental",
|
||||
"Hip Hop---Jazzy Hip-Hop",
|
||||
"Hip Hop---Miami Bass",
|
||||
"Hip Hop---Pop Rap",
|
||||
"Hip Hop---Ragga HipHop",
|
||||
"Hip Hop---RnB/Swing",
|
||||
"Hip Hop---Screw",
|
||||
"Hip Hop---Thug Rap",
|
||||
"Hip Hop---Trap",
|
||||
"Hip Hop---Trip Hop",
|
||||
"Hip Hop---Turntablism",
|
||||
"Jazz---Afro-Cuban Jazz",
|
||||
"Jazz---Afrobeat",
|
||||
"Jazz---Avant-garde Jazz",
|
||||
"Jazz---Big Band",
|
||||
"Jazz---Bop",
|
||||
"Jazz---Bossa Nova",
|
||||
"Jazz---Contemporary Jazz",
|
||||
"Jazz---Cool Jazz",
|
||||
"Jazz---Dixieland",
|
||||
"Jazz---Easy Listening",
|
||||
"Jazz---Free Improvisation",
|
||||
"Jazz---Free Jazz",
|
||||
"Jazz---Fusion",
|
||||
"Jazz---Gypsy Jazz",
|
||||
"Jazz---Hard Bop",
|
||||
"Jazz---Jazz-Funk",
|
||||
"Jazz---Jazz-Rock",
|
||||
"Jazz---Latin Jazz",
|
||||
"Jazz---Modal",
|
||||
"Jazz---Post Bop",
|
||||
"Jazz---Ragtime",
|
||||
"Jazz---Smooth Jazz",
|
||||
"Jazz---Soul-Jazz",
|
||||
"Jazz---Space-Age",
|
||||
"Jazz---Swing",
|
||||
"Latin---Afro-Cuban",
|
||||
"Latin---Bai\u00e3o",
|
||||
"Latin---Batucada",
|
||||
"Latin---Beguine",
|
||||
"Latin---Bolero",
|
||||
"Latin---Boogaloo",
|
||||
"Latin---Bossanova",
|
||||
"Latin---Cha-Cha",
|
||||
"Latin---Charanga",
|
||||
"Latin---Compas",
|
||||
"Latin---Cubano",
|
||||
"Latin---Cumbia",
|
||||
"Latin---Descarga",
|
||||
"Latin---Forr\u00f3",
|
||||
"Latin---Guaguanc\u00f3",
|
||||
"Latin---Guajira",
|
||||
"Latin---Guaracha",
|
||||
"Latin---MPB",
|
||||
"Latin---Mambo",
|
||||
"Latin---Mariachi",
|
||||
"Latin---Merengue",
|
||||
"Latin---Norte\u00f1o",
|
||||
"Latin---Nueva Cancion",
|
||||
"Latin---Pachanga",
|
||||
"Latin---Porro",
|
||||
"Latin---Ranchera",
|
||||
"Latin---Reggaeton",
|
||||
"Latin---Rumba",
|
||||
"Latin---Salsa",
|
||||
"Latin---Samba",
|
||||
"Latin---Son",
|
||||
"Latin---Son Montuno",
|
||||
"Latin---Tango",
|
||||
"Latin---Tejano",
|
||||
"Latin---Vallenato",
|
||||
"Non-Music---Audiobook",
|
||||
"Non-Music---Comedy",
|
||||
"Non-Music---Dialogue",
|
||||
"Non-Music---Education",
|
||||
"Non-Music---Field Recording",
|
||||
"Non-Music---Interview",
|
||||
"Non-Music---Monolog",
|
||||
"Non-Music---Poetry",
|
||||
"Non-Music---Political",
|
||||
"Non-Music---Promotional",
|
||||
"Non-Music---Radioplay",
|
||||
"Non-Music---Religious",
|
||||
"Non-Music---Spoken Word",
|
||||
"Pop---Ballad",
|
||||
"Pop---Bollywood",
|
||||
"Pop---Bubblegum",
|
||||
"Pop---Chanson",
|
||||
"Pop---City Pop",
|
||||
"Pop---Europop",
|
||||
"Pop---Indie Pop",
|
||||
"Pop---J-pop",
|
||||
"Pop---K-pop",
|
||||
"Pop---Kay\u014dkyoku",
|
||||
"Pop---Light Music",
|
||||
"Pop---Music Hall",
|
||||
"Pop---Novelty",
|
||||
"Pop---Parody",
|
||||
"Pop---Schlager",
|
||||
"Pop---Vocal",
|
||||
"Reggae---Calypso",
|
||||
"Reggae---Dancehall",
|
||||
"Reggae---Dub",
|
||||
"Reggae---Lovers Rock",
|
||||
"Reggae---Ragga",
|
||||
"Reggae---Reggae",
|
||||
"Reggae---Reggae-Pop",
|
||||
"Reggae---Rocksteady",
|
||||
"Reggae---Roots Reggae",
|
||||
"Reggae---Ska",
|
||||
"Reggae---Soca",
|
||||
"Rock---AOR",
|
||||
"Rock---Acid Rock",
|
||||
"Rock---Acoustic",
|
||||
"Rock---Alternative Rock",
|
||||
"Rock---Arena Rock",
|
||||
"Rock---Art Rock",
|
||||
"Rock---Atmospheric Black Metal",
|
||||
"Rock---Avantgarde",
|
||||
"Rock---Beat",
|
||||
"Rock---Black Metal",
|
||||
"Rock---Blues Rock",
|
||||
"Rock---Brit Pop",
|
||||
"Rock---Classic Rock",
|
||||
"Rock---Coldwave",
|
||||
"Rock---Country Rock",
|
||||
"Rock---Crust",
|
||||
"Rock---Death Metal",
|
||||
"Rock---Deathcore",
|
||||
"Rock---Deathrock",
|
||||
"Rock---Depressive Black Metal",
|
||||
"Rock---Doo Wop",
|
||||
"Rock---Doom Metal",
|
||||
"Rock---Dream Pop",
|
||||
"Rock---Emo",
|
||||
"Rock---Ethereal",
|
||||
"Rock---Experimental",
|
||||
"Rock---Folk Metal",
|
||||
"Rock---Folk Rock",
|
||||
"Rock---Funeral Doom Metal",
|
||||
"Rock---Funk Metal",
|
||||
"Rock---Garage Rock",
|
||||
"Rock---Glam",
|
||||
"Rock---Goregrind",
|
||||
"Rock---Goth Rock",
|
||||
"Rock---Gothic Metal",
|
||||
"Rock---Grindcore",
|
||||
"Rock---Grunge",
|
||||
"Rock---Hard Rock",
|
||||
"Rock---Hardcore",
|
||||
"Rock---Heavy Metal",
|
||||
"Rock---Indie Rock",
|
||||
"Rock---Industrial",
|
||||
"Rock---Krautrock",
|
||||
"Rock---Lo-Fi",
|
||||
"Rock---Lounge",
|
||||
"Rock---Math Rock",
|
||||
"Rock---Melodic Death Metal",
|
||||
"Rock---Melodic Hardcore",
|
||||
"Rock---Metalcore",
|
||||
"Rock---Mod",
|
||||
"Rock---Neofolk",
|
||||
"Rock---New Wave",
|
||||
"Rock---No Wave",
|
||||
"Rock---Noise",
|
||||
"Rock---Noisecore",
|
||||
"Rock---Nu Metal",
|
||||
"Rock---Oi",
|
||||
"Rock---Parody",
|
||||
"Rock---Pop Punk",
|
||||
"Rock---Pop Rock",
|
||||
"Rock---Pornogrind",
|
||||
"Rock---Post Rock",
|
||||
"Rock---Post-Hardcore",
|
||||
"Rock---Post-Metal",
|
||||
"Rock---Post-Punk",
|
||||
"Rock---Power Metal",
|
||||
"Rock---Power Pop",
|
||||
"Rock---Power Violence",
|
||||
"Rock---Prog Rock",
|
||||
"Rock---Progressive Metal",
|
||||
"Rock---Psychedelic Rock",
|
||||
"Rock---Psychobilly",
|
||||
"Rock---Pub Rock",
|
||||
"Rock---Punk",
|
||||
"Rock---Rock & Roll",
|
||||
"Rock---Rockabilly",
|
||||
"Rock---Shoegaze",
|
||||
"Rock---Ska",
|
||||
"Rock---Sludge Metal",
|
||||
"Rock---Soft Rock",
|
||||
"Rock---Southern Rock",
|
||||
"Rock---Space Rock",
|
||||
"Rock---Speed Metal",
|
||||
"Rock---Stoner Rock",
|
||||
"Rock---Surf",
|
||||
"Rock---Symphonic Rock",
|
||||
"Rock---Technical Death Metal",
|
||||
"Rock---Thrash",
|
||||
"Rock---Twist",
|
||||
"Rock---Viking Metal",
|
||||
"Rock---Y\u00e9-Y\u00e9",
|
||||
"Stage & Screen---Musical",
|
||||
"Stage & Screen---Score",
|
||||
"Stage & Screen---Soundtrack",
|
||||
"Stage & Screen---Theme"
|
||||
],
|
||||
"model_types": [
|
||||
"frozen_model",
|
||||
"SavedModel",
|
||||
"onnx"
|
||||
],
|
||||
"dataset": {
|
||||
"name": "Discogs-4M (unreleased)",
|
||||
"citation": "In-house dataset",
|
||||
"size": "4M full tracks (3.3M used)",
|
||||
"metrics": {
|
||||
"ROC-AUC": 0.95417,
|
||||
"PR-AUC": 0.20629
|
||||
}
|
||||
},
|
||||
"schema": {
|
||||
"inputs": [
|
||||
{
|
||||
"name": "serving_default_model_Placeholder",
|
||||
"type": "float",
|
||||
"shape": [
|
||||
"batch_size",
|
||||
1280
|
||||
]
|
||||
}
|
||||
],
|
||||
"outputs": [
|
||||
{
|
||||
"name": "PartitionedCall:0",
|
||||
"type": "float",
|
||||
"shape": [
|
||||
"batch_size",
|
||||
400
|
||||
],
|
||||
"op": "Sigmoid",
|
||||
"output_purpose": "predictions"
|
||||
}
|
||||
]
|
||||
},
|
||||
"citation": "@inproceedings{alonso2022music,\n title={Music Representation Learning Based on Editorial Metadata from Discogs},\n author={Alonso-Jim{\\'e}nez, Pablo and Serra, Xavier and Bogdanov, Dmitry},\n booktitle={Conference of the International Society for Music Information Retrieval (ISMIR)},\n year={2022}\n}",
|
||||
"inference": {
|
||||
"sample_rate": 16000,
|
||||
"algorithm": "TensorflowPredict2D",
|
||||
"embedding_model": {
|
||||
"algorithm": "TensorflowPredictEffnetDiscogs",
|
||||
"model_name": "discogs-effnet-bs64-1",
|
||||
"link": "https://essentia.upf.edu/models/music-style-classification/discogs-effnet/discogs-effnet-bs64-1.pb"
|
||||
}
|
||||
}
|
||||
}
|
||||
BIN
backend/models/genre_discogs400-discogs-effnet-1.pb
Normal file
BIN
backend/models/genre_discogs400-discogs-effnet-1.pb
Normal file
Binary file not shown.
BIN
backend/models/mtg_jamendo_genre-discogs-effnet-1.pb
Normal file
BIN
backend/models/mtg_jamendo_genre-discogs-effnet-1.pb
Normal file
Binary file not shown.
BIN
backend/models/mtg_jamendo_instrument-discogs-effnet-1.pb
Normal file
BIN
backend/models/mtg_jamendo_instrument-discogs-effnet-1.pb
Normal file
Binary file not shown.
BIN
backend/models/mtg_jamendo_moodtheme-discogs-effnet-1.pb
Normal file
BIN
backend/models/mtg_jamendo_moodtheme-discogs-effnet-1.pb
Normal file
Binary file not shown.
@@ -26,6 +26,11 @@ scipy==1.11.4
|
||||
pydantic==2.5.3
|
||||
pydantic-settings==2.1.0
|
||||
python-dotenv==1.0.0
|
||||
email-validator==2.1.0
|
||||
|
||||
# Authentication
|
||||
python-jose[cryptography]==3.3.0
|
||||
passlib[bcrypt]==1.7.4
|
||||
|
||||
# Utilities
|
||||
aiofiles==23.2.1
|
||||
|
||||
@@ -1,14 +1,15 @@
|
||||
"""FastAPI main application."""
|
||||
from fastapi import FastAPI
|
||||
from fastapi import FastAPI, Depends
|
||||
from fastapi.middleware.cors import CORSMiddleware
|
||||
from contextlib import asynccontextmanager
|
||||
|
||||
from ..utils.config import settings
|
||||
from ..utils.logging import setup_logging, get_logger
|
||||
from ..models.database import engine, Base
|
||||
from ..core.auth import require_auth
|
||||
|
||||
# Import routes
|
||||
from .routes import tracks, search, audio, analyze, similar, stats, library
|
||||
from .routes import tracks, search, audio, analyze, similar, stats, library, auth
|
||||
|
||||
# Setup logging
|
||||
setup_logging()
|
||||
@@ -62,13 +63,17 @@ async def health_check():
|
||||
|
||||
|
||||
# Include routers
|
||||
app.include_router(tracks.router, prefix="/api/tracks", tags=["tracks"])
|
||||
app.include_router(search.router, prefix="/api/search", tags=["search"])
|
||||
app.include_router(audio.router, prefix="/api/audio", tags=["audio"])
|
||||
app.include_router(analyze.router, prefix="/api/analyze", tags=["analyze"])
|
||||
app.include_router(similar.router, prefix="/api", tags=["similar"])
|
||||
app.include_router(stats.router, prefix="/api/stats", tags=["stats"])
|
||||
app.include_router(library.router, prefix="/api/library", tags=["library"])
|
||||
# Auth endpoints (public - no auth required)
|
||||
app.include_router(auth.router, prefix="/api/auth", tags=["auth"])
|
||||
|
||||
# Protected endpoints (auth required for ALL routes)
|
||||
app.include_router(tracks.router, prefix="/api/tracks", tags=["tracks"], dependencies=[Depends(require_auth)])
|
||||
app.include_router(search.router, prefix="/api/search", tags=["search"], dependencies=[Depends(require_auth)])
|
||||
app.include_router(audio.router, prefix="/api/audio", tags=["audio"], dependencies=[Depends(require_auth)])
|
||||
app.include_router(analyze.router, prefix="/api/analyze", tags=["analyze"], dependencies=[Depends(require_auth)])
|
||||
app.include_router(similar.router, prefix="/api", tags=["similar"], dependencies=[Depends(require_auth)])
|
||||
app.include_router(stats.router, prefix="/api/stats", tags=["stats"], dependencies=[Depends(require_auth)])
|
||||
app.include_router(library.router, prefix="/api/library", tags=["library"], dependencies=[Depends(require_auth)])
|
||||
|
||||
|
||||
@app.get("/", tags=["root"])
|
||||
|
||||
82
backend/src/api/routes/auth.py
Normal file
82
backend/src/api/routes/auth.py
Normal file
@@ -0,0 +1,82 @@
|
||||
"""Authentication endpoints."""
|
||||
from datetime import timedelta
|
||||
from fastapi import APIRouter, HTTPException, status, Depends
|
||||
from pydantic import BaseModel, EmailStr
|
||||
|
||||
from ...core.auth import authenticate_user, create_access_token, get_current_user
|
||||
from ...utils.config import settings
|
||||
from ...utils.logging import get_logger
|
||||
|
||||
router = APIRouter()
|
||||
logger = get_logger(__name__)
|
||||
|
||||
|
||||
class LoginRequest(BaseModel):
|
||||
"""Login request model."""
|
||||
email: EmailStr
|
||||
password: str
|
||||
|
||||
|
||||
class LoginResponse(BaseModel):
|
||||
"""Login response model."""
|
||||
access_token: str
|
||||
token_type: str = "bearer"
|
||||
user: dict
|
||||
|
||||
|
||||
class UserResponse(BaseModel):
|
||||
"""User response model."""
|
||||
email: str
|
||||
role: str
|
||||
|
||||
|
||||
@router.post("/login", response_model=LoginResponse)
|
||||
async def login(request: LoginRequest):
|
||||
"""Authenticate user and return JWT token.
|
||||
|
||||
Args:
|
||||
request: Login credentials
|
||||
|
||||
Returns:
|
||||
Access token and user info
|
||||
|
||||
Raises:
|
||||
HTTPException: 401 if credentials are invalid
|
||||
"""
|
||||
user = authenticate_user(request.email, request.password)
|
||||
|
||||
if not user:
|
||||
logger.warning(f"Failed login attempt for: {request.email}")
|
||||
raise HTTPException(
|
||||
status_code=status.HTTP_401_UNAUTHORIZED,
|
||||
detail="Incorrect email or password",
|
||||
headers={"WWW-Authenticate": "Bearer"},
|
||||
)
|
||||
|
||||
# Create access token
|
||||
access_token_expires = timedelta(hours=settings.JWT_EXPIRATION_HOURS)
|
||||
access_token = create_access_token(
|
||||
data={"sub": user["email"], "role": user["role"]},
|
||||
expires_delta=access_token_expires
|
||||
)
|
||||
|
||||
logger.info(f"User logged in: {user['email']}")
|
||||
|
||||
return {
|
||||
"access_token": access_token,
|
||||
"token_type": "bearer",
|
||||
"user": user
|
||||
}
|
||||
|
||||
|
||||
@router.get("/me", response_model=UserResponse)
|
||||
async def get_me(current_user: dict = Depends(get_current_user)):
|
||||
"""Get current authenticated user info.
|
||||
|
||||
Args:
|
||||
current_user: Current user from JWT token
|
||||
|
||||
Returns:
|
||||
User information
|
||||
"""
|
||||
return current_user
|
||||
@@ -41,6 +41,9 @@ def find_audio_files(directory: str) -> list[Path]:
|
||||
return []
|
||||
|
||||
for root, dirs, files in os.walk(directory_path):
|
||||
# Skip transcoded and waveforms directories
|
||||
dirs[:] = [d for d in dirs if d not in ['transcoded', 'waveforms', '.transcoded', '.waveforms']]
|
||||
|
||||
for file in files:
|
||||
file_path = Path(root) / file
|
||||
if file_path.suffix.lower() in AUDIO_EXTENSIONS:
|
||||
|
||||
@@ -46,6 +46,9 @@ def find_audio_files(directory: str) -> List[Path]:
|
||||
logger.info(f"Scanning directory: {directory}")
|
||||
|
||||
for root, dirs, files in os.walk(directory_path):
|
||||
# Skip transcoded and waveforms directories
|
||||
dirs[:] = [d for d in dirs if d not in ['transcoded', 'waveforms', '.transcoded', '.waveforms']]
|
||||
|
||||
for file in files:
|
||||
file_path = Path(root) / file
|
||||
if file_path.suffix.lower() in AUDIO_EXTENSIONS:
|
||||
|
||||
151
backend/src/core/auth.py
Normal file
151
backend/src/core/auth.py
Normal file
@@ -0,0 +1,151 @@
|
||||
"""Authentication utilities."""
|
||||
from datetime import datetime, timedelta
|
||||
from typing import Optional
|
||||
from jose import JWTError, jwt
|
||||
from passlib.context import CryptContext
|
||||
from fastapi import HTTPException, status, Depends
|
||||
from fastapi.security import HTTPBearer, HTTPAuthorizationCredentials
|
||||
|
||||
from ..utils.config import settings
|
||||
from ..utils.logging import get_logger
|
||||
|
||||
logger = get_logger(__name__)
|
||||
|
||||
# Password hashing
|
||||
pwd_context = CryptContext(schemes=["bcrypt"], deprecated="auto")
|
||||
|
||||
# HTTP Bearer for JWT
|
||||
security = HTTPBearer()
|
||||
|
||||
|
||||
def verify_password(plain_password: str, hashed_password: str) -> bool:
|
||||
"""Verify a password against its hash.
|
||||
|
||||
Args:
|
||||
plain_password: Plain text password
|
||||
hashed_password: Hashed password
|
||||
|
||||
Returns:
|
||||
True if password matches
|
||||
"""
|
||||
return pwd_context.verify(plain_password, hashed_password)
|
||||
|
||||
|
||||
def get_password_hash(password: str) -> str:
|
||||
"""Hash a password.
|
||||
|
||||
Args:
|
||||
password: Plain text password
|
||||
|
||||
Returns:
|
||||
Hashed password
|
||||
"""
|
||||
return pwd_context.hash(password)
|
||||
|
||||
|
||||
def create_access_token(data: dict, expires_delta: Optional[timedelta] = None) -> str:
|
||||
"""Create JWT access token.
|
||||
|
||||
Args:
|
||||
data: Data to encode in token
|
||||
expires_delta: Token expiration time
|
||||
|
||||
Returns:
|
||||
JWT token string
|
||||
"""
|
||||
to_encode = data.copy()
|
||||
|
||||
if expires_delta:
|
||||
expire = datetime.utcnow() + expires_delta
|
||||
else:
|
||||
expire = datetime.utcnow() + timedelta(hours=settings.JWT_EXPIRATION_HOURS)
|
||||
|
||||
to_encode.update({"exp": expire})
|
||||
encoded_jwt = jwt.encode(to_encode, settings.JWT_SECRET_KEY, algorithm="HS256")
|
||||
|
||||
return encoded_jwt
|
||||
|
||||
|
||||
def verify_token(token: str) -> dict:
|
||||
"""Verify and decode JWT token.
|
||||
|
||||
Args:
|
||||
token: JWT token string
|
||||
|
||||
Returns:
|
||||
Decoded token payload
|
||||
|
||||
Raises:
|
||||
HTTPException: If token is invalid
|
||||
"""
|
||||
try:
|
||||
payload = jwt.decode(token, settings.JWT_SECRET_KEY, algorithms=["HS256"])
|
||||
return payload
|
||||
except JWTError as e:
|
||||
logger.error(f"Token verification failed: {e}")
|
||||
raise HTTPException(
|
||||
status_code=status.HTTP_401_UNAUTHORIZED,
|
||||
detail="Could not validate credentials",
|
||||
headers={"WWW-Authenticate": "Bearer"},
|
||||
)
|
||||
|
||||
|
||||
def authenticate_user(email: str, password: str) -> Optional[dict]:
|
||||
"""Authenticate user with email and password.
|
||||
|
||||
Args:
|
||||
email: User email
|
||||
password: User password
|
||||
|
||||
Returns:
|
||||
User data if authenticated, None otherwise
|
||||
"""
|
||||
# Check against admin credentials from environment
|
||||
if email == settings.ADMIN_EMAIL and password == settings.ADMIN_PASSWORD:
|
||||
return {
|
||||
"email": email,
|
||||
"role": "admin"
|
||||
}
|
||||
|
||||
return None
|
||||
|
||||
|
||||
async def get_current_user(credentials: HTTPAuthorizationCredentials = Depends(security)) -> dict:
|
||||
"""Get current authenticated user from JWT token.
|
||||
|
||||
Args:
|
||||
credentials: HTTP Bearer credentials
|
||||
|
||||
Returns:
|
||||
User data from token
|
||||
|
||||
Raises:
|
||||
HTTPException: If authentication fails
|
||||
"""
|
||||
token = credentials.credentials
|
||||
payload = verify_token(token)
|
||||
|
||||
email: str = payload.get("sub")
|
||||
if email is None:
|
||||
raise HTTPException(
|
||||
status_code=status.HTTP_401_UNAUTHORIZED,
|
||||
detail="Could not validate credentials",
|
||||
headers={"WWW-Authenticate": "Bearer"},
|
||||
)
|
||||
|
||||
return {
|
||||
"email": email,
|
||||
"role": payload.get("role", "user")
|
||||
}
|
||||
|
||||
|
||||
async def require_auth(current_user: dict = Depends(get_current_user)) -> dict:
|
||||
"""Dependency to require authentication.
|
||||
|
||||
Args:
|
||||
current_user: Current user from get_current_user
|
||||
|
||||
Returns:
|
||||
Current user data
|
||||
"""
|
||||
return current_user
|
||||
@@ -21,6 +21,12 @@ class Settings(BaseSettings):
|
||||
ESSENTIA_MODELS_PATH: str = "./models"
|
||||
AUDIO_LIBRARY_PATH: str = "/audio"
|
||||
|
||||
# Authentication
|
||||
ADMIN_EMAIL: str = "admin@example.com"
|
||||
ADMIN_PASSWORD: str = "changeme"
|
||||
JWT_SECRET_KEY: str = "your-secret-key-change-in-production"
|
||||
JWT_EXPIRATION_HOURS: int = 24
|
||||
|
||||
# Application
|
||||
APP_NAME: str = "Audio Classifier API"
|
||||
APP_VERSION: str = "1.0.0"
|
||||
|
||||
@@ -41,9 +41,7 @@ services:
|
||||
image: git.benoitsz.com/benoit/audio-classifier-frontend:dev
|
||||
container_name: audio_classifier_ui
|
||||
environment:
|
||||
# In production, set NEXT_PUBLIC_API_URL to your server's public URL
|
||||
# Example: NEXT_PUBLIC_API_URL=https://yourserver.com:8001
|
||||
NEXT_PUBLIC_API_URL: ${NEXT_PUBLIC_API_URL:-http://localhost:8001}
|
||||
NEXT_PUBLIC_API_URL: https://api.audioclassifier.benoitsz.com
|
||||
ports:
|
||||
- "3000:3000"
|
||||
depends_on:
|
||||
|
||||
@@ -2,6 +2,7 @@ import type { Metadata } from "next"
|
||||
import { Inter } from "next/font/google"
|
||||
import "./globals.css"
|
||||
import { QueryProvider } from "@/components/providers/QueryProvider"
|
||||
import AuthGuard from "@/components/AuthGuard"
|
||||
import Script from "next/script"
|
||||
|
||||
const inter = Inter({ subsets: ["latin"] })
|
||||
@@ -23,7 +24,9 @@ export default function RootLayout({
|
||||
</head>
|
||||
<body className={inter.className}>
|
||||
<QueryProvider>
|
||||
{children}
|
||||
<AuthGuard>
|
||||
{children}
|
||||
</AuthGuard>
|
||||
</QueryProvider>
|
||||
</body>
|
||||
</html>
|
||||
|
||||
124
frontend/app/login/page.tsx
Normal file
124
frontend/app/login/page.tsx
Normal file
@@ -0,0 +1,124 @@
|
||||
"use client"
|
||||
|
||||
import { useState } from "react"
|
||||
import { useRouter } from "next/navigation"
|
||||
import { getApiUrl } from "@/lib/api"
|
||||
|
||||
export default function LoginPage() {
|
||||
const router = useRouter()
|
||||
const [email, setEmail] = useState("")
|
||||
const [password, setPassword] = useState("")
|
||||
const [error, setError] = useState("")
|
||||
const [isLoading, setIsLoading] = useState(false)
|
||||
|
||||
const handleSubmit = async (e: React.FormEvent) => {
|
||||
e.preventDefault()
|
||||
setError("")
|
||||
setIsLoading(true)
|
||||
|
||||
try {
|
||||
const response = await fetch(`${getApiUrl()}/api/auth/login`, {
|
||||
method: "POST",
|
||||
headers: {
|
||||
"Content-Type": "application/json",
|
||||
},
|
||||
body: JSON.stringify({ email, password }),
|
||||
})
|
||||
|
||||
if (!response.ok) {
|
||||
const data = await response.json()
|
||||
throw new Error(data.detail || "Login failed")
|
||||
}
|
||||
|
||||
const data = await response.json()
|
||||
|
||||
// Store token in localStorage
|
||||
localStorage.setItem("access_token", data.access_token)
|
||||
localStorage.setItem("user", JSON.stringify(data.user))
|
||||
|
||||
// Redirect to home
|
||||
router.push("/")
|
||||
} catch (err) {
|
||||
setError(err instanceof Error ? err.message : "Login failed")
|
||||
} finally {
|
||||
setIsLoading(false)
|
||||
}
|
||||
}
|
||||
|
||||
return (
|
||||
<div className="min-h-screen flex items-center justify-center bg-gradient-to-br from-gray-900 via-gray-800 to-gray-900">
|
||||
<div className="max-w-md w-full mx-4">
|
||||
<div className="bg-white rounded-lg shadow-2xl p-8">
|
||||
{/* Logo/Title */}
|
||||
<div className="text-center mb-8">
|
||||
<h1 className="text-3xl font-bold text-gray-900 mb-2">
|
||||
Audio Classifier
|
||||
</h1>
|
||||
<p className="text-gray-600">Sign in to continue</p>
|
||||
</div>
|
||||
|
||||
{/* Error message */}
|
||||
{error && (
|
||||
<div className="mb-4 p-3 bg-red-50 border border-red-200 text-red-700 rounded-md text-sm">
|
||||
{error}
|
||||
</div>
|
||||
)}
|
||||
|
||||
{/* Login form */}
|
||||
<form onSubmit={handleSubmit} className="space-y-6">
|
||||
<div>
|
||||
<label
|
||||
htmlFor="email"
|
||||
className="block text-sm font-medium text-gray-700 mb-1"
|
||||
>
|
||||
Email
|
||||
</label>
|
||||
<input
|
||||
id="email"
|
||||
type="email"
|
||||
required
|
||||
value={email}
|
||||
onChange={(e) => setEmail(e.target.value)}
|
||||
className="w-full px-3 py-2 border border-gray-300 rounded-md focus:outline-none focus:ring-2 focus:ring-blue-500 focus:border-transparent"
|
||||
placeholder="admin@example.com"
|
||||
disabled={isLoading}
|
||||
/>
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<label
|
||||
htmlFor="password"
|
||||
className="block text-sm font-medium text-gray-700 mb-1"
|
||||
>
|
||||
Password
|
||||
</label>
|
||||
<input
|
||||
id="password"
|
||||
type="password"
|
||||
required
|
||||
value={password}
|
||||
onChange={(e) => setPassword(e.target.value)}
|
||||
className="w-full px-3 py-2 border border-gray-300 rounded-md focus:outline-none focus:ring-2 focus:ring-blue-500 focus:border-transparent"
|
||||
placeholder="••••••••"
|
||||
disabled={isLoading}
|
||||
/>
|
||||
</div>
|
||||
|
||||
<button
|
||||
type="submit"
|
||||
disabled={isLoading}
|
||||
className="w-full bg-blue-600 hover:bg-blue-700 text-white font-medium py-2 px-4 rounded-md transition-colors disabled:bg-blue-400 disabled:cursor-not-allowed"
|
||||
>
|
||||
{isLoading ? "Signing in..." : "Sign in"}
|
||||
</button>
|
||||
</form>
|
||||
</div>
|
||||
|
||||
{/* Footer */}
|
||||
<p className="text-center text-gray-400 text-sm mt-6">
|
||||
Audio Classifier v1.0.0
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
)
|
||||
}
|
||||
@@ -2,7 +2,8 @@
|
||||
|
||||
import { useState, useMemo } from "react"
|
||||
import { useQuery } from "@tanstack/react-query"
|
||||
import { getTracks } from "@/lib/api"
|
||||
import { getTracks, getApiUrl } from "@/lib/api"
|
||||
import { logout, getUser } from "@/lib/auth"
|
||||
import type { FilterParams, Track } from "@/lib/types"
|
||||
import FilterPanel from "@/components/FilterPanel"
|
||||
import AudioPlayer from "@/components/AudioPlayer"
|
||||
@@ -90,7 +91,7 @@ export default function Home() {
|
||||
setIsScanning(true)
|
||||
setScanStatus("Démarrage du scan...")
|
||||
|
||||
const response = await fetch(`${process.env.NEXT_PUBLIC_API_URL}/api/library/scan`, {
|
||||
const response = await fetch(`${getApiUrl()}/api/library/scan`, {
|
||||
method: 'POST',
|
||||
})
|
||||
|
||||
@@ -103,7 +104,7 @@ export default function Home() {
|
||||
// Poll scan status
|
||||
const pollInterval = setInterval(async () => {
|
||||
try {
|
||||
const statusResponse = await fetch(`${process.env.NEXT_PUBLIC_API_URL}/api/library/scan/status`)
|
||||
const statusResponse = await fetch(`${getApiUrl()}/api/library/scan/status`)
|
||||
const status = await statusResponse.json()
|
||||
|
||||
if (!status.is_scanning) {
|
||||
@@ -160,6 +161,18 @@ export default function Home() {
|
||||
{tracksData?.total || 0} piste{(tracksData?.total || 0) > 1 ? 's' : ''}
|
||||
</div>
|
||||
|
||||
{/* Logout button */}
|
||||
<button
|
||||
onClick={logout}
|
||||
className="px-3 py-2 text-sm text-slate-600 hover:text-slate-900 hover:bg-slate-100 rounded-lg transition-colors flex items-center gap-2"
|
||||
title="Déconnexion"
|
||||
>
|
||||
<svg className="w-4 h-4" fill="none" stroke="currentColor" viewBox="0 0 24 24">
|
||||
<path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2} d="M17 16l4-4m0 0l-4-4m4 4H7m6 4v1a3 3 0 01-3 3H6a3 3 0 01-3-3V7a3 3 0 013-3h4a3 3 0 013 3v1" />
|
||||
</svg>
|
||||
Logout
|
||||
</button>
|
||||
|
||||
{/* Rescan button */}
|
||||
<button
|
||||
onClick={handleRescan}
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
|
||||
import { useState, useRef, useEffect } from "react"
|
||||
import type { Track } from "@/lib/types"
|
||||
import { getApiUrl } from "@/lib/api"
|
||||
|
||||
interface AudioPlayerProps {
|
||||
track: Track | null
|
||||
@@ -79,7 +80,7 @@ export default function AudioPlayer({ track, isPlaying, onPlayingChange }: Audio
|
||||
setIsLoadingWaveform(true)
|
||||
try {
|
||||
const response = await fetch(
|
||||
`${process.env.NEXT_PUBLIC_API_URL}/api/audio/waveform/${trackId}`
|
||||
`${getApiUrl()}/api/audio/waveform/${trackId}`
|
||||
)
|
||||
if (response.ok) {
|
||||
const data = await response.json()
|
||||
@@ -161,7 +162,7 @@ export default function AudioPlayer({ track, isPlaying, onPlayingChange }: Audio
|
||||
return (
|
||||
<div className="bg-gray-50 border-t border-gray-300 shadow-lg" style={{ height: '80px' }}>
|
||||
{/* Hidden audio element */}
|
||||
{track && <audio ref={audioRef} src={`${process.env.NEXT_PUBLIC_API_URL}/api/audio/stream/${track.id}`} />}
|
||||
{track && <audio ref={audioRef} src={`${getApiUrl()}/api/audio/stream/${track.id}`} />}
|
||||
|
||||
<div className="h-full flex items-center gap-3 px-4">
|
||||
{/* Play/Pause button */}
|
||||
@@ -300,7 +301,7 @@ export default function AudioPlayer({ track, isPlaying, onPlayingChange }: Audio
|
||||
{/* Download button */}
|
||||
{track && (
|
||||
<a
|
||||
href={`${process.env.NEXT_PUBLIC_API_URL}/api/audio/download/${track.id}`}
|
||||
href={`${getApiUrl()}/api/audio/download/${track.id}`}
|
||||
download
|
||||
className="w-8 h-8 flex items-center justify-center text-gray-600 hover:text-gray-900 transition-colors rounded hover:bg-gray-200 flex-shrink-0"
|
||||
aria-label="Download"
|
||||
|
||||
37
frontend/components/AuthGuard.tsx
Normal file
37
frontend/components/AuthGuard.tsx
Normal file
@@ -0,0 +1,37 @@
|
||||
"use client"
|
||||
|
||||
import { useEffect, useState } from "react"
|
||||
import { useRouter, usePathname } from "next/navigation"
|
||||
import { isAuthenticated } from "@/lib/auth"
|
||||
|
||||
export default function AuthGuard({ children }: { children: React.ReactNode }) {
|
||||
const router = useRouter()
|
||||
const pathname = usePathname()
|
||||
const [isChecking, setIsChecking] = useState(true)
|
||||
|
||||
useEffect(() => {
|
||||
// Skip auth check for login page
|
||||
if (pathname === "/login") {
|
||||
setIsChecking(false)
|
||||
return
|
||||
}
|
||||
|
||||
// Check if user is authenticated
|
||||
if (!isAuthenticated()) {
|
||||
router.push("/login")
|
||||
} else {
|
||||
setIsChecking(false)
|
||||
}
|
||||
}, [pathname, router])
|
||||
|
||||
// Show loading while checking auth
|
||||
if (isChecking && pathname !== "/login") {
|
||||
return (
|
||||
<div className="min-h-screen flex items-center justify-center bg-gray-900">
|
||||
<div className="text-white">Loading...</div>
|
||||
</div>
|
||||
)
|
||||
}
|
||||
|
||||
return <>{children}</>
|
||||
}
|
||||
@@ -15,35 +15,62 @@ import type {
|
||||
} from './types'
|
||||
|
||||
// Get API URL from runtime config (injected at container startup) or fallback to env var
|
||||
function getApiUrl(): string {
|
||||
export function getApiUrl(): string {
|
||||
if (typeof window !== 'undefined' && (window as any).__RUNTIME_CONFIG__) {
|
||||
return (window as any).__RUNTIME_CONFIG__.API_URL
|
||||
}
|
||||
return process.env.NEXT_PUBLIC_API_URL || 'http://localhost:8000'
|
||||
}
|
||||
|
||||
const API_BASE_URL = getApiUrl()
|
||||
// Create axios instance dynamically to use runtime config
|
||||
function getApiClient() {
|
||||
const client = axios.create({
|
||||
baseURL: getApiUrl(),
|
||||
headers: {
|
||||
'Content-Type': 'application/json',
|
||||
},
|
||||
})
|
||||
|
||||
const apiClient = axios.create({
|
||||
baseURL: API_BASE_URL,
|
||||
headers: {
|
||||
'Content-Type': 'application/json',
|
||||
},
|
||||
})
|
||||
// Add JWT token to requests if available
|
||||
client.interceptors.request.use((config) => {
|
||||
if (typeof window !== 'undefined') {
|
||||
const token = localStorage.getItem('access_token')
|
||||
if (token) {
|
||||
config.headers.Authorization = `Bearer ${token}`
|
||||
}
|
||||
}
|
||||
return config
|
||||
})
|
||||
|
||||
// Handle 401 errors (redirect to login)
|
||||
client.interceptors.response.use(
|
||||
(response) => response,
|
||||
(error) => {
|
||||
if (error.response?.status === 401 && typeof window !== 'undefined') {
|
||||
localStorage.removeItem('access_token')
|
||||
localStorage.removeItem('user')
|
||||
window.location.href = '/login'
|
||||
}
|
||||
return Promise.reject(error)
|
||||
}
|
||||
)
|
||||
|
||||
return client
|
||||
}
|
||||
|
||||
// Tracks
|
||||
export async function getTracks(params: FilterParams & { skip?: number; limit?: number }): Promise<TracksResponse> {
|
||||
const response = await apiClient.get('/api/tracks', { params })
|
||||
const response = await getApiClient().get('/api/tracks', { params })
|
||||
return response.data
|
||||
}
|
||||
|
||||
export async function getTrack(id: string): Promise<Track> {
|
||||
const response = await apiClient.get(`/api/tracks/${id}`)
|
||||
const response = await getApiClient().get(`/api/tracks/${id}`)
|
||||
return response.data
|
||||
}
|
||||
|
||||
export async function deleteTrack(id: string): Promise<void> {
|
||||
await apiClient.delete(`/api/tracks/${id}`)
|
||||
await getApiClient().delete(`/api/tracks/${id}`)
|
||||
}
|
||||
|
||||
// Search
|
||||
@@ -51,7 +78,7 @@ export async function searchTracks(
|
||||
query: string,
|
||||
filters?: { genre?: string; mood?: string; limit?: number }
|
||||
): Promise<SearchResponse> {
|
||||
const response = await apiClient.get('/api/search', {
|
||||
const response = await getApiClient().get('/api/search', {
|
||||
params: { q: query, ...filters },
|
||||
})
|
||||
return response.data
|
||||
@@ -59,7 +86,7 @@ export async function searchTracks(
|
||||
|
||||
// Similar
|
||||
export async function getSimilarTracks(id: string, limit: number = 10): Promise<SimilarTracksResponse> {
|
||||
const response = await apiClient.get(`/api/tracks/${id}/similar`, {
|
||||
const response = await getApiClient().get(`/api/tracks/${id}/similar`, {
|
||||
params: { limit },
|
||||
})
|
||||
return response.data
|
||||
@@ -67,30 +94,30 @@ export async function getSimilarTracks(id: string, limit: number = 10): Promise<
|
||||
|
||||
// Analysis
|
||||
export async function analyzeFolder(request: AnalyzeFolderRequest): Promise<{ job_id: string }> {
|
||||
const response = await apiClient.post('/api/analyze/folder', request)
|
||||
const response = await getApiClient().post('/api/analyze/folder', request)
|
||||
return response.data
|
||||
}
|
||||
|
||||
export async function getAnalyzeStatus(jobId: string): Promise<JobStatus> {
|
||||
const response = await apiClient.get(`/api/analyze/status/${jobId}`)
|
||||
const response = await getApiClient().get(`/api/analyze/status/${jobId}`)
|
||||
return response.data
|
||||
}
|
||||
|
||||
export async function deleteJob(jobId: string): Promise<void> {
|
||||
await apiClient.delete(`/api/analyze/job/${jobId}`)
|
||||
await getApiClient().delete(`/api/analyze/job/${jobId}`)
|
||||
}
|
||||
|
||||
// Audio
|
||||
export function getStreamUrl(trackId: string): string {
|
||||
return `${API_BASE_URL}/api/audio/stream/${trackId}`
|
||||
return `${getApiUrl()}/api/audio/stream/${trackId}`
|
||||
}
|
||||
|
||||
export function getDownloadUrl(trackId: string): string {
|
||||
return `${API_BASE_URL}/api/audio/download/${trackId}`
|
||||
return `${getApiUrl()}/api/audio/download/${trackId}`
|
||||
}
|
||||
|
||||
export async function getWaveform(trackId: string, numPeaks: number = 800): Promise<WaveformData> {
|
||||
const response = await apiClient.get(`/api/audio/waveform/${trackId}`, {
|
||||
const response = await getApiClient().get(`/api/audio/waveform/${trackId}`, {
|
||||
params: { num_peaks: numPeaks },
|
||||
})
|
||||
return response.data
|
||||
@@ -98,14 +125,12 @@ export async function getWaveform(trackId: string, numPeaks: number = 800): Prom
|
||||
|
||||
// Stats
|
||||
export async function getStats(): Promise<Stats> {
|
||||
const response = await apiClient.get('/api/stats')
|
||||
const response = await getApiClient().get('/api/stats')
|
||||
return response.data
|
||||
}
|
||||
|
||||
// Health
|
||||
export async function healthCheck(): Promise<{ status: string }> {
|
||||
const response = await apiClient.get('/health')
|
||||
const response = await getApiClient().get('/health')
|
||||
return response.data
|
||||
}
|
||||
|
||||
export default apiClient
|
||||
|
||||
34
frontend/lib/auth.ts
Normal file
34
frontend/lib/auth.ts
Normal file
@@ -0,0 +1,34 @@
|
||||
/**
|
||||
* Authentication utilities
|
||||
*/
|
||||
|
||||
export function getToken(): string | null {
|
||||
if (typeof window === "undefined") return null
|
||||
return localStorage.getItem("access_token")
|
||||
}
|
||||
|
||||
export function setToken(token: string): void {
|
||||
localStorage.setItem("access_token", token)
|
||||
}
|
||||
|
||||
export function removeToken(): void {
|
||||
localStorage.removeItem("access_token")
|
||||
localStorage.removeItem("user")
|
||||
}
|
||||
|
||||
export function getUser(): any | null {
|
||||
if (typeof window === "undefined") return null
|
||||
const user = localStorage.getItem("user")
|
||||
return user ? JSON.parse(user) : null
|
||||
}
|
||||
|
||||
export function isAuthenticated(): boolean {
|
||||
return getToken() !== null
|
||||
}
|
||||
|
||||
export function logout(): void {
|
||||
removeToken()
|
||||
if (typeof window !== "undefined") {
|
||||
window.location.href = "/login"
|
||||
}
|
||||
}
|
||||
20
frontend/middleware.ts
Normal file
20
frontend/middleware.ts
Normal file
@@ -0,0 +1,20 @@
|
||||
import { NextResponse } from 'next/server'
|
||||
import type { NextRequest } from 'next/server'
|
||||
|
||||
export function middleware(request: NextRequest) {
|
||||
// Middleware runs on server, can't access localStorage
|
||||
// Auth check will be done client-side in layout.tsx
|
||||
return NextResponse.next()
|
||||
}
|
||||
|
||||
export const config = {
|
||||
matcher: [
|
||||
/*
|
||||
* Match all request paths except for the ones starting with:
|
||||
* - _next/static (static files)
|
||||
* - _next/image (image optimization files)
|
||||
* - favicon.ico (favicon file)
|
||||
*/
|
||||
'/((?!_next/static|_next/image|favicon.ico).*)',
|
||||
],
|
||||
}
|
||||
Reference in New Issue
Block a user