Skip to content

Commit

Permalink
整理: setting_ui_template をルーターに移動 (#1213)
Browse files Browse the repository at this point in the history
refactor: `setting_ui_template` をルーターに移動

Co-authored-by: Hiroshiba Kazuyuki <[email protected]>
  • Loading branch information
tarepan and Hiroshiba authored May 5, 2024
1 parent 5fcd68b commit 2c78642
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 14 deletions.
13 changes: 1 addition & 12 deletions run.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
import uvicorn
from fastapi import FastAPI, HTTPException
from fastapi.responses import HTMLResponse
from fastapi.templating import Jinja2Templates

from voicevox_engine import __version__
from voicevox_engine.app.dependencies import deprecated_mutable_api
Expand Down Expand Up @@ -120,12 +119,6 @@ async def lifespan(app: FastAPI) -> AsyncIterator[None]:

metas_store = MetasStore(root_dir / "speaker_info")

setting_ui_template = Jinja2Templates(
directory=engine_root() / "ui_template",
variable_start_string="<JINJA_PRE>",
variable_end_string="<JINJA_POST>",
)

def get_engine(core_version: Optional[str]) -> TTSEngine:
if core_version is None:
return tts_engines[latest_core_version]
Expand Down Expand Up @@ -157,11 +150,7 @@ def get_core(core_version: Optional[str]) -> CoreAdapter:
app.include_router(
generate_engine_info_router(get_core, cores, engine_manifest_data)
)
app.include_router(
generate_setting_router(
setting_loader, engine_manifest_data, setting_ui_template
)
)
app.include_router(generate_setting_router(setting_loader, engine_manifest_data))

@app.get("/", response_class=HTMLResponse, tags=["その他"])
async def get_portal() -> str:
Expand Down
10 changes: 8 additions & 2 deletions voicevox_engine/app/routers/setting.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,20 @@
from voicevox_engine.engine_manifest.EngineManifest import EngineManifest
from voicevox_engine.setting.Setting import CorsPolicyMode, Setting
from voicevox_engine.setting.SettingLoader import SettingHandler
from voicevox_engine.utility.path_utility import engine_root

from ..dependencies import check_disabled_mutable_api

_setting_ui_template = Jinja2Templates(
directory=engine_root() / "ui_template",
variable_start_string="<JINJA_PRE>",
variable_end_string="<JINJA_POST>",
)


def generate_setting_router(
setting_loader: SettingHandler,
engine_manifest_data: EngineManifest,
setting_ui_template: Jinja2Templates,
) -> APIRouter:
"""設定 API Router を生成する"""
router = APIRouter()
Expand All @@ -34,7 +40,7 @@ def setting_get(request: Request) -> Response:
if allow_origin is None:
allow_origin = ""

return setting_ui_template.TemplateResponse(
return _setting_ui_template.TemplateResponse(
"ui.html",
{
"request": request,
Expand Down

0 comments on commit 2c78642

Please sign in to comment.