The open-source AI voice studio. Clone, dictate, create.
move CRUD and service modules into services/, platform_detect into utils/
James Pineb3012ed10ce9
diff --git a/backend/app.py b/backend/app.pyindex f8bbbcd1..69cee59b 100644--- a/backend/app.py+++ b/backend/app.py@@ -15,9 +15,10 @@ from fastapi import FastAPIfrom fastapi.middleware.cors import CORSMiddlewarefrom urllib.parse import quote-from . import __version__, database, tts, transcribe, config+from . import __version__, database+from .services import tts, transcribefrom .database import get_db-from .platform_detect import get_backend_type+from .utils.platform_detect import get_backend_typefrom .utils.progress import get_progress_managerfrom .services.task_queue import create_background_task, init_queuefrom .routes import register_routersdiff --git a/backend/backends/__init__.py b/backend/backends/__init__.pyindex 3ebbb985..cc35eabe 100644--- a/backend/backends/__init__.py+++ b/backend/backends/__init__.py@@ -11,7 +11,7 @@ from typing import Protocol, Optional, Tuple, Listfrom typing_extensions import runtime_checkableimport numpy as np-from ..platform_detect import get_backend_type+from ..utils.platform_detect import get_backend_typeLANGUAGE_CODE_TO_NAME = {"zh": "chinese",@@ -375,7 +375,7 @@ async def ensure_model_cached_or_raise(engine: str, model_size: str = "default")def unload_model_by_config(config: ModelConfig) -> bool:"""Unload a model given its config. Returns True if it was loaded, False otherwise."""from . import get_tts_backend_for_engine- from .. import tts, transcribe+ from ..services import tts, transcribeif config.engine == "whisper":whisper_model = transcribe.get_whisper_model()@@ -403,7 +403,7 @@ def unload_model_by_config(config: ModelConfig) -> bool:def check_model_loaded(config: ModelConfig) -> bool:"""Check if a model is currently loaded."""from . import get_tts_backend_for_engine- from .. import tts, transcribe+ from ..services import tts, transcribetry:if config.engine == "whisper":@@ -424,7 +424,7 @@ def check_model_loaded(config: ModelConfig) -> bool:def get_model_load_func(config: ModelConfig):"""Return a callable that loads/downloads the model."""from . import get_tts_backend_for_engine- from .. import tts, transcribe+ from ..services import tts, transcribeif config.engine == "whisper":return lambda: transcribe.get_whisper_model().load_model(config.model_size)diff --git a/backend/build_binary.py b/backend/build_binary.pyindex 43de991b..6f8b1736 100644--- a/backend/build_binary.py+++ b/backend/build_binary.py@@ -55,11 +55,11 @@ def build_server(cuda=False):'--hidden-import', 'backend.config','--hidden-import', 'backend.database','--hidden-import', 'backend.models',- '--hidden-import', 'backend.profiles',- '--hidden-import', 'backend.history',- '--hidden-import', 'backend.tts',- '--hidden-import', 'backend.transcribe',- '--hidden-import', 'backend.platform_detect',+ '--hidden-import', 'backend.services.profiles',+ '--hidden-import', 'backend.services.history',+ '--hidden-import', 'backend.services.tts',+ '--hidden-import', 'backend.services.transcribe',+ '--hidden-import', 'backend.utils.platform_detect','--hidden-import', 'backend.backends','--hidden-import', 'backend.backends.pytorch_backend','--hidden-import', 'backend.utils.audio',@@ -68,9 +68,9 @@ def build_server(cuda=False):'--hidden-import', 'backend.utils.hf_progress','--hidden-import', 'backend.utils.validation','--hidden-import', 'backend.services.cuda',- '--hidden-import', 'backend.effects',+ '--hidden-import', 'backend.services.effects','--hidden-import', 'backend.utils.effects',- '--hidden-import', 'backend.versions',+ '--hidden-import', 'backend.services.versions','--hidden-import', 'pedalboard','--hidden-import', 'chatterbox','--hidden-import', 'chatterbox.tts_turbo',diff --git a/backend/routes/audio.py b/backend/routes/audio.pyindex 12e774ef..682d7aae 100644--- a/backend/routes/audio.py+++ b/backend/routes/audio.py@@ -6,7 +6,8 @@ from fastapi import APIRouter, Depends, HTTPExceptionfrom fastapi.responses import FileResponsefrom sqlalchemy.orm import Session-from .. import history, models+from .. import models+from ..services import historyfrom ..database import get_dbrouter = APIRouter()@@ -15,7 +16,7 @@ router = APIRouter()@router.get("/audio/version/{version_id}")async def get_version_audio(version_id: str, db: Session = Depends(get_db)):"""Serve audio for a specific version."""- from .. import versions as versions_mod+ from ..services import versions as versions_modversion = versions_mod.get_version(version_id, db)if not version:diff --git a/backend/routes/channels.py b/backend/routes/channels.pyindex 56391624..c13162fb 100644--- a/backend/routes/channels.py+++ b/backend/routes/channels.py@@ -3,7 +3,8 @@from fastapi import APIRouter, Depends, HTTPExceptionfrom sqlalchemy.orm import Session-from .. import channels, models+from .. import models+from ..services import channelsfrom ..database import get_dbrouter = APIRouter()diff --git a/backend/routes/effects.py b/backend/routes/effects.pyindex 8e1f6272..8139176d 100644--- a/backend/routes/effects.py+++ b/backend/routes/effects.py@@ -9,7 +9,8 @@ from fastapi import APIRouter, Depends, HTTPExceptionfrom fastapi.responses import StreamingResponsefrom sqlalchemy.orm import Session-from .. import config, history, models+from .. import config, models+from ..services import historyfrom ..database import Generation as DBGeneration, get_dbrouter = APIRouter()@@ -28,7 +29,7 @@ async def preview_effects(if (gen.status or "completed") != "completed":raise HTTPException(status_code=400, detail="Generation is not completed")- from .. import versions as versions_mod+ from ..services import versions as versions_modfrom ..utils.effects import apply_effects, validate_effects_chainfrom ..utils.audio import load_audio@@ -73,7 +74,7 @@ async def get_available_effects():@router.get("/effects/presets", response_model=list[models.EffectPresetResponse])async def list_effect_presets(db: Session = Depends(get_db)):"""List all effect presets (built-in + user-created)."""- from .. import effects as effects_mod+ from ..services import effects as effects_modreturn effects_mod.list_presets(db)@@ -81,7 +82,7 @@ async def list_effect_presets(db: Session = Depends(get_db)):@router.get("/effects/presets/{preset_id}", response_model=models.EffectPresetResponse)async def get_effect_preset(preset_id: str, db: Session = Depends(get_db)):"""Get a specific effect preset."""- from .. import effects as effects_mod+ from ..services import effects as effects_modpreset = effects_mod.get_preset(preset_id, db)if not preset:@@ -95,7 +96,7 @@ async def create_effect_preset(db: Session = Depends(get_db),):"""Create a new effect preset."""- from .. import effects as effects_mod+ from ..services import effects as effects_modtry:return effects_mod.create_preset(data, db)@@ -110,7 +111,7 @@ async def update_effect_preset(db: Session = Depends(get_db),):"""Update an effect preset."""- from .. import effects as effects_mod+ from ..services import effects as effects_modtry:result = effects_mod.update_preset(preset_id, data, db)@@ -124,7 +125,7 @@ async def update_effect_preset(@router.delete("/effects/presets/{preset_id}")async def delete_effect_preset(preset_id: str, db: Session = Depends(get_db)):"""Delete a user effect preset."""- from .. import effects as effects_mod+ from ..services import effects as effects_modtry:if not effects_mod.delete_preset(preset_id, db):@@ -147,7 +148,7 @@ async def list_generation_versions(if not gen:raise HTTPException(status_code=404, detail="Generation not found")- from .. import versions as versions_mod+ from ..services import versions as versions_modreturn versions_mod.list_versions(generation_id, db)@@ -168,7 +169,7 @@ async def apply_effects_to_generation(if (gen.status or "completed") != "completed":raise HTTPException(status_code=400, detail="Generation is not completed")- from .. import versions as versions_mod+ from ..services import versions as versions_modfrom ..utils.effects import apply_effects, validate_effects_chainfrom ..utils.audio import load_audio, save_audio@@ -227,7 +228,7 @@ async def set_default_version(db: Session = Depends(get_db),):"""Set a specific version as the default for a generation."""- from .. import versions as versions_mod+ from ..services import versions as versions_modversion = versions_mod.get_version(version_id, db)if not version or version.generation_id != generation_id:@@ -246,7 +247,7 @@ async def delete_generation_version(db: Session = Depends(get_db),):"""Delete a version. Cannot delete the last remaining version."""- from .. import versions as versions_mod+ from ..services import versions as versions_modversion = versions_mod.get_version(version_id, db)if not version or version.generation_id != generation_id:diff --git a/backend/routes/generations.py b/backend/routes/generations.pyindex 32051796..d9f4ef29 100644--- a/backend/routes/generations.py+++ b/backend/routes/generations.py@@ -7,7 +7,8 @@ from fastapi import APIRouter, Depends, HTTPExceptionfrom fastapi.responses import StreamingResponsefrom sqlalchemy.orm import Session-from .. import history, models, profiles, tts+from .. import models+from ..services import history, profiles, ttsfrom ..database import Generation as DBGeneration, VoiceProfile as DBVoiceProfile, get_dbfrom ..services.generation import run_generationfrom ..services.task_queue import enqueue_generationdiff --git a/backend/routes/health.py b/backend/routes/health.pyindex 181aaebf..e48d5689 100644--- a/backend/routes/health.py+++ b/backend/routes/health.py@@ -8,9 +8,10 @@ import torchfrom fastapi import APIRouter, Dependsfrom sqlalchemy.orm import Session-from .. import config, models, tts+from .. import config, models+from ..services import ttsfrom ..database import get_db-from ..platform_detect import get_backend_type+from ..utils.platform_detect import get_backend_typerouter = APIRouter()diff --git a/backend/routes/history.py b/backend/routes/history.pyindex e4c2d47c..5ae438b2 100644--- a/backend/routes/history.py+++ b/backend/routes/history.py@@ -7,7 +7,8 @@ from fastapi import APIRouter, Depends, File, HTTPException, UploadFilefrom fastapi.responses import FileResponse, StreamingResponsefrom sqlalchemy.orm import Session-from .. import export_import, history, models+from .. import models+from ..services import export_import, historyfrom ..app import safe_content_dispositionfrom ..database import Generation as DBGeneration, VoiceProfile as DBVoiceProfile, get_dbdiff --git a/backend/routes/models.py b/backend/routes/models.pyindex c17d0f15..5706c7ad 100644--- a/backend/routes/models.py+++ b/backend/routes/models.py@@ -9,7 +9,7 @@ from fastapi.responses import StreamingResponsefrom sqlalchemy.orm import Sessionfrom .. import models-from ..platform_detect import get_backend_type+from ..utils.platform_detect import get_backend_typefrom ..services.task_queue import create_background_taskfrom ..utils.progress import get_progress_managerfrom ..utils.tasks import get_task_manager@@ -50,7 +50,7 @@ def _copy_with_progress(src: Path, dst: Path, progress_manager, copied_so_far: i@router.post("/models/load")async def load_model(model_size: str = "1.7B"):"""Manually load TTS model."""- from .. import tts+ from ..services import ttstry:tts_model = tts.get_tts_model()@@ -63,7 +63,7 @@ async def load_model(model_size: str = "1.7B"):@router.post("/models/unload")async def unload_model():"""Unload the default Qwen TTS model to free memory."""- from .. import tts+ from ..services import ttstry:tts.unload_tts_model()diff --git a/backend/routes/profiles.py b/backend/routes/profiles.pyindex 320dfc50..6b7b4509 100644--- a/backend/routes/profiles.py+++ b/backend/routes/profiles.py@@ -9,10 +9,11 @@ from fastapi import APIRouter, Depends, File, Form, HTTPException, UploadFilefrom fastapi.responses import FileResponse, StreamingResponsefrom sqlalchemy.orm import Session-from .. import channels, config, export_import, models, profiles+from .. import config, modelsfrom ..app import safe_content_dispositionfrom ..database import VoiceProfile as DBVoiceProfile, get_db-from ..profiles import _profile_to_response+from ..services import channels, export_import, profiles+from ..services.profiles import _profile_to_responserouter = APIRouter()diff --git a/backend/routes/stories.py b/backend/routes/stories.pyindex 0c5296ba..74af7a50 100644--- a/backend/routes/stories.py+++ b/backend/routes/stories.py@@ -6,7 +6,8 @@ from fastapi import APIRouter, Depends, HTTPExceptionfrom fastapi.responses import StreamingResponsefrom sqlalchemy.orm import Session-from .. import database, models, stories+from .. import database, models+from ..services import storiesfrom ..app import safe_content_dispositionfrom ..database import get_dbdiff --git a/backend/routes/transcription.py b/backend/routes/transcription.pyindex 8edafef6..b5008c82 100644--- a/backend/routes/transcription.py+++ b/backend/routes/transcription.py@@ -6,7 +6,8 @@ from pathlib import Pathfrom fastapi import APIRouter, File, Form, HTTPException, UploadFile-from .. import models, transcribe+from .. import models+from ..services import transcribefrom ..services.task_queue import create_background_taskfrom ..utils.tasks import get_task_managerdiff --git a/backend/channels.py b/backend/services/channels.pysimilarity index 99%rename from backend/channels.pyrename to backend/services/channels.pyindex 146c003d..f7d9d788 100644--- a/backend/channels.py+++ b/backend/services/channels.py@@ -7,14 +7,14 @@ from datetime import datetimeimport uuidfrom sqlalchemy.orm import Session-from .models import (+from ..models import (AudioChannelCreate,AudioChannelUpdate,AudioChannelResponse,ChannelVoiceAssignment,ProfileChannelAssignment,)-from .database import (+from ..database import (AudioChannel as DBAudioChannel,ChannelDeviceMapping as DBChannelDeviceMapping,ProfileChannelMapping as DBProfileChannelMapping,diff --git a/backend/effects.py b/backend/services/effects.pysimilarity index 96%rename from backend/effects.pyrename to backend/services/effects.pyindex 79130785..29ca5918 100644--- a/backend/effects.py+++ b/backend/services/effects.py@@ -11,8 +11,8 @@ from typing import List, Optionalfrom sqlalchemy.orm import Sessionfrom sqlalchemy.exc import IntegrityError-from .database import EffectPreset as DBEffectPreset-from .models import EffectPresetResponse, EffectPresetCreate, EffectPresetUpdate, EffectConfig+from ..database import EffectPreset as DBEffectPreset+from ..models import EffectPresetResponse, EffectPresetCreate, EffectPresetUpdate, EffectConfigdef _preset_response(p: DBEffectPreset) -> EffectPresetResponse:diff --git a/backend/export_import.py b/backend/services/export_import.pysimilarity index 98%rename from backend/export_import.pyrename to backend/services/export_import.pyindex 58acd400..93252f50 100644--- a/backend/export_import.py+++ b/backend/services/export_import.py@@ -12,11 +12,11 @@ from pathlib import Pathfrom typing import Optionalfrom sqlalchemy.orm import Session-from .models import VoiceProfileResponse-from .database import VoiceProfile as DBVoiceProfile, ProfileSample as DBProfileSample, Generation as DBGeneration, GenerationVersion as DBGenerationVersion+from ..models import VoiceProfileResponse+from ..database import VoiceProfile as DBVoiceProfile, ProfileSample as DBProfileSample, Generation as DBGeneration, GenerationVersion as DBGenerationVersionfrom .profiles import create_profile, add_profile_sample-from .models import VoiceProfileCreate-from . import config+from ..models import VoiceProfileCreate+from .. import configdef _get_unique_profile_name(name: str, db: Session) -> str:@@ -346,7 +346,7 @@ async def import_generation_from_zip(file_bytes: bytes, db: Session) -> dict:import tempfileimport shutilfrom datetime import datetime- from . import config+ from .. import configzip_buffer = io.BytesIO(file_bytes)diff --git a/backend/services/generation.py b/backend/services/generation.pyindex 6f85cd0c..04e07014 100644--- a/backend/services/generation.py+++ b/backend/services/generation.py@@ -19,7 +19,8 @@ from __future__ import annotationsimport tracebackfrom typing import Literal, Optional-from .. import config, history, profiles+from .. import config+from . import history, profilesfrom ..database import get_dbfrom ..utils.tasks import get_task_manager@@ -151,7 +152,7 @@ def _save_generate(Returns the final audio path (processed if effects were applied,otherwise clean)."""- from .. import versions as versions_mod+ from . import versions as versions_modclean_audio_path = config.get_generations_dir() / f"{generation_id}.wav"save_audio(audio, str(clean_audio_path), sample_rate)@@ -221,7 +222,7 @@ def _save_regenerate(Returns the audio path."""- from .. import versions as versions_mod+ from . import versions as versions_modsuffix = version_id[:8] if version_id else generation_id[:8]audio_path = config.get_generations_dir() / f"{generation_id}_{suffix}.wav"diff --git a/backend/history.py b/backend/services/history.pysimilarity index 96%rename from backend/history.pyrename to backend/services/history.pyindex c2c9197a..8f45d48f 100644--- a/backend/history.py+++ b/backend/services/history.py@@ -10,9 +10,9 @@ from pathlib import Pathfrom sqlalchemy.orm import Sessionfrom sqlalchemy import or_-from .models import GenerationRequest, GenerationResponse, HistoryQuery, HistoryResponse, HistoryListResponse, GenerationVersionResponse, EffectConfig-from .database import Generation as DBGeneration, GenerationVersion as DBGenerationVersion, VoiceProfile as DBVoiceProfile-from . import config+from ..models import GenerationRequest, GenerationResponse, HistoryQuery, HistoryResponse, HistoryListResponse, GenerationVersionResponse, EffectConfig+from ..database import Generation as DBGeneration, GenerationVersion as DBGenerationVersion, VoiceProfile as DBVoiceProfile+from .. import configdef _get_versions_for_generation(generation_id: str, db: Session) -> tuple:diff --git a/backend/profiles.py b/backend/services/profiles.pysimilarity index 97%rename from backend/profiles.pyrename to backend/services/profiles.pyindex ab8941c4..46180f3c 100644--- a/backend/profiles.py+++ b/backend/services/profiles.py@@ -10,23 +10,23 @@ from pathlib import Pathfrom sqlalchemy.orm import Sessionfrom sqlalchemy import func, select-from .models import (+from ..models import (VoiceProfileCreate,VoiceProfileResponse,ProfileSampleCreate,ProfileSampleResponse,)-from .database import (+from ..database import (VoiceProfile as DBVoiceProfile,ProfileSample as DBProfileSample,Generation as DBGeneration,)-from .models import EffectConfig-from .utils.audio import validate_reference_audio, load_audio, save_audio-from .utils.images import validate_image, process_avatar-from .utils.cache import _get_cache_dir, clear_profile_cache+from ..models import EffectConfig+from ..utils.audio import validate_reference_audio, load_audio, save_audio+from ..utils.images import validate_image, process_avatar+from ..utils.cache import _get_cache_dir, clear_profile_cachefrom .tts import get_tts_model-from . import config+from .. import configimport json as _json@@ -389,7 +389,7 @@ async def create_voice_prompt_for_profile(Returns:Voice prompt dictionary"""- from .backends import get_tts_backend_for_engine+ from ..backends import get_tts_backend_for_enginesamples = db.query(DBProfileSample).filter_by(profile_id=profile_id).all()diff --git a/backend/stories.py b/backend/services/stories.pysimilarity index 99%rename from backend/stories.pyrename to backend/services/stories.pyindex cb4dad65..ac8e22bd 100644--- a/backend/stories.py+++ b/backend/services/stories.py@@ -10,7 +10,7 @@ from pathlib import Pathfrom sqlalchemy.orm import Sessionfrom sqlalchemy import func-from .models import (+from ..models import (StoryCreate,StoryResponse,StoryDetailResponse,@@ -22,14 +22,14 @@ from .models import (StoryItemSplit,StoryItemVersionUpdate,)-from .database import (+from ..database import (Story as DBStory,StoryItem as DBStoryItem,Generation as DBGeneration,VoiceProfile as DBVoiceProfile,)from .history import _get_versions_for_generation-from .utils.audio import load_audio, save_audio+from ..utils.audio import load_audio, save_audioimport numpy as np@@ -754,7 +754,7 @@ async def set_story_item_version(# Validate version_id belongs to this generation if providedif data.version_id:- from .database import GenerationVersion as DBGenerationVersion+ from ..database import GenerationVersion as DBGenerationVersionversion = (db.query(DBGenerationVersion)@@ -820,7 +820,7 @@ async def export_story_audio(# Resolve audio path: use pinned version if set, otherwise generation defaultresolved_audio_path = generation.audio_pathif getattr(item, "version_id", None):- from .database import GenerationVersion as DBGenerationVersion+ from ..database import GenerationVersion as DBGenerationVersionversion = db.query(DBGenerationVersion).filter_by(id=item.version_id).first()if version:diff --git a/backend/transcribe.py b/backend/services/transcribe.pysimilarity index 89%rename from backend/transcribe.pyrename to backend/services/transcribe.pyindex 4d735fce..e400dbd5 100644--- a/backend/transcribe.py+++ b/backend/services/transcribe.py@@ -3,7 +3,7 @@ STT (Speech-to-Text) module - delegates to backend abstraction layer."""from typing import Optional-from .backends import get_stt_backend, STTBackend+from ..backends import get_stt_backend, STTBackenddef get_whisper_model() -> STTBackend:diff --git a/backend/tts.py b/backend/services/tts.pysimilarity index 93%rename from backend/tts.pyrename to backend/services/tts.pyindex 453f2f5c..d4f90ff3 100644--- a/backend/tts.py+++ b/backend/services/tts.py@@ -7,7 +7,7 @@ import numpy as npimport ioimport soundfile as sf-from .backends import get_tts_backend, TTSBackend+from ..backends import get_tts_backend, TTSBackenddef get_tts_model() -> TTSBackend:diff --git a/backend/versions.py b/backend/services/versions.pysimilarity index 98%rename from backend/versions.pyrename to backend/services/versions.pyindex 381114d7..1743a25c 100644--- a/backend/versions.py+++ b/backend/services/versions.py@@ -14,12 +14,12 @@ from typing import List, Optionalfrom sqlalchemy.orm import Session-from .database import (+from ..database import (GenerationVersion as DBGenerationVersion,Generation as DBGeneration,)-from .models import GenerationVersionResponse, EffectConfig-from . import config+from ..models import GenerationVersionResponse, EffectConfig+from .. import configdef _version_response(v: DBGenerationVersion) -> GenerationVersionResponse:diff --git a/backend/platform_detect.py b/backend/utils/platform_detect.pysimilarity index 100%rename from backend/platform_detect.pyrename to backend/utils/platform_detect.py